Merge pull request #1 from fagundes/develop

Prepare to 0.1.6
fagundes · Mar 16, 2016 · 686aa42 · 686aa42
2 parents 6681a31 + 925f306
commit 686aa42
Show file tree

Hide file tree

Showing 14 changed files with 161 additions and 47 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -82,7 +82,8 @@
         'abstract_factories' => [
             Form\FormAbstractFactory::class,
             Form\InputFilterAbstractFactory::class,
-            Service\ServiceAbstractFactory::class
+            Service\ServiceAbstractFactory::class,
+            Controller\ControllerAbstractFactory::class,
         ],
     ],
 ];
diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php
@@ -23,6 +23,32 @@ class AbstractController extends AbstractActionController
      */
     private $postedData;
 
+    /**
+     * @var array
+     */
+    protected $forms;
+
+    /**
+     * @var array
+     */
+    protected $services;
+
+    /**
+     * @return array list of forms's names
+     */
+    public function getForms()
+    {
+        return $this->forms;
+    }
+
+    /**
+     * @return array list of service's names
+     */
+    public function getServices()
+    {
+        return $this->services;
+    }
+
     protected function getPostedData()
     {
         if (is_null($this->postedData)) {

diff --git a/src/Controller/ControllerAbstractFactory.php b/src/Controller/ControllerAbstractFactory.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: vinicius
+ * Date: 15/03/16
+ * Time: 21:43
+ */
+
+namespace Zff\Base\Controller;
+
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class ControllerAbstractFactory implements AbstractFactoryInterface
+{
+    public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        if (class_exists($requestedName)) {
+            $reflect = new \ReflectionClass($requestedName);
+            if ($reflect->isSubclassOf(AbstractController::class)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function createServiceWithName(
+        ServiceLocatorInterface $serviceLocator,
+        $name,
+        $requestedName
+    ) {
+
+        if ($this->canCreateServiceWithName($serviceLocator, $name, $requestedName)) {
+            $reflect = new \ReflectionClass($requestedName);
+            $controller = $reflect->newInstance();
+
+            $forms = (array)$controller->getForms();
+            foreach ($forms as $customFormName => $formName) {
+                $this->loadForm($serviceLocator, $controller, $formName, $customFormName);
+            }
+
+            $services = (array)$controller->getServices();
+            foreach ($services as $customServiceName => $serviceName) {
+                $this->loadService($serviceLocator, $controller, $serviceName, $customServiceName);
+            }
+
+            return $controller;
+        }
+
+        return null;
+    }
+
+    protected function loadService(
+        ServiceLocatorInterface $serviceLocator,
+        AbstractController $controller,
+        $serviceNeededName,
+        $customServiceName
+    ) {
+
+        if (is_int($customServiceName)) {
+            $simpleServiceName = preg_replace('/(.*)\\\/', '', $serviceNeededName);
+        } else {
+            $simpleServiceName = ucfirst($customServiceName);
+        }
+
+        $methodSet = 'set' . $simpleServiceName . 'Service';
+
+        if (!method_exists($controller, $methodSet)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    'Expected method %s::%s, to set the service %s.',
+                    get_class($controller),
+                    $methodSet,
+                    $serviceNeededName
+                )
+            );
+        }
+
+        $serviceNeeded = $serviceLocator->get($serviceNeededName);
+        call_user_func([$controller,$methodSet], $serviceNeeded);
+    }
+
+    protected function loadForm(
+        ServiceLocatorInterface $serviceLocator,
+        AbstractController $controller,
+        $formNeededName,
+        $customFormName
+    ) {
+
+        if (is_int($customFormName)) {
+            $simpleServiceName = preg_replace('/(.*)\\\/', '', $formNeededName);
+        } else {
+            $simpleServiceName = ucfirst($customFormName);
+        }
+
+        $methodSet = 'set' . $simpleServiceName . 'Form';
+
+        if (!method_exists($controller, $methodSet)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    'Expected method %s::%s, to set the form %s.',
+                    get_class($controller),
+                    $methodSet,
+                    $formNeededName
+                )
+            );
+        }
+
+        $serviceNeeded = $serviceLocator->get($formNeededName);
+        call_user_func([$controller,$methodSet], $serviceNeeded);
+    }
+}
diff --git a/src/Entity/AbstractEntity.php b/src/Entity/AbstractEntity.php
@@ -29,5 +29,4 @@ public function exchangeArray($data)
     {
         $this->configure($data);
     }
-
 }
diff --git a/src/Hydrator/DoctrineObject.php b/src/Hydrator/DoctrineObject.php
@@ -54,7 +54,7 @@ protected function handleTypeConversions($value, $typeOfField)
                     $dateTime->setTimestamp($value);
                     $value = $dateTime;
                 } elseif (is_string($value)) {
-                    $value = $this->getDateFormat() ? 
+                    $value = $this->getDateFormat() ?
                         \DateTime::createFromFormat($this->getDateFormat(), $value) :
                         new DateTime($value);
                 }
@@ -65,4 +65,4 @@ protected function handleTypeConversions($value, $typeOfField)
 
         return $value;
     }
-}
+}
diff --git a/src/Module.php b/src/Module.php
@@ -63,4 +63,4 @@ public function getViewHelperConfig()
             ],
         ];
     }
-}
+}
diff --git a/src/Service/AbstractService.php b/src/Service/AbstractService.php
@@ -428,8 +428,8 @@ public function getPaginator(
         $currentPageNumber = null,
         $itemCountPerPage
         = null
-    )
-    {
+    ) {
+
 
         $this->setPagination($currentPageNumber, $itemCountPerPage);
         $query->setFirstResult($this->firstResult)

diff --git a/src/Service/ServiceAbstractFactory.php b/src/Service/ServiceAbstractFactory.php
@@ -47,10 +47,7 @@ public function createServiceWithName(
 
             $dbAdapter = $serviceLocator->get($service->getDbAdapterName());
             $service->setDbAdapter($dbAdapter);
-            /**
-             * @todo lazy load here, table handler recebe o nome default mais
-             * nao instancia os servicos o mesmo com service
-             */
+
             $tableHandler = $serviceLocator->get(Table\TableHandler::class);
             $tableHandler->setEntityManager($entityManager);
             $tableHandler->setDbAdapter($dbAdapter);
@@ -84,7 +81,7 @@ protected function loadService(
         if (!method_exists($service, $methodSet)) {
             throw new \InvalidArgumentException(
                 sprintf(
-                    'Espera-se o metodo %s::%s, para carregar o serviço %s.',
+                    'Expected method %s::%s, to set the service %s.',
                     get_class($service),
                     $methodSet,
                     $serviceNeededName

diff --git a/src/Service/Table/TableHandler.php b/src/Service/Table/TableHandler.php
@@ -7,12 +7,10 @@
 
 namespace Zff\Base\Service\Table;
 
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\Stdlib\Parameters;
 use ZfTable\AbstractTable;
 
-class TableHandler implements ServiceLocatorAwareInterface
+class TableHandler
 {
 
     /**
@@ -25,29 +23,11 @@ class TableHandler implements ServiceLocatorAwareInterface
      */
     protected $dbAdapter;
 
-    /**
-     * @var ServiceLocatorInterface
-     */
-    protected $serviceLocator;
-
-    public function getServiceLocator()
-    {
-        return $this->serviceLocator;
-    }
-
-    public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
-    {
-        $this->serviceLocator = $serviceLocator;
-    }
-
     /**
      * @return \Zend\Db\Adapter\Adapter
      */
     public function getDbAdapter()
     {
-        if (!$this->dbAdapter) {
-            $this->dbAdapter = $this->getServiceLocator()->get('zfdb_adapter');
-        }
         return $this->dbAdapter;
     }
 
@@ -62,10 +42,7 @@ public function setDbAdapter(\Zend\Db\Adapter\Adapter $dbAdapter)
      */
     public function getEntityManager()
     {
-        if (!$this->em) {
-            $this->em = $this->getServiceLocator()->get('doctrine.entitymanager.orm_default');
-        }
-        return $this->em;
+        return $this->entityManager;
     }
 
     public function setEntityManager(\Doctrine\ORM\EntityManager $entityManager)

diff --git a/src/Util/File.php b/src/Util/File.php
@@ -28,7 +28,7 @@ class File
 
     public static function rmdirRecursive($dir)
     {
-        if(!file_exists($dir)) {
+        if (!file_exists($dir)) {
             return;
         }
 

diff --git a/src/Util/FileMoverTrait.php b/src/Util/FileMoverTrait.php
@@ -87,4 +87,4 @@ protected function updateFile(&$oldFilePath, $newFileSourceInfo, $newFileDestPat
             $this->moveFile($oldFilePath, $newFileSourceInfo, $newFileDestPath);
         }
     }
-}
+}
diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -34,7 +34,8 @@ public function testConfig()
         $this->assertEquals($configArr, $this->module->getConfig());
     }
 
-    public function testAutoloader() {
+    public function testAutoloader()
+    {
         $this->assertNotEmpty($this->module->getAutoloaderConfig());
     }
-}
+}
diff --git a/test/Util/Assets/ConfigurableClass.php b/test/Util/Assets/ConfigurableClass.php
@@ -91,5 +91,4 @@ public function setZ($z)
         $this->z = $z;
         return $this;
     }
-
-}
+}
diff --git a/test/Util/Assets/FileMoverClass.php b/test/Util/Assets/FileMoverClass.php
@@ -91,14 +91,15 @@ public function moveAllFiles()
         $this->moveFile($this->filepathTwo, $this->filepathTwoInfo, 'test/data/upload/otherplace');
     }
 
-    public function removeAllFiles() {
+    public function removeAllFiles()
+    {
         $this->removeFile($this->filepathOne);
         $this->removeFile($this->filepathTwo);
     }
 
-    public function updateAllFiles() {
+    public function updateAllFiles()
+    {
         $this->updateFile($this->filepathOne, $this->filepathOneInfo, 'test/data/upload');
         $this->updateFile($this->filepathTwo, $this->filepathTwoInfo, 'test/data/upload/otherplace');
     }
-
-}
+}