Update to Drupal 8.0.0 beta 14. For more information, see https://drupal.org/node/2544542
This commit is contained in:
parent
3b2511d96d
commit
81ccda77eb
2155 changed files with 54307 additions and 46870 deletions
|
@ -175,7 +175,7 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate
|
|||
*/
|
||||
public function getIterator()
|
||||
{
|
||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
|
||||
return new \ArrayIterator($this->all());
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
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);
|
||||
@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.
|
||||
|
|
|
@ -126,7 +126,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||
private $lockMode = self::LOCK_TRANSACTIONAL;
|
||||
|
||||
/**
|
||||
* It's an array to support multiple reads before closing which is manual, non-standard usage
|
||||
* It's an array to support multiple reads before closing which is manual, non-standard usage.
|
||||
*
|
||||
* @var \PDOStatement[] An array of statements to release advisory locks
|
||||
*/
|
||||
|
@ -483,7 +483,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||
if ('sqlite' === $this->driver) {
|
||||
$this->pdo->exec('ROLLBACK');
|
||||
} else {
|
||||
$this->pdo->rollback();
|
||||
$this->pdo->rollBack();
|
||||
}
|
||||
$this->inTransaction = false;
|
||||
}
|
||||
|
@ -680,7 +680,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a PDO instance
|
||||
* Return a PDO instance.
|
||||
*
|
||||
* @return \PDO
|
||||
*/
|
||||
|
|
|
@ -249,7 +249,7 @@ class MockArraySessionStorage implements SessionStorageInterface
|
|||
*/
|
||||
protected function generateId()
|
||||
{
|
||||
return hash('sha256', uniqid(mt_rand()));
|
||||
return hash('sha256', uniqid('ss_mock_', true));
|
||||
}
|
||||
|
||||
protected function loadSession()
|
||||
|
|
|
@ -203,7 +203,13 @@ class NativeSessionStorage implements SessionStorageInterface
|
|||
$this->metadataBag->stampNew();
|
||||
}
|
||||
|
||||
return session_regenerate_id($destroy);
|
||||
$isRegenerated = session_regenerate_id($destroy);
|
||||
|
||||
// The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
|
||||
// @see https://bugs.php.net/bug.php?id=70013
|
||||
$this->loadSession();
|
||||
|
||||
return $isRegenerated;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Reference in a new issue