Merge 9c1f463 into be9f836

vincentchalamon · Oct 19, 2021 · 2b9c4b9 · 2b9c4b9
2 parents be9f836 + 9c1f463
commit 2b9c4b9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,11 +1,17 @@
 name: CI
 
 on:
+  push:
+    branches:
+      - main
+      - '[0-9].[0-9]'
+    tags:
+      - '*'
+  pull_request: ~
   schedule:
-    # Every sunday at 02:00
+    # Every Sunday at 02:00
     - cron: 0 2 * * 0
-  pull_request:
-  push: ~
+  workflow_dispatch: ~
 
 jobs:
   tests:
@@ -17,9 +23,12 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
+          - '8.1'
         symfony:
           - '4.4.*'
           - '5.3.*'
+          - '5.4.*'
+          - '6.0.*'
         include:
           - php: '7.4'
             symfony: '5.3.*'
@@ -32,9 +41,17 @@ jobs:
             deprecations: true
           - php: '8.0'
             phpstan: phpstan.php8.neon.dist
+          - php: '8.1'
+            phpstan: phpstan.php8.neon.dist
         exclude:
           - php: '8.0'
             symfony: '4.4.*'
+          - php: '8.1'
+            symfony: '4.4.*'
+          - php: '7.3'
+            symfony: '6.0.*'
+          - php: '7.4'
+            symfony: '6.0.*'
       fail-fast: false
     steps:
       - name: Checkout

diff --git a/composer.json b/composer.json
@@ -25,17 +25,17 @@
         "doctrine/collections": "^1.2",
         "jamesiarmes/php-ntlm": "^1.0",
         "ocramius/proxy-manager": "^2.11",
-        "symfony/config": "^4.4 || ^5.1",
+        "symfony/config": "^4.4 || ^5.1 || ^6.0",
         "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
-        "symfony/http-kernel": "^4.4.13 || ^5.1.5",
-        "symfony/property-access": "^4.4 || ^5.1",
-        "symfony/property-info": "^4.4 || ^5.1",
-        "symfony/serializer": "^4.4 || ^5.1",
-        "symfony/stopwatch": "^4.4 || ^5.1"
+        "symfony/http-kernel": "^4.4.13 || ^5.1.5 || ^6.0",
+        "symfony/property-access": "^4.4 || ^5.1 || ^6.0",
+        "symfony/property-info": "^4.4 || ^5.1 || ^6.0",
+        "symfony/serializer": "^4.4 || ^5.1 || ^6.0",
+        "symfony/stopwatch": "^4.4 || ^5.1 || ^6.0"
     },
     "require-dev": {
         "ext-simplexml": "*",
-        "api-platform/core": "^2.5.2 || ^2.5-dev",
+        "api-platform/core": "^2.5",
         "behat/behat": "^3.1",
         "behatch/contexts": "^3.3",
         "easycorp/easyadmin-bundle": "^2.3",
@@ -49,13 +49,13 @@
         "phpspec/prophecy": "^1.12",
         "phpstan/phpstan": "^0.12.9",
         "sensio/framework-extra-bundle": "^5.0",
-        "symfony/asset": "^4.4 || ^5.1",
-        "symfony/console": "^4.4 || ^5.1",
-        "symfony/dotenv": "^4.4 || ^5.1",
-        "symfony/phpunit-bridge": "^5.1",
-        "symfony/twig-bundle": "^4.4 || ^5.1",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.1",
-        "willdurand/negotiation": "^3.0-dev"
+        "symfony/asset": "^4.4 || ^5.1 || ^6.0",
+        "symfony/console": "^4.4 || ^5.1 || ^6.0",
+        "symfony/dotenv": "^4.4 || ^5.1 || ^6.0",
+        "symfony/phpunit-bridge": "^5.1 || ^6.0",
+        "symfony/twig-bundle": "^4.4 || ^5.1 || ^6.0",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.1 || ^6.0",
+        "willdurand/negotiation": "^3.0"
     },
     "suggest": {
         "api-platform/core": "Add support for API Platform",
@@ -86,11 +86,5 @@
         "post-update-cmd": [
             "vendor/bin/simple-phpunit --version"
         ]
-    },
-    "minimum-stability": "stable",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.0.x-dev"
-        }
     }
 }