Merge branch '2.3' into 2.7

* 2.3:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php

.php_cs

@@ -24,5 +24,7 @@ return Symfony\CS\Config\Config::create()
             ->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
             // test template
             ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
+            // explicit heredoc test
+            ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
     )
 ;

.travis.yml

@@ -60,7 +60,7 @@ install:
 script:
     - if [[ ! $deps ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
     - if [[ ! $deps ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi;
-    - if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
+    - if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu --timeout 60 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
     - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi;
     - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
     - if [[ $deps = skip ]]; then echo This matrix line is skipped for pull requests.; fi;

CHANGELOG-2.3.md

@@ -7,6 +7,34 @@ in 2.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
 
+* 2.3.36 (2015-12-26)
+
+ * bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
+ * bug #16826 Embedded identifier support (mihai-stancu)
+ * bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
+ * bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
+ * bug #17112 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace (alekitto)
+ * bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)
+ * bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
+ * bug #17055 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters (jakzal)
+ * bug #16959 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too (HeahDude)
+ * bug #16860 [Yaml] do not remove "comments" in scalar blocks (xabbuh)
+ * bug #16971 [HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers (jakzal, Sander-Toonen)
+ * bug #17048 Fix the logout path when not using the router (stof)
+ * bug #17057 [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands (xabbuh)
+ * bug #16915 [Process] Enhance compatiblity with --enable-sigchild (nicolas-grekas)
+ * bug #16829 [FrameworkBundle] prevent cache:clear creating too long paths (Tobion)
+ * bug #16870 [FrameworkBundle] Disable the server:run command when Process component is missing (gnugat, xabbuh)
+ * bug #16799 Improve error message for undefined DIC aliases (mpdude)
+ * bug #16772 Refactoring EntityUserProvider::__construct() to not do work, cause cache warm error (weaverryan)
+ * bug #16753 [Process] Fix signaling/stopping logic on Windows (nicolas-grekas)
+ * bug #16733 [Console] do not encode backslashes in console default description (Tobion)
+ * bug #16312 [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released (mpdude)
+ * bug #16695 [SecurityBundle] disable the init:acl command if ACL is not used (Tobion)
+ * bug #16676 [HttpFoundation] Workaround HHVM rewriting HTTP response line (nicolas-grekas)
+ * bug #16668 [ClassLoader] Fix parsing namespace when token_get_all() is missing (nicolas-grekas)
+ * bug #16386 Bug #16343 [Router] Too many Routes ? (jelte)
+
 * 2.3.35 (2015-11-23)
 
  * security #16631 CVE-2015-8124: Session Fixation in the "Remember Me" Login Feature (xabbuh)