Merge pull request #51 from matthiasnoback/upgrade

Upgrade

Author: matthiasnoback

.gitattributes

@@ -0,0 +1,10 @@
+.github/ export-ignore
+bin/ export-ignore
+doc/ export-ignore
+features/ export-ignore
+test/ export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+CONTRIBUTING.md export-ignore
+docker-compose.yml export-ignore
+ecs.php export-ignore

.github/workflows/code-style.yaml

@@ -15,8 +15,10 @@ jobs:
                     -
                         name: "Behat"
                         run: vendor/bin/behat
-                php-versions: ['7.4', '8.0']
-
+                    -
+                        name: "Code style"
+                        run: vendor/bin/ecs check --ansi
+                dependencies: ["lowest", "highest"]
         name: ${{ matrix.actions.name }}
         runs-on: ubuntu-latest
 
@@ -26,10 +28,12 @@ jobs:
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: ${{ matrix.php-versions }}
+                    php-version: 8.0
                     coverage: none
 
             # composer install cache - https://github.com/ramsey/composer-install
             -   uses: "ramsey/composer-install@v1"
+                with:
+                    dependency-versions: "${{ matrix.dependencies }}"
 
             -   run: ${{ matrix.actions.run }}

.github/workflows/tests.yaml

@@ -1,6 +1,5 @@
 If you want to contribute to this library, clone this project, then:
 
-- Run `composer install` to install dependencies.
-- Run `./install-git-hooks.sh` to install the pre-commit hook which fixes coding style problems automatically for you.
-
-Take a look at `.travis.yml` to find out which versions of Symfony are currently supported by this library. The easiest way to find out if your code changes are compatible with different versions of Symfony is to register your cloned repository at Travis. Then push your code to GitHub and wait for the Travis build to finish. If the build fails for a particular Symfony version you can reproduce the build locally by exporting the same environment variables as Travis does and running the install and test scripts on your machine.
+- Run `bin/install` to download relevant Docker images and install Composer dependencies.
+- Run `bin/fix-cs` to fix code style issues
+- Run `bin/test` to run the tests

.php_cs

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

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -eu
+
+echo "Creating .env file"
+printf "HOST_UID=%s\nHOST_GID=%s\n" "$(id -u)" "$(id -g)" > .env
+
+echo "Pulling Docker images"
+docker-compose pull
+
+echo "Installing Composer dependencies"
+docker-compose run --rm composer install --ignore-platform-reqs --prefer-dist
+
+echo ""
+echo "Done"
+echo ""

bin/fix-cs

@@ -2,7 +2,4 @@
 
 set -eu
 
-# Copy user and group ID into .env file
-printf "HOST_UID=%s\nHOST_GID=%s\n" "$(id -u)" "$(id -g)" > .env
-
 docker-compose run --rm php php "$@"

bin/install

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

bin/php

@@ -23,20 +23,21 @@
         }
     },
     "require": {
-        "php": ">=7.4",
-        "symfony/form": "~5.0",
-        "symfony/console": "~5.0",
-        "symfony/translation": "~5.0"
+        "php": ">=8.0",
+        "symfony/form": "~5.0 || ~6.0",
+        "symfony/console": "~5.0 || ~6.0",
+        "symfony/translation": "~5.0 || ~6.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"
+        "symfony/finder": "~5 || ~6.0.0",
+        "symfony/framework-bundle": "~5.0 || ~6.0",
+        "symfony/validator": "~5.0 || ~6.0",
+        "symfony/yaml": "~5.0 || ~6.0",
+        "symfony/security-csrf": "~5.0 || ~6.0",
+        "phpunit/phpunit": "^9.5",
+        "symplify/easy-coding-standard": "^9.4",
+        "symplify/coding-standard": "^9.4"
     }
 }