Merge branch '2.7' into pass-groups-on-collection-validate

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 3.4 or master / 2.7, 2.8, 3.2 or 3.3 <!-- see comment below -->
+| Branch?       | 3.4 or master / 2.7, 2.8 or 3.3 <!-- see comment below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
 | BC breaks?    | yes/no

.php_cs.dist

@@ -1,19 +1,21 @@
 <?php
 
+if (!file_exists(__DIR__.'/src')) {
+    exit(0);
+}
+
 return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
-        'heredoc_to_nowdoc' => false,
-        'phpdoc_annotation_without_dot' => false,
+        'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__.'/src')
+            ->append(array(__FILE__))
             ->exclude(array(
                 // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
                 'Symfony/Component/DependencyInjection/Tests/Fixtures',

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 
-dist: precise
+dist: trusty
 sudo: false
 
 git:
@@ -13,17 +13,14 @@ addons:
 
 env:
     global:
-        - MIN_PHP=5.3.9
+        - MIN_PHP=5.4.9
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
 
 matrix:
     include:
-        # Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
         - php: hhvm-3.18
           sudo: required
-          dist: trusty
           group: edge
-        - php: 5.3
         - php: 5.4
         - php: 5.5
         - php: 5.6
@@ -51,15 +48,38 @@ before_install:
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
       export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
 
+      nanoseconds() {
+          local cmd="date"
+          local format="+%s%N"
+          local os=$(uname)
+          if hash gdate > /dev/null 2>&1; then
+            cmd="gdate"
+          elif [[ "$os" = Darwin ]]; then
+            format="+%s000000000"
+          fi
+          $cmd -u $format
+      }
+      export -f nanoseconds
+
       # tfold is a helper to create folded reports
       tfold () {
-          title=$1
-          fold=$(echo $title | sed -r 's/[^-_A-Za-z\d]+/./g')
+          local title=$1
+          local fold=$(echo $title | sed -r 's/[^-_A-Za-z0-9]+/./g')
           shift
-          echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m"
-          bash -xc "$*" 2>&1 &&
+          local id=$(printf %08x $(( RANDOM * RANDOM )))
+          local start=$(nanoseconds)
+          echo -e "travis_fold:start:$fold"
+          echo -e "travis_time:start:$id"
+          echo -e "\\e[1;34m$title\\e[0m"
+
+          bash -xc "$*" 2>&1
+          local ok=$?
+          local end=$(nanoseconds)
+          echo -e "\\ntravis_time:end:$id:start=$start,finish=$end,duration=$(($end-$start))"
+          (exit $ok) &&
               echo -e "\\e[32mOK\\e[0m $title\\n\\ntravis_fold:end:$fold" ||
-              ( echo -e "\\e[41mKO\\e[0m $title\\n" && exit 1 )
+              echo -e "\\e[41mKO\\e[0m $title\\n"
+          (exit $ok)
       }
       export -f tfold
 
@@ -76,7 +96,6 @@ before_install:
       echo opcache.enable_cli = 1 >> $INI
       echo hhvm.jit = 0 >> $INI
       echo apc.enable_cli = 1 >> $INI
-      echo extension = ldap.so >> $INI
       [[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
       if [[ $PHP = 5.* ]]; then
           echo extension = mongo.so >> $INI

CHANGELOG-2.7.md

@@ -7,6 +7,30 @@ in 2.7 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.7.0...v2.7.1
 
+* 2.7.34 (2017-08-28)
+
+ * bug #23989 [Debug] Remove false-positive check in DebugClassLoader (nicolas-grekas)
+ * bug #23982 [VarDumper] Strengthen dumped JS (nicolas-grekas)
+ * bug #23925 [Validator] Fix use of GroupSequenceProvider in child classes (linniksa)
+ * bug #23945 [Validator] Fix Greek translation (azhurb)
+ * bug #23909 [Console] Initialize lazily to render exceptions properly (nicolas-grekas)
+ * bug #23856 [DI] Fix dumping abstract with YamlDumper (nicolas-grekas)
+ * bug #23752 Ignore memcached missing key error on session destroy (jderusse)
+ * bug #23658 [HttpFoundation] Generate safe fallback filename for wrongly encoded filename (xelaris)
+ * bug #23783 Avoid infinite loops when profiler data is malformed (javiereguiluz)
+ * bug #23729 [Bridge\ProxyManager] Dont call __destruct() on non-instantiated services (nicolas-grekas)
+
+* 2.7.33 (2017-08-01)
+
+ * bug #22244 [Console] Fix passing options with defaultCommand (Jakub Sacha)
+ * bug #23684 [Debug] Missing escape in debug output (c960657)
+ * bug #23662 [VarDumper] Adapt to php 7.2 changes (nicolas-grekas)
+ * bug #23649 [Form][TwigBridge] Don't render _method in form_rest() for a child form (fmarchalemisys)
+ * bug #23619 [Validator] Fix IbanValidator for ukrainian IBANs (paroe)
+ * bug #23238 [Security] ensure the 'route' index is set before attempting to use it (gsdevme)
+ * bug #23580 Fix login redirect when referer contains a query string (fabpot)
+ * bug #23574 [VarDumper] Move locale sniffing to dump() time (nicolas-grekas)
+
 * 2.7.32 (2017-07-17)
 
  * security #23507 [Security] validate empty passwords again (xabbuh)