Merge branch '9.19' into 10.0

Author: GrahamCampbell

.gitattributes

@@ -14,3 +14,4 @@
 /psalm.xml export-ignore
 /CHANGELOG.md export-ignore
 /README.md export-ignore
+/rector.yml export-ignore

.github/workflows/static.yml

@@ -68,3 +68,42 @@ jobs:
 
       - name: Execute Psalm
         run: vendor/bin/psalm --no-progress --output-format=github
+
+  rector:
+    name: Rector
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          tools: composer:v2, cs2pr
+          coverage: none
+
+      - name: Install Dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --no-interaction --no-progress
+
+      - name: Install PHPUnit
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer bin phpunit update --no-interaction --no-progress
+
+      - name: Install Rector
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer bin rector update --no-interaction --no-progress
+
+      - name: Execute Rector
+        run: vendor/bin/rector process --dry-run --output-format=checkstyle | cs2pr

Makefile

@@ -20,7 +20,13 @@ psalm-baseline:
 psalm-show-info:
 	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --show-info=true
 
-test: phpunit phpstan-analyze psalm-analyze
+rector-dry-run:
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process --dry-run
+
+rector-fix:
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process
+
+test: phpunit phpstan-analyze psalm-analyze rector-dry-run
 
 clean:
 	@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor

rector.yml

@@ -0,0 +1,52 @@
+parameters:
+    autoload_paths:
+        - 'vendor/autoload.php'
+        - 'vendor-bin/phpunit/vendor/autoload.php'
+    auto_import_names: true
+    import_short_classes: false
+    import_doc_blocks: false
+    php_version_features: '5.6'
+    paths:
+        - 'src'
+        - 'tests'
+    sets:
+        - 'code-quality'
+        - 'php52'
+        - 'php53'
+        - 'php54'
+        - 'php55'
+        - 'php56'
+        - 'phpunit40'
+        - 'phpunit50'
+
+services:
+    Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector: ~
+    Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector: ~
+    Rector\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector: ~
+    Rector\DeadCode\Rector\FunctionLike\RemoveCodeAfterReturnRector: ~
+    Rector\DeadCode\Rector\For_\RemoveDeadIfForeachForRector: ~
+    Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector: ~
+    Rector\DeadCode\Rector\Stmt\RemoveDeadStmtRector: ~
+    Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector: ~
+    Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector: ~
+    Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector: ~
+    Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector: ~
+    Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector: ~
+    Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector: ~
+    Rector\DeadCode\Rector\Instanceof_\RemoveDuplicatedInstanceOfRector: ~
+    Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector: ~
+    Rector\DeadCode\Rector\ClassConst\RemoveUnusedClassConstantRector: ~
+    Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector: ~
+    Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector: ~
+    Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateConstantRector: ~
+    Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector: ~
+    Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector: ~
+    Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector: ~
+    Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector: ~
+    Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector: ~
+    Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector: ~
+    Rector\Performance\Rector\FuncCall\PreslashSimpleFunctionRector: ~
+    Rector\SOLID\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector: ~
+    Rector\SOLID\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector: ~
+    Rector\SOLID\Rector\If_\ChangeNestedIfsToEarlyReturnRector: ~
+    Rector\SOLID\Rector\If_\RemoveAlwaysElseRector: ~

src/Api/AbstractApi.php

@@ -53,7 +53,7 @@ abstract class AbstractApi implements ApiInterface
     public function __construct(Client $client, int $perPage = null)
     {
         if (null !== $perPage && ($perPage < 1 || $perPage > 100)) {
-            throw new ValueError(sprintf('%s::__construct(): Argument #2 ($perPage) must be between 1 and 100, or null', self::class));
+            throw new ValueError(\sprintf('%s::__construct(): Argument #2 ($perPage) must be between 1 and 100, or null', self::class));
         }
 
         $this->client = $client;
@@ -72,7 +72,7 @@ public function __construct(Client $client, int $perPage = null)
     public function perPage(?int $perPage)
     {
         if (null !== $perPage && ($perPage < 1 || $perPage > 100)) {
-            throw new ValueError(sprintf('%s::perPage(): Argument #1 ($perPage) must be between 1 and 100, or null', self::class));
+            throw new ValueError(\sprintf('%s::perPage(): Argument #1 ($perPage) must be between 1 and 100, or null', self::class));
         }
 
         $copy = clone $this;
@@ -126,7 +126,7 @@ protected function get($uri, array $params = [], array $headers = [])
      */
     protected function post($uri, array $params = [], array $headers = [], array $files = [])
     {
-        if (0 < count($files)) {
+        if (0 < \count($files)) {
             $builder = $this->createMultipartStreamBuilder($params, $files);
             $body = self::prepareMultipartBody($builder);
             $headers = self::addMultipartContentType($headers, $builder);
@@ -153,7 +153,7 @@ protected function post($uri, array $params = [], array $headers = [], array $fi
      */
     protected function put($uri, array $params = [], array $headers = [], array $files = [])
     {
-        if (0 < count($files)) {
+        if (0 < \count($files)) {
             $builder = $this->createMultipartStreamBuilder($params, $files);
             $body = self::prepareMultipartBody($builder);
             $headers = self::addMultipartContentType($headers, $builder);
@@ -197,7 +197,7 @@ protected function delete($uri, array $params = [], array $headers = [])
      */
     protected static function encodePath($uri)
     {
-        return rawurlencode((string) $uri);
+        return \rawurlencode((string) $uri);
     }
 
     /**
@@ -256,11 +256,11 @@ protected function createOptionsResolver()
      */
     private static function prepareUri(string $uri, array $query = [])
     {
-        $query = array_filter($query, function ($value): bool {
+        $query = \array_filter($query, function ($value): bool {
             return null !== $value;
         });
 
-        return sprintf('%s%s%s', self::URI_PREFIX, $uri, QueryStringBuilder::build($query));
+        return \sprintf('%s%s%s', self::URI_PREFIX, $uri, QueryStringBuilder::build($query));
     }
 
     /**
@@ -284,7 +284,7 @@ private function createMultipartStreamBuilder(array $params = [], array $files =
                 'headers' => [
                     'Content-Type' => self::guessFileContentType($file),
                 ],
-                'filename' => basename($file),
+                'filename' => \basename($file),
             ]);
         }
 
@@ -313,9 +313,9 @@ private static function prepareMultipartBody(MultipartStreamBuilder $builder)
      */
     private static function addMultipartContentType(array $headers, MultipartStreamBuilder $builder)
     {
-        $contentType = sprintf('%s; boundary=%s', ResponseMediator::MULTIPART_CONTENT_TYPE, $builder->getBoundary());
+        $contentType = \sprintf('%s; boundary=%s', ResponseMediator::MULTIPART_CONTENT_TYPE, $builder->getBoundary());
 
-        return array_merge(['Content-Type' => $contentType], $headers);
+        return \array_merge(['Content-Type' => $contentType], $headers);
     }
 
     /**
@@ -327,11 +327,11 @@ private static function addMultipartContentType(array $headers, MultipartStreamB
      */
     private static function prepareJsonBody(array $params)
     {
-        $params = array_filter($params, function ($value): bool {
+        $params = \array_filter($params, function ($value): bool {
             return null !== $value;
         });
 
-        if (0 === count($params)) {
+        if (0 === \count($params)) {
             return null;
         }
 
@@ -347,7 +347,7 @@ private static function prepareJsonBody(array $params)
      */
     private static function addJsonContentType(array $headers)
     {
-        return array_merge(['Content-Type' => ResponseMediator::JSON_CONTENT_TYPE], $headers);
+        return \array_merge(['Content-Type' => ResponseMediator::JSON_CONTENT_TYPE], $headers);
     }
 
     /**
@@ -368,17 +368,17 @@ private static function addJsonContentType(array $headers)
     private static function tryFopen($filename, $mode)
     {
         $ex = null;
-        set_error_handler(function () use ($filename, $mode, &$ex) {
-            $ex = new RuntimeException(sprintf(
+        \set_error_handler(function () use ($filename, $mode, &$ex) {
+            $ex = new RuntimeException(\sprintf(
                 'Unable to open %s using mode %s: %s',
                 $filename,
                 $mode,
-                func_get_args()[1]
+                \func_get_args()[1]
             ));
         });
 
-        $handle = fopen($filename, $mode);
-        restore_error_handler();
+        $handle = \fopen($filename, $mode);
+        \restore_error_handler();
 
         if (null !== $ex) {
             throw $ex;
@@ -397,7 +397,7 @@ private static function tryFopen($filename, $mode)
      */
     private static function guessFileContentType(string $file)
     {
-        if (!class_exists(\finfo::class, false)) {
+        if (!\class_exists(\finfo::class, false)) {
             return ResponseMediator::STREAM_CONTENT_TYPE;
         }
 

src/Api/Groups.php

@@ -65,8 +65,8 @@ public function create($name, $path, $description = null, $visibility = 'private
             'shared_runners_minutes_limit' => $shared_runners_minutes_limit,
         ];
 
-        return $this->post('groups', array_filter($params, function ($value) {
-            return null !== $value && (!is_string($value) || strlen($value) > 0);
+        return $this->post('groups', \array_filter($params, function ($value) {
+            return null !== $value && (!\is_string($value) || \strlen($value) > 0);
         }));
     }
 
@@ -424,7 +424,7 @@ private function getGroupSearchResolver()
         $resolver->setDefined('skip_groups')
             ->setAllowedTypes('skip_groups', 'array')
             ->setAllowedValues('skip_groups', function (array $value) {
-                return count($value) == count(array_filter($value, 'is_int'));
+                return \count($value) === \count(\array_filter($value, 'is_int'));
             })
         ;
         $resolver->setDefined('all_available')

src/Api/GroupsMilestones.php

@@ -27,7 +27,7 @@ public function all($group_id, array $parameters = [])
         $resolver->setDefined('iids')
             ->setAllowedTypes('iids', 'array')
             ->setAllowedValues('iids', function (array $value) {
-                return count($value) == count(array_filter($value, 'is_int'));
+                return \count($value) === \count(\array_filter($value, 'is_int'));
             })
         ;
         $resolver->setDefined('state')

src/Api/Issues.php

@@ -417,7 +417,7 @@ protected function createOptionsResolver()
         $resolver->setDefined('iids')
             ->setAllowedTypes('iids', 'array')
             ->setAllowedValues('iids', function (array $value) {
-                return count($value) == count(array_filter($value, 'is_int'));
+                return \count($value) === \count(\array_filter($value, 'is_int'));
             })
         ;
         $resolver->setDefined('scope')

src/Api/Jobs.php

@@ -201,7 +201,7 @@ protected function createOptionsResolver()
             ->setAllowedTypes('scope', ['string', 'array'])
             ->setAllowedValues('scope', $allowedScopeValues)
             ->addAllowedValues('scope', function ($value) use ($allowedScopeValues) {
-                return is_array($value) && 0 === count(array_diff($value, $allowedScopeValues));
+                return \is_array($value) && 0 === \count(\array_diff($value, $allowedScopeValues));
             })
             ->setNormalizer('scope', function (OptionsResolver $resolver, $value) {
                 return (array) $value;

src/Api/MergeRequests.php

@@ -50,7 +50,7 @@ public function all($project_id = null, array $parameters = [])
         $resolver->setDefined('iids')
             ->setAllowedTypes('iids', 'array')
             ->setAllowedValues('iids', function (array $value) {
-                return count($value) == count(array_filter($value, 'is_int'));
+                return \count($value) === \count(\array_filter($value, 'is_int'));
             })
         ;
         $resolver->setDefined('state')
@@ -154,7 +154,7 @@ public function create($project_id, $source, $target, $title, array $parameters
 
         return $this->post(
             $this->getProjectPath($project_id, 'merge_requests'),
-            array_merge($baseParams, $parameters)
+            \array_merge($baseParams, $parameters)
         );
     }
 
@@ -481,7 +481,7 @@ public function createLevelRule($project_id, $mr_iid, $name, $approvals_required
 
         return $this->post(
             $this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/approval_rules'),
-            array_merge($baseParam, $parameters)
+            \array_merge($baseParam, $parameters)
         );
     }
 
@@ -504,7 +504,7 @@ public function updateLevelRule($project_id, $mr_iid, $approval_rule_id, $name,
 
         return $this->put(
             $this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/approval_rules/'.self::encodePath($approval_rule_id)),
-            array_merge($baseParam, $parameters)
+            \array_merge($baseParam, $parameters)
         );
     }