8000 Merge branch '2.7' into 2.8 · symfony/symfony@38bbb57 · GitHub
[go: up one dir, main page]
Skip to content

Commit 38bbb57

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: use stable 1.0.x Composer versions Fix typo in VarDumper README [WebProfilerBunde] Give an absolute url in case the request occured from another domain
2 parents ca5930b + a795388 commit 38bbb57

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ before_install:
5151
- if [[ ! $skip && $PHP = 5.* ]]; then pecl install -f memcached-2.1.0; fi
5252
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi
5353
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
54-
- if [[ ! $skip ]]; then composer self-update; fi
54+
- if [[ ! $skip ]]; then composer self-update --stable; fi
5555
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
5656
- if [[ ! $skip ]]; then ./phpunit install; fi
5757
- if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ install:
5050
- IF %PHP%==1 echo extension=php_ldap.dll >> php.ini-max
5151
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
5252
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
53-
- appveyor DownloadFile https://getcomposer.org/composer.phar
53+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
5454
- copy /Y php.ini-max php.ini
5555
- cd c:\projects\symfony
5656
- mkdir %APPDATA%\Composer

‎src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function onKernelResponse(FilterResponseEvent $event)
6565
try {
6666
$response->headers->set(
6767
'X-Debug-Token-Link',
68-
$this->urlGenerator->generate('_profiler', array('token' => $response->headers->get('X-Debug-Token')))
68+
$this->urlGenerator->generate('_profiler', array('token' => $response->headers->get('X-Debug-Token')), UrlGeneratorInterface::ABSOLUTE_URL)
6969
);
7070
} catch (\Exception $e) {
7171
$response->headers->set('X-Debug-Error', get_class($e).': '.$e->getMessage());

‎src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php

Lines changed: 4 additions & 3 deletions 10000
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Component\HttpFoundation\Response;
1717
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
1818
use Symfony\Component\HttpKernel\HttpKernelInterface;
19+
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
1920

2021
class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
2122
{
@@ -195,16 +196,16 @@ public function testXDebugUrlHeader()
195196
$urlGenerator
196197
->expects($this->once())
197198
->method('generate')
198-
->with('_profiler', array('token' => 'xxxxxxxx'))
199-
->will($this->returnValue('/_profiler/xxxxxxxx'))
199+
->with('_profiler', array('token' => 'xxxxxxxx'), UrlGeneratorInterface::ABSOLUTE_URL)
200+
->will($this->returnValue('http://mydomain.com/_profiler/xxxxxxxx'))
200201
;
201202

202203
$event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
203204

204205
$listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
205206
$listener->onKernelResponse($event);
206207

207-
$this->assertEquals('/_profiler/xxxxxxxx', $response->headers->get('X-Debug-Token-Link'));
208+
$this->assertEquals('http://mydomain.com/_profiler/xxxxxxxx', $response->headers->get('X-Debug-Token-Link'));
208209
}
209210

210211
public function testThrowingUrlGenerator()

‎src/Symfony/Component/VarDumper/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ VarDumper Component
22
===================
33

44
The VarDumper component provides mechanisms for walking through any arbitrary
5-
PHP variable. Built on top, it provides a better `dump()`` function that you
5+
PHP variable. Built on top, it provides a better `dump()` function that you
66
can use instead of `var_dump`.
77

88
Resources

0 commit comments

Comments
 (0)
0