Commit Graph

16111 Commits

Author SHA1 Message Date
Jakub Zalas
ade448cf10 [Console] Fixed command name guessing if an alternative is an alias. 2014-01-06 22:33:02 +00:00
Fabien Potencier
73edae9a79 Merge branch '2.3' into 2.4
* 2.3:
  [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
  [BrowserKit] Throw exception on invalid cookie expiration timestamp
  [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
2014-01-06 17:19:55 +01:00
Fabien Potencier
6e0848dce2 bug #9948 [WebProfilerBundle] Fixed profiler toolbar icons for XHTML. (rafalwrzeszcz)
This PR was squashed before being merged into the 2.3 branch (closes #9948).

Discussion
----------

[WebProfilerBundle] Fixed profiler toolbar icons for XHTML.

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

Profiler page itself is entirely autonomic, but toolbar is not - unfortunately currently it doesn't work in XHTML documents :(.

#9877 backported to `2.3` branch.

Commits
-------

296c4d1 [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
2014-01-06 17:19:21 +01:00
Rafał Wrzeszcz
296c4d1def [WebProfilerBundle] Fixed profiler toolbar icons for XHTML. 2014-01-06 17:19:20 +01:00
Fabien Potencier
956fa58227 bug #9933 Propel1 exception message (jaugustin)
This PR was merged into the 2.3 branch.

Discussion
----------

Propel1 exception message

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

This add exception message for `ModelChoiceList` and `ModelType` when `class` parameter is not provided or invalid

Commits
-------

047492f [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
2014-01-06 17:10:21 +01:00
Fabien Potencier
34c0f1bb0f bug #9949 [BrowserKit] Throw exception on invalid cookie expiration timestamp (anlutro)
This PR was squashed before being merged into the 2.3 branch (closes #9949).

Discussion
----------

[BrowserKit] Throw exception on invalid cookie expiration timestamp

Currently, if an invalid timestamp is provided, a fatal error with no stack trace will occur, making it difficult to trace the problem.

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

Commits
-------

8df535d [BrowserKit] Throw exception on invalid cookie expiration timestamp
2014-01-06 17:03:23 +01:00
Andreas
8df535dbf9 [BrowserKit] Throw exception on invalid cookie expiration timestamp 2014-01-06 17:03:23 +01:00
Fabien Potencier
def4d7cb93 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
2014-01-06 08:27:58 +01:00
Fabien Potencier
146e6663ef Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
This reverts commit 0af3d19c38, reversing
changes made to d56cc4b2cb.
2014-01-06 08:27:41 +01:00
Fabien Potencier
439664dabd bumped Symfony version to 2.4.2 2014-01-05 11:33:23 +01:00
Fabien Potencier
377a5fb23b updated VERSION for 2.4.1 2014-01-05 03:12:11 +01:00
Fabien Potencier
ae962797df updated CHANGELOG for 2.4.1 2014-01-05 03:12:05 +01:00
Fabien Potencier
8cc2414c96 Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.10
  updated VERSION for 2.3.9
  update CONTRIBUTORS for 2.3.9
  updated CHANGELOG for 2.3.9
  Add support SAPI cli-server
  Fix hardcoded listenerTag name in error message
  [HttpFoundation] Documented public properties.
  [Routing] add missing unit tests for Route and RouteCollection classes

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
2014-01-05 03:10:50 +01:00
Fabien Potencier
e7df0cfecd bumped Symfony version to 2.3.10 2014-01-05 03:02:33 +01:00
Fabien Potencier
ee1e0f2ef8 updated VERSION for 2.3.9 2014-01-05 02:24:54 +01:00
Fabien Potencier
e9356832fd update CONTRIBUTORS for 2.3.9 2014-01-05 02:24:39 +01:00
Fabien Potencier
08bd497e7d updated CHANGELOG for 2.3.9 2014-01-05 02:24:22 +01:00
Fabien Potencier
5a3a844fcc bug #9938 [Process] Add support SAPI cli-server (peter-gribanov)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9938).

Discussion
----------

[Process] Add support SAPI cli-server

As of PHP 5.4.0, the CLI SAPI provides a built-in web server.
```php
PHP_SAPI == 'cli-server'
```
PHP can be used portable without installation on PC. For example, the [assembly](http://windows.php.net/download/) does not require installation in the system on Windows. In this case `PHP_BINARY` contains the path to the PHP executor, and all the other search methods will not return result.

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

Commits
-------

92d8323 Add support SAPI cli-server
2014-01-05 02:14:12 +01:00
Peter Gribanov
3065f243ad Add support SAPI cli-server 2014-01-05 02:14:11 +01:00
Fabien Potencier
8fc0cfa442 bug #9940 [EventDispatcher] Fix hardcoded listenerTag name in error message (lemoinem)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9940).

Discussion
----------

[EventDispatcher] Fix hardcoded listenerTag name in error message

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

Just as the title say, there was a kernel.event_listener string hardcoded in an error message although everywhere else in this class it is stored in the `$listenerTag` property.

Commits
-------

8c91537 [EventDispatcher] Fix hardcoded listenerTag name in error message
2014-01-05 02:11:19 +01:00
Mathieu Lemoine
11c8b8d46c Fix hardcoded listenerTag name in error message 2014-01-05 02:10:45 +01:00
Fabien Potencier
b4a35ed119 minor #9928 [HttpFoundation] Documented public properties (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Documented public properties

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

`$request` and `$query` parameter bags could be hard to get for a newcommer, who's used to `$_POST` and `$_GET` variables. Some people claim naming makes no sense (see #9671).

For consistency I documented all public properties.

Commits
-------

1b79831 [HttpFoundation] Documented public properties.
2014-01-03 08:25:18 +01:00
jaugustin
047492fafa [Propel1Bridge][ModelChoiceList] add exception message for invalid classes 2014-01-02 22:55:16 +01:00
Jakub Zalas
1b798319f6 [HttpFoundation] Documented public properties. 2014-01-02 21:42:04 +00:00
Fabien Potencier
5519a3d948 minor #9925 [Routing] add missing unit tests for Route and RouteCollection classes (FlorianLB)
This PR was squashed before being merged into the 2.3 branch (closes #9925).

Discussion
----------

[Routing] add missing unit tests for Route and RouteCollection classes

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

Just add few unit tests in Route and RouteCollection classes to have a full coverage.

Commits
-------

7bbd568 [Routing] add missing unit tests for Route and RouteCollection classes
2014-01-02 13:27:25 +01:00
FlorianLB
7bbd56892d [Routing] add missing unit tests for Route and RouteCollection classes 2014-01-02 13:27:24 +01:00
Fabien Potencier
e5629d7987 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #9112 Prepend Child Bundle paths before the parent (trsteel88)"
2014-01-02 12:39:11 +01:00
Fabien Potencier
8c1735d5ff Revert "bug #9112 Prepend Child Bundle paths before the parent (trsteel88)"
This reverts commit cfa99a96dd, reversing
changes made to f8965b6499.
2014-01-02 12:38:40 +01:00
Fabien Potencier
e10d9e9da4 minor #9921 removed unneeded use statements (fabpot)
This PR was merged into the 2.4 branch.

Discussion
----------

removed unneeded use statements

Commits
-------

fd45c83 removed unneeded use statements
2014-01-01 10:15:51 +01:00
Fabien Potencier
051d2fb24f bug #9923 [DoctrineBridge] Fixed an issue with DoctrineParserCache (florianv)
This PR was merged into the 2.4 branch.

Discussion
----------

[DoctrineBridge] Fixed an issue with DoctrineParserCache

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

The `DoctrineParserCache` returns `false` when there is no entry (https://github.com/doctrine/cache/blob/master/lib/Doctrine/Common/Cache/Cache.php#L52).
But the `ExpressionLanguage` class expects `null` to be returned by the `ParserCacheInterface`, which causes the expressions to not be parsed when using a `DoctrineParserCache`.

Commits
-------

16728f7 [DoctrineBridge] Fixed an issue with DoctrineParserCache
2014-01-01 10:04:37 +01:00
Fabien Potencier
fd45c83eaf removed unneeded use statements 2014-01-01 10:02:49 +01:00
florianv
16728f7b9b [DoctrineBridge] Fixed an issue with DoctrineParserCache 2014-01-01 09:56:51 +01:00
Fabien Potencier
e0402bae65 Merge branch '2.3' into 2.4
* 2.3:
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2014-01-01 09:14:50 +01:00
Fabien Potencier
f36f666548 minor #9920 removed unneeded use statements (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

removed unneeded use statements

| Q             | A
| ------------- | ---
| License       | MIT

Commits
-------

7f9a366 removed unneeded use statements
2014-01-01 09:13:43 +01:00
Fabien Potencier
7f9a366529 removed unneeded use statements 2014-01-01 08:52:14 +01:00
Fabien Potencier
cfa99a96dd bug #9112 Prepend Child Bundle paths before the parent (trsteel88)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9112).

Discussion
----------

Prepend Child Bundle paths before the parent

This fixes #9085

Say you have AcmeDemoBundle and AppDemoBundle. AcmeDemoBundle is the parent of AppDemoBundle.

If you load templates using @AcmeDemoBundle/ControllerDir/template.html.twig it means that you cannot override the template in AppDemoBundle. The patch below prepends the AppDemoBundle Resources directory to the AcmeDemo namespace.

The namespace directories would not result in:

```
[AcmeDemo] => Array(
    [0] => [absolute-dir-here]/src/App/DemoBundle/Resources/views
    [1] => [absolute-dir-here]/app/Resources/AcmeDemoBundle/views
    [2] => [absolute-dir-here]/src/Acme/DemoBundle/Resources/views
)
```

Commits
-------

19fad88 Prepend Child Bundle paths before the parent
2013-12-31 19:00:11 +01:00
Trent Steel
17aaf84c1c Prepend Child Bundle paths before the parent 2013-12-31 19:00:11 +01:00
Fabien Potencier
f8965b6499 minor #9916 [Routing] add unit tests for Symfony\Component\Routing\RequestContext class (FlorianLB)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] add unit tests for Symfony\Component\Routing\RequestContext class

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

ATM, this class don't have its own unit tests. This PR fill this gap with a full coverage.

Commits
-------

c4aaa38 [Routing] add unit tests for Symfony\Component\Routing\RequestContext class
2013-12-31 18:06:28 +01:00
FlorianLB
c4aaa38d8b [Routing] add unit tests for Symfony\Component\Routing\RequestContext class 2013-12-31 16:41:26 +01:00
Fabien Potencier
7c727e4ea7 minor #9913 fixed PSR-0 issues (fabpot)
This PR was merged into the 2.4 branch.

Discussion
----------

fixed PSR-0 issues

| Q             | A
| ------------- | ---
| License       | MIT

Commits
-------

a901d73 fixed PSR-0 issues
2013-12-31 15:17:27 +01:00
Fabien Potencier
a901d73370 fixed PSR-0 issues 2013-12-31 14:47:12 +01:00
Fabien Potencier
35774da863 Merge branch '2.3' into 2.4
* 2.3:
  [Security] fixed pre/post authentication checks
  Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term.
  Fixed CSS
  [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class
  addressed == -> === suggestion
  Fixed #9020 - Added support for collections in service#parameters
  fixes PSR-0 issues in tests
  adjusted behavior to always copy override on url files
  Skips test that need full lib-intl.

Conflicts:
	src/Symfony/Component/Security/Acl/Tests/Permission/MaskBuilderTest.php
	src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php
	src/Symfony/Component/Security/Core/Tests/User/AccountCheckerTest.php
	src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php
	src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
	src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
	src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php
	src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememerMeTokenTest.php
	src/Symfony/Component/Security/Tests/Core/User/AccountCheckerTest.php
	src/Symfony/Component/Security/Tests/Core/User/InMemoryProviderTest.php
	src/Symfony/Component/Security/Tests/Core/User/InMemoryUserProviderTest.php
	src/Symfony/Component/Security/Tests/Core/User/UserCheckerTest.php
2013-12-31 14:43:26 +01:00
Fabien Potencier
323710a291 bug #9908 [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| BC breaks?    | no*
| Tests pass?   | yes
| Fixed tickets | #9903
| License       | MIT

\* as described in mentioned issue, before this PR there was thrown exception `UnexpectedValueException`, which was not correct, but I guess some people trying to hide the bug could use `try {} catch` on it.

Commits
-------

38287e7 [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class
2013-12-31 12:26:13 +01:00
Fabien Potencier
3704e08476 bug #9902 [Security] fixed pre/post authentication checks (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fixed pre/post authentication checks

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

After further investigation of #8510, I found that all checks in the `checkPreAuth` actually belongs to `checkPostAuth` and the same goes for checks in `CheckPostAuth` (I checked the original source from Spring and indeed, that's how it is implemented there: see https://github.com/spring-projects/spring-security/blob/master/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java#L305
).

So, this PR fixes that issue. I think that we can do this change safely in 2.3 as the error message is the same for all causes by default (`$hideUserNotFoundExceptions` is `true` by default in `UserAuthenticationProvider`).

The only "real" change is whether the authentication is checked or not.

Commits
-------

ada82a2 [Security] fixed pre/post authentication checks
2013-12-31 12:09:20 +01:00
Fabien Potencier
920c6814fe bug #9910 fixed missing use statements (fabpot)
This PR was merged into the 2.4 branch.

Discussion
----------

fixed missing use statements

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

Commits
-------

50a6d70 fixed missing use statements
2013-12-31 12:02:51 +01:00
Fabien Potencier
ada82a297a [Security] fixed pre/post authentication checks 2013-12-31 11:55:25 +01:00
Fabien Potencier
50a6d706c4 fixed missing use statements 2013-12-31 11:50:12 +01:00
Fabien Potencier
03ee37d11a minor #9909 [Validator] Updated lithuanian validator translation. (infro42)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9909).

Discussion
----------

[Validator] Updated lithuanian validator translation.

Updated lithuanian validator translation: changed 'vartotojas' to 'naudotojas' as it is more proper term.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| License       | MIT

Commits
-------

53a8621 Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term.
2013-12-31 11:35:31 +01:00
Aurelijus Rožėnas
b30083cebe Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term. 2013-12-31 11:35:30 +01:00
Fabien Potencier
85eb588bd0 minor #9478 Fixed CSS (peterrehm)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9478).

Discussion
----------

Fixed CSS

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

Commits
-------

95cc5b8 Fixed CSS
2013-12-31 08:58:55 +01:00