Commit Graph

15206 Commits

Author SHA1 Message Date
Besnik Br
6cf5e0812e convert object to string if possible instead of using var_export directly 2013-09-16 10:05:18 +02:00
Fabien Potencier
f4f6b06048 merged branch lsmith77/allow_null_tags (PR #9046)
This PR was squashed before being merged into the master branch (closes #9046).

Discussion
----------

Allow null values as tag attributes

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

see also 3a194b718d (commitcomment-4096394)

fixes a regression see https://travis-ci.org/symfony-cmf/RoutingBundle/jobs/11362114#L165

Commits
-------

639b0fa Allow null values as tag attributes
2013-09-16 10:01:04 +02:00
Lukas Kahwe Smith
639b0fa967 Allow null values as tag attributes 2013-09-16 10:01:04 +02:00
Fabien Potencier
42f4b6db7b [EventDispatcher] fixed some phpdoc 2013-09-13 17:15:57 +02:00
Fabien Potencier
6920a37a00 merged branch drak/edaware2 (PR #7852)
This PR was squashed before being merged into the master branch (closes #7852).

Discussion
----------

[2.3][EventDispatcher] Make events lighter

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

I've taken the previous discussions and taking into consideration @fabpot does not want to break BC. This PR now provides the `EventDispatcher` as an argument to listeners. I've made a second separate commit which also passes the event name.

This PR is alternative to #7582

Commits
-------

e2bff32 [2.3][EventDispatcher] Make events lighter
2013-09-13 17:13:26 +02:00
Drak
e2bff32de7 [2.3][EventDispatcher] Make events lighter 2013-09-13 17:13:25 +02:00
Fabien Potencier
fc437cf6fb Merge branch '2.3'
* 2.3:
  [FrameworkBundle][Security] Replaced void return type with null for consistency
  fixed CS
  NativeSessionStorage regenerate
  removed unneeded comment
  Use setTimeZone if this method exists.
  Fix FileResource test
  fixed wrong usage of unset()
  [HttpFoundation] Fixed the way path to directory is trimmed.
  [Console] Fixed argument parsing when a single dash is passed.
2013-09-13 14:20:47 +02:00
Fabien Potencier
33e9571886 Merge branch '2.2' into 2.3
* 2.2:
  [FrameworkBundle][Security] Replaced void return type with null for consistency
  fixed CS
  NativeSessionStorage regenerate
  removed unneeded comment
  Use setTimeZone if this method exists.
  Fix FileResource test
  fixed wrong usage of unset()
  [HttpFoundation] Fixed the way path to directory is trimmed.
  [Console] Fixed argument parsing when a single dash is passed.

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
2013-09-13 14:20:37 +02:00
Fabien Potencier
96165bc404 merged branch jakzal/dockblock-void-null-fix (PR #9026)
This PR was squashed before being merged into the 2.2 branch (closes #9026).

Discussion
----------

[FrameworkBundle][Security] Replaced void return type with null for consistency

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

We're using `null` everywhere else.

Commits
-------

e4100ac [FrameworkBundle][Security] Replaced void return type with null for consistency
2013-09-13 14:06:45 +02:00
Jakub Zalas
e4100ac2fa [FrameworkBundle][Security] Replaced void return type with null for consistency 2013-09-13 14:06:44 +02:00
Fabien Potencier
b96c40e570 fixed CS 2013-09-13 12:12:19 +02:00
Fabien Potencier
1271a4cdee merged branch lancergr/ticket_8460 (PR #8969)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8969).

Discussion
----------

[HttpFoundation] NativeSessionStorage regenerate

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

Since session_start is called by the regenerate function, then the 'started' flag of NativeSessionStorage have to be set to true. Otherwise, the variable $_SESSION is initiated and the exception "Failed to start the session: already started by PHP ($_SESSION is set)." is thrown.

This can be reproduced by clearing the session data (cookies) before authenticating with a method that does not require csrf (eg. using the confirmation link of FOSUserBundle).

Commits
-------

7a0eeb3 [HttpFoundation] NativeSessionStorage regenerate
2013-09-13 12:11:19 +02:00
lancergr
958ec09285 NativeSessionStorage regenerate 2013-09-13 12:11:17 +02:00
Fabien Potencier
68c9c86652 removed unneeded comment 2013-09-13 10:55:12 +02:00
Fabien Potencier
bce839e937 merged branch dropfen/master (PR #9015)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9015).

Discussion
----------

Fix #6029 : Use setTimeZone if this method exists.

The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.

Commits
-------

7d84cd7 Use setTimeZone if this method exists.
2013-09-13 10:52:43 +02:00
dropfen
0d6af5cd90 Use setTimeZone if this method exists.
The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.
2013-09-13 10:52:42 +02:00
Fabien Potencier
7d7b583851 merged branch jakzal/console-single-dash-argument (PR #9014)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fixed argument parsing when a single dash is passed.

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

Commits
-------

42019f6 [Console] Fixed argument parsing when a single dash is passed.
2013-09-13 07:13:53 +02:00
Fabien Potencier
27423104aa merged branch adrienbrault/patch-1 (PR #9016)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9016).

Discussion
----------

[Config] Fix FileResource test

I had the following test failing on OS X before:

```
There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml
+/private/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml

symfony/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php:56
```

Commits
-------

76a5b50 [Config] Fix FileResource test
2013-09-13 07:11:26 +02:00
Adrien Brault
124cb17625 Fix FileResource test
I had the following test failing on OS X before:

There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
2013-09-13 07:11:26 +02:00
Fabien Potencier
56250d3bdc merged branch jakzal/file-bugfix (PR #9019)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Fixed the way path to directory is trimmed

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

Commits
-------

773e716 [HttpFoundation] Fixed the way path to directory is trimmed.
2013-09-13 07:10:30 +02:00
Fabien Potencier
81fafe990a merged branch adrienbrault/twig-bridge-tests (PR #9017)
This PR was merged into the master branch.

Discussion
----------

TwigBridge: fix tests when run standalone

Hey,

I was trying to run the tests only for the TwigBridge, but the stopwatch dependency was missing.

Commits
-------

8718d19 TwigBridge: fix tests when run standalone
2013-09-13 07:08:20 +02:00
Fabien Potencier
4135f6803b fixed wrong usage of unset() 2013-09-13 07:05:55 +02:00
Jakub Zalas
773e7161bf [HttpFoundation] Fixed the way path to directory is trimmed. 2013-09-12 23:34:38 +01:00
Adrien Brault
8718d19438 TwigBridge: fix tests when run standalone 2013-09-12 15:07:35 -07:00
Jakub Zalas
42019f6774 [Console] Fixed argument parsing when a single dash is passed. 2013-09-12 21:51:59 +01:00
Fabien Potencier
860151ee8e Merge branch '2.3'
* 2.3:
  [WebProfilerBundle] fixed toolbar for IE8 (refs #8380)
  [HttpFoundation] removed double-slashes (closes #8388)
  [HttpFoundation] tried to keep the original Request URI as much as possible to avoid different behavior between ::createFromGlobals() and ::create()
  [TwigBridge] fixed form rendering when used in a template with dynamic inheritance
2013-09-12 22:07:33 +02:00
Fabien Potencier
8899e31a88 Merge branch '2.2' into 2.3
* 2.2:
  [HttpFoundation] removed double-slashes (closes #8388)
  [HttpFoundation] tried to keep the original Request URI as much as possible to avoid different behavior between ::createFromGlobals() and ::create()
  [TwigBridge] fixed form rendering when used in a template with dynamic inheritance
2013-09-12 22:07:23 +02:00
Fabien Potencier
097b376309 [WebProfilerBundle] fixed toolbar for IE8 (refs #8380) 2013-09-12 22:07:01 +02:00
Fabien Potencier
af20ad5ad2 merged branch kbond/patch-1 (PR #9013)
This PR was merged into the master branch.

Discussion
----------

[FrameworkBundle] Added comment about http_method_override and HttpCache

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

Commits
-------

52d2bdd Added comment about http_method_override and HttpCache
2013-09-12 22:01:06 +02:00
Kevin Bond
52d2bdd3f4 Added comment about http_method_override and HttpCache 2013-09-12 15:54:09 -04:00
Fabien Potencier
b591419631 [HttpFoundation] removed double-slashes (closes #8388) 2013-09-12 20:46:44 +02:00
Fabien Potencier
7b93e20e37 merged branch fabpot/request-uri-unification (PR #9012)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] tried to keep the original Request URI as much as possible to avoid different behavior between ::createFromGlobals() and ::create()

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

Commits
-------

4f5b8f0 [HttpFoundation] tried to keep the original Request URI as much as possible to avoid different behavior between ::createFromGlobals() and ::create()
2013-09-12 20:21:33 +02:00
Fabien Potencier
4f5b8f04f1 [HttpFoundation] tried to keep the original Request URI as much as possible to avoid different behavior between ::createFromGlobals() and ::create() 2013-09-12 20:10:57 +02:00
Fabien Potencier
8e5a9b056c merged branch fabpot/twig-form-renderer-fix (PR #9010)
This PR was merged into the 2.2 branch.

Discussion
----------

[TwigBridge] fixed form rendering when used in a template with dynamic inheritance

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

Commits
-------

4c1dbc7 [TwigBridge] fixed form rendering when used in a template with dynamic inheritance
2013-09-12 18:11:03 +02:00
Fabien Potencier
4c1dbc75d5 [TwigBridge] fixed form rendering when used in a template with dynamic inheritance 2013-09-12 17:53:10 +02:00
Fabien Potencier
5b71e61d15 Merge branch '2.3'
* 2.3:
  [HttpKernel] added a check for private event listeners/subscribers
  [FrameworkBundle] fixed registration of the register listener pass
  [Form] Fixed regression causing invalid "WHERE id IN ()" statements
  [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
  [Form] Fixed regression in BooleanToStringTransformer from ed83752
  [FrameworkBundle] removed obsolete code
  [Process] Close unix pipes before calling `proc_close` to avoid a deadlock
  [Process] Fix process merge in 2.3
  [Intl] made RegionBundle and LanguageBundle merge fallback data when using a country-specific locale
2013-09-12 14:59:51 +02:00
Fabien Potencier
0f78175dcd Merge branch '2.2' into 2.3
* 2.2:
  [HttpKernel] added a check for private event listeners/subscribers
  [FrameworkBundle] fixed registration of the register listener pass
  [Form] Fixed regression causing invalid "WHERE id IN ()" statements
  [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
  [Form] Fixed regression in BooleanToStringTransformer from ed83752
  [FrameworkBundle] removed obsolete code
  [Process] Close unix pipes before calling `proc_close` to avoid a deadlock

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/Process/Process.php
2013-09-12 14:57:47 +02:00
Fabien Potencier
6c10b6966d merged branch fabpot/event-services-check (PR #9006)
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed registration of private event listeners/subscribers

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

When registering a private event subscriber/listener, the listener was just ignored.

This PR does two things to fix the problem:

 * the event listener pass is done earlier to get access to the private services
 * when a private service is identified, a proper exception is thrown

Commits
-------

8444339 [HttpKernel] added a check for private event listeners/subscribers
427ee19 [FrameworkBundle] fixed registration of the register listener pass
2013-09-12 14:49:21 +02:00
Fabien Potencier
84443392df [HttpKernel] added a check for private event listeners/subscribers 2013-09-12 14:41:57 +02:00
Fabien Potencier
427ee19195 [FrameworkBundle] fixed registration of the register listener pass 2013-09-12 14:30:12 +02:00
Fabien Potencier
035a6e40c9 merged branch fabpot/sc-tags-check (PR #9004)
This PR was merged into the master branch.

Discussion
----------

[DependencyInjection] added tags validation when compiling a container

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

When using YAML or XML, the tags validadity are checked during loading, but when using PHP, that's not possible.
So, the added step in the compilation phase does that nicely.

Commits
-------

5cad478 [DependencyInjection] added tags validation when compiling a container
2013-09-12 14:27:48 +02:00
Fabien Potencier
8aec247dc3 merged branch fabpot/circular-refs-php-dumper (PR #8999)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)

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

Commits
-------

ce7de37 [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
2013-09-12 14:24:44 +02:00
Fabien Potencier
e0ef289363 fixed typoss 2013-09-12 12:56:56 +02:00
Fabien Potencier
5cad478c64 [DependencyInjection] added tags validation when compiling a container 2013-09-12 12:52:36 +02:00
Fabien Potencier
ee05995bd5 merged branch bschussek/issue8981-regression (PR #9001)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed regression causing invalid "WHERE id IN ()" statements

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

Commits
-------

867b81a [Form] Fixed regression causing invalid "WHERE id IN ()" statements
2013-09-12 10:33:00 +02:00
Bernhard Schussek
867b81af5a [Form] Fixed regression causing invalid "WHERE id IN ()" statements 2013-09-12 10:17:07 +02:00
Fabien Potencier
ce7de37f16 [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
This circular reference cannot be detected by the compiler pass as we
don't check for method arguments there.

The Container itself already detects such circular references at runtime.

So this fix is about circular references that are not detected at
compile time, and are not even detected at runtime because the code that
would cause the detection is never run (generated after a return
statement.)
2013-09-12 09:51:05 +02:00
Fabien Potencier
447fa2d321 merged branch bschussek/issue8989 (PR #9000)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed regression in BooleanToStringTransformer

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

Commits
-------

2747bdc [Form] Fixed regression in BooleanToStringTransformer from ed83752
2013-09-12 09:30:02 +02:00
Bernhard Schussek
2747bdca76 [Form] Fixed regression in BooleanToStringTransformer from ed83752 2013-09-12 09:25:54 +02:00
Fabien Potencier
610301d5e0 [FrameworkBundle] removed obsolete code 2013-09-12 06:41:55 +02:00