Commit Graph

15434 Commits

Author SHA1 Message Date
Martin Hasoň
d0c1db82fa Fixed the registration of validation.xml file when the form is disabled 2013-11-28 08:03:21 +01:00
Fabien Potencier
be0a3102cc bug #9625 [HttpFoundation] Do not return an empty session id if the session was closed (Taluu)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Do not return an empty session id if the session was closed

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

A regression from the bug fix #9246 was introduced due to an incomplete fix ;

As the `started` flag on the NativeSessionStorage was not `true` anymore when saving the session, the session id was always empty when saving it, and thus when sending the `PHPSESSID` cookie.

The previous PR I made (#9530) was another approach to solve this regression, but this one should keep the fix made by @tecbot on #9246, and finish it with another verification. I may miss another place where `started` is used, but I don't really see which other conditions depending on this property should be altered...

**Note : this is #9611 rebased on 2.2**

This should be mergeable.

Commits
-------

5b9a727 When getting the session's id, check if the session is not closed
2013-11-28 07:56:59 +01:00
Fabien Potencier
5307874aa5 minor #9636 [Translation] Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase (ismailasci)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9636).

Discussion
----------

[Translation] Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase

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

Commits
-------

2669486 [Translation] Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase
2013-11-28 07:43:59 +01:00
Ismail Asci
6141837628 Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase 2013-11-28 07:43:58 +01:00
Fabien Potencier
9651e403e2 bug #9637 [Validator] Replaced inexistent interface (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Replaced inexistent interface

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

`ClassMetadataFactoryInterface` was removed in 2.3 (#6096) and replaced with `MetadataFactoryInterface`.

Commits
-------

8fd3256 [Validator] Replaced inexistent interface.
2013-11-28 07:42:01 +01:00
Jakub Zalas
8fd3256248 [Validator] Replaced inexistent interface.
ClassMetadataFactoryInterface was removed in 2.3 and replaced with MetadataFactoryInterface.
2013-11-28 00:06:02 +00:00
Baptiste "Talus" Clavié
5b9a727705 When getting the session's id, check if the session is not closed
This introduced a regression from #9246, with an incomplete fix ;
As the `started` flag on the NativeSessionStorage was not `true`
anymore when saving the session, the session id was always empty
when saving it, and thus when sending the `PHPSESSID` cookie
2013-11-27 10:30:56 +01:00
Fabien Potencier
7921772901 bug #9605 Adjusting CacheClear Warmup method to namespaced kernels (rdohms)
This PR was merged into the 2.3 branch.

Discussion
----------

Adjusting CacheClear Warmup method to namespaced kernels

Backported the patch in #9525 to the 2.3 branch.

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | have not tried yet
| License       | MIT
| Fixed tickets | further fixes #1431

My kernel has been moved and namespaced to `Cfs\Bundle\MultiSiteBundle\Kernel\CfsKernel`. This worked fine until a change was made to how the kernel temp stuff is handled in the warmup phase.

When the app generates its own cache (i.e you run cache without warmup and access the site) everything is generated ok and the .meta files generate the proper reference to the FQN of the Kernel.

However if the warmup is used, it uses `Cfs\Bundle\MultiSiteBundle\Kernel\CfsKerne_` as the temporary Kernel, and when it does "fix references to the Kernel in .meta files" it generates 2 errors.

1. It does not use a string safe tempKernel name, so it never finds the reference to the kernel
2. If you fix that, then it replaces the FQN of the tempKernel with `CfsKernel`, the non-namespaced name of the proper Kernel (it also leaves the character count wrong in the serialization `C:43:<class>` where 43 is the char count for the FQN above)

The two changes above fix this, by escaping the string and replacing it with a FQN Kernel Class name.

What are your thoughts on this? If this sounds reasonable i'll do further enhancements and check tests.

Commits
-------

00d79d5 Adjusting CacheClear Warmup method to namespaced kernels
2013-11-26 18:12:57 +01:00
Fabien Potencier
da90eb911d minor #9616 Fixed mistake in upgrade docu (theaxel)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9616).

Discussion
----------

Fixed mistake in upgrade docu

Commits
-------

821006b Fixed mistake in upgrade docu
2013-11-26 13:40:10 +01:00
Axel K
3a2ae3861b Fixed mistake in upgrade docu 2013-11-26 13:40:10 +01:00
Fabien Potencier
40b5314acc bug #9610 Container::camelize also takes backslashes into consideration (ondrejmirtes)
This PR was submitted for the 2.4 branch but it was merged into the 2.3 branch instead (closes #9610).

Discussion
----------

Container::camelize also takes backslashes into consideration

I [complained](https://github.com/symfony/symfony/pull/8494) about unreported and unnoticed BC break.

Service names in our DI container contain backslashes and that pull request rendered newer versions of Symfony unusable for us.

This commit fixes this - it normalizes backslashes in service names into underscores.

Commits
-------

0f9bb0a Container::camelize also takes backslashes into consideration
2013-11-25 16:01:27 +01:00
Ondrej Mirtes
e30a7d072d Container::camelize also takes backslashes into consideration 2013-11-25 16:01:27 +01:00
Fabien Potencier
222564c0b0 fixed typos 2013-11-25 16:00:46 +01:00
Fabien Potencier
19caa6a311 fixed @expectedException class names 2013-11-25 15:52:16 +01:00
Fabien Potencier
e0b751a2d8 Merge branch '2.2' into 2.3
* 2.2:
  fixed some typos
  fixed @expectedException class names

Conflicts:
	src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
	src/Symfony/Component/Console/Tests/Command/CommandTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
2013-11-25 15:49:41 +01:00
Fabien Potencier
763c8aa09b minor #9603 Fixed some typos (fabpot)
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed some typos

Commits
-------

5c6edb3 fixed some typos
8d69bb5 fixed @expectedException class names
2013-11-25 15:47:45 +01:00
Rafael Dohms
00d79d559d Adjusting CacheClear Warmup method to namespaced kernels
Backported the patch in #9525 to the 2.3 branch.
2013-11-25 11:32:15 +01:00
Fabien Potencier
5c6edb3685 fixed some typos 2013-11-25 11:21:43 +01:00
Fabien Potencier
8d69bb5886 fixed @expectedException class names 2013-11-25 09:44:14 +01:00
Fabien Potencier
1fabf4dc52 minor #9599 [Validator] Typo and better wording for german validator translation (Danez)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9599).

Discussion
----------

[Validator] Typo and better wording for german validator translation

Follow up of #9588 as supposed by @craue

Commits
-------

263b618 Typo and better wording for german validator translation
2013-11-24 19:25:33 +01:00
Daniel Tschinder
2fe9cd351a Typo and better wording for german validator translation 2013-11-24 19:25:32 +01:00
Fabien Potencier
dfc54f9e96 Merge branch '2.2' into 2.3
* 2.2:
  No Entity Manager defined exception
  fixed CS
  [Acl] Fix for issue #9433
  [Validator] fix docblock typos
  [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class
  Fix mistake in translation's service definition.
  if handler_id is identical to null fix
  CS fix
  Fixed ModelChoiceList tests in Propel1 bridge.
  [AclProvider] Fix incorrect behaviour when partial results returned from cache
  Check if the pipe array is empty before calling stream_select()
  re-factor Propel1 ModelChoiceList
  [Locale] fixed the failing test described in #9455
  [Process] fix phpdoc and timeout of 0
  bug #9445 [BrowserKit] fixed protocol-relative url redirection

Conflicts:
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
2013-11-23 22:11:41 +01:00
Fabien Potencier
c66aaa91fe minor #9588 Add missing german translation for validators (Danez)
This PR was merged into the 2.3 branch.

Discussion
----------

Add missing german translation for validators

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

Some validators do not have german translation yet.

Commits
-------

11fd126 Add german translation for several validators (Greater/Equal/Less)
2013-11-23 18:55:27 +01:00
Daniel Tschinder
11fd126f15 Add german translation for several validators (Greater/Equal/Less) 2013-11-23 18:11:09 +01:00
Fabien Potencier
3c5a863330 bug #9447 [BrowserKit] fixed protocol-relative url redirection (jong99)
This PR was merged into the 2.2 branch.

Discussion
----------

[BrowserKit] fixed protocol-relative url redirection

Fixed redirects to protocol relative URLs, e.g. //www.example.org.  Previously the code would treat this as a relative URL.

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

Commits
-------

e8b5c84 bug #9445 [BrowserKit] fixed protocol-relative url redirection
2013-11-22 18:44:10 +01:00
Fabien Potencier
ccf0575ebd bug #9535 No Entity Manager defined exception (armetiz)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9535).

Discussion
----------

No Entity Manager defined exception

This PR is linked to this issue : https://github.com/symfony/symfony/issues/9534

Commits
-------

719ccb7 No Entity Manager defined exception
2013-11-22 18:33:29 +01:00
Thomas Tourlourat
af98688f94 No Entity Manager defined exception 2013-11-22 18:33:29 +01:00
Fabien Potencier
0e57c7b757 fixed CS 2013-11-22 18:23:33 +01:00
Fabien Potencier
90dfc9ee08 bug #9485 [Acl] Fix for issue #9433 (guilro)
This PR was squashed before being merged into the 2.2 branch (closes #9485).

Discussion
----------

[Acl] Fix for issue #9433

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

Two new test for issue #9433 :
`testUpdateAclInsertingMultipleObjectFieldAcesThrowsDBConstraintViolations()`
`testUpdateAclDeletingObjectFieldAcesThrowsDBConstraintViolations()`

The change to `updateAces()` line 857 is enough to make the first test succeed. When changing the `order` field value to a higher value, we must first change the value of the next entry (and all the next entries recursively) to preserve uniqueness of the `order` field in the database.

All the other changes are for the second test. In the former `updateAcl()` method, we commit the changes of the existing ACEs to the database before deleting or adding the new ones. We must delete the old ACEs before changing the existing ACEs in order to preserve uniqueness of the `order` field in the database.

Commits
-------

a38fab9 [Acl] Fix for issue #9433
2013-11-22 18:20:31 +01:00
Guillaume Royer
a38fab9b83 [Acl] Fix for issue #9433 2013-11-22 18:20:31 +01:00
Fabien Potencier
0434c7435d minor #9466 [Process] fix phpdoc and timeout of 0 (Tobion)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process] fix phpdoc and timeout of 0

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

getTimeout says it returns null when it's disabled. But passing 0 or 0.0 also disabled timeouts. So it should be treated as null as well. also it says it returns integer whereas it returns float.

Commits
-------

1758010 [Process] fix phpdoc and timeout of 0
2013-11-22 18:11:04 +01:00
Fabien Potencier
be0a605fc0 bug #9516 [AclProvider] Fix incorrect behavior when partial results returned from cache (superdav42)
This PR was merged into the 2.2 branch.

Discussion
----------

[AclProvider] Fix incorrect behavior when partial results returned from cache

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

[AclProvider] Fix incorrect behavior when partial results returned from cache

findAcls wasn't throwing the NotAllAclsFoundException with the partial result when some acls were retrieved from the cache. This will fix that behavior. Ideally we would update it to cache items that were not found so it wouldn't have to query the db every time for non existent items, but I'm not sure if that is possible.
I'm not sure if the ACL cache is being used very much, I didn't find any docs about it but it seems to work except for this issue. It might be more appropriate to merge the fix in master if no one is relying on it to work in 2.2.

Commits
-------

edae59c [AclProvider] Fix incorrect behaviour when partial results returned from cache
2013-11-22 18:06:22 +01:00
Fabien Potencier
5e034fa3a2 minor #9554 [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class (hhamon)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class

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

Commits
-------

7730d8d [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class
2013-11-22 18:05:49 +01:00
Fabien Potencier
a22a95caeb minor #9555 [Validator] fix docblock typos (shieldo)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] fix docblock typos

Commits
-------

8d32c9c [Validator] fix docblock typos
2013-11-21 07:12:57 +01:00
Fabien Potencier
21fa63532e bug #9352 [Intl] make currency bundle merge fallback locales when accessing data, ... (shieldo)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] make currency bundle merge fallback locales when accessing data, ...

...allowing use of country-specific locales

Fixes #9262.

Commits
-------

edc287b [Intl] make currency bundle merge fallback locales when accessing data, allowing use of country-specific locales
2013-11-21 07:11:51 +01:00
Douglas Greenshields
8d32c9cd0b [Validator] fix docblock typos 2013-11-20 18:57:15 +00:00
Hugo Hamon
7730d8d393 [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class 2013-11-20 19:23:10 +01:00
Fabien Potencier
a77cc5728b minor #9521 CS fix (peterkokot)
This PR was merged into the 2.2 branch.

Discussion
----------

CS fix

I hope this is not BC break though handler_id checking should be done with identical comparison operator I believe.

Commits
-------

1b6b1e9 if handler_id is identical to null fix
2013-11-19 19:31:08 +01:00
Fabien Potencier
61a0230743 minor #9520 CS fix (peterkokot)
This PR was merged into the 2.2 branch.

Discussion
----------

CS fix

Commits
-------

f348731 CS fix
2013-11-19 19:30:37 +01:00
Fabien Potencier
8a13ba606e minor #9526 [HttpFoundation] Removed useless check if self::$trustProxies is set (Danez)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9526).

Discussion
----------

[HttpFoundation] Removed useless check if self::$trustProxies is set

In Request::getClientIps() on line 772 there is a check if self::$trustedProxies is not set. If this condition evaluates to true the method will return.
Because of this, the second identical check on line 783 will never evaluate to true.

Commits
-------

21f2aee [HttpFoundation] Removed useless check if self::$trustProxies is set
2013-11-19 19:28:41 +01:00
Daniel Tschinder
5b3b40c044 Removed useless check if self::$trustProxies is set
In Request::getClientIps() on line 772 there is a check if self::$trustedProxies is not set. If this condition evaluates to true the method will return.
Because of this the second identical check on line 783 will never evaluate to true, as when reaching this position self::$trustedProxies must be set.
2013-11-19 19:28:40 +01:00
Fabien Potencier
aabd8fca3c bug #9537 [FrameworkBundle] Fix mistake in translation's service definition. (phpmike)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #9537).

Discussion
----------

[FrameworkBundle] Fix mistake in translation's service definition.

Wrong class parameter fixed.

Commits
-------

b542e84 [FrameworkBundle] Fix mistake in translation's service definition.
2013-11-19 19:26:27 +01:00
Michaël VEROUX
5719d84ae4 Fix mistake in translation's service definition. 2013-11-19 19:26:27 +01:00
Peter Kokot
1b6b1e9bfb if handler_id is identical to null fix 2013-11-17 15:05:15 +01:00
Peter Kokot
f3487312b7 CS fix 2013-11-17 14:39:12 +01:00
Fabien Potencier
805ea3e6cb minor #9517 [2.2] Fixed ModelChoiceList tests in Propel1 bridge (jakzal)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] Fixed ModelChoiceList tests in Propel1 bridge

Tests on 2.2 are broken since #9469 was merged.

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

Commits
-------

1e2d14e Fixed ModelChoiceList tests in Propel1 bridge.
2013-11-16 14:25:39 +01:00
Jakub Zalas
1e2d14ebb5 Fixed ModelChoiceList tests in Propel1 bridge. 2013-11-16 13:14:05 +00:00
David Stone
edae59c242 [AclProvider] Fix incorrect behaviour when partial results returned from cache 2013-11-15 12:54:31 -07:00
Fabien Potencier
2375046a64 bug #9367 [Process] Check if the pipe array is empty before calling stream_select() (jfposton)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9367).

Discussion
----------

[Process] Check if the pipe array is empty before calling stream_select()

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

ProcessPipes generates a warning frequently which can cause issues for custom shutdown functions. Adding a check to see if the pipe array is empty should be functionally equivalent without having to generate the error.

Fixes: #9280

Commits
-------

12f95e2 [Process] Check if the pipe array is empty before calling stream_select()
2013-11-15 17:36:12 +01:00
Jonathan Poston
52a18ea163 Check if the pipe array is empty before calling stream_select() 2013-11-15 17:36:11 +01:00