Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e610b41

Browse files
stofstof
committed
Merge branch '2.7' into 2.8
* 2.7: Fix license headers Ensure the ClockMock is loaded before using it in the testsuite Fix with_minutes option in time widget Fixed properties not explicitily declared
2 parents a31dfa6 + 05fc646 commit e610b41

File tree

29 files changed

+216
-76
lines changed

29 files changed

+216
-76
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
/*
44
* This file is part of the Symfony package.
5-
*
6-
* (c) Fabien Potencier <[email protected]>
7-
*
8-
* For the full copyright and license information, please view the LICENSE
9-
* file that was distributed with this source code.
10-
*/
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

‎src/Symfony/Bridge/PhpUnit/bootstrap.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
use Doctrine\Common\Annotations\AnnotationRegistry;
413
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
514

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
{% if datetime is not defined or false == datetime -%}
8181
<div {{ block('widget_container_attributes') -}}>
8282
{%- endif -%}
83-
{{- form_widget(form.hour) }}:{{ form_widget(form.minute) }}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
83+
{{- form_widget(form.hour) }}{% if with_minutes %}:{{ form_widget(form.minute) }}{% endif %}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
8484
{% if datetime is not defined or false == datetime -%}
8585
</div>
8686
{%- endif -%}

‎src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
105105

106106
private function validate($content, $file = null)
107107
{
108-
$this->parser = new Parser();
108+
$parser = new Parser();
109109
try {
110-
$this->parser->parse($content);
110+
$parser->parse($content);
111111
} catch (ParseException $e) {
112112
return array('file' => $file, 'valid' => false, 'message' => $e->getMessage());
113113
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
413

514
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
413
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
514

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
413

514
/*

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
return array(
413
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
514
new Symfony\Bundle\SecurityBundle\SecurityBundle(),

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
return array(
413
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
514
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),

‎src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use Symfony\Component\Console\Output\StreamOutput;
1717
use Symfony\Component\Console\Tests;
1818

19+
require_once __DIR__.'/../ClockMock.php';
20+
1921
class ProgressBarTest extends \PHPUnit_Framework_TestCase
2022
{
2123
protected function setUp()

‎src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\Console\Tests\Style;
413

514
use PHPUnit_Framework_TestCase;

‎src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public function process(ContainerBuilder $container)
6464
}
6565

6666
$this->currentId = $id;
67-
$this->currentDefinition = $definition;
6867
$this->currentScope = $scope = $definition->getScope(false);
6968

7069
if (ContainerInterface::SCOPE_CONTAINER === $scope) {

‎src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\DependencyInjection\Compiler;
413

514
use Symfony\Component\DependencyInjection\ContainerBuilder;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
413

514
use Symfony\Component\DependencyInjection\Alias;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
413

514
use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;

‎src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
$operators = array('not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**');
413
$operators = array_combine($operators, array_map('strlen', $operators));
514
arsort($operators);

‎src/Symfony/Component/ExpressionLanguage/Tests/ExpressionTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\ExpressionLanguage\Tests;
413

514
use Symfony\Component\ExpressionLanguage\Expression;

‎src/Symfony/Component/ExpressionLanguage/Tests/ParsedExpressionTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\ExpressionLanguage\Tests;
413

514
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;

‎src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Component\Filesystem\Tests;
413

514
use Symfony\Component\Filesystem\LockHandler;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

33
/*
4-
* This file is part of the Symfony package.
5-
*
6-
* (c) Fabien Potencier <[email protected]>
7-
*
8-
* For the full copyright and license information, please view the LICENSE
9-
* file that was distributed with this source code.
10-
*/
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Validator;
1313

‎src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
3434
private $clonesIndex = 0;
3535
private $rootRefs;
3636
private $charset;
37+
private $requestStack;
3738
private $dumper;
3839
private $dumperIsInjected;
3940

‎src/Symfony/Component/HttpKernel/HttpCache/Esi.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comme
200200
*/
201201
public function process(Request $request, Response $response)
202202
{
203-
$this->request = $request;
204203
$type = $response->headers->get('Content-Type');
205204
if (empty($type)) {
206205
$type = 'text/html';

‎src/Symfony/Component/HttpKernel/HttpCache/Ssi.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comme
113113
*/
114114
public function process(Request $request, Response $response)
115115
{
116-
$this->request = $request;
117116
$type = $response->headers->get('Content-Type');
118117
if (empty($type)) {
119118
$type = 'text/html';

‎src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
2828
protected $responses;
2929
protected $catch;
3030
protected $esi;
31+
protected $store;
3132

3233
protected function setUp()
3334
{

‎src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
2323
protected $bodies = array();
2424
protected $statuses = array();
2525
protected $headers = array();
26-
protected $call = false;
26+
protected $called = false;
2727
protected $backendRequest;
2828

2929
public function __construct($responses)
@@ -75,6 +75,6 @@ public function hasBeenCalled()
7575

7676
public function reset()
7777
{
78-
$this->call = false;
78+
$this->called = false;
7979
}
8080
}

‎src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
class JsonEncoderTest extends \PHPUnit_Framework_TestCase
1919
{
20+
private $encoder;
21+
private $serializer;
22+
2023
protected function setUp()
2124
{
2225
$this->encoder = new JsonEncoder();

0 commit comments

Comments
 (0)