diff --git a/composer.json b/composer.json
index 5c23f76..e068167 100644
--- a/composer.json
+++ b/composer.json
@@ -1,20 +1,33 @@
{
- "name": "rkeet/zf-doctrine-form",
- "description": "Zend Framework with Doctrine Form (Fieldset & InputFilter) usage focusing on re-usable components",
- "keywords": ["zend", "framework", "zend framework", "mvc", "zf", "zf3", "form", "components", "fieldset", "input filter", "validator", "doctrine"],
- "homepage": "http://keet.me/",
- "require": {
- "php": "^7.2",
- "doctrine/doctrine-orm-module": "^1.1",
- "zendframework/zend-math": "^3.0",
- "zendframework/zend-session": "^2.8"
+ "name" : "rkeet/zf-doctrine-form",
+ "description" : "Zend Framework with Doctrine Form (Fieldset & InputFilter) usage focusing on re-usable components",
+ "keywords" : [
+ "zend",
+ "framework",
+ "zend framework",
+ "mvc",
+ "zf",
+ "zf3",
+ "form",
+ "components",
+ "fieldset",
+ "input filter",
+ "validator",
+ "doctrine"
+ ],
+ "homepage" : "http://keet.me/",
+ "require" : {
+ "php" : "^7.2",
+ "doctrine/doctrine-orm-module" : "^1.1",
+ "zendframework/zend-math" : "^3.0",
+ "zendframework/zend-session" : "^2.8"
+ },
+ "autoload" : {
+ "psr-4" : {
+ "Keet\\Form\\" : "src/"
},
- "autoload": {
- "psr-4": {
- "Keet\\Form\\": "src/"
- },
- "classmap": [
- "src/Module.php"
- ]
- }
+ "classmap" : [
+ "src/Module.php"
+ ]
+ }
}
diff --git a/config/module.config.php b/config/module.config.php
index 7d7efea..e6b0097 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -9,9 +9,9 @@
use Zend\I18n\Translator\TranslatorServiceFactory;
return [
- 'form_elements' => [
+ 'form_elements' => [
'factories' => [
- GenericDeleteForm::class => GenericDeleteFormFactory::class,
+ GenericDeleteForm::class => GenericDeleteFormFactory::class,
GenericDoctrineDeleteForm::class => GenericDoctrineDeleteFormFactory::class,
],
],
@@ -20,10 +20,11 @@
'translator' => TranslatorServiceFactory::class,
],
],
- 'view_manager' => [
+ 'view_manager' => [
'template_map' => [
- 'keet/partials/form/genericDeleteForm' => __DIR__ . '/../view/partials/generic-delete-form.phtml',
- 'keet/partials/form/genericDoctrineDeleteForm' => __DIR__ . '/../view/partials/generic-doctrine-delete-form.phtml',
+ 'keet/partials/form/genericDeleteForm' => __DIR__ . '/../view/partials/generic-delete-form.phtml',
+ 'keet/partials/form/genericDoctrineDeleteForm' => __DIR__
+ . '/../view/partials/generic-doctrine-delete-form.phtml',
],
],
];
\ No newline at end of file
diff --git a/src/Factory/AbstractDoctrineFieldsetFactory.php b/src/Factory/AbstractDoctrineFieldsetFactory.php
index 96179a7..3f94fd8 100644
--- a/src/Factory/AbstractDoctrineFieldsetFactory.php
+++ b/src/Factory/AbstractDoctrineFieldsetFactory.php
@@ -2,6 +2,7 @@
namespace Keet\Form\Factory;
+use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\ORM\EntityManager;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface;
@@ -10,30 +11,31 @@
abstract class AbstractDoctrineFieldsetFactory extends AbstractFieldsetFactory
{
/**
- * @var EntityManager
+ * @var ObjectManager|EntityManager
*/
- protected $entityManager;
+ protected $objectManager;
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return AbstractDoctrineFieldset
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
{
- $this->setEntityManager($container->get(EntityManager::class));
+ $this->setObjectManager($container->get(EntityManager::class));
$this->setTranslator($container->get('translator'));
$fieldset = $this->getFieldset();
$fieldsetObject = $this->getFieldsetObject();
/** @var AbstractDoctrineFieldset $fieldset */
- $fieldset = new $fieldset($this->getEntityManager(), $this->name ?: $this->getFieldsetName());
+ $fieldset = new $fieldset($this->getObjectManager(), $this->name ?: $this->getFieldsetName());
$fieldset->setHydrator(
- new DoctrineObject($this->getEntityManager())
+ new DoctrineObject($this->getObjectManager())
);
$fieldset->setObject(new $fieldsetObject());
$fieldset->setTranslator($this->getTranslator());
@@ -44,18 +46,19 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
/**
* @return EntityManager
*/
- public function getEntityManager(): EntityManager
+ public function getObjectManager() : ObjectManager
{
- return $this->entityManager;
+ return $this->objectManager;
}
/**
- * @param EntityManager $entityManager
+ * @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineFieldsetFactory
*/
- public function setEntityManager(EntityManager $entityManager): AbstractDoctrineFieldsetFactory
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineFieldsetFactory
{
- $this->entityManager = $entityManager;
+ $this->objectManager = $objectManager;
return $this;
}
diff --git a/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php b/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php
index f3f7ce8..38f6a1b 100644
--- a/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php
+++ b/src/Factory/AbstractDoctrineFieldsetInputFilterFactory.php
@@ -10,6 +10,7 @@
/**
* Class AbstractFieldsetInputFilterFactory
+ *
* @package Keet\Form\Factory
*
* Creating FieldsetInputFilterFactory classes is, alas, pretty much a custom job each and every time. However,
@@ -32,7 +33,8 @@ abstract class AbstractDoctrineFieldsetInputFilterFactory extends AbstractFields
* Use this function to setup the basic requirements commonly reused.
*
* @param ContainerInterface $container
- * @param string|null $className
+ * @param string|null $className
+ *
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
@@ -43,23 +45,27 @@ public function setupRequirements(ContainerInterface $container, $className = nu
$this->setInputFilterManager($container->get(InputFilterPluginManager::class));
if (isset($className) && class_exists($className)) {
- $this->setObjectRepository($this->getObjectManager()->getRepository($className));
+ $this->setObjectRepository(
+ $this->getObjectManager()
+ ->getRepository($className)
+ );
}
}
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineFieldsetInputFilterFactory
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineFieldsetInputFilterFactory
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineFieldsetInputFilterFactory
{
$this->objectManager = $objectManager;
return $this;
@@ -68,16 +74,17 @@ public function setObjectManager(ObjectManager $objectManager): AbstractDoctrine
/**
* @return ObjectRepository
*/
- public function getObjectRepository(): ObjectRepository
+ public function getObjectRepository() : ObjectRepository
{
return $this->objectRepository;
}
/**
* @param ObjectRepository $objectRepository
+ *
* @return AbstractDoctrineFieldsetInputFilterFactory
*/
- public function setObjectRepository(ObjectRepository $objectRepository): AbstractDoctrineFieldsetInputFilterFactory
+ public function setObjectRepository(ObjectRepository $objectRepository) : AbstractDoctrineFieldsetInputFilterFactory
{
$this->objectRepository = $objectRepository;
return $this;
diff --git a/src/Factory/AbstractDoctrineFormFactory.php b/src/Factory/AbstractDoctrineFormFactory.php
index b2979cb..e72e32a 100644
--- a/src/Factory/AbstractDoctrineFormFactory.php
+++ b/src/Factory/AbstractDoctrineFormFactory.php
@@ -7,6 +7,7 @@
use Doctrine\ORM\EntityManager;
use Interop\Container\ContainerInterface;
use Keet\Form\Form\AbstractDoctrineForm;
+use Keet\Form\Form\AbstractForm;
abstract class AbstractDoctrineFormFactory extends AbstractFormFactory
{
@@ -17,19 +18,21 @@ abstract class AbstractDoctrineFormFactory extends AbstractFormFactory
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return AbstractDoctrineForm
* @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->setObjectManager($container->get(EntityManager::class));
$this->setTranslator($container->get('translator'));
$this->setInputFilterPluginManager($container->get('InputFilterManager'));
- $inputFilter = $this->getInputFilterPluginManager()->get($this->getFormInputFilter());
+ $inputFilter = $this->getInputFilterPluginManager()
+ ->get($this->getFormInputFilter());
$form = $this->getForm();
@@ -46,32 +49,34 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
* Checks if received class is an Entity
*
* @param ObjectManager $objectManager
- * @param string|object $class
+ * @param string|\object $class
*
* @return boolean
*/
function isEntity(ObjectManager $objectManager, $class)
{
- if(is_object($class)){
+ if (is_object($class)) {
$class = ClassUtils::getClass($class);
}
- return ! $objectManager->getMetadataFactory()->isTransient($class);
+ return ! $objectManager->getMetadataFactory()
+ ->isTransient($class);
}
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineFormFactory
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineFormFactory
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineFormFactory
{
$this->objectManager = $objectManager;
return $this;
diff --git a/src/Factory/AbstractDoctrineFormInputFilterFactory.php b/src/Factory/AbstractDoctrineFormInputFilterFactory.php
index 0982723..3d2637b 100644
--- a/src/Factory/AbstractDoctrineFormInputFilterFactory.php
+++ b/src/Factory/AbstractDoctrineFormInputFilterFactory.php
@@ -24,7 +24,8 @@ abstract class AbstractDoctrineFormInputFilterFactory extends AbstractFieldsetIn
* Use this function to setup the basic requirements commonly reused.
*
* @param ContainerInterface $container
- * @param string|null $className
+ * @param string|null $className
+ *
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
@@ -35,23 +36,27 @@ public function setupRequirements(ContainerInterface $container, $className = nu
$this->setInputFilterManager($container->get(InputFilterPluginManager::class));
if (isset($className) && class_exists($className)) {
- $this->setObjectRepository($this->getObjectManager()->getRepository($className));
+ $this->setObjectRepository(
+ $this->getObjectManager()
+ ->getRepository($className)
+ );
}
}
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineFormInputFilterFactory
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineFormInputFilterFactory
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineFormInputFilterFactory
{
$this->objectManager = $objectManager;
return $this;
@@ -60,16 +65,17 @@ public function setObjectManager(ObjectManager $objectManager): AbstractDoctrine
/**
* @return ObjectRepository
*/
- public function getObjectRepository(): ObjectRepository
+ public function getObjectRepository() : ObjectRepository
{
return $this->objectRepository;
}
/**
* @param ObjectRepository $objectRepository
+ *
* @return AbstractDoctrineFormInputFilterFactory
*/
- public function setObjectRepository(ObjectRepository $objectRepository): AbstractDoctrineFormInputFilterFactory
+ public function setObjectRepository(ObjectRepository $objectRepository) : AbstractDoctrineFormInputFilterFactory
{
$this->objectRepository = $objectRepository;
return $this;
diff --git a/src/Factory/AbstractFieldsetFactory.php b/src/Factory/AbstractFieldsetFactory.php
index e24e4fe..8e7da1e 100644
--- a/src/Factory/AbstractFieldsetFactory.php
+++ b/src/Factory/AbstractFieldsetFactory.php
@@ -38,21 +38,27 @@ abstract class AbstractFieldsetFactory implements FactoryInterface
/**
* AbstractFieldsetFactory constructor.
+ *
* @param $fieldset
* @param $name
* @param $fieldsetObject
+ *
* @throws ClassNotFoundException
*/
public function __construct($fieldset, $name, $fieldsetObject)
{
- if (!class_exists($fieldset)) {
+ if ( ! class_exists($fieldset)) {
- throw new ClassNotFoundException('AbstractFieldsetFactory parameter $fieldset should be the name of an existing Fieldset.');
+ throw new ClassNotFoundException(
+ 'AbstractFieldsetFactory parameter $fieldset should be the name of an existing Fieldset.'
+ );
}
- if (!class_exists($fieldsetObject)){
+ if ( ! class_exists($fieldsetObject)) {
- throw new ClassNotFoundException('AbstractFieldsetFactory parameter $fieldsetObject should be the name of an existing Entity.');
+ throw new ClassNotFoundException(
+ 'AbstractFieldsetFactory parameter $fieldsetObject should be the name of an existing Entity.'
+ );
}
$this->setFieldset($fieldset);
@@ -62,8 +68,9 @@ public function __construct($fieldset, $name, $fieldsetObject)
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return AbstractFieldset
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
@@ -87,16 +94,17 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
/**
* @return Translator
*/
- public function getTranslator(): Translator
+ public function getTranslator() : Translator
{
return $this->translator;
}
/**
* @param Translator $translator
+ *
* @return AbstractFieldsetFactory
*/
- public function setTranslator(Translator $translator): AbstractFieldsetFactory
+ public function setTranslator(Translator $translator) : AbstractFieldsetFactory
{
$this->translator = $translator;
return $this;
@@ -105,16 +113,17 @@ public function setTranslator(Translator $translator): AbstractFieldsetFactory
/**
* @return string
*/
- public function getName(): string
+ public function getName() : string
{
return $this->name;
}
/**
* @param string $name
+ *
* @return AbstractFieldsetFactory
*/
- public function setName(string $name): AbstractFieldsetFactory
+ public function setName(string $name) : AbstractFieldsetFactory
{
$this->name = $name;
return $this;
@@ -123,16 +132,17 @@ public function setName(string $name): AbstractFieldsetFactory
/**
* @return string
*/
- public function getFieldset(): string
+ public function getFieldset() : string
{
return $this->fieldset;
}
/**
* @param string $fieldset
+ *
* @return AbstractFieldsetFactory
*/
- public function setFieldset(string $fieldset): AbstractFieldsetFactory
+ public function setFieldset(string $fieldset) : AbstractFieldsetFactory
{
$this->fieldset = $fieldset;
return $this;
@@ -141,16 +151,17 @@ public function setFieldset(string $fieldset): AbstractFieldsetFactory
/**
* @return string
*/
- public function getFieldsetName(): string
+ public function getFieldsetName() : string
{
return $this->fieldsetName;
}
/**
* @param string $fieldsetName
+ *
* @return AbstractFieldsetFactory
*/
- public function setFieldsetName(string $fieldsetName): AbstractFieldsetFactory
+ public function setFieldsetName(string $fieldsetName) : AbstractFieldsetFactory
{
$this->fieldsetName = $fieldsetName;
return $this;
@@ -159,16 +170,17 @@ public function setFieldsetName(string $fieldsetName): AbstractFieldsetFactory
/**
* @return string
*/
- public function getFieldsetObject(): string
+ public function getFieldsetObject() : string
{
return $this->fieldsetObject;
}
/**
* @param string $fieldsetObject
+ *
* @return AbstractFieldsetFactory
*/
- public function setFieldsetObject(string $fieldsetObject): AbstractFieldsetFactory
+ public function setFieldsetObject(string $fieldsetObject) : AbstractFieldsetFactory
{
$this->fieldsetObject = $fieldsetObject;
return $this;
diff --git a/src/Factory/AbstractFieldsetInputFilterFactory.php b/src/Factory/AbstractFieldsetInputFilterFactory.php
index 81899d0..ca28b7e 100644
--- a/src/Factory/AbstractFieldsetInputFilterFactory.php
+++ b/src/Factory/AbstractFieldsetInputFilterFactory.php
@@ -9,6 +9,7 @@
/**
* Class AbstractFieldsetInputFilterFactory
+ *
* @package Keet\Form\Factory
*
* Creating FieldsetInputFilterFactory classes is, alas, pretty much a custom job each and every time. However,
@@ -31,6 +32,7 @@ abstract class AbstractFieldsetInputFilterFactory implements FactoryInterface
* Use this function to setup the basic requirements commonly reused.
*
* @param ContainerInterface $container
+ *
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
@@ -43,17 +45,18 @@ public function setupRequirements(ContainerInterface $container)
/**
* @return InputFilterPluginManager
*/
- public function getInputFilterManager(): InputFilterPluginManager
+ public function getInputFilterManager() : InputFilterPluginManager
{
return $this->inputFilterManager;
}
/**
* @param InputFilterPluginManager $inputFilterManager
+ *
* @return AbstractFieldsetInputFilterFactory
*/
- public function setInputFilterManager(InputFilterPluginManager $inputFilterManager): AbstractFieldsetInputFilterFactory
- {
+ public function setInputFilterManager(InputFilterPluginManager $inputFilterManager
+ ) : AbstractFieldsetInputFilterFactory {
$this->inputFilterManager = $inputFilterManager;
return $this;
}
@@ -61,16 +64,17 @@ public function setInputFilterManager(InputFilterPluginManager $inputFilterManag
/**
* @return Translator
*/
- public function getTranslator(): Translator
+ public function getTranslator() : Translator
{
return $this->translator;
}
/**
* @param Translator $translator
+ *
* @return AbstractFieldsetInputFilterFactory
*/
- public function setTranslator(Translator $translator): AbstractFieldsetInputFilterFactory
+ public function setTranslator(Translator $translator) : AbstractFieldsetInputFilterFactory
{
$this->translator = $translator;
return $this;
diff --git a/src/Factory/AbstractFormFactory.php b/src/Factory/AbstractFormFactory.php
index 9c7bdd7..d4cd01b 100644
--- a/src/Factory/AbstractFormFactory.php
+++ b/src/Factory/AbstractFormFactory.php
@@ -43,19 +43,22 @@ abstract class AbstractFormFactory implements FactoryInterface
/**
* AbstractFormFactory constructor.
+ *
* @param $form
* @param $formInputFilter
*/
public function __construct($form, $formInputFilter)
{
- if (!class_exists($form)) {
+ if ( ! class_exists($form)) {
throw new ClassNotFoundException('AbstractFormFactory requires $form to be an existing form.');
}
- if (!class_exists($formInputFilter)) {
+ if ( ! class_exists($formInputFilter)) {
- throw new ClassNotFoundException('AbstractFormFactory requires $formInputFilter to be an existing form InputFilter.');
+ throw new ClassNotFoundException(
+ 'AbstractFormFactory requires $formInputFilter to be an existing form InputFilter.'
+ );
}
$this->setForm($form);
@@ -64,18 +67,21 @@ public function __construct($form, $formInputFilter)
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return AbstractForm
* @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->setInputFilterPluginManager($container->get('InputFilterManager'));
- $inputFilter = $this->getInputFilterPluginManager()->get($this->getFormInputFilter());
+ $inputFilter =
+ $this->getInputFilterPluginManager()
+ ->get($this->getFormInputFilter());
$form = $this->getForm();
@@ -90,16 +96,17 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
/**
* @return string
*/
- public function getName(): string
+ public function getName() : string
{
return $this->name;
}
/**
* @param string $name
+ *
* @return AbstractFormFactory
*/
- public function setName(string $name): AbstractFormFactory
+ public function setName(string $name) : AbstractFormFactory
{
$this->name = $name;
return $this;
@@ -108,16 +115,17 @@ public function setName(string $name): AbstractFormFactory
/**
* @return array
*/
- public function getOptions(): array
+ public function getOptions() : array
{
return $this->options;
}
/**
* @param array $options
+ *
* @return AbstractFormFactory
*/
- public function setOptions(array $options): AbstractFormFactory
+ public function setOptions(array $options) : AbstractFormFactory
{
$this->options = $options;
return $this;
@@ -126,16 +134,17 @@ public function setOptions(array $options): AbstractFormFactory
/**
* @return Translator
*/
- public function getTranslator(): Translator
+ public function getTranslator() : Translator
{
return $this->translator;
}
/**
* @param Translator $translator
+ *
* @return AbstractFormFactory
*/
- public function setTranslator(Translator $translator): AbstractFormFactory
+ public function setTranslator(Translator $translator) : AbstractFormFactory
{
$this->translator = $translator;
return $this;
@@ -144,17 +153,19 @@ public function setTranslator(Translator $translator): AbstractFormFactory
/**
* @return InputFilterPluginManager
*/
- public function getInputFilterPluginManager(): InputFilterPluginManager
+ public function getInputFilterPluginManager() : InputFilterPluginManager
{
return $this->inputFilterPluginManager;
}
/**
* @param InputFilterPluginManager $inputFilterPluginManager
+ *
* @return AbstractFormFactory
*/
- public function setInputFilterPluginManager(InputFilterPluginManager $inputFilterPluginManager): AbstractFormFactory
- {
+ public function setInputFilterPluginManager(
+ InputFilterPluginManager $inputFilterPluginManager
+ ) : AbstractFormFactory {
$this->inputFilterPluginManager = $inputFilterPluginManager;
return $this;
}
@@ -162,16 +173,17 @@ public function setInputFilterPluginManager(InputFilterPluginManager $inputFilte
/**
* @return string
*/
- public function getForm(): string
+ public function getForm() : string
{
return $this->form;
}
/**
* @param string $form
+ *
* @return AbstractFormFactory
*/
- public function setForm(string $form): AbstractFormFactory
+ public function setForm(string $form) : AbstractFormFactory
{
$this->form = $form;
return $this;
@@ -180,16 +192,17 @@ public function setForm(string $form): AbstractFormFactory
/**
* @return string
*/
- public function getFormInputFilter(): string
+ public function getFormInputFilter() : string
{
return $this->formInputFilter;
}
/**
* @param string $formInputFilter
+ *
* @return AbstractFormFactory
*/
- public function setFormInputFilter(string $formInputFilter): AbstractFormFactory
+ public function setFormInputFilter(string $formInputFilter) : AbstractFormFactory
{
$this->formInputFilter = $formInputFilter;
return $this;
diff --git a/src/Factory/AbstractFormInputFilterFactory.php b/src/Factory/AbstractFormInputFilterFactory.php
index f763d02..0eee21b 100644
--- a/src/Factory/AbstractFormInputFilterFactory.php
+++ b/src/Factory/AbstractFormInputFilterFactory.php
@@ -23,6 +23,7 @@ abstract class AbstractFormInputFilterFactory implements FactoryInterface
* Use this function to setup the basic requirements commonly reused.
*
* @param ContainerInterface $container
+ *
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
@@ -35,16 +36,17 @@ public function setupRequirements(ContainerInterface $container)
/**
* @return Translator
*/
- public function getTranslator(): Translator
+ public function getTranslator() : Translator
{
return $this->translator;
}
/**
* @param Translator $translator
- * @return AbstractFieldsetInputFilterFactory
+ *
+ * @return AbstractFormInputFilterFactory
*/
- public function setTranslator(Translator $translator): AbstractFieldsetInputFilterFactory
+ public function setTranslator(Translator $translator) : AbstractFormInputFilterFactory
{
$this->translator = $translator;
return $this;
@@ -53,17 +55,18 @@ public function setTranslator(Translator $translator): AbstractFieldsetInputFilt
/**
* @return InputFilterPluginManager
*/
- public function getInputFilterManager(): InputFilterPluginManager
+ public function getInputFilterManager() : InputFilterPluginManager
{
return $this->inputFilterManager;
}
/**
* @param InputFilterPluginManager $inputFilterManager
- * @return AbstractFieldsetInputFilterFactory
+ *
+ * @return AbstractFormInputFilterFactory
*/
- public function setInputFilterManager(InputFilterPluginManager $inputFilterManager): AbstractFieldsetInputFilterFactory
- {
+ public function setInputFilterManager(InputFilterPluginManager $inputFilterManager
+ ) : AbstractFormInputFilterFactory {
$this->inputFilterManager = $inputFilterManager;
return $this;
}
diff --git a/src/Factory/GenericDeleteFormFactory.php b/src/Factory/GenericDeleteFormFactory.php
index 5fdb559..2fe8974 100644
--- a/src/Factory/GenericDeleteFormFactory.php
+++ b/src/Factory/GenericDeleteFormFactory.php
@@ -3,6 +3,8 @@
namespace Keet\Form\Factory;
use Interop\Container\ContainerInterface;
+use Keet\Form\Form\GenericDeleteForm;
+use Keet\Form\InputFilter\GenericDeleteFieldsetInputFilter;
use Zend\Hydrator\Reflection;
class GenericDeleteFormFactory extends AbstractFormFactory
@@ -14,8 +16,9 @@ public function __construct()
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return GenericDeleteForm
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
@@ -28,17 +31,16 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
$form = new GenericDeleteForm($this->name, $this->options);
$form->setHydrator(new Reflection());
$form->setInputFilter(
- $this->getInputFilterPluginManager()->get(
- GenericDeleteFieldsetInputFilter::class,
- [
- 'object_manager' => $this->getObjectManager(),
- 'object_repository' => $entityRepository,
- 'translator' => $this->getTranslator(),
- ]
- )
+ $this->getInputFilterPluginManager()
+ ->get(
+ GenericDeleteFieldsetInputFilter::class,
+ [
+ 'translator' => $this->getTranslator(),
+ ]
+ )
);
$form->setTranslator($this->getTranslator());
- $form->setOption('name_getter', $this->entityNameGetter);
+ $form->setOption('name_getter', $options['name_getter']);
return $form;
}
diff --git a/src/Factory/GenericDoctrineDeleteFormFactory.php b/src/Factory/GenericDoctrineDeleteFormFactory.php
index 0f59e83..315915b 100644
--- a/src/Factory/GenericDoctrineDeleteFormFactory.php
+++ b/src/Factory/GenericDoctrineDeleteFormFactory.php
@@ -6,6 +6,7 @@
use Doctrine\ORM\EntityRepository;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface;
+use Keet\Form\Form\AbstractForm;
use Keet\Form\Form\GenericDoctrineDeleteForm;
use Keet\Form\InputFilter\GenericDoctrineDeleteFieldsetInputFilter;
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
@@ -19,19 +20,22 @@ public function __construct()
/**
* @param ContainerInterface $container
- * @param string $requestedName
- * @param array|null $options
+ * @param string $requestedName
+ * @param array|null $options
+ *
* @return GenericDoctrineDeleteForm
* @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
{
- if (!$options['entity_name']) {
+ if ( ! $options['entity_name']) {
- throw new ServiceNotCreatedException('Option "entity_name" (FQCN) required for ' . __CLASS__ . '; not set.');
+ throw new ServiceNotCreatedException(
+ 'Option "entity_name" (FQCN) required for ' . __CLASS__ . '; not set.'
+ );
}
- if (!$options['unique_property']) {
+ if ( ! $options['unique_property']) {
throw new ServiceNotCreatedException('Option "unique_property" required for ' . __CLASS__ . '; not set.');
}
@@ -40,21 +44,23 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
$this->setTranslator($container->get('translator'));
$this->setInputFilterPluginManager($container->get('InputFilterManager'));
- /** @var EntityRepository $entityRepository */
- $entityRepository = $this->getObjectManager()->getRepository($options['entity_name']);
+ /** @var EntityRepository $objectRepository */
+ $objectRepository = $this->getObjectManager()
+ ->getRepository($options['entity_name']);
$form = new GenericDoctrineDeleteForm($this->name, $this->options);
$form->setHydrator(new DoctrineObject($this->objectManager));
$form->setObject(new $options['entity_name']());
$form->setInputFilter(
- $this->getInputFilterPluginManager()->get(
- GenericDoctrineDeleteFieldsetInputFilter::class,
- [
- 'object_manager' => $this->getObjectManager(),
- 'object_repository' => $entityRepository,
- 'translator' => $this->getTranslator(),
- ]
- )
+ $this->getInputFilterPluginManager()
+ ->get(
+ GenericDoctrineDeleteFieldsetInputFilter::class,
+ [
+ 'object_manager' => $this->getObjectManager(),
+ 'object_repository' => $objectRepository,
+ 'translator' => $this->getTranslator(),
+ ]
+ )
);
$form->setObjectManager($this->getObjectManager());
$form->setTranslator($this->getTranslator());
diff --git a/src/Fieldset/AbstractDoctrineFieldset.php b/src/Fieldset/AbstractDoctrineFieldset.php
index 48f14b4..76915b0 100644
--- a/src/Fieldset/AbstractDoctrineFieldset.php
+++ b/src/Fieldset/AbstractDoctrineFieldset.php
@@ -13,9 +13,10 @@ abstract class AbstractDoctrineFieldset extends AbstractFieldset
/**
* AbstractFieldset constructor.
- * @param ObjectManager $objectManager
- * @param string $name Lower case short class name
- * @param array $options
+ *
+ * @param ObjectManager $objectManager
+ * @param string $name Lower case short class name
+ * @param array $options
*/
public function __construct(ObjectManager $objectManager, string $name, array $options = [])
{
@@ -27,16 +28,17 @@ public function __construct(ObjectManager $objectManager, string $name, array $o
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineFieldset
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineFieldset
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineFieldset
{
$this->objectManager = $objectManager;
return $this;
diff --git a/src/Fieldset/AbstractFieldset.php b/src/Fieldset/AbstractFieldset.php
index 768083e..7f13a0c 100644
--- a/src/Fieldset/AbstractFieldset.php
+++ b/src/Fieldset/AbstractFieldset.php
@@ -14,9 +14,11 @@ abstract class AbstractFieldset extends Fieldset
public function init()
{
- $this->add([
- 'name' => 'id',
- 'type' => Hidden::class,
- ]);
+ $this->add(
+ [
+ 'name' => 'id',
+ 'type' => Hidden::class,
+ ]
+ );
}
}
\ No newline at end of file
diff --git a/src/Filter/ToFloat.php b/src/Filter/ToFloat.php
index 0503763..0fe0e54 100644
--- a/src/Filter/ToFloat.php
+++ b/src/Filter/ToFloat.php
@@ -8,9 +8,10 @@ class ToFloat extends AbstractFilter
{
/**
* @param mixed $value
+ *
* @return float
*/
- public function filter($value)
+ public function filter($value) : float
{
$float = $value;
diff --git a/src/Form/AbstractDoctrineForm.php b/src/Form/AbstractDoctrineForm.php
index 3b5ed68..517254c 100644
--- a/src/Form/AbstractDoctrineForm.php
+++ b/src/Form/AbstractDoctrineForm.php
@@ -18,16 +18,17 @@ abstract class AbstractDoctrineForm extends AbstractForm implements ObjectManage
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineForm
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineForm
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineForm
{
$this->objectManager = $objectManager;
return $this;
diff --git a/src/Form/AbstractForm.php b/src/Form/AbstractForm.php
index f3ece2b..deba734 100644
--- a/src/Form/AbstractForm.php
+++ b/src/Form/AbstractForm.php
@@ -51,12 +51,12 @@ protected function prepareBindData(array $values, array $match)
{
$data = [];
foreach ($values as $name => $value) {
- if (! array_key_exists($name, $match)) {
+ if ( ! array_key_exists($name, $match)) {
continue;
}
if (is_array($value) && is_array($match[$name])) {
- if (!empty(array_filter($value))) {
+ if ( ! empty(array_filter($value))) {
$data[$name] = $this->prepareBindData($value, $match[$name]);
}
} else {
@@ -74,7 +74,7 @@ protected function prepareBindData(array $values, array $match)
*/
public function init()
{
- if (!$this->has('submit')) {
+ if ( ! $this->has('submit')) {
$this->addSubmitButton();
}
}
@@ -84,19 +84,21 @@ public function init()
*
* Overwrite default usage of this function by adding your own element with 'name' => 'submit' to your Form.
*
- * @param string $value
+ * @param string $value
* @param array|null $classes
*/
public function addSubmitButton($value = 'Save', array $classes = null)
{
- $this->add([
- 'name' => 'submit',
- 'type' => Submit::class,
- 'attributes' => [
- 'value' => $value,
- 'class' => (!is_null($classes) ? join (' ', $classes) : 'btn btn-primary'),
- ],
- ]);
+ $this->add(
+ [
+ 'name' => 'submit',
+ 'type' => Submit::class,
+ 'attributes' => [
+ 'value' => $value,
+ 'class' => (! is_null($classes) ? join(' ', $classes) : 'btn btn-primary'),
+ ],
+ ]
+ );
}
/**
@@ -105,7 +107,8 @@ public function addSubmitButton($value = 'Save', array $classes = null)
* Extends Zend\Form with CSRF fields that can be retrieved by the name "CSRF"
* but are resolved to their unique name
*
- * @param string $elementOrFieldset
+ * @param string $elementOrFieldset
+ *
* @throws InvalidElementException
* @return ElementInterface
*/
@@ -128,14 +131,16 @@ public function get($elementOrFieldset)
*/
protected function addElementCsrf($csrfName = 'csrf')
{
- $this->add([
- 'type' => Csrf::class,
- 'name' => $csrfName,
- 'options' => [
- 'csrf_options' => [
- 'timeout' => $this->csrfTimeout,
+ $this->add(
+ [
+ 'type' => Csrf::class,
+ 'name' => $csrfName,
+ 'options' => [
+ 'csrf_options' => [
+ 'timeout' => $this->csrfTimeout,
+ ],
],
- ],
- ]);
+ ]
+ );
}
}
\ No newline at end of file
diff --git a/src/Form/GenericDeleteForm.php b/src/Form/GenericDeleteForm.php
index e6411d3..c481fd9 100644
--- a/src/Form/GenericDeleteForm.php
+++ b/src/Form/GenericDeleteForm.php
@@ -13,34 +13,40 @@ class GenericDeleteForm extends AbstractForm
*/
public function init()
{
- $this->add([
- 'name' => 'id',
- 'type' => Hidden::class,
- ]);
+ $this->add(
+ [
+ 'name' => 'id',
+ 'type' => Hidden::class,
+ ]
+ );
- $this->add([
- 'name' => 'delete',
- 'required' => true,
- 'type' => Select::class,
- 'options' => [
- 'label' => _('Confirm deletion'),
- 'value_options' => [
- 'yes' => _('Yes, delete it.'),
- 'no' => _('I made a mistake, take me back.'),
+ $this->add(
+ [
+ 'name' => 'delete',
+ 'required' => true,
+ 'type' => Select::class,
+ 'options' => [
+ 'label' => _('Confirm deletion'),
+ 'value_options' => [
+ 'yes' => _('Yes, delete it.'),
+ 'no' => _('I made a mistake, take me back.'),
+ ],
],
- ],
- 'attributes' => [
- 'value' => 'no',
- ],
- ]);
+ 'attributes' => [
+ 'value' => 'no',
+ ],
+ ]
+ );
- $this->add([
- 'name' => 'submit',
- 'type' => Submit::class,
- 'attributes' => [
- 'value' => _('Confirm action'),
- ],
- ]);
+ $this->add(
+ [
+ 'name' => 'submit',
+ 'type' => Submit::class,
+ 'attributes' => [
+ 'value' => _('Confirm action'),
+ ],
+ ]
+ );
//Call parent initializer. Check in parent what it does.
parent::init();
diff --git a/src/Form/GenericDoctrineDeleteForm.php b/src/Form/GenericDoctrineDeleteForm.php
index ce6916c..d9be763 100644
--- a/src/Form/GenericDoctrineDeleteForm.php
+++ b/src/Form/GenericDoctrineDeleteForm.php
@@ -13,34 +13,40 @@ class GenericDoctrineDeleteForm extends AbstractDoctrineForm
*/
public function init()
{
- $this->add([
- 'name' => 'id',
- 'type' => Hidden::class,
- ]);
+ $this->add(
+ [
+ 'name' => 'id',
+ 'type' => Hidden::class,
+ ]
+ );
- $this->add([
- 'name' => 'delete',
- 'required' => true,
- 'type' => Select::class,
- 'options' => [
- 'label' => _('Confirm deletion'),
- 'value_options' => [
- 'yes' => _('Yes, delete it.'),
- 'no' => _('I made a mistake, take me back.'),
+ $this->add(
+ [
+ 'name' => 'delete',
+ 'required' => true,
+ 'type' => Select::class,
+ 'options' => [
+ 'label' => _('Confirm deletion'),
+ 'value_options' => [
+ 'yes' => _('Yes, delete it.'),
+ 'no' => _('I made a mistake, take me back.'),
+ ],
],
- ],
- 'attributes' => [
- 'value' => 'no',
- ],
- ]);
+ 'attributes' => [
+ 'value' => 'no',
+ ],
+ ]
+ );
- $this->add([
- 'name' => 'submit',
- 'type' => Submit::class,
- 'attributes' => [
- 'value' => _('Confirm action'),
- ],
- ]);
+ $this->add(
+ [
+ 'name' => 'submit',
+ 'type' => Submit::class,
+ 'attributes' => [
+ 'value' => _('Confirm action'),
+ ],
+ ]
+ );
//Call parent initializer. Check in parent what it does.
parent::init();
diff --git a/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php b/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php
index 6878718..bc66ebd 100644
--- a/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php
+++ b/src/InputFilter/AbstractDoctrineFieldsetInputFilter.php
@@ -5,6 +5,7 @@
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
@@ -16,17 +17,20 @@ abstract class AbstractDoctrineFieldsetInputFilter extends AbstractDoctrineInput
/**
* AbstractDoctrineFieldsetInputFilter constructor.
+ *
* @param array $options
*/
public function __construct(array $options)
{
// Check if ObjectRepository instance for InputFilter is set
- if (!isset($options['object_repository'])) {
+ if ( ! isset($options['object_repository'])) {
- throw new InvalidArgumentException('Required parameter "object_repository" not found. InputFilters require the Doctrine ObjectRepository.');
+ throw new InvalidArgumentException(
+ 'Required parameter "object_repository" not found. InputFilters require the Doctrine ObjectRepository.'
+ );
}
- if (!$options['object_repository'] instanceof ObjectRepository) {
+ if ( ! $options['object_repository'] instanceof ObjectRepository) {
throw new InvalidArgumentException('Given ObjectRepository not an instance of ' . ObjectRepository::class);
}
@@ -37,31 +41,40 @@ public function __construct(array $options)
public function init()
{
- $this->add([
- 'name' => 'id',
- 'required' => true,
- 'filters' => [
- ['name' => ToInt::class],
- ],
- 'validators' => [
- ['name' => IsInt::class],
- ],
- ]);
+ $this->add(
+ [
+ 'name' => 'id',
+ 'required' => true,
+ 'filters' => [
+ ['name' => ToInt::class],
+ [
+ 'name' => ToNull::class,
+ 'options' => [
+ 'type' => ToNull::TYPE_INTEGER,
+ ],
+ ],
+ ],
+ 'validators' => [
+ ['name' => IsInt::class],
+ ],
+ ]
+ );
}
/**
* @return ObjectRepository
*/
- public function getObjectRepository(): ObjectRepository
+ public function getObjectRepository() : ObjectRepository
{
return $this->objectRepository;
}
/**
* @param ObjectRepository $objectRepository
+ *
* @return AbstractDoctrineFieldsetInputFilter
*/
- public function setObjectRepository(ObjectRepository $objectRepository): AbstractDoctrineFieldsetInputFilter
+ public function setObjectRepository(ObjectRepository $objectRepository) : AbstractDoctrineFieldsetInputFilter
{
$this->objectRepository = $objectRepository;
return $this;
diff --git a/src/InputFilter/AbstractDoctrineFormInputFilter.php b/src/InputFilter/AbstractDoctrineFormInputFilter.php
index 47d823b..ac93f66 100644
--- a/src/InputFilter/AbstractDoctrineFormInputFilter.php
+++ b/src/InputFilter/AbstractDoctrineFormInputFilter.php
@@ -17,15 +17,17 @@ abstract class AbstractDoctrineFormInputFilter extends AbstractDoctrineInputFilt
public function init()
{
// If CSRF validation has not been added, add it here
- if (!$this->has('csrf')) {
- $this->add([
- 'name' => 'csrf',
- 'required' => true,
- 'filters' => [],
- 'validators' => [
- ['name' => Csrf::class],
- ],
- ]);
+ if ( ! $this->has('csrf')) {
+ $this->add(
+ [
+ 'name' => 'csrf',
+ 'required' => true,
+ 'filters' => [],
+ 'validators' => [
+ ['name' => Csrf::class],
+ ],
+ ]
+ );
}
}
}
\ No newline at end of file
diff --git a/src/InputFilter/AbstractDoctrineInputFilter.php b/src/InputFilter/AbstractDoctrineInputFilter.php
index 4300356..8852269 100644
--- a/src/InputFilter/AbstractDoctrineInputFilter.php
+++ b/src/InputFilter/AbstractDoctrineInputFilter.php
@@ -13,6 +13,7 @@ abstract class AbstractDoctrineInputFilter extends AbstractInputFilter
/**
* AbstractFormInputFilter constructor.
+ *
* @param array $options
*/
public function __construct(array $options)
@@ -29,16 +30,17 @@ public function __construct(array $options)
/**
* @return ObjectManager
*/
- public function getObjectManager(): ObjectManager
+ public function getObjectManager() : ObjectManager
{
return $this->objectManager;
}
/**
* @param ObjectManager $objectManager
+ *
* @return AbstractDoctrineInputFilter
*/
- public function setObjectManager(ObjectManager $objectManager): AbstractDoctrineInputFilter
+ public function setObjectManager(ObjectManager $objectManager) : AbstractDoctrineInputFilter
{
$this->objectManager = $objectManager;
return $this;
diff --git a/src/InputFilter/AbstractFieldsetInputFilter.php b/src/InputFilter/AbstractFieldsetInputFilter.php
index a0313f1..20d7d36 100644
--- a/src/InputFilter/AbstractFieldsetInputFilter.php
+++ b/src/InputFilter/AbstractFieldsetInputFilter.php
@@ -3,6 +3,7 @@
namespace Keet\Form\InputFilter;
use Zend\Filter\ToInt;
+use Zend\Filter\ToNull;
use Zend\I18n\Validator\IsInt;
abstract class AbstractFieldsetInputFilter extends AbstractInputFilter
@@ -12,15 +13,23 @@ abstract class AbstractFieldsetInputFilter extends AbstractInputFilter
*/
public function init()
{
- $this->add([
- 'name' => 'id',
- 'required' => false,
- 'filters' => [
- ['name' => ToInt::class],
- ],
- 'validators' => [
- ['name' => IsInt::class],
- ],
- ]);
+ $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/AbstractFormInputFilter.php b/src/InputFilter/AbstractFormInputFilter.php
index ca24a3c..701d976 100644
--- a/src/InputFilter/AbstractFormInputFilter.php
+++ b/src/InputFilter/AbstractFormInputFilter.php
@@ -12,15 +12,17 @@ abstract class AbstractFormInputFilter extends AbstractInputFilter
public function init()
{
// If CSRF validation has not been added, add it here
- if (!$this->has('csrf')) {
- $this->add([
- 'name' => 'csrf',
- 'required' => true,
- 'filters' => [],
- 'validators' => [
- ['name' => Csrf::class],
- ],
- ]);
+ if ( ! $this->has('csrf')) {
+ $this->add(
+ [
+ 'name' => 'csrf',
+ 'required' => true,
+ 'filters' => [],
+ 'validators' => [
+ ['name' => Csrf::class],
+ ],
+ ]
+ );
}
}
}
\ No newline at end of file
diff --git a/src/InputFilter/AbstractInputFilter.php b/src/InputFilter/AbstractInputFilter.php
index 9cace91..a6f43c8 100644
--- a/src/InputFilter/AbstractInputFilter.php
+++ b/src/InputFilter/AbstractInputFilter.php
@@ -15,8 +15,8 @@
* The isValid function of the parent is overridden in this class. The function does a pre-check to see if the the
* current object to check is required. If not a further check is done to see if the element is empty. This check is
* done using the arrayFilterEmpty function. This function recursively loops objects to see if they're empty. As such,
- * a structure could have nested non-required empty objects, which will be skipped from validation. If any child contains
- * a bit of data, the parent will be checked as per normal rules of Zend Framework.
+ * a structure could have nested non-required empty objects, which will be skipped from validation. If any child
+ * contains a bit of data, the parent will be checked as per normal rules of Zend Framework.
*/
abstract class AbstractInputFilter extends InputFilter
{
@@ -34,25 +34,31 @@ abstract class AbstractInputFilter extends InputFilter
/**
* AbstractFormInputFilter constructor.
+ *
* @param array $options
*/
public function __construct(array $options)
{
// Check for presence of translator so as to translate return messages
- if (!isset($options['translator'])) {
+ if ( ! isset($options['translator'])) {
- throw new InvalidArgumentException('Required parameter "translator" not found. InputFilters require the Zend\I18n\Translator\Translator.');
+ throw new InvalidArgumentException(
+ 'Required parameter "translator" not found. InputFilters require the Zend\I18n\Translator\Translator.'
+ );
}
- if (!$options['translator'] instanceof 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".');
+ throw new InvalidArgumentException(
+ 'Incorrect translator was given for the InputFilter. Required to be instance of "Zend\I18n\Translator\Translator".'
+ );
}
$this->setTranslator($options['translator']);
}
/**
* @param array $array
+ *
* @return bool
*/
function arrayFilterEmpty($array)
@@ -64,7 +70,7 @@ function arrayFilterEmpty($array)
}
foreach ($rest as $key => $value) {
- if (!is_array($value) && !empty($value)) {
+ if ( ! is_array($value) && ! empty($value)) {
return false;
}
@@ -87,7 +93,7 @@ function arrayFilterEmpty($array)
*/
public function isValid($context = null)
{
- if (!$this->isRequired() && $this->arrayFilterEmpty($this->getRawValues())) {
+ if ( ! $this->isRequired() && $this->arrayFilterEmpty($this->getRawValues())) {
return true;
}
diff --git a/src/InputFilter/CollectionInputFilter.php b/src/InputFilter/CollectionInputFilter.php
index 1b1568f..c8d19b4 100644
--- a/src/InputFilter/CollectionInputFilter.php
+++ b/src/InputFilter/CollectionInputFilter.php
@@ -2,6 +2,9 @@
namespace Keet\Form\InputFilter;
+use InvalidArgumentException;
+use Traversable;
+
class CollectionInputFilter extends \Zend\InputFilter\CollectionInputFilter
{
/**
@@ -28,7 +31,7 @@ public function isValid($context = null)
$valid = false;
}
- if (! $this->data) {
+ if ( ! $this->data) {
$this->clearValues();
$this->clearRawValues();
diff --git a/src/InputFilter/GenericDeleteFieldsetInputFilter.php b/src/InputFilter/GenericDeleteFieldsetInputFilter.php
index f9fbe54..9747add 100644
--- a/src/InputFilter/GenericDeleteFieldsetInputFilter.php
+++ b/src/InputFilter/GenericDeleteFieldsetInputFilter.php
@@ -10,22 +10,24 @@ public function init()
{
parent::init();
- $this->add([
- 'name' => 'delete',
- 'required' => true,
- 'filters' => [],
- 'validators' => [
- [
- 'name' => InArray::class,
- 'options' => [
- 'haystack' => [
- 'yes',
- 'no',
+ $this->add(
+ [
+ 'name' => 'delete',
+ 'required' => true,
+ 'filters' => [],
+ 'validators' => [
+ [
+ 'name' => InArray::class,
+ 'options' => [
+ 'haystack' => [
+ 'yes',
+ 'no',
+ ],
],
+ 'strict' => InArray::COMPARE_NOT_STRICT,
],
- 'strict' => InArray::COMPARE_NOT_STRICT,
],
- ],
- ]);
+ ]
+ );
}
}
\ No newline at end of file
diff --git a/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php b/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php
index 05a04c1..5bb0d46 100644
--- a/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php
+++ b/src/InputFilter/GenericDoctrineDeleteFieldsetInputFilter.php
@@ -10,22 +10,24 @@ public function init()
{
parent::init();
- $this->add([
- 'name' => 'delete',
- 'required' => true,
- 'filters' => [],
- 'validators' => [
- [
- 'name' => InArray::class,
- 'options' => [
- 'haystack' => [
- 'yes',
- 'no',
+ $this->add(
+ [
+ 'name' => 'delete',
+ 'required' => true,
+ 'filters' => [],
+ 'validators' => [
+ [
+ 'name' => InArray::class,
+ 'options' => [
+ 'haystack' => [
+ 'yes',
+ 'no',
+ ],
],
+ 'strict' => InArray::COMPARE_NOT_STRICT,
],
- 'strict' => InArray::COMPARE_NOT_STRICT,
],
- ],
- ]);
+ ]
+ );
}
}
\ No newline at end of file
diff --git a/src/Module.php b/src/Module.php
index 52707dd..4fd926e 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -10,7 +10,7 @@ class Module implements ConfigProviderInterface, AutoloaderProviderInterface
/**
* @return array
*/
- public function getConfig(): array
+ public function getConfig() : array
{
$config = [];
@@ -24,7 +24,7 @@ public function getConfig(): array
/**
* @return array
*/
- public function getAutoloaderConfig(): array
+ public function getAutoloaderConfig() : array
{
return [
'Zend\Loader\StandardAutoloader' => [
diff --git a/src/Validator/NoOtherObjectExists.php b/src/Validator/NoOtherObjectExists.php
index 3bb2741..ace3886 100644
--- a/src/Validator/NoOtherObjectExists.php
+++ b/src/Validator/NoOtherObjectExists.php
@@ -6,16 +6,18 @@
/**
* Class NoOtherObjectExists
+ *
* @package Keet\Form\Validator
*
* =======================
*
- * TIP: Best set this requirement in Factory (which loads the form). ID for comparison object (the one you're modifying) is required.
+ * TIP: Best set this requirement in Factory (which loads the form). ID for comparison object (the one you're
+ * modifying) is required.
*
* In Factory that sets this Validator on Input:
- * @var \Zend\Router\Http\TreeRouteStack $router
+ * @var \Zend\Router\Http\TreeRouteStack $router
* $router = $this->getServiceManager()->get('router');
- * @var \Zend\Http\Request $request
+ * @var \Zend\Http\Request $request
* $request = $this->getServiceManager()->get('request');
*
* Then get the required ID: $router->match($request)->getParam('id')
@@ -58,34 +60,45 @@ class NoOtherObjectExists extends NoObjectExists
{
/**
* @param mixed $value
+ *
* @return bool
* @throws \Exception
*/
public function isValid($value)
{
- if (!array_key_exists('fields', $this->getOptions())) {
+ if ( ! array_key_exists('fields', $this->getOptions())) {
- throw new \InvalidArgumentException('Required option "property" not set for NoOtherObjectExists Validator.');
+ throw new \InvalidArgumentException(
+ 'Required option "property" not set for NoOtherObjectExists Validator.'
+ );
}
- if (!array_key_exists('class', $this->getOptions())) {
+ if ( ! array_key_exists('class', $this->getOptions())) {
- throw new \InvalidArgumentException('Required option "class" not set for NoOtherObjectExists Validator.');
+ throw new \InvalidArgumentException(
+ 'Required option "class" not set for NoOtherObjectExists Validator.'
+ );
}
- if (!array_key_exists('comparison_object', $this->getOptions())) {
+ if ( ! array_key_exists('comparison_object', $this->getOptions())) {
- throw new \InvalidArgumentException('Required option "comparison_object" not set for NoOtherObjectExists Validator.');
+ throw new \InvalidArgumentException(
+ 'Required option "comparison_object" not set for NoOtherObjectExists Validator.'
+ );
}
- if (!array_key_exists('identifier', $this->getOption('comparison_object'))) {
+ if ( ! array_key_exists('identifier', $this->getOption('comparison_object'))) {
- throw new \InvalidArgumentException('Required option "identifier" not set for NoOtherObjectExists Validator "comparison_object".');
+ throw new \InvalidArgumentException(
+ 'Required option "identifier" not set for NoOtherObjectExists Validator "comparison_object".'
+ );
}
- if (!array_key_exists('id', $this->getOption('comparison_object'))) {
+ if ( ! array_key_exists('id', $this->getOption('comparison_object'))) {
- throw new \InvalidArgumentException('Required option "id" not set for NoOtherObjectExists Validator "comparison_object".');
+ throw new \InvalidArgumentException(
+ 'Required option "id" not set for NoOtherObjectExists Validator "comparison_object".'
+ );
}
$propertyName = $this->getOption('fields');
@@ -97,11 +110,14 @@ public function isValid($value)
$comparisonObjectProperties = $this->getOption('comparison_object');
$getIdentifier = 'get' . ucfirst($comparisonObjectProperties['identifier']);
- /** @var object $comparisonObject */
- $comparisonObject = $this->objectRepository->findOneBy([
- $comparisonObjectProperties['identifier'] => $comparisonObjectProperties['id']
- ]);
- if (!method_exists($comparisonObject, $getterMethod)) {
+ /** @var \object $comparisonObject */
+ $comparisonObject = $this->objectRepository->findOneBy(
+ [
+ $comparisonObjectProperties['identifier'] => $comparisonObjectProperties['id'],
+ ]
+ );
+
+ if ( ! method_exists($comparisonObject, $getterMethod)) {
throw new \Exception(sprintf('Method %s() doesn\'t exist in class %s!', $getterMethod, $propertyClass));
}
diff --git a/view/partials/generic-delete-form.phtml b/view/partials/generic-delete-form.phtml
index 5fbbc39..ec08a54 100644
--- a/view/partials/generic-delete-form.phtml
+++ b/view/partials/generic-delete-form.phtml
@@ -2,17 +2,17 @@
/** @var \Keet\Form\Form\GenericDeleteForm $form */
$getter = 'get' . ucfirst($form->getOption('unique_property'));
?>
-
- translate('Delete') ?>: getObject()->{$getter}() ?>
-
+
+ translate('Delete') ?>: getObject()->{$getter}() ?>
+
+
prepare();
- echo $this->form()->openTag($form);
- echo $this->formRow($form->get('csrf'));
+$form->prepare();
+echo $this->form()->openTag($form);
+echo $this->formRow($form->get('csrf'));
- echo $this->formRow($form->get('id'));
- echo $this->formRow($form->get('delete'));
+echo $this->formRow($form->get('id'));
+echo $this->formRow($form->get('delete'));
- echo $this->formRow($form->get('submit'));
- echo $this->form()->closeTag($form);
-?>
\ No newline at end of file
+echo $this->formRow($form->get('submit'));
+echo $this->form()->closeTag($form);
\ No newline at end of file
diff --git a/view/partials/generic-doctrine-delete-form.phtml b/view/partials/generic-doctrine-delete-form.phtml
index 121c4ab..3156ef0 100644
--- a/view/partials/generic-doctrine-delete-form.phtml
+++ b/view/partials/generic-doctrine-delete-form.phtml
@@ -2,17 +2,17 @@
/** @var \Keet\Form\Form\GenericDoctrineDeleteForm $form */
$getter = 'get' . ucfirst($form->getOption('unique_property'));
?>
-
- translate('Delete') ?>: getObject()->{$getter}() ?>
-
+
+ translate('Delete') ?>: getObject()->{$getter}() ?>
+
prepare();
- echo $this->form()->openTag($form);
- echo $this->formRow($form->get('csrf'));
+$form->prepare();
+echo $this->form()
+ ->openTag($form);
+echo $this->formRow($form->get('csrf'));
- echo $this->formRow($form->get('id'));
- echo $this->formRow($form->get('delete'));
+echo $this->formRow($form->get('id'));
+echo $this->formRow($form->get('delete'));
- echo $this->formRow($form->get('submit'));
- echo $this->form()->closeTag($form);
-?>
\ No newline at end of file
+echo $this->formRow($form->get('submit'));
+echo $this->form()->closeTag($form);
\ No newline at end of file