Switch to ECS and minimum of PHP 8.0

Author: matthiasnoback

.gitattributes

@@ -5,7 +5,6 @@ features/ export-ignore
 test/ export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.php_cs export-ignore
 CONTRIBUTING.md export-ignore
 docker-compose.yml export-ignore
 ecs.php export-ignore

.github/workflows/code-style.yaml

@@ -14,7 +14,7 @@ jobs:
         actions:
           -
             name: "Code style"
-            run: vendor/bin/php-cs-fixer fix -v --diff --dry-run
+            run: vendor/bin/ecs check --ansi
         php-versions: ['7.4']
 
     name: ${{ matrix.actions.name }}

.php_cs

@@ -1,5 +1,5 @@
 If you want to contribute to this library, clone this project, then:
 
 - Run `bin/install` to download relevant Docker images and install Composer dependencies.
-- Run `bin/fix` to fix code style issues
+- Run `bin/fix-cs` to fix code style issues
 - Run `bin/test` to run the tests

CONTRIBUTING.md

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -eu
+
+docker-compose run --rm php php vendor/bin/ecs check --fix

bin/fix-cs

@@ -23,20 +23,21 @@
         }
     },
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "symfony/form": "~5.0",
         "symfony/console": "~5.0",
         "symfony/translation": "~5.0"
     },
     "require-dev": {
         "beberlei/assert": "~2.1",
         "behat/behat": "^3.6",
-        "friendsofphp/php-cs-fixer": "^2.2",
         "symfony/finder": "~5.0",
         "symfony/framework-bundle": "~5.0",
         "symfony/validator": "~5.0",
         "symfony/yaml": "~5.0",
         "symfony/security-csrf": "~5.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5",
+        "symplify/easy-coding-standard": "^9.4",
+        "symplify/coding-standard": "^9.4"
     }
 }

composer.json

@@ -11,7 +11,7 @@ services:
     user: ${HOST_UID}:${HOST_GID}
 
   php:
-    image: php:7.4-cli-alpine
+    image: php:8.0-cli-alpine
     working_dir: /app
     volumes:
       - ./:/app

docker-compose.yml

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
+
+return static function (
+    ContainerConfigurator $containerConfigurator
+): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(
+        Option::PATHS,
+        [
+            __DIR__ . '/src',
+            __DIR__ . '/test'
+        ]
+    );
+
+    $parameters->set(
+        Option::SKIP,
+        [
+            __DIR__ . '/test/temp'
+        ]
+    );
+
+    $containerConfigurator->import(SetList::CONTROL_STRUCTURES);
+    $containerConfigurator->import(SetList::PSR_12);
+    $containerConfigurator->import(SetList::COMMON);
+    $containerConfigurator->import(SetList::SYMPLIFY);
+};

ecs.php

@@ -7,7 +7,7 @@
 
 final class SymfonyConsoleFormBundle extends Bundle
 {
-    public function getContainerExtension()
+    public function getContainerExtension(): SymfonyConsoleFormExtension
     {
         return new SymfonyConsoleFormExtension();
     }

src/Bundle/SymfonyConsoleFormBundle.php

@@ -9,30 +9,30 @@
 
 class AppKernel extends Kernel
 {
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),
             new SymfonyConsoleFormBundle(),
         ];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config.yml');
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__;
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return __DIR__.'/temp/cache';
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return __DIR__.'/temp/logs';
     }