Merge branch '3.2'

* 3.2:
  fixed CS
  fixed CS

Author: fabpot

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php

@@ -15,7 +15,6 @@ class RegisterMappingsPassTest extends \PHPUnit_Framework_TestCase
     public function testNoDriverParmeterException()
     {
         $container = $this->createBuilder(array(
-
         ));
         $this->process($container, array(
             'manager.param.one',

src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 /**

src/Symfony/Component/Console/Tester/CommandTester.php

@@ -155,7 +155,7 @@ private static function createStream(array $inputs)
     {
         $stream = fopen('php://memory', 'r+', false);
 
-        fputs($stream, implode(PHP_EOL, $inputs));
+        fwrite($stream, implode(PHP_EOL, $inputs));
         rewind($stream);
 
         return $stream;

src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php

@@ -9,7 +9,7 @@
     $output = new SymfonyStyle($input, $output);
     $stream = fopen('php://memory', 'r+', false);
 
-    fputs($stream, "Foo\nBar\nBaz");
+    fwrite($stream, "Foo\nBar\nBaz");
     rewind($stream);
     $input->setStream($stream);
 

src/Symfony/Component/Debug/Exception/FlattenException.php

@@ -240,7 +240,7 @@ private function flattenArgs($args, $level = 0, &$count = 0)
                 $result[$key] = array('null', null);
             } elseif (is_bool($value)) {
                 $result[$key] = array('boolean', $value);
-            } elseif (is_integer($value)) {
+            } elseif (is_int($value)) {
                 $result[$key] = array('integer', $value);
             } elseif (is_float($value)) {
                 $result[$key] = array('float', $value);

src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php

@@ -255,7 +255,7 @@ function () {},
 
         // assertEquals() does not like NAN values.
         $this->assertEquals($array[$i][0], 'float');
-        $this->assertTrue(is_nan($array[$i++][1]));
+        $this->assertNan($array[$i++][1]);
     }
 
     public function testRecursionInArguments()

src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php

@@ -30,14 +30,14 @@ public function testConstructor()
     public function testGetUri()
     {
         $uri = 'http://symfony.com';
-        $crawler = new Crawler(null,  $uri);
+        $crawler = new Crawler(null, $uri);
         $this->assertEquals($uri, $crawler->getUri());
     }
 
     public function testGetBaseHref()
     {
         $baseHref = 'http://symfony.com';
-        $crawler = new Crawler(null,  null, $baseHref);
+        $crawler = new Crawler(null, null, $baseHref);
         $this->assertEquals($baseHref, $crawler->getBaseHref());
     }
 

src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -1281,7 +1281,7 @@ public function testInputStreamOnEmpty()
     {
         $i = 0;
         $input = new InputStream();
-        $input->onEmpty(function () use (&$i) {++$i;});
+        $input->onEmpty(function () use (&$i) { ++$i; });
 
         $process = $this->getProcess(self::$phpBin.' -r '.escapeshellarg('echo 123; echo fread(STDIN, 1); echo 456;'));
         $process->setInput($input);

src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php

@@ -123,7 +123,7 @@ public function testStrictWithInvalidEmails($email)
     }
 
     /**
-     * @link https://github.com/egulias/EmailValidator/blob/1.2.8/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
+     * @see https://github.com/egulias/EmailValidator/blob/1.2.8/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
      */
     public function getInvalidEmailsForStrictChecks()
     {

src/Symfony/Component/VarDumper/Cloner/Data.php

@@ -256,7 +256,7 @@ private function dumpChildren($dumper, $parentCursor, &$refs, $children, $hashCu
         $cursor->hashCut = $hashCut;
         foreach ($children as $key => $child) {
             $cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
-            $cursor->hashKey = $dumpKeys ? $key :  null;
+            $cursor->hashKey = $dumpKeys ? $key : null;
             $this->dumpItem($dumper, $cursor, $refs, $child);
             if (++$cursor->hashIndex === $this->maxItemsPerDepth || $cursor->stop) {
                 $parentCursor->stop = true;