[Jobs] moves factory classes into the factory directory. Removed unus…

…ed code
cross-solution · Mar 15, 2015 · 968244e · 968244e
1 parent 836109f
commit 968244e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 58 deletions.
diff --git a/module/Jobs/config/module.config.php b/module/Jobs/config/module.config.php
@@ -150,7 +150,7 @@
         ),
         'factories' => array(
             'Jobs/Options'                                => 'Jobs\Factory\ModuleOptionsFactory',
-            'Jobs\Form\Hydrator\OrganizationNameHydrator' => '\Jobs\Form\Hydrator\SLFactory\OrganizationNameHydratorSLFactory',
+            'Jobs\Form\Hydrator\OrganizationNameHydrator' => 'Jobs\Factory\Form\Hydrator\OrganizationNameHydratorFactory',
             'Jobs/JsonJobsEntityHydrator'                 => 'Jobs\Entity\Hydrator\JsonJobsEntityHydratorFactory',
             'Jobs/RestClient'                             => 'Jobs\Factory\Service\JobsPublisherFactory',
         )
@@ -208,16 +208,16 @@
             'Jobs/Description'                  => 'Jobs\Form\JobDescription',
             'Jobs/JobDescriptionFieldset'       => 'Jobs\Form\JobDescriptionFieldset',
             'Jobs/ApplyId'                      => 'Jobs\Form\ApplyIdentifierElement',
-            'Jobs/Import'                       => '\Jobs\Form\Import',
-            'Jobs/ImportFieldset'               => '\Jobs\Form\ImportFieldset',
-            'Jobs/ListFilter'                   => '\Jobs\Form\ListFilter',
+            'Jobs/Import'                       => 'Jobs\Form\Import',
+            'Jobs/ImportFieldset'               => 'Jobs\Form\ImportFieldset',
+            'Jobs/ListFilter'                   => 'Jobs\Form\ListFilter',
             'Jobs/ListFilterFieldset'           => 'Jobs\Form\ListFilterFieldset',
-            'Jobs/JobDescriptionDescription'    => '\Jobs\Form\JobDescriptionDescription',
-            'Jobs/JobDescriptionBenefits'       => '\Jobs\Form\JobDescriptionBenefits',
-            'Jobs/JobDescriptionRequirements'   => '\Jobs\Form\JobDescriptionRequirements',
-            'Jobs/JobDescriptionQualifications' => '\Jobs\Form\JobDescriptionQualifications',
-            'Jobs/JobDescriptionTitle'          => '\Jobs\Form\JobDescriptionTitle',
-            'Jobs/Description/Template'         => '\Jobs\Form\JobDescriptionTemplate',
+            'Jobs/JobDescriptionDescription'    => 'Jobs\Form\JobDescriptionDescription',
+            'Jobs/JobDescriptionBenefits'       => 'Jobs\Form\JobDescriptionBenefits',
+            'Jobs/JobDescriptionRequirements'   => 'Jobs\Form\JobDescriptionRequirements',
+            'Jobs/JobDescriptionQualifications' => 'Jobs\Form\JobDescriptionQualifications',
+            'Jobs/JobDescriptionTitle'          => 'Jobs\Form\JobDescriptionTitle',
+            'Jobs/Description/Template'         => 'Jobs\Form\JobDescriptionTemplate',
             'Jobs/Preview'                      => 'Jobs\Form\Preview',
             'Jobs/PreviewFieldset'              => 'Jobs\Form\PreviewFieldset',
             'Jobs/PreviewLink'                  => 'Jobs\Form\PreviewLink',
@@ -228,16 +228,16 @@
             'Jobs/MultipostElement'             => 'Jobs\Form\MultipostElement',
         ),
         'factories' => array(
-            'jobs/ListFilterFieldsetExtended' => 'Jobs\Form\ListFilterFieldsetExtendedFactory',
-            'Jobs/CompanyNameFieldset' => 'Jobs\Form\SLFactory\CompanyNameFieldsetSLFactory',
+            'Jobs/ListFilterFieldsetExtended'   => 'Jobs\Factory\Form\ListFilterFieldsetExtendedFactory',
+            'Jobs/CompanyNameFieldset'          => 'Jobs\Factory\Form\CompanyNameFieldsetFactory',
         )
     ),
 
     'input_filters' => array(
         'invokables' => array(
-            'Jobs/Location/New'  => 'Jobs\Form\InputFilter\JobLocationNew',
-            'Jobs/Location/Edit' => 'Jobs\Form\InputFilter\JobLocationEdit',
-            'Jobs/Company' => 'Jobs\Form\InputFilter\CompanyName',
+            'Jobs/Location/New'                 => 'Jobs\Form\InputFilter\JobLocationNew',
+            'Jobs/Location/Edit'                => 'Jobs\Form\InputFilter\JobLocationEdit',
+            'Jobs/Company'                      => 'Jobs\Form\InputFilter\CompanyName',
         ),
     ),
 

diff --git a/...LFactory/CompanyNameFieldsetSLFactory.php → ...ctory/Form/CompanyNameFieldsetFactory.php b/...LFactory/CompanyNameFieldsetSLFactory.php → ...ctory/Form/CompanyNameFieldsetFactory.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Jobs\Form\SLFactory;
+namespace Jobs\Factory\Form;
 
 use Jobs\Form\CompanyNameFieldset;
 use Jobs\Form\Hydrator\OrganizationNameHydrator;
 use Zend\Form\FormElementManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-class CompanyNameFieldsetSLFactory implements FactoryInterface
+class CompanyNameFieldsetFactory implements FactoryInterface
 {
     /**
      * Create service

diff --git a/...ory/OrganizationNameHydratorSLFactory.php → ...rator/OrganizationNameHydratorFactory.php b/...ory/OrganizationNameHydratorSLFactory.php → ...rator/OrganizationNameHydratorFactory.php
@@ -7,18 +7,18 @@
  * @license   MIT
   */
 
-namespace Jobs\Form\Hydrator\SLFactory;
+namespace Jobs\Factory\Form\Hydrator;
 
 use Jobs\Form\Hydrator\OrganizationNameHydrator;
 use Organizations\Repository\Organization;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
- * Class OrganizationNameHydratorSLFactory
- * @package Jobs\Form\Hydrator\SLFactory
+ * Class OrganizationNameHydratorFactory
+ * @package Jobs\Factory\Form\Hydrator
  */
-class OrganizationNameHydratorSLFactory implements FactoryInterface
+class OrganizationNameHydratorFactory implements FactoryInterface
 {
     /**
      * Create service

diff --git a/...orm/ListFilterFieldsetExtendedFactory.php → ...orm/ListFilterFieldsetExtendedFactory.php b/...orm/ListFilterFieldsetExtendedFactory.php → ...orm/ListFilterFieldsetExtendedFactory.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Jobs\Form;
+namespace Jobs\Factory\Form;
 
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Jobs\Form\ListFilterFieldset;
 
 /**
  * Factory for the job opening search formular fields
@@ -21,5 +22,4 @@ public function createService (ServiceLocatorInterface $serviceLocator)
         $fieldset = new ListFilterFieldset(true);
         return $fieldset;
     }
-
-}
+}
diff --git a/module/Jobs/src/Jobs/Form/ListFilterFactory.php b/module/Jobs/src/Jobs/Form/ListFilterFactory.php
diff --git a/module/Jobs/src/Jobs/Form/ListFilterFieldset.php b/module/Jobs/src/Jobs/Form/ListFilterFieldset.php
@@ -21,6 +21,11 @@
  */
 class ListFilterFieldset extends Fieldset
 {
+    /**
+     * Show my jobs, all jobs and job status filter
+     *
+     * @var bool
+     */
     protected $isExtended;
 
     public function __construct($extended = false)
@@ -79,7 +84,10 @@ public function init()
             ),
         ));
     }
-
+
+    /**
+     * @param FormInterface $form
+     */
     public function prepareElement(FormInterface $form)
     {
         foreach ($this->byName as $elementOrFieldset) {
@@ -90,4 +98,3 @@ public function prepareElement(FormInterface $form)
         }
     }
 }
-
diff --git a/...OrganizationNameHydratorSLFactoryTest.php → ...OrganizationNameHydratorSLFactoryTest.php b/...OrganizationNameHydratorSLFactoryTest.php → ...OrganizationNameHydratorSLFactoryTest.php
@@ -7,21 +7,21 @@
  * @license       MIT
  */
 
-namespace JobsTest\Form\Hydrator\SLFactory;
+namespace JobsTest\Factory\Form\Hydrator;
 
-use Jobs\Form\Hydrator\SLFactory\OrganizationNameHydratorSLFactory;
+use Jobs\Factory\Form\Hydrator\OrganizationNameHydratorFactory;
 use Test\Bootstrap;
 
-class OrganizationNameHydratorSLFactoryTest extends \PHPUnit_Framework_TestCase
+class OrganizationNameHydratorFactoryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var OrganizationNameHydratorSLFactory
+     * @var OrganizationNameHydratorFactory
      */
     private $testedObj;
 
     public function setUp()
     {
-        $this->testedObj = new OrganizationNameHydratorSLFactory();
+        $this->testedObj = new OrganizationNameHydratorFactory();
     }
 
     public function testCreateService()