Phpstan fixes

Author: dantleech

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-    - 7.1
-    - 7.2
     - 7.3
     - 7.4
 

composer.json

@@ -9,6 +9,7 @@
         }
     ],
     "require": {
+        "php": "^7.3",
         "webmozart/path-util": "^2.3",
         "dms/phpunit-arraysubset-asserts": "dev-master",
         "phpspec/prophecy-phpunit": "dev-master"
@@ -32,5 +33,12 @@
         "branch-alias": {
             "dev-master": "1.0.x-dev"
         }
+    },
+    "scripts": {
+        "integrate": [
+            "vendor/bin/php-cs-fixer fix",
+            "vendor/bin/phpstan analyse lib -c phpstan.neon",
+            "vendor/bin/phpunit"
+        ]
     }
 }

lib/ExtractOffset.php

@@ -8,7 +8,10 @@
  */
 class ExtractOffset
 {
-    public static function fromSource($source, $marker = '<>')
+    /**
+     * @return array<string>
+     */
+    public static function fromSource(string $source, string $marker = '<>'): array
     {
         list($source, $offsetStart) = self::extractOffset($source, $marker);
         list($source, $offsetEnd) = self::extractOffset($source, $marker);
@@ -19,10 +22,12 @@ public static function fromSource($source, $marker = '<>')
     /**
      * Extract the byte offset from the given marked source
      * and remove the <> mark.
+     *
+     * @return array<mixed>
      */
-    private static function extractOffset($source, $marker)
+    private static function extractOffset(string $source, string $marker): array
     {
-        $offset = $offset = mb_strpos($source, $marker);
+        $offset = mb_strpos($source, $marker);
 
         if (!$offset) {
             return [ $source, null ];

lib/PHPUnit/TestCase.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Phpactor\TestUtils\PHPUnit {
+
+    use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
+    use PHPUnit\Framework\TestCase as PhpUnitTestCase;
+    use Prophecy\PhpUnit\ProphecyTrait;
+
+    class TestCase extends PhpUnitTestCase
+    {
+        use ArraySubsetAsserts;
+        use ProphecyTrait;
+    }
+}
+
+// add stubs for PHPUnit < 8
+// when all packages are using PHPUnit 9 these can be removed
+
+namespace DMS\PHPUnitExtensions\ArraySubset{
+    if (!trait_exists(ArraySubsetAsserts::class)) {
+        trait ArraySubsetAsserts
+        {
+        }
+    }
+}
+
+namespace Prophecy\PhpUnit {
+    if (!trait_exists(ProphecyTrait::class)) {
+        trait ProphecyTrait
+        {
+        }
+    }
+}

lib/Workspace.php

@@ -64,7 +64,7 @@ public function getContents(string $path): string
         return $contents;
     }
 
-    public function reset()
+    public function reset(): void
     {
         if (file_exists($this->path)) {
             $this->remove($this->path);
@@ -84,7 +84,7 @@ public function put(string $path, string $contents): Workspace
         return $this;
     }
 
-    public function mkdir($path): Workspace
+    public function mkdir(string $path): Workspace
     {
         $path = $this->path($path);
 
@@ -100,7 +100,7 @@ public function mkdir($path): Workspace
         return $this;
     }
 
-    public function loadManifest(string $manifest)
+    public function loadManifest(string $manifest): void
     {
         foreach ($this->parseManifest($manifest) as $path => $contents) {
             $path = $this->path . DIRECTORY_SEPARATOR . $path;
@@ -113,7 +113,10 @@ public function loadManifest(string $manifest)
         }
     }
 
-    private function parseManifest(string $manifest)
+    /**
+     * @return array<string>
+     */
+    private function parseManifest(string $manifest): array
     {
         $lines = explode(PHP_EOL, $manifest);
 
@@ -144,7 +147,7 @@ private function parseManifest(string $manifest)
         }, $buffer);
     }
 
-    private function remove($path = '')
+    private function remove(string $path = ''): void
     {
         if ($path) {
             $splFileInfo = new SplFileInfo($path);

phpstan.neon

@@ -1,7 +1,5 @@
-includes:
-    - vendor/phpstan/phpstan/conf/config.level7.neon
-
 parameters:
+    level: 7
     inferPrivatePropertyTypeFromConstructor: true
     ignoreErrors: