Clean up

bram-pkg · bram-pkg · commit dd15aeefb7a0 · 2023-12-30T23:29:09.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - '**.php'
-      - '.github/workflows/phpunit.yml'
+      - '.github/workflows/tests.yml'
       - 'phpunit.xml.dist'
       - 'composer.json'
       - 'composer.lock'
@@ -53,4 +53,4 @@ jobs:
         run: composer show -D
 
       - name: Run test suite
-        run: vendor/bin/phpunit
+        run: vendor/bin/pest --ci
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,11 @@
-/.coverage
-/.phpunit.cache
-/.phpunit.result.cache
-/vendor
-/composer.lock
+.idea
+.phpunit.cache
+build
+composer.lock
+coverage
+docs
+phpunit.xml
+phpstan.neon
+testbench.yaml
+vendor
+node_modules
diff --git a/composer.json b/composer.json
@@ -27,13 +27,13 @@
     "composer/semver": "^3.3",
     "guzzlehttp/guzzle": "^7.5",
     "illuminate/contracts": "^10.0 | ^11.0",
-    "phpunit/phpunit": "^10.0",
     "twig/twig": "^3.0"
   },
   "require-dev": {
     "laravel/pint": "^1.13.7",
     "nunomaduro/collision": "^7.0 | ^8.0",
-    "orchestra/testbench": "^8.19 | ^9.0"
+    "orchestra/testbench": "^8.19 | ^9.0",
+    "pestphp/pest": "3.x-dev"
   },
   "autoload": {
     "psr-4": {
@@ -52,7 +52,10 @@
   "config": {
     "optimize-autoloader": true,
     "preferred-install": "dist",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "pestphp/pest-plugin": true
+    }
   },
   "scripts": {
     "post-autoload-dump": "@composer run prepare",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,27 +5,27 @@
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results.json"
+         cacheDirectory=".phpunit.cache"
          colors="true"
-         executionOrder="depends,defects"
+         executionOrder="random"
          failOnRisky="true"
          failOnWarning="true"
-         requireCoverageMetadata="true"
 >
     <testsuites>
-        <testsuite name="Feature">
-            <directory>tests/Feature</directory>
-        </testsuite>
-
-        <testsuite name="Unit">
-            <directory>tests/Unit</directory>
+        <testsuite name="Laravel Docker Builder Test Suite">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage">
+    <coverage>
         <report>
-            <html outputDirectory=".coverage"/>
-            <text outputFile="php://stdout" showOnlySummary="true"/>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
         </report>
     </coverage>
+
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
 </phpunit>
diff --git a/tests/Commands/BaseCommandTest.php b/tests/Commands/BaseCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Commands/BaseDockerCommandTest.php b/tests/Commands/BaseDockerCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseDockerCommand;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Commands/DockerBuildCommandTest.php b/tests/Commands/DockerBuildCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\DockerBuildCommand;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Commands/DockerCiCommandTest.php b/tests/Commands/DockerCiCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Feature\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\CiPlatform;
 use BlameButton\LaravelDockerBuilder\Detectors\CiPlatformDetector;
diff --git a/tests/Commands/DockerGenerateCommandTest.php b/tests/Commands/DockerGenerateCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Feature\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion;
diff --git a/tests/Commands/DockerPushCommandTest.php b/tests/Commands/DockerPushCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands;
 
 use BlameButton\LaravelDockerBuilder\Commands\DockerPushCommand;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Commands/GenerateQuestions/AlpineQuestionTest.php b/tests/Commands/GenerateQuestions/AlpineQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion;
diff --git a/tests/Commands/GenerateQuestions/ArtisanOptimizeQuestionTest.php b/tests/Commands/GenerateQuestions/ArtisanOptimizeQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion;
diff --git a/tests/Commands/GenerateQuestions/Choices/CiPlatformTest.php b/tests/Commands/GenerateQuestions/Choices/CiPlatformTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions\Choices;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions\Choices;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\CiPlatform;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Commands/GenerateQuestions/Choices/NodeBuildToolTest.php b/tests/Commands/GenerateQuestions/Choices/NodeBuildToolTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions\Choices;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions\Choices;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Commands/GenerateQuestions/Choices/NodePackageManagerTest.php b/tests/Commands/GenerateQuestions/Choices/NodePackageManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions\Choices;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions\Choices;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Commands/GenerateQuestions/Choices/PhpExtensionsTest.php b/tests/Commands/GenerateQuestions/Choices/PhpExtensionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions\Choices;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions\Choices;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions;
 use BlameButton\LaravelDockerBuilder\Integrations\SupportedPhpExtensions;
diff --git a/tests/Commands/GenerateQuestions/Choices/PhpVersionTest.php b/tests/Commands/GenerateQuestions/Choices/PhpVersionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions\Choices;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions\Choices;
 
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Commands/GenerateQuestions/NodeBuildToolQuestionTest.php b/tests/Commands/GenerateQuestions/NodeBuildToolQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool;
diff --git a/tests/Commands/GenerateQuestions/NodePackageManagerQuestionTest.php b/tests/Commands/GenerateQuestions/NodePackageManagerQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager;
diff --git a/tests/Commands/GenerateQuestions/PhpExtensionsQuestionTest.php b/tests/Commands/GenerateQuestions/PhpExtensionsQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpExtensionsQuestion;
diff --git a/tests/Commands/GenerateQuestions/PhpVersionQuestionTest.php b/tests/Commands/GenerateQuestions/PhpVersionQuestionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Commands\GenerateQuestions;
+namespace BlameButton\LaravelDockerBuilder\Tests\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion;
diff --git a/tests/Detectors/CiPlatformDetectorTest.php b/tests/Detectors/CiPlatformDetectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\CiPlatformDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Detectors/FileDetectorTest.php b/tests/Detectors/FileDetectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\FileDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Detectors/NodeBuildToolDetectorTest.php b/tests/Detectors/NodeBuildToolDetectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\NodeBuildToolDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Detectors/NodePackageManagerTest.php b/tests/Detectors/NodePackageManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\NodePackageManagerDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Detectors/PhpExtensionsDetectorTest.php b/tests/Detectors/PhpExtensionsDetectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\PhpExtensionsDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Detectors/PhpVersionDetectorTest.php b/tests/Detectors/PhpVersionDetectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Detectors;
+namespace BlameButton\LaravelDockerBuilder\Tests\Detectors;
 
 use BlameButton\LaravelDockerBuilder\Detectors\PhpVersionDetector;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/DockerServiceProviderTest.php b/tests/DockerServiceProviderTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit;
+namespace BlameButton\LaravelDockerBuilder\Tests;
 
 use BlameButton\LaravelDockerBuilder\DockerServiceProvider;
 use BlameButton\LaravelDockerBuilder\Integrations\SupportedPhpExtensions;
-use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Support\ServiceProvider;
 use Mockery\MockInterface;
diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit;
+namespace BlameButton\LaravelDockerBuilder\Tests;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Integrations/SupportedPhpExtensionsTest.php b/tests/Integrations/SupportedPhpExtensionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Integrations;
+namespace BlameButton\LaravelDockerBuilder\Tests\Integrations;
 
 use BlameButton\LaravelDockerBuilder\Integrations\SupportedPhpExtensions;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/Objects/ConfigurationTest.php b/tests/Objects/ConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Objects;
+namespace BlameButton\LaravelDockerBuilder\Tests\Objects;
 
 use BlameButton\LaravelDockerBuilder\Objects\Configuration;
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\ServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
-class TestCase extends Orchestra
+abstract class TestCase extends Orchestra
 {
     /**
      * Get package providers.
diff --git a/tests/Traits/InteractsWithTwigTest.php b/tests/Traits/InteractsWithTwigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BlameButton\LaravelDockerBuilder\Tests\Unit\Traits;
+namespace BlameButton\LaravelDockerBuilder\Tests\Traits;
 
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 use BlameButton\LaravelDockerBuilder\Traits\InteractsWithTwig;
