Commit Graph

22109 Commits

Author SHA1 Message Date
Fabien Potencier
bee5c61093 bug #15763 [HttpKernel] fix DumpDataCollector compat with Twig 2.0 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] fix DumpDataCollector compat with Twig 2.0

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

See https://github.com/twigphp/Twig/pull/1813

Commits
-------

92e50a3 [HttpKernel] fix DumpDataCollector compat with Twig 2.0
2015-09-11 15:10:24 +02:00
Nicolas Grekas
92e50a3b14 [HttpKernel] fix DumpDataCollector compat with Twig 2.0 2015-09-11 14:32:48 +02:00
Jakub Zalas
93e418f48e Improve exception messages. 2015-09-11 08:57:18 +01:00
Fabien Potencier
d8a801a70a bug #15718 Fix that two DirectoryResources with different patterns would be deduplicated (mpdude)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15718).

Discussion
----------

Fix that two DirectoryResources with different patterns would be deduplicated

| 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

ResourceInterface::__toString is mainly important because in various places, array_uniqe() is called to perform a de-duplication of resources and will use the string representation for objects.

Thus, we need to take care that if DirectoryResources apply different patterns they must be kept after array_unique calls.

Commits
-------

2b36ac5 Fix that two DirectoryResources with different patterns would be deduplicated
2015-09-10 14:19:00 +02:00
Matthias Pigulla
2b36ac5a61 Fix that two DirectoryResources with different patterns would be deduplicated
ResourceInterface::__toString is mainly important because in various places, array_uniqe() is called to perform a de-duplication of resources and will use the string representation for objects.

Thus, we need to take care that if DirectoryResources apply different patterns they must be kept after array_unique calls.
2015-09-10 14:18:59 +02:00
Fabien Potencier
cfd8cc24ff minor #15746 Tests fix clockmock (ewgRa)
This PR was squashed before being merged into the 2.3 branch (closes #15746).

Discussion
----------

Tests fix clockmock

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

On my local computer tests for HttpCacheTest not passed, because ClockMock make side effects on another tests (it takes time from _SERVER['REQUEST_TIME'] and for my computer difference with real one time and this time was more than expected by HttpCacheTest, one part of code take time from mock, anothers - from native time function). This PR remove this side effects.

Commits
-------

6b21752 Tests fix clockmock
2015-09-10 13:45:38 +02:00
Evgeniy Sokolov
6b21752285 Tests fix clockmock 2015-09-10 13:45:33 +02:00
Abdellatif Ait boudad
2ae2714dbf bug #15516 [Translator][warmup][fallback locales] fixed missing cache file generation. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translator][warmup][fallback locales] fixed missing cache file generation.

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

Commits
-------

cade651 [Translator][warmup][fallback locales] fixed missing cache file generation.
2015-09-10 11:41:15 +00:00
Fabien Potencier
6c9f86ba4b bug #14916 [WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX (drAlberT)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14916).

Discussion
----------

[WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX

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

Commits
-------

53cdb1a [WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX
2015-09-10 10:15:18 +02:00
AlberT
53cdb1a420 [WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX 2015-09-10 10:15:17 +02:00
Nicolas Grekas
249d130549 Merge branch '2.3' into 2.7
* 2.3:
  [Validator] Added Swedish translations
  improve exceptions when parsing malformed files
  Dispatch console.terminate *after* console.exception

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/ApplicationTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf
2015-09-10 10:05:42 +02:00
Fabien Potencier
1c5a213ec0 minor #15749 missing "YAML" in the exception message. (DavidBadura)
This PR was merged into the 2.3 branch.

Discussion
----------

missing "YAML" in the exception message.

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

Commits
-------

b95b5e2 missing "YAML" in the exception message.
2015-09-10 09:52:27 +02:00
David Badura
b95b5e217f missing "YAML" in the exception message. 2015-09-10 09:43:17 +02:00
Fabien Potencier
37827a2fef bug #15725 Dispatch console.terminate *after* console.exception (Seldaek)
This PR was merged into the 2.3 branch.

Discussion
----------

Dispatch console.terminate *after* console.exception

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

The problem is when using the ConsoleHandler from MonologBridge, TERMINATE closes it and removes the output, so when EXCEPTION fires if you want to log the exception it's too late and you don't get any output. See ed4fb54901/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php (L115-L145)

It is my understanding that TERMINATE is always supposed to come last anyway, so it is a bug in any case, but this particular use case is what prompted the discovery.

Commits
-------

7802345 Dispatch console.terminate *after* console.exception
2015-09-10 08:54:37 +02:00
Fabien Potencier
1e27c85a3b bug #15731 improve exceptions when parsing malformed files (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

improve exceptions when parsing malformed files

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

Commits
-------

3849cd8 improve exceptions when parsing malformed files
2015-09-10 08:51:50 +02:00
Fabien Potencier
5b404fc283 minor #15713 [Validator] Added Swedish translations (Nyholm)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15713).

Discussion
----------

[Validator] Added Swedish translations

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

This was another easy pick.

Commits
-------

1176d62 [Validator] Added Swedish translations
2015-09-09 22:42:37 +02:00
Tobias Nyholm
1176d6279a [Validator] Added Swedish translations 2015-09-09 22:42:29 +02:00
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