[FEATURE] add getter getInstances() in FormObjectFactory

Classes/AssetHandler/Connector/AssetHandlerConnectorManager.php

@@ -122,7 +122,7 @@ public function getFormzGeneratedFilePath($prefix = '')
             0,
             22
         );
-        $identifier .= '-' . md5($formObject->getHash());
+        $identifier .= '-' . md5($formObject->getHash() . $formObject->getName());
 
         return CacheService::GENERATED_FILES_PATH . $identifier;
     }

Classes/Condition/ConditionFactory.php

@@ -14,9 +14,11 @@
 namespace Romm\Formz\Condition;
 
 use Romm\Formz\Condition\Items\ConditionItemInterface;
+use Romm\Formz\Condition\Items\FieldCountValuesCondition;
 use Romm\Formz\Condition\Items\FieldHasErrorCondition;
 use Romm\Formz\Condition\Items\FieldHasValueCondition;
 use Romm\Formz\Condition\Items\FieldIsEmptyCondition;
+use Romm\Formz\Condition\Items\FieldIsFilledCondition;
 use Romm\Formz\Condition\Items\FieldIsValidCondition;
 use Romm\Formz\Exceptions\ClassNotFoundException;
 use Romm\Formz\Exceptions\EntryNotFoundException;
@@ -134,6 +136,12 @@ public function registerDefaultConditions()
             )->registerCondition(
                 FieldIsEmptyCondition::CONDITION_NAME,
                 FieldIsEmptyCondition::class
+            )->registerCondition(
+                FieldIsFilledCondition::CONDITION_IDENTIFIER,
+                FieldIsFilledCondition::class
+            )->registerCondition(
+                FieldCountValuesCondition::CONDITION_IDENTIFIER,
+                FieldCountValuesCondition::class
             );
         }
     }

Classes/Condition/Exceptions/InvalidConditionException.php

@@ -149,6 +149,23 @@ final public static function conditionFieldIsEmptyFieldNotFound($fieldName)
         return $exception;
     }
 
+    /**
+     * @code 1518016343128
+     *
+     * @param string $fieldName
+     * @return InvalidConditionException
+     */
+    final public static function conditionFieldIsFilledFieldNotFound($fieldName)
+    {
+        /** @var self $exception */
+        $exception = self::getNewExceptionInstance(
+            self::FIELD_DOES_NOT_EXIST,
+            [$fieldName]
+        );
+
+        return $exception;
+    }
+
     /**
      * @code 1488183577
      *
@@ -165,4 +182,21 @@ final public static function conditionFieldIsValidFieldNotFound($fieldName)
 
         return $exception;
     }
+
+    /**
+     * @code 1519909297
+     *
+     * @param string $fieldName
+     * @return InvalidConditionException
+     */
+    final public static function conditionFieldCountValuesFieldNotFound($fieldName)
+    {
+        /** @var self $exception */
+        $exception = self::getNewExceptionInstance(
+            self::FIELD_DOES_NOT_EXIST,
+            [$fieldName]
+        );
+
+        return $exception;
+    }
 }

Classes/Condition/Items/FieldCountValuesCondition.php

@@ -0,0 +1,108 @@
+<?php
+/*
+ * 2017 Romain CANON <romain.hydrocanon@gmail.com>
+ *
+ * This file is part of the TYPO3 FormZ project.
+ * It is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License, either
+ * version 3 of the License, or any later version.
+ *
+ * For the full copyright and license information, see:
+ * http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Romm\Formz\Condition\Items;
+
+use Romm\Formz\Condition\Exceptions\InvalidConditionException;
+use Romm\Formz\Condition\Processor\DataObject\PhpConditionDataObject;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+
+/**
+ * This condition will match when a field has a number of selected items between
+ * a given minimum and maximum.
+ */
+class FieldCountValuesCondition extends AbstractConditionItem
+{
+    const CONDITION_IDENTIFIER = 'fieldCountValues';
+
+    /**
+     * @inheritdoc
+     * @var array
+     */
+    protected static $javaScriptFiles = [
+        'EXT:formz/Resources/Public/JavaScript/Conditions/Formz.Condition.FieldCountValues.js'
+    ];
+
+    /**
+     * @var string
+     * @validate NotEmpty
+     */
+    protected $fieldName;
+
+    /**
+     * @var int
+     */
+    protected $minimum;
+
+    /**
+     * @var int
+     */
+    protected $maximum;
+
+    /**
+     * @param string $fieldName
+     * @param int $minimum
+     * @param int $maximum
+     */
+    public function __construct($fieldName, $minimum = null, $maximum = null)
+    {
+        $this->fieldName = $fieldName;
+        $this->minimum = $minimum;
+        $this->maximum = $maximum;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getJavaScriptResult()
+    {
+        return $this->getDefaultJavaScriptCall([
+            'fieldName'  => $this->fieldName,
+            'minimum' => $this->minimum,
+            'maximum' => $this->maximum
+        ]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPhpResult(PhpConditionDataObject $dataObject)
+    {
+        $value = ObjectAccess::getProperty($dataObject->getForm(), $this->fieldName);
+
+        return !($this->minimum && count($value) < (int)$this->minimum)
+            && !($this->maximum && count($value) > (int)$this->maximum);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws InvalidConditionException
+     */
+    protected function checkConditionConfiguration()
+    {
+        $configuration = $this->formObject->getConfiguration();
+
+        if (false === $configuration->hasField($this->fieldName)) {
+            throw InvalidConditionException::conditionFieldCountValuesFieldNotFound($this->fieldName);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getCssResult()
+    {
+        return '';
+    }
+}

Classes/Condition/Items/FieldIsEmptyCondition.php

@@ -45,7 +45,10 @@ class FieldIsEmptyCondition extends AbstractConditionItem
      */
     public function getCssResult()
     {
-        return '[' . DataAttributesAssetHandler::getFieldDataValueKey($this->fieldName) . '=""]';
+        return [
+            '[' . DataAttributesAssetHandler::getFieldDataValueKey($this->fieldName) . '=""]',
+            ':not([' . DataAttributesAssetHandler::getFieldDataValueKey($this->fieldName) . '])'
+        ];
     }
 
     /**

Classes/Condition/Items/FieldIsFilledCondition.php

@@ -0,0 +1,95 @@
+<?php
+/*
+ * 2018 Abdeljabar SAID <abdeljabar.saiid@gmail.com
+ * 2017 Romain CANON <romain.hydrocanon@gmail.com>
+ *
+ * This file is part of the TYPO3 FormZ project.
+ * It is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License, either
+ * version 3 of the License, or any later version.
+ *
+ * For the full copyright and license information, see:
+ * http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Romm\Formz\Condition\Items;
+
+use Romm\Formz\AssetHandler\Html\DataAttributesAssetHandler;
+use Romm\Formz\Condition\Exceptions\InvalidConditionException;
+use Romm\Formz\Condition\Processor\DataObject\PhpConditionDataObject;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+
+/**
+ * This condition will match when a field is filled with any value.
+ */
+class FieldIsFilledCondition extends AbstractConditionItem
+{
+    const CONDITION_IDENTIFIER = 'fieldIsFilled';
+
+    /**
+     * @inheritdoc
+     * @var array
+     */
+    protected static $javaScriptFiles = [
+        'EXT:formz/Resources/Public/JavaScript/Conditions/Formz.Condition.FieldIsFilled.js'
+    ];
+
+    /**
+     * @var string
+     * @validate NotEmpty
+     */
+    protected $fieldName;
+
+    /**
+     * @param string $fieldName
+     */
+    public function __construct($fieldName)
+    {
+        $this->fieldName = $fieldName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCssResult()
+    {
+        $valueKey = DataAttributesAssetHandler::getFieldDataValueKey($this->fieldName);
+
+        return '[' . $valueKey . ']:not([' . $valueKey . '=""])';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getJavaScriptResult()
+    {
+        return $this->getDefaultJavaScriptCall(['fieldName' => $this->fieldName]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPhpResult(PhpConditionDataObject $dataObject)
+    {
+        $value = ObjectAccess::getProperty($dataObject->getForm(), $this->fieldName);
+
+        return !empty($value);
+    }
+
+    /**
+     * Checks the condition configuration/options.
+     *
+     * If any syntax/configuration error is found, an exception of type
+     * `InvalidConditionException` must be thrown.
+     *
+     * @throws InvalidConditionException
+     */
+    protected function checkConditionConfiguration()
+    {
+        $configuration = $this->formObject->getConfiguration();
+
+        if (false === $configuration->hasField($this->fieldName)) {
+            throw InvalidConditionException::conditionFieldIsFilledFieldNotFound($this->fieldName);
+        }
+    }
+}

Classes/Condition/Parser/Node/NodeInterface.php

@@ -27,9 +27,9 @@ interface NodeInterface
     public function getParent();
 
     /**
-     * @param NodeInterface $parent
+     * @param self $parent
      */
-    public function setParent(NodeInterface $parent);
+    public function setParent(self $parent);
 
     /**
      * @return ConditionTree

Classes/Configuration/ConfigurationFactory.php

@@ -69,7 +69,7 @@ public function getFormzConfiguration()
 
     /**
      * Will fetch the configuration from cache, and build it if not found. It
-     * wont be stored in cache if any error is found. This is done this way to
+     * won't be stored in cache if any error is found. This is done this way to
      * avoid the integrator to be forced to flush caches when errors are found.
      *
      * @param string $cacheIdentifier

Classes/Controller/AjaxValidationController.php

@@ -30,7 +30,6 @@
 use Romm\Formz\Service\ExtensionService;
 use Romm\Formz\Service\MessageService;
 use Romm\Formz\Validation\DataObject\ValidatorDataObject;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Error\Error;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\RequestInterface;
@@ -201,7 +200,7 @@ public function runAction($name, $className, $fieldName, $validatorName)
         $validatorDataObject = new ValidatorDataObject($this->formObject, $this->validation);
 
         /** @var ValidatorInterface $validator */
-        $validator = GeneralUtility::makeInstance(
+        $validator = Core::instantiate(
             $this->validation->getClassName(),
             $this->validation->getOptions(),
             $validatorDataObject

Classes/Form/FormObjectFactory.php

@@ -177,6 +177,14 @@ protected function getCacheIdentifier($className, $name)
             ]
         );
     }
+
+    /**
+     * @return FormObject[]
+     */
+    public function getInstances()
+    {
+        return $this->instances;
+    }
 
     /**
      * @param ConfigurationFactory $configurationFactory

Classes/Service/FormService.php

@@ -24,10 +24,6 @@
  *
  * - Access to the last submitted form which validation failed:
  *   `$myFailedForm = FormUtility::getFormWithErrors(MyForm::class);`
- *
- * - Automatic redirect if required argument is missing:
- *
- * @see `onRequiredArgumentIsMissing()`
  */
 class FormService implements SingletonInterface
 {

Classes/Service/ViewHelper/Field/FieldViewHelperService.php

@@ -108,14 +108,23 @@ public function getView(Layout $layout)
         $identifier = $layout->getTemplateFile();
 
         if (null === $this->view[$identifier]) {
-            /** @var StandaloneView $view */
-            $view = Core::instantiate(StandaloneView::class);
-            $view->setTemplatePathAndFilename($layout->getTemplateFile());
-
-            $this->view[$identifier] = $view;
+            $this->view[$identifier] = $this->getViewInstance($layout);
         }
 
-        return $this->view[$identifier];
+        return clone $this->view[$identifier];
+    }
+
+    /**
+     * @param Layout $layout
+     * @return StandaloneView
+     */
+    protected function getViewInstance(Layout $layout)
+    {
+        /** @var StandaloneView $view */
+        $view = Core::instantiate(StandaloneView::class);
+        $view->setTemplatePathAndFilename($layout->getTemplateFile());
+
+        return $view;
     }
 
     /**