Merge pull request #32 from leightonthomas/fix/31-reflection-object

[#31] Reflection object fix

Author: kieljohn

src/Vivait/StringGeneratorBundle/EventListener/GeneratorListener.php

@@ -75,28 +75,29 @@ public function prePersist(LifecycleEventArgs $args)
                         break;
                     }
 
-                    $string = $this->generateString($property->name, $annotation, $object);
+                    $string = $this->generateString($property->name, $annotation, $entity);
                     $property->setValue($entity, $string);
                 }
             }
         }
     }
 
     /**
-     * @param $property
+     * @param string              $property
      * @param GeneratorAnnotation $annotation
-     * @param \ReflectionObject $object
+     * @param object              $entity
+     *
      * @return string
      */
-    private function generateString($property, GeneratorAnnotation $annotation, $object)
+    private function generateString($property, GeneratorAnnotation $annotation, $entity)
     {
         /** @var GeneratorInterface|ConfigurableGeneratorInterface $generator */
         $generator = $this->getRegistry()->get($annotation->generator);
 
         $generator->setLength($annotation->length);
 
         if(!empty($annotation->callbacks)){
-            $this->performCallbacks($generator, $annotation, $object);
+            $this->performCallbacks($generator, $annotation, $entity);
         }
 
         if($generator instanceof ConfigurableGeneratorInterface){
@@ -110,7 +111,7 @@ private function generateString($property, GeneratorAnnotation $annotation, $obj
         }
 
         if ($this->repo->findOneBy([$property => $str])) {
-            return $this->generateString($property, $annotation, $object);
+            return $this->generateString($property, $annotation, $entity);
         } else {
             return $str;
         }
@@ -133,25 +134,26 @@ public function configureGenerator(ConfigurableGeneratorInterface $generator, $o
     }
 
     /**
-     * @param GeneratorInterface $generator
+     * @param GeneratorInterface  $generator
      * @param GeneratorAnnotation $annotation
-     * @param \ReflectionObject $object
+     * @param object              $object
      */
     public function performCallbacks(GeneratorInterface $generator, GeneratorAnnotation $annotation, $object)
     {
         foreach($annotation->callbacks as $callback => $value){
-            if($this->isMethod($generator, $callback)){
-
-                if($this->isMethod($object, $value)){
+            if($this->isMethod($generator, $callback)) {
+                if($this->isMethod($object, $value)) {
                     $value = $object->$value();
                 }
+
                 $generator->$callback($value);
-            }
-            else{
-                throw new \InvalidArgumentException(sprintf(
-                    'Callback "%s" does not exist in class "%s"',
-                    $callback,
-                    get_class($generator))
+            } else {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Callback "%s" does not exist in class "%s"',
+                        $callback,
+                        get_class($generator)
+                    )
                 );
             }
         }