diff --git a/README.md b/README.md index 765a27a..c65afdf 100644 --- a/README.md +++ b/README.md @@ -481,7 +481,7 @@ class CityFieldsetFactory extends AbstractDoctrineFieldsetFactory public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { $this->setEntityManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); /** @var FormElementManagerV3Polyfill $formManager */ $formManager = $container->get('FormElementManager'); diff --git a/composer.json b/composer.json index e068167..165a8a2 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,12 @@ "homepage" : "http://keet.me/", "require" : { "php" : "^7.2", + "doctrine/doctrine-orm-module" : "^1.1", + + "zendframework/zend-i18n-resources": "*", "zendframework/zend-math" : "^3.0", + "zendframework/zend-mvc-i18n" : "^1.1", "zendframework/zend-session" : "^2.8" }, "autoload" : { diff --git a/config/module.config.php b/config/module.config.php index e6b0097..d0e703d 100644 --- a/config/module.config.php +++ b/config/module.config.php @@ -6,7 +6,7 @@ use Keet\Form\Factory\GenericDoctrineDeleteFormFactory; use Keet\Form\Form\GenericDeleteForm; use Keet\Form\Form\GenericDoctrineDeleteForm; -use Zend\I18n\Translator\TranslatorServiceFactory; +use Zend\Mvc\I18n\TranslatorFactory; return [ 'form_elements' => [ @@ -17,7 +17,7 @@ ], 'service_manager' => [ 'factories' => [ - 'translator' => TranslatorServiceFactory::class, + 'translator' => TranslatorFactory::class, ], ], 'view_manager' => [ diff --git a/src/Factory/AbstractDoctrineFieldsetFactory.php b/src/Factory/AbstractDoctrineFieldsetFactory.php index 3f94fd8..9442171 100644 --- a/src/Factory/AbstractDoctrineFieldsetFactory.php +++ b/src/Factory/AbstractDoctrineFieldsetFactory.php @@ -27,7 +27,7 @@ abstract class AbstractDoctrineFieldsetFactory extends AbstractFieldsetFactory public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { $this->setObjectManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $fieldset = $this->getFieldset(); $fieldsetObject = $this->getFieldsetObject(); diff --git a/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php b/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php index 38f6a1b..ebbcc96 100644 --- a/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php +++ b/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php @@ -41,7 +41,7 @@ abstract class AbstractDoctrineFieldsetInputFilterFactory extends AbstractFields public function setupRequirements(ContainerInterface $container, $className = null) { $this->setObjectManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterManager($container->get(InputFilterPluginManager::class)); if (isset($className) && class_exists($className)) { diff --git a/src/Factory/AbstractDoctrineFormFactory.php b/src/Factory/AbstractDoctrineFormFactory.php index e72e32a..7c3bb2a 100644 --- a/src/Factory/AbstractDoctrineFormFactory.php +++ b/src/Factory/AbstractDoctrineFormFactory.php @@ -28,7 +28,7 @@ abstract class AbstractDoctrineFormFactory extends AbstractFormFactory public function __invoke(ContainerInterface $container, $requestedName, array $options = null) : AbstractForm { $this->setObjectManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterPluginManager($container->get('InputFilterManager')); $inputFilter = $this->getInputFilterPluginManager() diff --git a/src/Factory/AbstractDoctrineFormInputFilterFactory.php b/src/Factory/AbstractDoctrineFormInputFilterFactory.php index 3d2637b..b8e2731 100644 --- a/src/Factory/AbstractDoctrineFormInputFilterFactory.php +++ b/src/Factory/AbstractDoctrineFormInputFilterFactory.php @@ -32,7 +32,7 @@ abstract class AbstractDoctrineFormInputFilterFactory extends AbstractFieldsetIn public function setupRequirements(ContainerInterface $container, $className = null) { $this->setObjectManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterManager($container->get(InputFilterPluginManager::class)); if (isset($className) && class_exists($className)) { diff --git a/src/Factory/AbstractFieldsetFactory.php b/src/Factory/AbstractFieldsetFactory.php index 8e7da1e..fb2ff45 100644 --- a/src/Factory/AbstractFieldsetFactory.php +++ b/src/Factory/AbstractFieldsetFactory.php @@ -6,7 +6,7 @@ use Keet\Form\Fieldset\AbstractFieldset; use Zend\Di\Exception\ClassNotFoundException; use Zend\Hydrator\Reflection; -use Zend\I18n\Translator\Translator; +use Zend\Mvc\I18n\Translator; use Zend\ServiceManager\Factory\FactoryInterface; abstract class AbstractFieldsetFactory implements FactoryInterface @@ -77,7 +77,7 @@ public function __construct($fieldset, $name, $fieldsetObject) */ public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $fieldset = $this->getFieldset(); $fieldsetObject = $this->getFieldsetObject(); diff --git a/src/Factory/AbstractFieldsetInputFilterFactory.php b/src/Factory/AbstractFieldsetInputFilterFactory.php index ca28b7e..6eab091 100644 --- a/src/Factory/AbstractFieldsetInputFilterFactory.php +++ b/src/Factory/AbstractFieldsetInputFilterFactory.php @@ -3,7 +3,7 @@ namespace Keet\Form\Factory; use Interop\Container\ContainerInterface; -use Zend\I18n\Translator\Translator; +use Zend\Mvc\I18n\Translator; use Zend\InputFilter\InputFilterPluginManager; use Zend\ServiceManager\Factory\FactoryInterface; @@ -38,7 +38,7 @@ abstract class AbstractFieldsetInputFilterFactory implements FactoryInterface */ public function setupRequirements(ContainerInterface $container) { - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterManager($container->get(InputFilterPluginManager::class)); } diff --git a/src/Factory/AbstractFormFactory.php b/src/Factory/AbstractFormFactory.php index d4cd01b..6780a8e 100644 --- a/src/Factory/AbstractFormFactory.php +++ b/src/Factory/AbstractFormFactory.php @@ -5,7 +5,7 @@ use Interop\Container\ContainerInterface; use Keet\Form\Form\AbstractForm; use Zend\Di\Exception\ClassNotFoundException; -use Zend\I18n\Translator\Translator; +use Zend\Mvc\I18n\Translator; use Zend\InputFilter\InputFilterPluginManager; use Zend\ServiceManager\Factory\FactoryInterface; @@ -76,7 +76,7 @@ public function __construct($form, $formInputFilter) */ public function __invoke(ContainerInterface $container, $requestedName, array $options = null) : AbstractForm { - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterPluginManager($container->get('InputFilterManager')); $inputFilter = diff --git a/src/Factory/AbstractFormInputFilterFactory.php b/src/Factory/AbstractFormInputFilterFactory.php index 0eee21b..db0b029 100644 --- a/src/Factory/AbstractFormInputFilterFactory.php +++ b/src/Factory/AbstractFormInputFilterFactory.php @@ -3,7 +3,7 @@ namespace Keet\Form\Factory; use Interop\Container\ContainerInterface; -use Zend\I18n\Translator\Translator; +use Zend\Mvc\I18n\Translator; use Zend\InputFilter\InputFilterPluginManager; use Zend\ServiceManager\Factory\FactoryInterface; @@ -29,7 +29,7 @@ abstract class AbstractFormInputFilterFactory implements FactoryInterface */ public function setupRequirements(ContainerInterface $container) { - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterManager($container->get(InputFilterPluginManager::class)); } diff --git a/src/Factory/GenericDeleteFormFactory.php b/src/Factory/GenericDeleteFormFactory.php index 2fe8974..dffe9fb 100644 --- a/src/Factory/GenericDeleteFormFactory.php +++ b/src/Factory/GenericDeleteFormFactory.php @@ -3,15 +3,24 @@ namespace Keet\Form\Factory; use Interop\Container\ContainerInterface; +use Keet\Form\Form\AbstractForm; use Keet\Form\Form\GenericDeleteForm; -use Keet\Form\InputFilter\GenericDeleteFieldsetInputFilter; +use Keet\Form\InputFilter\GenericDeleteFormInputFilter; use Zend\Hydrator\Reflection; +/** + * Class GenericDeleteFormFactory + * + * @package Keet\Form\Factory + * + * @deprecated 2018-07-22 RK: I work mainly with Doctrine, keeping this updated keeps coming back as an afterthought. + * Will remove in future release. Doctrine version will remain. + */ class GenericDeleteFormFactory extends AbstractFormFactory { public function __construct() { - parent::__construct(GenericDeleteForm::class, GenericDeleteFieldsetInputFilter::class); + parent::__construct(GenericDeleteForm::class, GenericDeleteFormInputFilter::class); } /** @@ -23,9 +32,9 @@ public function __construct() * @throws \Psr\Container\ContainerExceptionInterface * @throws \Psr\Container\NotFoundExceptionInterface */ - public function __invoke(ContainerInterface $container, $requestedName, array $options = null) + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) : AbstractForm { - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterPluginManager($container->get('InputFilterManager')); $form = new GenericDeleteForm($this->name, $this->options); @@ -33,7 +42,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o $form->setInputFilter( $this->getInputFilterPluginManager() ->get( - GenericDeleteFieldsetInputFilter::class, + GenericDeleteFormInputFilter::class, [ 'translator' => $this->getTranslator(), ] diff --git a/src/Factory/GenericDoctrineDeleteFormFactory.php b/src/Factory/GenericDoctrineDeleteFormFactory.php index 315915b..94890ef 100644 --- a/src/Factory/GenericDoctrineDeleteFormFactory.php +++ b/src/Factory/GenericDoctrineDeleteFormFactory.php @@ -8,14 +8,14 @@ use Interop\Container\ContainerInterface; use Keet\Form\Form\AbstractForm; use Keet\Form\Form\GenericDoctrineDeleteForm; -use Keet\Form\InputFilter\GenericDoctrineDeleteFieldsetInputFilter; +use Keet\Form\InputFilter\GenericDoctrineDeleteFormInputFilter; use Zend\ServiceManager\Exception\ServiceNotCreatedException; class GenericDoctrineDeleteFormFactory extends AbstractDoctrineFormFactory { public function __construct() { - parent::__construct(GenericDoctrineDeleteForm::class, GenericDoctrineDeleteFieldsetInputFilter::class); + parent::__construct(GenericDoctrineDeleteForm::class, GenericDoctrineDeleteFormInputFilter::class); } /** @@ -41,7 +41,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o } $this->setObjectManager($container->get(EntityManager::class)); - $this->setTranslator($container->get('translator')); + $this->setTranslator($container->get('MvcTranslator')); $this->setInputFilterPluginManager($container->get('InputFilterManager')); /** @var EntityRepository $objectRepository */ @@ -54,7 +54,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o $form->setInputFilter( $this->getInputFilterPluginManager() ->get( - GenericDoctrineDeleteFieldsetInputFilter::class, + GenericDoctrineDeleteFormInputFilter::class, [ 'object_manager' => $this->getObjectManager(), 'object_repository' => $objectRepository, diff --git a/src/Fieldset/AbstractFieldset.php b/src/Fieldset/AbstractFieldset.php index 7f13a0c..aa44eeb 100644 --- a/src/Fieldset/AbstractFieldset.php +++ b/src/Fieldset/AbstractFieldset.php @@ -2,7 +2,6 @@ namespace Keet\Form\Fieldset; -use Zend\Form\Element\Hidden; use Zend\Form\Fieldset; use Zend\I18n\Translator\TranslatorAwareTrait; use Zend\InputFilter\InputFilterAwareTrait; @@ -11,14 +10,4 @@ abstract class AbstractFieldset extends Fieldset { use InputFilterAwareTrait; use TranslatorAwareTrait; - - public function init() - { - $this->add( - [ - 'name' => 'id', - 'type' => Hidden::class, - ] - ); - } } \ No newline at end of file diff --git a/src/Form/GenericDeleteForm.php b/src/Form/GenericDeleteForm.php index c481fd9..4c438dc 100644 --- a/src/Form/GenericDeleteForm.php +++ b/src/Form/GenericDeleteForm.php @@ -6,6 +6,14 @@ use Zend\Form\Element\Select; use Zend\Form\Element\Submit; +/** + * Class GenericDeleteForm + * + * @package Keet\Form\Form + * + * @deprecated 2018-07-22 RK: I work mainly with Doctrine, keeping this updated keeps coming back as an afterthought. + * Will remove in future release. Doctrine version will remain. + */ class GenericDeleteForm extends AbstractForm { /** diff --git a/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php b/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php index bc66ebd..b663bd4 100644 --- a/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php +++ b/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php @@ -4,9 +4,6 @@ use Doctrine\Common\Persistence\ObjectRepository; use Zend\Di\Exception\InvalidArgumentException; -use Zend\Filter\ToInt; -use Zend\Filter\ToNull; -use Zend\I18n\Validator\IsInt; abstract class AbstractDoctrineFieldsetInputFilter extends AbstractDoctrineInputFilter { @@ -39,28 +36,6 @@ public function __construct(array $options) parent::__construct($options); } - public function init() - { - $this->add( - [ - 'name' => 'id', - 'required' => true, - 'filters' => [ - ['name' => ToInt::class], - [ - 'name' => ToNull::class, - 'options' => [ - 'type' => ToNull::TYPE_INTEGER, - ], - ], - ], - 'validators' => [ - ['name' => IsInt::class], - ], - ] - ); - } - /** * @return ObjectRepository */ diff --git a/src/InputFilter/AbstractFieldsetInputFilter.php b/src/InputFilter/AbstractFieldsetInputFilter.php index 20d7d36..dbf1c14 100644 --- a/src/InputFilter/AbstractFieldsetInputFilter.php +++ b/src/InputFilter/AbstractFieldsetInputFilter.php @@ -2,34 +2,6 @@ namespace Keet\Form\InputFilter; -use Zend\Filter\ToInt; -use Zend\Filter\ToNull; -use Zend\I18n\Validator\IsInt; - abstract class AbstractFieldsetInputFilter extends AbstractInputFilter { - /** - * Init function - */ - public function init() - { - $this->add( - [ - 'name' => 'id', - 'required' => false, - 'filters' => [ - ['name' => ToInt::class], - [ - 'name' => ToNull::class, - 'options' => [ - 'type' => ToNull::TYPE_INTEGER, - ], - ], - ], - 'validators' => [ - ['name' => IsInt::class], - ], - ] - ); - } } \ No newline at end of file diff --git a/src/InputFilter/AbstractInputFilter.php b/src/InputFilter/AbstractInputFilter.php index a6f43c8..1509977 100644 --- a/src/InputFilter/AbstractInputFilter.php +++ b/src/InputFilter/AbstractInputFilter.php @@ -3,9 +3,9 @@ namespace Keet\Form\InputFilter; use Zend\Di\Exception\InvalidArgumentException; -use Zend\I18n\Translator\Translator; use Zend\I18n\Translator\TranslatorAwareTrait; use Zend\InputFilter\InputFilter; +use Zend\Mvc\I18n\Translator; /** * Class adds $required property, making it available on an InputFilter. @@ -43,14 +43,14 @@ public function __construct(array $options) if ( ! isset($options['translator'])) { throw new InvalidArgumentException( - 'Required parameter "translator" not found. InputFilters require the Zend\I18n\Translator\Translator.' + 'Required parameter "translator" not found. InputFilters require the Zend\Mvc\I18n\Translator.' ); } if ( ! $options['translator'] instanceof Translator) { throw new InvalidArgumentException( - 'Incorrect translator was given for the InputFilter. Required to be instance of "Zend\I18n\Translator\Translator".' + 'Incorrect translator was given for the InputFilter. Required to be instance of "Zend\Mvc\I18n\Translator".' ); } $this->setTranslator($options['translator']); diff --git a/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php b/src/InputFilter/GenericDeleteFormInputFilter.php similarity index 67% rename from src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php rename to src/InputFilter/GenericDeleteFormInputFilter.php index 5bb0d46..f0a0f8d 100644 --- a/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php +++ b/src/InputFilter/GenericDeleteFormInputFilter.php @@ -4,7 +4,15 @@ use Zend\Validator\InArray; -class GenericDoctrineDeleteFieldsetInputFilter extends AbstractDoctrineFieldsetInputFilter +/** + * Class GenericDeleteFieldsetInputFilter + * + * @package Keet\Form\InputFilter + * + * @deprecated 2018-07-22 RK: I work mainly with Doctrine, keeping this updated keeps coming back as an afterthought. + * Will remove in future release. Doctrine version will remain. + */ +class GenericDeleteFormInputFilter extends AbstractFieldsetInputFilter { public function init() { diff --git a/src/InputFilter/GenericDeleteFieldsetInputFilter.php b/src/InputFilter/GenericDoctrineDeleteFormInputFilter.php similarity index 89% rename from src/InputFilter/GenericDeleteFieldsetInputFilter.php rename to src/InputFilter/GenericDoctrineDeleteFormInputFilter.php index 9747add..e0d0674 100644 --- a/src/InputFilter/GenericDeleteFieldsetInputFilter.php +++ b/src/InputFilter/GenericDoctrineDeleteFormInputFilter.php @@ -4,7 +4,7 @@ use Zend\Validator\InArray; -class GenericDeleteFieldsetInputFilter extends AbstractFieldsetInputFilter +class GenericDoctrineDeleteFormInputFilter extends AbstractDoctrineFieldsetInputFilter { public function init() {