Fixes

GuilhemN · GuilhemN · commit f3bb16a0a27a · 2017-01-31T19:21:50.000+01:00
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -178,26 +178,22 @@ public function loadClass($class)
             self::$finalMethods[$name] = $parent && isset(self::$finalMethods[$parent]) ? self::$finalMethods[$parent] : array();
 
             foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $method) {
-                // It's not the declaring class
                 if ($method->class !== $name) {
                     continue;
                 }
 
                 if ($parent && isset(self::$finalMethods[$parent][$method->name])) {
-                    // Fetch the real class declaring the parent method
-                    $prototype = $method->getPrototype();
-
-                    @trigger_error(sprintf('The %s::%s() method is considered final%s. It may change without further notice as of its next major version. You should not extend it from %s.', $prototype->class, $method->name, self::$finalMethods[$parent][$method->name], $name), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('%s It may change without further notice as of its next major version. You should not extend it from %s.', self::$finalMethods[$parent][$method->name], $name), E_USER_DEPRECATED);
                 }
 
                 $doc = $method->getDocComment();
-                // No @final annotation
                 if (false === $doc || false === strpos($doc, '@final')) {
                     continue;
                 }
 
                 if (preg_match('#\n\s+\* @final(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
-                    self::$finalMethods[$name][$method->name] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+                    $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+                    self::$finalMethods[$name][$method->name] = sprintf('The %s::%s() method is considered final%s.', $name, $method->name, $message);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -178,26 +178,22 @@ public function loadClass($class)`
`178`	`178`	`self::$finalMethods[$name] = $parent && isset(self::$finalMethods[$parent]) ? self::$finalMethods[$parent] : array();`
`179`	`179`
`180`	`180`	`foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC \| \ReflectionMethod::IS_PROTECTED) as $method) {`
`181`		`- // It's not the declaring class`
`182`	`181`	`if ($method->class !== $name) {`
`183`	`182`	`continue;`
`184`	`183`	`}`
`185`	`184`
`186`	`185`	`if ($parent && isset(self::$finalMethods[$parent][$method->name])) {`
`187`		`- // Fetch the real class declaring the parent method`
`188`		`- $prototype = $method->getPrototype();`
`189`		`-`
`190`		`- @trigger_error(sprintf('The %s::%s() method is considered final%s. It may change without further notice as of its next major version. You should not extend it from %s.', $prototype->class, $method->name, self::$finalMethods[$parent][$method->name], $name), E_USER_DEPRECATED);`
	`186`	`+ @trigger_error(sprintf('%s It may change without further notice as of its next major version. You should not extend it from %s.', self::$finalMethods[$parent][$method->name], $name), E_USER_DEPRECATED);`
`191`	`187`	`}`
`192`	`188`
`193`	`189`	`$doc = $method->getDocComment();`
`194`		`- // No @final annotation`
`195`	`190`	`if (false === $doc \|\| false === strpos($doc, '@final')) {`
`196`	`191`	`continue;`
`197`	`192`	`}`
`198`	`193`
`199`	`194`	`if (preg_match('#\n\s+\* @final(?:( .+?)\.?)?\r?\n\s+\*(?: @\|/$)#s', $doc, $notice)) {`
`200`		`- self::$finalMethods[$name][$method->name] = isset($notice[1]) ? preg_replace('#\s\r?\n \ +#', ' ', $notice[1]) : '';`
	`195`	`+ $message = isset($notice[1]) ? preg_replace('#\s\r?\n \ +#', ' ', $notice[1]) : '';`
	`196`	`+ self::$finalMethods[$name][$method->name] = sprintf('The %s::%s() method is considered final%s.', $name, $method->name, $message);`
`201`	`197`	`}`
`202`	`198`	`}`
`203`	`199`