symfony · mrcmorales · Jan 9, 2014 · Jan 9, 2014 · Jan 10, 2014 · wouterj
diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
@@ -42,7 +42,7 @@ public function validate($value, Constraint $constraint)
     /**
      * Returns a string representation of the type of the value.
      *
-     * @param  mixed $value
+     * @param mixed $value
      *
      * @return string
      */
@@ -54,7 +54,7 @@ private function valueToType($value)
     /**
      * Returns a string representation of the value.
      *
-     * @param  mixed  $value
+     * @param mixed $value
      *
      * @return string
      */
@@ -74,8 +74,8 @@ private function valueToString($value)
     /**
      * Compares the two given values to find if their relationship is valid
      *
-     * @param mixed      $value1     The first value to compare
-     * @param mixed      $value2     The second value to compare
+     * @param mixed $value1 The first value to compare
+     * @param mixed $value2 The second value to compare
      *
      * @return Boolean true if the relationship is valid, false otherwise
      */

diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComposite.php b/src/Symfony/Component/Validator/Constraints/AbstractComposite.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+
+/**
+ * @Annotation
+ *
+ * @author Marc Morales Valldepérez <[email protected]>
+ * @author Marc Morera Merino <[email protected]>
+ */
+abstract class AbstractComposite extends Constraint
+{
+
+    /**
+     * @var array
+     *
+     * Set of constraints
+     */
+    public $constraints = array();
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($options = null)
+    {
+        parent::__construct($options);
+
+        if (!is_array($this->constraints)) {
+            $this->constraints = array($this->constraints);
+        }
+
+        // We consider explicid groups are defined if are not default one
+        $areExplicitGroupsDefined = ( $this->groups != array(self::DEFAULT_GROUP));
+
+         // Each constraint contained
+        foreach ($this->constraints as $constraint) {
+            if (!$constraint instanceof Constraint) {
+                throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, __CLASS__));
+            }
+
+            if ($constraint instanceof Valid) {
+                throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', __CLASS__));
+            }
+
+            // If explicid groups are defined
+            if ($areExplicitGroupsDefined) {
+                /**
+                 * If constraint has explicid groups defined
+                 *
+                 * In that case, the groups of the nested constraint need to be
+                 * a subset of the groups of the outer constraint.
+                 */
+                if ($constraint->groups !== array(self::DEFAULT_GROUP)) {
+
+                    // If are not a subset
+                    if ($constraint->groups != array_intersect($constraint->groups, $this->groups)) {
+                        throw new ConstraintDefinitionException(sprintf('The groups defined in Constraint %s must be a subset of the groups defined in the Constraint %s', $constraint, __CLASS__));
+                    }
+
+                // Otherwise, we add all defined groups here
+                } else {
+                    foreach ($this->groups as $group) {
+                        $constraint->addImplicitGroupName($group);
+                    }
+                }
+
+            /**
+             * Otherwise, we merge current groups with constraint
+             */
+            } else {
+                $this->groups = array_unique(array_merge($this->groups, $constraint->groups));
+            }
+        }
+    }
+
+    /**
+     * Adds the given group if this constraint is in the Default group.
+     *
+     * Also propagate same method to nested Constraints.
+     *
+     * @param string $group
+     *
+     * @api
+     */
+    public function addImplicitGroupName($group)
+    {
+        parent::addImplicitGroupName($group);
+
+        foreach ($this->constraints as $constraint) {
+            $constraint->addImplicitGroupName($group);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'constraints';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequiredOptions()
+    {
+        return array('constraints');
+    }
+}
diff --git a/src/Symfony/Component/Validator/Constraints/All.php b/src/Symfony/Component/Validator/Constraints/All.php
@@ -20,6 +20,9 @@
  * @author Bernhard Schussek <[email protected]>
  *
  * @api
+ *
+ * @deprecated Deprecated in 2.5, to be removed in 3.0. Use
+ *             {@link \Symfony\Component\Validator\Constraints\Each} instead.
  */
 class All extends Constraint
 {
@@ -56,4 +59,5 @@ public function getRequiredOptions()
     {
         return array('constraints');
     }
+
 }
diff --git a/src/Symfony/Component/Validator/Constraints/AllValidator.php b/src/Symfony/Component/Validator/Constraints/AllValidator.php
@@ -19,6 +19,9 @@
  * @author Bernhard Schussek <[email protected]>
  *
  * @api
+ *
+ * @deprecated Deprecated in 2.5, to be removed in 3.0. Use
+ *             {@link \Symfony\Component\Validator\Constraints\EachValidator} instead.
  */
 class AllValidator extends ConstraintValidator
 {

diff --git a/src/Symfony/Component/Validator/Constraints/Each.php b/src/Symfony/Component/Validator/Constraints/Each.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+/**
+ * @Annotation
+ *
+ * @author Marc Morera Merino <[email protected]>
+ * @author Marc Morales Valldepérez <[email protected]> *
+ */
+class Each extends AbstractComposite
+{
+}
diff --git a/src/Symfony/Component/Validator/Constraints/EachValidator.php b/src/Symfony/Component/Validator/Constraints/EachValidator.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+/**
+ * @author Marc Morera Merino <[email protected]>
+ * @author Marc Morales Valldepérez <[email protected]>
+ */
+class EachValidator extends ConstraintValidator
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validate($value, Constraint $constraint)
+    {
+        if (null === $value) {
+            return;
+        }
+
+        if (!is_array($value) && !$value instanceof \Traversable) {
+            throw new UnexpectedTypeException($value, 'array or Traversable');
+        }
+
+        $group = $this->context->getGroup();
+
+        foreach ($value as $key => $element) {
+            foreach ($constraint->constraints as $constr) {
+                $this->context->validateValue($element, $constr, '[' . $key . ']', $group);
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Component/Validator/Constraints/None.php b/src/Symfony/Component/Validator/Constraints/None.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+/**
+ * @Annotation
+ *
+ * @author Marc Morera Merino <[email protected]>
+ * @author Marc Morales Valldepérez <[email protected]>
+ */
+class None extends AbstractComposite
+{
+
+    /**
+     * @var string
+     *
+     * Message for notice Violation
+     */
+    public $message = 'None of this collection should pass validation.';
+}
diff --git a/src/Symfony/Component/Validator/Constraints/NoneValidator.php b/src/Symfony/Component/Validator/Constraints/NoneValidator.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+/**
+ * @author Marc Morera Merino <[email protected]>
+ * @author Marc Morales Valldepérez <[email protected]>
+ */
+class NoneValidator extends ConstraintValidator
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validate($value, Constraint $constraint)
+    {
+        if (null === $value) {
+            return;
+        }
+
+        if (!is_array($value) && !$value instanceof \Traversable) {
+            throw new UnexpectedTypeException($value, 'array or Traversable');
+        }
+
+        $group = $this->context->getGroup();
+
+        $totalIterations = count($value) * count($constraint->constraints);
+
+        foreach ($value as $key => $element) {
+            foreach ($constraint->constraints as $constr) {
+                $this->context->validateValue($element, $constr, '[' . $key . ']', $group);
+            }
+        }
+
+        $constraintsSuccess = $totalIterations - (int) $this->context->getViolations()->count();
+
+        //We clear all violations as just current Validator should add real Violations
+        $this->context->clearViolations();
+
+        if ($constraintsSuccess > 0) {
+            $this->context->addViolation($constraint->message);
+        }
+    }
+}