symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+32Lines changed: 32 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+32Lines changed: 32 additions & 0 deletions
@@ -67,7 +67,11 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->arrayNode('trusted_proxies') // @deprecated in version 3.3, to be removed in 4.0
                     ->beforeNormalization()
-                        ->always()
+                        ->ifTrue(function ($v) { return empty($v); })
+                        ->then(function () { @trigger_error('The "framework.trusted_proxies" configuration key has been removed in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.', E_USER_DEPRECATED); })
+                    ->end()
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) { return !empty($v); })
                         ->thenInvalid('The "framework.trusted_proxies" configuration key has been removed in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.')
                     ->end()
                 ->end()
 
@@ -43,6 +43,38 @@ public function testDoNoDuplicateDefaultFormResources()
         $this->assertEquals(array('FrameworkBundle:Form'), $config['templating']['form']['resources']);
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.trusted_proxies" configuration key has been removed in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.
+     */
+    public function testTrustedProxiesSetToNullIsDeprecated()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, array(array('trusted_proxies' => null)));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.trusted_proxies" configuration key has been removed in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.
+     */
+    public function testTrustedProxiesSetToEmptyArrayIsDeprecated()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, array(array('trusted_proxies' => array())));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testTrustedProxiesSetToNonEmptyArrayIsInvalid()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, array(array('trusted_proxies' => array('127.0.0.1'))));
+    }
+
     public function testAssetsCanBeEnabled()
     {
         $processor = new Processor();