Commit Graph

25880 Commits

Author SHA1 Message Date
Nicolas Grekas
86c0a17721 Merge branch '2.3' into 2.7
* 2.3:
  [Validator] use correct term for a property in docblock (not "option")
  [PropertyAccess] Remove most ref mismatches to improve perf
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  Use XML_ELEMENT_NODE in nodeType check
  [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
  [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
  [FrameworkBundle] Add tests for the Controller class

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/PropertyAccess/PropertyPath.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
2016-03-22 09:55:46 +01:00
Fabien Potencier
d01a10651b bug #18224 [PropertyAccess] Remove most ref mismatches to improve perf (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Remove most ref mismatches to improve perf

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

This PR is for PHP5 where ref mismatches is a perf pain: it removes all ref mismatches along the "getValue" path, and keeps only the required ones on the "setValue" path.

Commits
-------

72940d7 [PropertyAccess] Remove most ref mismatches to improve perf
2016-03-21 09:49:16 -07:00
Fabien Potencier
46e82299e2 minor #18227 [Routing] small refactoring for scheme requirement (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] small refactoring for scheme requirement

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

Commits
-------

85f5e01 [Routing] small refactoring for scheme requirement
2016-03-21 06:55:59 -07:00
Fabien Potencier
dd7e05dd14 minor #18206 [FrameworkBundle][2.8] Add tests for the Controller class (dunglas)
This PR was squashed before being merged into the 2.8 branch (closes #18206).

Discussion
----------

[FrameworkBundle][2.8] Add tests for the Controller class

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

Backport tests of #18193 to the `abstract` Controller.

Commits
-------

5ee9f93 [FrameworkBundle][2.8] Add tests for the Controller class
2016-03-21 06:51:25 -07:00
Kévin Dunglas
5ee9f933bb [FrameworkBundle][2.8] Add tests for the Controller class 2016-03-21 06:51:23 -07:00
Fabien Potencier
a6941f63e3 bug #18237 [WebProfilerBundle] Added table-layout property to AJAX toolbar css (kevintweber)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] Added table-layout property to AJAX toolbar css

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

When a page contains the following css:
```css
table {
    table-layout: fixed;
}
```
Then the AJAX panel has broken table cell spacing.  All the cells are mostly on top of each other.

This patch fixes that situation by overriding the table-layout property for the AJAX panel.

Commits
-------

0fd9503 Added WebProfiler toolbar ajax panel table layout css.
2016-03-21 06:46:12 -07:00
Nicolas Grekas
003507db6a bug #18243 Fixed a bug: saving with not serializable values (RedisAdapter) (masterklavi)
This PR was squashed before being merged into the 3.1-dev branch (closes #18243).

Discussion
----------

Fixed a bug: saving with not serializable values (RedisAdapter)

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

Commits
-------

d86173c Fixed a bug: saving with not serializable values (RedisAdapter)
2016-03-21 10:32:47 +01:00
Masterklavi
d86173c10a Fixed a bug: saving with not serializable values (RedisAdapter) 2016-03-21 10:32:44 +01:00
Nicolas Grekas
fd0ddfb435 bug #18243 Fixed a bug: saving with not serializable values (RedisAdapter) (masterklavi)
This PR was squashed before being merged into the 3.1-dev branch (closes #18243).

Discussion
----------

Fixed a bug: saving with not serializable values (RedisAdapter)

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

Commits
-------

47f45b1 Fixed a bug: saving with not serializable values (RedisAdapter)
2016-03-21 10:30:49 +01:00
Masterklavi
47f45b1d5e Fixed a bug: saving with not serializable values (RedisAdapter) 2016-03-21 10:30:40 +01:00
Nicolas Grekas
d70da2ccae minor #18245 [DependencyInjection] Update changelog (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Update changelog

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| 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
-------

3de481d [DependencyInjection] Update changelog
2016-03-21 10:00:15 +01:00
Kévin Dunglas
3de481dc1e [DependencyInjection] Update changelog 2016-03-21 08:27:21 +01:00
Kévin Dunglas
26ed5820d1 [FrameworkBundle][TwigBundle] Make EngineInterface autowirable 2016-03-20 21:44:43 +01:00
Kevin Weber
0fd9503a6f Added WebProfiler toolbar ajax panel table layout css. 2016-03-19 13:38:42 -04:00
Tobias Schultze
2710a88363 minor #18228 [Validator] use correct term for a property in docblock (not "option") (sustmi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] use correct term for a property in docblock (not "option")

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/18218
| License       | MIT
| Doc PR        | -

Commits
-------

e38d954 [Validator] use correct term for a property in docblock (not "option")
2016-03-19 06:04:37 +01:00
Miroslav Sustek
e38d954c59 [Validator] use correct term for a property in docblock (not "option") 2016-03-18 21:39:03 +01:00
Tobias Schultze
85f5e0138d [Routing] small refactoring for scheme requirement 2016-03-18 19:55:39 +01:00
Nicolas Grekas
72940d7588 [PropertyAccess] Remove most ref mismatches to improve perf 2016-03-18 15:37:16 +01:00
Fabien Potencier
66f54ff6b8 minor #18204 [FrameworkBundle][2.7] Add tests for the Controller class (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][2.7] Add tests for the Controller class

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

Backport tests of #18193 to the `abstract` Controller.

Commits
-------

514a060 [FrameworkBundle] Add tests for the Controller class
2016-03-18 07:14:51 +01:00
Fabien Potencier
06146f3f2b minor #18203 [FrameworkBundle][2.3] Add tests for the Controller class (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle][2.3] Add tests for the Controller class

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

Backport tests of #18193 to the `abstract` Controller.

Commits
-------

ca56be1 [FrameworkBundle] Add tests for the Controller class
2016-03-18 07:13:28 +01:00
Fabien Potencier
0c01903559 bug #18209 [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor (teohhanhui)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #18209).

Discussion
----------

[PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor

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

Also use Doctrine\DBAL\Types\Type class constants

Commits
-------

b50360f [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor
2016-03-18 07:12:01 +01:00
Teoh Han Hui
b50360f8bb [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor
Also use Doctrine\DBAL\Types\Type class constants
2016-03-18 07:12:01 +01:00
Fabien Potencier
11bb865238 bug #18210 [PropertyAccess] Throw an UnexpectedTypeException when the type do not match (dunglas, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Throw an UnexpectedTypeException when the type do not match

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

Made in coordination with @dunglas,
Diff best viewed [ignoring whitspaces](https://github.com/symfony/symfony/pull/18210/files?w=1).

Quoting #18032:

> it appears that the current implementation is error prone because it throws a `\TypeError` that is an `Error` in PHP 7 but a regular `Exception` in PHP 5 because it uses the Symfony polyfill.
Programs wrote in PHP 5 and catching all exceptions will catch this "custom"  `\TypeError ` but not those wrote in PHP 7. It can be very hard to debug.

> In this alternative implementation:

> * catching type mismatch is considered a bug fix and applied to Symfony 2.3
> * for every PHP versions, a domain exception is thrown

Commits
-------

5fe2b06 [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
10c8d5e [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
2016-03-18 07:09:03 +01:00
Fabien Potencier
a5d941479e minor #18212 [DomCrawler] Use XML_ELEMENT_NODE in nodeType check (rvanlaak)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Use XML_ELEMENT_NODE in nodeType check

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

Making use of the predefined dom constant `XML_ELEMENT_NODE` (which value is `1`) makes more sense while interpreting `parents()` it's functionality. See http://php.net/manual/en/dom.constants.php

Commits
-------

cffea91 Use XML_ELEMENT_NODE in nodeType check
2016-03-18 07:07:29 +01:00
Fabien Potencier
d1b84140b6 bug #18216 [Intl] Fix invalid numeric literal on PHP 7 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fix invalid numeric literal on PHP 7

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

Work around `true === is_float(-9223372036854775808)`.

Commits
-------

999c0a5 [NumberFormatter] Fix invalid numeric literal on PHP 7
2016-03-18 07:04:14 +01:00
Nicolas Grekas
d2208301ee bug #18147 [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols (natechicago)
This PR was squashed before being merged into the 2.3 branch (closes #18147).

Discussion
----------

[Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols

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

Commits
-------

c551bd1 [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
2016-03-17 15:26:27 +01:00
natechicago
c551bd17fc [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols 2016-03-17 15:26:25 +01:00
Nicolas Grekas
999c0a5501 [NumberFormatter] Fix invalid numeric literal on PHP 7 2016-03-17 15:06:47 +01:00
Christophe Coevoet
cb2b1dcf3b minor #18217 [Process] fix docblock syntax (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] fix docblock syntax

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/18023#discussion_r56475711
| License       | MIT
| Doc PR        |

Commits
-------

f909fca [Process] fix docblock syntax
2016-03-17 12:46:57 +01:00
Christian Flothmann
f909fcad67 [Process] fix docblock syntax 2016-03-17 12:37:14 +01:00
Nicolas Grekas
254b4e9e91 minor #18213 [Console] use the clock mock for progress indicator tests (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] use the clock mock for progress indicator tests

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

Unfortunately, I opened #18200 for the wrong branch.

Commits
-------

584b752 use the clock mock for progress indicator tests
2016-03-17 12:16:42 +01:00
Nicolas Grekas
68d9ceabb2 [Cache] Optimize Chain adapter 2016-03-17 11:33:40 +01:00
Christian Flothmann
584b7521ef use the clock mock for progress indicator tests 2016-03-17 10:19:04 +01:00
Richard van Laak
cffea91c8e Use XML_ELEMENT_NODE in nodeType check 2016-03-17 10:11:54 +01:00
Kévin Dunglas
ebdcd16bdd [Cache] Add a Chain adapter 2016-03-17 09:39:21 +01:00
Nicolas Grekas
8cd9138938 bug #18023 [Process] getIncrementalOutput should work without calling getOutput (romainneutron)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] getIncrementalOutput should work without calling getOutput

| Q             | A
| ------------- | ---
| Branch        | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17937
| License       | MIT

Commits
-------

37d8695 [Process] getIncrementalOutput should work without calling getOutput
2016-03-17 09:31:46 +01:00
Nicolas Grekas
5fe2b06bc4 [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking 2016-03-17 09:22:17 +01:00
Kévin Dunglas
10c8d5eadb [PropertyAccess] Throw an UnexpectedTypeException when the type do not match 2016-03-17 09:11:03 +01:00
Kévin Dunglas
514a06083a [FrameworkBundle] Add tests for the Controller class 2016-03-16 19:49:12 +01:00
Kévin Dunglas
ca56be1c8a [FrameworkBundle] Add tests for the Controller class 2016-03-16 19:32:37 +01:00
Nicolas Grekas
83ebf97df3 Merge branch '3.0'
* 3.0:
  [PhpUnitBridge] Test on PHP 5.3
2016-03-16 18:52:16 +01:00
Nicolas Grekas
4af15567e0 minor #18202 [PhpUnitBridge] Test on PHP 5.3 (nicolas-grekas)
This PR was merged into the 3.0 branch.

Discussion
----------

[PhpUnitBridge] Test on PHP 5.3

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

Commits
-------

b01b142 [PhpUnitBridge] Test on PHP 5.3
2016-03-16 18:51:43 +01:00
Nicolas Grekas
b01b142632 [PhpUnitBridge] Test on PHP 5.3 2016-03-16 18:41:26 +01:00
Romain Neutron
37d86956f2 [Process] getIncrementalOutput should work without calling getOutput 2016-03-16 18:33:24 +01:00
Nicolas Grekas
8322e812a3 Merge branch '3.0'
* 3.0:
  use the clock mock for progress indicator tests
  Removed 3.0 restriction for the Ldap component in the Security component

Conflicts:
	phpunit.xml.dist
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/composer.json
2016-03-16 18:16:29 +01:00
Nicolas Grekas
d4fcaef6d1 minor #18201 Removed 3.0.0 restriction for the Ldap component in the Security component (csarrazi)
This PR was merged into the 3.0 branch.

Discussion
----------

Removed 3.0.0 restriction for the Ldap component in the Security component

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

This ticket removes the restriction on version 3.0 of the Ldap component, as the component is now both backward and forward-compatible.

This PR is being made against the `3.0` branch and not in the `2.8` branch as it seems that all other dependencies rely on `~2.8|~3.0.0` for the `2.8` branch.

There will be a conflict with the `master` branch. The versions to use on the `master` branch is `~3.1` for both `composer.json` files, as the authentication provider and the user provider rely on the new interface, and the `LdapInterface::query()` method, instead of `LdapClientInterface::search()`, which is deprecated.

Commits
-------

f576c9f Removed 3.0 restriction for the Ldap component in the Security component
2016-03-16 18:15:12 +01:00
Nicolas Grekas
e436c1e254 minor #18200 use the clock mock for progress indicator tests (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

use the clock mock for progress indicator tests

| Q             | A
| ------------- | ---
| Branch?       | 3.0
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/15617#issuecomment-196722189
| License       | MIT
| Doc PR        |

Commits
-------

dbde648 use the clock mock for progress indicator tests
2016-03-16 18:14:43 +01:00
Nicolas Grekas
009b544f41 bug #18076 [Ldap] Add forward compatibility layer (csarrazi)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Ldap] Add forward compatibility layer

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

This PR adds forward-compatibility for the use of the Ldap component within the Security component. Indeed, currently, if one uses the `Symfony\Component\Ldap\LdapClient` class and upgrades to the `master` branch of `symfony/symfony`, the Security component will break as the class does not implement `LdapInterface`.

This PR fixes this.

This means that from now on, the `master` branch of the Ldap component should be compatible with all versions of the Security component. The 2.8/3.0 Security component should be compatible with all versions of the Ldap component, and the 3.1 Security component should be compatible with versions 3.1 onwards of the Ldap component.

Commits
-------

97d9cee Improved BC layer for the Ldap component
2016-03-16 18:10:29 +01:00
Christian Flothmann
dbde648350 use the clock mock for progress indicator tests 2016-03-16 18:00:50 +01:00
Charles Sarrazin
f576c9f88c Removed 3.0 restriction for the Ldap component in the Security component 2016-03-16 17:47:19 +01:00