Merge branch '9.18' into 9.19

Author: GrahamCampbell

lib/Gitlab/ResultPager.php

@@ -9,8 +9,6 @@
 /**
  * This is the result pager class.
  *
- * @final
- *
  * @author Ramon de la Fuente <[email protected]>
  * @author Mitchel Verschoof <[email protected]>
  * @author Graham Campbell <[email protected]>

phpstan.neon.dist

@@ -1,5 +1,15 @@
 includes:
     - phpstan-baseline.neon
+    - vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
+    - vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
+    - vendor-bin/phpstan/vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
+
+rules:
+    - Ergebnis\PHPStan\Rules\Closures\NoNullableReturnTypeDeclarationRule
+    - Ergebnis\PHPStan\Rules\Expressions\NoCompactRule
+    - Ergebnis\PHPStan\Rules\Expressions\NoEmptyRule
+    - Ergebnis\PHPStan\Rules\Expressions\NoEvalRule
+    - Ergebnis\PHPStan\Rules\Methods\PrivateInFinalClassRule
 
 parameters:
     level: max

vendor-bin/phpstan/composer.json

@@ -1,10 +1,10 @@
 {
     "require": {
         "phpstan/phpstan": "~0.12.32",
-        "phpstan/extension-installer": "~1.0.4",
         "phpstan/phpstan-deprecation-rules": "~0.12.4",
         "phpstan/phpstan-strict-rules": "~0.12.2",
-        "thecodingmachine/phpstan-strict-rules": "~0.12.0"
+        "thecodingmachine/phpstan-strict-rules": "~0.12.0",
+        "ergebnis/phpstan-rules": "~0.15.0"
     },
     "config": {
         "preferred-install": "dist"