Comment the deprecations

GuilhemN · GuilhemN · commit 58b12b3da61c · 2016-03-03T18:48:20.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -493,7 +493,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode)
                 ->always(function ($v) {
                     if (!isset($v['annotations'])) {
                         $v['annotations']['enabled'] = true;
-                        @trigger_error('You must explicitly define wheter to enable "framework.annotations" or not. It will be disabled by default in 4.0', E_USER_DEPRECATED);
+                        // @trigger_error('You must explicitly define wheter to enable "framework.annotations" or not. It will be disabled by default in 4.0', E_USER_DEPRECATED);
                     }
 
                     return $v;
@@ -537,7 +537,7 @@ private function addPropertyAccessSection(ArrayNodeDefinition $rootNode)
                 ->always(function ($v) {
                     if (!isset($v['property_access'])) {
                         $v['property_access']['enabled'] = true;
-                        @trigger_error('You must explicitly define wheter to enable "framework.property_access" or not. It will be disabled by default in 4.0', E_USER_DEPRECATED);
+                        // @trigger_error('You must explicitly define wheter to enable "framework.property_access" or not. It will be disabled by default in 4.0', E_USER_DEPRECATED);
                     }
 
                     return $v;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/annotations_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/annotations_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'annotations' => array(
+        'enabled' => false,
+    ),
+));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/annotations_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/annotations_disabled.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:annotations enabled="false" />
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/annotations_disabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/annotations_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    annotations:
+        enabled: false
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml
@@ -10,7 +10,6 @@ framework:
     session:
         storage_id: session.storage.mock_file
     profiler: { only_exceptions: false }
-    property_access: ~
 
 services:
     logger: { class: Psr\Log\NullLogger }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ annotations:`
	`3`	`+ enabled: false`