Separate generator into its own class

Author: Robin Cawser

EventListener/IdGeneratorListener.php

@@ -5,6 +5,8 @@
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Vivait\StringGeneratorBundle\Annotation as Vivait;
+use Vivait\StringGeneratorBundle\Generator\StringGenerator;
+use Vivait\StringGeneratorBundle\Model\StringGeneratorInterface;
 
 class IdGeneratorListener
 {
@@ -56,7 +58,12 @@ public function prePersist(LifecycleEventArgs $args)
      */
     private function generateId($property, Vivait\StringGenerator $annotation)
     {
-        $id = $this->createId($annotation->alphabet, $annotation->length);
+        $generator = new StringGenerator();
+        $generator
+            ->setAlphabet($annotation->alphabet)
+            ->setLength($annotation->length);
+
+        $id = $$this->generator->generate();
 
         if ($annotation->prefix) {
             $id = sprintf("%s%s%s", $annotation->prefix, $annotation->separator, $id);
@@ -69,20 +76,5 @@ private function generateId($property, Vivait\StringGenerator $annotation)
         }
     }
 
-    /**
-     * @param $alphabet
-     * @param $length
-     * @return string
-     */
-    private function createId($alphabet, $length)
-    {
-        $id = [];
-        $alphaLength = strlen($alphabet) - 1;
-        for ($i = 0; $i < $length; $i++) {
-            $n = rand(0, $alphaLength);
-            $id[] = $alphabet[$n];
-        }
 
-        return implode($id);
-    }
 } 

Generator/StringGenerator.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Vivait\StringGeneratorBundle\Generator;
+
+use Vivait\StringGeneratorBundle\Model\StringGeneratorInterface;
+
+class StringGenerator implements StringGeneratorInterface
+{
+
+    private $alphabet;
+    private $length;
+
+    public function setAlphabet($alphabet)
+    {
+        $this->alphabet = $alphabet;
+        return $this;
+    }
+
+    public function setLength($length)
+    {
+        $this->length = $length;
+        return $this;
+    }
+
+    public function generate()
+    {
+        $str = [];
+        $alphaLength = strlen($this->alphabet) - 1;
+        for ($i = 0; $i < $$this->length; $i++) {
+            $n = rand(0, $alphaLength);
+            $str[] = $this->alphabet[$n];
+        }
+
+        return implode($str);
+    }
+}

Model/StringGeneratorInterface.php

@@ -2,12 +2,23 @@
 
 namespace Vivait\StringGeneratorBundle\Model;
 
-interface StringGeneratorInterface {
+interface StringGeneratorInterface
+{
+
+    /**
+     * @param $alphabet
+     * @return $this
+     */
+    public function setAlphabet($alphabet);
+
+    /**
+     * @param $length
+     * @return $this
+     */
+    public function setLength($length);
 
     /**
-     * Creates a random string
-     *
      * @return string
      */
-    public static function generate();
+    public function generate();
 }