[DependencyInjection] Deprecate ConstraintValidatorFactory::$validators and $container

GuilhemN · GuilhemN · commit 9ccdeac0d69a · 2017-02-23T20:25:06.000+01:00
diff --git a/UPGRADE-3.3.md b/UPGRADE-3.3.md
@@ -71,6 +71,9 @@ FrameworkBundle
    deprecated and will be removed in 4.0. Use the `Symfony\Component\Form\DependencyInjection\FormPass`
    class instead.
 
+ * The `ConstraintValidatorFactory::$validators` and `$container` properties
+   have been deprecated and will be removed in 4.0.
+
 HttpKernel
 -----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -188,6 +188,9 @@ FrameworkBundle
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass` class has been
    removed. Use the `Symfony\Component\Form\DependencyInjection\FormPass` class instead.
 
+ * The `ConstraintValidatorFactory::$validators` and `$container` properties
+   have been removed.
+
 HttpFoundation
 ---------------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
@@ -40,7 +40,14 @@
  */
 class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
 {
+    /**
+     * @deprecated since version 3.3, to be removed in 4.0 alongside with magic methods below
+     */
     protected $container;
+
+    /**
+     * @deprecated since version 3.3, to be removed in 4.0 alongside with magic methods below
+     */
     protected $validators;
 
     /**
@@ -85,4 +92,52 @@ public function getInstance(Constraint $constraint)
 
         return $this->validators[$name];
     }
+
+    /**
+     * @internal
+     */
+    public function __get($name)
+    {
+        if ('validators' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since version 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+        }
+
+        return $this->$name;
+    }
+
+    /**
+     * @internal
+     */
+    public function __set($name, $value)
+    {
+        if ('validators' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since version 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+        }
+
+        $this->$name = $value;
+    }
+
+    /**
+     * @internal
+     */
+    public function __isset($name)
+    {
+        if ('validators' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since version 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+        }
+
+        return isset($this->$name);
+    }
+
+    /**
+     * @internal
+     */
+    public function __unset($name)
+    {
+        if ('validators' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since version 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+        }
+
+        unset($this->$name);
+    }
 }
