8000 minor #12772 PSR-2 Fixes (GrahamCampbell) · symfony/symfony@be81a1d · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit be81a1d

Browse files
fabpotfabpot
committed
minor #12772 PSR-2 Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch. Discussion ---------- PSR-2 Fixes | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A ##### This pull request brings symfony 2.3 back inline with PSR-2. Commits ------- eda746b PSR-2 fixes
2 parents 2e65c3f + eda746b commit be81a1d

File tree

44 files changed

+127
-128
lines changed
  • Tests
  • Stopwatch/Tests
  • Validator/Tests
  • Yaml

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    44 files changed

    +127
    -128
    lines changed

    ‎src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,7 +36,7 @@ public function __construct(FragmentHandler $handler)
    3636
    public function getFunctions()
    3737
    {
    3838
    return array(
    39-
    new \Twig_SimpleFunction('render',array($this, 'renderFragment'), array('is_safe' => array('html'))),
    39+
    new \Twig_SimpleFunction('render', array($this, 'renderFragment'), array('is_safe' => array('html'))),
    4040
    new \Twig_SimpleFunction('render_*', array($this, 'renderFragmentStrategy'), array('is_safe' => array('html'))),
    4141
    new \Twig_SimpleFunction('controller', array($this, 'controller')),
    4242
    );

    ‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -226,7 +226,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
    226226
    'memcached' => 'Symfony\Component\HttpKernel\Profiler\MemcachedProfilerStorage',
    227227
    'redis' => 'Symfony\Component\HttpKernel\Profiler\RedisProfilerStorage',
    228228
    );
    229-
    list($class, ) = explode(':', $config['dsn'], 2);
    229+
    list($class,) = explode(':', $config['dsn'], 2);
    230230
    if (!isset($supported[$class])) {
    231231
    throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
    232232
    }
    @@ -663,7 +663,7 @@ private function getValidatorYamlMappingFiles(ContainerBuilder $container)
    663663
    return $files;
    664664
    }
    665665

    666-
    private function registerAnnotationsConfiguration(array $config, ContainerBuilder $container,$loader)
    666+
    private function registerAnnotationsConfiguration(array $config, ContainerBuilder $container, $loader)
    667667
    {
    668668
    $loader->load('annotations.xml');
    669669

    ‎src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -100,9 +100,9 @@ public function testGetTemplates()
    100100
    ->will($this->returnCallback(array($this, 'profileHasCollectorCallback')));
    101101

    102102
    $result = $this->templateManager->getTemplates($profile);
    103-
    $this->assertArrayHasKey('foo',$result);
    104-
    $this->assertArrayNotHasKey('bar',$result);
    105-
    $this->assertArrayNotHasKey('baz',$result);
    103+
    $this->assertArrayHasKey('foo', $result);
    104+
    $this->assertArrayNotHasKey('bar', $result);
    105+
    $this->assertArrayNotHasKey('baz', $result);
    106106
    }
    107107

    108108
    public function profilerHasCallback($panel)

    ‎src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php

    Lines changed: 8 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -202,9 +202,9 @@ public function testCookieGetWithSubdomain()
    202202
    $cookieJar->set($cookie1 = new Cookie('foo', 'bar', null, '/', '.example.com'));
    203203
    $cookieJar->set($cookie2 = new Cookie('foo1', 'bar', null, '/', 'test.example.com'));
    204204

    205-
    $this->assertEquals($cookie1, $cookieJar->get('foo','/','foo.example.com'));
    206-
    $this->assertEquals($cookie1, $cookieJar->get('foo','/','example.com'));
    207-
    $this->assertEquals($cookie2, $cookieJar->get('foo1','/','test.example.com'));
    205+
    $this->assertEquals($cookie1, $cookieJar->get('foo', '/', 'foo.example.com'));
    206+
    $this->assertEquals($cookie1, $cookieJar->get('foo', '/', 'example.com'));
    207+
    $this->assertEquals($cookie2, $cookieJar->get('foo1', '/', 'test.example.com'));
    208208
    }
    209209

    210210
    public function testCookieGetWithSubdirectory()
    @@ -213,11 +213,11 @@ public function testCookieGetWithSubdirectory()
    213213
    $cookieJar->set($cookie1 = new Cookie('foo', 'bar', null, '/test', '.example.com'));
    214214
    $cookieJar->set($cookie2 = new Cookie('foo1', 'bar1', null, '/', '.example.com'));
    215215

    216-
    $this->assertNull($cookieJar->get('foo','/','.example.com'));
    217-
    $this->assertNull($cookieJar->get('foo','/bar','.example.com'));
    218-
    $this->assertEquals($cookie1, $cookieJar->get('foo','/test','example.com'));
    219-
    $this->assertEquals($cookie2, $cookieJar->get('foo1','/','example.com'));
    220-
    $this->assertEquals($cookie2, $cookieJar->get('foo1','/bar','example.com'));
    216+
    $this->assertNull($cookieJar->get('foo', '/', '.example.com'));
    217+
    $this->assertNull($cookieJar->get('foo', '/bar', '.example.com'));
    218+
    $this->assertEquals($cookie1, $cookieJar->get('foo', '/test', 'example.com'));
    219+
    $this->assertEquals($cookie2, $cookieJar->get('foo1', '/', 'example.com'));
    220+
    $this->assertEquals($cookie2, $cookieJar->get('foo1', '/bar', 'example.com'));
    221221
    }
    222222

    223223
    public function testCookieWithWildcardDomain()

    ‎src/Symfony/Component/Config/Loader/FileLoader.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -91,7 +91,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
    9191
    }
    9292

    9393
    $resources = is_array($resource) ? $resource : array($resource);
    94-
    for ($i = 0; $i < $resourcesCount = count($resources); $i++ ) {
    94+
    for ($i = 0; $i < $resourcesCount = count($resources); $i++) {
    9595
    if (isset(self::$loading[$resources[$i]])) {
    9696
    if ($i == $resourcesCount-1) {
    9797
    throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading));

    ‎src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -116,10 +116,10 @@ public function getZeroNamedNodeExamplesData()
    116116
    'string_key' => 'just value',
    117117
    ),
    118118
    array(
    119-
    0 => array (
    119+
    0 => array(
    120120
    'name' => 'something',
    121121
    ),
    122-
    5 => array (
    122+
    5 => array(
    123123
    0 => 'this won\'t work too',
    124124
    'new_key' => 'some other value',
    125125
    ),

    ‎src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -33,16 +33,16 @@ public function testIfTrueExpression()
    3333
    $this->assertFinalizedValueIs('new_value', $test, array('key' => true));
    3434

    3535
    $test = $this->getTestBuilder()
    36-
    ->ifTrue( function ($v) { return true; })
    36+
    ->ifTrue(function ($v) { return true; })
    3737
    ->then($this->returnClosure('new_value'))
    3838
    ->end();
    3939
    $this->assertFinalizedValueIs('new_value', $test);
    4040

    4141
    $test = $this->getTestBuilder()
    42-
    ->ifTrue( function ($v) { return false; })
    42+
    ->ifTrue(function ($v) { return false; })
    4343
    ->then($this->returnClosure('new_value'))
    4444
    ->end();
    45-
    $this->assertFinalizedValueIs('value',$test);
    45+
    $this->assertFinalizedValueIs('value', $test);
    4646
    }
    4747

    4848
    public function testIfStringExpression()

    ‎src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -117,7 +117,7 @@ protected function describeApplication(Application $application, array $options
    117117

    118118
    $blocks[] = implode("\n", array_map(function ($commandName) {
    119119
    return '* '.$commandName;
    120-
    } , $namespace['commands']));
    120+
    }, $namespace['commands']));
    121121
    }
    122122

    123123
    foreach ($description->getCommands() as $command) {

    ‎src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php

    Lines changed: 5 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -126,9 +126,9 @@ public function testPrevious(\Exception $exception, $statusCode)
    126126

    127127
    $flattened->setPrevious($flattened2);
    128128

    129-
    $this->assertSame($flattened2,$flattened->getPrevious());
    129+
    $this->assertSame($flattened2, $flattened->getPrevious());
    130130

    131-
    $this->assertSame(array($flattened2),$flattened->getAllPrevious());
    131+
    $this->assertSame(array($flattened2), $flattened->getAllPrevious());
    132132
    }
    133133

    134134
    /**
    @@ -162,7 +162,7 @@ public function testToArray(\Exception $exception, $statusCode)
    162162
    'message' => 'test',
    163163
    'class' => 'Exception',
    164164
    'trace' => array(array(
    165-
    'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '', 'file' => 'foo.php', 'line' => 123,
    165+
    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
    166166
    'args' => array(),
    167167
    )),
    168168
    ),
    @@ -214,12 +214,12 @@ public function testSetTraceIncompleteClass()
    214214
    'class' => 'Exception',
    215215
    'trace' => array(
    216216
    array(
    217-
    'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '',
    217+
    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '',
    218218
    'file' => 'foo.php', 'line' => 123,
    219219
    'args' => array(),
    220220
    ),
    221221
    array(
    222-
    'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => 'test',
    222+
    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => 'test',
    223223
    'file' => __FILE__, 'line' => 123,
    224224
    'args' => array(
    225225
    array(

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

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -147,9 +147,9 @@ public function testSetLazyOnServiceHasParent()
    147147
    {
    148148
    $container = new ContainerBuilder();
    149149

    150-
    $container->register('parent','stdClass');
    150+
    $container->register('parent', 'stdClass');
    151151

    152-
    $container->setDefinition('child1',new DefinitionDecorator('parent'))
    152+
    $container->setDefinition('child1', new DefinitionDecorator('parent'))< B41A /div>
    153153
    ->setLazy(true)
    154154
    ;
    155155

    @@ -162,11 +162,11 @@ public function testSetLazyOnServiceIsParent()
    162162
    {
    163163
    $container = new ContainerBuilder();
    164164

    165-
    $container->register('parent','stdClass')
    165+
    $container->register('parent', 'stdClass')
    166166
    ->setLazy(true)
    167167
    ;
    168168

    169-
    $container->setDefinition('child1',new DefinitionDecorator('parent'));
    169+
    $container->setDefinition('child1', new DefinitionDecorator('parent'));
    170170

    171171
    $this->process($container);
    172172

    ‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@
    66
    }
    77

    88
    $phar = new Phar($file, 0, 'ProjectWithXsdExtensionInPhar.phar');
    9-
    $phar->addFromString('ProjectWithXsdExtensionInPhar.php',<<<EOT
    9+
    $phar->addFromString('ProjectWithXsdExtensionInPhar.php', <<<EOT
    1010
    <?php
    1111
    1212
    class ProjectWithXsdExtensionInPhar extends ProjectExtension

    ‎src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -351,8 +351,7 @@ public function testText()
    351351
    public function testHtml()
    352352
    {
    353353
    $this->assertEquals('<img alt="Bar">', $this->createTestCrawler()->filterXPath('//a[5]')->html());
    354-
    $this->assertEquals('<input type="text" value="TextValue" name="TextName"><input type="submit" value="FooValue" name="FooName" id="FooId"><input type="button" value="BarValue" name="BarName" id="BarId"><button value="ButtonValue" name="ButtonName" id="ButtonId"></button>'
    355-
    , trim($this->createTestCrawler()->filterXPath('//form[@id="FooFormId"]')->html()));
    354+
    $this->assertEquals('<input type="text" value="TextValue" name="TextName"><input type="submit" value="FooValue" name="FooName" id="FooId"><input type="button" value="BarValue" name="BarName" id="BarId"><button value="ButtonValue" name="ButtonName" id="ButtonId"></button>', trim($this->createTestCrawler()->filterXPath('//form[@id="FooFormId"]')->html()));
    356355

    357356
    try {
    358357
    $this->createTestCrawler()->filterXPath('//ol')->html();

    ‎src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -53,28 +53,28 @@ public function getTestFilterData()
    5353
    'name' => 'a.txt',
    5454
    'contents' => 'Lorem ipsum...',
    5555
    'type' => 'file',
    56-
    'mode' => 'r+',)
    56+
    'mode' => 'r+', )
    5757
    );
    5858

    5959
    $inner[] = new MockSplFileInfo(array(
    6060
    'name' => 'b.yml',
    6161
    'contents' => 'dolor sit...',
    6262
    'type' => 'file',
    63-
    'mode' => 'r+',)
    63+
    'mode' => 'r+', )
    6464
    );
    6565

    6666
    $inner[] = new MockSplFileInfo(array(
    6767
    'name' => 'some/other/dir/third.php',
    6868
    'contents' => 'amet...',
    6969
    'type' => 'file',
    70-
    'mode' => 'r+',)
    70+
    'mode' => 'r+', )
    7171
    );
    7272

    7373
    $inner[] = new MockSplFileInfo(array(
    7474
    'name' => 'unreadable-file.txt',
    7575
    'contents' => false,
    7676
    'type' => 'file',
    77-
    'mode' => 'r+',)
    77+
    'mode' => 'r+', )
    7878
    );
    7979

    8080
    return array(

    ‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -32,7 +32,7 @@ public function transform($array)
    3232
    $array = array();
    3333
    }
    3434

    35-
    if (!is_array($array) ) {
    35+
    if (!is_array($array)) {
    3636
    throw new TransformationFailedException('Expected an array.');
    3737
    }
    3838

    @@ -51,7 +51,7 @@ public function transform($array)
    5151

    5252
    public function reverseTransform($array)
    5353
    {
    54-
    if (!is_array($array) ) {
    54+
    if (!is_array($array)) {
    5555
    throw new TransformationFailedException('Expected an array.');
    5656
    }
    5757

    ‎src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -113,7 +113,7 @@ public function testGuessMaxLengthForConstraintWithMinValue()
    113113

    114114
    public function maxLengthTypeProvider()
    115115
    {
    116-
    return array (
    116+
    return array(
    117117
    array('double'),
    118118
    array('float'),
    119119
    array('numeric'),

    ‎src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -168,7 +168,7 @@ public function testAbortMappingIfNotSynchronized()
    168168
    $child = $this->getForm('address', 'address', null, array(), false, false);
    169169
    // even though "street" is synchronized, it should not have any errors
    170170
    // due to its parent not being synchronized
    171-
    $grandChild = $this->getForm('street' , 'street');
    171+
    $grandChild = $this->getForm('street', 'street');
    172172

    173173
    $parent->add($child);
    174174
    $child->add($grandChild);

    ‎src/Symfony/Component/HttpFoundation/Tests/CookieTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -51,7 +51,7 @@ public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidChara
    5151
    */
    5252
    public function testInvalidExpiration()
    5353
    {
    54-
    $cookie = new Cookie('MyCookie', 'foo','bar');
    54+
    $cookie = new Cookie('MyCookie', 'foo', 'bar');
    5555
    }
    5656

    5757
    /**

    ‎src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -116,7 +116,7 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
    116116
    copy(__DIR__.'/Fixtures/test.gif', $path);
    117117

    118118
    $file = new File($path);
    119-
    $movedFile = $file->move($targetDir,$filename);
    119+
    $movedFile = $file->move($targetDir, $filename);
    120120
    $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
    121121

    122122
    $this->assertTrue(file_exists($targetPath));

    ‎src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php

    Lines changed: 14 additions & 14 deletions
    Original file line numberDiff line numberDiff line change
    @@ -97,18 +97,18 @@ public function testReplace()
    9797
    public function testGet()
    9898
    {
    9999
    $bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
    100-
    $this->assertEquals( 'bar', $bag->get('foo'), '->get return current value');
    101-
    $this->assertEquals( 'bar', $bag->get('FoO'), '->get key in case insensitive');
    102-
    $this->assertEquals( array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
    100+
    $this->assertEquals('bar', $bag->get('foo'), '->get return current value');
    101+
    $this->assertEquals('bar', $bag->get('FoO'), '->get key in case insensitive');
    102+
    $this->assertEquals(array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
    103103

    104104
    // defaults
    105105
    $this->assertNull($bag->get('none'), '->get unknown values returns null');
    106-
    $this->assertEquals( 'default', $bag->get('none', 'default'), '->get unknown values returns default');
    107-
    $this->assertEquals( array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
    106+
    $this->assertEquals('default', $bag->get('none', 'default'), '->get unknown values returns default');
    107+
    $this->assertEquals(array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
    108108

    109109
    $bag->set('foo', 'bor', false);
    110-
    $this->assertEquals( 'bar', $bag->get('foo'), '->get return first value');
    111-
    $this->assertEquals( array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
    110+
    $this->assertEquals('bar', $bag->get('foo'), '->get return first value');
    111+
    $this->assertEquals(array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
    112112
    }
    113113

    114114
    public function testSetAssociativeArray()
    @@ -125,16 +125,16 @@ public function testSetAssociativeArray()
    125125
    public function testContains()
    126126
    {
    127127
    $bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
    128-
    $this->assertTrue( $bag->contains('foo', 'bar'), '->contains first value');
    129-
    $this->assertTrue( $bag->contains('fuzz', 'bizz'), '->contains second value');
    130-
    $this->assertFalse( $bag->contains('nope', 'nope'), '->contains unknown value');
    131-
    $this->assertFalse( $bag->contains('foo', 'nope'), '->contains unknown value');
    128+
    $this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
    129+
    $this->assertTrue($bag->contains('fuzz', 'bizz'), '->contains second value');
    130+
    $this->assertFalse($bag->contains('nope', 'nope'), '->contains unknown value');
    131+
    $this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
    132132

    133133
    // Multiple values
    134134
    $bag->set('foo', 'bor', false);
    135-
    $this->assertTrue( $bag->contains('foo', 'bar'), '->contains first value');
    136-
    $this->assertTrue( $bag->contains('foo', 'bor'), '->contains second value');
    137-
    $this->assertFalse( $bag->contains('foo', 'nope'), '->contains unknown value');
    135+
    $this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
    136+
    $this->assertTrue($bag->contains('foo', 'bor'), '->contains second value');
    137+
    $this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
    138138
    }
    139139

    140140
    public function testCacheControlDirectiveAccessors()

    ‎src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -212,12 +212,12 @@ public function testFilter()
    212212

    213213
    $this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
    214214
    'flags' => FILTER_FLAG_ALLOW_HEX,
    215-
    'options' => array('min_range' => 1, 'max_range' => 0xff),)
    215+
    'options' => array('min_range' => 1, 'max_range' => 0xff))
    216216
    ), '->filter() gets a value of parameter as integer between boundaries');
    217217

    218218
    $this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
    219219
    'flags' => FILTER_FLAG_ALLOW_HEX,
    220-
    'options' => array('min_range' => 1, 'max_range' => 0xff),)
    220+
    'options' => array('min_range' => 1, 'max_range' => 0xff))
    221221
    ), '->filter() gets a value of parameter as integer between boundaries');
    222222

    223223
    $this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');

    ‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -217,7 +217,7 @@ public function testCreate()
    217217
    $this->assertEquals(80, $request->getPort());
    218218
    $this->assertEquals('test.com', $request->getHttpHost());
    219219
    $this->assertEquals('username', $request->getUser());
    220-
    $this->assertSame('',$request->getPassword());
    220+
    $this->assertSame('', $request->getPassword());
    221221
    $this->assertFalse($request->isSecure());
    222222

    223223
    $request = Request::create('http://test.com/?foo');
    @@ -501,7 +501,7 @@ public function testGetUriForPath()
    501501

    502502
    $request = new Request();
    503503

    504-
    $request->initialize(array(), array(), array(), array(), array(),$server);
    504+
    $request->initialize(array(), array(), array(), array(), array(), $server);
    505505

    506506
    $this->assertEquals('http://host:8080/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with non default port');
    507507

    ‎src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -91,7 +91,7 @@ public function testAll()
    9191
    $this->bag->set('error', 'Bar');
    9292
    $this->assertEquals(array(
    9393
    'notice' => array('Foo'),
    94-
    'error' => array('Bar'),), $this->bag->all()
    94+
    'error' => array('Bar'), ), $this->bag->all()
    9595
    );
    9696

    9797
    $this->assertEquals(array(), $this->bag->all());

    ‎src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php

    Lines changed: 5 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -33,12 +33,12 @@ public function testCollect()
    3333
    $c->setKernel($kernel);
    3434
    $c->collect(new Request(), new Response());
    3535

    36-
    $this->assertSame('test',$c->getEnv());
    36+
    $this->assertSame('test', $c->getEnv());
    3737
    $this->assertTrue($c->isDebug());
    38-
    $this->assertSame('config',$c->getName());
    39-
    $this->assertSame('testkernel',$c->getAppName());
    40-
    $this->assertSame(PHP_VERSION,$c->getPhpVersion());
    41-
    $this->assertSame(Kernel::VERSION,$c->getSymfonyVersion());
    38+
    $this->assertSame('config', $c->getName());
    39+
    $this->assertSame('testkernel', $c->getAppName());
    40+
    $this->assertSame(PHP_VERSION, $c->getPhpVersion());
    41+
    $this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());
    4242
    $this->assertNull($c->getToken());
    4343

    4444
    // if else clause because we don't know it

    0 commit comments

    Comments
     (0)
    0