diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch pborreli/httpkernel-cs (PR #8537) 

This PR was merged into the master branch.

Discussion
----------

[HttpKernel] Fixed CS

Commits
-------

6e35963 Fixed CS
This commit is contained in:
Fabien Potencier 2013-07-21 21:21:19 +02:00
parent 0a894bc800 6e35963fa5
commit a0721afa5b
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
View File

@ -33,6 +33,7 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
* Constructor.
*
* @param HttpKernelInterface $kernel A HttpKernelInterface instance
* @param EventDispatcherInterface $dispatcher A EventDispatcherInterface instance
*/
public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null)
{
@ -53,7 +54,7 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
if ($uri instanceof ControllerReference) {
$reference = $uri;
// Remove attributes from the genereated URI because if not, the Symfony
// Remove attributes from the generated URI because if not, the Symfony
// routing system will use them to populate the Request attributes. We don't
// want that as we want to preserve objects (so we manually set Request attributes
// below instead)

12
src/Symfony/Component/HttpKernel/Tests/KernelTest.php
View File

@ -689,9 +689,9 @@ EOF;
public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
{
$grandparent = $this->getBundle(null, null, 'GrandParentCCundle');
$parent = $this->getBundle(null, 'GrandParentCCundle', 'ParentCCundle');
$child = $this->getBundle(null, 'ParentCCundle', 'ChildCCundle');
$grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
$parent = $this->getBundle(null, 'GrandParentCBundle', 'ParentCBundle');
$child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
$kernel = $this->getKernel();
$kernel
@ -703,9 +703,9 @@ EOF;
$kernel->initializeBundles();
$map = $kernel->getBundleMap();
$this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentCCundle']);
$this->assertEquals(array($child, $parent), $map['ParentCCundle']);
$this->assertEquals(array($child), $map['ChildCCundle']);
$this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentCBundle']);
$this->assertEquals(array($child, $parent), $map['ParentCBundle']);
$this->assertEquals(array($child), $map['ChildCBundle']);
}
/**