Merge 1347725 into b129251

.gitattributes

@@ -12,6 +12,8 @@
 /.scrutinizer.yml export-ignore
 /.travis.yml export-ignore
 /canvas.yaml export-ignore
+/phpstan-baseline.neon export-ignore
+/phpstan.neon.dist export-ignore
 /phpunit.xml export-ignore
 /sync.sh export-ignore
 /CHANGELOG-*.md export-ignore

.github/workflows/analyse.yml

@@ -0,0 +1,43 @@
+name: analyse
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  analyse:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        os:
+          - "ubuntu-latest"
+        php:
+          - "8.0"
+        experimental:
+          - true
+
+    name: PHP${{ matrix.php }} on ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, intl, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "highest"
+          composer-options: "--prefer-dist --no-cache"
+
+      - name: Installed dependencies
+        run: composer show -D
+
+      - name: Execute Static Code Analysis
+        run: vendor/bin/phpstan analyse

composer.json

@@ -45,7 +45,8 @@
     "require-dev": {
         "laravel/laravel": "9.x-dev",
         "laravel/pint": "^1.1",
-        "orchestra/canvas": "^7.0"
+        "orchestra/canvas": "^7.0",
+        "phpstan/phpstan": "^1.8"
     },
     "extra": {
         "branch-alias": {

phpstan-baseline.neon

@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors: []

phpstan.neon.dist

@@ -0,0 +1,16 @@
+includes:
+  # - ./phpstan-baseline.neon
+
+parameters:
+  paths:
+    - src
+
+  # The level 8 is the highest level
+  level: 6
+
+  ignoreErrors:
+    - '#Unsafe usage of new static#'
+
+  checkGenericClassInNonGenericObjectType: false
+  checkMissingIterableValueType: false
+  treatPhpDocTypesAsCertain: false

src/Concerns/CanServeSite.php

@@ -13,7 +13,7 @@ trait CanServeSite
     /**
      * The server implementation.
      *
-     * @var \Orchestra\Testbench\Dusk\DuskServer
+     * @var \Orchestra\Testbench\Dusk\DuskServer|null
      */
     protected static $server;
 
@@ -81,7 +81,7 @@ public static function reloadServing(): void
     /**
      * Make tweaks to the application, both inside the test and on the test server.
      *
-     * @param  \Closure(\Illuminate\Foundation\Application):void  $closure
+     * @param  \Closure(\Illuminate\Foundation\Application, \Illuminate\Contracts\Config\Repository):void  $closure
      * @return void
      */
     public function beforeServingApplication(Closure $closure): void

src/DuskServer.php

@@ -11,7 +11,7 @@ class DuskServer
     /**
      * Process pointer reference.
      *
-     * @var Process
+     * @var \Symfony\Component\Process\Process|null
      */
     protected $process;
 
@@ -157,6 +157,8 @@ protected function startServer(): void
      * that we want to use.  Sometimes a server can be left oped when
      * PHP drops out, or the user may have another service running.
      *
+     * @return void
+     *
      * @throws \Orchestra\Testbench\Dusk\Exceptions\UnableToStartServer
      */
     protected function guardServerStarting()
@@ -196,7 +198,6 @@ protected function prepareCommand(): string
      * For testbench purposes, this exists in the
      * core package.
      *
-     * @param  string|null  $root
      * @return string
      */
     public function laravelPublicPath(): string

src/Exceptions/UnableToStartServer.php

@@ -7,6 +7,13 @@
 
 class UnableToStartServer extends Exception
 {
+    /**
+     * Create new "Unable to start server" exception.
+     *
+     * @param string  $message
+     * @param int  $code
+     * @param \Throwable|null  $previous
+     */
     public function __construct($message = '', $code = 0, Throwable $previous = null)
     {
         $fullMessage = "A server is already running on {$message}. Please stop it before proceeding. \n".

src/Foundation/Console/DuskCommand.php

@@ -61,16 +61,17 @@ protected function phpunitArguments($options)
             return ! Str::startsWith($option, '--env=');
         }));
 
+        /** @phpstan-ignore-next-line */
+        $workingPath = TESTBENCH_WORKING_PATH;
+
         $file = Collection::make([
             'phpunit.dusk.xml',
             'phpunit.dusk.xml.dist',
             'phpunit.xml',
             'phpunit.xml.dist',
-        ])->map(static function ($file) {
-            return TESTBENCH_WORKING_PATH."/{$file}";
-        })->filter(static function ($file) {
-            return file_exists($file);
-        })->first();
+        ])->map(fn ($file) => "{$workingPath}/{$file}")
+        ->filter(fn ($file) => file_exists($file))
+        ->first();
 
         return ! \is_null($file) ? array_merge(['-c', $file], $options) : $options;
     }
@@ -82,18 +83,20 @@ protected function phpunitArguments($options)
      */
     protected function writeConfiguration()
     {
+        /** @phpstan-ignore-next-line */
+        $workingPath = TESTBENCH_WORKING_PATH;
+
         $file = Collection::make([
             'phpunit.dusk.xml',
             'phpunit.dusk.xml.dist',
             'phpunit.xml',
             'phpunit.xml.dist',
-        ])->map(static function ($file) {
-            return TESTBENCH_WORKING_PATH."/{$file}";
-        })->filter(static function ($file) {
-            return file_exists($file);
-        })->first();
+        ])->map(fn ($file) => "{$workingPath}/{$file}")
+        ->filter(fn ($file) => file_exists($file))
+        ->first();
 
         if (\is_null($file)) {
+            /** @phpstan-ignore-next-line */
             copy(realpath(__DIR__.'/../../../stubs/phpunit.xml'), TESTBENCH_WORKING_PATH.'/phpunit.dusk.xml');
 
             return;
@@ -109,6 +112,7 @@ protected function writeConfiguration()
      */
     protected function removeConfiguration()
     {
+        /** @phpstan-ignore-next-line */
         if (! $this->hasPhpUnitConfiguration && file_exists($file = TESTBENCH_WORKING_PATH.'/phpunit.dusk.xml')) {
             @unlink($file);
         }

src/Foundation/Console/PurgeCommand.php

@@ -63,6 +63,7 @@ public function handle()
      */
     protected function purgeDebuggingFiles(string $relativePath, string $patterns): void
     {
+        /** @phpstan-ignore-next-line */
         $path = TESTBENCH_WORKING_PATH."/{$relativePath}";
 
         if (! is_dir($path)) {

src/TestCase.php

@@ -72,8 +72,6 @@ public static function applicationBasePath()
     /**
      * Get Application's base URL.
      *
-     * @var string
-     *
      * @return string
      */
     public static function applicationBaseUrl()
@@ -180,8 +178,6 @@ protected function driver(): RemoteWebDriver
     /**
      * Determine the application's base URL.
      *
-     * @var string
-     *
      * @return string
      */
     protected function baseUrl()