Commit Graph

19563 Commits

Author SHA1 Message Date
Nicolas Grekas
cb347896b2 [Debug] fix loading order for legacy classes 2015-01-15 13:58:08 +01:00
Fabien Potencier
e87d4f7110 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fix routing descriptor for options
  exit when Twig environment is not set
  [Routing] fix misleading test for condition
2015-01-15 13:15:12 +01:00
Fabien Potencier
b53ceb1fb6 bug #13421 [FrameworkBundle] fix routing descriptor for options (Tobion)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fix routing descriptor for options

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

The markdown descriptor for routes missed brackets, so that the `options` where actually ignored. Also fixed some other inconsistencies.

Commits
-------

b0c29a0 [FrameworkBundle] fix routing descriptor for options
2015-01-15 13:14:56 +01:00
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
Fabien Potencier
f6d9f36672 minor #13395 [Debug] fix test (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] fix test

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

We really need a way to make tests green before subtree-splits

Commits
-------

df9bb26 [Debug] fix test
2015-01-13 18:07:02 +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
Nicolas Grekas
df9bb2674e [Debug] fix test 2015-01-13 15:49:42 +01:00
Fabien Potencier
c2f2fe518e Merge branch '2.5' into 2.6
* 2.5:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:35 +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
c6695d1e8b bug #13351 [VarDumper] fix very special vars handling (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] fix very special vars handling

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

Commits
-------

e26dc2c [VarDumper] fix very special vars handling
2015-01-13 11:55:05 +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
66b6e79ed2 Merge branch '2.5' into 2.6
* 2.5:
  [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
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/SecurityBundle/composer.json
2015-01-13 08:22:24 +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
Abdellatif Ait boudad
58a7426085 [Yaml] fixed parse shortcut Key after unindented collection. 2015-01-11 12:46:11 +00: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
Nicolas Grekas
e26dc2c958 [VarDumper] fix very special vars handling 2015-01-10 17:01:14 +01:00
Warnar Boekkooi
5d3a1fc4c5 [Console] Helper\Table->addRow optimization 2015-01-10 13:50:07 +01:00
Szijarto Tamas
b248368d63 [DependencyInjection] Fix missing ExpressionLanguageProviders on extension bild
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~
2015-01-10 10:50:24 +01:00
Fabien Potencier
aed787878f Merge branch '2.5' into 2.6
* 2.5:
  [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.
2015-01-09 19:07:16 +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
nacho
e6afff4f08 [Console] fixed #10531 2015-01-09 17:38:19 +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
47d5133252 bug #13198 [Form] Fixed check of violation constraint #12792 (xelaris)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] Fixed check of violation constraint #12792

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

ConstraintViolation::getConstraint() must not expect to provide a constraint as long as Symfony\Component\Validator\ExecutionContext exists (before 3.0)

Commits
-------

aedabc7 [Form] Fixed check of violation constraint #12792
2015-01-09 15:03:07 +01:00
Martin Hasoň
af496eaef0 [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled 2015-01-09 11:43:02 +01:00
Alexander Schwenn
aedabc76b6 [Form] Fixed check of violation constraint #12792
ConstraintViolation::getConstraint() must not expect to provide a
constraint as long as Symfony\Component\Validator\ExecutionContext
exists (before 3.0)
2015-01-09 05:45:27 +01:00
Tobias Schultze
0b42cad97a [OptionsResolver] added test for allowed values and types that default to null
ref #12809
2015-01-08 14:00:41 +01:00
Fabien Potencier
ccee4ea91d Merge branch '2.5' into 2.6
* 2.5:
  [Security] moved test files into the right place
2015-01-08 11:46:13 +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
e49b325d4a Merge branch '2.5' into 2.6
* 2.5:
  [Form] fixed the CSRF extension to allow using only the new interfaces
2015-01-08 10:11:40 +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
1d3a5c6422 Merge branch '2.5' into 2.6
* 2.5:
  fixed typo
2015-01-07 22:37:14 +01:00
Fabien Potencier
4fdb83203f fixed typo 2015-01-07 22:37:06 +01:00
Fabien Potencier
8d982f8cf5 bug #13307 added missing support for factories in console descriptions (fabpot)
This PR was merged into the 2.6 branch.

Discussion
----------

added missing support for factories in console descriptions

| 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

Follow-up for #13305

Commits
-------

f7fcefa added missing support for factories in console descriptions
2015-01-07 22:29:19 +01:00