Add nullOnly flag for annotations

Author: Robin Cawser

composer.json

@@ -12,6 +12,7 @@
     "require": {
         "php": ">=5.3.3",
         "doctrine/common": "~2.2",
+        "doctrine/orm": "~2.2",
         "symfony/security": "~2.1"
     },
     "require-dev": {

spec/Vivait/StringGeneratorBundle/EventListener/GeneratorListenerSpec.php

@@ -3,6 +3,12 @@
 namespace spec\Vivait\StringGeneratorBundle\EventListener;
 
 use Doctrine\Common\Annotations\Reader;
+
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Vivait\StringGeneratorBundle\Annotation\GeneratorAnnotation;
@@ -16,9 +22,17 @@ function it_is_initializable()
         $this->shouldHaveType('Vivait\StringGeneratorBundle\EventListener\GeneratorListener');
     }
 
-    function let(Reader $reader, Registry $registry)
+    function let(Reader $reader, Registry $registry, Entity $mockEntity, EntityRepository $entityRepository, ClassMetadata $meta, EntityManagerInterface $entityManager, LifecycleEventArgs $args)
     {
         $this->beConstructedWith($reader, $registry);
+
+        //Set up for EM etc.
+        $args->getEntity()->willReturn($mockEntity);
+        $args->getEntityManager()->willReturn($entityManager);
+        $entityManager->getClassMetadata(Argument::any())->willReturn($meta);
+        $entityManager->getRepository(Argument::any())->willReturn($entityRepository);
+        $meta->getName()->willReturn('Entity');
+
     }
 
     function it_performs_callbacks_on_the_generator(StringGenerator $generator, Entity $mockEntity)
@@ -40,13 +54,48 @@ function it_can_get_callback_values_from_annotated_object(StringGenerator $gener
         $generator->setPrefix('VIVA_')->shouldBeCalled();
         $this->performCallbacks($generator, $annotation, $mockEntity);
     }
+
+    function it_sets_only_null_properties_if_specified(Reader $reader, LifecycleEventArgs $args, StringGenerator $generator, Entity $mockEntity)
+    {
+        $mockEntity->setName(null);
+
+        $annotation = new GeneratorAnnotation([]);
+        $annotation->nullOnly = true;
+
+        $reader->getPropertyAnnotations(Argument::any())->willReturn([$annotation]);
+
+        $generator->generate()->shouldNotBeCalled();
+        $this->prePersist($args);
+    }
+
+    function it_generates_a_string_on_a_property(Registry $registry, Reader $reader, LifecycleEventArgs $args, StringGenerator $generator)
+    {
+        $annotation = new GeneratorAnnotation([]);
+
+        $reader->getPropertyAnnotations(Argument::any())->willReturn([$annotation]);
+
+        $registry->get(Argument::any())->willReturn($generator);
+
+        $generator->generate()->shouldBeCalled();
+        $generator->setLength(Argument::any())->shouldBeCalled();
+
+
+        $this->prePersist($args);
+    }
 }
 
 class Entity
 {
+    private $name;
+
     public function getPrefix()
     {
 
     }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 }
 

src/Vivait/StringGeneratorBundle/Annotation/GeneratorAnnotation.php

@@ -27,4 +27,6 @@ class GeneratorAnnotation extends Annotation
      * @var boolean
      */
     public $unique = true;
+
+    public $nullOnly = false;
 }

src/Vivait/StringGeneratorBundle/EventListener/GeneratorListener.php

@@ -3,14 +3,21 @@
 namespace Vivait\StringGeneratorBundle\EventListener;
 
 use Doctrine\Common\Annotations\Reader;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Vivait\StringGeneratorBundle\Annotation\GeneratorAnnotation;
 use Vivait\StringGeneratorBundle\Model\GeneratorInterface;
 use Vivait\StringGeneratorBundle\Registry\Registry;
 
 class GeneratorListener
 {
+    /**
+     * @var Reader
+     */
     private $reader;
+    /**
+     * @var EntityRepository
+     */
     private $repo;
     /**
      * @var GeneratorInterface
@@ -45,11 +52,15 @@ public function prePersist(LifecycleEventArgs $args)
 
         foreach ($object->getProperties() as $property) {
             foreach ($this->reader->getPropertyAnnotations($property) as $annotation) {
-
                 if ($annotation instanceof GeneratorAnnotation) {
-                    $string = $this->generateString($property->name, $annotation, $object);
 
-                    $meta->getReflectionProperty($property->name)->setValue($entity, $string);
+                    $property->setAccessible(true);
+                    if ($annotation->nullOnly && !$property->getValue($object)) {
+                        break;
+                    }
+
+                    $string = $this->generateString($property->name, $annotation, $object);
+                    $property->setValue($entity, $string);
                 }
             }
         }
@@ -77,13 +88,11 @@ private function generateString($property, GeneratorAnnotation $annotation, $obj
             return $str;
         }
 
-
         if ($this->repo->findOneBy([$property => $str])) {
             return $this->generateString($property, $annotation, $object);
         } else {
             return $str;
         }
-
     }
 
     /**