🆙 Upgrade PHP to version 8 (#44)

* 🔥 Remove unused `composer serve` command

Author: shrink

.editorconfig

@@ -13,6 +13,6 @@ indent_size = 2
 [Makefile]
 indent_style = tab
 
-[*.{php}]
+[*.php]
 indent_style = space
 indent_size = 4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/shrink/docker-php-api:7.4 as php
+FROM ghcr.io/shrink/docker-php-api:8 as php
 
 USER root
 RUN docker-php-ext-install pdo_mysql
@@ -10,10 +10,9 @@ FROM php as dependencies
 
 ENV HOME=/run
 
-COPY --from=composer:1 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 COPY composer.json composer.lock ./
-RUN composer global require hirak/prestissimo --dev --prefer-dist && \
-    composer install --no-ansi --no-autoloader --no-interaction
+RUN composer install --no-ansi --no-autoloader --no-interaction
 
 COPY --chown=nobody . ./
 RUN composer dump-autoload

Makefile

@@ -59,11 +59,6 @@ check:
 test:
 	${COMPOSER_COMMAND} test
 
-# Run the application's PHP Insights
-.PHONY: insights
-insights:
-	${COMPOSER_COMMAND} insights -- -v
-
 # Install all of the application's composer dependencies
 .PHONY: install
 install:

README-project.md

@@ -23,7 +23,8 @@ including `check`, `shell`, `logs`, `upgrade`, `build` and more.
 ### Quality
 
 Code quality is verified using the `check` command which executes all test
-suites, performs static analysis and generates code insights.
+suites, performs static analysis and validates compliance with
+[PSR-12: Extended Coding Style][psr-12].
 
 ```console
 dev:~$ make check
@@ -41,3 +42,4 @@ dev:~$ git config core.hooksPath .github/hooks
 [dockerfile]: Dockerfile
 [dc-config]: docker-compose.yml
 [mmake]: https://github.com/tj/mmake
+[psr-12]: https://www.php-fig.org/psr/psr-12/

README.md

@@ -1,16 +1,15 @@
 # Laravel Strict
 
 **Laravel** [`8`][laravel-8] + **Docker**
-[`shrink/docker-php-api`][shrink/docker-php-api]
+[`shrink/docker-php-api:8`][shrink/docker-php-api]
 
 Laravel Strict is a
 [<img src="https://laravel.com/img/favicon/favicon-32x32.png" height="12"> Laravel <sup>&neArr;</sup>][laravel]
 install designed for building high quality containerised Laravel applications.
 
 * **All HTTP requests served by Laravel** &mdash; ideal for an API
-* Code quality enforced by
-  [`nunomaduro/phpinsights`<sup>&neArr;</sup>][php-insights] and
-  [`vimeo/psalm`<sup>&neArr;</sup>][psalm]
+* Code quality enforced by [`vimeo/psalm`<sup>&neArr;</sup>][psalm] and
+  [`squizlabs/php_codesniffer`<sup>&neArr;</sup>][phpcs]
 * Laravel configured with sane defaults and without boilerplate
 * Continuous Delivery using [GitHub Actions][workflows] and the GitHub Container
   Registry
@@ -153,8 +152,8 @@ performance in development by ~10x
 [laravel]: https://laravel.com
 [laravel-8]: https://laravel.com/docs/8.x
 [shrink/docker-php-api]: https://github.com/shrink/docker-php-api
-[php-insights]: https://phpinsights.com
 [psalm]: https://psalm.dev
+[phpcs]: https://github.com/squizlabs/PHP_CodeSniffer
 [workflows]: .github/workflows
 [workflows/build]: .github/workflows/build.yml
 [laravel/laravel]: https://github.com/laravel/laravel

composer.json

@@ -1,71 +1,64 @@
 {
-    "name": "shrink/laravel-project",
-    "type": "project",
-    "description": "Add a project description here",
-    "license": "proprietary",
-    "require": {
-        "php": "^7.4",
-        "fideloper/proxy": "^4.0",
-        "laravel/framework": "^8.0",
-        "laravel/tinker": "^2.0",
-        "shrink/conductor-laravel": "^0.3.0"
-    },
-    "require-dev": {
-        "facade/ignition": "^2.3.6",
-        "nunomaduro/collision": "^5.0",
-        "nunomaduro/phpinsights": "^1.14",
-        "phpunit/phpunit": "^8.5|^9.0",
-        "vimeo/psalm": "^3.11"
-    },
-    "config": {
-        "optimize-autoloader": false,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "App\\": "app/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "scripts": {
-        "post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
-        ],
-        "generate-key": [
-            "@php artisan key:generate --ansi"
-        ],
-        "serve": [
-            "@generate-key",
-            "Composer\\Config::disableProcessTimeout",
-            "(source .env && echo \"\n→ Launching local server at http://localhost:${APP_PORT}\n\")",
-            "@php -S 0.0.0.0:8080 -t public"
-        ],
-        "check": [
-            "@test",
-            "@static",
-            "@insights"
-        ],
-        "test": [
-            "vendor/bin/phpunit --colors=always"
-        ],
-        "insights": [
-            "vendor/bin/phpinsights --ansi --no-interaction --config-path=insights.php"
-        ],
-        "static": [
-            "vendor/bin/psalm --long-progress --report=artifacts/psalm.junit.xml"
-        ]
+  "name": "shrink/laravel-project",
+  "type": "project",
+  "description": "Add a project description here",
+  "license": "proprietary",
+  "require": {
+    "php": "^8",
+    "laravel/framework": "^8.0",
+    "laravel/tinker": "^2.0",
+    "shrink/conductor-laravel": "^1.1.0"
+  },
+  "require-dev": {
+    "facade/ignition": "^2.3.6",
+    "nunomaduro/collision": "^5.0",
+    "phpunit/phpunit": "^8.5|^9.0",
+    "squizlabs/php_codesniffer": "^3.5",
+    "vimeo/psalm": "^4.3"
+  },
+  "config": {
+    "optimize-autoloader": false,
+    "preferred-install": "dist",
+    "sort-packages": true
+  },
+  "extra": {
+    "laravel": {
+      "dont-discover": []
     }
+  },
+  "autoload": {
+    "psr-4": {
+      "App\\": "app/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "scripts": {
+    "post-autoload-dump": [
+      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+      "@php artisan package:discover --ansi"
+    ],
+    "generate-key": [
+      "@php artisan key:generate --ansi"
+    ],
+    "check": [
+      "@test",
+      "@static",
+      "@quality"
+    ],
+    "test": [
+      "vendor/bin/phpunit --colors=always"
+    ],
+    "quality": [
+      "vendor/bin/phpcs --standard=PSR12 src/"
+    ],
+    "static": [
+      "vendor/bin/psalm --long-progress --report=artifacts/psalm.junit.xml"
+    ]
+  }
 }