Add Pro level - Webshop support - Drop php8.3 (#3868)

Author: ildyria

.editorconfig

@@ -27,4 +27,8 @@ indent_size = 2
 
 [lang/**.php]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[docker-compose.yaml]
+indent_style = space
+indent_size = 2

.env.example

@@ -259,12 +259,6 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 # STRIPE_API_KEY=
 # STRIPE_PUBLISHABLE_KEY=
 
-# https://github.com/thephpleague/omnipay-paypal/blob/master/src/RestGateway.php
+# Configuration values for PayPal integration
 # PAYPAL_CLIENT_ID=
 # PAYPAL_SECRET=
-
-# https://github.com/thephpleague/omnipay-paypal/blob/master/src/ExpressInContextGateway.php
-# https://github.com/thephpleague/omnipay-paypal/blob/master/src/ProGateway.php
-# PAYPAL_API_USERNAME=
-# PAYPAL_API_PASSWORD=
-# PAYPAL_API_SIGNATURE=

.github/workflows/CICD.yml

@@ -3,6 +3,10 @@ name: Integrate
 # Run this workflow every time a new commit pushed to your repository
 on:
   push:
+    branches:
+      - master
+    tags:
+      - '*'
     paths-ignore:
       - '**/*.md'
       - 'public/dist/*.js'
@@ -20,28 +24,14 @@ on:
 # Declare default permissions as read only.
 permissions: read-all
 
-jobs:
-  kill_previous:
-    name: 0️⃣ Kill previous runs
-    runs-on: ubuntu-latest
-    # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push to the branch.
-    if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
-        with:
-          egress-policy: audit
-
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
-        with:
-          access_token: ${{ github.token }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'master') && !startsWith(github.ref, 'refs/tags/') }} # Only cancel previous runs on non-master/non-tag branches.
 
+jobs:
   php_syntax_errors:
-    name: 1️⃣ PHP 8.3 - Syntax errors
+    name: 0️⃣ PHP 8.4 - Syntax errors
     runs-on: ubuntu-latest
-    needs:
-      - kill_previous
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
@@ -51,7 +41,7 @@ jobs:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
-          php-version: 8.3
+          php-version: 8.4
 
       - name: Checkout code
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -62,8 +52,12 @@ jobs:
       - name: Check source code for syntax errors
         run: vendor/bin/parallel-lint --exclude .git --exclude vendor .
 
+  check_js:
+    name: 0️⃣ JS front-end
+    uses: ./.github/workflows/js_check.yml
+
   code_style_errors:
-    name: 2️⃣ PHP 8.3 - Code Style errors
+    name: 1️⃣ PHP 8.4 - Code Style errors
     runs-on: ubuntu-latest
     needs:
       - php_syntax_errors
@@ -76,7 +70,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
-          php-version: 8.3
+          php-version: 8.4
 
       - name: Checkout code
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -85,16 +79,10 @@ jobs:
         uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
 
       - name: Check source code for code style errors
-        run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --verbose --diff --dry-run
-
-  check_js:
-    name: 2️⃣ JS front-end
-    uses: ./.github/workflows/js_check.yml
-    needs:
-      - php_syntax_errors
+        run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --verbose --diff --dry-run
 
   phpstan:
-    name: 2️⃣ PHP 8.3 - PHPStan
+    name: 1️⃣ PHP 8.4 - PHPStan
     runs-on: ubuntu-latest
     needs:
       - php_syntax_errors
@@ -110,7 +98,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
-          php-version: 8.3
+          php-version: 8.4
           coverage: none
 
       - name: Install Composer dependencies
@@ -120,7 +108,7 @@ jobs:
         run: vendor/bin/phpstan analyze
 
   license:
-    name: 2️⃣ PHP 8.3 - License Check
+    name: 1️⃣ PHP 8.4 - License Check
     runs-on: ubuntu-latest
     needs:
       - php_syntax_errors
@@ -136,7 +124,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
-          php-version: 8.3
+          php-version: 8.4
           coverage: none
 
       - name: Install Composer dependencies
@@ -147,21 +135,21 @@ jobs:
         run: vendor/bin/composer-license-checker check -b GPL-2.0-or-later -b GPL-2.0-only -b GPL-3.0-only -b GPL-3.0-or-later -b AGPL-1.0-only -b AGPL-1.0-or-later -b AGPL-3.0-only -b AGPL-3.0-or-later -b LGPL-2.0-only -b LGPL-2.0-or-later -b LGPL-2.1-only -b LGPL-2.1-or-later -b LGPL-3.0-only -b LGPL-3.0-or-later --no-dev
 
   tests:
-    name:  2️⃣ PHP tests
+    name: 1️⃣ PHP tests
     needs:
       - php_syntax_errors
     uses: ./.github/workflows/php_tests.yml
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   dist:
-    name:  3️⃣ PHP dist
+    name: 2️⃣ PHP dist
     needs:
       - code_style_errors
     uses: ./.github/workflows/php_dist.yml
 
   createArtifact:
-    name: 4️⃣ Build Artifact
+    name: 3️⃣ Build Artifact
     if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
     needs:
       - phpstan
@@ -188,7 +176,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: ${{ env.extensions }}
           coverage: none
 
@@ -241,7 +229,7 @@ jobs:
 
 
   release:
-    name: 5️⃣ Release
+    name: 4️⃣ Release
     if: startsWith(github.ref, 'refs/tags/')
     needs:
       - createArtifact

.github/workflows/php_dist.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 8.3
           - 8.4
+          - 8.5
         sql-versions:
           - mariadb
           - postgresql

.github/workflows/php_tests.yml

@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 8.3
           - 8.4
+          - 8.5
         sql-versions:
           - mariadb
           - postgresql

.gitignore

@@ -59,8 +59,12 @@ docker-compose.yml
 
 # Building stuff for releaseses
 Lychee/*
+lychee/*
 /public/embed/
 report_*
 
 # XHProf output
-public/vendor/
+public/vendor/
+**/caddy
+frankenphp
+frankenphp-worker.php

.php-cs-fixer.php

@@ -57,5 +57,6 @@ function (PhpCsFixer\Finder $finder, $dir) {
 $config->setIndent("\t");
 $config->setLineEnding("\n");
 $config->setFinder($finder);
+$config->setUnsupportedPhpVersionAllowed(true);
 
 return $config;