8000 Merge branch '3.0' · chalasr/symfony@b44abe3 · GitHub
[go: up one dir, main page]
Skip to content

Commit b44abe3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.0'
* 3.0: use stable 1.0.x Composer versions Fix typo in VarDumper README [DI] Fix AutowirePass fatal error with classes that have non-existing parents [DependencyInjection] Tests for AutowirePass with missing parent class [WebProfilerBunde] Give an absolute url in case the request occured from another domain Conflicts: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
2 parents 84b48de + fc50ad9 commit b44abe3

File tree

8 files changed

+82
-14
lines changed

8 files changed

+82
-14
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ before_install:
5656
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi
5757
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = redis.so >> $INI_FILE; fi;
5858
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
59-
- if [[ ! $skip ]]; then composer self-update; fi
59+
- if [[ ! $skip ]]; then composer self-update --stable; fi
6060
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
6161
- if [[ ! $skip ]]; then ./phpunit install; fi
6262
- 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
@@ -45,7 +45,7 @@ install:
4545
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
4646
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
4747
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
48-
- appveyor DownloadFile https://getcomposer.org/composer.phar
48+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
4949
- copy /Y php.ini-max php.ini
5050
- cd c:\projects\symfony
5151
- 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
Original file line numberDiff line numberDiff line change
@@ -16 8000 ,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/DependencyInjection/Compiler/AutowirePass.php

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,32 @@ class AutowirePass implements CompilerPassInterface
3535
*/
3636
public function process(ContainerBuilder $container)
3737
{
38-
$this->container = $container;
39-
foreach ($container->getDefinitions() as $id => $definition) {
40-
if ($definition->isAutowired()) {
41-
$this->completeDefinition($id, $definition);
38+
$throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
39+
spl_autoload_register($throwingAutoloader);
40+
41+
try {
42+
$this->container = $container;
43+
foreach ($container->getDefinitions() as $id => $definition) {
44+
if ($definition->isAutowired()) {
45+
$this->completeDefinition($id, $definition);
46+
}
4247
}
48+
} catch (\Error $e) {
49+
} catch (\Exception $e) {
4350
}
4451

52+
spl_autoload_unregister($throwingAutoloader);
53+
4554
// Free memory and remove circular reference to container
4655
$this->container = null;
4756
$this->reflectionClasses = array();
4857
$this->definedTypes = array();
4958
$this->types = null;
5059
$this->ambiguousServiceTypes = array();
60+
61+
if (isset($e)) {
62+
throw $e;
63+
}
5164
}
5265

5366
/**
@@ -139,11 +152,11 @@ private function completeDefinition($id, Definition $definition)
139152
}
140153
}
141154
}
142-
} catch (\ReflectionException $reflectionException) {
155+
} catch (\ReflectionException $e) {
143156
// Typehint against a non-existing class
144157

145158
if (!$parameter->isDefaultValueAvailable()) {
146-
throw new RuntimeException(sprintf('Cannot autowire argument %s for %s because the type-hinted class does not exist (%s).', $index + 1, $definition->getClass(), $reflectionException->getMessage()), 0, $reflectionException);
159+
throw new RuntimeException(sprintf('Cannot autowire argument %s for %s because the type-hinted class does not exist (%s).', $index + 1, $definition->getClass(), $e->getMessage()), 0, $e);
147160
}
148161

149162
$value = $parameter->getDefaultValue();
@@ -295,7 +308,7 @@ private function getReflectionClass($id, Definition $definition)
295308

296309
try {
297310
$reflector = new \ReflectionClass($class);
298-
} catch (\ReflectionException $reflectionException) {
311+
} catch (\ReflectionException $e) {
299312
$reflector = false;
300313
}
301314

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,21 @@ public function testClassNotFoundThrowsException()
284284
$pass->process($container);
285285
}
286286

287+
/**
288+
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
289+
* @expectedExceptionMessage Cannot autowire argument 2 for Symfony\Component\DependencyInjection\Tests\Compiler\BadParentTypeHintedArgument because the type-hinted class does not exist (Class Symfony\Component\DependencyInjection\Tests\Compiler\OptionalServiceClass does not exist).
290+
*/
291+
public function testParentClassNotFoundThrowsException()
292+
{
293+
$container = new ContainerBuilder();
294+
295+
$aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
296+
$aDefinition->setAutowired(true);
297+
298+
$pass = new AutowirePass();
299+
$pass->process($container);
300+
}
301+
287302
public function testDontUseAbstractServices()
288303
{
289304
$container = new ContainerBuilder();
@@ -446,6 +461,21 @@ public function getCreateResourceTests()
446461
['ClassChangedConstructorArgs', false],
447462
);
448463
}
464+
465+
public function testIgnoreServiceWithClassNotExisting()
466+
{
467+
$container = new ContainerBuilder();
468+
469+
$container->register('class_not_exist', __NAMESPACE__.'\OptionalServiceClass');
470+
471+
$barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
472+
$barDefinition->setAutowired(true);
473+
474+
$pass = new AutowirePass();
475+
$pass->process($container);
476+
477+
$this->assertTrue($container->hasDefinition('bar'));
478+
}
449479
}
450480

451481
class Foo
@@ -558,6 +588,12 @@ public function __construct(Dunglas $k, NotARealClass $r)
558588
{
559589
}
560590
}
591+
class BadParentTypeHintedArgument
592+
{
593+
public function __construct(Dunglas $k, OptionalServiceClass $r)
594+
{
595+
}
596+
}
561597
class NotGuessableArgument
562598
{
563599
public function __construct(Foo $k)

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
13+
14+
use Symfony\Bug\NotExistClass;
15+
16+
class OptionalServiceClass extends NotExistClass
17+
{
18+
}

‎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