minor #12699 Hackday deprecated 12621 (arnaugm)

fabpot · fabpot · commit bfc5c06d3ba3 · 2014-11-30T12:26:29.000+01:00
This PR was squashed before being merged into the 2.7 branch (closes #12699). Discussion ---------- Hackday deprecated 12621 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12621 | License | MIT | Doc PR | - [MonologBridge] added the deprecated error trigger in the monolog logger emerg(), crit(), err() and warn() methods [HttpKernel] added the deprecated error trigger in the NullLogger emerg(), crit(), err() and warn() methods Commits ------- 88b9500 Hackday deprecated 12621
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
@@ -27,6 +27,8 @@ class Logger extends BaseLogger implements LoggerInterface, DebugLoggerInterface
      */
     public function emerg($message, array $context = array())
     {
+        trigger_error('The emerg() method of the Monolog Logger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+
         return parent::addRecord(BaseLogger::EMERGENCY, $message, $context);
     }
 
@@ -35,6 +37,8 @@ public function emerg($message, array $context = array())
      */
     public function crit($message, array $context = array())
     {
+        trigger_error('The crit() method of the Monolog Logger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+
         return parent::addRecord(BaseLogger::CRITICAL, $message, $context);
     }
 
@@ -43,6 +47,8 @@ public function crit($message, array $context = array())
      */
     public function err($message, array $context = array())
     {
+        trigger_error('The err() method of the Monolog Logger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+
         return parent::addRecord(BaseLogger::ERROR, $message, $context);
     }
 
@@ -51,6 +57,8 @@ public function err($message, array $context = array())
      */
     public function warn($message, array $context = array())
     {
+        trigger_error('The warn() method of the Monolog Logger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+
         return parent::addRecord(BaseLogger::WARNING, $message, $context);
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Log/NullLogger.php b/src/Symfony/Component/HttpKernel/Log/NullLogger.php
@@ -28,6 +28,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
      */
     public function emerg($message, array $context = array())
     {
+        trigger_error('The emerg() method of the NullLogger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -36,6 +37,7 @@ public function emerg($message, array $context = array())
      */
     public function crit($message, array $context = array())
     {
+        trigger_error('The crit() method of the NullLogger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -44,6 +46,7 @@ public function crit($message, array $context = array())
      */
     public function err($message, array $context = array())
     {
+        trigger_error('The err() method of the NullLogger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -52,5 +55,6 @@ public function err($message, array $context = array())
      */
     public function warn($message, array $context = array())
     {
+        trigger_error('The warn() method of the NullLogger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ class Logger extends BaseLogger implements LoggerInterface, DebugLoggerInterface`
`27`	`27`	`*/`
`28`	`28`	`public function emerg($message, array $context = array())`
`29`	`29`	`{`
	`30`	`+ trigger_error('The emerg() method of the Monolog Logger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
	`31`	`+`
`30`	`32`	`return parent::addRecord(BaseLogger::EMERGENCY, $message, $context);`
`31`	`33`	`}`
`32`	`34`
`@@ -35,6 +37,8 @@ public function emerg($message, array $context = array())`
`35`	`37`	`*/`
`36`	`38`	`public function crit($message, array $context = array())`
`37`	`39`	`{`
	`40`	`+ trigger_error('The crit() method of the Monolog Logger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
	`41`	`+`
`38`	`42`	`return parent::addRecord(BaseLogger::CRITICAL, $message, $context);`
`39`	`43`	`}`
`40`	`44`
`@@ -43,6 +47,8 @@ public function crit($message, array $context = array())`
`43`	`47`	`*/`
`44`	`48`	`public function err($message, array $context = array())`
`45`	`49`	`{`
	`50`	`+ trigger_error('The err() method of the Monolog Logger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
	`51`	`+`
`46`	`52`	`return parent::addRecord(BaseLogger::ERROR, $message, $context);`
`47`	`53`	`}`
`48`	`54`
`@@ -51,6 +57,8 @@ public function err($message, array $context = array())`
`51`	`57`	`*/`
`52`	`58`	`public function warn($message, array $context = array())`
`53`	`59`	`{`
	`60`	`+ trigger_error('The warn() method of the Monolog Logger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
	`61`	`+`
`54`	`62`	`return parent::addRecord(BaseLogger::WARNING, $message, $context);`
`55`	`63`	`}`
`56`	`64`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface`
`28`	`28`	`*/`
`29`	`29`	`public function emerg($message, array $context = array())`
`30`	`30`	`{`
	`31`	`+ trigger_error('The emerg() method of the NullLogger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`/**`
`@@ -36,6 +37,7 @@ public function emerg($message, array $context = array())`
`36`	`37`	`*/`
`37`	`38`	`public function crit($message, array $context = array())`
`38`	`39`	`{`
	`40`	`+ trigger_error('The crit() method of the NullLogger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`/**`
`@@ -44,6 +46,7 @@ public function crit($message, array $context = array())`
`44`	`46`	`*/`
`45`	`47`	`public function err($message, array $context = array())`
`46`	`48`	`{`
	`49`	`+ trigger_error('The err() method of the NullLogger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`/**`
`@@ -52,5 +55,6 @@ public function err($message, array $context = array())`
`52`	`55`	`*/`
`53`	`56`	`public function warn($message, array $context = array())`
`54`	`57`	`{`
	`58`	`+ trigger_error('The warn() method of the NullLogger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);`
`55`	`59`	`}`
`56`	`60`	`}`