Commit Graph

20133 Commits

Author SHA1 Message Date
Abdellatif Ait boudad 189313caee [2.6][Translation] fix legacy tests. 2015-04-19 14:17:37 +01:00
Alexander Schwenn aca1f28843 [FrameworkBundle] Check for 'xlf' instead of 'xliff'
There is no translation writer format named 'xliff', but 'xlf' only. So the TranslationUpdateCommand can't be called with 'output-format' == 'xliff' and the version info will never be shown.
2015-04-18 23:27:35 +02:00
Nicolas Grekas 0191aa24bb Merge branch '2.3' into 2.6
* 2.3:
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  [2.3] Static Code Analysis for Components
  [Translation][fixed test] refresh cache when resources are no longer fresh.
  [Validator] Added missing Simplified Chinese (zh_CN) translations
  [FrameworkBundle] Workaround php -S ignoring auto_prepend_file

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
	src/Symfony/Component/Console/Descriptor/TextDescriptor.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-04-18 17:02:51 +02:00
Nicolas Grekas 1014719e0b bug #14272 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Workaround php -S ignoring auto_prepend_file

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

`php -S front_controller.php` (thus `php app/console server:run`) ignores auto_prepend_file for no reason.

Commits
-------

dcde445 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file
2015-04-18 12:24:12 +02:00
Fabien Potencier a7a1ff2c8d minor #14367 CS fixes (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS fixes

| 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

Update before releasing PHP CS Fixer 1.7.

To keep fabbot.io happy ;)

Commits
-------

cfa3e95 CS fixes
2015-04-18 12:19:52 +02:00
Fabien Potencier 9c6f65fc0f minor #14081 [Config][DX] improve file loader error message for missing resource (cordoval)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config][DX] improve file loader error message for missing resource

|Q            |A     |
|---          |---   |
|Bug Fix?     |y     |
|New Feature? |n     |
|BC Breaks?   |n     |
|Deprecations?|n     |
|Tests Pass?  |y     |
|Fixed Tickets|#11958|
|License      |MIT   |
|Doc PR       |      |

Commits
-------

a2deb61 [DX] improve file loader error for router/other resources in bundle
2015-04-18 12:16:58 +02:00
Nicolas Grekas b9930273de bug #14362 [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions) (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)

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

Commits
-------

3450122 [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
2015-04-18 12:13:38 +02:00
Nicolas Grekas 8b22526fe7 minor #14369 [HttpKernel] Cleanup ExceptionListener (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Cleanup ExceptionListener

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

Commits
-------

d97279e [HttpKernel] Cleanup ExceptionListener
2015-04-18 12:11:43 +02:00
Nicolas Grekas 7cdd624119 bug #14345 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors

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

Commits
-------

7e95a24 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
2015-04-18 12:10:42 +02:00
Tobias Schultze 4545af24cf bug #14381 [FrameworkBundle] Initialize translator with the default locale. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] Initialize translator with the default locale.

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

Commits
-------

a0d185a [FrameworkBundle] Initialize translator with the default locale.
2015-04-17 16:55:35 +02:00
Tobias Schultze a8d0b1aa75 bug #14325 [Routing][DependencyInjection] Support .yaml extension in YAML loaders (thunderer)
This PR was squashed before being merged into the 2.3 branch (closes #14325).

Discussion
----------

[Routing][DependencyInjection] Support .yaml extension in YAML loaders

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

YAML [FAQ](http://www.yaml.org/faq.html) states that .yaml file extension should be used whenever possible. I tweaked YamlFileLoader supports() method in Symfony Routing component to accept both .yml and .yaml and added some asserts in tests for that behavior.

This PR replaces #14319 as it was based on 2.7. BTW Is there a way to "rebase" PR branch without redoing all the work?

Commits
-------

dd5a811 [Routing][DependencyInjection] Support .yaml extension in YAML loaders
2015-04-17 12:05:01 +02:00
Tomasz Kowalczyk dd5a811de6 [Routing][DependencyInjection] Support .yaml extension in YAML loaders 2015-04-17 12:04:38 +02:00
Luis Cordova a2deb618db [DX] improve file loader error for router/other resources in bundle 2015-04-17 01:24:38 -05:00
Abdellatif Ait boudad a0d185a43c [FrameworkBundle] Initialize translator with the default locale. 2015-04-17 00:52:06 +01:00
Fabien Potencier 7b2873f983 minor #14370 [2.6][Translation] remove duplicate code for loading catalogue. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Translation] remove duplicate code for loading catalogue.

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

Commits
-------

973ee2e [2.6][Translation] remove duplicate code for loading catalogue.
2015-04-16 18:11:02 +02:00
Nicolas Grekas 7e95a244d8 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors 2015-04-16 14:03:59 +02:00
Abdellatif Ait boudad 973ee2e1e4 [2.6][Translation] remove duplicate code for loading catalogue. 2015-04-16 11:17:38 +01:00
Abdellatif Ait boudad 8584bfc3d4 bug #14344 [Translation][fixed test] refresh cache when resources are no longer fresh. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][fixed test] refresh cache when resources are no longer fresh.

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

Commits
-------

04b8e4e [Translation][fixed test] refresh cache when resources are no longer fresh.
2015-04-16 11:02:56 +01:00
Nicolas Grekas d97279e942 [HttpKernel] Cleanup ExceptionListener 2015-04-16 10:51:32 +02:00
Dariusz Ruminski cfa3e95f4d CS fixes 2015-04-16 09:01:03 +02:00
Fabien Potencier eb2ff793e8 bug #14346 [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

 [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14111, #14337, #14342 in conjunction with #14345
| License       | MIT
| Doc PR        | -

Commits
-------

92e33e4 [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
2015-04-16 08:58:21 +02:00
Fabien Potencier 32db442aef bug #14338 [FrameworkBundle] improve usage of Table helper (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] improve usage of Table helper

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

Use the `Table` helper if present in favor of the deprecated
`TableHelper` class.

Commits
-------

71d84e6 [FrameworkBundle] improve usage of Table helper
2015-04-15 17:26:47 +02:00
Fabien Potencier bb4d45e777 minor #14356 [Translation] LoggingTranslator simplifications (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation] LoggingTranslator simplifications

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

Commits
-------

5d7a4f9 [Translation] LoggingTranslator simplifications
2015-04-15 17:20:44 +02:00
Fabien Potencier 942f7f2fd1 minor #14231 [DependencyInjection] Show better error when the Yaml component is not installed (dosten)
This PR was squashed before being merged into the 2.3 branch (closes #14231).

Discussion
----------

[DependencyInjection] Show better error when the Yaml component is not installed

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

As the Yaml component is a suggested dependency, if someone try to use the `YamlFileLoader` or the `YamlDumper` without the component will get an ugly message:
```
PHP Fatal error:  Class 'Symfony\Component\Yaml\Dumper' not found in xxxx
```
With this PR the error will be an exception with the message: `Unable to dump the container as the Symfony Yaml Component is not installed.` for `YamlDumper` and `Unable to load YAML files service definitions as the Symfony Yaml Component is not installed.'` for `YamlFileLoader`

Commits
-------

870a299 [DependencyInjection] Show better error when the Yaml component is not installed
2015-04-15 17:14:38 +02:00
Diego Saint Esteben 870a299eb3 [DependencyInjection] Show better error when the Yaml component is not installed 2015-04-15 17:14:35 +02:00
Fabien Potencier c74cd4adbb minor #14206 [2.3] SCA for Components - reference mismatches (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #14206).

Discussion
----------

[2.3] SCA for Components - reference mismatches

| 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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- worked out some of reference mismatches

Commits
-------

f732659 [2.3] SCA for Components - reference mismatches
2015-04-15 17:09:40 +02:00
Vladimir Reznichenko f732659219 [2.3] SCA for Components - reference mismatches 2015-04-15 17:09:34 +02:00
Nicolas Grekas 3450122061 [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions) 2015-04-15 16:47:26 +02:00
Fabien Potencier 49cbf1c7d1 minor #14097 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #14097).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- array_keys/array_values usage as foreach array
- foreach value by reference - added unsets to keep scope clear
- strstr usage as strpos fixed
- array_push miss-use resolved

Commits
-------

78cc93c [2.3] Static Code Analysis for Components
2015-04-15 16:34:30 +02:00
Vladimir Reznichenko 78cc93c3b2 [2.3] Static Code Analysis for Components 2015-04-15 16:34:28 +02:00
Nicolas Grekas 92e33e482f [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator 2015-04-15 09:58:17 +02:00
Christian Flothmann 5d7a4f99f7 [Translation] LoggingTranslator simplifications 2015-04-15 00:06:07 +02:00
Christian Flothmann f36803eb00 [EventDispatcher] make listeners removable from an executed listener 2015-04-14 22:43:17 +02:00
Abdellatif Ait boudad 04b8e4e77e [Translation][fixed test] refresh cache when resources are no longer fresh. 2015-04-14 08:53:08 +01:00
Fabien Potencier 85a494c12d bug #14129 [FrameworkBundle] Fixed server:start --router relative path issue #14124 (abulford)
This PR was squashed before being merged into the 2.6 branch (closes #14129).

Discussion
----------

[FrameworkBundle] Fixed server:start --router relative path issue #14124

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

This ensures that a relative path can be used to specify the router script, and that if the router script cannot be found an error is reported and the command fails.

The file path for the router script is now determined and checked prior to the child process being forked, which seems cleaner.  The same change could be made in ServerRunCommand.php, or possibly in the ServerCommand base class; to keep the scope small, though, this wasn't done as part of this bug fix.

Commits
-------

0c1b9ba [FrameworkBundle] Fixed server:start --router relative path issue #14124
2015-04-13 17:33:55 +02:00
abulford 0c1b9bacd8 [FrameworkBundle] Fixed server:start --router relative path issue #14124 2015-04-13 17:33:51 +02:00
Christian Flothmann 71d84e66e4 [FrameworkBundle] improve usage of Table helper
Use the `Table` helper if present in favor of the deprecated
`TableHelper` class.
2015-04-13 17:21:02 +02:00
Baptiste Dupuch c3eecb591d Add better phpdoc message for getListeners method of the EventDispatcher 2015-04-13 12:57:04 +02:00
Fabien Potencier 5d428b7091 minor #14324 [Validator] Added missing Simplified Chinese (zh_CN) translations (foxwoods)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Added missing Simplified Chinese (zh_CN) translations

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

Added the missing Mandarin Chinese translations.

Commits
-------

c0f0258 [Validator] Added missing Simplified Chinese (zh_CN) translations
2015-04-12 20:28:23 +02:00
Jingyu Wang c0f0258c56 [Validator] Added missing Simplified Chinese (zh_CN) translations 2015-04-12 10:14:47 +08:00
Fabien Potencier 234cebd087 Merge branch '2.3' into 2.6
* 2.3:
  renamed some confusing tests
  [2.3] Fix @link annotations
  Fix javascript
  [2.3][Translation] test refresh cache when resources File change.
  [Translator] Cache does not take fallback locales into consideration

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
2015-04-11 09:16:15 +02:00
Fabien Potencier 8b7148fbec minor #14312 renamed some confusing tests (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

renamed some confusing tests

| 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
-------

a8e4c43 renamed some confusing tests
2015-04-11 08:59:48 +02:00
Fabien Potencier a8e4c43080 renamed some confusing tests 2015-04-11 08:39:49 +02:00
Fabien Potencier 624be35038 minor #14309 [2.6] Fix @link annotations (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Fix @link annotations

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

It would be great if PHP CS Fixer could enforce this.

Commits
-------

fb077a2 [2.6] Fix @link annotations
2015-04-11 07:17:31 +02:00
Fabien Potencier 08f4d29c72 minor #14310 [2.3] Fix @link annotations (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix @link annotations

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

It would be great if PHP CS Fixer could enforce this.

Commits
-------

c1983ca [2.3] Fix @link annotations
2015-04-11 07:16:37 +02:00
Nicolas Grekas c1983cad4d [2.3] Fix @link annotations 2015-04-10 20:54:05 +02:00
Nicolas Grekas fb077a2748 [2.6] Fix @link annotations 2015-04-10 20:22:21 +02:00
Fabien Potencier c764a84a27 minor #14299 [2.3] Fix javascript (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix javascript

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

Remove dead code and add missing semicolons.

Commits
-------

df76126 Fix javascript
2015-04-10 17:35:17 +02:00
Possum df76126d47 Fix javascript 2015-04-10 08:59:04 +02:00
Fabien Potencier aeef0cd9a2 bug #14271 [VarDumper] Fix call site detection (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix call site detection

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

`$trace[$i]['file']` is not always defined and `call_user_func_array` should also be filtered out.

Commits
-------

d8fb6a4 [VarDumper] Fix call site detection
2015-04-10 08:43:32 +02:00