minor #758 Fix CS (fabpot)

fabpot · fabpot · commit 7112b535d5a4 · 2021-04-27T13:36:51.000+02:00
This PR was merged into the 1.12-dev branch. Discussion ---------- Fix CS Commits ------- 37eabb7 Fix CS
diff --git a/src/Command/InstallRecipesCommand.php b/src/Command/InstallRecipesCommand.php
@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $win = '\\' === \DIRECTORY_SEPARATOR;
         $force = $input->getOption('force');
 
-        if ($force && !@is_executable(strtok(exec($win ? 'where git' : 'command -v git'), PHP_EOL))) {
+        if ($force && !@is_executable(strtok(exec($win ? 'where git' : 'command -v git'), \PHP_EOL))) {
             throw new RuntimeException('Cannot run "sync-recipes --force": git not found.');
         }
 
diff --git a/src/Configurator/CopyFromRecipeConfigurator.php b/src/Configurator/CopyFromRecipeConfigurator.php
@@ -147,7 +147,7 @@ private function removeFile(string $to)
         @unlink($to);
         $this->write(sprintf('  Removed <fg=green>"%s"</>', $this->path->relativize($to)));
 
-        if (0 === \count(glob(\dirname($to).'/*', GLOB_NOSORT))) {
+        if (0 === \count(glob(\dirname($to).'/*', \GLOB_NOSORT))) {
             @rmdir(\dirname($to));
         }
     }
diff --git a/src/Configurator/DockerComposeConfigurator.php b/src/Configurator/DockerComposeConfigurator.php
@@ -107,7 +107,7 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock)
 
             $name = $recipe->getName();
             // Remove recipe and add break line
-            $contents = preg_replace(sprintf('{%s+###> %s ###.*?###< %s ###%s+}s', "\n", $name, $name, "\n"), PHP_EOL.PHP_EOL, file_get_contents($dockerComposeFile), -1, $count);
+            $contents = preg_replace(sprintf('{%s+###> %s ###.*?###< %s ###%s+}s', "\n", $name, $name, "\n"), \PHP_EOL.\PHP_EOL, file_get_contents($dockerComposeFile), -1, $count);
             if (!$count) {
                 return;
             }
diff --git a/src/Configurator/EnvConfigurator.php b/src/Configurator/EnvConfigurator.php
@@ -69,7 +69,7 @@ private function configureEnvDist(Recipe $recipe, $vars, bool $update)
             $data = $this->markData($recipe, $data);
 
             if (!$this->updateData($env, $data)) {
-                file_put_contents($env, $data, FILE_APPEND);
+                file_put_contents($env, $data, \FILE_APPEND);
             }
         }
     }
diff --git a/src/Configurator/GitignoreConfigurator.php b/src/Configurator/GitignoreConfigurator.php
@@ -36,7 +36,7 @@ public function configure(Recipe $recipe, $vars, Lock $lock, array $options = []
         $data = "\n".ltrim($this->markData($recipe, $data), "\r\n");
 
         if (!$this->updateData($gitignore, $data)) {
-            file_put_contents($gitignore, $data, FILE_APPEND);
+            file_put_contents($gitignore, $data, \FILE_APPEND);
         }
     }
 
diff --git a/src/Configurator/MakefileConfigurator.php b/src/Configurator/MakefileConfigurator.php
@@ -50,7 +50,7 @@ public function configure(Recipe $recipe, $definitions, Lock $lock, array $optio
         }
 
         if (!$this->updateData($makefile, $data)) {
-            file_put_contents($makefile, $data, FILE_APPEND);
+            file_put_contents($makefile, $data, \FILE_APPEND);
         }
     }
 
diff --git a/src/CurlDownloader.php b/src/CurlDownloader.php
@@ -25,12 +25,12 @@ class CurlDownloader
 
     private static $options = [
         'http' => [
-            'method' => CURLOPT_CUSTOMREQUEST,
-            'content' => CURLOPT_POSTFIELDS,
+            'method' => \CURLOPT_CUSTOMREQUEST,
+            'content' => \CURLOPT_POSTFIELDS,
         ],
         'ssl' => [
-            'cafile' => CURLOPT_CAINFO,
-            'capath' => CURLOPT_CAPATH,
+            'cafile' => \CURLOPT_CAINFO,
+            'capath' => \CURLOPT_CAPATH,
         ],
     ];
 
@@ -46,15 +46,15 @@ class CurlDownloader
     public function __construct()
     {
         $this->multiHandle = $mh = curl_multi_init();
-        curl_multi_setopt($mh, CURLMOPT_PIPELINING, /*CURLPIPE_MULTIPLEX*/ 2);
+        curl_multi_setopt($mh, \CURLMOPT_PIPELINING, /*CURLPIPE_MULTIPLEX*/ 2);
         if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {
-            curl_multi_setopt($mh, CURLMOPT_MAX_HOST_CONNECTIONS, 8);
+            curl_multi_setopt($mh, \CURLMOPT_MAX_HOST_CONNECTIONS, 8);
         }
 
         $this->shareHandle = $sh = curl_share_init();
-        curl_share_setopt($sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
-        curl_share_setopt($sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
-        curl_share_setopt($sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
+        curl_share_setopt($sh, \CURLSHOPT_SHARE, \CURL_LOCK_DATA_COOKIE);
+        curl_share_setopt($sh, \CURLSHOPT_SHARE, \CURL_LOCK_DATA_DNS);
+        curl_share_setopt($sh, \CURLSHOPT_SHARE, \CURL_LOCK_DATA_SSL_SESSION);
     }
 
     public function get($origin, $url, $context, $file)
@@ -72,21 +72,21 @@ public function get($origin, $url, $context, $file)
         $headers = array_diff($params['options']['http']['header'], ['Connection: close']);
 
         if (!isset($params['options']['http']['protocol_version'])) {
-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+            curl_setopt($ch, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_1_0);
         } else {
             $headers[] = 'Connection: keep-alive';
-            if (0 === strpos($url, 'https://') && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (CURL_VERSION_HTTP2 & curl_version()['features'])) {
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+            if (0 === strpos($url, 'https://') && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (\CURL_VERSION_HTTP2 & curl_version()['features'])) {
+                curl_setopt($ch, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_2_0);
             }
         }
 
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);
-        curl_setopt($ch, CURLOPT_WRITEHEADER, $hd);
-        curl_setopt($ch, CURLOPT_FILE, $fd);
-        curl_setopt($ch, CURLOPT_SHARE, $this->shareHandle);
+        curl_setopt($ch, \CURLOPT_URL, $url);
+        curl_setopt($ch, \CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, \CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, \CURLOPT_DNS_USE_GLOBAL_CACHE, false);
+        curl_setopt($ch, \CURLOPT_WRITEHEADER, $hd);
+        curl_setopt($ch, \CURLOPT_FILE, $fd);
+        curl_setopt($ch, \CURLOPT_SHARE, $this->shareHandle);
 
         foreach (self::$options as $type => $options) {
             foreach ($options as $name => $curlopt) {
@@ -106,7 +106,7 @@ public function get($origin, $url, $context, $file)
         ];
 
         curl_multi_add_handle($this->multiHandle, $ch);
-        $params['notification'](STREAM_NOTIFY_RESOLVE, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0, false);
+        $params['notification'](\STREAM_NOTIFY_RESOLVE, \STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0, false);
         $active = true;
 
         try {
@@ -128,7 +128,7 @@ public function get($origin, $url, $context, $file)
                         if ('' !== curl_error($h)) {
                             throw new TransportException(curl_error($h));
                         }
-                        if ($job['file'] && CURLE_OK === curl_errno($h) && !isset($this->exceptions[$i])) {
+                        if ($job['file'] && \CURLE_OK === curl_errno($h) && !isset($this->exceptions[$i])) {
                             fclose($job['fd']);
                             rename($job['file'].'~', $job['file']);
                         }
@@ -158,8 +158,8 @@ public function get($origin, $url, $context, $file)
                 }
             }
 
-            if ('' !== curl_error($ch) || CURLE_OK !== curl_errno($ch)) {
-                $this->exceptions[(int) $ch] = new TransportException(curl_error($ch), curl_getinfo($ch, CURLINFO_HTTP_CODE) ?: 0);
+            if ('' !== curl_error($ch) || \CURLE_OK !== curl_errno($ch)) {
+                $this->exceptions[(int) $ch] = new TransportException(curl_error($ch), curl_getinfo($ch, \CURLINFO_HTTP_CODE) ?: 0);
             }
             if (isset($this->exceptions[(int) $ch])) {
                 throw $this->exceptions[(int) $ch];
@@ -193,24 +193,24 @@ private function onProgress($ch, callable $notify, array $progress, array $previ
         }
 
         if (!$previousProgress['http_code'] && $progress['http_code'] && $progress['http_code'] < 200 || 400 <= $progress['http_code']) {
-            $code = 403 === $progress['http_code'] ? STREAM_NOTIFY_AUTH_RESULT : STREAM_NOTIFY_FAILURE;
-            $notify($code, STREAM_NOTIFY_SEVERITY_ERR, curl_error($ch), $progress['http_code'], 0, 0, false);
+            $code = 403 === $progress['http_code'] ? \STREAM_NOTIFY_AUTH_RESULT : \STREAM_NOTIFY_FAILURE;
+            $notify($code, \STREAM_NOTIFY_SEVERITY_ERR, curl_error($ch), $progress['http_code'], 0, 0, false);
         }
 
         if ($previousProgress['download_content_length'] < $progress['download_content_length']) {
-            $notify(STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, (int) $progress['download_content_length'], false);
+            $notify(\STREAM_NOTIFY_FILE_SIZE_IS, \STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, (int) $progress['download_content_length'], false);
         }
 
         if ($previousProgress['size_download'] < $progress['size_download']) {
-            $notify(STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['download_content_length'], false);
+            $notify(\STREAM_NOTIFY_PROGRESS, \STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['download_content_length'], false);
         }
     }
 
     private function finishProgress($ch, callable $notify, array $progress)
     {
         if ($progress['download_content_length'] < 0) {
-            $notify(STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, (int) $progress['size_download'], false);
-            $notify(STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['size_download'], false);
+            $notify(\STREAM_NOTIFY_FILE_SIZE_IS, \STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, (int) $progress['size_download'], false);
+            $notify(\STREAM_NOTIFY_PROGRESS, \STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['size_download'], false);
         }
     }
 }
diff --git a/src/Flex.php b/src/Flex.php
@@ -313,7 +313,7 @@ public function lockPlatform()
         }
 
         $this->lock->set('php', [
-            'version' => $this->config->get('platform')['php'] ?? (PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION),
+            'version' => $this->config->get('platform')['php'] ?? (\PHP_MAJOR_VERSION.'.'.\PHP_MINOR_VERSION),
         ]);
     }
 
@@ -708,7 +708,7 @@ public function populateFilesCacheDir(InstallerEvent $event)
                 $fileUrl = current($package->getDistUrls());
             }
 
-            if (!preg_match('/^https?:/', $fileUrl) || !$originUrl = parse_url($fileUrl, PHP_URL_HOST)) {
+            if (!preg_match('/^https?:/', $fileUrl) || !$originUrl = parse_url($fileUrl, \PHP_URL_HOST)) {
                 continue;
             }
 
@@ -1011,10 +1011,10 @@ public static function getSubscribedEvents(): array
 
         if (version_compare('2.0.0', PluginInterface::PLUGIN_API_VERSION, '>')) {
             $events += [
-                InstallerEvents::PRE_DEPENDENCIES_SOLVING => [['populateProvidersCacheDir', PHP_INT_MAX]],
-                InstallerEvents::POST_DEPENDENCIES_SOLVING => [['populateFilesCacheDir', PHP_INT_MAX], ['lockPlatform']],
-                PackageEvents::PRE_PACKAGE_INSTALL => [['populateFilesCacheDir', ~PHP_INT_MAX]],
-                PackageEvents::PRE_PACKAGE_UPDATE => [['populateFilesCacheDir', ~PHP_INT_MAX]],
+                InstallerEvents::PRE_DEPENDENCIES_SOLVING => [['populateProvidersCacheDir', \PHP_INT_MAX]],
+                InstallerEvents::POST_DEPENDENCIES_SOLVING => [['populateFilesCacheDir', \PHP_INT_MAX], ['lockPlatform']],
+                PackageEvents::PRE_PACKAGE_INSTALL => [['populateFilesCacheDir', ~\PHP_INT_MAX]],
+                PackageEvents::PRE_PACKAGE_UPDATE => [['populateFilesCacheDir', ~\PHP_INT_MAX]],
                 PluginEvents::PRE_FILE_DOWNLOAD => 'onFileDownload',
             ];
         } else {
diff --git a/src/ParallelDownloader.php b/src/ParallelDownloader.php
@@ -75,7 +75,7 @@ public function download(array &$nextArgs, callable $nextCallback, bool $quiet =
 
             $note = '';
             if ($this->io->isDecorated()) {
-                $note = '\\' === \DIRECTORY_SEPARATOR ? '' : (false !== stripos(PHP_OS, 'darwin') ? '🎵' : '🎶');
+                $note = '\\' === \DIRECTORY_SEPARATOR ? '' : (false !== stripos(\PHP_OS, 'darwin') ? '🎵' : '🎶');
                 $note .= $this->downloader ? ('\\' !== \DIRECTORY_SEPARATOR ? ' 💨' : '') : '';
             }
 
@@ -158,7 +158,7 @@ public function getContents($originUrl, $fileUrl, $progress = true, $options = [
      */
     public function callbackGet($notificationCode, $severity, $message, $messageCode, $bytesTransferred, $bytesMax, $nativeDownload = true)
     {
-        if (!$nativeDownload && STREAM_NOTIFY_SEVERITY_ERR === $severity) {
+        if (!$nativeDownload && \STREAM_NOTIFY_SEVERITY_ERR === $severity) {
             throw new TransportException($message, $messageCode);
         }
 
@@ -168,12 +168,12 @@ public function callbackGet($notificationCode, $severity, $message, $messageCode
             return;
         }
 
-        if (STREAM_NOTIFY_FILE_SIZE_IS === $notificationCode) {
+        if (\STREAM_NOTIFY_FILE_SIZE_IS === $notificationCode) {
             ++$state->bytesMaxCount;
             $state->bytesMax += $bytesMax;
         }
 
-        if (!$bytesMax || STREAM_NOTIFY_PROGRESS !== $notificationCode) {
+        if (!$bytesMax || \STREAM_NOTIFY_PROGRESS !== $notificationCode) {
             if ($state->nextArgs && !$nativeDownload) {
                 $this->getNext();
             }
diff --git a/src/ScriptExecutor.php b/src/ScriptExecutor.php
@@ -118,7 +118,7 @@ private function expandPhpScript(string $cmd): string
         $arguments = $phpFinder->findArguments();
 
         if ($env = (string) (getenv('COMPOSER_ORIGINAL_INIS'))) {
-            $paths = explode(PATH_SEPARATOR, $env);
+            $paths = explode(\PATH_SEPARATOR, $env);
             $ini = array_shift($paths);
         } else {
             $ini = php_ini_loaded_file();
diff --git a/tests/Configurator/DockerfileConfiguratorTest.php b/tests/Configurator/DockerfileConfiguratorTest.php
@@ -21,7 +21,7 @@
 
 class DockerfileConfiguratorTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         @mkdir(FLEX_TEST_DIR);
     }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`50`	`50`	`$win = '\\' === \DIRECTORY_SEPARATOR;`
`51`	`51`	`$force = $input->getOption('force');`
`52`	`52`
`53`		`- if ($force && !@is_executable(strtok(exec($win ? 'where git' : 'command -v git'), PHP_EOL))) {`
	`53`	`+ if ($force && !@is_executable(strtok(exec($win ? 'where git' : 'command -v git'), \PHP_EOL))) {`
`54`	`54`	`throw new RuntimeException('Cannot run "sync-recipes --force": git not found.');`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private function removeFile(string $to)`
`147`	`147`	`@unlink($to);`
`148`	`148`	`$this->write(sprintf(' Removed <fg=green>"%s"</>', $this->path->relativize($to)));`
`149`	`149`
`150`		`- if (0 === \count(glob(\dirname($to).'/*', GLOB_NOSORT))) {`
	`150`	`+ if (0 === \count(glob(\dirname($to).'/*', \GLOB_NOSORT))) {`
`151`	`151`	`@rmdir(\dirname($to));`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock)`
`107`	`107`
`108`	`108`	`$name = $recipe->getName();`
`109`	`109`	`// Remove recipe and add break line`
`110`		`- $contents = preg_replace(sprintf('{%s+###> %s ###.*?###< %s ###%s+}s', "\n", $name, $name, "\n"), PHP_EOL.PHP_EOL, file_get_contents($dockerComposeFile), -1, $count);`
	`110`	`+ $contents = preg_replace(sprintf('{%s+###> %s ###.*?###< %s ###%s+}s', "\n", $name, $name, "\n"), \PHP_EOL.\PHP_EOL, file_get_contents($dockerComposeFile), -1, $count);`
`111`	`111`	`if (!$count) {`
`112`	`112`	`return;`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private function configureEnvDist(Recipe $recipe, $vars, bool $update)`
`69`	`69`	`$data = $this->markData($recipe, $data);`
`70`	`70`
`71`	`71`	`if (!$this->updateData($env, $data)) {`
`72`		`- file_put_contents($env, $data, FILE_APPEND);`
	`72`	`+ file_put_contents($env, $data, \FILE_APPEND);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function configure(Recipe $recipe, $vars, Lock $lock, array $options = []`
`36`	`36`	`$data = "\n".ltrim($this->markData($recipe, $data), "\r\n");`
`37`	`37`
`38`	`38`	`if (!$this->updateData($gitignore, $data)) {`
`39`		`- file_put_contents($gitignore, $data, FILE_APPEND);`
	`39`	`+ file_put_contents($gitignore, $data, \FILE_APPEND);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function configure(Recipe $recipe, $definitions, Lock $lock, array $optio`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (!$this->updateData($makefile, $data)) {`
`53`		`- file_put_contents($makefile, $data, FILE_APPEND);`
	`53`	`+ file_put_contents($makefile, $data, \FILE_APPEND);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function download(array &$nextArgs, callable $nextCallback, bool $quiet =`
`75`	`75`
`76`	`76`	`$note = '';`
`77`	`77`	`if ($this->io->isDecorated()) {`
`78`		`- $note = '\\' === \DIRECTORY_SEPARATOR ? '' : (false !== stripos(PHP_OS, 'darwin') ? '🎵' : '🎶');`
	`78`	`+ $note = '\\' === \DIRECTORY_SEPARATOR ? '' : (false !== stripos(\PHP_OS, 'darwin') ? '🎵' : '🎶');`
`79`	`79`	`$note .= $this->downloader ? ('\\' !== \DIRECTORY_SEPARATOR ? ' 💨' : '') : '';`
`80`	`80`	`}`
`81`	`81`
`@@ -158,7 +158,7 @@ public function getContents($originUrl, $fileUrl, $progress = true, $options = [`
`158`	`158`	`*/`
`159`	`159`	`public function callbackGet($notificationCode, $severity, $message, $messageCode, $bytesTransferred, $bytesMax, $nativeDownload = true)`
`160`	`160`	`{`
`161`		`- if (!$nativeDownload && STREAM_NOTIFY_SEVERITY_ERR === $severity) {`
	`161`	`+ if (!$nativeDownload && \STREAM_NOTIFY_SEVERITY_ERR === $severity) {`
`162`	`162`	`throw new TransportException($message, $messageCode);`
`163`	`163`	`}`
`164`	`164`
`@@ -168,12 +168,12 @@ public function callbackGet($notificationCode, $severity, $message, $messageCode`
`168`	`168`	`return;`
`169`	`169`	`}`
`170`	`170`
`171`		`- if (STREAM_NOTIFY_FILE_SIZE_IS === $notificationCode) {`
	`171`	`+ if (\STREAM_NOTIFY_FILE_SIZE_IS === $notificationCode) {`
`172`	`172`	`++$state->bytesMaxCount;`
`173`	`173`	`$state->bytesMax += $bytesMax;`
`174`	`174`	`}`
`175`	`175`
`176`		`- if (!$bytesMax \|\| STREAM_NOTIFY_PROGRESS !== $notificationCode) {`
	`176`	`+ if (!$bytesMax \|\| \STREAM_NOTIFY_PROGRESS !== $notificationCode) {`
`177`	`177`	`if ($state->nextArgs && !$nativeDownload) {`
`178`	`178`	`$this->getNext();`
`179`	`179`	`}`