Silence invasive deprecation warnings, opt-in for warnings

reecefowell · reecefowell · commit 7fb10f2e285a · 2015-06-08T10:37:21.000+01:00
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1127,7 +1127,7 @@ private function getProxyInstantiator()
     private function synchronize($id)
     {
         if ('request' !== $id) {
-            trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
         }
 
         foreach ($this->definitions as $definitionId => $definition) {
diff --git a/Definition.php b/Definition.php
@@ -98,7 +98,7 @@ public function getFactory()
      */
     public function setFactoryClass($factoryClass)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
 
         $this->factoryClass = $factoryClass;
 
@@ -116,7 +116,7 @@ public function setFactoryClass($factoryClass)
     public function getFactoryClass($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryClass;
@@ -134,7 +134,7 @@ public function getFactoryClass($triggerDeprecationError = true)
      */
     public function setFactoryMethod($factoryMethod)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
 
         $this->factoryMethod = $factoryMethod;
 
@@ -187,7 +187,7 @@ public function getDecoratedService()
     public function getFactoryMethod($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryMethod;
@@ -205,7 +205,7 @@ public function getFactoryMethod($triggerDeprecationError = true)
      */
     public function setFactoryService($factoryService)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
 
         $this->factoryService = $factoryService;
 
@@ -223,7 +223,7 @@ public function setFactoryService($factoryService)
     public function getFactoryService($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryService;
@@ -667,7 +667,7 @@ public function isPublic()
     public function setSynchronized($boolean, $triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->synchronized = (bool) $boolean;
@@ -687,7 +687,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)
     public function isSynchronized($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->synchronized;
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -705,7 +705,7 @@ private function addServiceSynchronizer($id, Definition $definition)
         }
 
         if ('request' !== $id) {
-            trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
         }
 
         $code = '';
@@ -1414,7 +1414,7 @@ public function dumpParameter($name)
      */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
 
         $this->expressionLanguageProviders[] = $provider;
     }
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -151,7 +151,7 @@ private function parseDefinition(\DOMElement $service, $file)
         foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) {
             if ($value = $service->getAttribute($key)) {
                 if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) {
-                    trigger_error(sprintf('The "%s" attribute in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, $file), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('The "%s" attribute in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, $file), E_USER_DEPRECATED);
                 }
                 $method = 'set'.str_replace('-', '', $key);
                 $definition->$method(XmlUtils::phpize($value));
@@ -162,7 +162,7 @@ private function parseDefinition(\DOMElement $service, $file)
             $triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
 
             if ($triggerDeprecation) {
-                trigger_error(sprintf('The "synchronized" attribute in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "synchronized" attribute in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
             }
 
             $definition->setSynchronized(XmlUtils::phpize($value), $triggerDeprecation);
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -172,7 +172,7 @@ private function parseDefinition($id, $service, $file)
         }
 
         if (isset($service['synchronized'])) {
-            trigger_error(sprintf('The "synchronized" key in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "synchronized" key in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
             $definition->setSynchronized($service['synchronized'], 'request' !== $id);
         }
 
@@ -202,17 +202,17 @@ private function parseDefinition($id, $service, $file)
         }
 
         if (isset($service['factory_class'])) {
-            trigger_error(sprintf('The "factory_class" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "factory_class" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
             $definition->setFactoryClass($service['factory_class']);
         }
 
         if (isset($service['factory_method'])) {
-            trigger_error(sprintf('The "factory_method" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "factory_method" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
             $definition->setFactoryMethod($service['factory_method']);
         }
 
         if (isset($service['factory_service'])) {
-            trigger_error(sprintf('The "factory_service" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "factory_service" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
             $definition->setFactoryService($service['factory_service']);
         }
 
diff --git a/SimpleXMLElement.php b/SimpleXMLElement.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection;
 
-trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\ExpressionLanguage\Expression;

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ private function getProxyInstantiator()`
`1127`	`1127`	`private function synchronize($id)`
`1128`	`1128`	`{`
`1129`	`1129`	`if ('request' !== $id) {`
`1130`		`- trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);`
	`1130`	`+ @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`	`1133`	`foreach ($this->definitions as $definitionId => $definition) {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getFactory()`
`98`	`98`	`*/`
`99`	`99`	`public function setFactoryClass($factoryClass)`
`100`	`100`	`{`
`101`		`- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);`
	`101`	`+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);`
`102`	`102`
`103`	`103`	`$this->factoryClass = $factoryClass;`
`104`	`104`
`@@ -116,7 +116,7 @@ public function setFactoryClass($factoryClass)`
`116`	`116`	`public function getFactoryClass($triggerDeprecationError = true)`
`117`	`117`	`{`
`118`	`118`	`if ($triggerDeprecationError) {`
`119`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`119`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`return $this->factoryClass;`
`@@ -134,7 +134,7 @@ public function getFactoryClass($triggerDeprecationError = true)`
`134`	`134`	`*/`
`135`	`135`	`public function setFactoryMethod($factoryMethod)`
`136`	`136`	`{`
`137`		`- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);`
	`137`	`+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);`
`138`	`138`
`139`	`139`	`$this->factoryMethod = $factoryMethod;`
`140`	`140`
`@@ -187,7 +187,7 @@ public function getDecoratedService()`
`187`	`187`	`public function getFactoryMethod($triggerDeprecationError = true)`
`188`	`188`	`{`
`189`	`189`	`if ($triggerDeprecationError) {`
`190`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`190`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`return $this->factoryMethod;`
`@@ -205,7 +205,7 @@ public function getFactoryMethod($triggerDeprecationError = true)`
`205`	`205`	`*/`
`206`	`206`	`public function setFactoryService($factoryService)`
`207`	`207`	`{`
`208`		`- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);`
	`208`	`+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);`
`209`	`209`
`210`	`210`	`$this->factoryService = $factoryService;`
`211`	`211`
`@@ -223,7 +223,7 @@ public function setFactoryService($factoryService)`
`223`	`223`	`public function getFactoryService($triggerDeprecationError = true)`
`224`	`224`	`{`
`225`	`225`	`if ($triggerDeprecationError) {`
`226`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`226`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`return $this->factoryService;`
`@@ -667,7 +667,7 @@ public function isPublic()`
`667`	`667`	`public function setSynchronized($boolean, $triggerDeprecationError = true)`
`668`	`668`	`{`
`669`	`669`	`if ($triggerDeprecationError) {`
`670`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`670`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`$this->synchronized = (bool) $boolean;`
`@@ -687,7 +687,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)`
`687`	`687`	`public function isSynchronized($triggerDeprecationError = true)`
`688`	`688`	`{`
`689`	`689`	`if ($triggerDeprecationError) {`
`690`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`690`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`691`	`691`	`}`
`692`	`692`
`693`	`693`	`return $this->synchronized;`
Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ private function addServiceSynchronizer($id, Definition $definition)`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`if ('request' !== $id) {`
`708`		`- trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);`
	`708`	`+ @trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`$code = '';`
`@@ -1414,7 +1414,7 @@ public function dumpParameter($name)`
`1414`	`1414`	`*/`
`1415`	`1415`	`public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)`
`1416`	`1416`	`{`
`1417`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);`
	`1417`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);`
`1418`	`1418`
`1419`	`1419`	`$this->expressionLanguageProviders[] = $provider;`
`1420`	`1420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private function parseDefinition($id, $service, $file)`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`if (isset($service['synchronized'])) {`
`175`		`- trigger_error(sprintf('The "synchronized" key in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);`
	`175`	`+ @trigger_error(sprintf('The "synchronized" key in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);`
`176`	`176`	`$definition->setSynchronized($service['synchronized'], 'request' !== $id);`
`177`	`177`	`}`
`178`	`178`
`@@ -202,17 +202,17 @@ private function parseDefinition($id, $service, $file)`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if (isset($service['factory_class'])) {`
`205`		`- trigger_error(sprintf('The "factory_class" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
	`205`	`+ @trigger_error(sprintf('The "factory_class" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
`206`	`206`	`$definition->setFactoryClass($service['factory_class']);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`if (isset($service['factory_method'])) {`
`210`		`- trigger_error(sprintf('The "factory_method" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
	`210`	`+ @trigger_error(sprintf('The "factory_method" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
`211`	`211`	`$definition->setFactoryMethod($service['factory_method']);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`if (isset($service['factory_service'])) {`
`215`		`- trigger_error(sprintf('The "factory_service" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
	`215`	`+ @trigger_error(sprintf('The "factory_service" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);`
`216`	`216`	`$definition->setFactoryService($service['factory_service']);`
`217`	`217`	`}`
`218`	`218`