Commit Graph

16066 Commits

Author SHA1 Message Date
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
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
Saro0h
e1c19f8941 [Yaml] Removed the ability to parse a file in Yaml::parse() 2014-12-28 18:25:05 +01:00
Saro0h
b552b1b182 [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand 2014-12-28 18:19:42 +01:00
Nicolas Grekas
b369bb6eed [2.7] Allow 3.0 requirements 2014-12-27 12:44:51 +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
Saro0h
e93b571ab5 [HttpKernel] Removed deprecated ErrorHandler and ExceptionHandler classes 2014-12-26 19:26:05 +01:00
Saro0h
c6b049f4e0 [Form] Removed deprecated form_enctype() 2014-12-26 19:00:47 +01:00
Saro0h
dfb97068ee [Console] Removed DialogHelper, ProgressHelper and TableHelper 2014-12-26 14:45:27 +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
d6af4d6efa Merge branch '2.7'
* 2.7:
  [travis] reorder matrix + prevent "Killed" jobs
  [FrameworkBundle] Optimize validator registration
  [FrameworkBundle] fix browserkit requirement
  [FrameworkBundle] fix expression-language requirement
  [TwigBridge] fix form requirement
  [HttpFoundation] removed wrong HTTP header
  [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 11:31:50 +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
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
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
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
Nicolas Grekas
965b4ddc42 [FrameworkBundle] fix http-foundation requirement 2014-12-25 12:07:27 +01:00
Nicolas Grekas
f333cb23de Merge branch '2.7'
* 2.7:
  [Security/Http] fix mock logger in test
  [Serializer] Fix XmlFileLoader test
  [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
2014-12-25 11:29:59 +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
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
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
SofHad
7d02e4838b [VarDumper] Minor fix for the uniformity 2014-12-24 17:16:12 +01:00
Fabien Potencier
fa36b98141 [CssSelector] added the license of the Python library we ported to PHP 2014-12-24 16:07:20 +01:00
Fabien Potencier
8135727102 [SecurityBundle] avoid unneeded work 2014-12-24 16:04:14 +01:00
Fabien Potencier
2707569865 bug #13093 [TwigBundle] added missing absolute URL in Twig exceptions (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[TwigBundle] added missing absolute URL in Twig exceptions

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

Commits
-------

e4bb2c7 [TwigBundle] added missing absolute URL in Twig exceptions
2014-12-24 12:29:24 +01:00
Nicolas Grekas
602ba228e5 Merge branch '2.7'
* 2.7:
  [VarDumper] fix tests under 5.3
  [Console] Move QuestionHelperTest to tty group
  [travis] remove sh wrapper
2014-12-24 11:55:33 +01:00
Nicolas Grekas
1922f55259 Merge branch '2.6' into 2.7
* 2.6:
  [VarDumper] fix tests under 5.3
  [Console] Move QuestionHelperTest to tty group
  [travis] remove sh wrapper
2014-12-24 11:55:26 +01:00
Nicolas Grekas
b0d73f3765 Merge branch '2.5' into 2.6
* 2.5:
  [Console] Move QuestionHelperTest to tty group
  [travis] remove sh wrapper
2014-12-24 11:55:18 +01:00
Nicolas Grekas
333fb6f3df [VarDumper] fix tests under 5.3 2014-12-24 11:36:03 +01:00
Nicolas Grekas
e714f8583e [Console] Move QuestionHelperTest to tty group 2014-12-24 10:25:10 +01:00
Fabien Potencier
877390fad6 Merge branch '2.7'
* 2.7:
  [DependencyInjection] use/fix newest Definition::setFactory
  fixed unit tests
  [2.7] print deprecation summary at end of tests
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:12:09 +01:00
Fabien Potencier
94b293c5e3 Merge branch '2.6' into 2.7
* 2.6:
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:12:02 +01:00
Fabien Potencier
f31f5a96b0 Merge branch '2.5' into 2.6
* 2.5:
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:11:54 +01:00
Fabien Potencier
0ec80c6d1f Merge branch '2.3' into 2.5
* 2.3:
  [Bridge] [Propel] minor improvements to the Propel bridge.

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Fixtures/Column.php
2014-12-24 08:11:46 +01:00
Fabien Potencier
87ac31a3e3 Merge branch '2.6' into 2.7
* 2.6:
  [DependencyInjection] use/fix newest Definition::setFactory
  fixed unit tests
2014-12-24 08:10:22 +01:00
Fabien Potencier
c90edd95a6 bug #13087 [DependencyInjection] use/fix newest Definition::setFactory (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] use/fix newest Definition::setFactory

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

Commits
-------

f683a7a [DependencyInjection] use/fix newest Definition::setFactory
2014-12-24 08:03:13 +01:00
Nicolas Grekas
f683a7a72c [DependencyInjection] use/fix newest Definition::setFactory 2014-12-24 07:58:22 +01:00
Fabien Potencier
e4bb2c708d [TwigBundle] added missing absolute URL in Twig exceptions 2014-12-24 07:54:29 +01:00
Fabien Potencier
0566a50a33 bug #12975 [FrameworkBundle] Allow custom services for validator mapping cache. (jakzal)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] Allow custom services for validator mapping cache.

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

#9892 introduced `DoctrineCache`, but it's not really used by the FrameworkBundle. This was overlooked, therefore I think it should go into 2.5.

This PR will let us to configure a service id, instead of a driver name. The only exception is apc, which is converted to `validator.mapping.cache.apc` to keep BC.

Examples:

```yaml
framework:
    validation:
        cache: apc # converted to validator.mapping.cache.apc
```

```yaml
framework:
    validation:
        cache: my_custom_cache_service
```

It would be nice to be able to provide a doctrine service id, instead of `CacheInterface` implementation. It could be automatically decorated with `DoctrineCache`:

```yaml
framework:
    validation:
        cache:
            doctrine: my_doctrine_cache_service # could be provided by DoctrineCacheBundle
```

I'll work on it next.

Commits
-------

4cdcf10 [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 07:41:03 +01:00
Fabien Potencier
1f98e60f5d fixed unit tests 2014-12-24 07:17:40 +01:00
Fabien Potencier
9ea3f6ac2f minor #13063 [2.3] [Bridge] [Propel] minor improvements to the Propel bridge. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Bridge] [Propel] minor improvements to the Propel bridge.

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

Commits
-------

6d9d460 [Bridge] [Propel] minor improvements to the Propel bridge.
2014-12-24 06:49:41 +01:00
Fabien Potencier
e09e027fc3 Merge branch '2.7'
* 2.7:
  Add LegacyPdoSessionHandler class
  fix dependency on ExtensionInterface over implementation
  [Console] Remove $this in closure
  [FrameworkBundle] forward error reporting level to insulated Client
  [VarDumper] fix and test PdoCaster
  [Config] fix error handler restoration in test
2014-12-23 18:36:41 +01:00
Fabien Potencier
9b501daf5a Merge branch '2.6' into 2.7
* 2.6:
  Add LegacyPdoSessionHandler class
  fix dependency on ExtensionInterface over implementation
  [FrameworkBundle] forward error reporting level to insulated Client
  [VarDumper] fix and test PdoCaster
  [Config] fix error handler restoration in test
2014-12-23 18:36:18 +01:00
Fabien Potencier
7ebb685805 Merge branch '2.5' into 2.6
* 2.5:
  fix dependency on ExtensionInterface over implementation
  [FrameworkBundle] forward error reporting level to insulated Client
  [Config] fix error handler restoration in test
2014-12-23 18:36:09 +01:00
Fabien Potencier
aaf4c84557 Merge branch '2.3' into 2.5
* 2.3:
  [FrameworkBundle] forward error reporting level to insulated Client
  [Config] fix error handler restoration in test
2014-12-23 18:36:02 +01:00
Jeremy Livingston
3bd1616db9 Add LegacyPdoSessionHandler class
The changes made to the PdoSessionHandler in 2.6 introduced a
backwards-compatability break for users upgrading from 2.5. This update
introduces a LegacyPdoSessionHandler class that uses the old service's
functionality.

Users who cannot make schema updates or do not want to lose sessions can
use LegacyPdoSessionHandler until 3.0.
2014-12-23 18:34:42 +01:00
Fabien Potencier
cad7f0e99c bug #13075 [Config] fix error handler restoration in test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] fix error handler restoration in test

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

Commits
-------

266afeb [Config] fix error handler restoration in test
2014-12-23 18:31:59 +01:00
Fabien Potencier
3402fffb97 bug #13073 [VarDumper] fix and test PdoCaster (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] fix and test PdoCaster

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

Commits
-------

0b1be13 [VarDumper] fix and test PdoCaster
2014-12-23 18:30:47 +01:00
Berny Cantos
5e1a5f778d fix dependency on ExtensionInterface over implementation 2014-12-23 12:45:12 +01:00
sarah khalil
de0fe5d175 [Console] Remove $this in closure 2014-12-23 12:23:33 +01:00
Fabien Potencier
e2762f69c5 bug #13081 [FrameworkBundle] forward error reporting level to insulated Client (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] forward error reporting level to insulated Client

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

Especially if deprecation notices are silenced on the main php instance, we should also silence them in the insulated Client

Commits
-------

d82e062 [FrameworkBundle] forward error reporting level to insulated Client
2014-12-23 09:09:12 +01:00
Nicolas Grekas
d82e062d17 [FrameworkBundle] forward error reporting level to insulated Client 2014-12-23 08:41:15 +01:00
Fabien Potencier
37909a407f Merge branch '2.7'
* 2.7:
  [2.3] CS And DocBlock Fixes
  [Serializer] Serialization groups support
  [2.3] CS Fixes
  Fixed the issue 11116
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
  [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
  [Serializer] Add xml_format_output context option. Close #12517.
  [WebProfilerBundle] Fixed IE8 support
2014-12-22 17:45:23 +01:00
Fabien Potencier
7c026bb33e Merge branch '2.6' into 2.7
* 2.6:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
2014-12-22 17:45:18 +01:00
Fabien Potencier
72c169e8a1 Merge branch '2.5' into 2.6
* 2.5:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
2014-12-22 17:44:09 +01:00
Fabien Potencier
f26c062c00 Merge branch '2.3' into 2.5
* 2.3:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes

Conflicts:
	src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
	src/Symfony/Component/Form/FormError.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Process/ProcessUtils.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
	src/Symfony/Component/Validator/Constraints/GroupSequence.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2014-12-22 17:29:52 +01:00
Fabien Potencier
442c633af4 Merge branch '2.3' into 2.5
* 2.3:
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Component/Console/Helper/TableHelper.php
2014-12-22 17:16:14 +01:00
Graham Campbell
83c15db887 [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Nicolas Grekas
0b1be13309 [VarDumper] fix and test PdoCaster 2014-12-22 10:05:34 +01:00
Nicolas Grekas
266afeb161 [Config] fix error handler restoration in test 2014-12-22 10:02:19 +01:00
Kévin Dunglas
57a191b3a9 [Serializer] Serialization groups support 2014-12-21 23:11:52 +01:00
Fabien Potencier
affcafcc79 Merge branch '2.6' into 2.7
* 2.6:
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 17:36:23 +01:00
Fabien Potencier
1a473672af Merge branch '2.5' into 2.6
* 2.5:
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 17:36:15 +01:00
Hugo Hamon
6d9d460ebb [Bridge] [Propel] minor improvements to the Propel bridge. 2014-12-21 17:25:02 +01:00
Fabien Potencier
d8ebcd20ac feature #12994 Add LegacyPdoSessionHandler class (jeremylivingston)
This PR was squashed before being merged into the 3.0-dev branch (closes #12994).

Discussion
----------

Add LegacyPdoSessionHandler class

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

The changes made to the PdoSessionHandler in 2.6 introduced a
backwards-compatability break for users upgrading from 2.5. This update
introduces a LegacyPdoSessionHandler class that uses the old service's
functionality.

Users who cannot make schema updates or do not want to lose sessions can
use LegacyPdoSessionHandler until 3.0.

Commits
-------

20cb713 Add LegacyPdoSessionHandler class
2014-12-21 16:13:27 +01:00
Jeremy Livingston
20cb7139f9 Add LegacyPdoSessionHandler class 2014-12-21 16:13:24 +01:00
Fabien Potencier
397dfb2fa5 feature #13031 [Serializer] Add xml_format_output context option. Close #12517. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Add xml_format_output context option. Close #12517.

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

Allows to pretty print XML encoder output.

Commits
-------

37d3f84 [Serializer] Add xml_format_output context option. Close #12517.
2014-12-21 16:06:18 +01:00
Fabien Potencier
ff1b6854bf minor #13044 [2.7] [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.

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

Commits
-------

337eb57 [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
2014-12-21 16:04:52 +01:00
Fabien Potencier
27ac290b2a Merge branch '2.6' into 2.7
* 2.6:
  [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
  [WebProfilerBundle] Fixed IE8 support

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
2014-12-21 16:02:02 +01:00
Fabien Potencier
ff52a9f928 minor #13054 [2.3] CS Fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #13054).

Discussion
----------

[2.3] CS Fixes

| 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

##### This pull request provides some cs fixes.

Commits
-------

b521c20 [2.3] CS Fixes
2014-12-21 15:56:19 +01:00
Graham Campbell
b521c200a8 [2.3] CS Fixes 2014-12-21 15:56:12 +01:00
Fabien Potencier
188963f526 minor #13045 [2.6] [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite. (hhamon)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.

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

Commits
-------

ea4cf33 [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
2014-12-21 15:49:48 +01:00
Fabien Potencier
3892389c6d minor #13059 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.

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

Commits
-------

e22c887 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 15:48:15 +01:00
Saro0h
fa03e523d7 Fixed the issue 11116 2014-12-21 14:13:21 +01:00
Saro0h
5aa3ef465e [Security] Fixed tests 2014-12-21 13:39:03 +01:00
Saro0h
7b33d1a060 Removed all $that variables 2014-12-21 13:10:13 +01:00
Hugo Hamon
e22c887799 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. 2014-12-21 12:42:01 +01:00
Saro0h
2ca438deb6 [FrameworkBundle] Fixed Translation loader and update translation command. 2014-12-21 12:33:47 +01:00
Fabien Potencier
4c1ab52161 feature #13046 [3.0] [Bridge] [Swiftmailer] removed Swiftmailer bridge namespace. (hhamon)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [Bridge] [Swiftmailer] removed Swiftmailer bridge namespace.

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

Commits
-------

c70a616 [Bridge] [Swiftmailer] removes Swiftmailer bridge namespace.
2014-12-21 11:24:01 +01:00
Fabien Potencier
70f6fcd98b Merge branch '2.7'
* 2.7:
  [Bridge] [Swiftmailer] adds deprecation notice on MessageDataCollector class.
2014-12-21 11:22:54 +01:00