From 957028dc0cf73d04196be6f20a43572a78544242 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 15 Mar 2016 23:35:27 +0100 Subject: [PATCH] updated CS removed invokable from view-helper and form --- composer.json | 1 + config/module.config.php | 4 +- .../Entity/Repository/TicketSubject.php | 5 +- src/ZfcTicketSystem/Entity/TicketEntry.php | 2 +- src/ZfcTicketSystem/Entity/TicketSubject.php | 6 +- .../Form/AdminTicketCategory.php | 52 ++++----- .../Form/AdminTicketCategoryFilter.php | 48 ++++---- src/ZfcTicketSystem/Form/TicketEntry.php | 25 ++--- .../Form/TicketEntryFilter.php | 18 +-- src/ZfcTicketSystem/Form/TicketSystem.php | 67 ++++++------ .../Form/TicketSystemFilter.php | 103 +++++++----------- .../Mapper/HydratorTicketCategory.php | 2 +- .../Mapper/HydratorTicketEntry.php | 2 +- .../Mapper/HydratorTicketSubject.php | 2 +- src/ZfcTicketSystem/Module.php | 33 ++++-- src/ZfcTicketSystem/Service/TicketSystem.php | 2 +- .../View/Helper/InvokerBase.php | 41 ------- .../View/Helper/NewTicketWidget.php | 23 ++-- .../View/Helper/TicketStatus.php | 3 +- 19 files changed, 201 insertions(+), 238 deletions(-) delete mode 100644 src/ZfcTicketSystem/View/Helper/InvokerBase.php diff --git a/composer.json b/composer.json index 344f676..8d85edd 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "zendframework/zend-loader": "~2.5", "zendframework/zend-config": "~2.5", "zendframework/zend-view": "~2.5", + "zendframework/zend-http": "~2.5", "zendframework/zend-serializer": "~2.5", "zendframework/zend-log": "~2.5", "zendframework/zend-i18n": "~2.5", diff --git a/config/module.config.php b/config/module.config.php index 3ea13f8..85e562b 100644 --- a/config/module.config.php +++ b/config/module.config.php @@ -35,10 +35,10 @@ ], ], 'service_manager' => [ - 'invokables' => array( + 'invokables' => [ 'zfcticketsystem_ticketsystem_service' => 'ZfcTicketSystem\Service\TicketSystem', 'zfcticketsystem_category_service' => 'ZfcTicketSystem\Service\Category', - ), + ], ], 'controllers' => [ 'invokables' => [ diff --git a/src/ZfcTicketSystem/Entity/Repository/TicketSubject.php b/src/ZfcTicketSystem/Entity/Repository/TicketSubject.php index 2279a63..9fc967b 100644 --- a/src/ZfcTicketSystem/Entity/Repository/TicketSubject.php +++ b/src/ZfcTicketSystem/Entity/Repository/TicketSubject.php @@ -43,7 +43,10 @@ public function getTicketSubject4Admin($ticketId) } /** - * @return \ZfcTicketSystem\Entity\TicketSubject|null + * @param $userId + * @param $ticketId + * @return null|\ZfcTicketSystem\Entity\TicketSubject + * @throws \Doctrine\ORM\NonUniqueResultException */ public function getTicket4UserId($userId, $ticketId) { diff --git a/src/ZfcTicketSystem/Entity/TicketEntry.php b/src/ZfcTicketSystem/Entity/TicketEntry.php index 1a611fd..b86ae26 100644 --- a/src/ZfcTicketSystem/Entity/TicketEntry.php +++ b/src/ZfcTicketSystem/Entity/TicketEntry.php @@ -2,8 +2,8 @@ namespace ZfcTicketSystem\Entity; -use SmallUser\Entity\UserInterface; use Doctrine\ORM\Mapping as ORM; +use SmallUser\Entity\UserInterface; /** * TicketEntry diff --git a/src/ZfcTicketSystem/Entity/TicketSubject.php b/src/ZfcTicketSystem/Entity/TicketSubject.php index 53414d1..b1f0ba3 100644 --- a/src/ZfcTicketSystem/Entity/TicketSubject.php +++ b/src/ZfcTicketSystem/Entity/TicketSubject.php @@ -2,9 +2,9 @@ namespace ZfcTicketSystem\Entity; -use SmallUser\Entity\UserInterface; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; +use SmallUser\Entity\UserInterface; /** * TicketSubject @@ -230,7 +230,7 @@ public function getLastEdit() /** * Set ticketCategory - * @param TicketEntry $ticketCategory + * @param TicketEntry $ticketEntry * @return $this */ public function addTicketEntry(TicketEntry $ticketEntry = null) diff --git a/src/ZfcTicketSystem/Form/AdminTicketCategory.php b/src/ZfcTicketSystem/Form/AdminTicketCategory.php index 00f1103..11d133e 100644 --- a/src/ZfcTicketSystem/Form/AdminTicketCategory.php +++ b/src/ZfcTicketSystem/Form/AdminTicketCategory.php @@ -12,59 +12,59 @@ class AdminTicketCategory extends ProvidesEventsForm public function __construct() { parent::__construct(); - $this->add(array( + $this->add([ 'type' => 'Zend\Form\Element\Csrf', 'name' => 'dfhs5ghrth3e4zn43ezj' - )); + ]); - $this->add(array( + $this->add([ 'name' => 'subject', - 'options' => array( + 'options' => [ 'label' => 'Subject', - ), - 'attributes' => array( + ], + 'attributes' => [ 'placeholder' => 'Subject', 'class' => 'form-control', - ), - )); + ], + ]); - $this->add(array( + $this->add([ 'name' => 'sort_key', - 'options' => array( + 'options' => [ 'label' => 'Sortkey', - ), - 'attributes' => array( + ], + 'attributes' => [ 'placeholder' => 'Sortkey', 'class' => 'form-control', - ), - )); + ], + ]); - $this->add(array( + $this->add([ 'name' => 'active', 'type' => 'Zend\Form\Element\Select', - 'options' => array( + 'options' => [ 'label' => 'Active', - 'value_options' => array( + 'value_options' => [ 0 => 'deactive', 1 => 'active', - ), - ), - 'attributes' => array( + ], + ], + 'attributes' => [ 'placeholder' => 'Active', 'class' => 'form-control', - ), - )); + ], + ]); $submitElement = new Element\Button('submit'); $submitElement ->setLabel('Submit') - ->setAttributes(array( + ->setAttributes([ 'class' => 'btn btn-default', 'type' => 'submit', - )); + ]); - $this->add($submitElement, array( + $this->add($submitElement, [ 'priority' => -100, - )); + ]); } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Form/AdminTicketCategoryFilter.php b/src/ZfcTicketSystem/Form/AdminTicketCategoryFilter.php index c16632c..4d3e78e 100644 --- a/src/ZfcTicketSystem/Form/AdminTicketCategoryFilter.php +++ b/src/ZfcTicketSystem/Form/AdminTicketCategoryFilter.php @@ -9,42 +9,42 @@ class AdminTicketCategoryFilter extends ProvidesEventsInputFilter { public function __construct() { - $this->add(array( + $this->add([ 'name' => 'subject', 'required' => true, - 'filters' => array(array('name' => 'StringTrim')), - 'validators' => array( - array( + 'filters' => [['name' => 'StringTrim']], + 'validators' => [ + [ 'name' => 'StringLength', - 'options' => array( + 'options' => [ 'min' => 1, 'max' => 200, - ), - ), - ), - )); + ], + ], + ], + ]); - $this->add(array( + $this->add([ 'name' => 'sort_key', 'required' => false, - 'validators' => array( - array( + 'validators' => [ + [ 'name' => 'IsInt', - ), - ), - )); + ], + ], + ]); - $this->add(array( + $this->add([ 'name' => 'active', 'required' => true, - 'validators' => array( - array( + 'validators' => [ + [ 'name' => 'InArray', - 'options' => array( - 'haystack' => array(0, 1), - ), - ), - ), - )); + 'options' => [ + 'haystack' => [0, 1], + ], + ], + ], + ]); } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Form/TicketEntry.php b/src/ZfcTicketSystem/Form/TicketEntry.php index 8a1518e..fc49ea5 100644 --- a/src/ZfcTicketSystem/Form/TicketEntry.php +++ b/src/ZfcTicketSystem/Form/TicketEntry.php @@ -2,7 +2,6 @@ namespace ZfcTicketSystem\Form; -use Zend\Form\Form; use Zend\Form\Element; use ZfcBase\Form\ProvidesEventsForm; @@ -12,33 +11,33 @@ class TicketEntry extends ProvidesEventsForm public function __construct() { parent::__construct(); - $this->add(array( + $this->add([ 'type' => 'Zend\Form\Element\Csrf', 'name' => 'fdh456eh56ujzum45zkuik45zhrh' - )); + ]); - $this->add(array( + $this->add([ 'name' => 'memo', 'type' => 'Zend\Form\Element\Textarea', - 'options' => array( + 'options' => [ 'label' => 'Memo', - ), - 'attributes' => array( + ], + 'attributes' => [ 'placeholder' => 'Memo', 'class' => 'form-control', - ), - )); + ], + ]); $submitElement = new Element\Button('submit'); $submitElement ->setLabel('Submit') - ->setAttributes(array( + ->setAttributes([ 'class' => 'btn btn-primary', 'type' => 'submit', - )); + ]); - $this->add($submitElement, array( + $this->add($submitElement, [ 'priority' => -100, - )); + ]); } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Form/TicketEntryFilter.php b/src/ZfcTicketSystem/Form/TicketEntryFilter.php index 7eb0d5b..52e2012 100644 --- a/src/ZfcTicketSystem/Form/TicketEntryFilter.php +++ b/src/ZfcTicketSystem/Form/TicketEntryFilter.php @@ -9,19 +9,19 @@ class TicketEntryFilter extends ProvidesEventsInputFilter public function __construct() { - $this->add(array( + $this->add([ 'name' => 'memo', 'required' => true, - 'filters' => array(array('name' => 'StringTrim')), - 'validators' => array( - array( + 'filters' => [['name' => 'StringTrim']], + 'validators' => [ + [ 'name' => 'StringLength', - 'options' => array( + 'options' => [ 'min' => 3, - ), - ), - ), - )); + ], + ], + ], + ]); } diff --git a/src/ZfcTicketSystem/Form/TicketSystem.php b/src/ZfcTicketSystem/Form/TicketSystem.php index eb5fd6b..998ea5d 100644 --- a/src/ZfcTicketSystem/Form/TicketSystem.php +++ b/src/ZfcTicketSystem/Form/TicketSystem.php @@ -2,75 +2,78 @@ namespace ZfcTicketSystem\Form; -use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Form\Form; +use Doctrine\ORM\EntityManager; use Zend\Form\Element; use ZfcBase\Form\ProvidesEventsForm; +use ZfcTicketSystem\Options\EntityOptions; class TicketSystem extends ProvidesEventsForm { /** - * @param ServiceLocatorInterface $serviceLocator + * TicketSystem constructor. + * @param EntityManager $entityManager + * @param EntityOptions $entityOptions */ - public function __construct(ServiceLocatorInterface $serviceLocator) + public function __construct(EntityManager $entityManager, EntityOptions $entityOptions) { parent::__construct(); - $this->add(array( + + $this->add([ 'type' => 'Zend\Form\Element\Csrf', 'name' => 'fdh456eh56ujzum45zkuik45zhrh' - )); + ]); - $this->add(array( + $this->add([ 'name' => 'subject', - 'options' => array( + 'options' => [ 'label' => 'Subject', - ), - 'attributes' => array( + ], + 'attributes' => [ 'placeholder' => 'Subject', 'class' => 'form-control', 'type' => 'text' - ), - )); - $this->add(array( + ], + ]); + $this->add([ 'name' => 'categoryId', 'type' => 'DoctrineModule\Form\Element\ObjectSelect', - 'options' => array( - 'object_manager' => $serviceLocator->get('Doctrine\ORM\EntityManager'), - 'target_class' => $serviceLocator->get('zfcticketsystem_entry_options')->getTicketCategory(), + 'options' => [ + 'object_manager' => $entityManager, + 'target_class' => $entityOptions->getTicketCategory(), 'property' => 'subject', 'label' => 'Category', 'empty_option' => '-- select --', 'is_method' => true, - 'find_method' => array( + 'find_method' => [ 'name' => 'getActiveCategory', - ), - ), - 'attributes' => array( + ], + ], + 'attributes' => [ 'class' => 'form-control', - ), - )); - $this->add(array( + ], + ]); + $this->add([ 'name' => 'memo', 'type' => 'Zend\Form\Element\Textarea', - 'options' => array( + 'options' => [ 'label' => 'Memo', - ), - 'attributes' => array( + ], + 'attributes' => [ 'placeholder' => 'Memo', 'class' => 'form-control', - ), - )); + ], + ]); $submitElement = new Element\Button('submit'); $submitElement ->setLabel('Submit') - ->setAttributes(array( + ->setAttributes([ 'class' => 'btn btn-primary', 'type' => 'submit', - )); + ]); - $this->add($submitElement, array( + $this->add($submitElement, [ 'priority' => -100, - )); + ]); } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Form/TicketSystemFilter.php b/src/ZfcTicketSystem/Form/TicketSystemFilter.php index 6d34604..56ae433 100644 --- a/src/ZfcTicketSystem/Form/TicketSystemFilter.php +++ b/src/ZfcTicketSystem/Form/TicketSystemFilter.php @@ -2,76 +2,67 @@ namespace ZfcTicketSystem\Form; +use Doctrine\ORM\EntityManager; use ZfcBase\InputFilter\ProvidesEventsInputFilter; -use Zend\ServiceManager\ServiceLocatorInterface; +use ZfcTicketSystem\Options\EntityOptions; class TicketSystemFilter extends ProvidesEventsInputFilter { /** - * @var ServiceLocatorInterface + * @var EntityManager */ - protected $serviceManager; + protected $entityManager; /** - * @var \Doctrine\ORM\EntityManager + * @var EntityOptions */ - protected $entityManager; + protected $entityOptions; - public function __construct(ServiceLocatorInterface $serviceManager) + public function __construct(EntityManager $entityManager, EntityOptions $entityOptions) { - $this->setServiceManager($serviceManager); + $this->entityManager = $entityManager; + $this->entityOptions = $entityOptions; - $this->add(array( + $this->add([ 'name' => 'subject', 'required' => true, - 'filters' => array(array('name' => 'StringTrim')), - 'validators' => array( - array( + 'filters' => [['name' => 'StringTrim']], + 'validators' => [ + [ 'name' => 'StringLength', - 'options' => array( + 'options' => [ 'min' => 3, 'max' => 255, - ), - ), - ), - )); + ], + ], + ], + ]); - $this->add(array( + $this->add([ 'name' => 'categoryId', 'required' => true, - 'validators' => array( - array( + 'validators' => [ + [ 'name' => 'InArray', - 'options' => array( + 'options' => [ 'haystack' => $this->getTicketCategory(), - ), - ), - ), - )); + ], + ], + ], + ]); - $this->add(array( + $this->add([ 'name' => 'memo', 'required' => true, - 'filters' => array(array('name' => 'StringTrim')), - 'validators' => array( - array( + 'filters' => [['name' => 'StringTrim']], + 'validators' => [ + [ 'name' => 'StringLength', - 'options' => array( + 'options' => [ 'min' => 3, - ), - ), - ), - )); - } - - /** - * @param ServiceLocatorInterface $serviceManager - * @return $this - */ - public function setServiceManager(ServiceLocatorInterface $serviceManager) - { - $this->serviceManager = $serviceManager; - - return $this; + ], + ], + ], + ]); } /** @@ -80,13 +71,13 @@ public function setServiceManager(ServiceLocatorInterface $serviceManager) protected function getTicketCategory() { /** @var \ZfcTicketSystem\Entity\Repository\TicketCategory $ticketCategory */ - $ticketCategory = $this->getEntityManager()->getRepository( - $this->getServiceManager()->get('zfcticketsystem_entry_options')->getTicketCategory() + $ticketCategory = $this->entityManager->getRepository( + $this->entityOptions->getTicketCategory() ); $category = $ticketCategory->getActiveCategory(); - $result = array(); + $result = []; foreach ($category as $entry) { $result[] = $entry->getId(); } @@ -94,23 +85,5 @@ protected function getTicketCategory() return $result; } - /** - * @return ServiceLocatorInterface - */ - protected function getServiceManager() - { - return $this->serviceManager; - } - - /** - * @return \Doctrine\ORM\EntityManager - */ - protected function getEntityManager() - { - if (!$this->entityManager) { - $this->entityManager = $this->getServiceManager()->get('Doctrine\ORM\EntityManager'); - } - return $this->entityManager; - } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Mapper/HydratorTicketCategory.php b/src/ZfcTicketSystem/Mapper/HydratorTicketCategory.php index 521b60e..425c6b0 100644 --- a/src/ZfcTicketSystem/Mapper/HydratorTicketCategory.php +++ b/src/ZfcTicketSystem/Mapper/HydratorTicketCategory.php @@ -3,7 +3,7 @@ namespace ZfcTicketSystem\Mapper; -use Zend\Stdlib\Hydrator\ClassMethods; +use Zend\Hydrator\ClassMethods; use ZfcTicketSystem\Entity\TicketCategory; class HydratorTicketCategory extends ClassMethods diff --git a/src/ZfcTicketSystem/Mapper/HydratorTicketEntry.php b/src/ZfcTicketSystem/Mapper/HydratorTicketEntry.php index 78533b1..5d505d1 100644 --- a/src/ZfcTicketSystem/Mapper/HydratorTicketEntry.php +++ b/src/ZfcTicketSystem/Mapper/HydratorTicketEntry.php @@ -2,7 +2,7 @@ namespace ZfcTicketSystem\Mapper; -use Zend\Stdlib\Hydrator\ClassMethods; +use Zend\Hydrator\ClassMethods; use ZfcTicketSystem\Entity\TicketEntry; diff --git a/src/ZfcTicketSystem/Mapper/HydratorTicketSubject.php b/src/ZfcTicketSystem/Mapper/HydratorTicketSubject.php index aa52e37..455178e 100644 --- a/src/ZfcTicketSystem/Mapper/HydratorTicketSubject.php +++ b/src/ZfcTicketSystem/Mapper/HydratorTicketSubject.php @@ -2,7 +2,7 @@ namespace ZfcTicketSystem\Mapper; -use Zend\Stdlib\Hydrator\ClassMethods; +use Zend\Hydrator\ClassMethods; use ZfcTicketSystem\Entity\TicketSubject; class HydratorTicketSubject extends ClassMethods diff --git a/src/ZfcTicketSystem/Module.php b/src/ZfcTicketSystem/Module.php index fd8482a..2333ab5 100644 --- a/src/ZfcTicketSystem/Module.php +++ b/src/ZfcTicketSystem/Module.php @@ -27,10 +27,13 @@ public function getViewHelperConfig() return [ 'factories' => [ 'numberOfNewTickets' => function (AbstractPluginManager $pluginManager) { - return new View\Helper\NewTicketWidget($pluginManager->getServiceLocator()); + /** @noinspection PhpParamsInspection */ + return new View\Helper\NewTicketWidget( + $pluginManager->getServiceLocator()->get('zfcticketsystem_ticketsystem_service') + ); }, - 'ticketStatus' => function (AbstractPluginManager $pluginManager) { - return new View\Helper\TicketStatus($pluginManager->getServiceLocator()); + 'ticketStatus' => function () { + return new View\Helper\TicketStatus(); }, ] ]; @@ -44,12 +47,24 @@ public function getViewHelperConfig() */ public function getServiceConfig() { - return array( - 'factories' => array( + return [ + 'factories' => [ 'zfcticketsystem_ticketsystem_new_form' => function ($sm) { /** @var $sm \Zend\ServiceManager\ServiceLocatorInterface */ - $form = new Form\TicketSystem($sm); - $form->setInputFilter(new Form\TicketSystemFilter($sm)); + /** @noinspection PhpParamsInspection */ + $form = new Form\TicketSystem( + $sm->get('Doctrine\ORM\EntityManager'), + $sm->get('zfcticketsystem_entry_options') + ); + + /** @noinspection PhpParamsInspection */ + $form->setInputFilter( + new Form\TicketSystemFilter( + $sm->get('Doctrine\ORM\EntityManager'), + $sm->get('zfcticketsystem_entry_options') + ) + ); + return $form; }, 'zfcticketsystem_ticketsystem_entry_form' => function () { @@ -67,7 +82,7 @@ public function getServiceConfig() $config = $sm->get('Configuration'); return new Options\EntityOptions($config['zfc-ticket-system']['entity']); } - ), - ); + ], + ]; } } \ No newline at end of file diff --git a/src/ZfcTicketSystem/Service/TicketSystem.php b/src/ZfcTicketSystem/Service/TicketSystem.php index 3244386..404b7e3 100644 --- a/src/ZfcTicketSystem/Service/TicketSystem.php +++ b/src/ZfcTicketSystem/Service/TicketSystem.php @@ -5,9 +5,9 @@ use SmallUser\Entity\UserInterface; use Zend\ServiceManager\ServiceManager; use Zend\ServiceManager\ServiceManagerAwareInterface; +use ZfcTicketSystem\Entity\TicketSubject; use ZfcTicketSystem\Mapper\HydratorTicketEntry; use ZfcTicketSystem\Mapper\HydratorTicketSubject; -use ZfcTicketSystem\Entity\TicketSubject; class TicketSystem implements ServiceManagerAwareInterface { diff --git a/src/ZfcTicketSystem/View/Helper/InvokerBase.php b/src/ZfcTicketSystem/View/Helper/InvokerBase.php deleted file mode 100644 index 9dd90bb..0000000 --- a/src/ZfcTicketSystem/View/Helper/InvokerBase.php +++ /dev/null @@ -1,41 +0,0 @@ -setServiceLocator($serviceLocatorInterface); - } - - /** - * @return ServiceLocatorInterface - */ - protected function getServiceLocator() - { - return $this->serviceLocator; - } - - /** - * @param ServiceLocatorInterface $serviceLocator - * - * @return $this - */ - protected function setServiceLocator(ServiceLocatorInterface $serviceLocator) - { - $this->serviceLocator = $serviceLocator; - - return $this; - } - -} \ No newline at end of file diff --git a/src/ZfcTicketSystem/View/Helper/NewTicketWidget.php b/src/ZfcTicketSystem/View/Helper/NewTicketWidget.php index bd1235a..4ad9974 100644 --- a/src/ZfcTicketSystem/View/Helper/NewTicketWidget.php +++ b/src/ZfcTicketSystem/View/Helper/NewTicketWidget.php @@ -3,21 +3,30 @@ namespace ZfcTicketSystem\View\Helper; -class NewTicketWidget extends InvokerBase +use Zend\View\Helper\AbstractHelper; +use ZfcTicketSystem\Service\TicketSystem; + +class NewTicketWidget extends AbstractHelper { + /** @var TicketSystem */ + protected $ticketService; + /** - * @return int + * NewTicketWidget constructor. + * @param TicketSystem $ticketService */ - public function __invoke() + public function __construct(TicketSystem $ticketService) { - return $this->getTicketService()->getNumberOfNewTickets(); + $this->ticketService = $ticketService; } /** - * @return \ZfcTicketSystem\Service\TicketSystem + * @return int */ - protected function getTicketService() + public function __invoke() { - return $this->getServiceLocator()->get('zfcticketsystem_ticketsystem_service'); + return $this->ticketService->getNumberOfNewTickets(); } + + } \ No newline at end of file diff --git a/src/ZfcTicketSystem/View/Helper/TicketStatus.php b/src/ZfcTicketSystem/View/Helper/TicketStatus.php index b0272ac..f11e7c8 100644 --- a/src/ZfcTicketSystem/View/Helper/TicketStatus.php +++ b/src/ZfcTicketSystem/View/Helper/TicketStatus.php @@ -4,9 +4,10 @@ namespace ZfcTicketSystem\View\Helper; +use Zend\View\Helper\AbstractHelper; use ZfcTicketSystem\Entity\TicketSubject; -class TicketStatus extends InvokerBase +class TicketStatus extends AbstractHelper { /** * @param string $statusId