Commit Graph

5989 Commits

Author SHA1 Message Date
Fabien Potencier
4de4180457 made Symfony compatible with both Twig 1.x and 2.x 2015-08-22 18:18:42 +02:00
Fabien Potencier
e25aca7072 Merge branch '2.3' into 2.7
* 2.3:
  made Symfony compatible with both Twig 1.x and 2.x
2015-08-22 09:41:51 +02:00
Christian Flothmann
17950711a2 [WebProfilerBundle] add import for Twig macro 2015-08-22 09:00:15 +02:00
Fabien Potencier
a5c7a85b78 made Symfony compatible with both Twig 1.x and 2.x 2015-08-18 14:26:23 +02:00
Nicolas Grekas
adb5327dbb [FrameworkBundle] Fix precedence of xdebug.file_link_format 2015-08-14 15:34:27 +02:00
Fabien Potencier
b450c8481a bug #15514 removed _self usage when not needed (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

removed _self usage when not needed

| 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

As those calls are macros, there are already imported via the `from` call, so accessing them directly is not need, nor desired.

Commits
-------

3d0577d removed _self usage when not needed
2015-08-11 22:59:59 +02:00
Fabien Potencier
3d0577d1d2 removed _self usage when not needed 2015-08-11 17:34:43 +02:00
Nicolas Grekas
c0ff72802c Merge branch '2.3' into 2.7
* 2.3:
  typofix - https://github.com/vlajos/misspell_fixer
  [Yaml] Nested merge keys
  Add support for variadic arguments in the GetSetNormalizer

Conflicts:
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
	src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
2015-08-11 09:58:34 +02:00
Fabien Potencier
19ee814cee minor #15470 [FrameworkBundle] [Command] removed unused variable. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] [Command] removed unused variable.

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

Commits
-------

117e054 [FrameworkBundle] [Command] removed unused variable.
2015-08-06 12:02:52 +02:00
Nicolas Grekas
500a2c4504 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Build standalone phpunit without symfony/yaml

Conflicts:
	.travis.yml
	src/Symfony/Bundle/TwigBundle/composer.json
2015-08-06 10:34:04 +02:00
Nicolas Grekas
4dd0de6694 [travis] Build standalone phpunit without symfony/yaml 2015-08-06 10:22:42 +02:00
Hugo Hamon
117e054f87 [FrameworkBundle] [Command] removed unused variable. 2015-08-05 19:26:57 -04:00
Nicolas Grekas
3d7d378cbc Merge branch '2.3' into 2.7
* 2.3:
  Fix security-acl deps
  Fix doctrine mapping validation type error
  Remove skipping of tests based on ICU data version whenever possible
  Fix the handling of null as locale in the stub intl classes
  do not dump leading backslashes in class names
  Skip ::class constant
  [Config] type specific check for emptiness

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
	src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
	src/Symfony/Component/Locale/Tests/LocaleTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
2015-08-01 11:05:17 +02:00
Nicolas Grekas
1270e72560 Fix security-acl deps 2015-08-01 10:11:30 +02:00
bokonet
5179acc29b fix issue #15377 2015-07-28 16:52:34 +02:00
Nicolas Grekas
c37387dc02 Merge branch '2.3' into 2.7
* 2.3:
  [php7] Fix for substr() always returning a string
  [Security] Do not save the target path in the session for a stateless firewall
  [DependencyInjection] fixed FrozenParameterBag and improved Parameter…

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
2015-07-28 16:07:07 +02:00
Grégoire Pineau
335825363d [Security] Do not save the target path in the session for a stateless firewall 2015-07-26 20:14:09 +02:00
Nicolas Grekas
75dc464db8 [Twig+FrameworkBundle] Fix forward compat with Form 2.8 2015-07-23 11:16:04 +02:00
Nicolas Grekas
bf889d3534 Merge branch '2.6' into 2.7
* 2.6:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-07-22 12:11:00 +02:00
Nicolas Grekas
b0d97b71c5 Merge branch '2.3' into 2.6
* 2.3:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-07-22 12:08:40 +02:00
Nicolas Grekas
1c9b43396f [travis] Fix deps=high jobs 2015-07-21 19:12:21 +02:00
Fabien Potencier
c104bc291a fixed merge 2015-07-09 18:32:09 +02:00
Fabien Potencier
175af7f3ac Merge branch '2.6' into 2.7
* 2.6:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [2.6] Static Code Analysis for Components and Bundles
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove duplicate example
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:07:40 +02:00
Fabien Potencier
e6cc4918bf Merge branch '2.3' into 2.6
* 2.3:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:02:48 +02:00
Vladimir Reznichenko
1dac1277a3 [2.6] Static Code Analysis for Components and Bundles 2015-07-08 07:59:48 +02:00
Christian Flothmann
9b0dfd4267 [Security] allow to use method in XML configs
Before this change, you always had to use the `methods` key which is
inconsistent compared to other options like `roles` and `ips` for which
it was possible to use their singular versions.
2015-07-05 10:40:49 +02:00
Nicolas Grekas
eb179f9032 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Towards 100% HHVM compat
  [Security/Http] Fix test
  [Stopwatch] Fix test
  Minor fixes
  Towards 100% HHVM compat
  unify default AccessDeniedExeption message
  trigger event with right user (add test)
  [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
  [Form] Fixed: Data mappers always receive forms indexed by their names

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-07-01 13:25:50 +02:00
Jérôme Vasseur
52755ba26d Fix choice translation domain for expanded choice widget 2015-06-29 21:23:41 +02:00
Christian Flothmann
87e7709b7b unify default AccessDeniedExeption message 2015-06-29 20:24:24 +02:00
Tobias Schultze
dd504d4adf Merge branch '2.6' into 2.7 2015-06-27 22:17:00 +02:00
Tobias Schultze
cbca187a49 Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
2015-06-27 22:15:38 +02:00
Restless-ET
1a5c4c6c93 [Translation][Form][choice] empty_value shouldn't be translated when it has an empty value 2015-06-27 19:52:55 +02:00
Christian Flothmann
96a5653c8d update type hint 2015-06-26 18:55:33 +02:00
Tobias Schultze
a0af4ef1bf minor #15066 [FrameworkBundle] Remove unused old_assets.xml (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove unused old_assets.xml

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

Commit f74a1f2dc3 removed any reference to old_assets.xml

Commits
-------

18e37c8 [FrameworkBundle] Remove unused old_assets.xml
2015-06-26 11:55:27 +02:00
Abdellatif Ait boudad
d1de40e036 Merge remote-tracking branch 'origin/2.6' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
2015-06-25 12:52:11 +00:00
Abdellatif Ait boudad
33413153c9 [Translation][debug cmd] fixed failing tests. 2015-06-25 12:14:41 +00:00
Nicolas Grekas
18e37c834e [FrameworkBundle] Remove unused old_assets.xml 2015-06-24 16:11:52 +02:00
Abdellatif Ait boudad
2e37ede730 [Translation][update cmd] taken account into bundle overrides path. 2015-06-22 14:30:38 +00:00
Fabien Potencier
e64b9bbcbd bug #15038 [Translation][debug cmd] taken account into bundle overrides path. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation][debug cmd] taken account into bundle overrides path.

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

Commits
-------

c3a077a [Translation][debug cmd] taken account into bundle overrides path.
2015-06-21 22:20:15 +02:00
Diego Saint Esteben
8602a4b156 Fixed wrong phpdocs 2015-06-21 15:10:28 -03:00
Abdellatif Ait boudad
c3a077a38b [Translation][debug cmd] taken account into bundle overrides path. 2015-06-19 15:52:10 +00:00
Abdellatif Ait boudad
a8f315b8dd [Translation][update cmd] taken account into bundle overrides path. 2015-06-19 15:48:24 +00:00
Fabien Potencier
ad12251781 bug #14989 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #14989).

Discussion
----------

[FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer

| 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

Inject the `property_accessor` service if available in the `ObjectNormalize` instead of creating a new instance.

Commits
-------

256d441 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
2015-06-19 17:02:37 +02:00
Kévin Dunglas
256d441b21 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer 2015-06-19 17:02:31 +02:00
Nicolas Grekas
9eea9eb848 [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy 2015-06-18 21:21:56 +02:00
Nicolas Grekas
2e7c2caaf2 Merge branch '2.6' into 2.7
* 2.6:
  Add test for HHVM FatalErrors
  [2.6][Debug] Fix fatal-errors handling on HHVM
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/ContextListener.php
	src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
	src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
2015-06-18 15:03:50 +02:00
Nicolas Grekas
7617492914 Merge branch '2.3' into 2.6
* 2.3:
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
2015-06-18 14:58:06 +02:00
Javier Eguiluz
e8b924c2d3 Standardize the name of the exception variables 2015-06-15 18:26:34 +02:00
Fabien Potencier
4b960a65c5 minor #14986 Added a small Upgrade note regarding security.context (iltar)
This PR was merged into the 2.7 branch.

Discussion
----------

Added a small Upgrade note regarding security.context

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

I've added a note in the 2.7 upgrade file on which extending implementations should be updated when using 2.7. Along with it, I've removed an unused use statement, fixed some typos and removed a redundant session check as this check is already done at the start of the method.

For #14889 I have also done a search through the docs (2.7), but I couldn't find any remaining examples encouraging the usage of the `SecurityContext(Interface)` anywhere.

Commits
-------

ade1fef Added a small Upgrade note regarding security.context
2015-06-15 18:18:03 +02:00
Iltar van der Berg
ade1fef3ae Added a small Upgrade note regarding security.context 2015-06-15 08:46:44 +02:00
Abdellatif Ait boudad
c907f8cb04 [WebProfilerBundle][logger] remove duplicated deprecation message 2015-06-12 19:24:25 +00:00
Fabien Potencier
99f95ac212 Merge branch '2.6' into 2.7
* 2.6:
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [2.3] Fix tests on Windows
2015-06-11 19:26:34 +02:00
Fabien Potencier
f0045deaba Merge branch '2.3' into 2.6
* 2.3:
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [2.3] Fix tests on Windows
2015-06-11 19:26:27 +02:00
WouterJ
e3e5f3d661 [2.3] Fix tests on Windows 2015-06-10 02:09:26 +02:00
reecefowell
73bbaa6cc7 Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00
Fabien Potencier
d65adc07a9 Merge branch '2.6' into 2.7
* 2.6:
  Improve the config validation in TwigBundle
  [WebProfilerBundle][logger] added missing deprecation message.
  [Security][Acl] enforce string identifiers
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.3.31
  updated VERSION for 2.3.30
  updated CHANGELOG for 2.3.30
  Php Inspections (EA Extended):     - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString     -resolved implicit magic methods calls     -resolved callable name case mismatches
2015-06-04 22:11:48 +02:00
Fabien Potencier
1c4c0435b4 Merge branch '2.3' into 2.6
* 2.3:
  Improve the config validation in TwigBundle
  [Security][Acl] enforce string identifiers
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.3.31
  updated VERSION for 2.3.30
  updated CHANGELOG for 2.3.30
  Php Inspections (EA Extended):     - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString     -resolved implicit magic methods calls     -resolved callable name case mismatches

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-06-04 22:11:39 +02:00
Christophe Coevoet
f4dfee3bea Improve the config validation in TwigBundle 2015-06-04 12:52:47 +02:00
Zander Baldwin
1778e02151 [2.7][SecurityBundle] Remove SecurityContext from Compile
Remove the deprecated SecurityContext from the list of classes to compile into `classes.map` and `classes.php`.
2015-06-02 16:01:16 +01:00
Fabien Potencier
1dbf67ed66 bug #14793 [FrameworkBundle] make templating.helper.router service available again for BC reasons (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] make `templating.helper.router` service available again for BC reasons

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

Commits
-------

95dcfa2 [FrameworkBundle] make `templating.helper.router` service available again for BC reasons
2015-06-01 17:28:56 +02:00
Abdellatif Ait boudad
3061ace2bf [WebProfilerBundle][logger] added missing deprecation message. 2015-06-01 09:10:59 +00:00
Benjamin Laugueux
fb9e5bfc69 Fix profiler CSS 2015-06-01 10:01:07 +02:00
Christian Flothmann
95dcfa2ee6 [FrameworkBundle] make templating.helper.router service available again for BC reasons 2015-05-30 22:40:00 +02:00
Fabien Potencier
e2b74ca429 Merge branch '2.6' into 2.7
* 2.6:
  bumped Symfony version to 2.6.10
  updated VERSION for 2.6.9
  updated CHANGELOG for 2.6.9
  fixed tests
  Avoid using the app global variable in the profiler templates

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-05-30 01:30:31 +02:00
Fabien Potencier
b5f7196bf5 fixed tests 2015-05-30 00:53:29 +02:00
Fabien Potencier
2e3040cefe bug #14777 Avoid using the app global variable in the profiler templates (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Avoid using the app global variable in the profiler templates

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | small one for people overwriting the WebDebugToolbarListener methods
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/issues/64
| License       | MIT
| Doc PR        | n/a

#14217 introduced a usage of the ``app`` global variables in profiler templates, while we previously removed all such usages to avoid the dependency on TwigBundle in these templates.
This keeps them usable outside the fullstack framework (for instance in Silex).

I had to do a small BC break to be able to pass the request in the place where we were not yet injecting the Request in the template.

Commits
-------

415c79e Avoid using the app global variable in the profiler templates
2015-05-29 18:43:31 +02:00
Fabien Potencier
b07eca5453 Merge branch '2.6' into 2.7
* 2.6: (21 commits)
  Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
  InvalidResourceException file name
  [Validators] Remove forgotten space in a translation key [nl]
  [Validators] Correct translation key and content [nl]
  bumped Symfony version to 2.6.9
  updated VERSION for 2.6.8
  updated CHANGELOG for 2.6.8
  added missing CVE number
  bumped Symfony version to 2.3.30
  updated VERSION for 2.3.29
  update CONTRIBUTORS for 2.3.29
  updated CHANGELOG for 2.3.29
  [Validators] Missing translations for arabic language.
  Code style
  fixed C
  [HttpKernel][Bundle] Check extension implements ExtensionInterface
  [DebugBundle] Fix config XSD
  [CS] [Console] StreamOuput : fix loose comparison
  [Framework][router commands] fixed failing test.
  [HttpKernel] Do not call the FragmentListener if _controller is already defined
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
2015-05-29 16:44:44 +02:00
Fabien Potencier
c349cb3528 Merge branch '2.3' into 2.6
* 2.3:
  Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
  InvalidResourceException file name
  [Validators] Remove forgotten space in a translation key [nl]
  [Validators] Correct translation key and content [nl]
  added missing CVE number
  bumped Symfony version to 2.3.30
  updated VERSION for 2.3.29
  update CONTRIBUTORS for 2.3.29
  updated CHANGELOG for 2.3.29
  [CS] [Console] StreamOuput : fix loose comparison
  [DependencyInjection] Avoid unnecessary calls to strtolower()

Conflicts:
	src/Symfony/Component/Console/Output/StreamOutput.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-05-29 16:42:58 +02:00
Fabien Potencier
a3ee1c5c09 Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
This reverts commit 4d40852596, reversing
changes made to dd2fb850a7.
2015-05-29 16:42:01 +02:00
Christophe Coevoet
415c79e0a6 Avoid using the app global variable in the profiler templates
This keeps them usable outside the fullstack framework (for instance in
Silex).
2015-05-29 10:20:13 +02:00
Nicolas Grekas
6b15ab5a4d [DebugBundle] Fix config XSD 2015-05-24 12:31:48 -07:00
Abdellatif Ait boudad
39cb6616a2 [Framework][router commands] fixed failing test. 2015-05-22 19:35:43 +00:00
Fabien Potencier
58efb98c6f Merge branch '2.6' into 2.7
* 2.6: (30 commits)
  [Translation] fixed JSON loader on PHP 7 when file is empty
  Fix typo
  Check instance of FormBuilderInterface instead of FormBuilder
  [Security] TokenBasedRememberMeServices test to show why encoding username is required
  [Security] AbstractRememberMeServices::encodeCookie() validates cookie parts
  fixed typo
  [console][formater] allow format toString object.
  [HttpFoundation] Fix baseUrl when script filename is contained in pathInfo
  Avoid redirection to XHR URIs
  [HttpFoundation] IpUtils::checkIp4() should allow  networks
  [2.6] Fix HTML escaping of to-source links
  Fix HTML escaping of to-source links
  ExceptionHandler: More Encoding
  Fix the rendering of deprecation log messages
  [FrameworkBundle] Removed unnecessary parameter in TemplateController
  [DomCrawler] Throw an exception if a form field path is incomplete.
  Fixed the indentation in the compiled template for the DumpNode
  [Console] Delete duplicate test in CommandTest
  [TwigBundle] Refresh twig paths when resources change.
  WebProfiler break words
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
	src/Symfony/Component/Debug/ExceptionHandler.php
2015-05-22 16:54:25 +02:00
Fabien Potencier
dd744c9f53 Merge branch '2.3' into 2.6
* 2.3:
  Fix typo
  Check instance of FormBuilderInterface instead of FormBuilder
  [Security] TokenBasedRememberMeServices test to show why encoding username is required
  [Security] AbstractRememberMeServices::encodeCookie() validates cookie parts
  [console][formater] allow format toString object.
  [HttpFoundation] Fix baseUrl when script filename is contained in pathInfo
  Avoid redirection to XHR URIs
  [HttpFoundation] IpUtils::checkIp4() should allow  networks
  Fix HTML escaping of to-source links
  [FrameworkBundle] Removed unnecessary parameter in TemplateController
  [DomCrawler] Throw an exception if a form field path is incomplete.
  [Console] Delete duplicate test in CommandTest
  [TwigBundle] Refresh twig paths when resources change.
  WebProfiler break words
  fixed typo
  Update README.md
  [HttpKernel] Handle an array vary header in the http cache store
  [Security][Translation] fixes #14584
  [Framework] added test for Router commands.
  Handled bearer authorization header in REDIRECT_ form

Conflicts:
	src/Symfony/Component/Debug/ExceptionHandler.php
2015-05-22 16:53:08 +02:00
Fabien Potencier
84d2fdbe86 minor #14662 added supported format in commands supporting --format (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

added supported format in commands supporting --format

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

replaces #14084

Commits
-------

ea874b6 added supported format in commands supporting --format
c4bf217 deprecated the --xml option for commands
2015-05-21 06:22:51 +02:00
Fabien Potencier
c7e05388a0 minor #14595 [FrameworkBundle] Applied new styles to translation commands (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Applied new styles to translation commands

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

## Translation debug

_Only the table layout and deprecation note is changed_

![screenshot 2015-05-09 a 17 09 17](https://cloud.githubusercontent.com/assets/2211145/7550802/45f9a53c-f670-11e4-8e33-6ec9de973c99.PNG)
![screenshot 2015-05-09 a 17 13 47](https://cloud.githubusercontent.com/assets/2211145/7551396/d57523e2-f686-11e4-907c-8b4183183ee1.PNG)

## Translation update

### Before:

![screenshot 2015-05-09 a 17 15 51](https://cloud.githubusercontent.com/assets/2211145/7550791/06cee3a4-f670-11e4-80f1-320e2768290c.PNG)

### After:

![screenshot 2015-05-09 a 17 03 59](https://cloud.githubusercontent.com/assets/2211145/7550797/45f3baaa-f670-11e4-9beb-ad6c6b10442c.PNG)
![screenshot 2015-05-09 a 17 04 35](https://cloud.githubusercontent.com/assets/2211145/7550799/45f7ed64-f670-11e4-9b77-9b602ea2920b.PNG)
![screenshot 2015-05-09 a 17 05 06](https://cloud.githubusercontent.com/assets/2211145/7550800/45f97904-f670-11e4-8b60-c73095b74800.PNG)
![screenshot 2015-05-09 a 17 06 07](https://cloud.githubusercontent.com/assets/2211145/7550798/45f6508a-f670-11e4-9c21-7247691df985.PNG)

Commits
-------

812fedc [FrameworkBundle] Applied new styles to translation commands
2015-05-20 10:22:46 +02:00
Fabien Potencier
8bfe846ee4 minor #14665 [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel

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

I agree that we should not trigger the deprecation warning when the `ContainerAwareHttpKernel` is used in the framework code. However, developers using this class in their own code should receive a warning to be able to prepare their applications for Symfony 3.0.

Commits
-------

030731a [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel
2015-05-20 10:17:11 +02:00
Fabien Potencier
ea874b6ef6 added supported format in commands supporting --format 2015-05-20 10:16:32 +02:00
Nicolas Grekas
385a6b799f Fix HTML escaping of to-source links 2015-05-19 17:44:44 -07:00
Christophe Coevoet
8b6efffd5a Fix the rendering of deprecation log messages 2015-05-19 18:27:55 +02:00
Thomas Schulz
7a4394e771 [FrameworkBundle] Removed unnecessary parameter in TemplateController
Response::setPublic doesn't have any parameters, so this parameter call is not needed.
2015-05-19 12:17:14 +02:00
Abdellatif Ait boudad
cafb0d7b11 [TwigBundle] Refresh twig paths when resources change. 2015-05-16 16:20:37 +02:00
Kovacs Nicolas
7259d72676 WebProfiler break words
WebProfiler CSS word-break: break-all;
2015-05-16 15:40:55 +02:00
Fabien Potencier
3eb8ee7925 minor #14432 [Framework] added test for router commands. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Framework] added test for router commands.

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

- [x] router:debug
- [x] router:match

Commits
-------

6d403a7 [Framework] added test for Router commands.
2015-05-16 15:35:20 +02:00
Fabien Potencier
624dafbd4d bug #14217 [WebProfilerBundle] Fix regexp (romqin)
This PR was squashed before being merged into the 2.6 branch (closes #14217).

Discussion
----------

[WebProfilerBundle] Fix regexp

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

Old PR #12124

Commits
-------

091b37e [WebProfilerBundle] Fix regexp
2015-05-16 15:05:13 +02:00
Romain Gautier
091b37ebea [WebProfilerBundle] Fix regexp 2015-05-16 15:05:10 +02:00
Fabien Potencier
0c613fbcea bug #14645 [WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7 (GromNaN)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7

The WebProfilerBundle version 2.7 is supposed to be compatible with HttpKernel 2.4, but the template of the config profile uses a property `symfonyState` that has been added in Symfony 2.7 by #13626.

> Twig_Error_Runtime: Method "symfonyState" for object "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" does not exist in "@WebProfiler/Collector/config.html.twig" at line 12

This fix makes the property optional.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/pull/63
| License       | MIT

Commits
-------

700fcf1 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
2015-05-15 16:03:58 +02:00
Fabien Potencier
d883ba0984 fixed CS 2015-05-15 16:02:48 +02:00
Fabien Potencier
c658fcdbca Merge branch '2.6' into 2.7
* 2.6:
  fixed CS
  fixed CS

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-05-15 15:53:44 +02:00
Fabien Potencier
0678b3e6f8 fixed CS 2015-05-15 15:53:19 +02:00
Fabien Potencier
c5fe926f40 minor #14591 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands

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

Min dependency on `symfony/console` is changed to `~2.7` in the FrameworkBundle, as it will be a requirement in order to update each command provided in this bundle.

Commits
-------

e56a619 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
2015-05-15 15:35:53 +02:00
Fabien Potencier
e13373ec11 Merge branch '2.6' into 2.7
* 2.6:
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Component/Finder/Expression/Glob.php
2015-05-15 15:33:16 +02:00
Fabien Potencier
fcfc876c5b Merge branch '2.3' into 2.6
* 2.3:
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
2015-05-15 15:32:45 +02:00
Jérôme Tamarelle
700fcf1871 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7 2015-05-15 15:29:11 +02:00
Fabien Potencier
984d82cbe5 minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Pre incrementation/decrementation should be used if possible

| 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

Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1113

If this pr is merged I would change the level of the fixer to `symfony`.

Commits
-------

c5123d6 CS: Pre incrementation/decrementation should be used if possible
2015-05-15 15:28:34 +02:00
Nicolas Grekas
5f255e5059 [DebugBundle] Allow alternative destination for dumps 2015-05-15 10:09:58 +02:00
Christian Flothmann
030731aa1d [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel 2015-05-14 17:55:34 +02:00
Nicolas Grekas
b47b51187e Merge branch '2.6' into 2.7
* 2.6:
  fix missing links to https://symfony.com
  fix missing links to https://symfony.com
  [travis] Don't use the cache
  [DebugBundle] Remove inlined dumps on XHR

Conflicts:
	src/Symfony/Component/Security/Acl/README.md
	src/Symfony/Component/Security/Core/README.md
	src/Symfony/Component/Security/Csrf/README.md
	src/Symfony/Component/Security/Http/README.md
2015-05-13 13:34:46 +02:00
Nicolas Grekas
70e6a145c8 fix missing links to https://symfony.com 2015-05-13 13:33:56 +02:00
ogizanagi
e56a619efb [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands 2015-05-12 23:29:10 +02:00
ogizanagi
812fedcdc6 [FrameworkBundle] Applied new styles to translation commands 2015-05-12 21:44:04 +02:00
Abdellatif Ait boudad
f75790a216 [TranslationDebugCommand] fixed failing tests. 2015-05-11 18:17:01 +00:00
Fabien Potencier
daf4a03e5d Merge branch '2.6' into 2.7
* 2.6: (21 commits)
  bumped Symfony version to 2.6.8
  updated VERSION for 2.6.7
  updated CHANGELOG for 2.6.7
  bumped Symfony version to 2.3.29
  updated VERSION for 2.3.28
  update CONTRIBUTORS for 2.3.28
  updated CHANGELOG for 2.3.28
  [Debug] Fixed ClassNotFoundFatalErrorHandlerTest
  [SecurityBundle] use access decision constants in config
  [SecurityBundle] use session auth constants in config
  PhpDoc fix in AbstractRememberMeServices
  [Filesystem] Simplified an if statement
  [SecurityBundle] Use Enum Nodes Instead Of Scalar
  [Debug 2.3] Fix test for PHP7
  [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
  [Translation] simplify getMessages.
  [Framework][Translation] added test for debug command.
  Run tests on hhvm instead of hhvm-nightly
  Use HTTPS in README and some other fixes
  add more entropy to generated classnames
  ...

Conflicts:
	.travis.yml
	src/Symfony/Component/HttpKernel/Kernel.php
2015-05-11 04:35:29 +02:00
Tobias Schultze
54311dafae [SecurityBundle] use access decision constants in config 2015-05-08 02:10:43 +02:00
Tobias Schultze
e12359303d Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
2015-05-08 02:09:07 +02:00
Tobias Schultze
a95559858d [SecurityBundle] use session auth constants in config 2015-05-08 02:01:21 +02:00
Vadim Kharitonov
ce7fb040b6 [SecurityBundle] Use Enum Nodes Instead Of Scalar 2015-05-06 18:42:39 +03:00
Fabien Potencier
c4867485d7 bug #14478 [DebugBundle] Fix dump() output in API / No-Toolbar context (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] Fix dump() output in API / No-Toolbar context

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

With this PR, dumps are written as plain text when the main content-type is not HTML.
With HTML, dumps are inlined when the web debug toolbar is not enabled.

Commits
-------

62f8469 [DebugBundle] Fix dump() output in API/No-Toolbar context
2015-05-05 03:50:03 +02:00
Abdellatif Ait boudad
9a50252507 [Framework][Translation] added test for debug command. 2015-05-04 14:53:25 +00:00
Fabien Potencier
42e3ecbe78 Merge branch '2.6' into 2.7
* 2.6: (25 commits)
  [2.6] link to https://symfony.com where possible
  Do not override PHP constants, only use when available
  link to https://symfony.com where possible
  [FrameworkBundle] Added missing log in server:run command
  [Finder] Only use GLOB_BRACE when available
  [HttpFoundation] Allow curly braces in trusted host patterns
  Fix merge
  Fix typo in variable name
  [profiler][security] check authenticated user by tokenClass instead of username.
  [WebProfiler] fix html syntax for input types
  [TwigBundle] Fix deprecated use of FlattenException
  [DependencyInjection] Removed extra strtolower calls
  Use https://symfony.com/search for searching
  [Debug] PHP7 compatibility with BaseException
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  [DependencyInjection] resolve circular reference
  ...

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
	src/Symfony/Component/Form/README.md
	src/Symfony/Component/Intl/README.md
	src/Symfony/Component/Security/README.md
	src/Symfony/Component/Translation/README.md
	src/Symfony/Component/Validator/README.md
2015-05-02 17:21:08 +02:00
Fabien Potencier
f47d9055bc minor #14519 [2.6] link to https://symfony.com where possible (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] link to https://symfony.com where possible

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

2.6-related changes of #14518.

Commits
-------

38bcab0 [2.6] link to https://symfony.com where possible
2015-05-02 17:19:33 +02:00
Fabien Potencier
b8cd3ca3f8 Merge branch '2.3' into 2.6
* 2.3:
  link to https://symfony.com where possible
  [FrameworkBundle] Added missing log in server:run command
  [HttpFoundation] Allow curly braces in trusted host patterns
  [profiler][security] check authenticated user by tokenClass instead of username.
  Use https://symfony.com/search for searching

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
	src/Symfony/Component/Form/README.md
	src/Symfony/Component/Intl/README.md
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/README.md
	src/Symfony/Component/Translation/README.md
	src/Symfony/Component/Validator/README.md
2015-05-02 17:18:45 +02:00
Fabien Potencier
3cdb539360 minor #14518 [2.3] link to https://symfony.com where possible (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] link to https://symfony.com where possible

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

Commits
-------

bf8a1ce link to https://symfony.com where possible
2015-05-02 17:15:45 +02:00
Christian Flothmann
38bcab0823 [2.6] link to https://symfony.com where possible 2015-05-01 16:14:24 +02:00
Diego Saint Esteben
d5cc056cd3 Do not override PHP constants, only use when available 2015-05-01 16:09:32 +02:00
Christian Flothmann
bf8a1ce2a2 link to https://symfony.com where possible 2015-05-01 16:06:45 +02:00
Grégoire Pineau
5dd52c3b00 [FrameworkBundle] Added missing log in server:run command
Because of the current implementation of `php -S` command,
logs are skipped if a front controller is specified.

This patch put back the missing logs
2015-05-01 16:01:56 +02:00
Fabien Potencier
5402035fd1 minor #14477 Use https://symfony.com/search for search form (jrobeson)
This PR was merged into the 2.3 branch.

Discussion
----------

Use https://symfony.com/search for search form

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

Using https for symfony.com/search stops chrome (and eventually firefox)
from warning us about "Mixed Content" when developing sites that use SSL
for the entire site.

Here is the warning text:

```
Mixed Content: The page at 'https://example.org/' was loaded over a secure connection, but contains a form which targets an insecure endpoint 'http://symfony.com/search'. This endpoint should be made available over a secure connection.
```

Commits
-------

74983d7 Use https://symfony.com/search for searching
2015-05-01 15:37:40 +02:00
Nicolas Grekas
1439da4c30 bug #14480 [TwigBundle] Fix deprecated use of FlattenException (alOneh)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBundle] Fix deprecated use of FlattenException

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

Commits
-------

4d2f044 [TwigBundle] Fix deprecated use of FlattenException
2015-04-28 19:26:09 +02:00
Nicolas Grekas
62f8469f25 [DebugBundle] Fix dump() output in API/No-Toolbar context 2015-04-28 08:20:00 +02:00
Paul Andrieux
bb9c4ee5c3 Fix typo in variable name
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~
2015-04-27 17:32:10 +02:00
Abdellatif Ait boudad
79e005bfbb [profiler][security] check authenticated user by tokenClass instead of username. 2015-04-27 16:29:18 +01:00
Tobias Schultze
876b180227 [WebProfiler] fix html syntax for input types 2015-04-27 15:13:12 +02:00
Hippolyte Alain
4d2f0442f4 [TwigBundle] Fix deprecated use of FlattenException 2015-04-27 14:57:27 +02:00
Fabien Potencier
3928ed5fce Merge branch '2.3' into 2.6
* 2.3:
  [DependencyInjection] Removed extra strtolower calls
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  CS: unalign =
  Show a better error when the port is in use
  CS: unalign =>
  [FrameworkBundle] Check for 'xlf' instead of 'xliff'
  Add better phpdoc message for getListeners method of the EventDispatcher

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
2015-04-27 14:43:05 +02:00
Fabien Potencier
7f24883f48 bug #14436 Show a better error when the port is in use (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

Show a better error when the port is in use

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

This is a backport of #14063

Commits
-------

34e000e Show a better error when the port is in use
2015-04-27 14:30:26 +02:00
Nicolas Dewez
69704692e4 Changed output for translation:debug command 2015-04-27 14:13:46 +02:00
Johnny Robeson
74983d7fd7 Use https://symfony.com/search for searching
Using https for symfony.com/search stops chrome (and eventually firefox)
from warning us about "Mixed Content" when developing sites that use SSL
for the entire site.
2015-04-26 17:52:15 -04:00
Nicolas Grekas
9b333d655e minor #14439 CS: unalign => (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: unalign =>

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

Update before upcoming changes on PHP CS Fixer 1.8

To keep fabbot.io happy ;)

Commits
-------

1233baa CS: unalign =>
2015-04-26 16:27:11 +02:00
Abdellatif Ait boudad
efb10f641a [FrameworkBundle][Translation] skip warmUp when cache is not used. 2015-04-25 12:46:08 +01:00
Matthias Pigulla
c0300f57d5 Remaining tweaks for translator tests on 2.7
This are the remaining changes on the 2.7 branch after #14437 merged most of the improvements into 2.6.
2015-04-24 23:23:51 +02:00
Nicolas Grekas
4cc4f079c5 [FrameworkBundle] Fix test related to PSR-4 2015-04-24 21:21:36 +02:00
Nicolas Grekas
e0c6f444a3 Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix deprecated use of DebugClassLoader
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:36:44 +02:00
Nicolas Grekas
4a6100a6f2 [Debug] Fix deprecated use of DebugClassLoader 2015-04-24 12:55:50 +02:00
Dariusz Ruminski
d5742c18b0 CS: unalign = 2015-04-22 09:13:42 +02:00
Diego Saint Esteben
34e000e59a Show a better error when the port is in use 2015-04-21 22:28:59 -03:00
Dariusz Ruminski
1233baa669 CS: unalign => 2015-04-21 22:51:01 +02:00
Abdellatif Ait boudad
6d403a7795 [Framework] added test for Router commands. 2015-04-21 20:02:11 +01:00
Christian Flothmann
69285072ab inject asset packages in assets helper service 2015-04-20 18:41:42 +02:00
Nicolas Grekas
bf8f70607a Merge branch '2.6' into 2.7
* 2.6:
  [2.6][Translation] fix legacy tests.
  [EventDispatcher] make listeners removable from an executed listener

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
2015-04-20 13:53:55 +02:00
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
8cf0613ead Merge branch '2.6' into 2.7
* 2.6:
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
  [2.3] Static Code Analysis for Components
  [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
  [Translation] LoggingTranslator simplifications
  [Translation][fixed test] refresh cache when resources are no longer fresh.
  [FrameworkBundle] Fixed server:start --router relative path issue #14124
  [FrameworkBundle] improve usage of Table helper
  [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/Console/Helper/Table.php
	src/Symfony/Component/Translation/LoggingTranslator.php
2015-04-18 17:11:06 +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
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
Abdellatif Ait boudad
a0d185a43c [FrameworkBundle] Initialize translator with the default locale. 2015-04-17 00:52:06 +01:00
Nicolas Grekas
7e95a244d8 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors 2015-04-16 14:03:59 +02:00
Dariusz Ruminski
cfa3e95f4d CS fixes 2015-04-16 09:01:03 +02:00