WIP

romm · May 15, 2017 · c4d3776 · c4d3776
1 parent 45eaaea
commit c4d3776
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/Classes/Condition/ConditionFactory.php b/Classes/Condition/ConditionFactory.php
@@ -13,6 +13,7 @@
 
 namespace Romm\Formz\Condition;
 
+use InvalidArgumentException;
 use Romm\Formz\Condition\Items\ConditionItemInterface;
 use Romm\Formz\Condition\Items\FieldHasErrorCondition;
 use Romm\Formz\Condition\Items\FieldHasValueCondition;
@@ -22,6 +23,7 @@
 use Romm\Formz\Exceptions\ClassNotFoundException;
 use Romm\Formz\Exceptions\EntryNotFoundException;
 use Romm\Formz\Exceptions\InvalidArgumentTypeException;
+use Romm\Formz\Exceptions\MissingArgumentException;
 use Romm\Formz\Service\Traits\SelfInstantiateTrait;
 use TYPO3\CMS\Core\SingletonInterface;
 
@@ -128,19 +130,23 @@ public function getConditions()
      * @param array  $arguments
      * @return ConditionItemInterface
      * @throws EntryNotFoundException
+     * @throws MissingArgumentException
      */
     public function instantiateCondition($identifier, array $arguments = [])
     {
         if (false === $this->hasCondition($identifier)) {
             throw EntryNotFoundException::instantiateConditionNotFound($identifier, $this->conditions);
         }
 
-        // @todo handle \InvalidArgumentException
-        /** @var ConditionItemInterface $condition */
-        $condition = call_user_func_array(
-            [Core::class, 'instantiate'],
-            array_merge([$this->conditions[$identifier]], $arguments)
-        );
+        try {
+            /** @var ConditionItemInterface $condition */
+            $condition = call_user_func_array(
+                [Core::class, 'instantiate'],
+                array_merge([$this->conditions[$identifier]], $arguments)
+            );   
+        } catch (InvalidArgumentException $exception) {
+            throw MissingArgumentException::conditionConstructorArgumentMissing($identifier, $this->conditions[$identifier], $arguments);
+        }
 
         return $condition;
     }

diff --git a/Classes/Exceptions/MissingArgumentException.php b/Classes/Exceptions/MissingArgumentException.php
@@ -17,6 +17,8 @@ class MissingArgumentException extends FormzException
 {
     const ARGUMENT_MISSING = 'The argument "%s" was not found in the request.';
 
+    const CONDITION_CONSTRUCTOR_ARGUMENT_MISSING = 'Error while instantiating the condition "%s" of type "%s": a constructor argument is missing. Given arguments were: "%s".';
+
     /**
      * @code 1490179179
      *
@@ -48,4 +50,23 @@ final public static function ajaxControllerClassNameArgumentNotSet()
 
         return $exception;
     }
+
+    /**
+     * @code 1494850270
+     *
+     * @param string $conditionName
+     * @param string $conditionClassName
+     * @param array  $arguments
+     * @return self
+     */
+    final public static function conditionConstructorArgumentMissing($conditionName, $conditionClassName, array $arguments)
+    {
+        /** @var self $exception */
+        $exception = self::getNewExceptionInstance(
+            self::CONDITION_CONSTRUCTOR_ARGUMENT_MISSING,
+            [$conditionName, $conditionClassName, implode('", "', array_keys($arguments))]
+        );
+
+        return $exception;
+    }
 }