Merge branch '10.0' into 10.1

Author: GrahamCampbell

.github/workflows/static.yml

@@ -67,7 +67,7 @@ jobs:
           command: composer bin psalm update --no-interaction --no-progress
 
       - name: Execute Psalm
-        run: vendor/bin/psalm --no-progress --output-format=github
+        run: vendor/bin/psalm.phar --no-progress --output-format=github
 
   rector:
     name: Rector

.styleci.yml

@@ -1,13 +1,20 @@
 preset: symfony
 
+risky: true
+
 enabled:
   - align_phpdoc
   - alpha_ordered_imports
   - array_indentation
   - const_visibility_required
+  - native_constant_invocation
+  - native_function_invocation
   - phpdoc_order
+  - void_return
 
 disabled:
+  - native_constant_invocation_symfony
+  - native_function_invocation_symfony
   - no_superfluous_phpdoc_tags_symfony
   - phpdoc_to_comment
   - phpdoc_var_without_name

CHANGELOG.md

@@ -2,6 +2,11 @@ CHANGE LOG
 ==========
 
 
+## 10.0.0 (UPCOMING)
+
+* No changes since RC2
+
+
 ## 10.0.0-RC2 (23/07/2020)
 
 * Restored 9.x behaviour for empty JSON responses

Makefile

@@ -12,13 +12,13 @@ phpstan-baseline:
 	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze --generate-baseline
 
 psalm-analyze:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
 
 psalm-baseline:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --set-baseline=psalm-baseline.xml
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --set-baseline=psalm-baseline.xml
 
 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
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --show-info=true
 
 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

phpstan-baseline.neon

@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$error_handler of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
+			count: 1
+			path: src/Api/AbstractApi.php
+
 		-
 			message: "#^Return type \\(Gitlab\\\\Model\\\\Issue\\) of method Gitlab\\\\Model\\\\Issue\\:\\:close\\(\\) should be covariant with return type \\(static\\(Gitlab\\\\Model\\\\Stateful\\)\\) of method Gitlab\\\\Model\\\\Stateful\\:\\:close\\(\\)$#"
 			count: 1

phpunit.xml.dist

@@ -20,9 +20,9 @@
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

psalm-baseline.xml

@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.12.2@7c7ebd068f8acaba211d4a2c707c4ba90874fa26">
+<files psalm-version="3.13.1@afd8874a9e4562eac42a02de90e42e430c3a1db1">
+  <file src="src/Api/AbstractApi.php">
+    <InvalidArgument occurrences="1"/>
+  </file>
+  <file src="src/HttpClient/Util/JsonArray.php">
+    <UndefinedFunction occurrences="1">
+      <code>\get_debug_type($data)</code>
+    </UndefinedFunction>
+  </file>
 </files>

src/Api/AbstractApi.php

@@ -357,7 +357,7 @@ private static function addJsonContentType(array $headers)
     private static function tryFopen(string $filename, string $mode)
     {
         $ex = null;
-        \set_error_handler(function () use ($filename, $mode, &$ex) {
+        \set_error_handler(function () use ($filename, $mode, &$ex): void {
             $ex = new RuntimeException(\sprintf(
                 'Unable to open %s using mode %s: %s',
                 $filename,
@@ -390,7 +390,7 @@ private static function guessFileContentType(string $file)
             return ResponseMediator::STREAM_CONTENT_TYPE;
         }
 
-        $finfo = new \finfo(FILEINFO_MIME_TYPE);
+        $finfo = new \finfo(\FILEINFO_MIME_TYPE);
         $type = $finfo->file($file);
 
         return false !== $type ? $type : ResponseMediator::STREAM_CONTENT_TYPE;

src/Api/Issues.php

@@ -90,6 +90,18 @@ public function update($project_id, int $issue_iid, array $params)
         return $this->put($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid)), $params);
     }
 
+    /**
+     * @param int|string $project_id
+     * @param int        $issue_iid
+     * @param array      $params
+     *
+     * @return mixed
+     */
+    public function reorder($project_id, int $issue_iid, array $params)
+    {
+        return $this->put($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid)).'/reorder', $params);
+    }
+
     /**
      * @param int|string $project_id
      * @param int        $issue_iid

src/HttpClient/Builder.php

@@ -159,7 +159,7 @@ public function getUriFactory()
      *
      * @return void
      */
-    public function addPlugin(Plugin $plugin)
+    public function addPlugin(Plugin $plugin): void
     {
         $this->plugins[] = $plugin;
         $this->pluginClient = null;
@@ -172,7 +172,7 @@ public function addPlugin(Plugin $plugin)
      *
      * @return void
      */
-    public function removePlugin(string $fqcn)
+    public function removePlugin(string $fqcn): void
     {
         foreach ($this->plugins as $idx => $plugin) {
             if ($plugin instanceof $fqcn) {
@@ -190,7 +190,7 @@ public function removePlugin(string $fqcn)
      *
      * @return void
      */
-    public function addCache(CacheItemPoolInterface $cachePool, array $config = [])
+    public function addCache(CacheItemPoolInterface $cachePool, array $config = []): void
     {
         if (!isset($config['cache_key_generator'])) {
             $config['cache_key_generator'] = new HeaderCacheKeyGenerator(['Authorization', 'Cookie', 'Accept', 'Content-type']);
@@ -205,7 +205,7 @@ public function addCache(CacheItemPoolInterface $cachePool, array $config = [])
      *
      * @return void
      */
-    public function removeCache()
+    public function removeCache(): void
     {
         $this->cachePlugin = null;
         $this->pluginClient = null;