Commit Graph

22202 Commits

Author SHA1 Message Date
Remi Collet af420c120d avoid duplicated path with addPrefix 2015-10-06 17:11:44 +02:00
Fabien Potencier 380e2ba103 minor #16131 [2.7] Fix docblocks about callables (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Fix docblocks about callables

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

Commits
-------

7b12fe9 [2.7] Fix docblocks about callables
2015-10-06 17:07:22 +02:00
Nicolas Grekas b362c961f7 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
2015-10-06 17:02:37 +02:00
Fabien Potencier dd385402ec bug #16146 [Security] sync translations and add a test for it (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] sync translations and add a test for it

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

Commits
-------

08333ec [Security] sync translations and add a test for it
2015-10-06 16:57:43 +02:00
Christian Flothmann 08333ecb11 [Security] sync translations and add a test for it 2015-10-06 16:47:20 +02:00
Fabien Potencier 2539af63ad minor #16145 [FrameworkBundle] Fix deps=low/high tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix deps=low/high tests

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

Commits
-------

26ca3dc [FrameworkBundle] Fix deps=low/high tests
2015-10-06 16:42:38 +02:00
Fabien Potencier 4d57d587c1 minor #14491 [2.3][SECURITY] Add remember me cookie configuration (klaascuvelier)
This PR was squashed before being merged into the 2.3 branch (closes #14491).

Discussion
----------

[2.3][SECURITY] Add remember me cookie configuration

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

Commits
-------

e8f0e5a [2.3][SECURITY] Add remember me cookie configuration
2015-10-06 16:28:56 +02:00
Klaas Cuvelier e8f0e5afd8 [2.3][SECURITY] Add remember me cookie configuration 2015-10-06 16:28:55 +02:00
Nicolas Grekas 26ca3dc6c2 [FrameworkBundle] Fix deps=low/high tests 2015-10-06 16:14:42 +02:00
Nicolas Grekas 99bf879559 Merge branch '2.3' into 2.7 2015-10-06 14:56:09 +02:00
Nicolas Grekas 2b35f38d06 minor #16141 [FrameworkBundle] [Security] Remove trans from the security/core in 2.3 & dir loading (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] [Security] Remove trans from the security/core in 2.3 & dir loading

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

See https://github.com/symfony/symfony/pull/16139#discussion_r41238804.

I think the most efficient solution is to remove translations from `Security/Core` in 2.3 only (should not be propagated to newest branches!) and load both folders if they exist.

Commits
-------

1ed07a0 [FrameworkBundle] [Security] Remove trans from the security/core in 2.3 & dir loading
2015-10-06 14:54:17 +02:00
maxime.steinhausser 1ed07a09d8 [FrameworkBundle] [Security] Remove trans from the security/core in 2.3 & dir loading 2015-10-06 14:29:32 +02:00
Nicolas Grekas 8d3bf0348e [Console] Fix merge 2015-10-06 10:54:15 +02:00
Nicolas Grekas 04f1363bfb Merge branch '2.3' into 2.7 2015-10-06 10:50:12 +02:00
Nicolas Grekas ea10f2415e minor #16139 [FrameworkBundle] Fix translations dir discovery (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix translations dir discovery

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

Commits
-------

f37ceef [FrameworkBundle] Fix translations dir discovery
2015-10-06 10:49:56 +02:00
Nicolas Grekas f37ceef819 [FrameworkBundle] Fix translations dir discovery 2015-10-06 10:41:18 +02:00
Nicolas Grekas 209047ea79 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Process/Process.php
2015-10-06 10:31:51 +02:00
Nicolas Grekas 59d8220724 minor #16138 [Security\Core] Fix test failure after sebastianbergmann/phpunit#1821 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security\Core] Fix test failure after sebastianbergmann/phpunit#1821

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

See sebastianbergmann/phpunit#1821

Commits
-------

742547c [Security\Core] Fix test failure after sebastianbergmann/phpunit#1821
2015-10-06 10:21:54 +02:00
Nicolas Grekas 742547c099 [Security\Core] Fix test failure after sebastianbergmann/phpunit#1821 2015-10-06 09:59:00 +02:00
Nicolas Grekas 7b12fe982b [2.7] Fix docblocks about callables 2015-10-06 09:34:35 +02:00
Fabien Potencier 1f2a51106f minor #16130 Fix docblocks about callables (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix docblocks about callables

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

Commits
-------

a25beb6 Fix docblocks about callables
2015-10-06 08:16:33 +02:00
Fabien Potencier fd75cfe076 bug #16133 compatibility with Security component split (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

compatibility with Security component split

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

The FrameworkBundle in version 2.3 can be used with recent versions of
the Security component. However, after the Security component has been
split with Symfony 2.4, translations resources have been moved to the
`symfony/security-core` package. Thus, the changed location must be
taken into account.

Commits
-------

7bc836c compatibility with Security component split
2015-10-06 08:04:40 +02:00
Christian Flothmann 7bc836cc72 compatibility with Security component split
The FrameworkBundle in version 2.3 can be used with recent versions of
the Security component. However, after the Security component has been
split with Symfony 2.4, translations resources have been moved to the
`symfony/security-core` package. Thus, the changed location must be
taken into account.
2015-10-05 23:08:59 +02:00
Fabien Potencier 136722c9b0 bug #16123 Command list ordering fix (spdionis, fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Command list ordering fix

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

Makes sure that global commands are always first.

Commits
-------

2984f8e fixed previous commit
70f2b3e global commands are always first in command list
2015-10-05 22:39:07 +02:00
Fabien Potencier 416d6eb9dd minor #16132 [SecurityBundle] Remove duplicated require-dev (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] Remove duplicated require-dev

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

Commits
-------

1ecbc67 [SecurityBundle] Remove duplicated require-dev
2015-10-05 21:22:37 +02:00
ogizanagi 1ecbc67238 [SecurityBundle] Remove duplicated require-dev 2015-10-05 19:46:50 +02:00
Nicolas Grekas a25beb623d Fix docblocks about callables 2015-10-05 19:32:31 +02:00
Fabien Potencier 2984f8ed60 fixed previous commit 2015-10-05 17:47:05 +02:00
Fabien Potencier d657834bd0 Merge branch '2.3' into 2.7
* 2.3:
  [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1]
  [ci] Use current PHP_BINARY when running ./phpunit
  Fixed typos
  [UPGRADE-3.0] fix bullet indentation
  [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
2015-10-05 17:17:54 +02:00
Fabien Potencier 9becf27d5c minor #16121 [ci] Use current PHP_BINARY when running ./phpunit (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Use current PHP_BINARY when running ./phpunit

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

This allows to easilly test with several php versions.
I also added an auto-install of composer and the deps when they are not here.
Should ease on-boarding devs to running tests.

Commits
-------

41aecbe [ci] Use current PHP_BINARY when running ./phpunit
2015-10-05 17:17:26 +02:00
Fabien Potencier 0c5f017d8e minor #16119 Fixed typos (pborreli)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed typos

Following #16098

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

f5802c2 Fixed typos
2015-10-05 17:12:44 +02:00
Fabien Potencier 1c4ea85787 bug #14842 [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] (MacDada)
This PR was squashed before being merged into the 2.3 branch (closes #14842).

Discussion
----------

[Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1]

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

* test now always pass "secure" and "httponly" options, as they are required
* could be considered BC, but [`RememberMeFactory` passes them](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php#L21), so they should've always been treated as required
* I can squash the commits before merging
* Alternative solution: #14843

Commits
-------

18b1c6a [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1]
2015-10-05 16:40:32 +02:00
Dawid Nowak 18b1c6a235 [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] 2015-10-05 16:40:29 +02:00
Fabien Potencier d3b8176bc3 bug #13627 [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing (issei-m)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing

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

When a user has changed own password, I want to logout any sessions which is authenticated by its user except changer itself.

[DaoAuthenticationManager::checkAuthentication()](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php#L59) method seems to concern about it.

But, this situation actually never happens because both users that will be passed to this method are always identical in re-authentication.
It's because the token refreshes own user via [ContextListener](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Http/Firewall/ContextListener.php#L90) before re-authentication.

Commits
-------

729902a [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
2015-10-05 16:30:38 +02:00
spdionis 70f2b3eb8c global commands are always first in command list 2015-10-05 15:59:45 +02:00
Nicolas Grekas 41aecbe510 [ci] Use current PHP_BINARY when running ./phpunit 2015-10-05 14:41:13 +02:00
Fabien Potencier 2455b69bf9 minor #16118 [UPGRADE-3.0] fix bullet indentation (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[UPGRADE-3.0] fix bullet indentation

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

Those points aren't related to the previous one.

Commits
-------

028d336 [UPGRADE-3.0] fix bullet indentation
2015-10-05 12:53:43 +02:00
Pascal Borreli f5802c2251 Fixed typos 2015-10-05 10:36:28 +01:00
maxime.steinhausser 028d3361ed [UPGRADE-3.0] fix bullet indentation 2015-10-05 10:42:37 +02:00
Fabien Potencier 2c46204001 Merge branch '2.3' into 2.7
* 2.3:
  Fix PropertyAccessor modifying array in object when array key does not exist
2015-10-05 09:28:51 +02:00
Fabien Potencier 58bf830020 bug #16090 Fix PropertyAccessor modifying array in object when array key does no… (pierredup)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix PropertyAccessor modifying array in object when array key does no…

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

Commits
-------

f24c678 Fix PropertyAccessor modifying array in object when array key does not exist
2015-10-05 09:23:57 +02:00
Tobias Schultze d1f50c5dee bug #16092 [Process] Throw exception if tempnam returns false (pierredup)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Throw exception if tempnam returns false

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

Commits
-------

cc854e6 Throw exception if tempnam returns false
2015-10-04 17:54:32 +02:00
Tobias Schultze 3e019c42ab Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/Process/ProcessPipes.php
2015-10-04 17:52:32 +02:00
Tobias Schultze af2768c2d1 bug #16111 Throw exception if tempnam returns false in ProcessPipes (pierredup)
This PR was merged into the 2.3 branch.

Discussion
----------

Throw exception if tempnam returns false in ProcessPipes

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

Related to #16092

Commits
-------

1425b8a Throw exception if tempnam returns false in ProcessPipes
2015-10-04 17:49:48 +02:00
Pierre du Plessis 1425b8adb0 Throw exception if tempnam returns false in ProcessPipes 2015-10-04 17:41:50 +02:00
Pierre du Plessis cc854e6d23 Throw exception if tempnam returns false 2015-10-03 22:13:32 +02:00
Pierre du Plessis f24c678027 Fix PropertyAccessor modifying array in object when array key does not exist 2015-10-03 22:00:22 +02:00
Tobias Schultze 8e3a4223a2 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
2015-10-03 18:41:23 +02:00
Fabien Potencier ad2e85eac8 minor #16091 [Form] remove obsolete deprecation comments (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] remove obsolete deprecation comments

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

These comments are obsolete and wrong.

Commits
-------

dd50645 [Form] remove obsolete deprecation comments
2015-10-03 08:25:54 +02:00
Fabien Potencier 2e386b3ca1 bug #16087 Fixing typo in variable name (yceruto)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16087).

Discussion
----------

Fixing typo in variable name

```php
foreach ($reflectionClass->getProperties() as $property) {
    if (!isset($attributeMetadata[$property->name])) {
        $attributesMetadata[$property->name] = new AttributeMetadata($property->name);
        $classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
    }

    if ($property->getDeclaringClass()->name === $className) {
        foreach ($this->reader->getPropertyAnnotations($property) as $groups) {
            if ($groups instanceof Groups) {
                foreach ($groups->getGroups() as $group) {
                    $attributesMetadata[$property->name]->addGroup($group);
                }
            }

            $loaded = true;
        }
    }
}
```

This `$attributeMetadata` does not exists in this `foreach` context and the goal of this condition could be unexpected.

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

Commits
-------

89499ff Fixing typo in variable name
2015-10-03 08:19:38 +02:00