Commit Graph

11778 Commits

Author SHA1 Message Date
Fabien Potencier
415245ee89 bumped Symfony version to 2.3.29 2015-05-11 03:22:26 +02:00
Fabien Potencier
56bc4057e3 updated VERSION for 2.3.28 2015-05-10 17:02:48 +02:00
Alexander Schwenn
f7def8c1d1 [Debug] Fixed ClassNotFoundFatalErrorHandlerTest 2015-05-08 15:17:44 +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
Dawid Nowak
c7a91f1a01 Removed unnecessary statement from PersistentTokenBasedRememberMeServices.php 2015-05-07 21:48:22 +02:00
Dawid Nowak
a73d2cc685 PhpDoc fix in AbstractRememberMeServices
All extending classes return `UserInterface`, not TokenInterface:

* https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php#L64
* https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php#L116

And `AbstractRememberMeServices` actually required the return value to be `UserInterface`:

            $user = $this->processAutoLoginCookie($cookieParts, $request);

            if (!$user instanceof UserInterface) {
                throw new \RuntimeException('processAutoLoginCookie() must return a UserInterface implementation.');
            }
2015-05-07 16:20:47 +02:00
Stepan Anchugov
4d974ced7f [Filesystem] Simplified an if statement 2015-05-06 18:34:36 +02:00
Fabien Potencier
cbcdb16bee bug #14266 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed (hason)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed

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

Commits
-------

43cc877 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
2015-05-06 18:28:43 +02:00
Nicolas Grekas
115fc32541 Merge branch '2.3' into 2.6
* 2.3:
  [Debug 2.3] Fix test for PHP7
  Run tests on hhvm instead of hhvm-nightly
  Use HTTPS in README and some other fixes
  add more entropy to generated classnames

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
2015-05-06 16:13:47 +02:00
Nicolas Grekas
fafcb64d00 [Debug 2.3] Fix test for PHP7 2015-05-06 12:13:27 +02:00
Martin Hasoň
43cc8776df [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed 2015-05-06 11:52:26 +02:00
Abdellatif Ait boudad
09cb24bbad minor #14549 [Translation] simplify getMessages. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation] simplify getMessages.

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

Commits
-------

db077c1 [Translation] simplify getMessages.
2015-05-05 16:51:00 +00:00
Bernhard Schussek
e60f715920 bug #14465 [Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields

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

Commits
-------

7997f24 [Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields
2015-05-05 10:54:18 +02: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
Fabien Potencier
84ce2c57b6 Merge branch '2.6' into 2.7
* 2.6:
  [Validator] Property paths starting with 0 are broken.
  Fixed test
  [2.6][Validator] Fix Interface reference in docblock
  Fix getOrigin

Conflicts:
	src/Symfony/Component/Validator/ValidatorInterface.php
2015-05-05 03:30:36 +02:00
fago
b3db07f5f2 [Validator] Property paths starting with 0 are broken. 2015-05-05 03:29:27 +02:00
Fabien Potencier
473e3314d5 bug #14540 [Serializer] Ignore \Traversable in default normalizers. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Ignore \Traversable in default normalizers.

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

Before the merge of #13500, default normalizers where never called for `\Traversable` objects. This PR restore the previous behavior in a cleaner way.
This is also convenient when dealing with Doctrine's ArrayCollection and serialization groups (see #14495).

ping @symfony/deciders

Commits
-------

c9bff46 [Serializer] Ignore \Traversable in default normalizers. Close #14495.
2015-05-05 03:26:23 +02:00
Fabien Potencier
1ea4612d7e minor #14548 [Translation] Fixed test (dosten)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation] Fixed test

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

Since php7 version 20150301 the json error levels has changed. See http://3v4l.org/Omb8E.
This PR updated the fixture to trigger a syntax error. See http://3v4l.org/OMN7S

Commits
-------

5dca3ff Fixed test
2015-05-05 03:22:57 +02:00
Fabien Potencier
15648ffe30 bug #14527 Fix getOrigin (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix getOrigin

I am far from sure if this is a correct fix, but I believe it is.

The problem is that `getOrigin()` now returns either the Form it was thrown in or `null`. This causes issues when using the `FormErrorIterator`, like:

```php
// note: errors are deep and flatten
foreach ($form->getErrors(true) as $error) {
    echo '* '.$error->getOrigin()->getName().': '.$error->getMessage();
}
```

This now doesn't work for fields that have `error_bubbling => false` or for the root form. In that case, it'll throw an error. Even if I first checked if `getOrigin()` returned `null` or a `FormInterface`, I still had a problem: There is no way to detect which field it was bound to.

Imo, `$error->getOrigin()` should always return the Form that caused them.

/cc @webmozart would love if you can verify that I'm correct here. The form error iterator stuff is still dizzling my head...

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

Commits
-------

01eac33 Fix getOrigin
2015-05-05 03:21:50 +02:00
Abdellatif Ait boudad
db077c1f3b [Translation] simplify getMessages. 2015-05-04 21:22:52 +00:00
Diego Saint Esteben
5dca3ffa69 Fixed test 2015-05-04 17:55:59 -03:00
Nicolas Grekas
dfba29a901 minor #14525 [2.7] [DebugClassLoader] Minor update in deprecation message (phansys)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [DebugClassLoader] Minor update in deprecation message

| 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

Minor update for PHP version reference in deprecation message.

Before:
```
Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7.0
```

After:
```
Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7 and higher
```

Commits
-------

bdc20e5 [2.7] [minor] [DebugClassLoader] Minor update in deprecation message
2015-05-04 18:00:45 +02:00
Javier Spagnoletti
bdc20e5252 [2.7] [minor] [DebugClassLoader] Minor update in deprecation message
| 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

Minor update for PHP version reference in deprecation message.

Before:
```
Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7.0
```

After:
```
Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7+
```
2015-05-04 09:57:47 -03:00
Alexander Schwenn
7f8ff6a7fd [2.6][Validator] Fix Interface reference in docblock 2015-05-04 14:41:38 +02:00
Wouter J
01eac33540 Fix getOrigin 2015-05-04 11:39:13 +02:00
Kévin Dunglas
c9bff461bc [Serializer] Ignore \Traversable in default normalizers. Close #14495. 2015-05-04 09:31:19 +02:00
Bernhard Schussek
f6c77ff362 bug #14395 [Validator] Property paths starting with 0 are broken. (fago)
This PR was squashed before being merged into the 2.7 branch (closes #14395).

Discussion
----------

[Validator] Property paths starting with 0 are broken.

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

Commits
-------

1ced8da [Validator] Property paths starting with 0 are broken.
2015-05-04 09:18:53 +02:00
fago
1ced8dad1d [Validator] Property paths starting with 0 are broken. 2015-05-04 09:18:46 +02:00
Bernhard Schussek
7997f24555 [Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields 2015-05-04 08:53:23 +02:00
Berny Cantos
afc39ee11f add more entropy to generated classnames
- use proxy destination filename to create and md5 salt
- apply fabbot patch
- inline salt generation
2015-05-02 20:46:11 +02: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
Christian Flothmann
38bcab0823 [2.6] link to https://symfony.com where possible 2015-05-01 16:14:24 +02:00
Fabien Potencier
851c7b844a minor #14515 Do not override PHP constants, only use when available (dosten)
This PR was squashed before being merged into the 2.6 branch (closes #14515).

Discussion
----------

Do not override PHP constants, only use when available

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

In #12372, the override of internal constants has been deleted, but the definition of `JSON_PRETTY_PRINT` if not available is missing in that PR.

Commits
-------

d5cc056 Do not override PHP constants, only use when available
2015-05-01 16:09:34 +02:00
Diego Saint Esteben
d5cc056cd3 Do not override PHP constants, only use when available 2015-05-01 16:09:32 +02:00
Fabien Potencier
84ba801e9f feature #14472 [Debug] Trigger deprecation notices when using PHP7 reserved class names (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Trigger deprecation notices when using PHP7 reserved class names

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

Commits
-------

58c0bfe [Debug] Trigger deprecation notices when using PHP7 reserved class names
2015-05-01 16:07:04 +02:00
Christian Flothmann
bf8a1ce2a2 link to https://symfony.com where possible 2015-05-01 16:06:45 +02:00
Diego Saint Esteben
7632d2787e [Finder] Only use GLOB_BRACE when available 2015-05-01 15:39:14 +02:00
Tobias Schultze
7389aa1cb8 minor #14351 [WebProfilerBundle] [HttpKernel] A static approach to version feedback (derrabus)
This PR was squashed before being merged into the 2.7 branch (closes #14351).

Discussion
----------

[WebProfilerBundle] [HttpKernel] A static approach to version feedback

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

This is an alternative approach for the version feedback feature of PR #13626. The original PR performed a server-side HTTP request to symfony.com, which might be problematic in certain environments, see #14349.

This PR makes the following assumptions:

* Symfony's release roadmap is rarely changed
* After the first release of a branch, the Symfony development team is committed to the announced support dates.
* The support period of a stable  branch might be extended, but it's usually not reduced.

Given those assumptions, the EOM and EOL dates may be shipped with the Symfony release and may be updated with a later bugfix release. The information would be available offline without any need to query Symfony's servers.

If the user is running the latest bugfix release of a branch, the EOM/EOL dates should be accurate. If he's running an earlier version, he might get a false positive warning about reaching EOM or EOL if the support period has been extended in the meantime. But since he's running an outdated version anyway, would this really be a problem?

Commits
-------

f5f3bba [WebProfilerBundle] [HttpKernel] A static approach to version feedback
2015-04-28 21:15:25 +02:00
Alexander M. Turek
f5f3bbafba [WebProfilerBundle] [HttpKernel] A static approach to version feedback 2015-04-28 21:15:11 +02:00
Sebastian Grodzicki
6038b75eaf [HttpFoundation] Allow curly braces in trusted host patterns 2015-04-28 20:14:20 +02:00
Nicolas Grekas
58c0bfe65a [Debug] Trigger deprecation notices when using PHP7 reserved class names 2015-04-28 19:35:02 +02:00
Fabien Potencier
13ae7fae09 bug #14469 [Debug] BaseException compatibility for PHP7 (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] BaseException compatibility for PHP7

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

Commits
-------

e94b31f [Debug] PHP7 compatibility with BaseException
2015-04-28 17:14:24 +02:00
Nicolas Grekas
62f8469f25 [DebugBundle] Fix dump() output in API/No-Toolbar context 2015-04-28 08:20:00 +02:00
Nicolas Grekas
343d2828d6 Fix merge 2015-04-27 18:33:29 +02:00
Romain Neutron
af54bda89b [VarDumper] Fix #14481 : Open tree recursively on OSX 2015-04-27 17:26: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
3a404f8fe6 minor #14412 [Yaml] Match signature of Yaml::parse() with Parser->parse() (Zzortell)
This PR was merged into the 2.7 branch.

Discussion
----------

[Yaml] Match signature of Yaml::parse() with Parser->parse()

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

Commits
-------

238589d Add $objectForMap as argument of Yaml::parse()
2015-04-27 14:33:52 +02:00
Fabien Potencier
3be6492e2b minor #14449 [Security] Fix Portuguese (Portugal) translation (Restless-ET)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix Portuguese (Portugal) translation

Commits
-------

b62eb73 Fix Portuguese (Portugal) translation for Security
2015-04-27 14:28:09 +02:00
Fabien Potencier
94cf4ba449 minor #14452 [StringUtil] Fixed singularification of 'selfies' (pmodin)
This PR was merged into the 2.3 branch.

Discussion
----------

[StringUtil] Fixed singularification of 'selfies'

| 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

Related to #14191.

At tonights PHP Stockholm meetup we discussed #14191, and we noticed that "selfie" was incorrectly handled as well. One selfie, many selfies.

Commits
-------

7c2b875 [StringUtil] Fixed singularification of 'selfies'
2015-04-27 14:27:22 +02:00
Fabien Potencier
501df8d14c minor #14460 [Filesystem] deprecate chmod support in dumpFile() (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Filesystem] deprecate chmod support in dumpFile()

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

The ability to support a custom permission mask in the `dumpFile()` method is deprecated since Symfony Symfony 2.3.12. This commit adds the `trigger_error()` call if a custom permission mask is passed.

Commits
-------

faee0d7 [Filesystem] deprecate chmod support in dumpFile()
2015-04-27 14:23:34 +02:00
Fabien Potencier
01b2d8ef96 bug #14463 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed Choice when an empty array is used in the "choices" option

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

This is a backport of #14448 for the 2.3 branch.

Commits
-------

8bf8556 [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-27 14:22:06 +02:00
Fabien Potencier
8f7a55864a minor #14470 [DependencyInjection] Removed extra strtolower calls (dosten)
This PR was squashed before being merged into the 2.3 branch (closes #14470).

Discussion
----------

[DependencyInjection] Removed extra strtolower calls

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

`Alias` already lowercase the `$id` in the constructor. Using `ContainerBuilder::hasAlias()` and `ContainerBuilder::hasDefinition()` inside the code makes an extra strtolower call.

Commits
-------

3bfbf45 [DependencyInjection] Removed extra strtolower calls
2015-04-27 14:15:57 +02:00
Diego Saint Esteben
3bfbf45ed2 [DependencyInjection] Removed extra strtolower calls 2015-04-27 14:15:55 +02:00
Kévin Dunglas
454ef8cc6f [Serializer] Fix a bug when using groups together with a name converter 2015-04-27 14:05:43 +02:00
Nicolas Grekas
fcf53950ca minor #14457 [DependencyInjection] Fixed missing tests (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Fixed missing tests

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

Follow up of #11422 and #14446

Commits
-------

2892902 Fixed tests
2015-04-27 12:30:21 +02:00
Nicolas Grekas
7c5337367a bug #14446 [DependencyInjection] resolve circular reference (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] resolve circular reference

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

This issue has been fixed in #11422. Due to a bad merge in 3bed1b7988 it partially appeared again in Symfony 2.6 or higher.

Commits
-------

8b3b3ce [DependencyInjection] resolve circular reference
2015-04-27 12:29:08 +02:00
Kévin Dunglas
a1f7fb3b04 feature #14187 [Serializer] Supports hassers and setters for groups annotations (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Supports hassers and setters for groups annotations

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

For more coherence with the new `ObjectNormalizer` (#13257), this PR allows to add `@Groups` annotations on hasser and setter methods too.

Commits
-------

9c87ecc [Serializer] Supports hassers and setters for groups annotations
2015-04-27 09:28:02 +02: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
Nicolas Grekas
22693f3a46 minor #14438 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
-------

d5742c1 CS: unalign =
2015-04-26 16:20:13 +02:00
Nicolas Grekas
e94b31f3a0 [Debug] PHP7 compatibility with BaseException 2015-04-26 11:08:32 +02: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
0cbe1e011d Fix test 2015-04-24 18:44:40 +02:00
Nicolas Grekas
62808e4078 feature #14462 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response" (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"

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

This partially reverts commit 22f4807522:
it broke BC (see https://github.com/silexphp/Silex/pull/1142 and 22f4807522 (commitcomment-10857485))

Commits
-------

10c5ffb Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
2015-04-24 17:37:58 +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
Bernhard Schussek
8bf855620f [Validator] Fixed Choice when an empty array is used in the "choices" option 2015-04-24 12:06:28 +02:00
Bernhard Schussek
d206ffd212 bug #14448 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] Fixed Choice when an empty array is used in the "choices" option

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

Commits
-------

a5a41b2 [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 11:48:58 +02:00
Nicolas Grekas
10c5ffbdd0 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
This partially reverts commit 22f4807522.
2015-04-24 09:21:43 +02:00
Nicolas Grekas
1b34f2cb7d Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.

Conflicts:
	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
2015-04-24 09:02:30 +02:00
Christian Flothmann
faee0d714b [Filesystem] deprecate chmod support in dumpFile()
The ability to support a custom permission mask in the `dumpFile()`
method is deprecated since Symfony Symfony 2.3.12. This commit adds the
`trigger_error()` call if a custom permission mask is passed.
2015-04-23 23:48:30 +02:00
Diego Saint Esteben
2892902ead Fixed tests 2015-04-23 18:00:03 -03:00
Nicolas Grekas
98ed078029 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups 2015-04-23 10:57:12 +02:00
Per Modin
7c2b8755e8 [StringUtil] Fixed singularification of 'selfies' 2015-04-23 05:20:57 +02:00
Matthias Pigulla
a8c44713c4 [2.6][Translator] Extend, refactor and simplify Translator tests. 2015-04-22 22:34:04 +01:00
Abdellatif Ait boudad
520660302a minor #14316 [Translation] improved exception when missing required component (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation] improved exception when missing required component

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

Commits
-------

c3bd418 improved exception when missing required component
2015-04-22 22:21:47 +01:00
Restless-ET
b62eb73590 Fix Portuguese (Portugal) translation for Security 2015-04-22 16:50:37 +01:00
Christian Flothmann
c3bd418483 improved exception when missing required component 2015-04-22 17:09:08 +02:00
Bernhard Schussek
a5a41b2f21 [Validator] Fixed Choice when an empty array is used in the "choices" option 2015-04-22 16:59:03 +02:00
Christian Flothmann
8b3b3ce18a [DependencyInjection] resolve circular reference
This issue has been fixed in #11422. Due to a bad merge in
3bed1b7988 it partially appeared again in
Symfony 2.6 or higher.
2015-04-22 16:02:46 +02:00
Dariusz Ruminski
d5742c18b0 CS: unalign = 2015-04-22 09:13:42 +02:00
Dariusz Ruminski
1233baa669 CS: unalign => 2015-04-21 22:51:01 +02:00
Moritz Kraft
dcc65866c9 Update DebugClassLoader.php
Using name property of ReflectionClass instance in strncmp instead of __toString() return value, the latter seemed to breaking one of hte vendor bundles we use, and it seems fine now with the former.
2015-04-20 18:36:32 +01: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
Fabien Potencier
db243627e5 minor #14304 [EventDispatcher] Added the sorted priority information on phpdoc of the getListeners method (dupuchba)
This PR was merged into the 2.3 branch.

Discussion
----------

[EventDispatcher] Added the sorted priority information on phpdoc of the getListeners method

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

Added the sorting by descending priority information on the `EventDisparcherInterface`

Commits
-------

c3eecb5 Add better phpdoc message for getListeners method of the EventDispatcher
2015-04-20 12:41:44 +02:00
Fabien Potencier
f48cc1ba34 bug #14355 [2.6][EventDispatcher] make listeners removable from an executed listener (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][EventDispatcher] make listeners removable from an executed listener

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

Commits
-------

f36803e [EventDispatcher] make listeners removable from an executed listener
2015-04-19 19:01:19 +02:00
Fabien Potencier
d5ed6ecdf6 minor #14366 [HttpFoundation] remove getExtension method (dosten)
This PR was squashed before being merged into the 2.7 branch (closes #14366).

Discussion
----------

[HttpFoundation] remove getExtension method

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

Since the minimum PHP version in 2.7 is 5.3.9 we can delete the `getExtension` method and use the real `\SplFileInfo::getExtension()`

Commits
-------

55ecf3b [HttpFoundation] remove getExtension method
2015-04-19 18:59:32 +02:00
Diego Saint Esteben
55ecf3bc46 [HttpFoundation] remove getExtension method 2015-04-19 18:59:29 +02:00
Fabien Potencier
e26afa4c1d bug #14397 [Debug] Map PHP errors to LogLevel::CRITICAL (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Map PHP errors to LogLevel::CRITICAL

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

See https://github.com/Seldaek/monolog#log-levels for reference.
This is #14294 on 2.7 (not 2.6)

Commits
-------

1dcfbdd [Debug] Map PHP errors to LogLevel::CRITICAL
2015-04-19 18:55:37 +02:00
Rémi Blaise
238589d4e8 Add $objectForMap as argument of Yaml::parse() 2015-04-19 18:34:12 +02:00
Abdellatif Ait boudad
189313caee [2.6][Translation] fix legacy tests. 2015-04-19 14:17:37 +01:00
Bernhard Schussek
a3917fc8c1 [Form] Removed remaining deprecation notices in the test suite 2015-04-19 12:11:13 +02:00
Bernhard Schussek
8f297c14e8 [Form] Moved deprecation notice triggers to file level 2015-04-19 12:00:49 +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
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
1dcfbddf2f [Debug] Map PHP errors to LogLevel::CRITICAL 2015-04-18 12:16:04 +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