Fix CS

fabpot · fabpot · commit 06cefc03ea41 · 2020-02-04T10:32:40.000+01:00
diff --git a/Tests/DnsMockTest.php b/Tests/DnsMockTest.php
@@ -18,15 +18,15 @@ class DnsMockTest extends TestCase
 {
     protected function tearDown(): void
     {
-        DnsMock::withMockedHosts(array());
+        DnsMock::withMockedHosts([]);
     }
 
     public function testCheckdnsrr()
     {
-        DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'MX'))));
+        DnsMock::withMockedHosts(['example.com' => [['type' => 'MX']]]);
         $this->assertTrue(DnsMock::checkdnsrr('example.com'));
 
-        DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'A'))));
+        DnsMock::withMockedHosts(['example.com' => [['type' => 'A']]]);
         $this->assertFalse(DnsMock::checkdnsrr('example.com'));
         $this->assertTrue(DnsMock::checkdnsrr('example.com', 'a'));
         $this->assertTrue(DnsMock::checkdnsrr('example.com', 'any'));
@@ -35,34 +35,34 @@ public function testCheckdnsrr()
 
     public function testGetmxrr()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(array(
+        DnsMock::withMockedHosts([
+            'example.com' => [[
                 'type' => 'MX',
                 'host' => 'mx.example.com',
                 'pri' => 10,
-            )),
-        ));
+            ]],
+        ]);
 
         $this->assertFalse(DnsMock::getmxrr('foobar.com', $mxhosts, $weight));
         $this->assertTrue(DnsMock::getmxrr('example.com', $mxhosts, $weight));
-        $this->assertSame(array('mx.example.com'), $mxhosts);
-        $this->assertSame(array(10), $weight);
+        $this->assertSame(['mx.example.com'], $mxhosts);
+        $this->assertSame([10], $weight);
     }
 
     public function testGethostbyaddr()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'AAAA',
                     'ipv6' => '::12',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertSame('::21', DnsMock::gethostbyaddr('::21'));
         $this->assertSame('example.com', DnsMock::gethostbyaddr('::12'));
@@ -71,78 +71,78 @@ public function testGethostbyaddr()
 
     public function testGethostbyname()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'AAAA',
                     'ipv6' => '::12',
-                ),
-                array(
+                ],
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertSame('foobar.com', DnsMock::gethostbyname('foobar.com'));
         $this->assertSame('1.2.3.4', DnsMock::gethostbyname('example.com'));
     }
 
     public function testGethostbynamel()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'A',
                     'ip' => '2.3.4.5',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertFalse(DnsMock::gethostbynamel('foobar.com'));
-        $this->assertSame(array('1.2.3.4', '2.3.4.5'), DnsMock::gethostbynamel('example.com'));
+        $this->assertSame(['1.2.3.4', '2.3.4.5'], DnsMock::gethostbynamel('example.com'));
     }
 
     public function testDnsGetRecord()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'PTR',
                     'ip' => '2.3.4.5',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
-        $records = array(
-            array(
+        $records = [
+            [
                 'host' => 'example.com',
                 'class' => 'IN',
                 'ttl' => 1,
                 'type' => 'A',
                 'ip' => '1.2.3.4',
-            ),
-            $ptr = array(
+            ],
+            $ptr = [
                 'host' => 'example.com',
                 'class' => 'IN',
                 'ttl' => 1,
                 'type' => 'PTR',
                 'ip' => '2.3.4.5',
-            ),
-        );
+            ],
+        ];
 
         $this->assertFalse(DnsMock::dns_get_record('foobar.com'));
         $this->assertSame($records, DnsMock::dns_get_record('example.com'));
         $this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_ALL));
         $this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_A | DNS_PTR));
-        $this->assertSame(array($ptr), DnsMock::dns_get_record('example.com', DNS_PTR));
+        $this->assertSame([$ptr], DnsMock::dns_get_record('example.com', DNS_PTR));
     }
 }
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -15,7 +15,7 @@
 error_reporting(-1);
 
 global $argv, $argc;
-$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
+$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : [];
 $argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
 $getEnvVar = function ($name, $default = false) use ($argv) {
     if (false !== $value = getenv($name)) {
@@ -130,11 +130,11 @@
     $PHP .= ' -qrr';
 }
 
-$defaultEnvs = array(
+$defaultEnvs = [
     'COMPOSER' => 'composer.json',
     'COMPOSER_VENDOR_DIR' => 'vendor',
     'COMPOSER_BIN_DIR' => 'bin',
-);
+];
 
 foreach ($defaultEnvs as $envName => $envValue) {
     if ($envValue !== getenv($envName)) {
@@ -147,21 +147,21 @@
     || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
     || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))
     || file_exists($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? `git rev-parse --show-toplevel 2> NUL` : `git rev-parse --show-toplevel 2> /dev/null`).DIRECTORY_SEPARATOR.'composer.phar')
-    ? (file_get_contents($COMPOSER, false, null, 0, 18) === '#!/usr/bin/env php' ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
+    ? ('#!/usr/bin/env php' === file_get_contents($COMPOSER, false, null, 0, 18) ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
     : 'composer';
 
-$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml': ''));
-$configurationHash = md5(implode(PHP_EOL, array(md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT)));
-$PHPUNIT_VERSION_DIR=sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);
+$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));
+$configurationHash = md5(implode(PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));
+$PHPUNIT_VERSION_DIR = sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);
 if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") || $configurationHash !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION_DIR.md5")) {
     // Build a standalone phpunit without symfony/yaml nor prophecy by default
 
     @mkdir($PHPUNIT_DIR, 0777, true);
     chdir($PHPUNIT_DIR);
     if (file_exists("$PHPUNIT_VERSION_DIR")) {
-        passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? 'rmdir /S /Q %s > NUL': 'rm -rf %s', "$PHPUNIT_VERSION_DIR.old"));
+        passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? 'rmdir /S /Q %s > NUL' : 'rm -rf %s', "$PHPUNIT_VERSION_DIR.old"));
         rename("$PHPUNIT_VERSION_DIR", "$PHPUNIT_VERSION_DIR.old");
-        passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? 'rmdir /S /Q %s': 'rm -rf %s', "$PHPUNIT_VERSION_DIR.old"));
+        passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? 'rmdir /S /Q %s' : 'rm -rf %s', "$PHPUNIT_VERSION_DIR.old"));
     }
     $passthruOrFail("$COMPOSER create-project --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi phpunit/phpunit $PHPUNIT_VERSION_DIR \"$PHPUNIT_VERSION.*\"");
     @copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
@@ -187,7 +187,7 @@
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     $q = '\\' === DIRECTORY_SEPARATOR ? '"' : '';
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
-    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", array(), $p, getcwd()));
+    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", [], $p, getcwd()));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {
         exit($exit);
@@ -233,13 +233,20 @@ class SymfonyBlacklistPhpunit {}
 }
 
 if ($PHPUNIT_VERSION < 8.0) {
-    $argv = array_filter($argv, function ($v) use (&$argc) { if ('--do-not-cache-result' !== $v) return true; --$argc; return false; });
+    $argv = array_filter($argv, function ($v) use (&$argc) {
+        if ('--do-not-cache-result' !== $v) {
+            return true;
+        }
+        --$argc;
+
+        return false;
+    });
 } elseif (filter_var(getenv('SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE'), FILTER_VALIDATE_BOOLEAN)) {
     $argv[] = '--do-not-cache-result';
     ++$argc;
 }
 
-$components = array();
+$components = [];
 $cmd = array_map('escapeshellarg', $argv);
 $exit = 0;
 
@@ -274,7 +281,7 @@ class SymfonyBlacklistPhpunit {}
 
 if ($components) {
     $skippedTests = isset($_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS']) ? $_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS'] : false;
-    $runningProcs = array();
+    $runningProcs = [];
 
     foreach ($components as $component) {
         // Run phpunit tests in parallel
@@ -285,7 +292,7 @@ class SymfonyBlacklistPhpunit {}
 
         $c = escapeshellarg($component);
 
-        if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), array(), $pipes)) {
+        if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), [], $pipes)) {
             $runningProcs[$component] = $proc;
         } else {
             $exit = 1;
@@ -295,7 +302,7 @@ class SymfonyBlacklistPhpunit {}
 
     while ($runningProcs) {
         usleep(300000);
-        $terminatedProcs = array();
+        $terminatedProcs = [];
         foreach ($runningProcs as $component => $proc) {
             $procStatus = proc_get_status($proc);
             if (!$procStatus['running']) {
@@ -306,7 +313,7 @@ class SymfonyBlacklistPhpunit {}
         }
 
         foreach ($terminatedProcs as $component => $procStatus) {
-            foreach (array('out', 'err') as $file) {
+            foreach (['out', 'err'] as $file) {
                 $file = "$component/phpunit.std$file";
                 readfile($file);
                 unlink($file);
@@ -316,7 +323,7 @@ class SymfonyBlacklistPhpunit {}
             // STATUS_STACK_BUFFER_OVERRUN (-1073740791/0xC0000409)
             // STATUS_ACCESS_VIOLATION (-1073741819/0xC0000005)
             // STATUS_HEAP_CORRUPTION (-1073740940/0xC0000374)
-            if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN) || !in_array($procStatus, array(-1073740791, -1073741819, -1073740940)))) {
+            if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN) || !in_array($procStatus, [-1073740791, -1073741819, -1073740940]))) {
                 $exit = $procStatus;
                 echo "\033[41mKO\033[0m $component\n\n";
             } else {
@@ -326,9 +333,11 @@ class SymfonyBlacklistPhpunit {}
     }
 } elseif (!isset($argv[1]) || 'install' !== $argv[1] || file_exists('install')) {
     if (!class_exists('SymfonyBlacklistSimplePhpunit', false)) {
-        class SymfonyBlacklistSimplePhpunit {}
+        class SymfonyBlacklistSimplePhpunit
+        {
+        }
     }
-    array_splice($argv, 1, 0, array('--colors=always'));
+    array_splice($argv, 1, 0, ['--colors=always']);
     $_SERVER['argv'] = $argv;
     $_SERVER['argc'] = ++$argc;
     include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";
