Commit Graph

8546 Commits

Author SHA1 Message Date
Fabien Potencier
4c0b44ee44 fixed lexing expression ending with spaces 2013-11-28 07:52:02 +01:00
Romain Neutron
55a76e78f0 [HttpKernel] Fix profiler event-listener usage outside request stack context 2013-11-27 18:32:46 +01:00
Jérôme Tamarelle
f2d4b323d4 Fix undefined offset when formatting namespace suggestions 2013-11-27 10:10:40 +01:00
Fabien Potencier
990267f959 Merge branch '2.3' into 2.4
* 2.3:
  Fixed mistake in upgrade docu
  Container::camelize also takes backslashes into consideration
  fixed typos
  fixed @expectedException class names
  fixed some typos
  fixed @expectedException class names
  Typo and better wording for german validator translation
2013-11-26 17:40:27 +01:00
Hugo Hamon
d1e5006df4 [HttpKernel] fixed regression introduced in 2.4 in the base DataCollector class. Added more unit tests coverage for the RequestDataCollector object. 2013-11-26 13:58:53 +01:00
Fabien Potencier
a5408b0a2a bumped Symfony version to 2.4.0 2013-11-25 22:22:41 +01:00
Fabien Potencier
32ceb0b89c updated VERSION for 2.4.0-RC1 2013-11-25 20:35:53 +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
Dorian Villet
ec43a0caf2 Fix an issue when overriding Client::setServerParameters() and using the getContainer() method in it. 2013-11-25 13:34:16 +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
Catalin Dan
087403b71d [Security] Typos in Security's ExpressionLanguage 2013-11-24 19:29:24 +01:00
Daniel Tschinder
2fe9cd351a Typo and better wording for german validator translation 2013-11-24 19:25:32 +01:00
Fabien Potencier
43becff31d Merge branch '2.3'
* 2.3: (24 commits)
  Add german translation for several validators (Greater/Equal/Less)
  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
  Removed useless check if self::$trustProxies is set
  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()
  [Intl] fixed datetime test as described in #9455
  bumped Symfony version to 2.3.8
  updated VERSION for 2.3.7
  updated CHANGELOG for 2.3.7
  re-factor Propel1 ModelChoiceList
  [Form] Added method Form::getClickedButton() to remove memory leak in FormValidator
  [Locale] fixed the failing test described in #9455
  ...

Conflicts:
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
	src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
	src/Symfony/Bridge/Propel1/Tests/Propel1TestCase.php
	src/Symfony/Component/Form/Tests/CompoundFormTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Process/Process.php
2013-11-23 22:17:02 +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
Daniel Tschinder
11fd126f15 Add german translation for several validators (Greater/Equal/Less) 2013-11-23 18:11:09 +01:00
Fabien Potencier
b81494133d [DomCrawler] fixed a PHPDoc 2013-11-23 08:20:18 +01:00
Alexander Obuhovich
13168bcbeb Fixes attr method returning empty string for missing attributes 2013-11-23 08:18:27 +01:00
Fabien Potencier
d8893c4d64 bug #9565 [Debug] Fixed ClassNotFoundFatalErrorHandler which could cause a fatal error (jakzal)
This PR was merged into the master branch.

Discussion
----------

[Debug] Fixed ClassNotFoundFatalErrorHandler which could cause a fatal error

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

It might happen that `require_once` will include a file second time (for example with links or case-changed paths). Therefore we need to check if a class exists before requiring the file.

I also removed an unused argument from two methods (`$loader`).

Commits
-------

0baae4c [Debug] Fixed ClassNotFoundFatalErrorHandler which could cause a fatal error.
2013-11-23 08:01:41 +01:00
Jakub Zalas
0baae4cde6 [Debug] Fixed ClassNotFoundFatalErrorHandler which could cause a fatal error.
It might happen that require_once will include a file second time (for
example with links or case-changed paths). Therefore we need to check
if a class exists before requiring the file.
2013-11-22 20:12:05 +00: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
b74a887cd9 minor #9487 unify constructor initialization style throughout symfony (Tobion)
This PR was merged into the master branch.

Discussion
----------

unify constructor initialization style 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

In almost all classes symfony uses property initialization when the value is static. Constructor initialization is only used for things that actually have logic, like passed parameters or dynamic values. IMHO it makes the code much more readable because property definition, phpdoc and default value is in one place. Also one can easily see what the constructor implements for logic like overridden default value of a parent class. Otherwise the real deal is just hidden behind 10 property initializations. One more advantage is that it requires less code. As you can see, the code was almost cut in half (210 additions and 395 deletions).
I unified it accordingly across symfony. Sometimes it was [not even consistent within one class](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Config/Definition/BaseNode.php#L32). At the same time I recognized some errors like missing parent constructor call, or undefined properties or private properties that are not even used.

I then realized that a few Kernel tests were not passing because they were deeply implementation specific like modifying booted flag with a custom `KernelForTest->setIsBooted();`. I improved and refactored the kernel tests in the __second commit__.

__Third commit__ unifies short ternary operator, e.g. `$foo ?: new Foo()`. __Forth commit__ unifies missing parentheses, e.g. `new Foo()`.

Commits
-------

077a089 unify missing parentheses
2888594 unify short ternary operator
2a9daff [HttpKernel] better written kernel tests
111ac18 unify constructor initialization style throughout symfony
2013-11-22 18:42:00 +01:00
Fabien Potencier
efff757e24 fixed CS 2013-11-22 18:29:47 +01:00
Fabien Potencier
572c3bb900 minor #9481 [HttpFoundation] fixed the issue described in #9480 (andremaha)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] fixed the issue described in #9480

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

Commits
-------

7d35ce3 [HttpFoundation] fixed the issue described in #9480
2013-11-22 18:25:24 +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
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
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
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
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
Jakub Zalas
d553347549 [Security] Added a missing field in SimpleAuthenticationHandler 2013-11-21 07:37:18 +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
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
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
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
Francois Zaninotto
76efcc7f8c Remove executable bit on PHP file 2013-11-19 14:48:58 +01:00
Wouter J
b521dc5ace [ExpressionLanguage] Fixed conflict between punctation and range 2013-11-18 22:05:18 +01:00
Peter Kokot
f3487312b7 CS fix 2013-11-17 14:39:12 +01:00