Commit Graph

16250 Commits

Author SHA1 Message Date
Paweł Wacławczyk
a7baa3b7c2 [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. 2013-12-29 16:53:42 +01:00
Fabien Potencier
be01e34ed5 bug #9557 [DoctrineBridge] Fix for cache-key conflict when having a \Traversable as choices (DRvanR)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9557).

Discussion
----------

[DoctrineBridge] Fix for cache-key conflict when having a \Traversable as choices

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

Commits
-------

1119684 Fix for cache-key conflict when having a \Traversable as choices
2013-12-29 16:35:40 +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
fd5a2d09bc Merge branch '2.4'
* 2.4:
  [Security] simplified some unit tests
  [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:45:01 +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
7fc0a53e0d bug #9884 [DomCrawler] Fixed creating form objects from named form nodes (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed creating form objects from named form nodes

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

Commits
-------

72d6322 [DomCrawler] Fixed creating form objects from form nodes.
2013-12-29 15:19:10 +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
20a0fe79e5 minor #9883 disabled php.ini changes when using HHVM in .travis.yml (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

disabled php.ini changes when using HHVM in .travis.yml

Commits
-------

78bfd3a disabled php.ini changes when using HHVM in .travis.yml
2013-12-29 12:20:12 +01:00
Fabien Potencier
78bfd3a12d disabled php.ini changes when using HHVM in .travis.yml 2013-12-29 11:46:47 +01:00
Fabien Potencier
83eea20bd8 bug #9882 Add support for HHVM in the getting of the PHP executable (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Add support for HHVM in the getting of the PHP executable

| 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

Same as #9583 but with CS fixed, on 2.3, and with an added safeguard to only change the current behavior for HHVM.

Check for a PHP_BINARY environment variable before using the pre-defined PHP_BINARY constant.

HHVM has an explicit hhvm binary and a wrapper to mimic php functionality. We were running into issues with tests that ran in their own process where using the hhvm binary does not handle php code sent to it via stdin very well. We get "Nothing to do...pass file" exceptions. Unfortunately, the PHP_BINARY is always set to the explicit binary (the php wrapper is basically a symlink to the explicit binary). So, we thought about adding a check for a PHP_BINARY environment variable as the first choice when getting the PHP binary.

Commits
-------

876482f [Process] fixed HHVM support
539de17 Add support for HHVM in the getting of the PHP executable
2013-12-29 11:05:23 +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
7d80045b22 Merge branch '2.4'
* 2.4:
  fixed typos
  Fixed deprecated method calls
  Add testing against HHVM at Travis-CI
  Fixed typo
  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:40:48 +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
a1ae7033c9 minor #9878 fixed typos (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed typos

| 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

Hope @pborreli is not going to be too jealous about all those typo fixes ;)

Commits
-------

5ff5615 fixed typos
2013-12-28 22:39:04 +01:00
Fabien Potencier
5ff5615fb5 fixed typos 2013-12-28 22:34:46 +01:00
Fabien Potencier
f063108bfe feature #9814 [EventDispatcher] Added TraceableEventDispatcher from HttpKernel (florianv)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[EventDispatcher] Added TraceableEventDispatcher from HttpKernel

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

Moved the reusable parts from the `TraceableEventDispatcher` from `HttpKernel` to the same class in `EventDispatcher` to allow debugging dispatchers.

I changed the `TraceableEventDispatcherInterface` to extend `EventDispatcherInterface`, so this is a BC break but I'm not sure if a lot of people use it without actually extending it.

Commits
-------

9a90e06 [EventDispatcher] Added TraceableEventDispatcher from HttpKernel
2013-12-28 22:32:28 +01:00
florianv
9a90e0621c [EventDispatcher] Added TraceableEventDispatcher from HttpKernel 2013-12-28 20:38:07 +01:00
Fabien Potencier
0b0c431cd1 feature #9833 [Bridge] [DoctrineExtension] Allow cache drivers that are not an EM's child (FabioBatSilva)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Bridge] [DoctrineExtension] Allow cache drivers that are not an EM's child

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [yes]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes|]
| Fixed tickets | []
| License       | MIT
| Doc PR        | [https://github.com/doctrine/doctrine2/pull/808, https://github.com/doctrine/DoctrineBundle/pull/224]

Commits
-------

7528e4c Allow cache drivers that are not an EM's child
2013-12-28 18:40:57 +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
Tomasz Szymczyk
616b6c5227 [Security] fixed error 500 instead of 403 if previous exception is provided to AccessDeniedException 2013-12-28 17:11:12 +01:00
Wouter J
a6562b36c4 Fixed deprecated method calls 2013-12-28 17:01:14 +01:00
Fabien Potencier
c33341df09 bug #9850 [Validator] Fixed IBAN validator with 0750447346 value (stewe)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed IBAN validator with 0750447346 value

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

Commits
-------

cf88ba5 [Validator] Fixed IBAN validator with 0750447346 value
2013-12-28 14:42:37 +01:00
Fabien Potencier
f0d9af022d feature #9876 [Serializer] error handling inconsistencies fixed in the serializer decoders (fabpot)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Serializer] error handling inconsistencies fixed in the serializer decoders

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

see #9586 for the original PR

Commits
-------

a1ab939 [Serializer] fixed CS
6d9f0be Json encoder classes now throws UnexpectedValueException as XML classes
2013-12-28 13:23:53 +01:00
Fabien Potencier
a1ab939c35 [Serializer] fixed CS 2013-12-28 13:20:23 +01:00
Rodrigo Díez Villamuera
6d9f0be0a0 Json encoder classes now throws UnexpectedValueException as XML classes 2013-12-28 13:14:12 +01:00
Fabien Potencier
9a93efacd6 minor #9761 Add testing against HHVM at Travis-CI (stloyd)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9761).

Discussion
----------

Add testing against HHVM at Travis-CI

Commits
-------

a4d1095 Add testing against HHVM at Travis-CI
2013-12-28 12:44:15 +01:00
Joseph Bielawski
ce7b019fd7 Add testing against HHVM at Travis-CI 2013-12-28 12:44:05 +01:00
Fabien Potencier
8dca5fcb4c minor #9875 Fixed typo (pborreli)
This PR was squashed before being merged into the 2.3 branch (closes #9875).

Discussion
----------

Fixed typo

| 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
-------

660ab38 Fixed typo
2013-12-28 12:31:17 +01:00
Pascal Borreli
660ab38648 Fixed typo 2013-12-28 12:31:17 +01:00
Fabien Potencier
79fe1090e3 minor #9874 Fixed typo (pborreli)
This PR was merged into the 2.4 branch.

Discussion
----------

Fixed typo

| 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
-------

c3d5721 Fixed typo
2013-12-28 12:30:48 +01:00
Fabien Potencier
976cdcc364 minor #9873 Fixed typo (pborreli)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9873).

Discussion
----------

Fixed typo

| 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
-------

025ae7a Fixed typo
2013-12-28 12:29:52 +01:00
Pascal Borreli
55f765b21b Fixed typo 2013-12-28 12:29:51 +01:00
Pascal Borreli
c3d5721295 Fixed typo 2013-12-28 10:23:21 +00:00
Fabien Potencier
350656334f minor #9872 fixed acronyms (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed acronyms

| 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
-------

15baa81 fixed acronyms
2013-12-28 10:08:46 +01:00
Fabien Potencier
15baa81fdc fixed acronyms 2013-12-28 09:33:14 +01:00
Fabien Potencier
f9dff0616b Merge branch '2.4'
* 2.4:
  fixed CS
  fixed a typo
  fixed CS for lambdas
  [Yaml] fixed some license headers
  Fixes message value for objects
  Check for hour, minute & second validity
  avoid tables to have apparently long blank line breaks and be too far appart for long nested array params
  fixed various typos
  [Filesystem] Fixed mirror for symlinks
  [Validator] Removed duplicated test for IBAN in data provider
2013-12-28 09:12:58 +01:00
Fabien Potencier
b04b0eba38 fixed CS 2013-12-28 09:12:49 +01:00
Fabien Potencier
d87d8daa36 Merge branch '2.3' into 2.4
* 2.3:
  fixed a typo
  fixed CS for lambdas
  [Yaml] fixed some license headers
  Fixes message value for objects
  Check for hour, minute & second validity
  fixed various typos
  [Filesystem] Fixed mirror for symlinks
  [Validator] Removed duplicated test for IBAN in data provider

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
2013-12-28 09:12:03 +01:00
Fabien Potencier
ec9c6e054a minor #9871 [Yaml] fixed some license headers (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fixed some license headers

| 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

Fixes lambdas once and for all.

Commits
-------

a2a6bd4 fixed a typo
35b407f fixed CS for lambdas
93edf44 [Yaml] fixed some license headers
2013-12-28 09:02:05 +01:00
Fabien Potencier
a2a6bd4dff fixed a typo 2013-12-28 08:54:52 +01:00
Fabien Potencier
35b407f016 fixed CS for lambdas 2013-12-28 08:46:05 +01:00
Fabien Potencier
93edf44950 [Yaml] fixed some license headers 2013-12-28 08:37:38 +01:00
Fabien Potencier
c9dd348947 bug #9865 [Validator] Fixes message value for objects (jongotlin)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9865).

Discussion
----------

[Validator] Fixes message value for objects

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

Commits
-------

7b69e9b [Validator] Fixes message value for objects
2013-12-27 22:53:59 +01:00