WIP docker:ci command

bram-pkg · bram-pkg · commit e06525445cb0 · 2023-01-15T20:22:21.000Z
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -15,22 +15,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Validate composer.json and composer.lock
-      run: composer validate --strict
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
 
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v3
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
 
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
 
-    - name: Run test suite
-      run: vendor/bin/phpunit
+      - name: Run test suite
+        run: vendor/bin/phpunit
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ When `--detect` is passed to the `docker:generate` command, it will automaticall
 
 * PHP version, detected using the `php` version in your `composer.json`
 * PHP extensions, detected using the configuration of your project:
-  * Cache driver: Redis, Memcached, APC
-  * Database driver: MySQL, Postgres, SQL Server
-  * Broadcasting driver: Redis
-  * Queue driver: Redis
-  * Session driver: Redis, Memcached, APC
+    * Cache driver: Redis, Memcached, APC
+    * Database driver: MySQL, Postgres, SQL Server
+    * Broadcasting driver: Redis
+    * Queue driver: Redis
+    * Session driver: Redis, Memcached, APC
 * Node package manager, detected using the existence of `package-lock.json` or `yarn.lock`
 * Node build tool, detected using the existence of `vite.config.js` or `webpack.mix.js`
 
diff --git a/composer.json b/composer.json
@@ -3,7 +3,13 @@
   "description": "Production ready Docker files for Laravel",
   "license": "MIT",
   "type": "library",
-  "keywords": ["laravel", "docker", "image","generate", "kubernetes"],
+  "keywords": [
+    "laravel",
+    "docker",
+    "image",
+    "generate",
+    "kubernetes"
+  ],
   "authors": [
     {
       "name": "Bram Ceulemans",
diff --git a/src/Commands/DockerCiCommand.php b/src/Commands/DockerCiCommand.php
@@ -15,8 +15,9 @@ class DockerCiCommand extends BaseCommand
     public function handle(): int
     {
         if ($argument = $this->argument('ci-platform')) {
-            if (!in_array($argument, CiPlatform::values())) {
+            if (! in_array($argument, CiPlatform::values())) {
                 $this->error("Invalid value [$argument] for argument [ci-platform].");
+
                 return self::FAILURE;
             }
 
diff --git a/tests/Feature/Commands/DockerGenerateCommandTest.php b/tests/Feature/Commands/DockerGenerateCommandTest.php
@@ -13,18 +13,19 @@
  * @uses   \BlameButton\LaravelDockerBuilder\Detectors\PhpExtensionsDetector
  * @uses   \BlameButton\LaravelDockerBuilder\Detectors\NodePackageManagerDetector
  * @uses   \BlameButton\LaravelDockerBuilder\Detectors\NodeBuildToolDetector
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\BaseCommand::optionalChoice
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\DockerCiCommand::getArguments()
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpVersionQuestion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpExtensionsQuestion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodePackageManagerQuestion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodeBuildToolQuestion
  * @uses   package_path()
- * @uses \BlameButton\LaravelDockerBuilder\Commands\BaseCommand::optionalChoice
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpVersionQuestion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpExtensionsQuestion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodePackageManagerQuestion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodeBuildToolQuestion
  *
  * @covers \BlameButton\LaravelDockerBuilder\Objects\Configuration
  * @covers \BlameButton\LaravelDockerBuilder\Commands\DockerGenerateCommand
@@ -117,19 +118,19 @@ public function provideInvalidOptions(): array
     {
         return [
             'php version' => [
-                'Invalid value [unsupported] for option [php-version]',
+                'Invalid value [unsupported] for option [php-version].',
                 'docker:generate -n -p unsupported -e bcmath -o -a -m npm -b vite',
             ],
             'php extensions' => [
                 'Extension [unsupported] is not supported.',
                 'docker:generate -n -p 8.2 -e bcmath,unsupported -o -a -m npm -b vite',
             ],
             'node package manager' => [
-                'Invalid value [unsupported] for option [node-package-manager]',
+                'Invalid value [unsupported] for option [node-package-manager].',
                 'docker:generate -n -p 8.2 -e bcmath -o -a -m unsupported -b vite',
             ],
             'node build tool' => [
-                'Invalid value [unsupported] for option [node-build-tool]',
+                'Invalid value [unsupported] for option [node-build-tool].',
                 'docker:generate -n -p 8.2 -e bcmath -o -a -m npm -b unsupported',
             ],
         ];
diff --git a/tests/Unit/Commands/BaseDockerCommandTest.php b/tests/Unit/Commands/BaseDockerCommandTest.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Process\Process;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\BaseDockerCommand
  */
diff --git a/tests/Unit/Commands/DockerBuildCommandTest.php b/tests/Unit/Commands/DockerBuildCommandTest.php
@@ -7,8 +7,8 @@
 use Symfony\Component\Process\Process;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses package_path()
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   package_path()
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\DockerBuildCommand
  */
diff --git a/tests/Unit/Commands/DockerPushCommandTest.php b/tests/Unit/Commands/DockerPushCommandTest.php
@@ -7,8 +7,8 @@
 use Symfony\Component\Process\Process;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses package_path()
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   package_path()
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\DockerPushCommand
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/AlpineQuestionTest.php b/tests/Unit/Commands/GenerateQuestions/AlpineQuestionTest.php
@@ -7,7 +7,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/ArtisanOptimizeQuestionTest.php b/tests/Unit/Commands/GenerateQuestions/ArtisanOptimizeQuestionTest.php
@@ -7,7 +7,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/Choices/NodeBuildToolTest.php b/tests/Unit/Commands/GenerateQuestions/Choices/NodeBuildToolTest.php
@@ -6,7 +6,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/Choices/NodePackageManagerTest.php b/tests/Unit/Commands/GenerateQuestions/Choices/NodePackageManagerTest.php
@@ -6,7 +6,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/Choices/PhpExtensionsTest.php b/tests/Unit/Commands/GenerateQuestions/Choices/PhpExtensionsTest.php
@@ -8,7 +8,7 @@
 use Mockery\MockInterface;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/Choices/PhpVersionTest.php b/tests/Unit/Commands/GenerateQuestions/Choices/PhpVersionTest.php
@@ -6,7 +6,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/NodeBuildToolQuestionTest.php b/tests/Unit/Commands/GenerateQuestions/NodeBuildToolQuestionTest.php
@@ -11,8 +11,8 @@
 use Mockery\MockInterface;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodeBuildToolQuestion
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/NodePackageManagerQuestionTest.php b/tests/Unit/Commands/GenerateQuestions/NodePackageManagerQuestionTest.php
@@ -11,8 +11,8 @@
 use Mockery\MockInterface;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodePackageManagerQuestion
  */
diff --git a/tests/Unit/Commands/GenerateQuestions/PhpVersionQuestionTest.php b/tests/Unit/Commands/GenerateQuestions/PhpVersionQuestionTest.php
@@ -11,8 +11,8 @@
 use Mockery\MockInterface;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
  *
  * @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpVersionQuestion
  */
diff --git a/tests/Unit/DockerServiceProviderTest.php b/tests/Unit/DockerServiceProviderTest.php
@@ -10,12 +10,13 @@
 use Mockery\MockInterface;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\Commands\DockerGenerateCommand::getOptions()
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
- * @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
- * @uses package_path()
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\DockerCiCommand::getArguments()
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\DockerGenerateCommand::getOptions()
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
+ * @uses   \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
+ * @uses   package_path()
  *
  * @covers \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  */
diff --git a/tests/Unit/Objects/ConfigurationTest.php b/tests/Unit/Objects/ConfigurationTest.php
@@ -6,7 +6,7 @@
 use BlameButton\LaravelDockerBuilder\Tests\TestCase;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
  *
  * @covers \BlameButton\LaravelDockerBuilder\Objects\Configuration
  */
diff --git a/tests/Unit/Traits/InteractsWithTwigTest.php b/tests/Unit/Traits/InteractsWithTwigTest.php
@@ -9,8 +9,8 @@
 use Twig\Loader\FilesystemLoader;
 
 /**
- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
- * @uses package_path()
+ * @uses   \BlameButton\LaravelDockerBuilder\DockerServiceProvider
+ * @uses   package_path()
  *
  * @covers \BlameButton\LaravelDockerBuilder\Traits\InteractsWithTwig
  */

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,9 @@ class DockerCiCommand extends BaseCommand`
`15`	`15`	`public function handle(): int`
`16`	`16`	`{`
`17`	`17`	`if ($argument = $this->argument('ci-platform')) {`
`18`		`- if (!in_array($argument, CiPlatform::values())) {`
	`18`	`+ if (! in_array($argument, CiPlatform::values())) {`
`19`	`19`	`$this->error("Invalid value [$argument] for argument [ci-platform].");`
	`20`	`+`
`20`	`21`	`return self::FAILURE;`
`21`	`22`	`}`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Symfony\Component\Process\Process;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider`
	`11`	`+ * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider`
`12`	`12`	`*`
`13`	`13`	`* @covers \BlameButton\LaravelDockerBuilder\Commands\BaseDockerCommand`
`14`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use BlameButton\LaravelDockerBuilder\Tests\TestCase;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider`
	`10`	`+ * @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider`
`11`	`11`	`*`
`12`	`12`	`* @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion`
`13`	`13`	`*/`