Commit Graph

16079 Commits

Author SHA1 Message Date
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
415e0d06df minor #9542 unify and fix callable phpdoc throughout symfony (Tobion)
This PR was merged into the master branch.

Discussion
----------

unify and fix callable phpdoc throughout symfony

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

I unified the phpdoc to use "callable" as type. It wasn't done consistently. It varied between mixed, callback, callable.
I think callable is best because php 5.4 even has a typehint callable.

Commits
-------

6d5ddce unify and fix callable phpdoc throughout symfony
2013-11-22 17:55:47 +01:00
Fabien Potencier
8d8b3db758 feature #9546 [FrameworkBundle] use the new request_stack service in the GlobalVariables object (hhamon)
This PR was merged into the master branch.

Discussion
----------

[FrameworkBundle] use the new request_stack service in the GlobalVariables object

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

Commits
-------

9c2ce49 [FrameworkBundle] use the new request_stack object in the GlobalVariables object
2013-11-22 17:52:08 +01:00
Fabien Potencier
60eb4f630d bug #9566 [Console] Revert BC-break for verbose option value (chEbba)
This PR was merged into the master branch.

Discussion
----------

[Console] Revert BC-break for verbose option value

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

Closes #9285

----

PR #8835 "fixed" the input value for verbosity option with `VALUE_OPTIONAL`. And syntax like
```
cli.php -v command
cli.php --verbose command
```
Is broken now, because `ArgvInput` tries to use argument as verbose value (#9285).
For now i added a test for this case and revert this changes.

Commits
-------

432bbe1 [Console] Revert a28eb8 because of BC break
5e03e9a [Console] Add test for --verbose before argument
2013-11-22 17:23:52 +01:00
Fabien Potencier
f00146f5bf minor #9563 [Security] optimized ExpressionVoter (fabpot)
This PR was merged into the master branch.

Discussion
----------

[Security] optimized ExpressionVoter

Commits
-------

a8c74d1 [Security] optimized ExpressionVoter
2013-11-22 14:54:43 +01:00
Fabien Potencier
a8c74d1880 [Security] optimized ExpressionVoter 2013-11-22 14:45:43 +01:00
Kirill chEbba Chebunin
432bbe1af8 [Console] Revert a28eb8 because of BC break 2013-11-22 04:30:18 +04:00
Kirill chEbba Chebunin
5e03e9ad72 [Console] Add test for --verbose before argument 2013-11-22 04:30:09 +04:00
Fabien Potencier
e49ca36120 bug #9553 [FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class (hhamon)
This PR was merged into the master branch.

Discussion
----------

[FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class

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

Commits
-------

2e07338 [FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class
2013-11-21 18:10:54 +01:00
Hugo Hamon
2e07338c5c [FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class 2013-11-21 11:59:04 +01:00
Fabien Potencier
95b2d02ce9 feature #9541 [Translation] make IdentityTranslater consistent with normal translator (Tobion)
This PR was merged into the master branch.

Discussion
----------

[Translation] make IdentityTranslater consistent with normal translator

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

The MessageSelector should not be required in the constructor of the IdentityTranslator because it's also optional for the [Translator](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Translation/Translator.php#L64).
I also fixed the TranslatorInterface phpdoc and the IdentityTranslator params similar to 90a20d7835

Commits
-------

7cdb260 [Translation] make IdentityTranslater consistent with normal translator
2013-11-21 08:05:43 +01:00
Fabien Potencier
bb7ac471de minor #9540 [Security] Added a missing field in SimpleAuthenticationHandler (jakzal)
This PR was squashed before being merged into the master branch (closes #9540).

Discussion
----------

[Security] Added a missing field in SimpleAuthenticationHandler

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

Added tests and made a small CS fix as a bonus.

Btw, the properties are protected. Do we really want to provide extension points here?

Commits
-------

d553347 [Security] Added a missing field in SimpleAuthenticationHandler
2013-11-21 07:37:18 +01:00
Jakub Zalas
d553347549 [Security] Added a missing field in SimpleAuthenticationHandler 2013-11-21 07:37:18 +01:00
Fabien Potencier
b5cacc54cc bug #9536 [FrameworkBundle] Update 2 dependencies (currently broken) (asm89)
This PR was squashed before being merged into the master branch (closes #9536).

Discussion
----------

[FrameworkBundle] Update 2 dependencies (currently broken)

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

## Dependency on http-foundation

In b1a062d232 the `RequestStack` was moved to `http-foundation`, because of this the `framework-bundle` now also depends on `http-foundation`: b1a062d232 (diff-3) (at least in services.xml).

We got an error while installing the framework-bundle `2.4.*` with `prefer-stable` in our composer.json. We currently get framework-bundle 2.4 with http-kernel and http-foundation 2.3. An alternative fix would be raising the requirement of http-kernel to 2.4, but I think this is the "purest" declaration of dependencies.

Update 1
## Dependency on config

In 05e9ca7509 the config component was updated with an xml reference dumper for configuration. In the same commit the frameworkbundle dump command is updated to make use of the 2 newly introduced classes. It is currently possible to get an installation with config `2.3`, which in turn leads to an exception when running the dump-reference command:

```
 $ app/console config:dump-reference framework
# Default configuration for extension with alias: "framework"
PHP Fatal error:  Class 'Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper
```

Update 2
## Dependency on http-kernel
We just found out that the dependency on http-kernel should also be updated to `2.4`. That's because the framework-bundle injects the `RequestStack` now and doesn't set the request on the `RouterListener` service anymore. Without updating the dependency it is possible to get a `RouterListener` that is not aware of the request stack (< 2.4) and none of your routes will work.

*tests are failing because of some race condition I guess?*

Commits
-------

fe5d8f8 [FrameworkBundle] Update 2 dependencies (currently broken)
2013-11-21 07:34:10 +01:00
Alexander
fe5d8f86a8 [FrameworkBundle] Update 2 dependencies (currently broken) 2013-11-21 07:34:10 +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
Hugo Hamon
9c2ce49d92 [FrameworkBundle] use the new request_stack object in the GlobalVariables object 2013-11-20 13:37:49 +01:00
Tobias Schultze
6d5ddce9a4 unify and fix callable phpdoc throughout symfony 2013-11-20 10:25:10 +01:00
Tobias Schultze
7cdb26066f [Translation] make IdentityTranslater consistent with normal translator 2013-11-20 03:31:35 +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
8d85745430 minor #9518 Fixed typos (pborreli)
This PR was merged into the master branch.

Discussion
----------

Fixed typos

Commits
-------

8ebf7c5 Fixed typos
2013-11-19 19:29:47 +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
Fabien Potencier
1a992908f1 minor #9531 Add missing dependency to expression-language (armetiz)
This PR was merged into the master branch.

Discussion
----------

Add missing dependency to expression-language

Add missing dependency, without this dependency, PHPUnit can't run successfully.

Commits
-------

4206e98 Add missing dependency to expression-language
2013-11-19 19:25:17 +01:00
Fabien Potencier
c18ba190cf Merge pull request #9532 from fzaninotto/bug_trait_executable
Remove executable bit on ContainerAwareTrait PHP file
2013-11-19 10:12:24 -08:00
Francois Zaninotto
76efcc7f8c Remove executable bit on PHP file 2013-11-19 14:48:58 +01:00
Thomas Tourlourat
4206e98f01 Add missing dependency to expression-language 2013-11-19 14:20:36 +01:00
Fabien Potencier
4f51f0f1c3 bug #9529 [ExpressionLanguage] Fixed conflict between punctation and range (WouterJ)
This PR was squashed before being merged into the master branch (closes #9529).

Discussion
----------

[ExpressionLanguage] Fixed conflict between punctation and range

The range operator (`..`) was actually lexed as 2 punctations (`.`). That causes any expression using the range to fail.

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

Commits
-------

b521dc5 [ExpressionLanguage] Fixed conflict between punctation and range
2013-11-18 22:05:18 +01:00
Wouter J
b521dc5ace [ExpressionLanguage] Fixed conflict between punctation and range 2013-11-18 22:05:18 +01:00
Rafael Dohms
9e7788ea80 Cache Warmup Breaks Namespaced Kernel
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?
2013-11-18 11:39:25 +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
4e9332b6b6 minor #9519 [Debug] Fixed a typo. (jakzal)
This PR was merged into the master branch.

Discussion
----------

[Debug] Fixed a typo.

@pborreli style ;)

Commits
-------

df90c62 [Debug] Fixed a typo.
2013-11-17 09:45:14 +01:00
Jakub Zalas
df90c623f9 [Debug] Fixed a typo. 2013-11-16 18:00:51 +00:00
Pascal Borreli
8ebf7c5515 Fixed typos 2013-11-16 15:13:54 +00: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