Normalizes deprecation notice messages.

This commit is contained in:
Hugo Hamon 2014-12-30 13:40:50 +01:00
parent 738b9be447
commit 2a3e7d2cc9
18 changed files with 35 additions and 31 deletions

View File

@ -30,7 +30,7 @@ class RequestHelper extends Helper
*
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
*
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
*/
public function __construct($requestStack)
{

View File

@ -30,7 +30,7 @@ class SessionHelper extends Helper
*
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
*
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
*/
public function __construct($requestStack)
{

View File

@ -42,8 +42,8 @@ class TwigEngine extends BaseEngine implements EngineInterface
}
/**
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Inject the escaping
* strategy on Twig_Environment instead
* @deprecated since version 2.3, to be removed in 3.0.
* Inject the escaping strategy on \Twig_Environment instead.
*/
public function setDefaultEscapingStrategy($strategy)
{
@ -51,7 +51,8 @@ class TwigEngine extends BaseEngine implements EngineInterface
}
/**
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use TwigDefaultEscapingStrategy instead.
* @deprecated since version 2.3, to be removed in 3.0.
* Use TwigDefaultEscapingStrategy instead.
*/
public function guessDefaultEscapingStrategy($filename)
{

View File

@ -11,6 +11,8 @@
namespace Symfony\Component\ClassLoader;
trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
/**
* ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
*
@ -60,7 +62,8 @@ namespace Symfony\Component\ClassLoader;
*
* @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the {@link ClassLoader} class instead.
*/
class ApcUniversalClassLoader extends UniversalClassLoader
{

View File

@ -1,11 +1,6 @@
CHANGELOG
=========
2.7.0
-----
* The UniversalClassLoader class has been deprecated in favor of ClassLoader class
2.4.0
-----

View File

@ -11,12 +11,15 @@
namespace Symfony\Component\ClassLoader;
trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
/**
* Checks that the class is actually declared in the included file.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the {@link \Symfony\Component\Debug\DebugClassLoader} class instead.
*/
class DebugUniversalClassLoader extends UniversalClassLoader
{

View File

@ -101,7 +101,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
if ($function[0] instanceof DebugClassLoader) {
$function = $function[0]->getClassLoader();
// Since 2.5, returning an object from DebugClassLoader::getClassLoader() is @deprecated
// @deprecated since version 2.5. Returning an object from DebugClassLoader::getClassLoader() is deprecated.
if (is_object($function)) {
$function = array($function);
}

View File

@ -169,7 +169,7 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate
/**
* Returns an iterator for flashes.
*
* @deprecated Will be removed in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*
* @return \ArrayIterator An \ArrayIterator instance
*/

View File

@ -11,6 +11,8 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
/**
* Session handler using a PDO connection to read and write data.
*
@ -77,8 +79,6 @@ class LegacyPdoSessionHandler implements \SessionHandlerInterface
throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
}
trigger_error('"Symfony\Component\HttpFoundation\Session\Storage\Handler\LegacyPdoSessionHandler" is deprecated since version 2.6 and will be removed in 3.0. Use "Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" instead.', E_USER_DEPRECATED);
$this->pdo = $pdo;
$dbOptions = array_merge(array(
'db_id_col' => 'sess_id',

View File

@ -116,7 +116,7 @@ class ExceptionListener implements EventSubscriberInterface
'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
// keep for BC -- as $format can be an argument of the controller callable
// see src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
// @deprecated in 2.4, to be removed in 3.0
// @deprecated since version 2.4, to be removed in 3.0
'format' => $request->getRequestFormat(),
);
$request = $request->duplicate(null, null, $attributes);

View File

@ -86,7 +86,7 @@ class RouterListener implements EventSubscriberInterface
*
* @param Request|null $request A Request instance
*
* @deprecated since version 2.4, to be moved to a private function in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*/
public function setRequest(Request $request = null)
{

View File

@ -55,7 +55,8 @@ class JsonDecode implements DecoderInterface
*
* @return int
*
* @deprecated since version 2.5, decode() throws an exception if error found, will be removed in 3.0
* @deprecated since version 2.5, to be removed in 3.0.
* The {@self decode()} method throws an exception if error found.
*
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
*/

View File

@ -33,7 +33,8 @@ class JsonEncode implements EncoderInterface
*
* @return int
*
* @deprecated since version 2.5, encode() throws an exception if error found, will be removed in 3.0
* @deprecated since version 2.5, to be removed in 3.0.
* The {@self encode()} throws an exception if error found.
*
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
*/

View File

@ -41,7 +41,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
*
* @return int
*
* @deprecated since version 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0
* @deprecated since version 2.5, to be removed in 3.0. JsonEncode throws exception if an error is found.
*/
public function getLastEncodingError()
{
@ -55,7 +55,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
*
* @return int
*
* @deprecated since version 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0
* @deprecated since version 2.5, to be removed in 3.0. JsonDecode throws exception if an error is found.
*/
public function getLastDecodingError()
{

View File

@ -103,7 +103,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @see \IteratorAggregate::getIterator()
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function getIterator()
{
@ -121,7 +121,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @return bool Whether the offset exists
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function offsetExists($offset)
{
@ -141,7 +141,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @throws OutOfBoundsException If the object does not exist
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function offsetGet($offset)
{
@ -165,7 +165,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
* @param int $offset The offset
* @param string $value The group name
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function offsetSet($offset, $value)
{
@ -187,7 +187,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @param int $offset The offset
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function offsetUnset($offset)
{
@ -203,7 +203,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @return int The number of groups
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function count()
{

View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Context;
trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory is deprecated since version 2.5 and will be removed in 3.0.');
trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\MetadataFactoryInterface;

View File

@ -23,7 +23,7 @@ use Symfony\Component\Translation\TranslatorInterface;
* @author Fabien Potencier <fabien@symfony.com>
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @deprecated since version 2.5, to be removed in Symfony 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
* Use {@link Context\ExecutionContext} instead.
*/
class ExecutionContext implements ExecutionContextInterface

View File

@ -373,7 +373,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
*
* @param MemberMetadata $metadata
*
* @deprecated since version 2.6, to be in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
protected function addMemberMetadata(MemberMetadata $metadata)
{