Commit Graph

13418 Commits

Author SHA1 Message Date
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
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
Trent Steel
17aaf84c1c Prepend Child Bundle paths before the parent 2013-12-31 19:00:11 +01:00
FlorianLB
c4aaa38d8b [Routing] add unit tests for Symfony\Component\Routing\RequestContext class 2013-12-31 16:41:26 +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
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
Peter Rehm
eb27d50e01 Fixed CSS 2013-12-31 08:58:55 +01:00
Kamil Kokot
f5fee9ac9b [Intl] Added round support for ROUND_CEILING, ROUND_FLOOR, ROUND_DOWN, ROUND_UP 2013-12-31 08:52:30 +01:00
Joseph Bielawski
38287e76ed [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class 2013-12-31 00:31:44 +01:00
Luis Cordova
0556f718a7 addressed == -> === suggestion 2013-12-30 18:30:14 -05:00
Fabien Potencier
63d226db12 minor #9897 fixed some PSR-0 class names (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed some PSR-0 class names

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

Commits
-------

a38e2c0 fixes PSR-0 issues in tests
2013-12-30 22:38:15 +01:00
Fabien Potencier
b70503ce70 bug #9899 [Filesystem | WCM] 9339 fix stat on url for filesystem copy (cordoval)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem | WCM] 9339 fix stat on url for filesystem copy

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

supersedes https://github.com/symfony/symfony/pull/9863

Commits
-------

4fba412 adjusted behavior to always copy override on url files
2013-12-30 22:31:05 +01:00
Sébastien Lavoie
a2358e04bc Fixed #9020 - Added support for collections in service#parameters 2013-12-30 22:18:20 +01:00
Fabien Potencier
a38e2c042b fixes PSR-0 issues in tests 2013-12-30 22:13:42 +01:00
Luis Cordova
4fba412761 adjusted behavior to always copy override on url files 2013-12-30 11:15:58 -05:00
Kamil Kokot
dbb7e78af1 Skips test that need full lib-intl. 2013-12-30 07:16:13 +01:00
Fabien Potencier
37813bd7c3 Merge branch '2.3' into 2.4
* 2.3:
  fix some cs
  use restore_error_handler instead of set_error_handler($previous)
  fix #9321 Crawler::addHtmlContent add gbk encoding support
  [Console] fixed column width when using the Table helper with some decoration in cells
  [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.
  Fix for cache-key conflict when having a \Traversable as choices
  [Security] removed obsolete comment

Conflicts:
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Security/Tests/Http/Firewall/ExceptionListenerTest.php
2013-12-29 21:33:52 +01:00
Fabien Potencier
6d4174227d bug #9889 [Console] fixed column width when using the Table helper with some decoration in cells (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] fixed column width when using the Table helper with some decoration in cells

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

This PR fixes the same issue as #9366 but works in all situations (all kind of styles, when the string is shorter than any other one or larger than any other ones, ...).

I'm not very satisfied with the fix and especially the `computeLengthWithoutDecoration` method, but the whole helper should be rethought to make it stateless (out of the scope of this PR).

Commits
-------

5b4d057 [Console] fixed column width when using the Table helper with some decoration in cells
2013-12-29 21:20:53 +01:00
bronze1man
e26e564b64 fix some cs 2013-12-29 19:30:30 +01:00
bronze1man
461412ca12 use restore_error_handler instead of set_error_handler($previous) 2013-12-29 19:30:30 +01:00
bronze1man
acb2df0842 fix #9321 Crawler::addHtmlContent add gbk encoding support 2013-12-29 19:30:30 +01:00
Fabien Potencier
5b4d057b58 [Console] fixed column width when using the Table helper with some decoration in cells 2013-12-29 18:21:38 +01:00
Fabien Potencier
0285bfde5d bug #8997 [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. (pawaclawczyk)
This PR was squashed before being merged into the 2.3 branch (closes #8997).

Discussion
----------

[Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.

<table>
  <tr>
    <td><b>Q</b></td>
    <td><b>A</b></td>
  </tr>
  <tr>
    <td>Bug fix?</td>
    <td>yes</td>
  </tr>
  <tr>
    <td>New feature</td>
    <td>no</td>
  </tr>
  <tr>
    <td>BC breaks?</td>
    <td>no</td>
  </tr>
  <tr>
    <td>Deprecations?</td>
    <td>no</td>
  </tr>
  <tr>
    <td>Tests pass?</td>
    <td>yes</td>
  </tr>
  <tr>
    <td>Fixed tickets</td>
    <td>#3085, #8974</td>
  </tr>
  <tr>
    <td>License</td>
    <td>MIT</td>
  </tr>
  <tr>
    <td>Doc PR</td>
    <td>n/a</td>
  </tr>
</table>

Problem occurs while user is impersonated. Authentication process generates new token and doeas not preserve role ```ROLE_PREVIOUS_ADMIN```. Ex. when parameter ```security.always_authenticate_before_granting``` is enabled.

Commits
-------

a7baa3b [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.
2013-12-29 16:53:43 +01:00
Paweł Wacławczyk
a7baa3b7c2 [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. 2013-12-29 16:53:42 +01:00
Daan van Renterghem
d6163a8ac2 Fix for cache-key conflict when having a \Traversable as choices 2013-12-29 16:35:40 +01:00
Fabien Potencier
28e9e0631c [Security] removed obsolete comment 2013-12-29 15:45:35 +01:00
Fabien Potencier
206c610bde [Security] simplified some unit tests 2013-12-29 15:44:35 +01:00
Fabien Potencier
26b5cf3e4e Merge branch '2.3' into 2.4
* 2.3:
  [Security] made code easier to understand, added some missing unit tests
  [DependencyInjection] fixed InlineServiceDefinitionsPass to not inline a service if it's part of the current definition (to avoid an infinite loop)
  [DomCrawler] Fixed creating form objects from form nodes.
  disabled php.ini changes when using HHVM in .travis.yml
  [Process] fixed HHVM support
  Add support for HHVM in the getting of the PHP executable
  [Security] fixed error 500 instead of 403 if previous exception is provided to AccessDeniedException
2013-12-29 15:43:38 +01:00
Fabien Potencier
e9d12dd520 bug #9879 [Security] Fix ExceptionListener to catch correctly AccessDeniedException if is not first exception (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix ExceptionListener to catch correctly AccessDeniedException if is not first exception

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

Same as #9823 but with some refactoring of the code and with some unit tests.

When merging to 2.4, the unit tests can be simplified a bit.

Commits
-------

172fd63 [Security] made code easier to understand, added some missing unit tests
616b6c5 [Security] fixed error 500 instead of 403 if previous exception is provided to AccessDeniedException
2013-12-29 15:41:33 +01:00
Fabien Potencier
172fd6366f [Security] made code easier to understand, added some missing unit tests 2013-12-29 15:40:38 +01:00
Fabien Potencier
c63bbe958d bug #9885 [Dependencyinjection] Fixed handling of inlined references in the AnalyzeServiceReferencesPass (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Dependencyinjection] Fixed handling of inlined references in the AnalyzeServiceReferencesPass

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

Hopefully a better fix for #9829 (ping @jakzal). Unit tests coming soon.

In some cases `InlineServiceDefinitionsPass` replaces a Reference with a service Definition. In such scenarios `AnalyzeServiceReferencesPass` was falling into an infinite loop.

Commits
-------

d650295 [DependencyInjection] fixed InlineServiceDefinitionsPass to not inline a service if it's part of the current definition (to avoid an infinite loop)
2013-12-29 15:28:28 +01:00
Fabien Potencier
d6502952b4 [DependencyInjection] fixed InlineServiceDefinitionsPass to not inline a service if it's part of the current definition (to avoid an infinite loop) 2013-12-29 15:15:37 +01:00
Jakub Zalas
72d6322e25 [DomCrawler] Fixed creating form objects from form nodes. 2013-12-29 12:48:17 +01:00
Fabien Potencier
876482f1a6 [Process] fixed HHVM support 2013-12-29 09:14:19 +01:00
Joel Marcey
539de177ca Add support for HHVM in the getting of the PHP executable 2013-12-29 09:11:01 +01:00
Fabien Potencier
3a1d2200b0 Merge branch '2.3' into 2.4
* 2.3:
  fixed typos
  Fixed deprecated method calls
  Add testing against HHVM at Travis-CI
  Fixed typo
  Fixed typo
  fixed acronyms
  [Validator] Fixed IBAN validator with 0750447346 value

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2013-12-28 22:39:51 +01:00
Fabien Potencier
5ff5615fb5 fixed typos 2013-12-28 22:34:46 +01:00
Fabien Potencier
fac711c5f9 minor #9353 [2.3] Removed deprecated calls (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Removed deprecated calls

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

Commits
-------

a6562b3 Fixed deprecated method calls
2013-12-28 17:31:57 +01:00