Merge branch '3.1'

* 3.1:
  fixed CS
  fixed CS
  fixed CS
  fixed CS
  tweaked default CS fixer config
  [HttpKernel] Dont close the output stream in debug
  move HttpKernel component to require section
  Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
  [Session] fix PDO transaction aborted under PostgreSQL
  [Console] Use InputInterface inherited doc as possible
  Mention generating absolute urls in UPGRADE files and CHANGELOG
  parse embedded mappings only if value is a string
  add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
  FormBuilderInterface: fix getForm() return type.
  [YAML] Fixed parsing problem with nested DateTime lists
  Fixed typo in PHPDoc

Author: fabpot

ControllerMetadata/ArgumentMetadataFactory.php

@@ -101,7 +101,7 @@ private function getType(\ReflectionParameter $parameter)
             $refClass = $parameter->getClass();
         } catch (\ReflectionException $e) {
             // mandatory; extract it from the exception message
-            return str_replace(['Class ', ' does not exist'], '', $e->getMessage());
+            return str_replace(array('Class ', ' does not exist'), '', $e->getMessage());
         }
 
         return $refClass ? $refClass->getName() : null;

Kernel.php

@@ -134,6 +134,14 @@ public function terminate(Request $request, Response $response)
         }
 
         if ($this->getHttpKernel() instanceof TerminableInterface) {
+            if (!$this->debug) {
+                if (function_exists('fastcgi_finish_request')) {
+                    fastcgi_finish_request();
+                } elseif ('cli' !== PHP_SAPI) {
+                    Response::closeOutputBuffers(0, true);
+                }
+            }
+
             $this->getHttpKernel()->terminate($request, $response);
         }
     }

Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php

@@ -28,7 +28,7 @@ protected function setUp()
 
     public function testSignature1()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature1']);
+        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature1'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', self::class, false, false, null),
@@ -39,7 +39,7 @@ public function testSignature1()
 
     public function testSignature2()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature2']);
+        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature2'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', self::class, false, true, null),
@@ -50,7 +50,7 @@ public function testSignature2()
 
     public function testSignature3()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature3']);
+        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature3'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, false, null),
@@ -60,18 +60,18 @@ public function testSignature3()
 
     public function testSignature4()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature4']);
+        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature4'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', null, false, true, 'default'),
             new ArgumentMetadata('bar', null, false, true, 500),
-            new ArgumentMetadata('baz', null, false, true, []),
+            new ArgumentMetadata('baz', null, false, true, array()),
         ), $arguments);
     }
 
     public function testSignature5()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature5']);
+        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature5'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', 'array', false, true, null),
@@ -84,7 +84,7 @@ public function testSignature5()
      */
     public function testVariadicSignature()
     {
-        $arguments = $this->factory->createArgumentMetadata([new VariadicController(), 'action']);
+        $arguments = $this->factory->createArgumentMetadata(array(new VariadicController(), 'action'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', null, false, false, null),
@@ -97,7 +97,7 @@ public function testVariadicSignature()
      */
     public function testBasicTypesSignature()
     {
-        $arguments = $this->factory->createArgumentMetadata([new BasicTypesController(), 'action']);
+        $arguments = $this->factory->createArgumentMetadata(array(new BasicTypesController(), 'action'));
 
         $this->assertEquals(array(
             new ArgumentMetadata('foo', 'string', false, false, null),
@@ -108,26 +108,21 @@ public function testBasicTypesSignature()
 
     private function signature1(ArgumentMetadataFactoryTest $foo, array $bar, callable $baz)
     {
-
     }
 
     private function signature2(ArgumentMetadataFactoryTest $foo = null, FakeClassThatDoesNotExist $bar = null, ImportedAndFake $baz = null)
     {
-
     }
 
     private function signature3(FakeClassThatDoesNotExist $bar, ImportedAndFake $baz)
     {
-
     }
 
-    private function signature4($foo = 'default', $bar = 500, $baz = [])
+    private function signature4($foo = 'default', $bar = 500, $baz = array())
     {
-
     }
 
     private function signature5(array $foo = null, $bar)
     {
-
     }
 }