Test/try fix

.github/workflows/a11y_tests.yaml

@@ -1,15 +1,18 @@
 name: Accessibility (a11y) Tests
 
 on:
-    pull_request:
+    push:
+        branches:
+            - master
+#    pull_request:
 
 jobs:
     a11y_tests:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['7.2']
-                node-version: ['12.5']
+                php-version: ['8.0']
+                node-version: ['12.22']
                 actions:
                     -
                         name: Run pa11yci
@@ -19,38 +22,43 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
 
             # see https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml
             -
-                name: Use Node.js 12.5
-                uses: actions/setup-node@v1
+                name: Use Node.js ${{ matrix.node-version }}
+                uses: actions/setup-node@v4
                 with:
                     node-version: ${{ matrix.node-version }}
-                    coverage: none
-            -   uses: shivammathur/setup-php@v2
+#                    coverage: none
+            -   name: Use PHP ${{ matrix.php-version }}
+                uses: shivammathur/setup-php@v2
                 with:
                     # test the lowest version, to make sure checks pass on it
                     php-version: ${{ matrix.php-version }}
                     extensions: json, mbstring, pdo, curl, pdo_sqlite
                     coverage: none
+                    tools: composer
+            -   run: |
+                    wget https://get.symfony.com/cli/installer -O - | bash
             -   name: Install dependencies
                 run: |
-                    sudo composer self-update -q
-                    sudo COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress	
-                    ./bin/console bolt:info	--ansi
+                    export PATH="$HOME/.symfony5/bin:$PATH"
+                    COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress	
+                    symfony console bolt:info	--ansi
                     npm set progress=false	
                     npm ci	
             -   name: Prepare environment
                 run: |
+                    export PATH="$HOME/.symfony5/bin:$PATH"
                     # build assets	
                     npm run build
                     sudo chmod -R 777 config/ public/files/ public/theme/ public/thumbs/ var/	
                     # prepare web server for e2e tests	
-                    ./bin/console doctrine:database:create	
-                    ./bin/console doctrine:schema:create	
-                    ./bin/console doctrine:fixtures:load --group=without-images -n	
-                    ./bin/console server:start 127.0.0.1:8088	
+                    symfony console doctrine:database:create	
+                    symfony console doctrine:schema:create	
+                    symfony console doctrine:fixtures:load --group=without-images -n	
+                    symfony server:start --no-tls --port=8088 -d
                     # test if web server works	
                     sleep 3	
                     wget "http://127.0.0.1:8088/bolt/login"

.github/workflows/api_tests.yaml

@@ -1,37 +1,45 @@
 name: API tests
 
 on:
-    pull_request:
+    push:
+        branches:
+            - master
+#    pull_request:
 
 jobs:
     apicurltests:
         strategy:
             matrix:
-                php-version: [ '7.2', '8.0' ]
+                php-version: [ '8.0' ]
         name: curl tests
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                   # test the lowest version, to make sure checks pass on it
                   php-version: ${{ matrix.php-version }}
                   extensions: json, mbstring, pdo, curl, pdo_sqlite
                   coverage: none
-            - name: Initialise
+                  tools: composer
+            - name: Symfony cli installation
               run: |
-                  sudo composer self-update -q	
+                  wget https://get.symfony.com/cli/installer -O - | bash
             - name: Install dependencies
               run: |
-                  sudo COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress
+                  export PATH="$HOME/.symfony5/bin:$PATH"
+                  COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 symfony composer update --prefer-dist --no-progress
             - name: Initialise the database
               run: |
-                  sudo chmod -R 777 config/ public/files/ public/theme/ public/thumbs/ var/
-                  ./bin/console doctrine:database:create
-                  ./bin/console doctrine:schema:create
-                  ./bin/console server:start 127.0.0.1:8088
+                  export PATH="$HOME/.symfony5/bin:$PATH"
+                  chmod -R 777 config/ public/files/ public/theme/ public/thumbs/ var/
+                  symfony console doctrine:database:create
+                  symfony console doctrine:schema:create
+                  symfony server:start --no-tls --port=8088 -d
             - name: create api user
-              run: php bin/console bolt:add-user apiuser apiuser%1 api@example.org API --roles=ROLE_WEBSERVICE
+              run: |
+                  export PATH="$HOME/.symfony5/bin:$PATH"
+                  symfony console bolt:add-user apiuser apiuser%1 api@example.org API --roles=ROLE_WEBSERVICE
             - name: check API user gets content
               run: curl -fkI -u apiuser:apiuser%1 http://localhost:8088/api/contents
             - name: check API user gets fields

.github/workflows/assets_code_analysis.yaml

@@ -1,7 +1,7 @@
 name: Assets Code Analysis
 
 on:
-    pull_request: null
+#    pull_request: null
     push:
         branches:
             - master
@@ -24,14 +24,14 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
 
             # see https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml
             -
-                name: Use Node.js 12.5
-                uses: actions/setup-node@v1
+                name: Use Node.js 12.22
+                uses: actions/setup-node@v4
                 with:
-                    node-version: 12.5
+                    node-version: 12.22
 
             # same as "npm install", just uses package-lock.json", see https://stackoverflow.com/a/53325242/1348344
             -   run: npm ci

.github/workflows/code_analysis.yaml

@@ -1,7 +1,7 @@
 name: Code Analysis
 
 on:
-    pull_request: null
+#    pull_request: null
     push:
         branches:
             - master
@@ -11,7 +11,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['7.2', '8.0']
+                php-version: ['8.0']
                 actions:
                     -
                         name: Coding Standard
@@ -46,14 +46,15 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
                     # test the lowest version, to make sure checks pass on it
                     php-version: ${{ matrix.php-version }}
                     extensions: json, mbstring, pdo, curl, pdo_sqlite
                     coverage: none
+                    tools: composer
 
             -   run: composer install --no-progress --ansi
 

.github/workflows/cypress_tests.yaml

@@ -16,55 +16,79 @@ jobs:
             matrix:
                 containers: [1, 2, 3] # number of parallel containers
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
                     # test the lowest version, to make sure checks pass on it
-                    php-version: 7.2
+                    php-version: 8.0
                     extensions: json, mbstring, pdo, curl, pdo_sqlite
                     coverage: none
-            -   uses: actions/setup-node@v1
+                    tools: composer
+            -   uses: actions/setup-node@v4
                 with:
-                    node-version: 12.5
+                    node-version: 12.22
             # See https://github.community/t/sudo-apt-install-fails-with-failed-to-fetch-http-security-ubuntu-com-404-not-found-ip/17075
-            -   run: sudo apt update
+            -   run: |
+                    sudo apt update
+            -   name: Symfony cli installation
+                run: |
+                    wget https://get.symfony.com/cli/installer -O - | bash
             -   name: Install dependencies
                 run: |
-                    sudo composer self-update -q
-                    sudo COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress
-                    ./bin/console bolt:info	--ansi
+                    export PATH="$HOME/.symfony5/bin:$PATH"
+                    COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 symfony composer update --prefer-dist --no-progress
+                    symfony console bolt:info	--ansi
                     npm set progress=false
                     npm ci
                     mkdir -p ./var/log/e2e-reports/report/features/
                     touch ./var/log/e2e-reports/report/features/.gitkeep
                     # Install latest stable Chrome for e2e tests
                     sudo apt --fix-broken install
-                    sudo apt-get install libxss1 libappindicator1 libindicator7
+                    #sudo apt-get install libxss1 libappindicator1 libindicator7
+                    sudo apt-cache search libappindicator1
+                    sudo apt-get install libxss1 libindicator7
                     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
                     sudo apt install ./google-chrome*.deb
             -   name: Prepare environment
                 run: |
+                    export PATH="$HOME/.symfony5/bin:$PATH"
                     # build assets
                     npm run build
                     sudo chmod -R 777 config/ public/files/ public/theme/ public/thumbs/ var/
+                    echo "date.timezone=UTC" >> php.ini
+                    echo "session.gc_probability=0" >> php.ini
+                    echo "session.gc_divisor=100000" >> php.ini
+                    echo "session.gc_maxlifetime=1440000" >> php.ini
                     # prepare web server for e2e tests
-                    ./bin/console doctrine:database:create
-                    ./bin/console doctrine:schema:create
-                    ./bin/console doctrine:fixtures:load --group=without-images -n
-                    ./bin/console server:start 127.0.0.1:8088
+                    symfony console doctrine:database:create
+                    symfony console doctrine:schema:create
+                    symfony console doctrine:fixtures:load --group=without-images -n
+                    symfony server:start --no-tls --port=8088 -d
                     # test if web server works
                     sleep 3
                     wget "http://127.0.0.1:8088/bolt/login"
 
             -   name: Cypress run
-                uses: cypress-io/github-action@v2
+                uses: cypress-io/github-action@v6
                 with:
                     command: "npm run cypress:ci"
+
+                    # Starts web server for E2E tests - replace with your own server invocation
+                    # https://docs.cypress.io/guides/continuous-integration/introduction#Boot-your-server
+#                    start: npm start
+                    wait-on: 'http://127.0.0.1:8088' # Waits for above
+                    # Records to Cypress Cloud
+                    # https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
+                    record: true
+                    parallel: true
                 env:
                     CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-                    GITHUB_TOKEN: ${{ secrets.CYPRESS_GITHUB_TOKEN }}
-            -   uses: actions/upload-artifact@v1
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                    ELECTRON_ENABLE_LOGGING: 1
+            -   uses: actions/upload-artifact@v4
                 if: failure()
                 with:
-                    name: cypress-screenshots
-                    path: tests/cypress/screenshots
+                    name: cypress-screenshots-${{matrix.containers}}
+                    path: |
+                        tests/cypress/screenshots
+                        var/log

.github/workflows/unit_tests.yaml

@@ -1,29 +1,30 @@
 name: Unit Tests Checks
 
 on:
-    pull_request:
+    push:
+        branches:
+            - master
+#    pull_request:
 
 jobs:
     unittests:
         strategy:
             matrix:
-                php-version: [ '7.2', '8.0' ]
+                php-version: ['8.0' ]
             fail-fast: false
         name: PHPUnit 
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                 # test the lowest version, to make sure checks pass on it
                 php-version: ${{ matrix.php-version }}
                 extensions: json, mbstring, pdo, curl, pdo_sqlite
                 coverage: none
-            - name: Initialise
-              run: |
-                  sudo composer self-update -q	
+                tools: composer
             - name: Install dependencies
               run: |
-                  sudo COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress	--no-scripts
+                  COMPOSER_MEMORY_LIMIT=-1 COMPOSER_PROCESS_TIMEOUT=60 composer update --prefer-dist --no-progress	--no-scripts
             - name: run PHP Unit
               run: ./vendor/bin/phpunit

.gitignore

@@ -1,4 +1,5 @@
 composer.phar
+.phpunit.result.cache
 
 ### Built Assets and uploads ###
 /public/assets/

assets/js/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '5.1.24';
+export const version = '5.1.27';

composer.json

@@ -14,7 +14,7 @@
         "beberlei/doctrineextensions": "^1.3",
         "bolt-oss/yaml-migrations": "^1.1.1",
         "bolt-oss/common": "^3.0.5",
-        "cocur/slugify": "^4.0",
+        "cocur/slugify": "^4.5",
         "composer/composer": "^2.0",
         "composer/package-versions-deprecated": "^1.11",
         "doctrine/doctrine-bundle": "^2.4",
@@ -133,7 +133,7 @@
         "public-dir": "public",
         "symfony": {
             "allow-contrib": true,
-            "require": "^5.2"
+            "require": "^5.4"
         }
     },
     "autoload": {

config/bundles.php

@@ -18,7 +18,6 @@
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'local' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
     Translation\Bundle\TranslationBundle::class => ['all' => true],

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bolt",
-    "version": "5.1.24",
+    "version": "5.1.27",
     "homepage": "https://boltcms.io",
     "author": "Bob den Otter <bob@twokings.nl> (https://boltcms.io)",
     "license": "MIT",
@@ -124,7 +124,7 @@
         "a11y:test": "pa11y-ci",
         "test": "jest",
         "genversion": "genversion --es6 --semi assets/js/version.js",
-        "cypress:ci": "cypress run --config-file=tests/cypress/cypress-ci.json --record --parallel --quiet",
+        "cypress:ci": "cypress run --config-file=tests/cypress/cypress-ci.json --record --parallel --quiet --tag ci",
         "cypress:dev": "cypress run --config-file=tests/cypress/cypress-dev.json"
     },
     "browserslist": [

php.ini

@@ -0,0 +1,5 @@
+date.timezone=UTC
+
+session.gc_probability=0
+session.gc_divisor=100000
+session.gc_maxlifetime=1440000