Merge branch '3.1'

* 3.1:
  fixed bad merge
  Fix PHP 7.1 related failures
  [VarDumper] Fix for 7.1
  fixed CS
  Added class existence check if is_subclass_of() fails in compiler passes
  Fix the DBAL session handler version check for Postgresql

Author: fabpot

.travis.yml

@@ -26,8 +26,9 @@ matrix:
           group: edge
         - php: 5.5
         - php: 5.6
-          env: deps=high
         - php: 7.0
+          env: deps=high
+        - php: 7.1
           env: deps=low
     fast_finish: true
 
@@ -55,13 +56,13 @@ before_install:
     - if [[ ! $skip ]]; then echo opcache.enable_cli = 1 >> $INI_FILE; fi
     - if [[ ! $skip && $PHP = 5.* ]]; then echo extension = mongo.so >> $INI_FILE; fi
     - if [[ ! $skip && $PHP = 5.* ]]; then echo extension = memcache.so >> $INI_FILE; fi
-    - if [[ ! $skip && $PHP = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.10 && echo apc.enable_cli = 1 >> $INI_FILE); fi
-    - if [[ ! $skip && $PHP = 7.* ]]; then (echo yes | pecl install -f apcu-5.1.2 && echo apc.enable_cli = 1 >> $INI_FILE); fi
+    - if [[ ! $skip && $PHP = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.11 && echo apc.enable_cli = 1 >> $INI_FILE); fi
+    - if [[ ! $skip && $PHP = 7.0 ]]; then (echo yes | pecl install -f apcu-5.1.5 && echo apc.enable_cli = 1 >> $INI_FILE); fi
     - if [[ ! $deps && $PHP = 5.* ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> $INI_FILE); fi
     - if [[ ! $skip && $PHP = 5.* ]]; then pecl install -f memcached-2.1.0; fi
     - if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = ldap.so >> $INI_FILE; fi
     - if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = redis.so >> $INI_FILE; fi;
-    - if [[ ! $skip && ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini; fi
+    - if [[ ! $skip && ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - if [[ ! $skip ]]; then composer self-update --stable; fi
     - if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi
     - if [[ ! $skip ]]; then ./phpunit install; fi

src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Platforms\SQLServer2008Platform;
 
 /**
@@ -241,9 +242,33 @@ private function getMergeSql()
                     "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time;";
             case 'sqlite' === $platform:
                 return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
-            case 'postgresql' === $platform && version_compare($this->con->getServerVersion(), '9.5', '>='):
+            case 'postgresql' === $platform && version_compare($this->getServerVersion(), '9.5', '>='):
                 return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
                     "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";
         }
     }
+
+    private function getServerVersion()
+    {
+        $params = $this->con->getParams();
+
+        // Explicit platform version requested (supersedes auto-detection), so we respect it.
+        if (isset($params['serverVersion'])) {
+            return $params['serverVersion'];
+        }
+
+        $wrappedConnection = $this->con->getWrappedConnection();
+
+        if ($wrappedConnection instanceof ServerInfoAwareConnection) {
+            return $wrappedConnection->getServerVersion();
+        }
+
+        // Support DBAL 2.4 by accessing it directly when using PDO PgSQL
+        if ($wrappedConnection instanceof \PDO) {
+            return $wrappedConnection->getAttribute(\PDO::ATTR_SERVER_VERSION);
+        }
+
+        // If we cannot guess the version, the empty string will mean we won't use the code for newer versions when doing version checks.
+        return '';
+    }
 }

src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt

@@ -22,5 +22,5 @@ class ProjectServiceContainer extends Container
     }
 }
 
-class stdClass_%s extends \stdClass implements \ProxyManager\%s
+class stdClass_%s extends %SstdClass implements \ProxyManager\%s
 {%a}%A

src/Symfony/Bridge/Twig/composer.json

@@ -33,7 +33,7 @@
         "symfony/security-acl": "~2.8|~3.0",
         "symfony/stopwatch": "~2.8|~3.0",
         "symfony/console": "~2.8|~3.0",
-        "symfony/var-dumper": "~2.8|~3.0",
+        "symfony/var-dumper": "~2.8.9|~3.0.9|~3.1.3|~3.2",
         "symfony/expression-language": "~2.8|~3.0"
     },
     "suggest": {

src/Symfony/Component/Console/Helper/Table.php

@@ -487,7 +487,7 @@ private function fillNextRows($rows, $line)
                 }
 
                 // create a two dimensional array (rowspan x colspan)
-                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, ''), $unmergedRows);
+                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, array()), $unmergedRows);
                 foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
                     $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
                     $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));

src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php

@@ -34,7 +34,7 @@ public function testCrossCheck($fixture, $type)
         $loaderClass = 'Symfony\\Component\\DependencyInjection\\Loader\\'.ucfirst($type).'FileLoader';
         $dumperClass = 'Symfony\\Component\\DependencyInjection\\Dumper\\'.ucfirst($type).'Dumper';
 
-        $tmp = tempnam('sf_service_container', 'sf');
+        $tmp = tempnam(sys_get_temp_dir(), 'sf');
 
         file_put_contents($tmp, file_get_contents(self::$fixturesPath.'/'.$type.'/'.$fixture));
 

src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php

@@ -97,9 +97,13 @@ public function process(ContainerBuilder $container)
 
             // We must assume that the class value has been correctly filled, even if the service is created by a factory
             $class = $container->getParameterBag()->resolveValue($def->getClass());
-
             $interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
+
             if (!is_subclass_of($class, $interface)) {
+                if (!class_exists($class, false)) {
+                    throw new \InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                }
+
                 throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
             }
 

src/Symfony/Component/Form/Util/OrderedHashMap.php

@@ -130,7 +130,7 @@ public function offsetSet($key, $value)
                     ? 0
                     // Imitate PHP's behavior of generating a key that equals
                     // the highest existing integer key + 1
-                    : max($this->orderedKeys) + 1;
+                    : 1 + (int) max($this->orderedKeys);
             }
 
             $this->orderedKeys[] = $key;

src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php

@@ -20,7 +20,7 @@ abstract class CacheWarmer implements CacheWarmerInterface
 {
     protected function writeCacheFile($file, $content)
     {
-        $tmpFile = tempnam(dirname($file), basename($file));
+        $tmpFile = @tempnam(dirname($file), basename($file));
         if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
             @chmod($file, 0666 & ~umask());
 

src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php

@@ -53,7 +53,12 @@ public function process(ContainerBuilder $container)
 
             $class = $container->getParameterBag()->resolveValue($def->getClass());
             $interface = 'Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface';
+
             if (!is_subclass_of($class, $interface)) {
+                if (!class_exists($class, false)) {
+                    throw new \InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                }
+
                 throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
             }