Commit Graph

19008 Commits

Author SHA1 Message Date
Christian Flothmann
1917b703c6 fix DumpDataCollectorTest after CS changes
Modify the expected line value which was affected by the move of the
`__LINE__` constant in #12872 to make tests pass again.
2014-12-08 18:03:34 +01:00
Fabien Potencier
0a09eaf609 minor #12895 [Security] Fixed typo in SecurityContext PHPDoc (althaus)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security] Fixed typo in SecurityContext PHPDoc

Fixes a simple typo.

Commits
-------

8d7581a Fixed typo in SecurityContext PHPDoc
2014-12-08 12:33:14 +01:00
Matthias Althaus
8d7581af3a Fixed typo in SecurityContext PHPDoc
Fixed typo in PHPDoc
2014-12-08 12:17:16 +01:00
Fabien Potencier
23eafccd4a Merge branch '2.5' into 2.6
* 2.5:
  Added information when an error occured during validation of an answer of a question
  [Console] fixes some typos and phpdoc.
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader
2014-12-08 09:43:24 +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
51509be663 minor #12890 Adding note about the PdoSessionHandler BC break (weaverryan)
This PR was merged into the 2.6 branch.

Discussion
----------

Adding note about the PdoSessionHandler BC break

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12833
| License       | MIT
| Doc PR        | symfony/symfony-docs#4609

Hi guys!

This adds an UPGRADE note about the PdoSessionHandler BC break in 2.6. I also added a section on top, which might be more controversial that highlights the BC breaks. That's because this document is long, and much of it is telling you about deprecated features. But what I first want to know is - what will break?

I'm also still interested in maybe adding the old PdoSessionHandler to 2.6 and allowing you to use that one to keep BC (still a BC break, but you could choose to use the old one).

Thanks!

Commits
-------

adfdad9 Adding note about known BC issues
42950e9 Adding note about the PdoSessionHandler BC break
2014-12-08 09:37:20 +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
Ryan Weaver
adfdad9c38 Adding note about known BC issues 2014-12-07 19:23:51 -05:00
Ryan Weaver
42950e9e71 Adding note about the PdoSessionHandler BC break 2014-12-07 19:21:36 -05: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
b0ba74d49f minor #12872 [2.6] CS Fixes And Removed An Unused Import (GrahamCampbell)
This PR was squashed before being merged into the 2.6 branch (closes #12872).

Discussion
----------

[2.6] CS Fixes And Removed An Unused Import

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

This is the sequel to #12856.

Commits
-------

2f10a0a [2.6] CS Fixes And Removed An Unused Import
2014-12-07 19:23:40 +01:00
Graham Campbell
2f10a0a704 [2.6] CS Fixes And Removed An Unused Import 2014-12-07 19:23:39 +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
c4a80412b8 Merge branch '2.5' into 2.6
* 2.5:
  CS fixes
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.5.9
  updated VERSION for 2.5.8
  update CONTRIBUTORS for 2.5.8
  updated CHANGELOG for 2.5.8
  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/Component/Console/Helper/ProgressBar.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
	src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
2014-12-05 13:00:15 +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
7224bde4c1 Revert "minor #12821 Remove deprecated class (MasterB)"
This reverts commit 3d637487f0, reversing
changes made to 7a5762c198.
2014-12-04 10:43:55 +01: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
0b3aa16f2f bumped Symfony version to 2.6.2 2014-12-03 18:16:02 +01:00
Fabien Potencier
d805dfd679 updated VERSION for 2.6.1 2014-12-03 17:40:43 +01:00
Fabien Potencier
74a16e6155 updated CHANGELOG for 2.6.1 2014-12-03 17:40:31 +01: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
0999ea74b7 fixed a test 2014-12-03 11:02:59 +01:00
Fabien Potencier
73149ae819 bug #12823 [DependencyInjection] fix PhpDumper (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] fix PhpDumper

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

Commits
-------

7887a46 [DependencyInjection] keep some of the reverted perf optim
2f0b355 Revert "minor #10241 [DependencyInjection] made some perf improvements (fabpot)"
2014-12-03 10:28:04 +01:00
Nicolas Grekas
7887a46ff9 [DependencyInjection] keep some of the reverted perf optim 2014-12-03 10:22:11 +01:00
Fabien Potencier
3d637487f0 minor #12821 Remove deprecated class (MasterB)
This PR was merged into the 2.6 branch.

Discussion
----------

Remove deprecated class

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

Improvement: Replace deprecated class with correct one

Commits
-------

a088521 Remove deprecated class
2014-12-03 10:07:16 +01:00
Nicolas Grekas
2f0b3551b5 Revert "minor #10241 [DependencyInjection] made some perf improvements (fabpot)"
This reverts commit 181e460984, reversing
changes made to ff17493029.
2014-12-03 09:59:38 +01:00
MasterB
a088521b6f Remove deprecated class
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | 

replace deprecated class with correct one
2014-12-03 08:02:21 +01:00
Fabien Potencier
7a5762c198 Merge branch '2.5' into 2.6
* 2.5:
  fixed wrong merge
2014-12-02 22:48:38 +01:00
Fabien Potencier
b8a37bdf34 fixed wrong merge 2014-12-02 22:48:32 +01:00
Fabien Potencier
83ee704816 Merge branch '2.5' into 2.6
* 2.5:
  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
  Remove dialog usage
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Parser.php
2014-12-02 21:19:20 +01:00