Commit Graph

19582 Commits

Author SHA1 Message Date
Fabien Potencier 459b8b6f92 minor #13144 No global state for isolated tests and other fixes (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

No global state for isolated tests and other fixes

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

By default, phpunit preserves global state for isolated processes. This made the tests break on my laptop.
Other tweaks included.
In branch 2.5, `src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php` also misses the `@preserveGlobalState disabled` annotation. Please add it when merging

Commits
-------

750f3a6 No global state for isolated tests and other fixes
2014-12-29 11:01:53 +01:00
Nicolas Grekas 750f3a62f7 No global state for isolated tests and other fixes 2014-12-29 10:34:09 +01:00
Fabien Potencier 8637a1f471 bug #13027 fix #10054 - form data collector with dynamic fields (zulus)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #13027).

Discussion
----------

fix #10054 - form data collector with dynamic fields

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

This simple patch will fix webprofiler bug with collection field.

Commits
-------

cffb64f fix #10054 - form data collector with dynamic fields
2014-12-29 09:51:57 +01:00
Dawid Pakuła cffb64fd93 fix #10054 - form data collector with dynamic fields
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10054
| License       | MIT
| Doc PR        | -
2014-12-29 09:51:56 +01:00
Fabien Potencier 4cc4e8a257 bug #13141 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment

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

The default escaping strategy was set on the Twig Engine and not the Twig Environment. That's a problem under some circumstances (like what #11773 describes), but it's also much better to set everything on the Twig  Environment directly.

Commits
-------

91b24e8 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
2014-12-29 09:40:20 +01:00
Fabien Potencier 91b24e8f92 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment 2014-12-29 09:39:08 +01:00
Fabien Potencier 55feca6958 bug #13114 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP head... (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP head...

| 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

On symfony.com, we have errors related to IP addresses in the `X-Forwarded-For` HTTP header that have a port. If that happens (I have no ideas what is doing that), the page crashes with an error like `inet_pton(): Unrecognized address 187.65.229.211:63479` (which comes from IpUtils::checkIpv6()). This fixes the root cause by removing the port.

#12572 is solving the consequence and I propose to also merge it.

Commits
-------

60ad382 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
2014-12-29 09:20:51 +01:00
Fabien Potencier ff079dd41e bug #12572 [HttpFoundation] fix checkip6 (Neime)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #12572).

Discussion
----------

[HttpFoundation] fix checkip6

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

I have this error ContextErrorException: Warning: inet_pton(): Unrecognized address X.X.X.X:X
in IpUtils.php line 110

X.X.X.X:X is detected as a ipv6 because HTTP_X_FORWARDED_FOR have a port.

Commits
-------

1da0ba4 [Debug] fix checkip6
2014-12-29 09:16:17 +01:00
Neime 1da0ba4150 [Debug] fix checkip6 2014-12-29 09:16:16 +01:00
Fabien Potencier 60ad382684 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port 2014-12-29 09:12:40 +01:00
Nicolas Grekas b369bb6eed [2.7] Allow 3.0 requirements 2014-12-27 12:44:51 +01:00
Fabien Potencier f68b7c7d9d minor #13132 [CssSelector] Use the correct cssselect library name in docblocks. (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] Use the correct cssselect library name in docblocks.

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

As suggested in #11894, the original python library is called [cssselect](https://github.com/SimonSapin/cssselect), not cssselector.

I also updated the README, as the cssselect was extracted as an independent library and it's no longer part of lxml.

Commits
-------

55f0d9e Update the note about origins of the CssSelector component.
1997b12 Use the correct cssselect library name in docblocks.
2014-12-27 04:31:18 +01:00
Jakub Zalas 55f0d9ed0b Update the note about origins of the CssSelector component.
The last rewrite is based on the cssselect which is no longer part of lxml, but was extracted as an independent library.
2014-12-26 23:33:10 +01:00
Jakub Zalas 1997b12f51 Use the correct cssselect library name in docblocks.
The original python library is called cssselect, not cssselector.
2014-12-26 23:22:03 +01:00
Fabien Potencier 550ca9d987 Revert "minor #12673 [Form] [Hackday] [2.7] Add a deprecation note about the `form_enctype` helper (mrcmorales)"
This reverts commit e8d98578f4, reversing
changes made to 0c7df5898f.
2014-12-26 12:36:36 +01:00
Nicolas Grekas f5407b7314 Merge branch '2.6' into 2.7
* 2.6:
  [travis] reorder matrix + prevent "Killed" jobs
  [HttpFoundation] removed wrong HTTP header
2014-12-26 11:31:34 +01:00
Nicolas Grekas 445a0815f9 Merge branch '2.5' into 2.6
* 2.5:
  [travis] reorder matrix + prevent "Killed" jobs
  [HttpFoundation] removed wrong HTTP header
2014-12-26 11:31:05 +01:00
Nicolas Grekas 7c42995bd9 Merge branch '2.3' into 2.5
* 2.3:
  [travis] reorder matrix + prevent "Killed" jobs
  [HttpFoundation] removed wrong HTTP header
2014-12-26 11:30:47 +01:00
Nicolas Grekas e10024e5f4 minor #13123 [travis] reorder matrix + prevent "Killed" jobs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] reorder matrix + prevent "Killed" jobs

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

The new --prefer-lowest matrix line fails randomly with ["Killed" message](http://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error).
Lets try reducing concurrency on this one.
The matrix is also reordered so that the slowest lines are started first.

Commits
-------

b1d47e9 [travis] reorder matrix + prevent "Killed" jobs
2014-12-26 11:30:14 +01:00
Nicolas Grekas b1d47e94df [travis] reorder matrix + prevent "Killed" jobs 2014-12-26 11:26:07 +01:00
Fabien Potencier 1c039ce18d minor #13115 [HttpFoundation] removed wrong HTTP header (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] removed wrong HTTP header

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

Commits
-------

73dddac [HttpFoundation] removed wrong HTTP header
2014-12-26 10:45:06 +01:00
Fabien Potencier 2a85c7e19b minor #13111 [FrameworkBundle] Optimize validator registration (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Optimize validator registration

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

Optimize validator registration (avoid an unneeded loop and access to the Reflection API).

Commits
-------

9c5b9e1 [FrameworkBundle] Optimize validator registration
2014-12-26 10:33:39 +01:00
Kévin Dunglas 9c5b9e1fed [FrameworkBundle] Optimize validator registration 2014-12-26 08:58:15 +01:00
Nicolas Grekas df0f2b23d5 Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] fix browserkit requirement
  [FrameworkBundle] fix expression-language requirement
  [TwigBridge] fix form requirement
  [Filesystem] restore ability to create broken symlinks
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work
2014-12-26 00:30:25 +01:00
Nicolas Grekas af0d5f9fe3 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fix browserkit requirement
  [TwigBridge] fix form requirement
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpKernel/composer.json
2014-12-26 00:28:31 +01:00
Nicolas Grekas d7bd25978f Merge branch '2.3' into 2.5
* 2.3:
  [TwigBridge] fix form requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2014-12-26 00:24:15 +01:00
Nicolas Grekas 993ef6a2d2 minor #13119 [FrameworkBundle] fix expression-language requirement (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] fix expression-language requirement

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

Commits
-------

23c603a [FrameworkBundle] fix expression-language requirement
2014-12-26 00:21:44 +01:00
Nicolas Grekas 9e5066fbde minor #13117 [FrameworkBundle] fix browserkit requirement (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fix browserkit requirement

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

Commits
-------

abbd270 [FrameworkBundle] fix browserkit requirement
2014-12-26 00:19:57 +01:00
Nicolas Grekas 841f532fda minor #13118 [TwigBridge] fix form requirement (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge] fix form requirement

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

Commits
-------

d9053d9 [TwigBridge] fix form requirement
2014-12-26 00:18:04 +01:00
Nicolas Grekas abbd2707ef [FrameworkBundle] fix browserkit requirement 2014-12-26 00:04:51 +01:00
Nicolas Grekas 23c603a7cc [FrameworkBundle] fix expression-language requirement 2014-12-25 23:57:44 +01:00
Nicolas Grekas d9053d9b55 [TwigBridge] fix form requirement 2014-12-25 23:41:41 +01:00
Fabien Potencier 37724f01a5 minor #13104 [CssSelector] added the license of the Python library we ported to PHP (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] added the license of the Python library we ported to PHP

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

Commits
-------

fa36b98 [CssSelector] added the license of the Python library we ported to PHP
2014-12-25 20:43:18 +01:00
Fabien Potencier 49dd88ff86 minor #13103 [SecurityBundle] avoid unneeded work (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] avoid unneeded work

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

Commits
-------

8135727 [SecurityBundle] avoid unneeded work
2014-12-25 20:42:32 +01:00
Fabien Potencier 73dddac4e0 [HttpFoundation] removed wrong HTTP header 2014-12-25 20:39:31 +01:00
Fabien Potencier 0775080d33 bug #13109 [Filesystem] restore ability to create broken symlinks (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Filesystem] restore ability to create broken symlinks

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

Commits
-------

3101202 [Filesystem] restore ability to create broken symlinks
2014-12-25 19:54:01 +01:00
Nicolas Grekas 3101202333 [Filesystem] restore ability to create broken symlinks 2014-12-25 12:18:46 +01:00
Fabien Potencier 0e721881e1 minor #13112 [FrameworkBundle] fix http-foundation requirement (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fix http-foundation requirement

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

Request::getDefaultLocale() has been introduced in 2.5.4

Commits
-------

965b4dd [FrameworkBundle] fix http-foundation requirement
2014-12-25 12:12:13 +01:00
Nicolas Grekas 965b4ddc42 [FrameworkBundle] fix http-foundation requirement 2014-12-25 12:07:27 +01:00
Nicolas Grekas c1c5cd58b7 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] silence deprecation notices in new components
  [2.5] silence deprecation notices in new components
  [VarDumper] Minor fix for the uniformity
  [TwigBundle] added missing absolute URL in Twig exceptions

Conflicts:
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
	src/Symfony/Component/Security/Acl/phpunit.xml.dist
	src/Symfony/Component/Security/Core/phpunit.xml.dist
	src/Symfony/Component/Security/Csrf/phpunit.xml.dist
	src/Symfony/Component/Security/Http/phpunit.xml.dist
	src/Symfony/Component/VarDumper/phpunit.xml.dist
2014-12-25 11:29:16 +01:00
Nicolas Grekas 667c8c7ddb Merge branch '2.5' into 2.6
* 2.5:
  [2.5] silence deprecation notices in new components
  [TwigBundle] added missing absolute URL in Twig exceptions
2014-12-25 11:26:10 +01:00
Fabien Potencier 0a2879e79b minor #13099 [2.6] silence deprecation notices in new components (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] silence deprecation notices in new components

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

Commits
-------

b0a156f [2.6] silence deprecation notices in new components
2014-12-25 11:07:53 +01:00
Fabien Potencier 771703d094 minor #13098 [2.5] silence deprecation notices in new components (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] silence deprecation notices in new components

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

Commits
-------

6872e51 [2.5] silence deprecation notices in new components
2014-12-25 11:07:16 +01:00
Fabien Potencier 9280c6272a minor #13108 [Serializer] Fix XmlFileLoader test (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix XmlFileLoader test

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

Fix a bug in `XmlFileLoaderTest` tests.

Commits
-------

efd39cf [Serializer] Fix XmlFileLoader test
2014-12-25 11:06:03 +01:00
Fabien Potencier 4475e4d23f minor #13110 [Security/Http] fix mock logger in test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security/Http] fix mock logger in test

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

Commits
-------

4e544b9 [Security/Http] fix mock logger in test
2014-12-25 11:05:02 +01:00
Nicolas Grekas 4e544b9450 [Security/Http] fix mock logger in test 2014-12-25 10:39:34 +01:00
Kévin Dunglas efd39cfa51 [Serializer] Fix XmlFileLoader test 2014-12-25 05:07:44 +01:00
Nicolas Grekas b0a156fc11 [2.6] silence deprecation notices in new components 2014-12-24 22:28:06 +01:00
Nicolas Grekas 6872e51289 [2.5] silence deprecation notices in new components 2014-12-24 22:27:15 +01:00
Nicolas Grekas bad5169f0d minor #13090 [VarDumper] Minor fix for the uniformity (SofHad)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #13090).

Discussion
----------

[VarDumper] Minor fix for the uniformity

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

Commits
-------

7d02e48 [VarDumper] Minor fix for the uniformity
2014-12-24 17:16:12 +01:00