opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.6. For more information, see https://www.drupal.org/project/drupal/releases/8.2.6

Browse source
This commit is contained in:
Pantheon Automation 2017-02-02 16:28:38 -08:00 • committed by Greg Anderson
parent db56c09587
commit f1e72395cb
588 changed files with 26857 additions and 2777 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vendor/symfony/http-kernel/Profiler/Profile.php vendored
View file

@ -76,7 +76,7 @@ class Profile
/**
* Sets the parent token.
*
* @param Profile $parent The parent Profile
* @param Profile $parent
*/
public function setParent(Profile $parent)
{
@ -86,7 +86,7 @@ class Profile
/**
* Returns the parent profile.
*
* @return Profile The parent profile
* @return self
*/
public function getParent()
{
@ -191,7 +191,7 @@ class Profile
/**
* Finds children profilers.
*
* @return Profile[] An array of Profile
* @return self[]
*/
public function getChildren()
{
@ -201,7 +201,7 @@ class Profile
/**
* Sets children profiler.
*
* @param Profile[] $children An array of Profile
* @param Profile[] $children
*/
public function setChildren(array $children)
{
@ -214,7 +214,7 @@ class Profile
/**
* Adds the child token.
*
* @param Profile $child The child Profile
* @param Profile $child
*/
public function addChild(Profile $child)
{

11
vendor/symfony/http-kernel/Profiler/Profiler.php vendored
View file

@ -11,6 +11,7 @@
namespace Symfony\Component\HttpKernel\Profiler;
use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
@ -77,7 +78,7 @@ class Profiler
*
* @param Response $response A Response instance
*
* @return Profile A Profile instance
* @return Profile|false A Profile instance
*/
public function loadProfileFromResponse(Response $response)
{
@ -152,7 +153,7 @@ class Profiler
*
* @param string $data A data string as exported by the export() method
*
* @return Profile A Profile instance
* @return Profile|false A Profile instance
*
* @deprecated since Symfony 2.8, to be removed in 3.0.
*/
@ -208,9 +209,13 @@ class Profiler
$profile = new Profile(substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
$profile->setTime(time());
$profile->setUrl($request->getUri());
$profile->setIp($request->getClientIp());
$profile->setMethod($request->getMethod());
$profile->setStatusCode($response->getStatusCode());
try {
$profile->setIp($request->getClientIp());
} catch (ConflictingHeadersException $e) {
$profile->setIp('Unknown');
}
$response->headers->set('X-Debug-Token', $profile->getToken());