Commit Graph

21839 Commits

Author SHA1 Message Date
Tobias Schultze
4ecbc7053d Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-09-09 20:00:08 +02:00
Tobias Schultze
b38e448f42 fix leftover changes from previous merge 2015-09-09 19:53:06 +02:00
Tobias Schultze
7c3748ce01 minor #15733 fix class use and in phpdoc (ewgRa)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #15733).

Discussion
----------

fix class use and in phpdoc

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

Just some fixes from code inspection.

Commits
-------

f0d40c4 fix class use and in phpdoc
2015-09-09 19:43:02 +02:00
Evgeniy Sokolov
f0d40c4559 fix class use and in phpdoc 2015-09-09 19:42:36 +02:00
Tobias Schultze
ac822f9c9b bug #15737 Fix the injection of the container in invokable controllers (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix the injection of the container in invokable controllers

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

https://github.com/symfony/symfony/pull/12022 added the necessary extension point in the ControllerResolver to hook into the instantiation (in 2.6+), but has not updated FrameworkBundle to use it.

I also reused the parent ``createController`` method instead of duplicating its code

Commits
-------

36e09da Fix the injection of the container in invokable controllers
2015-09-09 19:22:38 +02:00
Abdellatif Ait boudad
cade651915 [Translator][warmup][fallback locales] fixed missing cache file generation. 2015-09-09 14:57:38 +00:00
Christophe Coevoet
36e09da4b9 Fix the injection of the container in invokable controllers 2015-09-09 14:19:27 +02:00
Nicolas Grekas
753d46ac03 minor #15734 drop unused private methods (ewgRa)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15734).

Discussion
----------

drop unused private methods

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

Just drop two unused methods.

Commits
-------

0ffcc4f drop unused private methods
2015-09-09 09:30:19 +02:00
Evgeniy Sokolov
0ffcc4f53d drop unused private methods 2015-09-09 09:30:09 +02:00
Fabien Potencier
146dca11a0 bug #15729 [Kernel] Integer version constants (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Kernel] Integer version constants

| 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

The idea of these constants is that they can be compared without using version_compare. But we want them to be compared as integers not as strings (it worked before as well because of php type juggling). They are integers semantically.

Commits
-------

4b45bb9 Kernel version constants are integers to actually be comparable numerically
2015-09-09 07:40:58 +02:00
Christian Flothmann
3849cd80b9 improve exceptions when parsing malformed files 2015-09-08 22:16:40 +02:00
Tobias Schultze
4b45bb91ab Kernel version constants are integers to actually be comparable numerically 2015-09-08 21:33:18 +02:00
Fabien Potencier
6b08d3eb16 bumped Symfony version to 2.7.5 2015-09-08 20:12:26 +02:00
Fabien Potencier
1fdf23fe28 updated VERSION for 2.7.4 2015-09-08 16:26:39 +02:00
Fabien Potencier
d788cc5743 updated CHANGELOG for 2.7.4 2015-09-08 16:26:10 +02:00
Jordi Boggiano
7802345824 Dispatch console.terminate *after* console.exception 2015-09-08 14:55:10 +01:00
Fabien Potencier
72615e11a2 bug #15552 [ExpressionLanguage] Fixed expressions cache key generation (inso)
This PR was squashed before being merged into the 2.7 branch (closes #15552).

Discussion
----------

[ExpressionLanguage] Fixed expressions cache key generation

| 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

Reworked version of #15537

Difference with original PR:
- sort $names array to ensure its order does not affect caching, added test for it
- minor tweaks for cache key format
- used `foreach` instead of `array_map`

P.S. I'm not proficient with tests so not sure if tests are correct.

Commits
-------

4114a2b [ExpressionLanguage] Fixed expressions cache key generation
2015-09-07 14:45:05 +02:00
Anton Bakai
4114a2bd3e [ExpressionLanguage] Fixed expressions cache key generation 2015-09-07 14:45:02 +02:00
Nicolas Grekas
ae643240bb Merge branch '2.3' into 2.7
* 2.3:
  use new repo location in some readme.md
2015-09-06 10:36:38 +02:00
Fabien Potencier
22c5964a3c minor #15687 [2.7] Clean deprecated interfaces (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Clean deprecated interfaces

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

Commits
-------

e49739c [2.7] Clean deprecated interfaces
2015-09-06 10:30:54 +02:00
Nicolas Grekas
e49739c469 [2.7] Clean deprecated interfaces 2015-09-04 22:16:46 +02:00
Fabien Potencier
6430c828f6 minor #15688 [Doc] Use new repo location (Goutte & Silex) in some readme.md (JakeFr)
This PR was merged into the 2.3 branch.

Discussion
----------

[Doc] Use new repo location (Goutte & Silex) in some readme.md

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

Correct links to silex and goutte repos to the new organizations, respectively FriendsOfPHP and silexphp.
Not a bug fix, github.com redirects correctly, just typo.

Commits
-------

fa7fe56 use new repo location in some readme.md
2015-09-04 08:41:45 +02:00
JakeFr
fa7fe56830 use new repo location in some readme.md 2015-09-03 22:55:07 +02:00
Fabien Potencier
041dff57ac minor #15681 [Validator] Cleanup a test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Cleanup a test

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/15664/files#r38640423
| License       | MIT
| Doc PR        | -

Commits
-------

12ec734 [Validator] Cleanup a test
2015-09-03 16:20:20 +02:00
Nicolas Grekas
12ec734845 [Validator] Cleanup a test 2015-09-03 14:38:39 +02:00
Nicolas Grekas
323178e28b Merge branch '2.3' into 2.7
* 2.3:
  [travis] Add PHP 7 to allowed failures until segfaults are fixed
2015-09-03 13:42:06 +02:00
Nicolas Grekas
05d9411670 Merge branch '2.3' into 2.7
* 2.3:
  [Intl] Fix test
  [Translator][fallback catalogues] fixed circular reference.
  bumped Symfony version to 2.3.33
  updated VERSION for 2.3.32
  update CONTRIBUTORS for 2.3.32
  updated CHANGELOG for 2.3.32
  [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
  [console] Use the description when no help is available

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
	src/Symfony/Component/HttpKernel/Kernel.php
2015-09-03 13:40:38 +02:00
Fabien Potencier
823bce0193 minor #15678 [travis] Add PHP 7 to allowed failures until segfaults are fixed (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Add PHP 7 to allowed failures until segfaults are fixed

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

Commits
-------

57232ef [travis] Add PHP 7 to allowed failures until segfaults are fixed
2015-09-03 13:32:40 +02:00
Nicolas Grekas
57232ef44f [travis] Add PHP 7 to allowed failures until segfaults are fixed 2015-09-03 13:24:41 +02:00
Michael Lee
232f6fd534 [framework-bundle] Add Test for TranslationUpdateCommand
Added the test script as per the discussion in PR #15562

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a
2015-09-03 17:05:39 +08:00
Tobias Schultze
6f18c7573f minor #15672 [Intl] Fix test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fix test

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

Commits
-------

7969503 [Intl] Fix test
2015-09-02 23:17:00 +02:00
Nicolas Grekas
79695037b0 [Intl] Fix test 2015-09-02 18:14:26 +02:00
Fabien Potencier
59ade353a4 bug #15527 [Translator][fallback catalogues] fixed circular reference. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translator][fallback catalogues] fixed circular reference.

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

Commits
-------

79e29c1 [Translator][fallback catalogues] fixed circular reference.
2015-09-02 14:57:57 +02:00
Abdellatif Ait boudad
79e29c1f23 [Translator][fallback catalogues] fixed circular reference. 2015-09-02 09:56:25 +00:00
Fabien Potencier
fedbf711a1 bumped Symfony version to 2.3.33 2015-09-01 18:03:57 +02:00
Fabien Potencier
221da6edaf updated VERSION for 2.3.32 2015-09-01 17:40:52 +02:00
Fabien Potencier
a988449e4e update CONTRIBUTORS for 2.3.32 2015-09-01 17:39:15 +02:00
Fabien Potencier
7c87baab77 updated CHANGELOG for 2.3.32 2015-09-01 17:38:42 +02:00
Nicolas Grekas
2c4860877d Require symfony/intl ~2.4 when Locale::setDefault() is used 2015-09-01 15:39:59 +02:00
Fabien Potencier
db8420e6d5 bug #15662 [Form][2.7][ Choice type] fixed groups with empty array. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][2.7][ Choice type] fixed groups with empty array.

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

- [x] test

Commits
-------

835aa78 [Form][2.7][ Choice type] fixed groups with empty array.
2015-09-01 09:47:15 +02:00
Nicolas Grekas
33fac1479c minor #15661 [appveyor] PHP 5.3.11 for Symfony 2.7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] PHP 5.3.11 for Symfony 2.7

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

Commits
-------

0f2256e [appveyor] PHP 5.3.11 for Symfony 2.7
2015-09-01 09:32:02 +02:00
Fabien Potencier
f972fa49d9 minor #15663 Mark deprecated Twig functions as deprecated with the Twig feature (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Mark deprecated Twig functions as deprecated with the Twig feature

| 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

We were not able to trigger the deprecation for ``form_enctype`` because we were trying to trigger it at runtime, and we failed at it.
Twig now has a builtin way to mark functions as deprecated so here is the PR using it.

Commits
-------

cd167f4 Mark deprecated Twig functions as deprecated with the Twig feature
2015-09-01 07:50:14 +02:00
Abdellatif Ait boudad
835aa788d4 [Form][2.7][ Choice type] fixed groups with empty array. 2015-08-31 20:22:13 +00:00
Christophe Coevoet
cd167f49dd Mark deprecated Twig functions as deprecated with the Twig feature 2015-08-31 21:21:38 +02:00
Nicolas Grekas
0f2256e85a [appveyor] PHP 5.3.11 for Symfony 2.7 2015-08-31 18:44:53 +02:00
Fabien Potencier
cb303017b4 bug #15601 [console] Use the description when no help is available (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[console] Use the description when no help is available

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

Commits
-------

e5d3f25 [console] Use the description when no help is available
2015-08-31 14:48:21 +02:00
Fabien Potencier
e1b7e46c5c minor #15650 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting

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

Not  bug fix because the fix it fixes has not yet been released in any taggued version, but still a fix.

Commits
-------

de7d4a7 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
2015-08-31 14:45:42 +02:00
Fabien Potencier
3b9756c0a7 minor #15654 [HttpKernel] Group deprecation notices (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #15654).

Discussion
----------

[HttpKernel] Group deprecation notices

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

Let's remove duplicate deprecation messages.

![capture du 2015-08-30 14 15 45](https://cloud.githubusercontent.com/assets/243674/9567210/d45c6124-4f22-11e5-9d93-714f924be677.png)

Commits
-------

8d6e337 [HttpKernel] Group deprecation notices
2015-08-31 14:42:38 +02:00
Nicolas Grekas
8d6e337602 [HttpKernel] Group deprecation notices 2015-08-31 14:42:37 +02:00
Fabien Potencier
a1d0f539ac Merge branch '2.3' into 2.7
* 2.3:
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
2015-08-31 14:32:30 +02:00