Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2a3e7d2

Browse filesBrowse files
author
Hugo Hamon
committed
Normalizes deprecation notice messages.
1 parent 738b9be commit 2a3e7d2
Copy full SHA for 2a3e7d2

File tree

Expand file treeCollapse file tree

18 files changed

+35
-31
lines changed
Filter options
Expand file treeCollapse file tree

18 files changed

+35
-31
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class RequestHelper extends Helper
3030
*
3131
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
3232
*
33-
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
33+
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
3434
*/
3535
public function __construct($requestStack)
3636
{

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SessionHelper extends Helper
3030
*
3131
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
3232
*
33-
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
33+
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
3434
*/
3535
public function __construct($requestStack)
3636
{

‎src/Symfony/Bundle/TwigBundle/TwigEngine.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/TwigEngine.php
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,17 @@ public function __construct(\Twig_Environment $environment, TemplateNameParserIn
4242
}
4343

4444
/**
45-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Inject the escaping
46-
* strategy on Twig_Environment instead
45+
* @deprecated since version 2.3, to be removed in 3.0.
46+
* Inject the escaping strategy on \Twig_Environment instead.
4747
*/
4848
public function setDefaultEscapingStrategy($strategy)
4949
{
5050
$this->environment->getExtension('escaper')->setDefaultStrategy($strategy);
5151
}
5252

5353
/**
54-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use TwigDefaultEscapingStrategy instead.
54+
* @deprecated since version 2.3, to be removed in 3.0.
55+
* Use TwigDefaultEscapingStrategy instead.
5556
*/
5657
public function guessDefaultEscapingStrategy($filename)
5758
{

‎src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\ClassLoader;
1313

14+
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);
15+
1416
/**
1517
* ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
1618
*
@@ -60,7 +62,8 @@
6062
*
6163
* @api
6264
*
63-
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
65+
* @deprecated since version 2.4, to be removed in 3.0.
66+
* Use the {@link ClassLoader} class instead.
6467
*/
6568
class ApcUniversalClassLoader extends UniversalClassLoader
6669
{

‎src/Symfony/Component/ClassLoader/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/ClassLoader/CHANGELOG.md
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
CHANGELOG
22
=========
33

4-
2.7.0
5-
-----
6-
7-
* The UniversalClassLoader class has been deprecated in favor of ClassLoader class
8-
94
2.4.0
105
-----
116

‎src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111

1212
namespace Symfony\Component\ClassLoader;
1313

14+
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);
15+
1416
/**
1517
* Checks that the class is actually declared in the included file.
1618
*
1719
* @author Fabien Potencier <fabien@symfony.com>
1820
*
19-
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
21+
* @deprecated since version 2.4, to be removed in 3.0.
22+
* Use the {@link \Symfony\Component\Debug\DebugClassLoader} class instead.
2023
*/
2124
class DebugUniversalClassLoader extends UniversalClassLoader
2225
{

‎src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private function getClassCandidates($class)
101101
if ($function[0] instanceof DebugClassLoader) {
102102
$function = $function[0]->getClassLoader();
103103

104-
// Since 2.5, returning an object from DebugClassLoader::getClassLoader() is @deprecated
104+
// @deprecated since version 2.5. Returning an object from DebugClassLoader::getClassLoader() is deprecated.
105105
if (is_object($function)) {
106106
$function = array($function);
107107
}

‎src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function clear()
169169
/**
170170
* Returns an iterator for flashes.
171171
*
172-
* @deprecated Will be removed in 3.0.
172+
* @deprecated since version 2.4, to be removed in 3.0.
173173
*
174174
* @return \ArrayIterator An \ArrayIterator instance
175175
*/

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

14+
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);
15+
1416
/**
1517
* Session handler using a PDO connection to read and write data.
1618
*
@@ -77,8 +79,6 @@ public function __construct(\PDO $pdo, array $dbOptions = array())
7779
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__));
7880
}
7981

80-
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);
81-
8282
$this->pdo = $pdo;
8383
$dbOptions = array_merge(array(
8484
'db_id_col' => 'sess_id',

‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function duplicateRequest(\Exception $exception, Request $request)
116116
'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
117117
// keep for BC -- as $format can be an argument of the controller callable
118118
// see src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
119-
// @deprecated in 2.4, to be removed in 3.0
119+
// @deprecated since version 2.4, to be removed in 3.0
120120
'format' => $request->getRequestFormat(),
121121
);
122122
$request = $request->duplicate(null, null, $attributes);

‎src/Symfony/Component/HttpKernel/EventListener/RouterListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte
8686
*
8787
* @param Request|null $request A Request instance
8888
*
89-
* @deprecated since version 2.4, to be moved to a private function in 3.0.
89+
* @deprecated since version 2.4, to be removed in 3.0.
9090
*/
9191
public function setRequest(Request $request = null)
9292
{

‎src/Symfony/Component/Serializer/Encoder/JsonDecode.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonDecode.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public function __construct($associative = false, $depth = 512)
5555
*
5656
* @return int
5757
*
58-
* @deprecated since version 2.5, decode() throws an exception if error found, will be removed in 3.0
58+
* @deprecated since version 2.5, to be removed in 3.0.
59+
* The {@self decode()} method throws an exception if error found.
5960
*
6061
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
6162
*/

‎src/Symfony/Component/Serializer/Encoder/JsonEncode.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public function __construct($bitmask = 0)
3333
*
3434
* @return int
3535
*
36-
* @deprecated since version 2.5, encode() throws an exception if error found, will be removed in 3.0
36+
* @deprecated since version 2.5, to be removed in 3.0.
37+
* The {@self encode()} throws an exception if error found.
3738
*
3839
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
3940
*/

‎src/Symfony/Component/Serializer/Encoder/JsonEncoder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
4141
*
4242
* @return int
4343
*
44-
* @deprecated since version 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0
44+
* @deprecated since version 2.5, to be removed in 3.0. JsonEncode throws exception if an error is found.
4545
*/
4646
public function getLastEncodingError()
4747
{
@@ -55,7 +55,7 @@ public function getLastEncodingError()
5555
*
5656
* @return int
5757
*
58-
* @deprecated since version 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0
58+
* @deprecated since version 2.5, to be removed in 3.0. JsonDecode throws exception if an error is found.
5959
*/
6060
public function getLastDecodingError()
6161
{

‎src/Symfony/Component/Validator/Constraints/GroupSequence.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/GroupSequence.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function __construct(array $groups)
103103
*
104104
* @see \IteratorAggregate::getIterator()
105105
*
106-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
106+
* @deprecated since version 2.5, to be removed in 3.0.
107107
*/
108108
public function getIterator()
109109
{
@@ -121,7 +121,7 @@ public function getIterator()
121121
*
122122
* @return bool Whether the offset exists
123123
*
124-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
124+
* @deprecated since version 2.5, to be removed in 3.0.
125125
*/
126126
public function offsetExists($offset)
127127
{
@@ -141,7 +141,7 @@ public function offsetExists($offset)
141141
*
142142
* @throws OutOfBoundsException If the object does not exist
143143
*
144-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
144+
* @deprecated since version 2.5, to be removed in 3.0.
145145
*/
146146
public function offsetGet($offset)
147147
{
@@ -165,7 +165,7 @@ public function offsetGet($offset)
165165
* @param int $offset The offset
166166
* @param string $value The group name
167167
*
168-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
168+
* @deprecated since version 2.5, to be removed in 3.0.
169169
*/
170170
public function offsetSet($offset, $value)
171171
{
@@ -187,7 +187,7 @@ public function offsetSet($offset, $value)
187187
*
188188
* @param int $offset The offset
189189
*
190-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
190+
* @deprecated since version 2.5, to be removed in 3.0.
191191
*/
192192
public function offsetUnset($offset)
193193
{
@@ -203,7 +203,7 @@ public function offsetUnset($offset)
203203
*
204204
* @return int The number of groups
205205
*
206-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
206+
* @deprecated since version 2.5, to be removed in 3.0.
207207
*/
208208
public function count()
209209
{

‎src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Validator\Context;
1313

14-
trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory is deprecated since version 2.5 and will be removed in 3.0.');
14+
trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
1515

1616
use Symfony\Component\Translation\TranslatorInterface;
1717
use Symfony\Component\Validator\MetadataFactoryInterface;

‎src/Symfony/Component/Validator/ExecutionContext.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/ExecutionContext.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @author Fabien Potencier <fabien@symfony.com>
2424
* @author Bernhard Schussek <bschussek@gmail.com>
2525
*
26-
* @deprecated since version 2.5, to be removed in Symfony 3.0.
26+
* @deprecated since version 2.5, to be removed in 3.0.
2727
* Use {@link Context\ExecutionContext} instead.
2828
*/
2929
class ExecutionContext implements ExecutionContextInterface

‎src/Symfony/Component/Validator/Mapping/ClassMetadata.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public function mergeConstraints(ClassMetadata $source)
373373
*
374374
* @param MemberMetadata $metadata
375375
*
376-
* @deprecated since version 2.6, to be in 3.0.
376+
* @deprecated since version 2.6, to be removed in 3.0.
377377
*/
378378
protected function addMemberMetadata(MemberMetadata $metadata)
379379
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.