Merge remote-tracking branch 'upstream/master' into chore/bamarni-dep…

…recration
thephpleague · Oct 14, 2023 · 64a0919 · 64a0919
2 parents a04f7b7 + 49f3da0
commit 64a0919
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -1,14 +1,19 @@
 name: "coding standards"
 
-on: ["pull_request", "push"]
+on:
+    pull_request: ~
+    push: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
 
 jobs:
     coding-standards:
         name: "coding standards"
         runs-on: "ubuntu-latest"
         steps:
             - name: "checkout"
-              uses: "actions/checkout@v2"
+              uses: "actions/checkout@v4"
 
             - name: "build the environment"
               run: "dev/bin/docker-compose build"

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,14 +1,19 @@
 name: "static analysis"
 
-on: ["pull_request", "push"]
+on:
+    pull_request: ~
+    push: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
 
 jobs:
     static-analysis:
         name: "static analysis"
         runs-on: "ubuntu-latest"
         steps:
             - name: "checkout"
-              uses: "actions/checkout@v2"
+              uses: "actions/checkout@v4"
 
             - name: "build the environment"
               run: "dev/bin/docker-compose build"

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -1,6 +1,11 @@
 name: "unit tests"
 
-on: [ "pull_request", "push" ]
+on:
+    pull_request: ~
+    push: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
 
 jobs:
     tests:
@@ -10,32 +15,21 @@ jobs:
             fail-fast: false
             matrix:
                 #Stable supported versions
-                php: ['7.4', '8.0', '8.1', '8.2']
+                php: ['8.1', '8.2']
                 symfony: ['5.4.*', '6.2.*']
                 composer-flags: ['--prefer-stable']
                 can-fail: [false]
                 exclude:
-                    - php: '7.4'
-                      symfony: '6.2.*'
-                    - php: '8.0'
+                    - php: '8.1'
                       symfony: '6.2.*'
                 include:
                     # Lowest supported versions
-                    - php: '7.2'
+                    - php: '8.1'
                       symfony: '5.4.*'
                       composer-flags: '--prefer-stable --prefer-lowest'
                       can-fail: false
-                    # EOL PHP versions
-                    - php: '7.2'
-                      symfony: '5.4.*'
-                      composer-flags: '--prefer-stable'
-                      can-fail: false
-                    - php: '7.3'
-                      symfony: '5.4.*'
-                      composer-flags: '--prefer-stable'
-                      can-fail: false
                     # Development versions
-                    - php: '8.2'
+                    - php: '8.3'
                       symfony: '6.3.x-dev'
                       composer-flags: ''
                       can-fail: true
@@ -47,11 +41,7 @@ jobs:
 
         steps:
             - name: "checkout"
-              uses: "actions/checkout@v2"
-
-            - name: "build the PHP7 environment"
-              run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} php"
-              if: startsWith(matrix.php, '7')
+              uses: "actions/checkout@v4"
 
             - name: "build the PHP8 environment"
               run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} --build-arg XDEBUG_VERSION='3.2.0' php"

diff --git a/composer.json b/composer.json
@@ -16,15 +16,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": "^8.1",
         "doctrine/doctrine-bundle": "^2.0.8",
         "doctrine/orm": "^2.7.1",
         "league/oauth2-server": "^8.3",
         "nyholm/psr7": "^1.4",
         "psr/http-factory": "^1.0",
         "symfony/event-dispatcher": "^5.4|^6.2",
         "symfony/framework-bundle": "^5.4|^6.2",
-        "symfony/polyfill-php81": "^1.22",
         "symfony/psr-http-message-bridge": "^2.0",
         "symfony/security-bundle": "^5.4|^6.2"
     },

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.4
+ARG PHP_VERSION=8.1
 
 FROM php:${PHP_VERSION}-cli-alpine
 LABEL maintainer="Petar Obradović <[email protected]>"