Commit Graph

20691 Commits

Author SHA1 Message Date
Nicolas Grekas
dc6ea1a859 minor #13918 [travis] Do no tar in // (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Do no tar in //

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

Using tar in parallel break 2.6 tests randomly with messages like "tar: Acl: file changed as we read it"
Removing parallel has no perf impact in this case and fixes the issue.
Best review with `?w=1`

Commits
-------

4f93aa3 [travis] Do no tar in //
2015-03-13 14:21:24 +01:00
Nicolas Grekas
4f93aa3318 [travis] Do no tar in // 2015-03-13 13:47:20 +01:00
Fabien Potencier
027a747736 feature #13897 [translation][performances] move loading resources into Translator initialize. (aitboudad)
This PR was squashed before being merged into the 2.7 branch (closes #13897).

Discussion
----------

[translation][performances] move loading resources into Translator initialize.

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

Commits
-------

bf5c583 [translation][performances] move loading resources into Translator initialize.
2015-03-13 13:42:25 +01:00
Abdellatif Ait boudad
bf5c583fe6 [translation][performances] move loading resources into Translator initialize. 2015-03-13 13:42:22 +01:00
Fabien Potencier
0de88bbcc1 feature #13864 Entity type: loader caching by query builder instance (dominikzogg)
This PR was merged into the 2.7 branch.

Discussion
----------

Entity type: loader caching by query builder instance

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

Using entity types within a collection, can get very slow, if a query_builder option is set.

Without this option, the doctrine type handles everything itself, and makes it calls against the manager registry, but using this, calls the getLoader method, which ends in build the choice list again for each collection element, which makes more than twice the time for a page load within my energycalculator.

https://github.com/dominikzogg/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php#L68

https://github.com/dominikzogg/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php#L108

https://github.com/dominikzogg/energycalculator/blob/master/src/Dominikzogg/EnergyCalculator/Form/ComestibleWithinDayType.php

Commits
-------

42b682b allow to cache entity loader based on query builder
2015-03-13 13:38:17 +01:00
Dominik Zogg
42b682b883 allow to cache entity loader based on query builder 2015-03-13 12:48:27 +01:00
Nicolas Grekas
bdc68c3b8a removed obsolete test 2015-03-13 12:21:11 +01:00
Fabien Potencier
d8720427d1 bug #13871 [Assets] Make templating.helper.assets service available again for BC reasons (WouterJ)
This PR was squashed before being merged into the 2.7 branch (closes #13871).

Discussion
----------

[Assets] Make templating.helper.assets service available again for BC reasons

This service has always been available and the SonataDoctrinePhpcrOdmBundle relied on this services. Moving it to the templating_php config (which is only loaded when PHP templating is enabled, which is often not the case) is a BC break that makes it very hard to support <2.7 and 2.7.

This should be reverted for the 3.0 branch (master), as it should be removed in 3.0. However, it should be added to the `UPRADE-3.0.md` file.

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

Commits
-------

a4b7da5 [Assets] Make templating.helper.assets service available again for BC reasons
2015-03-13 12:07:03 +01:00
WouterJ
a4b7da57db [Assets] Make templating.helper.assets service available again for BC reasons 2015-03-13 12:07:00 +01:00
Nicolas Grekas
21450da1f0 Merge branch '2.7'
* 2.7:
  Changed visibility of setUp() and tearDown to protected
  Changed visibility of setUp() and tearDown to protected
  [2.7] Fix travis file
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  [Debug] reintroduce charset param to ExceptionHandler
  Changed visibility of setUp() and tearDown to protected
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  [Debug] deprecate ExceptionHandler::utf8Htmlize
  Added default button class
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  [FrameworkBundle] Read config/validation/*.(xml|yml) files
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
	src/Symfony/Bundle/TwigBundle/Tests/Extension/LegacyAssetsExtensionTest.php
	src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
	src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
	src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
	src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
2015-03-13 11:36:02 +01:00
Nicolas Grekas
de658e75e8 minor #13903 [2.7] Changed visibility of setUp() and tearDown to protected (saro0h)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Changed visibility of setUp() and tearDown to protected

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

Commits
-------

a818ab2 Changed visibility of setUp() and tearDown to protected
2015-03-13 11:02:01 +01:00
sarah khalil
a818ab2fb1 Changed visibility of setUp() and tearDown to protected 2015-03-13 10:59:53 +01:00
Nicolas Grekas
6aa74b8daf Merge branch '2.6' into 2.7
* 2.6:
  Changed visibility of setUp() and tearDown to protected
2015-03-13 10:55:11 +01:00
Nicolas Grekas
18bb15734f minor #13905 [2.6] Changed visibility of setUp() and tearDown to protected (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Changed visibility of setUp() and tearDown to protected

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

Commits
-------

48d5e20 Changed visibility of setUp() and tearDown to protected
2015-03-13 10:54:18 +01:00
sarah khalil
48d5e20e7e Changed visibility of setUp() and tearDown to protected 2015-03-13 10:50:03 +01:00
Fabien Potencier
8a18b56c3b minor #13908 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13908).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- unused array fill-in removed (dead code)
- reduced str_replace calls \Symfony\Component\BrowserKit\Response::getHeader

Commits
-------

d05cffb [2.3] Static Code Analysis for Components
2015-03-12 18:51:58 +01:00
Vladimir Reznichenko
d05cffb409 [2.3] Static Code Analysis for Components 2015-03-12 18:51:57 +01:00
Nicolas Grekas
e91058089c [2.7] Fix travis file 2015-03-12 15:47:10 +01:00
Nicolas Grekas
578dccfe1f Merge branch '2.6' into 2.7
* 2.6:
  [Debug] reintroduce charset param to ExceptionHandler
2015-03-12 15:45:07 +01:00
Fabien Potencier
0fc1e9f421 bug #13899 [Debug] deprecate protected ExceptionHandler::utf8Htmlize (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] deprecate protected ExceptionHandler::utf8Htmlize

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

Commits
-------

132b3b1 [Debug] deprecate ExceptionHandler::utf8Htmlize
2015-03-12 15:33:21 +01:00
Fabien Potencier
900558c9c4 bug #13902 [Debug] reintroduce charset param to ExceptionHandler (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] reintroduce charset param to ExceptionHandler

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

For some reason, we removed the charset arg of the constructor in 2.5, then used the same position to add fileLinkFormat in 2.6. This is a BC break with 2.3.
This PR reintroduces charset at second position, with some heuristic to keep compat with 2.6

Commits
-------

c8bd867 [Debug] reintroduce charset param to ExceptionHandler
2015-03-12 15:32:01 +01:00
Fabien Potencier
6d605a7d3e Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  Changed visibility of setUp() and tearDown to protected
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  Added default button class
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	.travis.yml
2015-03-12 15:31:07 +01:00
Fabien Potencier
43efb1ac1c Merge branch '2.3' into 2.6
* 2.3:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2015-03-12 15:30:42 +01:00
Fabien Potencier
374b7180bf bug #13901 [Bundle] Fix charset config (nicolas-grekas, bamarni)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle] Fix charset config

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

This reverts #13715 and resurrects #7532, which was fine.

Commits
-------

ef41059 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
cbd0525 used HTML5 meta charset tag and removed hardcoded ones
6ca7fc9 Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
2015-03-12 15:23:35 +01:00
Fabien Potencier
a4d6be4b55 bug #13911 [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age (bzikarsky)
This PR was squashed before being merged into the 2.3 branch (closes #13911).

Discussion
----------

[HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age

This PR is a follow-up to #12516 and replaces the old one.

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

As discussed there: Sessions which are older than GC age should never be read.
This PR adds the expiry-datetime on session-write and changes session-read and session-gc accordingly.

We still need to update the documentation with some clarifications, as described here:
- https://github.com/symfony/symfony/pull/12516#issuecomment-65028144
- https://github.com/symfony/symfony/pull/12516#issuecomment-69087996

My experience with the Symfony Docs from a developer perspective is very limited, so help would be very appreciated.

Commits
-------

8289ec3 [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
2015-03-12 15:16:01 +01:00
Benjamin Zikarsky
8289ec35b3 [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age 2015-03-12 15:15:59 +01:00
Nicolas Grekas
c8bd867414 [Debug] reintroduce charset param to ExceptionHandler 2015-03-12 11:30:29 +01:00
Nicolas Grekas
fc009c16d7 Merge branch '2.3' into 2.6
* 2.3:
  Changed visibility of setUp() and tearDown to protected
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Config/Util/XmlUtils.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Yaml/Inline.php
2015-03-12 11:28:44 +01:00
Nicolas Grekas
f68532cc0d minor #13906 [2.3] Changed visibility of setUp() and tearDown to protected (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Changed visibility of setUp() and tearDown to protected

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

Commits
-------

1e64220 Changed visibility of setUp() and tearDown to protected
2015-03-12 10:37:37 +01:00
sarah khalil
1e64220b95 Changed visibility of setUp() and tearDown to protected 2015-03-11 19:52:02 +01:00
Nicolas Grekas
ef410597a6 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback 2015-03-11 17:56:24 +01:00
Nicolas Grekas
132b3b1e66 [Debug] deprecate ExceptionHandler::utf8Htmlize 2015-03-11 17:29:23 +01:00
Fabien Potencier
5ad671ae2e bug #13883 #13857 Added default button class (Piers Warmers)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13883).

Discussion
----------

#13857 Added default button class

[Bridge\Twig] Added default-btn class to Twig button block.

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

Commits
-------

c07a902 Added default button class
2015-03-11 16:48:24 +01:00
Piers Warmers
c07a902d4d Added default button class 2015-03-11 16:48:23 +01:00
Bilal Amarni
cbd0525f8f used HTML5 meta charset tag and removed hardcoded ones
Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
2015-03-11 16:27:03 +01:00
Nicolas Grekas
6ca7fc9460 Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
This reverts commit 463b24b27c, reversing
changes made to c475704c8f.
2015-03-11 15:41:28 +01:00
Fabien Potencier
e020f749f0 bug #13890 Fix XSS in Debug exception handler (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix XSS in Debug exception handler

| 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

This XSS issue has been reported to security@symfony.com but after discussing this issue, we decided to treat it as a regular bug as the debug mode **must** never be enabled on production servers (as it can leak many sensitive information coming from arguments displayed in the stack trace for instance -- even more information is leaked when used with the Symfony full-stack framework).

Commits
-------

1af6a9e fixed XSS in the exception handler
2015-03-11 10:21:57 +01:00
Fabien Potencier
f86ad95683 [DependencyInjection] fixed service resolution for factories 2015-03-11 09:33:49 +01:00
Fabien Potencier
1af6a9ec5a fixed XSS in the exception handler 2015-03-10 14:08:39 +01:00
Nicolas Grekas
22f4807522 [HttpKernel] Throw a LogicException when kernel.exception does not led to a Response 2015-03-09 17:32:01 +01:00
Fabien Potencier
43f74ef41f minor #13845 [travis] Test with local components instead of waiting for the subtree-splitter when possible (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Test with local components instead of waiting for the subtree-splitter when possible

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

Should be ready - a first step that allows testing PR with the proposed patch. Works only when deps are resolved to the same branch. But this opens the way for further improvements.

Commits
-------

f885b9b Test with local components instead of waiting for the subtree-splitter when possible
2015-03-09 16:14:43 +01:00
Fabien Potencier
de0bd91c83 minor #13866 [2.3] Remove most refs uses (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Remove most refs uses

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

Removes some references usages. They are error prone, and trigger too many copies-on-writes.

Commits
-------

8862705 [2.3] Remove most refs uses
2015-03-09 08:38:59 +01:00
Fabien Potencier
6963887589 feature #13855 Read validation contraints from Resources/config/validation/ sub-dir (GromNaN)
This PR was merged into the 2.7 branch.

Discussion
----------

Read validation contraints from Resources/config/validation/ sub-dir

When a bundle contains many entities/documents and it uses YAML or XML format instead of annotations, it is convenient to split the validation constraints into several small files.

With this simple PR, every files in the `validation` sub-directory will be loaded by the validator like it's done for doctrine mapping.

```
Resources/
    config/
        doctrine/
            Author.orm.yml
            Post.orm.yml
        validation/
            Author.yml
            Post.yml
```

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [How to split validation yaml files](http://stackoverflow.com/questions/24064813/how-to-split-validation-yaml-files-in-symfony-2-5/24210501#24210501)
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5060

Read more: http://blog.kevingomez.fr/2013/10/14/split-symfony2-yaml-validation-configuration-file/

Commits
-------

e41dcb3 [FrameworkBundle] Read config/validation/*.(xml|yml) files
2015-03-09 08:25:49 +01:00
Fabien Potencier
a73413ee91 minor #13869 [2.3] static code analysis across codebase (kalessil)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] static code analysis across codebase

| 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

Static Code Analysis with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>, no functional changes:
- Reduce couple count calls in a array dump function [Yaml]
- Modernize type casting, fix several strict comparisons on the way
- Unsets merged
- Elvis operator usage (couple more cases)
- Short syntax for applied operations

PS: I didn't try merging these changes into 2.6, expecting conflicts in the case.

Commits
-------

9682756 Php Inspections (EA Extended) - static code analysis includes:
2015-03-09 07:55:40 +01:00
Hidde Wieringa
25ef76fded [FrameworkBundle] Added domain column when debugging translations 2015-03-08 21:28:04 +01:00
Vladimir Reznichenko
968275624a Php Inspections (EA Extended) - static code analysis includes:
Reduce couple count calls in [Yaml]
Modernize type casting, fix several strict comparisons
Unsets merged
Elvis operator usage
Short syntax for applied operations
2015-03-07 20:12:23 +01:00
Nicolas Grekas
ac803e753a [PhpUnitBridge] do not replace but require-dev in symfony/symfony 2015-03-07 17:28:03 +01:00
Nicolas Grekas
88627058c9 [2.3] Remove most refs uses 2015-03-07 13:18:29 +01:00
Fabien Potencier
13bf31bcf3 Merge branch '2.7'
* 2.7: (22 commits)
  Php Inspections (EA Extended): squash all PR-13813 commits
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [FrameworkBundle] simplify dep declaration
  [VarDumper] Fix "next element is already occupied"
  [Serializer] Introduce ObjectNormalizer
  [Serializer] Refactoring of metadata
  [Validator] Added missing galician (gl) translations
  [WebProfilerBundle] Update ajax calls in toolbar to add the css error class
  [PropertyAccess] stop overwriting once a reference is reached (3rd)
  [OptionsResolver] Remove Unused Variable from Foreach Cycles
  [travis] Tests Security sub-components
  [Serializer] Test that normalizers ignore non-existing attributes.
  [Twig] bootstrap_3_layout.html.twig is usable as a trait
  [travis] Tests Security sub-components
  [Serializer] Fix ClassMetadataFactory PHPDoc
  CS fixes
  [Serializer] rename exception interface
  [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
  [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
  ...

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
	src/Symfony/Component/Serializer/composer.json
2015-03-07 08:44:26 +01:00
Fabien Potencier
0f00f7c7e8 Merge branch '2.6' into 2.7
* 2.6:
  Php Inspections (EA Extended): squash all PR-13813 commits
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [FrameworkBundle] simplify dep declaration
  [VarDumper] Fix "next element is already occupied"
  [Validator] Added missing galician (gl) translations
  [PropertyAccess] stop overwriting once a reference is reached (3rd)
  [OptionsResolver] Remove Unused Variable from Foreach Cycles
  [travis] Tests Security sub-components
  [Twig] bootstrap_3_layout.html.twig is usable as a trait
  [travis] Tests Security sub-components
  CS fixes
  [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
  [travis] test with php nightly

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-03-07 08:43:00 +01:00