diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,397 Commits 24 Branches 563 Tags 228 MiB
7dee89b7fc
Commit Graph

19397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gábor Egyed
16a51e7ca3 [WebProfiler] Tweaked ajax requests toolbar css reset 2014-12-11 16:04:48 +01:00
Fabien Potencier
b72875d0d1 minor #12905 fix phpdoc's alignment (keradus) 
This PR was merged into the 2.5 branch.

Discussion
----------

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

2.3 fixed by #12887
let fix 2.5 now ;)

Commits
-------

e9ea4c1 fix phpdoc's alignment
 2014-12-11 15:59:22 +01:00
Fabien Potencier
c2fc7c959d minor #12903 [TwigBundle] avoid risky tests (xabbuh) 
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBundle] avoid risky tests

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

Commits
-------

e7b0b89 avoid risky tests
 2014-12-11 15:53:32 +01:00
Fabien Potencier
144c19d292 bug #12913 Fix missing space in label_attr (garak) 
This PR was merged into the 2.6 branch.

Discussion
----------

Fix missing space in label_attr

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

``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``

Commits
-------

90b3f3b Fix missing space in label_attr
 2014-12-11 15:51:16 +01:00
Fabien Potencier
480819f939 minor #12927 Fixed deprecation version (WouterJ) 
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed deprecation version

Passing a file to `Yaml::parse()` is deprecated since 2.2 if I understand http://symfony.com/blog/security-release-symfony-2-0-22-and-2-1-7-released correctly.

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

Commits
-------

5f13343 Fixed deprecation version
 2014-12-11 15:47:49 +01:00
Hugo Hamon
123e054087 [WebProfilerBundle] replaced pattern to path attribute in routes definitions. 2014-12-10 08:57:07 +01:00
Dariusz Rumiński
e9ea4c1c9a fix phpdoc's alignment 2014-12-09 19:18:22 +01:00
Wouter J
5f13343597 Fixed deprecation version 2014-12-09 18:32:32 +01:00
Luca Genuzio
6c70bc5211 Fix missing addExpressionLanguageProvider (used by service container to add expression providers) 2014-12-09 13:45:31 +01:00
Graham Campbell
1270327d83 Fixed the AuthenticationProviderInterface alignment 2014-12-09 12:18:23 +00:00
Graham Campbell
ed6c50f4fd Fixed the proxy-manager version constraint 2014-12-09 11:07:51 +00:00
Massimiliano Arione
90b3f3b040 Fix missing space in label_attr 
``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``
 2014-12-09 10:58:23 +01:00
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
Christian Flothmann
e7b0b899e0 avoid risky tests 2014-12-08 17:47:47 +01:00
Dmitry Korotovsky
a6dd6c9b6a [WebProfilerBundle] Fixed IE8 support 2014-12-08 18:46:30 +03:00
Fabien Potencier
a835b18203 bug #12894 [FrameworkBundle][Template name] avoid error message for the shortcut n... (aitboudad) 
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle][Template name] avoid  error message for the shortcut n...

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

Commits
-------

055129c [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
 2014-12-08 15:53:01 +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
Abdellatif Ait boudad
055129c1c2 [FrameworkBundle][Template name] avoid error message for the shortcut notation. 2014-12-08 10:32:45 +00:00
Fabien Potencier
f4e7fd7691 Merge branch '2.7' 
* 2.7: (27 commits)
  Added information when an error occured during validation of an answer of a question
  Adding note about known BC issues
  Adding note about the PdoSessionHandler BC break
  [Console] fixes some typos and phpdoc.
  [HttpKernel] Add deprecation log for Kernel::isClassInActiveBundle()
  fix phpdoc's alignment
  [2.6] CS Fixes And Removed An Unused Import
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader
  CS fixes
  Revert "minor #12821 Remove deprecated class (MasterB)"
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.6.2
  updated VERSION for 2.6.1
  updated CHANGELOG for 2.6.1
  bumped Symfony version to 2.5.9
  updated VERSION for 2.5.8
  update CONTRIBUTORS for 2.5.8
  ...
 2014-12-08 09:44:04 +01:00
Fabien Potencier
d0d7ae24e4 Merge branch '2.6' into 2.7 
* 2.6: (25 commits)
  Added information when an error occured during validation of an answer of a question
  Adding note about known BC issues
  Adding note about the PdoSessionHandler BC break
  [Console] fixes some typos and phpdoc.
  fix phpdoc's alignment
  [2.6] CS Fixes And Removed An Unused Import
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader
  CS fixes
  Revert "minor #12821 Remove deprecated class (MasterB)"
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.6.2
  updated VERSION for 2.6.1
  updated CHANGELOG for 2.6.1
  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
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
 2014-12-08 09:43:57 +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
6e1087836b minor #12888 [HttpKernel] Add deprecation log for Kernel::isClassInActiveBundle() (hacfi) 
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Add deprecation log for Kernel::isClassInActiveBundle()

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #11652
| License       | MIT
| Doc PR        | - (Not mentioned in the docs)

See #11869 and #12854

Commits
-------

5ba6d1f [HttpKernel] Add deprecation log for Kernel::isClassInActiveBundle()
 2014-12-08 09:42:23 +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
Philipp Wahala
5ba6d1f314 [HttpKernel] Add deprecation log for Kernel::isClassInActiveBundle() 
See #11869 and #12854
 2014-12-07 19:58:47 +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
Nicolas Grekas
fcd8ff9b67 [DependencyInjection] perf optim: call dirname() at most 5x 2014-12-04 19:27:52 +01:00
Philipp Wahala
91dcca4c2f [HttpKernel] Remove unused method Kernel::isClassInActiveBundle 
Follow-up of #11869
 2014-12-04 19:05:04 +01:00
Nicolas Grekas
c11535bd6b [DependencyInjection] backport perf optim 
Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
 2014-12-04 17:53:10 +01:00
Pieter Jordaan
0cbc2b0d79 Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher] 2014-12-04 12:52:47 +01:00
Fabien Potencier
f8fb8a98b2 minor #12796 [Console] improve deprecation warning triggers (xabbuh) 
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] improve deprecation warning triggers

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

Since the default helper set of the Console `Application` relies on
the `DialogHelper`, the `ProgressHelper` and the `TableHelper`, there
must be a way to not always trigger `E_USER_DEPRECATION` errors when
one of these helper is used.

Commits
-------

88e3314 [Console] improve deprecation warning triggers
 2014-12-04 11:25:57 +01: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