fixed cs, added comments, reverted unrelated changes

zendframework · Dec 11, 2014 · 2187b64 · 2187b64
1 parent f11b0b5
commit 2187b64
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 43 deletions.
diff --git a/module/ZfModule/config/module.config.php b/module/ZfModule/config/module.config.php
@@ -70,17 +70,16 @@
     ),
 
     'view_helpers' => array(
+        'factories' => array(
+            'listModule' => 'ZfModule\View\Helper\ListModuleFactory',
+            'newModule' => 'ZfModule\View\Helper\NewModuleFactory',
+            'totalModules' => 'ZfModule\View\Helper\TotalModulesFactory',
+        ),
         'invokables' => array(
             'moduleView' => 'ZfModule\View\Helper\ModuleView',
             'moduleDescription' => 'ZfModule\View\Helper\ModuleDescription',
             'composerView' => 'ZfModule\View\Helper\ComposerView',
         ),
-        'factories' => array(
-            'listModule' => 'ZfModule\View\Helper\ListModuleFactory',
-            'newModule' => 'ZfModule\View\Helper\NewModuleFactory',
-            'totalModules' => 'ZfModule\View\Helper\TotalModulesFactory',
-
-        )
     ),
     'zfmodule' => array(
         /**

diff --git a/module/ZfModule/src/ZfModule/Service/Module.php b/module/ZfModule/src/ZfModule/Service/Module.php
@@ -9,15 +9,17 @@
 
 class Module extends EventProvider
 {
-    /** @var Mapper\Module */
+    /**
+     * @var Mapper\Module
+     */
     private $moduleMapper;
 
-    /** @var Client */
+    /**
+     * @var Client
+     */
     private $githubClient;
 
     /**
-     * Constructor
-     *
      * @param Mapper\Module $moduleMapper
      * @param Client $githubClient
      */

diff --git a/module/ZfModule/src/ZfModule/Service/ModuleFactory.php b/module/ZfModule/src/ZfModule/Service/ModuleFactory.php
@@ -5,22 +5,20 @@
 use EdpGithub\Client;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use ZfModule\Mapper\Module;
+use ZfModule\Mapper;
 
 class ModuleFactory implements FactoryInterface
 {
     /**
-     * Create Service Instance
-     *
      * @param ServiceLocatorInterface $serviceLocator
-     * @return mixed|Module
+     * @return Module
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        /** @var ModuleMapper $moduleMapper */
+        /* @var Mapper\Module $moduleMapper */
         $moduleMapper = $serviceLocator->get('zfmodule_mapper_module');
 
-        /** @var Client $githubClient */
+        /* @var Client $githubClient */
         $githubClient = $serviceLocator->get('EdpGithub\Client');
 
         return new Module($moduleMapper, $githubClient);

diff --git a/module/ZfModule/src/ZfModule/View/Helper/ComposerView.php b/module/ZfModule/src/ZfModule/View/Helper/ComposerView.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfModule\View\Helper;
 
 use Zend\View\Helper\AbstractHelper;

diff --git a/module/ZfModule/src/ZfModule/View/Helper/ListModule.php b/module/ZfModule/src/ZfModule/View/Helper/ListModule.php
@@ -8,15 +8,17 @@
 
 class ListModule extends AbstractHelper
 {
-    /** @var Mapper\Module */
+    /**
+     * @var Mapper\Module
+     */
     private $moduleMapper;
 
-    /** @var Client */
+    /**
+     * @var Client
+     */
     private $githubClient;
 
     /**
-     * Constructor
-     *
      * @param Mapper\Module $moduleMapper
      * @param Client $githubClient
      */
@@ -40,12 +42,10 @@ public function __invoke($options = null)
 
         //limit modules to only user modules
         if ($user) {
-            $repositories = $this->githubClient->api('current_user')->repos(
-                array(
-                    'type' =>'all',
-                    'per_page' => 100
-                )
-            );
+            $repositories = $this->githubClient->api('current_user')->repos([
+                'type' =>'all',
+                'per_page' => 100
+            ]);
 
             $modules = array();
             foreach ($repositories as $repository) {

diff --git a/module/ZfModule/src/ZfModule/View/Helper/ListModuleFactory.php b/module/ZfModule/src/ZfModule/View/Helper/ListModuleFactory.php
@@ -2,17 +2,32 @@
 
 namespace ZfModule\View\Helper;
 
+use EdpGithub\Client;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\HelperPluginManager;
+use ZfModule\Mapper;
 
 class ListModuleFactory implements FactoryInterface
 {
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    /**
+     * @param ServiceLocatorInterface $helperPluginManager
+     * @return ListModule
+     */
+    public function createService(ServiceLocatorInterface $helperPluginManager)
     {
-        $sm = $serviceLocator->getServiceLocator();
-        $moduleMapper = $sm->get('zfmodule_mapper_module');
-        $githubClient = $sm->get('EdpGithub\Client');
+        /* @var HelperPluginManager $helperPluginManager */
+        $serviceManager = $helperPluginManager->getServiceLocator();
 
-        return new ListModule($moduleMapper, $githubClient);
+        /* @var Mapper\Module $moduleMapper */
+        $moduleMapper = $serviceManager->get('zfmodule_mapper_module');
+
+        /* @var Client $githubClient */
+        $githubClient = $serviceManager->get('EdpGithub\Client');
+
+        return new ListModule(
+            $moduleMapper,
+            $githubClient
+        );
     }
 }
diff --git a/module/ZfModule/src/ZfModule/View/Helper/NewModule.php b/module/ZfModule/src/ZfModule/View/Helper/NewModule.php
@@ -8,12 +8,12 @@
 
 class NewModule extends AbstractHelper
 {
-    /** @var Mapper\Module */
+    /**
+     * @var Mapper\Module
+     */
     private $moduleMapper;
 
     /**
-     * Constructor
-     *
      * @param Mapper\Module $moduleMapper
      */
     public function __construct(Mapper\Module $moduleMapper)
@@ -40,4 +40,14 @@ public function __invoke($options = null)
 
         return $this->getView()->render($vm);
     }
+
+    /**
+     * @param string $viewTemplate
+     * @return NewModules
+     */
+    public function setViewTemplate($viewTemplate)
+    {
+        $this->viewTemplate = $viewTemplate;
+        return $this;
+    }
 }
diff --git a/module/ZfModule/src/ZfModule/View/Helper/NewModuleFactory.php b/module/ZfModule/src/ZfModule/View/Helper/NewModuleFactory.php
@@ -4,13 +4,22 @@
 
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\HelperPluginManager;
+use ZfModule\Mapper;
 
 class NewModuleFactory implements FactoryInterface
 {
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    /**
+     * @param ServiceLocatorInterface $helperPluginManager
+     * @return NewModule
+     */
+    public function createService(ServiceLocatorInterface $helperPluginManager)
     {
-        $sm = $serviceLocator->getServiceLocator();
-        $moduleMapper = $sm->get('zfmodule_mapper_module');
+        /* @var HelperPluginManager $helperPluginManager */
+        $serviceManager = $helperPluginManager->getServiceLocator();
+
+        /* @var Mapper\Module $moduleMapper */
+        $moduleMapper = $serviceManager->get('zfmodule_mapper_module');
 
         return new NewModule($moduleMapper);
     }

diff --git a/module/ZfModule/src/ZfModule/View/Helper/TotalModules.php b/module/ZfModule/src/ZfModule/View/Helper/TotalModules.php
@@ -7,7 +7,9 @@
 
 class TotalModules extends AbstractHelper
 {
-    /** @var Mapper\Module */
+    /**
+     * @var Mapper\Module
+     */
     private $moduleMapper;
 
     /**
@@ -16,8 +18,6 @@ class TotalModules extends AbstractHelper
     protected $total;
 
     /**
-     * Constructor
-     *
      * @param Mapper\Module $moduleMapper
      */
     public function __construct(Mapper\Module $moduleMapper)

diff --git a/module/ZfModule/src/ZfModule/View/Helper/TotalModulesFactory.php b/module/ZfModule/src/ZfModule/View/Helper/TotalModulesFactory.php
@@ -4,13 +4,22 @@
 
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\HelperPluginManager;
+use ZfModule\Mapper;
 
 class TotalModulesFactory implements FactoryInterface
 {
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    /**
+     * @param ServiceLocatorInterface $helperPluginManager
+     * @return TotalModules
+     */
+    public function createService(ServiceLocatorInterface $helperPluginManager)
     {
-        $sm = $serviceLocator->getServiceLocator();
-        $moduleMapper = $sm->get('zfmodule_mapper_module');
+        /* @var HelperPluginManager $helperPluginManager */
+        $serviceManager = $helperPluginManager->getServiceLocator();
+
+        /* @var Mapper\Module $moduleMapper */
+        $moduleMapper = $serviceManager->get('zfmodule_mapper_module');
 
         return new TotalModules($moduleMapper);
     }