Commit Graph

18346 Commits

Author SHA1 Message Date
Dariusz Rumiński
e9ea4c1c9a fix phpdoc's alignment 2014-12-09 19:18:22 +01:00
Fabien Potencier
7bb6f4445c Merge branch '2.3' into 2.5
* 2.3:
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader

Conflicts:
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
2014-12-08 09:43:12 +01:00
Fabien Potencier
99369a2b49 bug #12806 [Console] Removed the use of $this->getHelperSet() as it is null by default (saro0h)
This PR was submitted for the 2.6 branch but it was merged into the 2.5 branch instead (closes #12806).

Discussion
----------

[Console] Removed the use of $this->getHelperSet() as it is null by default

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

Before:
![capture d ecran 2014-12-02 a 15 51 38](https://cloud.githubusercontent.com/assets/667519/5264798/303bf87a-7a3e-11e4-9b45-68e8a86bab60.png)

After:
![capture d ecran 2014-12-02 a 16 36 25](https://cloud.githubusercontent.com/assets/667519/5265299/b13190d6-7a41-11e4-9e68-d889ea290cae.png)

Commits
-------

111b194 Added information when an error occured during validation of an answer of a question
2014-12-08 09:28:22 +01:00
Saro0h
111b1948f2 Added information when an error occured during validation of an answer of a question 2014-12-08 09:28:21 +01:00
Fabien Potencier
6104fe0234 minor #12884 [Console] fixes some typos and phpdoc. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] fixes some typos and phpdoc.

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

Commits
-------

86840df [Console] fixes some typos and phpdoc.
2014-12-08 09:25:46 +01:00
Hugo Hamon
86840df972 [Console] fixes some typos and phpdoc. 2014-12-07 21:49:32 +01:00
Fabien Potencier
f031154fa7 bug #12858 [ClassLoader] Fix undefined index in ClassCollectionLoader (szicsu)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Fix undefined index in ClassCollectionLoader

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

Commits
-------

cfdb925 [ClassLoader] Fix undefined index in ClassCollectionLoader
2014-12-07 19:38:12 +01:00
Fabien Potencier
9f76f1c10f minor #12887 [2.3] CS Fixes: fix phpdoc's alignment (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] CS Fixes: fix phpdoc's alignment

| 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

Fix phpdoc's alignment

Commits
-------

f588610 fix phpdoc's alignment
2014-12-07 19:28:24 +01:00
Dariusz Rumiński
f588610722 fix phpdoc's alignment 2014-12-07 19:24:30 +01:00
Fabien Potencier
250a8056d8 minor #12886 Minor phpcs fixes (acrobat)
This PR was merged into the 2.3 branch.

Discussion
----------

Minor phpcs fixes

| 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

Small phpcs fixes

Commits
-------

9a0d5c3 Minor phpcs fixes
2014-12-07 18:55:36 +01:00
Jeroen Thora
9a0d5c3e2e Minor phpcs fixes 2014-12-07 18:50:06 +01:00
Fabien Potencier
002595a66b minor #12856 [2.5] CS Fixes And Removed Unused Imports (GrahamCampbell)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] CS Fixes And Removed Unused Imports

| 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

##### This pull request fixes some cs issues in symfony 2.5.

I've applied the same set of fixes that I did to the 2.3 branch.

There are far fewer fixes than there were for 2.3, so I've just done them all at once.

Commits
-------

ed4fb54 CS fixes
2014-12-05 12:58:26 +01:00
Szijarto Tamas
cfdb925c47 [ClassLoader] Fix undefined index in ClassCollectionLoader 2014-12-04 22:06:34 +01:00
Graham Campbell
ed4fb54901 CS fixes 2014-12-04 20:26:11 +00:00
Fabien Potencier
9aff1ec93c Merge branch '2.3' into 2.5
* 2.3:
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.3.24
  updated VERSION for 2.3.23
  update CONTRIBUTORS for 2.3.23
  updated CHANGELOG for 2.3.23

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
2014-12-04 09:55:19 +01:00
Fabien Potencier
15551f2e85 minor #12840 [2.3] More cs fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #12840).

Discussion
----------

[2.3] More 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

##### This pull request fixes some more cs issues in symfony 2.3.

I should be done with cs fixes to the 2.3 branch now. Sorry I missed these in my last pull.

Commits
-------

b034b08 [2.3] More cs fixes
2014-12-04 06:06:19 +01:00
Graham Campbell
b034b08506 [2.3] More cs fixes 2014-12-04 06:06:17 +01:00
Fabien Potencier
cef9972484 minor #12837 [2.3] CS Fixes And Removed Unused Imports (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] CS Fixes And Removed Unused Imports

| 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

##### This pull request fixes some cs issues in symfony 2.3.

As far as I understand, symfony's coding standards dictate that there should be no blank lines between imports and imports should not be prefixed with a slash. There are one or two other tiny fixes in here too.

Also, we should only import things that we actually *use*. :)

Commits
-------

0e4f0e7 Removed unused imports
0fc3369 CS fixes
2014-12-03 21:27:24 +01:00
Graham Campbell
0e4f0e7c9e Removed unused imports 2014-12-03 20:18:13 +00:00
Graham Campbell
0fc3369b35 CS fixes 2014-12-03 20:10:26 +00:00
Fabien Potencier
51aa4788d1 bumped Symfony version to 2.5.9 2014-12-03 17:34:22 +01:00
Fabien Potencier
00da57005c updated VERSION for 2.5.8 2014-12-03 15:18:17 +01:00
Fabien Potencier
547f7b93e1 update CONTRIBUTORS for 2.5.8 2014-12-03 15:18:05 +01:00
Fabien Potencier
15948b8307 updated CHANGELOG for 2.5.8 2014-12-03 15:17:51 +01:00
Fabien Potencier
9b24d184c2 bumped Symfony version to 2.3.24 2014-12-03 15:07:19 +01:00
Fabien Potencier
daf150374d updated VERSION for 2.3.23 2014-12-03 13:04:45 +01:00
Fabien Potencier
c8010a7580 update CONTRIBUTORS for 2.3.23 2014-12-03 13:04:30 +01:00
Fabien Potencier
6b7c822126 updated CHANGELOG for 2.3.23 2014-12-03 13:03:49 +01:00
Fabien Potencier
b8a37bdf34 fixed wrong merge 2014-12-02 22:48:32 +01:00
Fabien Potencier
ab1e9f3f81 Merge branch '2.3' into 2.5
* 2.3:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	composer.json
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-12-02 21:15:53 +01:00
Fabien Potencier
be81a1d11b minor #12772 PSR-2 Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

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

##### This pull request brings symfony 2.3 back inline with PSR-2.

Commits
-------

eda746b PSR-2 fixes
2014-12-02 21:00:13 +01:00
Fabien Potencier
2e65c3fccf bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
This PR was squashed before being merged into the 2.3 branch (closes #12811).

Discussion
----------

Configure firewall's kernel exception listener with configured entry point or a default entry point

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | when relying on buggy behaviour
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12581 #12801
| License       | MIT
| Doc PR        | —

The #12296 PR introduced a bug where the firewall's exception listener was sometimes configured with the default entry point returned by `SecurityExtension#createAuthenticationListeners()`. These changes add a regression test and make the configured entry point (if any) always take precedence over a default entry point.

If someone can confirm this fix, it would have my preference merging this over reverting #12296 for Symfony 2.6.1.

Commits
-------

b122262 Configure firewall's kernel exception listener with configured entry point or a default entry point
2014-12-02 20:53:07 +01:00
Reinier Kip
b1222624b2 Configure firewall's kernel exception listener with configured entry point or a default entry point 2014-12-02 20:53:05 +01:00
Graham Campbell
eda746bad5 PSR-2 fixes 2014-12-02 19:42:47 +00:00
Fabien Potencier
b604b0ae75 bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] make paths relative to __DIR__ in the generated container

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6484, #3079, partially #9238, #10894, #10999
| License       | MIT
| Doc PR        | n/a

This is an alternative approach to #10999 for removing absolute paths from the generated container:
instead of trying to fix the container file after it has been dumped, telling to the PhpDumper where its output will be written allows it to replace parts of strings by an equivalent value based on `__DIR__`.
This should be safe, thus the PR is on 2.3.

Commits
-------

edd7057 [DependencyInjection] make paths relative to __DIR__ in the generated container
2014-12-02 13:16:33 +01:00
Nicolas Grekas
edd705716a [DependencyInjection] make paths relative to __DIR__ in the generated container 2014-12-02 11:32:16 +01:00
Fabien Potencier
9e0dff5a91 minor #12781 Fixed the symfony/config version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the symfony/config version constraint

| 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

##### This pull request fixes the `symfony/config` version constraint in the proxy manager bridge.

Before this pull, composer was only allowing `v2.3.0` to be downloaded. This surely was not the intention. I've updated the version constraint from `"2.3"` to `"~2.3"` thus allowing all 2.x versions that are equal to or greater than `v2.3.0`.

Commits
-------

ec14f0f Fixed the symfony/config version constraint
2014-11-30 18:00:27 +01:00
Fabien Potencier
c68ff54aac minor #12774 Docblock Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Docblock 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

##### This pull request fixes the docblock alignment as requested in #12760.

It was also necessary for me to ensure the `@return` annotations were correctly separated in order to accurately align the `@param` annotations.

Commits
-------

443307e Docblock fixes
2014-11-30 17:59:09 +01:00
Fabien Potencier
b4a8655020 minor #12777 Tweaked the password-compat version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Tweaked the password-compat version constraint

| 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

##### This pull request tweaks the `"ircmaxell/password-compat` version constraint in the 2.3 branch.

I've updated the version constraint to `"~1.0"` match the way we require all "stable" releases. Note that this version constraint is technically different, but I consider it safe still.

Commits
-------

f703e56 Tweaked the password-compat version constraint
2014-11-30 17:56:53 +01:00
Fabien Potencier
b788a08f50 minor #12783 Fixed the syntax of a composer.json file (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the syntax of a composer.json file

| 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

##### This pull request fixes the syntax of a composer.json file.

There should not be a space before a colon following a double quote. This is not bad syntax, but it just an inconsistency.

Commits
-------

0f8547a Fixed the syntax of a composer.json file
2014-11-30 17:54:43 +01:00
Graham Campbell
0f8547af4b Fixed the syntax of a composer.json file 2014-11-30 15:11:35 +00:00
Graham Campbell
ec14f0f007 Fixed the symfony/config version constraint
Fixes the symfony/config version constraint in the proxy manager bridge
2014-11-30 15:06:19 +00:00
Graham Campbell
f703e5661a Tweaked the password-compat version constraint 2014-11-30 14:39:13 +00:00
Graham Campbell
443307edc1 Docblock fixes 2014-11-30 13:33:44 +00:00
Fabien Potencier
a0703cff9a minor #12767 [Console] Remove dialog helper usage (blanchonvincent)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] Remove dialog helper usage

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

Because the dialog helper is deprecated, we should use question helper instead.

Commits
-------

844aa54 Remove dialog usage
2014-11-30 11:12:31 +01:00
blanchonvincent
844aa54aa2 Remove dialog usage 2014-11-30 09:03:32 +01:00
Fabien Potencier
6945a2a15a bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] define constant only if it wasn't defined before

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

Commits
-------

388229b define constant only if it wasn't defined before
2014-11-29 13:55:31 +01:00
Christian Flothmann
388229b55c define constant only if it wasn't defined before 2014-11-29 13:36:20 +01:00
Fabien Potencier
2c4d0ca6ff minor #12638 [Hackday][2.3] Fixed typos (pborreli)
This PR was merged into the 2.3 branch.

Discussion
----------

[Hackday][2.3] Fixed typos

Commits
-------

7a67e8c Fixed typos
2014-11-29 12:52:41 +01:00
Fabien Potencier
facdd9082b minor #12644 Fix incorrect spanish translation (alfonso)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #12644).

Discussion
----------

Fix incorrect spanish translation

SymfonyCon Madrid 2014 Hackday

Commits
-------

28b07ba Fix incorrect spanish translation
2014-11-29 12:13:57 +01:00