Skip to content

Commit

Permalink
Normalizes deprecation notice messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo Hamon committed Jan 5, 2015
1 parent 2493ffb commit 0819815
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Session/Flash/FlashBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function clear()
/**
* 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
*/
Expand Down
4 changes: 2 additions & 2 deletions Session/Storage/Handler/LegacyPdoSessionHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -77,8 +79,6 @@ public function __construct(\PDO $pdo, array $dbOptions = array())
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',
Expand Down

0 comments on commit 0819815

Please sign in to comment.