Commit Graph

18640 Commits

Author SHA1 Message Date
Tobias Schultze
b0c29a0c18 [FrameworkBundle] fix routing descriptor for options 2015-01-15 12:18:50 +01:00
Fabien Potencier
8d07449414 bug #13405 [TwigBridge] exit when Twig environment is not set in the LintCommand (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[TwigBridge] exit when Twig environment is not set in the LintCommand

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

The `LintCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.

Commits
-------

05a4602 exit when Twig environment is not set
2015-01-14 10:26:36 +01:00
Christian Flothmann
05a4602450 exit when Twig environment is not set
The `LintCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.
2015-01-13 20:56:15 +01:00
Tobias Schultze
1d8fc92dbe minor #13399 [Routing] fix misleading test for condition (Tobion)
This PR was merged into the 2.5 branch.

Discussion
----------

[Routing] fix misleading test for condition

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

Commits
-------

d687a88 [Routing] fix misleading test for condition
2015-01-13 16:05:34 +01:00
Tobias Schultze
d687a885a4 [Routing] fix misleading test for condition 2015-01-13 15:58:43 +01:00
Fabien Potencier
d7e9448353 Merge branch '2.3' into 2.5
* 2.3:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:30 +01:00
Fabien Potencier
760ad3306f minor #13386 [Debug] add missing conflict dep rules (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] add missing conflict dep rules

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

Commits
-------

a4be610 [Debug] add missing conflict dep rules
2015-01-13 11:52:51 +01:00
Nicolas Grekas
a4be6103d4 [Debug] add missing conflict dep rules 2015-01-13 10:04:07 +01:00
Fabien Potencier
bf3e882a0c Merge branch '2.3' into 2.5
* 2.3:
  [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle
  [HttpFoundation] Make use of isEmpty() method
  fix missing comma in YamlDumper
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
2015-01-13 08:22:00 +01:00
Fabien Potencier
cc359a6798 [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle 2015-01-13 08:01:38 +01:00
Fabien Potencier
faf7db1b8a bug #13371 fix missing comma in YamlDumper (garak)
This PR was merged into the 2.3 branch.

Discussion
----------

fix missing comma in YamlDumper

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

The YamlDumper were missing commas between tag attributes.
See https://github.com/rosstuck/TuckConverterBundle/issues/6

Commits
-------

f600d1a fix missing comma in YamlDumper
2015-01-12 17:43:29 +01:00
Fabien Potencier
de48c2ed5d bug #13365 [HttpFoundation] Make use of isEmpty() method (xelaris)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13365).

Discussion
----------

[HttpFoundation] Make use of isEmpty() method

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

Commits
-------

fc51d54 [HttpFoundation] Make use of isEmpty() method
2015-01-12 17:40:49 +01:00
Alexander Schwenn
fc51d544b5 [HttpFoundation] Make use of isEmpty() method 2015-01-12 17:40:49 +01:00
Massimiliano Arione
f600d1a557 fix missing comma in YamlDumper 2015-01-11 18:40:41 +01:00
Fabien Potencier
80b097094c bug #13355 [Console] Helper\Table->addRow optimization (boekkooi)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] Helper\Table->addRow optimization

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

Commits
-------

5d3a1fc [Console] Helper\Table->addRow optimization
2015-01-10 18:09:02 +01:00
Fabien Potencier
76de7006d5 bug #13347 [Console] Helper\TableHelper->addRow optimization (boekkooi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Helper\TableHelper->addRow optimization

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

Commits
-------

9ea59ac [Console] Helper\Table->addRow optimization
2015-01-10 18:05:09 +01:00
Warnar Boekkooi
5d3a1fc4c5 [Console] Helper\Table->addRow optimization 2015-01-10 13:50:07 +01:00
Fabien Potencier
e300b4384f Merge branch '2.3' into 2.5
* 2.3:
  [PropertyAccessor] Added test to allow null value for a array
  [Yaml] Fixed #10597: Improved Yaml directive parsing
  [Form] Set a child type to text if added to the form without a type.

Conflicts:
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2015-01-09 19:07:12 +01:00
Fabien Potencier
55b8939183 bug #13346 [PropertyAccessor] Allow null value for a array (2.3) (boekkooi)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccessor] Allow null value for a array (2.3)

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

Original PR is #12511
A rebase on 2.3 was requested by @fabpot

Commits
-------

9706b09 [PropertyAccessor] Added test to allow null value for a array
2015-01-09 17:16:50 +01:00
Warnar Boekkooi
9ea59ac531 [Console] Helper\Table->addRow optimization 2015-01-09 16:09:18 +01:00
Warnar Boekkooi
9706b090c0 [PropertyAccessor] Added test to allow null value for a array 2015-01-09 15:57:01 +01:00
Fabien Potencier
d5e9de2f94 bug #13170 [Form] Set a child type to text if added to the form without a type. (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Set a child type to text if added to the form without a type.

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

This copies the behaviour of `FormBuilder::create()` to `Form::add()`.

ping @webmozart

Commits
-------

57070a2 [Form] Set a child type to text if added to the form without a type.
2015-01-09 15:25:23 +01:00
Fabien Potencier
425385400d bug #13334 [Yaml] Fixed #10597: Improved Yaml directive parsing (VictoriaQ)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13334).

Discussion
----------

[Yaml] Fixed #10597: Improved Yaml directive parsing

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

There was a problem with the regular expression used to process the YAML directive. The modifier `s` made the regex too greedy, replacing everything but the last line of the YAML. Existing tests using the YAML directive contained only one line, that's why they were passing.

Commits
-------

95d8ce3 [Yaml] Fixed #10597: Improved Yaml directive parsing
2015-01-09 15:23:47 +01:00
victoria
95d8ce3031 [Yaml] Fixed #10597: Improved Yaml directive parsing 2015-01-09 15:23:46 +01:00
Fabien Potencier
b52e0d19c1 minor #13319 [Security] moved test files into the right place (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[Security] moved test files into the right place

Commits
-------

0601ed3 [Security] moved test files into the right place
2015-01-08 11:45:59 +01:00
Fabien Potencier
0601ed33c4 [Security] moved test files into the right place 2015-01-08 11:25:36 +01:00
Fabien Potencier
04ec9424d3 bug #13316 [Form] fixed the CSRF extension to allow using only the new interfaces (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[Form] fixed the CSRF extension to allow using only the new interfaces

| 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

The CSRF extension did not allow to only use the new interfaces, which leads to deprecation notices you cannot get rid of in 2.7.

Commits
-------

555b010 [Form] fixed the CSRF extension to allow using only the new interfaces
2015-01-08 10:11:25 +01:00
Fabien Potencier
555b010b1f [Form] fixed the CSRF extension to allow using only the new interfaces 2015-01-08 09:14:31 +01:00
Fabien Potencier
4fdb83203f fixed typo 2015-01-07 22:37:06 +01:00
Fabien Potencier
b5c2600f5c bug #13305 [FrameworkBundle] fixed missing information in some descriptors (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fixed missing information in some descriptors

| 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

Commits
-------

530af5c [FrameworkBundle] fixed missing information in some descriptors
2015-01-07 22:10:05 +01:00
Fabien Potencier
530af5c009 [FrameworkBundle] fixed missing information in some descriptors 2015-01-07 18:56:38 +01:00
Fabien Potencier
b3a55fe3f6 bumped Symfony version to 2.5.10 2015-01-07 14:02:53 +01:00
Fabien Potencier
e082a9f28e updated VERSION for 2.5.9 2015-01-07 13:32:08 +01:00
Fabien Potencier
59000ae8f1 updated CHANGELOG for 2.5.9 2015-01-07 13:30:42 +01:00
Fabien Potencier
686015da73 Merge branch '2.3' into 2.5
* 2.3:
  bumped Symfony version to 2.3.25
  updated VERSION for 2.3.24
  update CONTRIBUTORS for 2.3.24
  updated CHANGELOG for 2.3.24
  fixed tests
  [Security] Don't destroy the session on buggy php releases.

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_2.json
	src/Symfony/Component/HttpKernel/Kernel.php
2015-01-07 13:26:05 +01:00
Fabien Potencier
1b39930dad bumped Symfony version to 2.3.25 2015-01-07 12:12:24 +01:00
Fabien Potencier
5b2c33be25 updated VERSION for 2.3.24 2015-01-07 11:32:09 +01:00
Fabien Potencier
b74037792f update CONTRIBUTORS for 2.3.24 2015-01-07 11:31:01 +01:00
Fabien Potencier
3e02ca23de minor #13303 Removed unneeded version requirements (peterrehm)
This PR was merged into the 2.5 branch.

Discussion
----------

Removed unneeded version requirements

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   |
| Fixed tickets | -
| License       | MIT
| Related        | #12891

As @stof has requested.

Commits
-------

3716f4c Removed unneeded version requirements
2015-01-07 11:30:36 +01:00
Peter Rehm
3716f4c138 Removed unneeded version requirements 2015-01-07 11:23:40 +01:00
Fabien Potencier
154e442f47 updated CHANGELOG for 2.3.24 2015-01-07 11:21:38 +01:00
Fabien Potencier
21b27c6be9 fixed tests 2015-01-07 11:18:33 +01:00
Fabien Potencier
c076ba8a9a bug #13286 [Security] Don't destroy the session on buggy php releases. (derrabus)
This PR was squashed before being merged into the 2.3 branch (closes #13286).

Discussion
----------

[Security] Don't destroy the session on buggy php releases.

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

See #13269 for the discussion. This workaround avoids destroying the old session after login on the migrate strategy when running under a php version that we know to be broken.

Corresponding php bug: https://bugs.php.net/bug.php?id=63379

Commits
-------

5d0b527 [Security] Don't destroy the session on buggy php releases.
2015-01-07 09:13:08 +01:00
Alexander M. Turek
5d0b527dea [Security] Don't destroy the session on buggy php releases. 2015-01-07 09:13:06 +01:00
Fabien Potencier
111a88c042 minor #13239 [2.5] Made help information of commands more consistent (WouterJ)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Made help information of commands more consistent

Follow up of https://github.com/symfony/symfony/pull/13231 for commands added in 2.4 and 2.5

Commits
-------

a450d66 Made help information consistent
2015-01-06 18:42:03 +01:00
Fabien Potencier
cbcd0f42d7 Merge branch '2.3' into 2.5
* 2.3:
  [WIP] Made help information of commands more consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.json
	src/Symfony/Component/Console/Tests/Fixtures/application_2.json
2015-01-06 18:40:45 +01:00
Fabien Potencier
515a3ed07e minor #13231 [WIP] Made help information of commands more consistent (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #13231).

Discussion
----------

[WIP] Made help information of commands more consistent

| Q   | A
| --- | ---
| Test pass | Not yet
| License | MIT
| Fixed tickets | -

Commits
-------

602d687 [WIP] Made help information of commands more consistent
2015-01-06 18:30:00 +01:00
WouterJ
602d687a46 [WIP] Made help information of commands more consistent 2015-01-06 18:29:58 +01:00
Fabien Potencier
e3ca5165c6 Merge branch '2.3' into 2.5
* 2.3:
  [2.3] fix failing test
  fixed typo
  Escape annotations in comments, refs #13089.
  [2.3] missing cleanup for legacy test
  add missing param names to @param annotation
  Improve the composer root version setting on Travis
2015-01-05 21:58:03 +01:00
Fabien Potencier
1201853b55 minor #13272 [2.3] fix failing test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] fix failing test

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

Fix failing tests on 2.3 with components=high

Commits
-------

064799a [2.3] fix failing test
2015-01-05 21:55:16 +01:00