Merge pull request symfony#89 from dunglas/native_functions

dunglas · web-flow · commit c162c195c76d · 2018-09-23T20:05:01.000+02:00
Add a backslash only to opmizable functions
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -52,6 +52,7 @@ return PhpCsFixer\Config::create()
         'strict_comparison' => true,
         'strict_param' => true,
         'ternary_to_null_coalescing' => true,
+        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
     ])
     ->setFinder($finder)
 ;
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,8 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - if [[ $lint = '1' ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.12.1/php-cs-fixer.phar; fi
-  - if [[ $lint = '1' ]]; then wget https://github.com/phpstan/phpstan/releases/download/0.10.1/phpstan.phar; fi
+  - if [[ $lint = '1' ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.13.0/php-cs-fixer.phar; fi
+  - if [[ $lint = '1' ]]; then wget https://github.com/phpstan/phpstan/releases/download/0.10.3/phpstan.phar; fi
 
 before_script:
   - phpenv config-rm xdebug.ini
diff --git a/src/Cookie/CookieJar.php b/src/Cookie/CookieJar.php
@@ -139,7 +139,7 @@ private function getWebDriverCookie(string $name, string $path = '/', ?string $d
         }
 
         $cookiePath = $cookie->getPath() ?? '/';
-        if (0 !== \strpos($path, $cookiePath)) {
+        if (0 !== strpos($path, $cookiePath)) {
             return null;
         }
 
@@ -148,8 +148,8 @@ private function getWebDriverCookie(string $name, string $path = '/', ?string $d
             return $cookie;
         }
 
-        $cookieDomain = '.'.\ltrim($cookieDomain, '.');
-        if ($cookieDomain !== \substr('.'.$domain, -\strlen($cookieDomain))) {
+        $cookieDomain = '.'.ltrim($cookieDomain, '.');
+        if ($cookieDomain !== substr('.'.$domain, -\strlen($cookieDomain))) {
             return null;
         }
 
diff --git a/src/ProcessManager/ChromeManager.php b/src/ProcessManager/ChromeManager.php
@@ -34,7 +34,7 @@ public function __construct(?string $chromeDriverBinary = null, ?array $argument
     {
         $this->process = new Process([$chromeDriverBinary ?: $this->findChromeDriverBinary()], null, null, null, null);
         $this->arguments = $arguments ?? $this->getDefaultArguments();
-        $this->options = \array_merge($this->getDefaultOptions(), $options);
+        $this->options = array_merge($this->getDefaultOptions(), $options);
     }
 
     /**
diff --git a/src/ProcessManager/WebServerManager.php b/src/ProcessManager/WebServerManager.php
@@ -45,13 +45,13 @@ public function __construct(string $documentRoot, string $hostname, int $port)
         }
 
         $this->process = new Process(
-            \array_merge(
+            array_merge(
                 [$binary],
                 $finder->findArguments(),
                 [
                     '-dvariables_order=EGPCS',
                     '-S',
-                    \sprintf('%s:%d', $this->hostname, $this->port),
+                    sprintf('%s:%d', $this->hostname, $this->port),
                     '-t',
                     $documentRoot,
                 ]
diff --git a/src/ProcessManager/WebServerReadinessProbeTrait.php b/src/ProcessManager/WebServerReadinessProbeTrait.php
@@ -27,9 +27,9 @@ trait WebServerReadinessProbeTrait
      */
     private function checkPortAvailable(string $hostname, int $port, bool $throw = true): void
     {
-        $resource = @\fsockopen($hostname, $port);
+        $resource = @fsockopen($hostname, $port);
         if (\is_resource($resource)) {
-            \fclose($resource);
+            fclose($resource);
             if ($throw) {
                 throw new \RuntimeException(\sprintf('The port %d is already in use.', $port));
             }
@@ -38,21 +38,21 @@ private function checkPortAvailable(string $hostname, int $port, bool $throw = t
 
     public function waitUntilReady(Process $process, string $url, bool $ignoreErrors = false): void
     {
-        $context = \stream_context_create(['http' => [
+        $context = stream_context_create(['http' => [
             'ignore_errors' => $ignoreErrors,
             'protocol_version' => '1.1',
             'header' => ['Connection: close'],
             'timeout' => 1,
         ]]);
 
-        while (Process::STATUS_STARTED !== ($status = $process->getStatus()) || false === @\file_get_contents($url, false, $context)) {
+        while (Process::STATUS_STARTED !== ($status = $process->getStatus()) || false === @file_get_contents($url, false, $context)) {
             if (Process::STATUS_TERMINATED === $status) {
                 throw new \RuntimeException($process->getErrorOutput(), $process->getExitCode());
             }
 
             // block until the web server is ready
-            \usleep(1000);
+            usleep(1000);
         }
-        \sleep(1);
+        sleep(1);
     }
 }
diff --git a/tests/ProcessManager/WebServerManagerTest.php b/tests/ProcessManager/WebServerManagerTest.php
@@ -25,7 +25,7 @@ public function testRun()
     {
         $server = new WebServerManager(__DIR__.'/../fixtures/', '127.0.0.1', 1234);
         $server->start();
-        $this->assertContains('Hello', \file_get_contents('http://127.0.0.1:1234/basic.html'));
+        $this->assertContains('Hello', file_get_contents('http://127.0.0.1:1234/basic.html'));
 
         $server->quit();
     }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ return PhpCsFixer\Config::create()`
`52`	`52`	`'strict_comparison' => true,`
`53`	`53`	`'strict_param' => true,`
`54`	`54`	`'ternary_to_null_coalescing' => true,`
	`55`	`+ 'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],`
`55`	`56`	`])`
`56`	`57`	`->setFinder($finder)`
`57`	`58`	`;`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private function getWebDriverCookie(string $name, string $path = '/', ?string $d`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`$cookiePath = $cookie->getPath() ?? '/';`
`142`		`- if (0 !== \strpos($path, $cookiePath)) {`
	`142`	`+ if (0 !== strpos($path, $cookiePath)) {`
`143`	`143`	`return null;`
`144`	`144`	`}`
`145`	`145`
`@@ -148,8 +148,8 @@ private function getWebDriverCookie(string $name, string $path = '/', ?string $d`
`148`	`148`	`return $cookie;`
`149`	`149`	`}`
`150`	`150`
`151`		`- $cookieDomain = '.'.\ltrim($cookieDomain, '.');`
`152`		`- if ($cookieDomain !== \substr('.'.$domain, -\strlen($cookieDomain))) {`
	`151`	`+ $cookieDomain = '.'.ltrim($cookieDomain, '.');`
	`152`	`+ if ($cookieDomain !== substr('.'.$domain, -\strlen($cookieDomain))) {`
`153`	`153`	`return null;`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(?string $chromeDriverBinary = null, ?array $argument`
`34`	`34`	`{`
`35`	`35`	`$this->process = new Process([$chromeDriverBinary ?: $this->findChromeDriverBinary()], null, null, null, null);`
`36`	`36`	`$this->arguments = $arguments ?? $this->getDefaultArguments();`
`37`		`- $this->options = \array_merge($this->getDefaultOptions(), $options);`
	`37`	`+ $this->options = array_merge($this->getDefaultOptions(), $options);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ public function __construct(string $documentRoot, string $hostname, int $port)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$this->process = new Process(`
`48`		`- \array_merge(`
	`48`	`+ array_merge(`
`49`	`49`	`[$binary],`
`50`	`50`	`$finder->findArguments(),`
`51`	`51`	`[`
`52`	`52`	`'-dvariables_order=EGPCS',`
`53`	`53`	`'-S',`
`54`		`- \sprintf('%s:%d', $this->hostname, $this->port),`
	`54`	`+ sprintf('%s:%d', $this->hostname, $this->port),`
`55`	`55`	`'-t',`
`56`	`56`	`$documentRoot,`
`57`	`57`	`]`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ trait WebServerReadinessProbeTrait`
`27`	`27`	`*/`
`28`	`28`	`private function checkPortAvailable(string $hostname, int $port, bool $throw = true): void`
`29`	`29`	`{`
`30`		`- $resource = @\fsockopen($hostname, $port);`
	`30`	`+ $resource = @fsockopen($hostname, $port);`
`31`	`31`	`if (\is_resource($resource)) {`
`32`		`- \fclose($resource);`
	`32`	`+ fclose($resource);`
`33`	`33`	`if ($throw) {`
`34`	`34`	`throw new \RuntimeException(\sprintf('The port %d is already in use.', $port));`
`35`	`35`	`}`
`@@ -38,21 +38,21 @@ private function checkPortAvailable(string $hostname, int $port, bool $throw = t`
`38`	`38`
`39`	`39`	`public function waitUntilReady(Process $process, string $url, bool $ignoreErrors = false): void`
`40`	`40`	`{`
`41`		`- $context = \stream_context_create(['http' => [`
	`41`	`+ $context = stream_context_create(['http' => [`
`42`	`42`	`'ignore_errors' => $ignoreErrors,`
`43`	`43`	`'protocol_version' => '1.1',`
`44`	`44`	`'header' => ['Connection: close'],`
`45`	`45`	`'timeout' => 1,`
`46`	`46`	`]]);`
`47`	`47`
`48`		`- while (Process::STATUS_STARTED !== ($status = $process->getStatus()) \|\| false === @\file_get_contents($url, false, $context)) {`
	`48`	`+ while (Process::STATUS_STARTED !== ($status = $process->getStatus()) \|\| false === @file_get_contents($url, false, $context)) {`
`49`	`49`	`if (Process::STATUS_TERMINATED === $status) {`
`50`	`50`	`throw new \RuntimeException($process->getErrorOutput(), $process->getExitCode());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// block until the web server is ready`
`54`		`- \usleep(1000);`
	`54`	`+ usleep(1000);`
`55`	`55`	`}`
`56`		`- \sleep(1);`
	`56`	`+ sleep(1);`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function testRun()`
`25`	`25`	`{`
`26`	`26`	`$server = new WebServerManager(__DIR__.'/../fixtures/', '127.0.0.1', 1234);`
`27`	`27`	`$server->start();`
`28`		`- $this->assertContains('Hello', \file_get_contents('http://127.0.0.1:1234/basic.html'));`
	`28`	`+ $this->assertContains('Hello', file_get_contents('http://127.0.0.1:1234/basic.html'));`
`29`	`29`
`30`	`30`	`$server->quit();`
`31`	`31`	`}`