Commit Graph

20844 Commits

Author SHA1 Message Date
Fabien Potencier
3c75c48838 feature #18242 [FrameworkBundle][TwigBundle] Make EngineInterface autowirable (dunglas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[FrameworkBundle][TwigBundle] Make EngineInterface autowirable

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

Commits
-------

26ed582 [FrameworkBundle][TwigBundle] Make EngineInterface autowirable
2016-03-25 17:49:43 +01:00
Fabien Potencier
697bac9bf2 feature #18197 Make Request::isFromTrustedProxy() public. (Peter Bex)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Make Request::isFromTrustedProxy() public.

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

When adding custom headers to your proxy (in our particular case, a `X-Base-Url` header, but it could be anything), it is necessary to be able to tell whether the request came from a trusted proxy or not. Unfortunately, currently the `isFromTrustedProxy()` method is private, which means you'll need to subclass `Request` and add your own *differently named* method just to be able to access this information.

This functionality is pretty straightforward, and I don't see a reason to keep this method private so this a trivial pull request to make it public (and it adds a comment so it'll show up in the API docs with proper documentation).

Commits
-------

286f64f Make Request::isFromTrustedProxy() public.
2016-03-25 12:38:37 +01:00
Tobias Schultze
3598105da9 Merge branch '3.0' 2016-03-25 02:52:00 +01:00
Tobias Schultze
8529f190fb [Form] remove irrelevant doc after 3.0 merge 2016-03-25 02:50:54 +01:00
Tobias Schultze
fe36f04889 Merge branch '2.8' into 3.0 2016-03-25 02:41:20 +01:00
Tobias Schultze
a8843132b8 Merge branch '2.7' into 2.8 2016-03-25 02:40:30 +01:00
Tobias Schultze
0cd725ea42 Merge branch '2.3' into 2.7 2016-03-25 02:39:14 +01:00
Tobias Schultze
43df701103 minor #18303 [Form] Fix Forms docblock to use FQCN (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix `Forms` docblock to use FQCN

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

Commits
-------

df61aab [Form] Fix `Forms` docblock to use FQCN
2016-03-25 02:32:07 +01:00
Tobias Schultze
0839df5b70 minor #18302 [Form] Fix FormBuilderInterface docblocks (HeahDude)
This PR was merged into the 3.0 branch.

Discussion
----------

[Form] Fix `FormBuilderInterface` docblocks

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

Commits
-------

67458d8 [Form] Fix `FormBuilderInterface` docblocks
2016-03-25 02:26:45 +01:00
Jules Pietri
df61aabaa7 [Form] Fix Forms docblock to use FQCN 2016-03-24 20:57:49 +01:00
Jules Pietri
67458d8cf5 [Form] Fix FormBuilderInterface docblocks 2016-03-24 20:40:46 +01:00
Jules Pietri
8af78e9f9b [Form] Remove unused legacy code in ChoiceType 2016-03-24 20:00:16 +01:00
Tobias Schultze
058dee70c6 minor #18293 [FrameworkBundle 2.7+] Removed unused variables (iltar)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle 2.7+] Removed unused variables

| Q             | A
| ------------- | ---
| Branch?       | 2.7, can be merged upwards
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

I noticed some unused variables in the Framework Extension. I did a project inspection in phpstorm and I found nothing else. Hence I submit this PR to make it consistent again.

Commits
-------

9fea1ee Removed unused variables
2016-03-24 14:05:39 +01:00
Iltar van der Berg
9fea1ee4f4 Removed unused variables 2016-03-24 12:33:34 +01:00
Tobias Schultze
d31d92ef67 minor #18286 [2.7] fix mocking of some methods (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] fix mocking of some methods

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | items 6 and 8 of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299#issuecomment-200443756
| License       | MIT
| Doc PR        |

Commits
-------

a45b93d [2.7] fix mocking of some methods
2016-03-24 11:22:08 +01:00
Guilliam Xavier
3f6e37efe6 Fix copy-paste in PHPDoc comment text 2016-03-24 10:50:31 +01:00
Christian Flothmann
a45b93d423 [2.7] fix mocking of some methods 2016-03-24 10:06:43 +01:00
Tobias Schultze
06b1e5d38b minor #18287 [3.0] fix mocking of some methods (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

[3.0] fix mocking of some methods

| Q             | A
| ------------- | ---
| Branch?       | 3.0
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | items 1 and 2 of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299#issuecomment-200443756
| License       | MIT
| Doc PR        |

Commits
-------

07308e9 [3.0] fix mocking of some methods
2016-03-23 23:48:01 +01:00
Christian Flothmann
07308e9322 [3.0] fix mocking of some methods 2016-03-23 23:25:51 +01:00
Christian Flothmann
542cf6b046 [2.3] fix mocking of some methods 2016-03-23 22:36:43 +01:00
Christian Flothmann
243e59c108 Merge branch '3.0'
* 3.0:
  fix controller tests
  move test methods to test case class
2016-03-23 21:25:59 +01:00
Christian Flothmann
fb963d27c9 fix controller tests
Add missing public method stubs to `TestController` (all methods in the
base `Controller` class from the FrameworkBundle are `protected` since
Symfony 3.0).
2016-03-23 21:13:13 +01:00
Christian Flothmann
239d546db3 Merge branch '2.8' into 3.0
* 2.8:
  move test methods to test case class
2016-03-23 21:03:51 +01:00
Christian Flothmann
d2b0ebc941 Merge branch '2.7' into 2.8
* 2.7:
  move test methods to test case class
2016-03-23 20:59:19 +01:00
Christian Flothmann
81886530c7 move test methods to test case class 2016-03-23 19:17:25 +01:00
Nicolas Grekas
abb8d6486a bug #18248 Fast multiple setEx with the pipeline transcation (RedisAdapter::doSave) (masterklavi)
This PR was squashed before being merged into the 3.1-dev branch (closes #18248).

Discussion
----------

Fast multiple setEx with the pipeline transcation (RedisAdapter::doSave)

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

Commits
-------

e132763 Fast multiple setEx with the pipeline transcation (RedisAdapter::doSave)
2016-03-23 18:34:09 +01:00
Masterklavi
e132763f55 Fast multiple setEx with the pipeline transcation (RedisAdapter::doSave) 2016-03-23 18:33:57 +01:00
Christian Flothmann
d4ec7dd845 use class constants instead of FQCN strings 2016-03-23 18:13:33 +01:00
Fabien Potencier
434a2f51e2 feature #18211 [Security] Use auth trust resolver to determine anonymous in ContextListener (WouterJ)
This PR was squashed before being merged into the 3.1-dev branch (closes #18211).

Discussion
----------

[Security] Use auth trust resolver to determine anonymous in ContextListener

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

There is a nice class in Symfony that is used to check whether a token is anonymously: `AuthenticationTrustResolver`. However, its logic was still hard coded in the `ContextListener`, making it impossible to customize it (e.g. using another anonymous token class). I think it makes lots of sense to use the dedicated class.

Commits
-------

ab5578e [Security] Use auth trust resolver to determine anonymous in ContextListener
2016-03-23 10:01:36 -07:00
WouterJ
ab5578e5ac [Security] Use auth trust resolver to determine anonymous in ContextListener 2016-03-23 10:01:34 -07:00
Nicolas Grekas
64fe5392f9 [Bridge\PhpUnit] Add "disabled" mode to SYMFONY_DEPRECATIONS_HELPER 2016-03-23 14:47:06 +01:00
Nicolas Grekas
a4af637317 Merge branch '3.0'
* 3.0:
  Fix backport
2016-03-23 14:46:29 +01:00
Nicolas Grekas
37a75f463d Merge branch '2.8' into 3.0
* 2.8:
  Fix backport
2016-03-23 14:46:08 +01:00
Nicolas Grekas
1373a5b747 Fix backport 2016-03-23 14:45:24 +01:00
Nicolas Grekas
44dd066b99 Merge branch '3.0'
* 3.0:
  [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt
2016-03-23 14:38:44 +01:00
Nicolas Grekas
af648d6f63 Merge branch '2.8' into 3.0
* 2.8:
  [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt
2016-03-23 14:38:38 +01:00
Nicolas Grekas
50e1445c11 [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt 2016-03-23 14:38:15 +01:00
Nicolas Grekas
d53874b747 Merge branch '3.0'
* 3.0: (22 commits)
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [FrameworkBundle][2.8] Add tests for the Controller class
  [DependencyInjection] Update changelog
  Added WebProfiler toolbar ajax panel table layout css.
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [PropertyAccess] Remove most ref mismatches to improve perf
  [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  [Process] fix docblock syntax
  use the clock mock for progress indicator tests
  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/Bridge/PhpUnit/SymfonyTestsListener.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-03-23 14:33:04 +01:00
Nicolas Grekas
3c40825202 Merge branch '2.8' into 3.0
* 2.8: (22 commits)
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [FrameworkBundle][2.8] Add tests for the Controller class
  [DependencyInjection] Update changelog
  Added WebProfiler toolbar ajax panel table layout css.
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [PropertyAccess] Remove most ref mismatches to improve perf
  [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  [Process] fix docblock syntax
  use the clock mock for progress indicator tests
  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:
	.travis.yml
	composer.json
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
2016-03-23 14:23:25 +01:00
Nicolas Grekas
42815018ed Merge branch '2.7' into 2.8
* 2.7:
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [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
  [Process] fix docblock syntax
  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
  [FrameworkBundle] Add tests for the Controller class
  [Process] getIncrementalOutput should work without calling getOutput

Conflicts:
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bridge/PhpUnit/TextUI/Command.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
2016-03-23 14:11:46 +01:00
Nicolas Grekas
2b3f4261d6 Fix backport 2016-03-23 13:43:53 +01:00
Nicolas Grekas
c5dbb1d9b6 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
2016-03-23 13:40:00 +01:00
Nicolas Grekas
bf465eb6db [travis] Upgrade phpunit wrapper & hirak/prestissimo 2016-03-23 13:34:50 +01:00
Nicolas Grekas
4ea9548e23 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests 2016-03-23 13:16:35 +01:00
Nicolas Grekas
8a52fcdbff [PropertyAccess] Fix isPropertyWritable not using the reflection cache 2016-03-22 10:40:06 +01:00
Nicolas Grekas
cb1c87ac5f [PropertyAccess] Backport fixes from 2.7 2016-03-22 10:19:04 +01:00
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
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