[Bridge\Twig] Trigger deprecation when using FormExtension::$renderer

nicolas-grekas · nicolas-grekas · commit f3d766e41b33 · 2016-12-06T15:53:32.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -25,9 +25,9 @@ class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRunti
 {
     private $renderer;
 
-    public function __construct(TwigRendererInterface $renderer = null)
+    public function __construct(TwigRendererInterface $renderer = null, $triggerDeprecation = true)
     {
-        if (null !== $this->renderer) {
+        if ($triggerDeprecation && null !== $this->renderer) {
             @trigger_error(sprintf('Passing a Twig Form Renderer to the "%s" constructor is deprecated since version 3.2 and won\'t be possible in 4.0. Pass the Twig_Environment to the TwigRendererEngine constructor instead.', static::class), E_USER_DEPRECATED);
         }
         $this->renderer = $renderer;
@@ -94,6 +94,54 @@ public function getTests()
         );
     }
 
+    /**
+     * @internal
+     */
+    public function __get($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        return $this->$name;
+    }
+
+    /**
+     * @internal
+     */
+    public function __set($name, $value)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        $this->$name = $value;
+    }
+
+    /**
+     * @internal
+     */
+    public function __isset($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        return isset($this->$name);
+    }
+
+    /**
+     * @internal
+     */
+    public function __unset($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        unset($this->$name);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -118,7 +118,11 @@
             <argument type="service" id="router.request_context" on-invalid="ignore" />
         </service>
 
-        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false" />
+
+        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
+            <argument type="service" id="twig.form.renderer" />
+            <argument>false</argument>
+        </service>
 
         <service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
 
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/twig-bridge": "~3.2",
+        "symfony/twig-bridge": "~3.2,>=3.2.1",
         "symfony/http-foundation": "~2.8|~3.0",
         "symfony/http-kernel": "~2.8|~3.0",
         "twig/twig": "~1.28|~2.0"
