Commit Graph

22202 Commits

Author SHA1 Message Date
Yonel Ceruto González 89499ff9e1 Fixing typo in variable name
This condition is always `true` because `$attributesMetadata` does not exists in this `foreach` context and could overwrite values in the `$attributesMetadata` variable.
2015-10-03 08:19:37 +02:00
Tobias Schultze dd5064578e [Form] remove obsolete deprecation comments 2015-10-03 00:55:12 +02:00
Fabien Potencier 513fc315d6 minor #16084 [Form] minor CS fix (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] minor CS fix

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

c92809a [Form] minor CS fix
2015-10-02 18:41:44 +02:00
Nicolas Grekas c92809a1fd [Form] minor CS fix 2015-10-02 18:35:24 +02:00
Fabien Potencier fdce6ac104 Merge branch '2.3' into 2.7
* 2.3:
  use PHP_OS instead of php_uname('s')
2015-10-02 15:59:42 +02:00
Fabien Potencier 8879a5fa9a bug #16053 [Console] use PHP_OS instead of php_uname('s') (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] use PHP_OS instead of php_uname('s')

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15058
| License       | MIT
| Doc PR        |

The php_uname() function may be disabled for security reasons.

Commits
-------

40e0dc8 use PHP_OS instead of php_uname('s')
2015-10-02 14:47:06 +02:00
Fabien Potencier 34c8a7c51c Merge branch '2.3' into 2.7
* 2.3:
  [Yaml] Add regression test for comments indents
  Revert "bug #15860 [Yaml] Fix improper comments removal (ogizanagi)"
2015-10-02 14:36:41 +02:00
Fabien Potencier 351bccbffb minor #16074 [Yaml] Add regression test for comments indents (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Add regression test for comments indents

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This is related to #16065, #15857 and #15860  (last one has been reverted due to this regression)

Commits
-------

7b9d519 [Yaml] Add regression test for comments indents
2015-10-02 14:33:33 +02:00
maxime.steinhausser 7b9d519b0f [Yaml] Add regression test for comments indents 2015-10-02 14:20:54 +02:00
Fabien Potencier 510fdea599 Revert "bug #15860 [Yaml] Fix improper comments removal (ogizanagi)"
This reverts commit 150f52f3aa, reversing
changes made to 74af02a771.
2015-10-02 12:12:23 +02:00
Nicolas Grekas 9b0fa548c1 Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Fix command line
  [Yaml] Fix improper comments removal inside strings
2015-10-02 08:55:14 +02:00
Nicolas Grekas 17edafd7e3 minor #16061 [appveyor] Fix command line (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Fix command line

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Discovery the joy of cmd programming...

Commits
-------

bdcbde9 [appveyor] Fix command line
2015-10-02 08:53:52 +02:00
Nicolas Grekas bdcbde91b9 [appveyor] Fix command line 2015-10-02 08:28:33 +02:00
Fabien Potencier 150f52f3aa bug #15860 [Yaml] Fix improper comments removal (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Fix improper comments removal

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15857
| License       | MIT
| Doc PR        | -

This tries to fix #15857 .

Honestly, I don't have any idea of the regressions it might introduce. Tests are passing, so if this code had any reason to exist, tests covering it are certainly missing :/

Any hint ?

Commits
-------

0e24fc5 [Yaml] Fix improper comments removal inside strings
2015-10-01 23:11:01 +02:00
Christian Flothmann 40e0dc8084 use PHP_OS instead of php_uname('s')
The php_uname() function may be disabled for security reasons.
2015-10-01 19:06:54 +02:00
Tobias Schultze 4b0e4c4ee0 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
2015-10-01 17:31:29 +02:00
Fabien Potencier 74af02a771 bug #16050 [TwigBundle] fix useless and failing test (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBundle] fix useless and failing test

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

This test is failing in php 7, see https://travis-ci.org/symfony/symfony/jobs/83107755#L2015
But it also doesn't test anything. So it's useless in it's current form.

In 2.7 we have more tests that are actually useful. So the class is not untested.

Commits
-------

d94dd16 [TwigBundle] fix useless and failing test
2015-10-01 17:03:00 +02:00
Tobias Schultze d94dd1679a [TwigBundle] fix useless and failing test 2015-10-01 16:53:49 +02:00
Fabien Potencier a94d7a06d1 minor #15967 [Console] Fix tests for SymfonyStyle (1ed)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fix tests for SymfonyStyle

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15909
| License       | MIT
| Doc PR        | -

Commits
-------

7720f5c [Console] Fix tests for SymfonyStyle
2015-10-01 15:25:36 +02:00
Fabien Potencier 38888af7ce minor #16005 The 'config' variable is already used as an array expression less... (tecnocat)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16005).

Discussion
----------

The 'config' variable is already used as an array expression less...

| Q             | A
| ------------- | ---
| Fixed tickets | None
| License       | MIT

The 'config' variable is already used as an array expression less...

Using a variable both as an 'array expression' and as a 'key' or 'value' most often is a typing error.

Commits
-------

f15d179 The 'config' variable is already used as an array expression less...
2015-10-01 15:23:51 +02:00
Aarón Nieves Fernández f15d179fbd The 'config' variable is already used as an array expression less... 2015-10-01 15:23:50 +02:00
Nicolas Grekas 0a615f999f Merge branch '2.3' into 2.7
* 2.3:
  Fix appveyor.yml missing ANSICON env var
  [appveyor] merge test matrix in a single job
  [travis] Skip testing intermediate PHP versions on pull requests

Conflicts:
	appveyor.yml
2015-10-01 14:02:24 +02:00
Nicolas Grekas 36306ab7c6 Fix appveyor.yml missing ANSICON env var 2015-10-01 14:01:27 +02:00
Nicolas Grekas 6a249bba5f minor #16047 [travis] Skip testing intermediate PHP versions on pull requests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Skip testing intermediate PHP versions on pull requests

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

I've never seen a build fail exclusively on 5.4/5.5. But for sure, this could happen.
Thus, to get results faster, I propose to skip the corresponding matrix lines on pull requests but keep them when testing branches.

Commits
-------

99c1cd7 [travis] Skip testing intermediate PHP versions on pull requests
2015-10-01 13:59:01 +02:00
Nicolas Grekas 80be79185f minor #16043 [appveyor] merge test matrix in a single job (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] merge test matrix in a single job

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Appveyor doesn't allow more than one concurrent job. Let's manage our matrix ourselves to get results faster.

Commits
-------

249942a [appveyor] merge test matrix in a single job
2015-10-01 13:58:27 +02:00
Nicolas Grekas 249942a31a [appveyor] merge test matrix in a single job 2015-10-01 12:28:28 +02:00
Nicolas Grekas 99c1cd725d [travis] Skip testing intermediate PHP versions on pull requests 2015-10-01 12:01:50 +02:00
Fabien Potencier aa09d82289 Merge branch '2.3't m into 2.7
* 2.3:
  fixed typo
2015-10-01 10:42:07 +02:00
Fabien Potencier 1be6f3efa8 fixed typo 2015-10-01 10:41:56 +02:00
Fabien Potencier 4b24394a87 Merge branch '2.3' into 2.7
* 2.3:
  Use PHPUnit 5.0 for PHP 7
2015-10-01 10:36:54 +02:00
Fabien Potencier 25855eb71b minor #16041 Use PHPUnit 5.0 for PHP 7 (stof)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16041).

Discussion
----------

Use PHPUnit 5.0 for PHP 7

PHPUnit 4.8 is not fully compatible with PHP 7, and won't be fixed for full support. See https://github.com/sebastianbergmann/phpunit/issues/1882

Commits
-------

1129d60 Use PHPUnit 5.0 for PHP 7
2015-10-01 10:36:33 +02:00
Christophe Coevoet 1129d608de Use PHPUnit 5.0 for PHP 7
PHPUnit 4.8 is not fully compatible with PHP 7, and won't be fixed for
full support.
2015-10-01 10:36:32 +02:00
Fabien Potencier 291587f4d0 bug #16028 [DomCrawler] always pass base href to subcrawlers (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DomCrawler] always pass base href to subcrawlers

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Make sure that all relevant information is passed to created crawlers.
To avoid future regressions, this commit backports the approach taken by
@stof in #15934 to have a single place in the class that is responsible
to create subcrawler instances.

Commits
-------

3d9a748 [DomCrawler] always pass base href to subcrawlers
2015-10-01 07:29:57 +02:00
Christian Flothmann 3d9a748978 [DomCrawler] always pass base href to subcrawlers
Make sure that all relevant information is passed to created crawlers.
To avoid future regressions, this commit backports the approach taken by
@stof in #15934 to have a single place in the class that is responsible
to create subcrawler instances.
2015-09-30 18:22:59 +02:00
Gábor Egyed 7720f5c70b [Console] Fix tests for SymfonyStyle 2015-09-30 15:35:30 +02:00
Fabien Potencier f80e6c63d7 Merge branch '2.3' into 2.7
* 2.3:
  [DependencyInjection] improved a comment for reading fluency
  [HttpKernel] change a class in tests to avoid depending on SQLite
  [ci] Display fastest results first when running tests in parallel
  [Yaml] Improve newline handling in folded scalar blocks
2015-09-30 11:14:28 +02:00
Fabien Potencier 5e46485b83 minor #16009 [HttpKernel] change a class in tests to avoid depending on SQLite (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] change a class in tests to avoid depending on SQLite

| 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

Commits
-------

d6a7517 [HttpKernel] change a class in tests to avoid depending on SQLite
2015-09-30 09:50:05 +02:00
Fabien Potencier 7512c04696 minor #16010 [DependencyInjection] improve a comment for reading fluency (craue)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #16010).

Discussion
----------

[DependencyInjection] improve a comment for reading fluency

| Q             | A
| ------------- | ---
| Fixed tickets | --
| License       | MIT

Commits
-------

55f3af7 [DependencyInjection] improved a comment for reading fluency
2015-09-30 09:41:35 +02:00
Christian Raue 55f3af7602 [DependencyInjection] improved a comment for reading fluency 2015-09-30 09:41:34 +02:00
Fabien Potencier c0ff4bfbbc bug #15482 [Yaml] Improve newline handling in folded scalar blocks (teohhanhui)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Improve newline handling in folded scalar blocks

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15477
| License       | MIT
| Doc PR        | N/A

Commits
-------

73366d5 [Yaml] Improve newline handling in folded scalar blocks
2015-09-30 08:37:21 +02:00
Fabien Potencier d6a7517923 [HttpKernel] change a class in tests to avoid depending on SQLite 2015-09-30 08:34:42 +02:00
Fabien Potencier 899c212315 minor #15996 [Bridge\Twig] Fix form lowest version (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge\Twig] Fix form lowest version

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

3f4ad74 [Bridge\Twig] Fix form lowest version
2015-09-30 08:05:43 +02:00
Fabien Potencier d8dc8f27fd minor #15993 [ci] Display fastest results first when running tests in parallel (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Display fastest results first when running tests in parallel

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Keeping order prevents seeing failures early as they happen. I propose to display tests results asap instead.
Best viewed with: https://github.com/symfony/symfony/pull/15993/files?w=1

Commits
-------

3d6c864 [ci] Display fastest results first when running tests in parallel
2015-09-30 07:57:50 +02:00
Tobias Schultze 3146062fb7 fix merge 2015-09-29 14:13:09 +02:00
Tobias Schultze 331019e87b remove api tags that are new in 2.7 2015-09-29 14:08:33 +02:00
Tobias Schultze 8573385a83 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
	src/Symfony/Component/ClassLoader/DebugClassLoader.php
	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/DependencyInjection/Definition.php
	src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
	src/Symfony/Component/EventDispatcher/Event.php
	src/Symfony/Component/Filesystem/Exception/IOException.php
	src/Symfony/Component/HttpFoundation/File/File.php
	src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
	src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/HttpKernel.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/KernelInterface.php
	src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
	src/Symfony/Component/HttpKernel/Log/NullLogger.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Routing/RequestContext.php
	src/Symfony/Component/Routing/Route.php
	src/Symfony/Component/Templating/EngineInterface.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateNameParser.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/IdentityTranslator.php
	src/Symfony/Component/Translation/Translator.php
	src/Symfony/Component/Validator/ConstraintViolationInterface.php
	src/Symfony/Component/Validator/Constraints/False.php
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/GroupSequence.php
	src/Symfony/Component/Validator/Constraints/Image.php
	src/Symfony/Component/Validator/Constraints/Null.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/True.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/ValidatorInterface.php
2015-09-29 14:06:14 +02:00
Tobias Schultze e1ede46b7d minor #15979 remove api tags from code (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

remove api tags from code

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15977
| License       | MIT
| Doc PR        | n/a

Commits
-------

f1c7c65 remove api tags from code
2015-09-29 13:19:55 +02:00
Nicolas Grekas 3f4ad74974 [Bridge\Twig] Fix form lowest version 2015-09-29 12:39:09 +02:00
Nicolas Grekas 525e63d68c [Form] Fix merge 2015-09-29 11:59:39 +02:00
Nicolas Grekas 3d6c86496e [ci] Display fastest results first when running tests in parallel 2015-09-29 11:43:32 +02:00