php-cs

weaverryan · weaverryan · commit 8b4fb881cb3a · 2021-12-18T14:08:46.000-05:00
diff --git a/src/Command/InstallRecipesCommand.php b/src/Command/InstallRecipesCommand.php
@@ -13,7 +13,6 @@
 
 use Composer\Command\BaseCommand;
 use Composer\DependencyResolver\Operation\InstallOperation;
-use Composer\Factory;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Command/UpdateRecipesCommand.php b/src/Command/UpdateRecipesCommand.php
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if (!$symfonyLock->has($packageName)) {
             $io->writeError([
                 'Package not found inside symfony.lock. It looks like it\'s not installed?',
-                sprintf('Try running <info>composer recipes:install %s --force -v</info> to re-install the recipe.', $packageName)
+                sprintf('Try running <info>composer recipes:install %s --force -v</info> to re-install the recipe.', $packageName),
             ]);
 
             return 1;
@@ -81,7 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->writeError([
                 'It doesn\'t look like this package had a recipe when it was originally installed.',
                 'To install the latest version of the recipe, if there is one, run:',
-                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName)
+                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName),
             ]);
 
             return 1;
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 'The version of the installed recipe was not saved into symfony.lock.',
                 'This is possible if it was installed by an old version of Symfony Flex.',
                 'Update the recipe by re-installing the latest version with:',
-                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName)
+                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName),
             ]);
 
             return 1;
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->writeError([
                 'The original recipe version you have installed could not be found, it may be too old.',
                 'Update the recipe by re-installing the latest version with:',
-                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName)
+                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName),
             ]);
 
             return 1;
@@ -134,7 +134,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $throwable->getMessage(),
                 '',
                 'Update the recipe by re-installing the latest version with:',
-                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName)
+                sprintf('  <info>composer recipes:install %s --force -v</info>', $packageName),
             ]);
 
             return 1;
@@ -154,7 +154,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->write([
                 '  The recipe was updated but with <bg=red;fg=white>one or more conflicts</>.',
                 '  Run <comment>git status</comment> to see them.',
-                '  After resolving, commit your changes like normal.'
+                '  After resolving, commit your changes like normal.',
             ]);
         } else {
             if (!$patch->getPatch()) {
@@ -169,7 +169,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
 
-        if (0 !== count($recipeUpdate->getCopyFromPackagePaths())) {
+        if (0 !== \count($recipeUpdate->getCopyFromPackagePaths())) {
             $io->write([
                 '',
                 '  <bg=red;fg=white>NOTE:</>',
@@ -181,7 +181,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->write([
                 '',
                 '  The recipe updater has no way of knowing if these files have changed since you originally installed the recipe.',
-                '  And so, no updates were made to these paths.'
+                '  And so, no updates were made to these paths.',
             ]);
         }
 
@@ -213,7 +213,7 @@ private function getRecipe(string $packageName, string $recipeRef = null, string
         }
         $recipes = $this->downloader->getRecipes([$operation]);
 
-        if (0 === count($recipes['manifests'] ?? [])) {
+        if (0 === \count($recipes['manifests'] ?? [])) {
             return null;
         }
 
diff --git a/src/Configurator/AbstractConfigurator.php b/src/Configurator/AbstractConfigurator.php
@@ -96,7 +96,7 @@ protected function updateData(string $file, string $data): bool
     }
 
     /**
-     * @return string|null Returns the updated content if the section was found, null if not found.
+     * @return string|null returns the updated content if the section was found, null if not found
      */
     protected function updateDataString(string $contents, string $data): ?string
     {
diff --git a/src/Configurator/ContainerConfigurator.php b/src/Configurator/ContainerConfigurator.php
@@ -85,7 +85,7 @@ private function configureParameters(array $parameters, bool $update = false): s
                 $matches = [];
                 if (preg_match(sprintf('/^\s+%s\:/', preg_quote($key, '/')), $line, $matches)) {
                     if ($update) {
-                        $lines[$i] = substr($line, 0, strlen($matches[0])).' '.str_replace("'", "''", $value)."\n";
+                        $lines[$i] = substr($line, 0, \strlen($matches[0])).' '.str_replace("'", "''", $value)."\n";
                     }
 
                     unset($parameters[$key]);
diff --git a/src/Configurator/DockerComposeConfigurator.php b/src/Configurator/DockerComposeConfigurator.php
@@ -81,7 +81,7 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock)
 
     public function update(RecipeUpdate $recipeUpdate, array $originalConfig, array $newConfig): void
     {
-        if (!DockerComposeConfigurator::shouldConfigureDockerRecipe($this->composer, $this->io, $recipeUpdate->getNewRecipe())) {
+        if (!self::shouldConfigureDockerRecipe($this->composer, $this->io, $recipeUpdate->getNewRecipe())) {
             return;
         }
 
@@ -331,7 +331,7 @@ private function configureDockerCompose(Recipe $recipe, array $config, bool $upd
 
     private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, array $config): array
     {
-        if (0 === count($config)) {
+        if (0 === \count($config)) {
             return [];
         }
 
diff --git a/src/Configurator/DockerfileConfigurator.php b/src/Configurator/DockerfileConfigurator.php
@@ -96,7 +96,7 @@ private function configureDockerfile(Recipe $recipe, array $config, bool $update
 
     private function getContentsAfterApplyingRecipe(Recipe $recipe, array $config): ?string
     {
-        if (0 === count($config)) {
+        if (0 === \count($config)) {
             return null;
         }
 
diff --git a/src/Configurator/EnvConfigurator.php b/src/Configurator/EnvConfigurator.php
@@ -202,7 +202,7 @@ private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe,
     {
         $files = ['.env', '.env.dist', 'phpunit.xml.dist', 'phpunit.xml'];
 
-        if (0 === count($vars)) {
+        if (0 === \count($vars)) {
             return array_fill_keys($files, null);
         }
 
@@ -264,7 +264,7 @@ private function findExistingValue(string $var, string $filename, Recipe $recipe
                 continue;
             }
 
-            return trim(substr($line, strlen($var) + 1));
+            return trim(substr($line, \strlen($var) + 1));
         }
 
         return null;
diff --git a/src/Configurator/GitignoreConfigurator.php b/src/Configurator/GitignoreConfigurator.php
@@ -77,7 +77,7 @@ private function configureGitignore(Recipe $recipe, array $vars, bool $update)
 
     private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, $vars): ?string
     {
-        if (0 === count($vars)) {
+        if (0 === \count($vars)) {
             return null;
         }
 
diff --git a/src/Configurator/MakefileConfigurator.php b/src/Configurator/MakefileConfigurator.php
@@ -94,7 +94,7 @@ private function configureMakefile(Recipe $recipe, array $definitions, bool $upd
 
     private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, array $definitions): ?string
     {
-        if (0 === count($definitions)) {
+        if (0 === \count($definitions)) {
             return null;
         }
 
diff --git a/src/GithubApi.php b/src/GithubApi.php
@@ -62,6 +62,7 @@ public function findRecipeCommitDataFromTreeRef(string $package, string $repo, s
                 if ($treeItem['sha'] === $lockRef) {
                     // remove *this* commit from the new commits list
                     array_pop($commitShas);
+
                     return [
                         // shorten for brevity
                         'commit' => substr($commitData['sha'], 0, 7),
@@ -127,7 +128,7 @@ public function getPullRequestForCommit(string $commit, string $repo): ?array
     {
         $data = $this->requestGitHubApi('https://api.github.com/search/issues?q='.$commit);
 
-        if (0 === count($data['items'])) {
+        if (0 === \count($data['items'])) {
             return null;
         }
 
diff --git a/src/PackageJsonSynchronizer.php b/src/PackageJsonSynchronizer.php
@@ -42,7 +42,7 @@ public function synchronize(array $phpPackages): bool
     {
         // Remove all links and add again only the existing packages
         try {
-            $didAddLink = $this->removePackageJsonLinks((new JsonFile($this->rootDir . '/package.json'))->read());
+            $didAddLink = $this->removePackageJsonLinks((new JsonFile($this->rootDir.'/package.json'))->read());
         } catch (ParsingException) {
             // if package.json is invalid (possible during a recipe upgrade), we can't update the file
             return false;
diff --git a/src/Update/RecipePatch.php b/src/Update/RecipePatch.php
@@ -15,6 +15,7 @@ class RecipePatch
 {
     private string $patch;
     private array $blobs;
+
     public function __construct(string $patch, array $blobs)
     {
         $this->patch = $patch;
diff --git a/src/Update/RecipePatcher.php b/src/Update/RecipePatcher.php
@@ -33,7 +33,7 @@ public function __construct(string $rootDir, IOInterface $io)
     /**
      * Applies the patch. If it fails unexpectedly, an exception will be thrown.
      *
-     * @return bool Returns true of fully successful, false if conflicts were encountered.
+     * @return bool returns true of fully successful, false if conflicts were encountered
      */
     public function applyPatch(RecipePatch $patch): bool
     {
@@ -54,7 +54,7 @@ public function applyPatch(RecipePatch $patch): bool
             $statusCode = $this->processExecutor->execute('git apply "_flex_recipe_update.patch" -3', $output, $this->rootDir);
             $this->io->debug('git apply output: '.$output);
 
-            if ($statusCode === 0) {
+            if (0 === $statusCode) {
                 // successful with no conflicts
                 return true;
             }
@@ -77,11 +77,11 @@ public function applyPatch(RecipePatch $patch): bool
     public function generatePatch(array $originalFiles, array $newFiles): RecipePatch
     {
         // null implies "file does not exist"
-        $originalFiles = array_filter($originalFiles, function($file) {
-            return $file !== null;
+        $originalFiles = array_filter($originalFiles, function ($file) {
+            return null !== $file;
         });
-        $newFiles = array_filter($newFiles, function($file) {
-            return $file !== null;
+        $newFiles = array_filter($newFiles, function ($file) {
+            return null !== $file;
         });
 
         // find removed files and add them so they will be deleted
@@ -110,7 +110,7 @@ public function generatePatch(array $originalFiles, array $newFiles): RecipePatc
             $this->execute('git config user.email ""', $tmpPath);
 
             $blobs = [];
-            if (count($originalFiles) > 0) {
+            if (\count($originalFiles) > 0) {
                 $this->writeFiles($originalFiles, $tmpPath);
                 $this->execute('git add -A', $tmpPath);
                 $this->execute('git commit -m "original files"', $tmpPath);
@@ -142,8 +142,8 @@ private function writeFiles(array $files, string $directory): void
                 continue;
             }
 
-            if (!file_exists(dirname($path))) {
-                $this->filesystem->mkdir(dirname($path));
+            if (!file_exists(\dirname($path))) {
+                $this->filesystem->mkdir(\dirname($path));
             }
             file_put_contents($path, $contents);
         }
@@ -179,8 +179,8 @@ private function addMissingBlobs(array $blobs): array
             }
 
             $addedBlobs[] = $blobPath;
-            if (!file_exists(dirname($blobPath))) {
-                $this->filesystem->mkdir(dirname($blobPath));
+            if (!file_exists(\dirname($blobPath))) {
+                $this->filesystem->mkdir(\dirname($blobPath));
             }
             file_put_contents($blobPath, $contents);
         }
diff --git a/tests/Command/UpdateRecipesCommandTest.php b/tests/Command/UpdateRecipesCommandTest.php
@@ -11,19 +11,14 @@
 
 namespace Symfony\Flex\Tests\Command;
 
-use Composer\Composer;
-use Composer\Config;
 use Composer\Factory;
 use Composer\IO\BufferIO;
-use Composer\IO\IOInterface;
 use Composer\Util\Platform;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\Process;
-use Symfony\Flex\Command\DumpEnvCommand;
 use Symfony\Flex\Command\UpdateRecipesCommand;
 use Symfony\Flex\Configurator;
 use Symfony\Flex\Downloader;
diff --git a/tests/Configurator/BundlesConfiguratorTest.php b/tests/Configurator/BundlesConfiguratorTest.php
@@ -141,7 +141,6 @@ public function testUpdate()
             FLEX_TEST_DIR
         );
 
-
         $this->saveBundlesFile(<<<EOF
 <?php
 
@@ -188,8 +187,8 @@ public function testUpdate()
     private function saveBundlesFile(string $contents)
     {
         $config = FLEX_TEST_DIR.'/config/bundles.php';
-        if (!file_exists(dirname($config))) {
-            @mkdir(dirname($config), 0777, true);
+        if (!file_exists(\dirname($config))) {
+            @mkdir(\dirname($config), 0777, true);
         }
         file_put_contents($config, $contents);
     }
diff --git a/tests/Configurator/ComposerScriptsConfiguratorTest.php b/tests/Configurator/ComposerScriptsConfiguratorTest.php
@@ -41,13 +41,13 @@ public function testConfigure()
         file_put_contents(FLEX_TEST_DIR.'/composer.json', json_encode([
             'scripts' => [
                 'auto-scripts' => [
-                    'cache:clear' => "symfony-cmd",
-                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd'
+                    'cache:clear' => 'symfony-cmd',
+                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd',
                 ],
                 'post-install-cmd' => ['@auto-scripts'],
                 'post-update-cmd' => ['@auto-scripts'],
-            ]
-        ], JSON_PRETTY_PRINT));
+            ],
+        ], \JSON_PRETTY_PRINT));
 
         $configurator = new ComposerScriptsConfigurator(
             $this->createMock(Composer::class),
@@ -88,13 +88,13 @@ public function testUnconfigure()
         file_put_contents(FLEX_TEST_DIR.'/composer.json', json_encode([
             'scripts' => [
                 'auto-scripts' => [
-                    'cache:clear' => "symfony-cmd",
-                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd'
+                    'cache:clear' => 'symfony-cmd',
+                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd',
                 ],
                 'post-install-cmd' => ['@auto-scripts'],
                 'post-update-cmd' => ['@auto-scripts'],
-            ]
-        ], JSON_PRETTY_PRINT));
+            ],
+        ], \JSON_PRETTY_PRINT));
 
         $configurator = new ComposerScriptsConfigurator(
             $this->createMock(Composer::class),
@@ -147,13 +147,13 @@ public function testUpdate()
         file_put_contents(FLEX_TEST_DIR.'/composer.json', json_encode([
             'scripts' => [
                 'auto-scripts' => [
-                    'cache:clear' => "symfony-cmd",
-                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd'
+                    'cache:clear' => 'symfony-cmd',
+                    'assets:install %PUBLIC_DIR%' => 'symfony-cmd',
                 ],
                 'post-install-cmd' => ['@auto-scripts'],
                 'post-update-cmd' => ['@auto-scripts'],
-            ]
-        ], JSON_PRETTY_PRINT));
+            ],
+        ], \JSON_PRETTY_PRINT));
 
         $configurator->update(
             $recipeUpdate,
diff --git a/tests/Configurator/ContainerConfiguratorTest.php b/tests/Configurator/ContainerConfiguratorTest.php
@@ -14,7 +14,6 @@
 use Composer\Composer;
 use Composer\IO\IOInterface;
 use PHPUnit\Framework\TestCase;
-use Symfony\Flex\Configurator\BundlesConfigurator;
 use Symfony\Flex\Configurator\ContainerConfigurator;
 use Symfony\Flex\Lock;
 use Symfony\Flex\Options;
@@ -33,7 +32,7 @@ public function testConfigure()
         $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $config = FLEX_TEST_DIR.'/config/services.yaml';
-        @mkdir(dirname($config));
+        @mkdir(\dirname($config));
         file_put_contents(
             $config,
             <<<EOF
diff --git a/tests/Configurator/DockerComposeConfiguratorTest.php b/tests/Configurator/DockerComposeConfiguratorTest.php
diff --git a/tests/Update/RecipePatcherTest.php b/tests/Update/RecipePatcherTest.php
diff --git a/tests/Update/RecipeUpdateTest.php b/tests/Update/RecipeUpdateTest.php

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected function updateData(string $file, string $data): bool`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * @return string\|null Returns the updated content if the section was found, null if not found.`
	`99`	`+ * @return string\|null returns the updated content if the section was found, null if not found`
`100`	`100`	`*/`
`101`	`101`	`protected function updateDataString(string $contents, string $data): ?string`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private function configureParameters(array $parameters, bool $update = false): s`
`85`	`85`	`$matches = [];`
`86`	`86`	`if (preg_match(sprintf('/^\s+%s\:/', preg_quote($key, '/')), $line, $matches)) {`
`87`	`87`	`if ($update) {`
`88`		`- $lines[$i] = substr($line, 0, strlen($matches[0])).' '.str_replace("'", "''", $value)."\n";`
	`88`	`+ $lines[$i] = substr($line, 0, \strlen($matches[0])).' '.str_replace("'", "''", $value)."\n";`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`unset($parameters[$key]);`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock)`
`81`	`81`
`82`	`82`	`public function update(RecipeUpdate $recipeUpdate, array $originalConfig, array $newConfig): void`
`83`	`83`	`{`
`84`		`- if (!DockerComposeConfigurator::shouldConfigureDockerRecipe($this->composer, $this->io, $recipeUpdate->getNewRecipe())) {`
	`84`	`+ if (!self::shouldConfigureDockerRecipe($this->composer, $this->io, $recipeUpdate->getNewRecipe())) {`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`
`@@ -331,7 +331,7 @@ private function configureDockerCompose(Recipe $recipe, array $config, bool $upd`
`331`	`331`
`332`	`332`	`private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, array $config): array`
`333`	`333`	`{`
`334`		`- if (0 === count($config)) {`
	`334`	`+ if (0 === \count($config)) {`
`335`	`335`	`return [];`
`336`	`336`	`}`
`337`	`337`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private function configureDockerfile(Recipe $recipe, array $config, bool $update`
`96`	`96`
`97`	`97`	`private function getContentsAfterApplyingRecipe(Recipe $recipe, array $config): ?string`
`98`	`98`	`{`
`99`		`- if (0 === count($config)) {`
	`99`	`+ if (0 === \count($config)) {`
`100`	`100`	`return null;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe,`
`202`	`202`	`{`
`203`	`203`	`$files = ['.env', '.env.dist', 'phpunit.xml.dist', 'phpunit.xml'];`
`204`	`204`
`205`		`- if (0 === count($vars)) {`
	`205`	`+ if (0 === \count($vars)) {`
`206`	`206`	`return array_fill_keys($files, null);`
`207`	`207`	`}`
`208`	`208`
`@@ -264,7 +264,7 @@ private function findExistingValue(string $var, string $filename, Recipe $recipe`
`264`	`264`	`continue;`
`265`	`265`	`}`
`266`	`266`
`267`		`- return trim(substr($line, strlen($var) + 1));`
	`267`	`+ return trim(substr($line, \strlen($var) + 1));`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private function configureGitignore(Recipe $recipe, array $vars, bool $update)`
`77`	`77`
`78`	`78`	`private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, $vars): ?string`
`79`	`79`	`{`
`80`		`- if (0 === count($vars)) {`
	`80`	`+ if (0 === \count($vars)) {`
`81`	`81`	`return null;`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function configureMakefile(Recipe $recipe, array $definitions, bool $upd`
`94`	`94`
`95`	`95`	`private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe, array $definitions): ?string`
`96`	`96`	`{`
`97`		`- if (0 === count($definitions)) {`
	`97`	`+ if (0 === \count($definitions)) {`
`98`	`98`	`return null;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public function findRecipeCommitDataFromTreeRef(string $package, string $repo, s`
`62`	`62`	`if ($treeItem['sha'] === $lockRef) {`
`63`	`63`	`// remove this commit from the new commits list`
`64`	`64`	`array_pop($commitShas);`
	`65`	`+`
`65`	`66`	`return [`
`66`	`67`	`// shorten for brevity`
`67`	`68`	`'commit' => substr($commitData['sha'], 0, 7),`
`@@ -127,7 +128,7 @@ public function getPullRequestForCommit(string $commit, string $repo): ?array`
`127`	`128`	`{`
`128`	`129`	`$data = $this->requestGitHubApi('https://api.github.com/search/issues?q='.$commit);`
`129`	`130`
`130`		`- if (0 === count($data['items'])) {`
	`131`	`+ if (0 === \count($data['items'])) {`
`131`	`132`	`return null;`
`132`	`133`	`}`
`133`	`134`