Upgrade to PHP8 versions of dependencies

.editorconfig

@@ -11,9 +11,6 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.md]
-trim_trailing_whitespace = true
-
 [*.yaml]
 indent_size = 2
 
@@ -22,3 +19,12 @@ indent_size = 2
 
 [*.go]
 indent_style = tab
+
+[*.json]
+indent_size = 2
+
+[composer.json]
+indent_size = 4
+
+[*.neon]
+indent_style = tab

.github/workflows/ci.yml

@@ -44,6 +44,9 @@ jobs:
         CI_COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | head -c8)
         ./bin/platform self:build --no-composer-rebuild --yes --replace-version "$CI_COMMIT_REF_NAME"-"$CI_COMMIT_SHORT_SHA" --output platform.phar
 
+    - name: Lint PHP files
+      run: make lint-php-cs-fixer lint-phpstan
+
     - name: Run PHPUnit tests
       run: |
         composer install --no-interaction --no-scripts
@@ -55,6 +58,9 @@ jobs:
         go-version: 1.22
         cache-dependency-path: cli/go.sum
 
+    - name: Lint Go files
+      run: make lint-gofmt
+
     - name: Run integration tests
       run: |
         export TEST_CLI_PATH=$(realpath "./platform.phar")

.gitignore

@@ -5,3 +5,5 @@
 /release-changelog*.md
 /local-php-security-checker
 /.phpunit.result.cache
+/.phpunit.cache
+/.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,18 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+    ->notPath([
+        'config/cache/container.php', // Ignore generated file
+        'dist/installer.php', // Keep old PHP compatibility
+        'tests/data', // Ignore test data
+    ])
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PER-CS' => true,
+        '@PHP84Migration' => true,
+    ])
+    ->setFinder($finder)
+;

Makefile

@@ -0,0 +1,34 @@
+GO_TESTS_DIR=go-tests
+
+.PHONY: composer-dev
+composer-dev:
+	composer install --no-interaction
+
+.PHONY: clean
+clean:
+	rm config/cache/container.php
+
+.PHONY: lint-phpstan
+lint-phpstan: composer-dev
+	./vendor/bin/phpstan analyse
+
+.PHONY: lint-php-cs-fixer
+lint-php-cs-fixer: composer-dev
+	./vendor/bin/php-cs-fixer check --config .php-cs-fixer.dist.php --diff
+
+.PHONY: lint-gofmt
+lint-gofmt:
+	cd $(GO_TESTS_DIR) && go fmt ./...
+
+.PHONY: lint-golangci
+lint-golangci:
+	command -v golangci-lint >/dev/null || go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	cd $(GO_TESTS_DIR) && golangci-lint run
+
+.PHONY: lint
+lint: lint-gofmt lint-golangci lint-php-cs-fixer lint-phpstan
+
+.PHONY: test
+test:
+	./vendor/bin/phpunit --exclude-group slow
+	cd $(GO_TESTS_DIR) && go test -v -count=1 ./...

box.json

@@ -2,14 +2,13 @@
   "chmod": "0755",
   "directories": [
     "bin",
-    "resources",
-    "src"
+    "config",
+    "resources"
   ],
   "files": [
     "config.yaml",
     "config-defaults.yaml",
     "constants.php",
-    "services.yaml",
     "shell-config.tmpl.rc",
     "shell-config-bash.tmpl.rc",
     "shell-config-bash-direct.tmpl.rc",
@@ -18,6 +17,10 @@
     "vendor/composer/ca-bundle/res/cacert.pem"
   ],
   "finder": [
+    {
+      "in": "src",
+      "exclude": ["Rector"]
+    },
     {
       "in": "vendor",
       "name": "*.php*",
@@ -33,7 +36,7 @@
   ],
   "main": "bin/platform",
   "output": "platform.phar",
-  "stub": "stub.php",
+  "stub": "resources/phar-stub.php",
   "compactors": [
       "KevinGH\\Box\\Compactor\\Json",
       "KevinGH\\Box\\Compactor\\Php"

composer.json

@@ -5,28 +5,26 @@
     "require": {
         "php": ">=8.2",
         "doctrine/cache": "~1.5",
-        "guzzlehttp/guzzle": "^5.3",
-        "guzzlehttp/ringphp": "^1.1",
-        "platformsh/console-form": ">=0.0.37 <2.0",
-        "platformsh/client": ">=0.87.0 <2.0",
-        "symfony/console": "^3.0 >=3.2",
-        "symfony/yaml": "^3.0 || ^2.6",
-        "symfony/finder": "^3.0",
-        "symfony/filesystem": "^3.0",
-        "symfony/process": "^3.0 >=3.4",
-        "stecman/symfony-console-completion": "^0.11",
-        "symfony/event-dispatcher": "^3.0",
+        "guzzlehttp/guzzle": "^7",
+        "platformsh/console-form": "^1@beta",
+        "platformsh/client": "^3@beta",
+        "symfony/console": "^7",
+        "symfony/yaml": "^7",
+        "symfony/finder": "^7",
+        "symfony/filesystem": "^7",
+        "symfony/process": "^7",
+        "symfony/event-dispatcher": "^7",
         "padraic/phar-updater": "^1.0",
-        "symfony/dependency-injection": "^3.1",
-        "symfony/config": "^3.1",
-        "paragonie/random_compat": "^2.0",
+        "symfony/dependency-injection": "^7",
+        "symfony/config": "^7",
         "ext-json": "*",
         "composer/ca-bundle": "^1.3",
         "khill/php-duration": "^1.1",
-        "giggsey/libphonenumber-for-php": "^8.13",
         "symfony/polyfill-mbstring": "^1.19",
         "symfony/polyfill-iconv": "^1.19",
-        "padraic/humbug_get_contents": "dev-allow-php-8 as 1.1.3"
+        "padraic/humbug_get_contents": "dev-allow-php-8 as 1.1.3",
+        "platformsh/oauth2": "^1@beta",
+        "giggsey/libphonenumber-for-php-lite": "^8.13"
     },
     "repositories": [
         {
@@ -49,7 +47,9 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^11"
+        "phpunit/phpunit": "^11",
+        "rector/rector": "^1.2",
+        "friendsofphp/php-cs-fixer": "^3.65"
     },
     "authors": [
         {
@@ -69,6 +69,7 @@
     },
     "scripts": {
         "update-countries": "php scripts/update-countries.php",
-        "update-known-hosts": "php scripts/update-known-hosts.php"
+        "update-known-hosts": "php scripts/update-known-hosts.php",
+        "post-install-cmd": ["Platformsh\\Cli\\Application::warmCaches"]
     }
 }