chore(ci): update GH Actions php test (#3867 )

- php versions should be strings - caching updated to current recommendation - fixed env var name
Fix parse error: #3894
2025-02-20 19:56:53 +01:00 · 2025-02-05 11:16:51 -07:00 · 2025-01-24 15:23:06 -07:00 · 2025-01-18 12:39:11 +00:00 · 2025-01-13 12:30:17 +00:00 · 2025-01-07 13:53:09 +00:00
497 changed files with 3707 additions and 4997 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -11,7 +11,7 @@ jobs:
    permissions:
      contents: write # for release creation (svenstaro/upload-release-action)

-    #if: "!github.event.release.prerelease"
+    if: "!github.event.release.prerelease"
    runs-on: ubuntu-latest

    steps:
@ -23,7 +23,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: 8.2
+          php-version: 7.3
          extensions: opcache, gd
          tools: composer:v2
          coverage: none
@ -38,10 +38,10 @@ jobs:
      - name: Retrieval of Builder Scripts
        run: |
          # Real Grav URL
-          curl --silent -H "Authorization: token ${{ secrets.GLOBAL_TOKEN }}" -H "Accept: application/vnd.github.v3.raw" ${{ secrets.BUILD_SCRIPT_URL_18 }} --output build-grav.sh
+          curl --silent -H "Authorization: token ${{ secrets.GLOBAL_TOKEN }}" -H "Accept: application/vnd.github.v3.raw" ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh

          # Development Local URL
-          # curl ${{ secrets.BUILD_SCRIPT_URL_18 }} --output build-grav.sh
+          # curl ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh

      - name: Grav Builder
        run: |
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@ -10,20 +10,18 @@ permissions:
  contents: read # to fetch code (actions/checkout)

 jobs:
-
  unit-tests:
+    strategy:
+      matrix:
+        php: ['8.3', '8.2', '8.1', '8.0', '7.4', '7.3']
+        os: [ubuntu-latest]

    runs-on: ${{ matrix.os }}

-    strategy:
-      matrix:
-        php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
-        os: [ubuntu-latest]
-
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

-      - name: Setup PHP
+      - name: Setup PHP ${{ matrix.php }}
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php }}
@ -31,20 +29,14 @@ jobs:
          tools: composer:v2
          coverage: none
        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-#      - name: Update composer
-#        run: composer update
-#
-#      - name: Validate composer.json and composer.lock
-#        run: composer validate
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Get composer cache directory
        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

      - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,33 +1,3 @@
-# v1.8.0-beta.2
-## 10/28/2024
-
-1. [](#new)
-    * Use `dev-master` branch of Clockwork to support Monolog2 / Monolog3
-    * `AVIF` image support via updates to `getgrav/Image` library
-    * Upgraded to **Doctrine Collection 2.2**
-1. [](#improved) 
-    * Updated composer libraries
-    * Updated composer.php binary to `v2.8.1`
-    * Fixes for PHP 8.4 - Implicitly nullable parameter declarations deprecated
-    * Added back Missing `RocketTheme\Toolbox\Event\EventSubscriberInterface` for Gantry5
-1. [](#bugfix)
-    * Various fixes to use `$log->debug()`, `$log->info()`, `$log->warning()` and `$log->error()` For Monolog2 support
-   
-# v1.8.0-beta.1
-## 10/23/2024
-
-1. [](#new)
-    * Set minimum requirements to **PHP 8.2**
-    * Updated to **Twig 2.14**
-    * Updated to **Symfony 6.4**
-    * Updated to **Monolog 2.3**
-    * Updated to **RocketTheme/Toolbox 2.0**
-    * Updated to **Composer/Semver 3.2**
-    * Use **Symfony Cache** instead of unmaintained **Doctrine Cache**
-    * Removed unsupported **APC**, **WinCache**, **XCache** and **Memcache**, use apcu or memcached instead
-    * Removed `system.umask_fix` setting for security reasons
-    * Support phpstan level 6 in Framework classes
-
 # v1.7.48
 ## 10/28/2024

@ -42,18 +12,18 @@
 ## 10/23/2024

 1. [](#new)
-   * New `Utils::toAscii()` method  
-   * Added support for Clockwork Debugger to allow web UI (requires new `clockwork-web` plugin)
+  * New `Utils::toAscii()` method  
+  * Added support for Clockwork Debugger to allow web UI (requires new `clockwork-web` plugin)
 1. [](#improved) 
-   * Include modular sub-pages in last-modification date computation [#3562](https://github.com/getgrav/grav/pull/3562)
-   * Updated vendor libs to latest versions
-   * Updated JQuery to `3.7.1` [#3787](https://github.com/getgrav/grav/pull/3827)
-   * Updated vendor libraries to latest versions
-   * Support for Fediverse Creator meta tag [#3844](https://github.com/getgrav/grav/pull/3844)
+  * Include modular sub-pages in last-modification date computation [#3562](https://github.com/getgrav/grav/pull/3562)
+  * Updated vendor libs to latest versions
+  * Updated JQuery to `3.7.1` [#3787](https://github.com/getgrav/grav/pull/3827)
+  * Updated vendor libraries to latest versions
+  * Support for Fediverse Creator meta tag [#3844](https://github.com/getgrav/grav/pull/3844)
 1. [](#bugfix)
-   * Fixes deprecated for return type in Filesystem with PHP 8.3.6 [#3831](https://github.com/getgrav/grav/issues/3831) 
-   * Fix for `exif_imagtetype()` throwing an exception when file doesn't exist
-   * Fix JSON output comments check with content type [#3859](https://github.com/getgrav/grav/pull/3859)
+  * Fixes deprecated for return type in Filesystem with PHP 8.3.6 [#3831](https://github.com/getgrav/grav/issues/3831) 
+  * Fix for `exif_imagtetype()` throwing an exception when file doesn't exist
+  * Fix JSON output comments check with content type [#3859](https://github.com/getgrav/grav/pull/3859)

 # v1.7.46
 ## 05/15/2024
--- a/README.md
+++ b/README.md
@ -39,22 +39,22 @@ You can download a **ready-built** package from the [Downloads page on https://g

 You can create a new project with the latest **stable** Grav release with the following command:

-```
-$ composer create-project getgrav/grav ~/webroot/grav
+```bash
+composer create-project getgrav/grav ~/webroot/grav
 ```

 ### From GitHub

 1. Clone the Grav repository from [https://github.com/getgrav/grav]() to a folder in the webroot of your server, e.g. `~/webroot/grav`. Launch a **terminal** or **console** and navigate to the webroot folder:
-   ```
-   $ cd ~/webroot
-   $ git clone https://github.com/getgrav/grav.git
+   ```bash
+   cd ~/webroot
+   git clone https://github.com/getgrav/grav.git
   ```

 2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](https://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
-   ```
-   $ cd ~/webroot/grav
-   $ bin/grav install
+   ```bash
+   cd ~/webroot/grav
+   bin/grav install
   ```

 Check out the [install procedures](https://learn.getgrav.org/basics/installation) for more information.
@ -63,36 +63,35 @@ Check out the [install procedures](https://learn.getgrav.org/basics/installation

 You can download [plugins](https://getgrav.org/downloads/plugins) or [themes](https://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on https://getgrav.org](https://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:

-```
-$ bin/gpm index
+```bash
+bin/gpm index
 ```

 This will display all the available plugins and then you can install one or more with:

-```
-$ bin/gpm install <plugin/theme>
+```bash
+bin/gpm install <plugin/theme>
 ```

 # Updating

 To update Grav you should use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:

-```
-$ bin/gpm selfupgrade
+```bash
+bin/gpm selfupgrade
 ```

 To update plugins and themes:

-```
-$ bin/gpm update
+```bash
+bin/gpm update
 ```

 ## Upgrading from older version

-* [Upgrading to Grav 1.8](https://learn.getgrav.org/16/advanced/grav-development/grav-18-upgrade-guide)
 * [Upgrading to Grav 1.7](https://learn.getgrav.org/16/advanced/grav-development/grav-17-upgrade-guide)
 * [Upgrading to Grav 1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-16-upgrade-guide)
-* [Upgrading from Grav before 1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-15-upgrade-guide)
+* [Upgrading from Grav <1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-15-upgrade-guide)

 # Contributing
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -12,7 +12,7 @@ We are focusing our security updates on the following versions

 ## :pushpin: Note on Security Severity

-> NOTE: Please use the following guidlines when selecting a **Severity**.  Submitted advisories that are marked **High** or **Critical** that don't meet the guidelines below will be cliosed.
+> NOTE: Please use the following guidelines when selecting a **Severity**.  Submitted advisories that are marked **High** or **Critical** that don't meet the guidelines below will be closed.

 * **CRITICAL** - no account required, can modify content, or run malicious code or nefarious activity without any access.
 * **HIGH** - publisher level account able to run malicious code or nefarious activity, or other high level security things.
--- a/bin/composer.phar
+++ b/bin/composer.phar
--- a/bin/gpm
+++ b/bin/gpm
@ -2,7 +2,7 @@
 <?php

 /**
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/bin/grav
+++ b/bin/grav
@ -2,7 +2,7 @@
 <?php

 /**
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/bin/plugin
+++ b/bin/plugin
@ -2,7 +2,7 @@
 <?php

 /**
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/codeception.yml
+++ b/codeception.yml
@ -2,7 +2,7 @@ actor: Tester
 bootstrap: _bootstrap.php
 paths:
    tests: tests
-    output: tests/_output
+    log: tests/_output
    data: tests/_data
    support: tests/_support
    envs: tests/_envs
--- a/composer.json
+++ b/composer.json
@ -12,7 +12,7 @@
    "homepage": "https://getgrav.org",
    "license": "MIT",
    "require": {
-        "php": "^8.2",
+        "php": "^7.3.6 || ^8.0",
        "ext-json": "*",
        "ext-openssl": "*",
        "ext-curl": "*",
@ -20,71 +20,61 @@
        "ext-dom": "*",
        "ext-libxml": "*",
        "ext-gd": "*",
-        "symfony/polyfill-mbstring": "^1.24",
-        "symfony/polyfill-iconv": "^1.24",
-        "symfony/polyfill-php80": "^1.24",
-        "symfony/polyfill-php81": "^1.24",
+        "symfony/polyfill-mbstring": "~1.23",
+        "symfony/polyfill-iconv": "^1.23",
+        "symfony/polyfill-php74": "^1.23",
+        "symfony/polyfill-php80": "^1.23",
+        "symfony/polyfill-php81": "^1.23",
        "psr/simple-cache": "^1.0",
-        "psr/http-message": "^1.1",
+        "psr/http-message": "^1.0",
        "psr/http-server-middleware": "^1.0",
-        "psr/container": "^1.1",
-        "psr/log": "^1.1",
-        "symfony/cache": "^6.4",
-        "symfony/yaml": "^6.4",
-        "symfony/console": "^6.4",
-        "symfony/event-dispatcher": "^6.4",
-        "symfony/var-exporter": "^6.4",
-        "symfony/var-dumper": "^6.4",
-        "symfony/process": "^6.4",
-        "symfony/http-client": "^6.4",
-        "twig/twig": "^2.1",
-        "monolog/monolog": "^2.0",
-        "doctrine/cache": "^2.2",
-        "doctrine/collections": "^2.2",
-        "pimple/pimple": "~3.5.0",
-        "nyholm/psr7-server": "^1.1",
-        "nyholm/psr7": "^1.8",
+        "psr/container": "~1.1.0",
+        "nyholm/psr7-server": "^1.0",
+        "nyholm/psr7": "^1.3",
+        "twig/twig": "~v1.44",
        "erusev/parsedown": "^1.7",
        "erusev/parsedown-extra": "~0.8",
-        "rockettheme/toolbox": "v2.x-dev",
-        "composer/ca-bundle": "^1.5",
-        "composer/semver": "^3.4",
-        "dragonmantank/cron-expression": "^3.0",
-        "willdurand/negotiation": "^3.1",
-        "rhukster/dom-sanitizer": "^1.0",
+        "symfony/contracts": "~1.1",
+        "symfony/yaml": "~4.4",
+        "symfony/console": "~4.4",
+        "symfony/event-dispatcher": "~4.4",
+        "symfony/var-dumper": "~4.4",
+        "symfony/process": "~4.4",
+        "doctrine/cache": "^1.10",
+        "doctrine/collections": "^1.6",
+        "guzzlehttp/psr7": "^1.7",
+        "filp/whoops": "~2.9",
        "matthiasmullie/minify": "^1.3",
-        "donatj/phpuseragentparser": "~1.9",
-        "guzzlehttp/psr7": "^2.7",
-        "filp/whoops": "~2.16",
-        "itsgoingd/clockwork": "dev-master",
-        "maximebf/debugbar": "~1.23",
-        "getgrav/image": "^4.0",
+        "monolog/monolog": "~1.25",
+        "getgrav/image": "^3.0",
        "getgrav/cache": "^2.0",
-        "antoligy/dom-string-iterators": "^1.0",
+        "donatj/phpuseragentparser": "~1.1",
+        "pimple/pimple": "~3.5.0",
+        "rockettheme/toolbox": "~1.5",
+        "maximebf/debugbar": "~1.16",
+        "league/climate": "^3.6",
        "miljar/php-exif": "^0.6",
-        "league/climate": "^3.8",
+        "composer/ca-bundle": "^1.2",
+        "dragonmantank/cron-expression": "^1.2",
+        "willdurand/negotiation": "^3.0",
+        "itsgoingd/clockwork": "^5.0",
+        "symfony/http-client": "^4.4",
+        "composer/semver": "^1.4",
+        "rhukster/dom-sanitizer": "^1.0",
        "multiavatar/multiavatar-php": "^1.0"
    },
    "require-dev": {
-        "codeception/codeception": "^5.1",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "codeception/codeception": "^4.1",
+        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
        "phpunit/php-code-coverage": "~9.2",
        "getgrav/markdowndocs": "^2.0",
-        "codeception/module-asserts": "*",
-        "codeception/module-phpbrowser": "*",
-        "rector/rector": "^1.2"
+        "codeception/module-asserts": "^1.3",
+        "codeception/module-phpbrowser": "^1.0"
    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/rockettheme/toolbox"
-        }
-    ],
    "replace": {
        "symfony/polyfill-php72": "*",
-        "symfony/polyfill-php73": "*",
-        "symfony/polyfill-php74": "*"
+        "symfony/polyfill-php73": "*"
    },
    "suggest": {
        "ext-mbstring": "Recommended for better performance",
@ -99,14 +89,12 @@
    "config": {
        "apcu-autoloader": true,
        "platform": {
-            "php": "8.2"
+            "php": "7.3.6"
        }
    },
    "autoload": {
        "psr-4": {
            "Grav\\": "system/src/Grav",
-            "Doctrine\\": "system/src/Doctrine",
-            "RocketTheme\\": "system/src/RocketTheme",
            "Twig\\": "system/src/Twig"
        },
        "files": [
@ -129,7 +117,7 @@
        "api-17": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.17.md",
        "post-create-project-cmd": "bin/grav install",
        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon --memory-limit=720M system/src",
-        "phpstan-framework": "vendor/bin/phpstan analyse -l 6 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
        "phpstan-plugins": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/plugins.neon --memory-limit=400M user/plugins",
        "test": "vendor/bin/codecept run unit",
        "test-windows": "vendor\\bin\\codecept run unit"
--- a/composer.lock
+++ b/composer.lock
--- a/index.php
+++ b/index.php
@ -10,7 +10,7 @@
 namespace Grav;

 \define('GRAV_REQUEST_TIME', microtime(true));
-\define('GRAV_PHP_MIN', '8.2.0');
+\define('GRAV_PHP_MIN', '7.3.6');

 if (PHP_SAPI === 'cli-server') {
    $symfony_server = stripos(getenv('_'), 'symfony') !== false || stripos($_SERVER['SERVER_SOFTWARE'] ?? '', 'symfony') !== false || stripos($_ENV['SERVER_SOFTWARE'] ?? '', 'symfony') !== false;
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@ -619,9 +619,11 @@ form:
              options:
                auto: Auto detect
                file: File
+                apc: APC
                apcu: APCu
                memcache: Memcache
                memcached: Memcached
+                wincache: WinCache
                redis: Redis

            cache.prefix:
@ -705,6 +707,20 @@ form:
              validate:
                type: bool

+            cache.memcache.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.MEMCACHE_SERVER
+              help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.memcache.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.MEMCACHE_PORT
+              help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
+              placeholder: "11211"
+
            cache.memcached.server:
              type: text
              size: medium
@ -868,6 +884,17 @@ form:
              validate:
                type: bool

+            twig.umask_fix:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_UMASK_FIX
+              help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
        assets:
          type: tab
          title: PLUGIN_ADMIN.ASSETS
--- a/system/config/mime.yaml
+++ b/system/config/mime.yaml
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@ -93,13 +93,13 @@ cache:
  enabled: true                                  # Set to true to enable caching
  check:
    method: file                                 # Method to check for updates in pages: file|folder|hash|none
-  driver: auto                                   # One of: auto|file|apcu|memcached|redis
+  driver: auto                                   # One of: auto|file|apcu|memcache|wincache
  prefix: 'g'                                    # Cache prefix string (prevents cache conflicts)
  purge_at: '0 4 * * *'                          # How often to purge old file cache (using new scheduler)
  clear_at: '0 3 * * *'                           # How often to clear cache (using new scheduler)
  clear_job_type: 'standard'                     # Type to clear when processing the scheduled clear job `standard`|`all`
  clear_images_by_default: false                 # By default grav does not include processed images in cache clear, this can be enabled
-  cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcached, etc.)
+  cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
  lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
  gzip: false                                    # GZip compress the page output
  allow_webserver_gzip: false                    # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
@ -117,6 +117,7 @@ twig:
  undefined_filters: true                        # Allow undefined filters
  safe_functions: []                             # List of PHP functions which are allowed to be used as Twig functions
  safe_filters: []                               # List of PHP functions which are allowed to be used as Twig filters
+  umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775

 assets:                                          # Configuration for Assets Manager (JS, CSS)
  css_pipeline: false                            # The CSS pipeline is the unification of multiple CSS resources into one file
--- a/system/defines.php
+++ b/system/defines.php
@ -3,19 +3,19 @@
 /**
 * @package    Grav\Core
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.8.0-beta.2');
+define('GRAV_VERSION', '1.7.48');
 define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
-define('GRAV_TESTING', true);
+define('GRAV_TESTING', false);

 // PHP minimum requirement
 if (!defined('GRAV_PHP_MIN')) {
-    define('GRAV_PHP_MIN', '8.2.0');
+    define('GRAV_PHP_MIN', '7.3.6');
 }

 // Directory separator
--- a/system/install.php
+++ b/system/install.php
@ -2,7 +2,7 @@
 /**
 * @package    Grav\Core
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/router.php
+++ b/system/router.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Core
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Doctrine/Common/Cache/FilesystemCache.php
+++ b/system/src/Doctrine/Common/Cache/FilesystemCache.php
@ -1,93 +0,0 @@
-<?php
-
-namespace Doctrine\Common\Cache;
-
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-
-/**
- * Filesystem cache driver (backwards compatibility).
- */
-class FilesystemCache extends CacheProvider
-{
-    public const EXTENSION = '.doctrinecache.data';
-
-    /** @var FilesystemAdapter */
-    private $pool;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        user_error(__CLASS__ . ' is deprecated since Grav 1.8, use Symfony cache instead', E_USER_DEPRECATED);
-
-        $this->pool = new FilesystemAdapter('', 0, $directory);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $item = $this->pool->getItem(rawurlencode($id));
-
-        return $item->isHit() ? $item->get() : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    protected function doContains($id)
-    {
-        return $this->pool->hasItem(rawurlencode($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $item = $this->pool->getItem(rawurlencode($id));
-
-        if (0 < $lifeTime) {
-            $item->expiresAfter($lifeTime);
-        }
-
-        return $this->pool->save($item->set($data));
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    protected function doDelete($id)
-    {
-        return $this->pool->deleteItem(rawurlencode($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    protected function doFlush()
-    {
-        return $this->pool->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return array|null
-     */
-    protected function doGetStats()
-    {
-        return null;
-    }
-
-}
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/BaseAsset.php
+++ b/system/src/Grav/Common/Assets/BaseAsset.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/BlockAssets.php
+++ b/system/src/Grav/Common/Assets/BlockAssets.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Css.php
+++ b/system/src/Grav/Common/Assets/Css.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/InlineCss.php
+++ b/system/src/Grav/Common/Assets/InlineCss.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/InlineJs.php
+++ b/system/src/Grav/Common/Assets/InlineJs.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/InlineJsModule.php
+++ b/system/src/Grav/Common/Assets/InlineJsModule.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Js.php
+++ b/system/src/Grav/Common/Assets/Js.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/JsModule.php
+++ b/system/src/Grav/Common/Assets/JsModule.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Link.php
+++ b/system/src/Grav/Common/Assets/Link.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Pipeline.php
+++ b/system/src/Grav/Common/Assets/Pipeline.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets\Traits
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets\Traits
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Assets\Traits
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Backup/Backups.php
+++ b/system/src/Grav/Common/Backup/Backups.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Backup
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -194,7 +194,7 @@ class Backups
     * @param callable|null $status
     * @return string|null
     */
-    public static function backup($id = 0, ?callable $status = null)
+    public static function backup($id = 0, callable $status = null)
    {
        $grav = Grav::instance();

--- a/system/src/Grav/Common/Browser.php
+++ b/system/src/Grav/Common/Browser.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@ -3,15 +3,14 @@
 /**
 * @package    Grav\Common
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

 namespace Grav\Common;

 use DirectoryIterator;
-use Doctrine\Common\Cache\CacheProvider;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
+use \Doctrine\Common\Cache as DoctrineCache;
 use Exception;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
@ -19,12 +18,6 @@ use Grav\Common\Scheduler\Scheduler;
 use LogicException;
 use Psr\SimpleCache\CacheInterface;
 use RocketTheme\Toolbox\Event\Event;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Adapter\ApcuAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\MemcachedAdapter;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use function dirname;
 use function extension_loaded;
@ -34,11 +27,12 @@ use function is_array;

 /**
 * The GravCache object is used throughout Grav to store and retrieve cached data.
- * It uses Symfony library (adding backward compatibility to Doctrine Cache) and supports a variety of caching mechanisms. Those include:
+ * It uses DoctrineCache library and supports a variety of caching mechanisms. Those include:
 *
 * APCu
 * RedisCache
- * MemCached
+ * MemCache
+ * MemCacheD
 * FileSystem
 */
 class Cache extends Getters
@ -55,10 +49,7 @@ class Cache extends Getters
    /** @var Config $config */
    protected $config;

-    /** @var AdapterInterface */
-    protected $adapter;
-
-    /** @var CacheProvider */
+    /** @var DoctrineCache\CacheProvider */
    protected $driver;

    /** @var CacheInterface */
@ -79,7 +70,6 @@ class Cache extends Getters
    protected static $standard_remove = [
        'cache://twig/',
        'cache://doctrine/',
-        'cache://grav/',
        'cache://compiled/',
        'cache://clockwork/',
        'cache://validated-',
@ -90,7 +80,6 @@ class Cache extends Getters
    protected static $standard_remove_no_images = [
        'cache://twig/',
        'cache://doctrine/',
-        'cache://grav/',
        'cache://compiled/',
        'cache://clockwork/',
        'cache://validated-',
@ -153,10 +142,10 @@ class Cache extends Getters

        // Cache key allows us to invalidate all cache on configuration changes.
        $this->key = ($prefix ?: 'g') . '-' . $uniqueness;
-        $this->cache_dir = $grav['locator']->findResource('cache://grav/' . $uniqueness, true, true);
+        $this->cache_dir = $grav['locator']->findResource('cache://doctrine/' . $uniqueness, true, true);
        $this->driver_setting = $this->config->get('system.cache.driver');
-        $this->adapter = $this->getCacheAdapter();
-        $this->driver = $this->getCacheDriver($this->adapter);
+        $this->driver = $this->getCacheDriver();
+        $this->driver->setNamespace($this->key);

        /** @var EventDispatcher $dispatcher */
        $dispatcher = Grav::instance()['events'];
@ -169,7 +158,12 @@ class Cache extends Getters
    public function getSimpleCache()
    {
        if (null === $this->simpleCache) {
-            $this->simpleCache = new Psr16Cache($this->adapter);
+            $cache = new \Grav\Framework\Cache\Adapter\DoctrineCache($this->driver, '', $this->getLifetime());
+
+            // Disable cache key validation.
+            $cache->setValidation(false);
+
+            $this->simpleCache = $cache;
        }

        return $this->simpleCache;
@ -235,42 +229,53 @@ class Cache extends Getters
     * If there is no config option for $driver in the config, or it's set to 'auto', it will
     * pick the best option based on which cache extensions are installed.
     *
-     * @param string|null $namespace
-     * @param int|null $defaultLifetime
-     * @return AdapterInterface  The cache driver to use
-     * @throws \RedisException
-     * @throws \Symfony\Component\Cache\Exception\CacheException
+     * @return DoctrineCache\CacheProvider  The cache driver to use
     */
-    public function getCacheAdapter(?string $namespace = null, ?int $defaultLifetime = null): AdapterInterface
+    public function getCacheDriver()
    {
-        $setting = $this->driver_setting ?? 'auto';
+        $setting = $this->driver_setting;
        $driver_name = 'file';

-        if (in_array($setting, ['apc', 'xcache', 'wincache', 'memcache'], true)) {
-            throw new LogicException(sprintf('Cache driver for %s has been removed, use auto, file, apcu or memcached instead!', $setting));
-        }
-
        // CLI compatibility requires a non-volatile cache driver
-        if ($this->config->get('system.cache.cli_compatibility') && ($setting === 'auto' || $this->isVolatileDriver($setting))) {
+        if ($this->config->get('system.cache.cli_compatibility') && (
+            $setting === 'auto' || $this->isVolatileDriver($setting))) {
            $setting = $driver_name;
        }

-        if ($setting === 'auto' || $this->isVolatileDriver($setting)) {
+        if (!$setting || $setting === 'auto') {
            if (extension_loaded('apcu')) {
                $driver_name = 'apcu';
+            } elseif (extension_loaded('wincache')) {
+                $driver_name = 'wincache';
            }
        } else {
            $driver_name = $setting;
        }

        $this->driver_name = $driver_name;
-        $namespace = $namespace ?? $this->key;
-        $defaultLifetime = $defaultLifetime ?? 0;

        switch ($driver_name) {
            case 'apc':
            case 'apcu':
-                $adapter = new ApcuAdapter($namespace, $defaultLifetime);
+                $driver = new DoctrineCache\ApcuCache();
+                break;
+
+            case 'wincache':
+                $driver = new DoctrineCache\WinCacheCache();
+                break;
+
+            case 'memcache':
+                if (extension_loaded('memcache')) {
+                    $memcache = new \Memcache();
+                    $memcache->connect(
+                        $this->config->get('system.cache.memcache.server', 'localhost'),
+                        $this->config->get('system.cache.memcache.port', 11211)
+                    );
+                    $driver = new DoctrineCache\MemcacheCache();
+                    $driver->setMemcache($memcache);
+                } else {
+                    throw new LogicException('Memcache PHP extension has not been installed');
+                }
                break;

            case 'memcached':
@ -280,7 +285,8 @@ class Cache extends Getters
                        $this->config->get('system.cache.memcached.server', 'localhost'),
                        $this->config->get('system.cache.memcached.port', 11211)
                    );
-                    $adapter = new MemcachedAdapter($memcached, $namespace, $defaultLifetime);
+                    $driver = new DoctrineCache\MemcachedCache();
+                    $driver->setMemcached($memcached);
                } else {
                    throw new LogicException('Memcached PHP extension has not been installed');
                }
@ -312,39 +318,19 @@ class Cache extends Getters
                        throw new \RedisException('Could not select alternate Redis database ID');
                    }

-                    $adapter = new RedisAdapter($redis, $namespace, $defaultLifetime);
+                    $driver = new DoctrineCache\RedisCache();
+                    $driver->setRedis($redis);
                } else {
                    throw new LogicException('Redis PHP extension has not been installed');
                }
                break;

            default:
-                $adapter = new FilesystemAdapter($namespace, $defaultLifetime, $this->cache_dir);
+                $driver = new DoctrineCache\FilesystemCache($this->cache_dir);
                break;
        }

-        return $adapter;
-    }
-
-    /**
-     * Automatically picks the cache mechanism to use.  If you pick one manually it will use that
-     * If there is no config option for $driver in the config, or it's set to 'auto', it will
-     * pick the best option based on which cache extensions are installed.
-     *
-     * @return CacheProvider  The cache driver to use
-     */
-    public function getCacheDriver(?AdapterInterface $adapter = null)
-    {
-        if (null === $adapter) {
-            $adapter = $this->getCacheAdapter();
-        }
-
-        $cache = DoctrineProvider::wrap($adapter);
-        if (!$cache instanceof CacheProvider) {
-            throw new \RuntimeException('Internal error');
-        }
-
-        return $cache;
+        return $driver;
    }

    /**
@ -632,7 +618,7 @@ class Cache extends Getters
     */
    public function isVolatileDriver($setting)
    {
-        return $setting === 'apcu';
+        return in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'], true);
    }

    /**
--- a/system/src/Grav/Common/Composer.php
+++ b/system/src/Grav/Common/Composer.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/CompiledBase.php
+++ b/system/src/Grav/Common/Config/CompiledBase.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/CompiledBlueprints.php
+++ b/system/src/Grav/Common/Config/CompiledBlueprints.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/CompiledConfig.php
+++ b/system/src/Grav/Common/Config/CompiledConfig.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/CompiledLanguages.php
+++ b/system/src/Grav/Common/Config/CompiledLanguages.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/ConfigFileFinder.php
+++ b/system/src/Grav/Common/Config/ConfigFileFinder.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/Languages.php
+++ b/system/src/Grav/Common/Config/Languages.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Config/Setup.php
+++ b/system/src/Grav/Common/Config/Setup.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Config
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Data/BlueprintSchema.php
+++ b/system/src/Grav/Common/Data/BlueprintSchema.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Data/Blueprints.php
+++ b/system/src/Grav/Common/Data/Blueprints.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Data/Data.php
+++ b/system/src/Grav/Common/Data/Data.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -323,7 +323,7 @@ class Data implements DataInterface, ArrayAccess, \Countable, JsonSerializable,
     * @param FileInterface|null $storage Optionally enter a new storage.
     * @return FileInterface|null
     */
-    public function file(?FileInterface $storage = null)
+    public function file(FileInterface $storage = null)
    {
        if ($storage) {
            $this->storage = $storage;
--- a/system/src/Grav/Common/Data/DataInterface.php
+++ b/system/src/Grav/Common/Data/DataInterface.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -80,5 +80,5 @@ interface DataInterface
     * @param FileInterface|null $storage Optionally enter a new storage.
     * @return FileInterface
     */
-    public function file(?FileInterface $storage = null);
+    public function file(FileInterface $storage = null);
 }
--- a/system/src/Grav/Common/Data/Validation.php
+++ b/system/src/Grav/Common/Data/Validation.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -162,7 +162,7 @@ class Validation
     * @param  UserInterface|null $user
     * @return bool
     */
-    public static function authorize($action, ?UserInterface $user = null)
+    public static function authorize($action, UserInterface $user = null)
    {
        if (!$user) {
            return false;
--- a/system/src/Grav/Common/Data/ValidationException.php
+++ b/system/src/Grav/Common/Data/ValidationException.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Data
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -544,7 +544,7 @@ class Debugger
     * @param string|null $message
     * @return mixed
     */
-    public function profile(callable $callable, ?string $message = null)
+    public function profile(callable $callable, string $message = null)
    {
        $this->startProfiling();
        $response = $callable();
@ -585,7 +585,7 @@ class Debugger
     * @param string|null $message
     * @return array|null
     */
-    public function stopProfiling(?string $message = null): ?array
+    public function stopProfiling(string $message = null): ?array
    {
        $timings = null;
        if ($this->enabled && extension_loaded('tideways_xhprof')) {
@ -776,7 +776,7 @@ class Debugger
     * @param float|null $time
     * @return $this
     */
-    public function addEvent(string $name, $event, EventDispatcherInterface $dispatcher, ?float $time = null)
+    public function addEvent(string $name, $event, EventDispatcherInterface $dispatcher, float $time = null)
    {
        if ($this->enabled && $this->clockwork) {
            $time = $time ?? microtime(true);
--- a/system/src/Grav/Common/Errors/BareHandler.php
+++ b/system/src/Grav/Common/Errors/BareHandler.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Errors
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Errors/Errors.php
+++ b/system/src/Grav/Common/Errors/Errors.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Errors
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -70,7 +70,7 @@ class Errors
            $logger = $grav['log'];
            $whoops->pushHandler(function ($exception, $inspector, $run) use ($logger) {
                try {
-                    $logger->critical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
+                    $logger->addCritical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
                } catch (Exception $e) {
                    echo $e;
                }
--- a/system/src/Grav/Common/Errors/SimplePageHandler.php
+++ b/system/src/Grav/Common/Errors/SimplePageHandler.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Errors
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Errors/SystemFacade.php
+++ b/system/src/Grav/Common/Errors/SystemFacade.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Errors
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/File/CompiledFile.php
+++ b/system/src/Grav/Common/File/CompiledFile.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\File
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/File/CompiledJsonFile.php
+++ b/system/src/Grav/Common/File/CompiledJsonFile.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\File
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/File/CompiledMarkdownFile.php
+++ b/system/src/Grav/Common/File/CompiledMarkdownFile.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\File
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/File/CompiledYamlFile.php
+++ b/system/src/Grav/Common/File/CompiledYamlFile.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\File
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Filesystem/Archiver.php
+++ b/system/src/Grav/Common/Filesystem/Archiver.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Filesystem
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -75,21 +75,21 @@ abstract class Archiver
     * @param callable|null $status
     * @return $this
     */
-    abstract public function compress($folder, ?callable $status = null);
+    abstract public function compress($folder, callable $status = null);

    /**
     * @param string $destination
     * @param callable|null $status
     * @return $this
     */
-    abstract public function extract($destination, ?callable $status = null);
+    abstract public function extract($destination, callable $status = null);

    /**
     * @param array $folders
     * @param callable|null $status
     * @return $this
     */
-    abstract public function addEmptyFolders($folders, ?callable $status = null);
+    abstract public function addEmptyFolders($folders, callable $status = null);

    /**
     * @param string $rootPath
--- a/system/src/Grav/Common/Filesystem/Folder.php
+++ b/system/src/Grav/Common/Filesystem/Folder.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Filesystem
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php
+++ b/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Filesystem
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
+++ b/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Filesystem
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Filesystem/ZipArchiver.php
+++ b/system/src/Grav/Common/Filesystem/ZipArchiver.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Filesystem
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -26,7 +26,7 @@ class ZipArchiver extends Archiver
     * @param callable|null $status
     * @return $this
     */
-    public function extract($destination, ?callable $status = null)
+    public function extract($destination, callable $status = null)
    {
        $zip = new ZipArchive();
        $archive = $zip->open($this->archive_file);
@ -51,7 +51,7 @@ class ZipArchiver extends Archiver
     * @param callable|null $status
     * @return $this
     */
-    public function compress($source, ?callable $status = null)
+    public function compress($source, callable $status = null)
    {
        if (!extension_loaded('zip')) {
            throw new InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
@ -105,7 +105,7 @@ class ZipArchiver extends Archiver
     * @param callable|null $status
     * @return $this
     */
-    public function addEmptyFolders($folders, ?callable $status = null)
+    public function addEmptyFolders($folders, callable $status = null)
    {
        if (!extension_loaded('zip')) {
            throw new InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
--- a/system/src/Grav/Common/Flex/FlexCollection.php
+++ b/system/src/Grav/Common/Flex/FlexCollection.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/FlexIndex.php
+++ b/system/src/Grav/Common/Flex/FlexIndex.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/FlexObject.php
+++ b/system/src/Grav/Common/Flex/FlexObject.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -32,7 +32,7 @@ abstract class FlexObject extends \Grav\Framework\Flex\FlexObject implements Med
     * {@inheritdoc}
     * @see FlexObjectInterface::getFormValue()
     */
-    public function getFormValue(string $name, $default = null, ?string $separator = null)
+    public function getFormValue(string $name, $default = null, string $separator = null)
    {
        $value = $this->getNestedProperty($name, null, $separator);

--- a/system/src/Grav/Common/Flex/Traits/FlexCollectionTrait.php
+++ b/system/src/Grav/Common/Flex/Traits/FlexCollectionTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Traits/FlexCommonTrait.php
+++ b/system/src/Grav/Common/Flex/Traits/FlexCommonTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Traits/FlexGravTrait.php
+++ b/system/src/Grav/Common/Flex/Traits/FlexGravTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Traits/FlexIndexTrait.php
+++ b/system/src/Grav/Common/Flex/Traits/FlexIndexTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Traits/FlexObjectTrait.php
+++ b/system/src/Grav/Common/Flex/Traits/FlexObjectTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Generic/GenericCollection.php
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericCollection.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Generic/GenericIndex.php
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericIndex.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -766,7 +766,7 @@ class PageCollection extends FlexPageCollection implements PageCollectionInterfa
     * @return static
     * @phpstan-return static<T>
     */
-    public function withTranslation(bool $bool = true, ?string $languageCode = null, ?bool $fallback = null)
+    public function withTranslation(bool $bool = true, string $languageCode = null, bool $fallback = null)
    {
        $list = array_keys(array_filter($this->call('hasTranslation', [$languageCode, $fallback])));

@ -778,7 +778,7 @@ class PageCollection extends FlexPageCollection implements PageCollectionInterfa
     * @param bool|null $fallback
     * @return PageIndex
     */
-    public function withTranslated(?string $languageCode = null, ?bool $fallback = null)
+    public function withTranslated(string $languageCode = null, bool $fallback = null)
    {
        return $this->getIndex()->withTranslated($languageCode, $fallback);
    }
--- a/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -57,7 +57,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
    public const ORDER_LIST_REGEX = '/(\/\d+)\.[^\/]+/u';
    public const PAGE_ROUTE_REGEX = '/\/\d+\./u';

-    /** @var T|array */
+    /** @var PageObject|array */
    protected $_root;
    /** @var array|null */
    protected $_params;
@ -66,7 +66,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @param array $entries
     * @param FlexDirectory|null $directory
     */
-    public function __construct(array $entries = [], ?FlexDirectory $directory = null)
+    public function __construct(array $entries = [], FlexDirectory $directory = null)
    {
        // Remove root if it's taken.
        if (isset($entries[''])) {
@ -181,7 +181,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @return static
     * @phpstan-return static<T,C>
     */
-    public function withTranslated(?string $languageCode = null, ?bool $fallback = null)
+    public function withTranslated(string $languageCode = null, bool $fallback = null)
    {
        if (null === $languageCode) {
            return $this;
@ -413,7 +413,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @return static
     * @phpstan-return static<T,C>
     */
-    protected function createFrom(array $entries, ?string $keyField = null)
+    protected function createFrom(array $entries, string $keyField = null)
    {
        /** @var static $index */
        $index = parent::createFrom($entries, $keyField);
@ -428,7 +428,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @param bool|null $fallback
     * @return array
     */
-    protected function translateEntries(array $entries, string $lang, ?bool $fallback = null): array
+    protected function translateEntries(array $entries, string $lang, bool $fallback = null): array
    {
        $languages = $this->getFallbackLanguages($lang, $fallback);
        foreach ($entries as $key => &$entry) {
@ -493,7 +493,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @param bool|null $fallback
     * @return array
     */
-    protected function getFallbackLanguages(?string $languageCode = null, ?bool $fallback = null): array
+    protected function getFallbackLanguages(string $languageCode = null, bool $fallback = null): array
    {
        $fallback = $fallback ?? true;
        if (!$fallback && null !== $languageCode) {
@ -781,7 +781,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface
     * @param int|null $timestamp
     * @return string|null
     */
-    private function jsDate(?int $timestamp = null): ?string
+    private function jsDate(int $timestamp = null): ?string
    {
        if (!$timestamp) {
            return null;
--- a/system/src/Grav/Common/Flex/Types/Pages/PageObject.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageObject.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -129,7 +129,7 @@ class PageObject extends FlexPageObject
    /**
     * @inheritdoc PageInterface
     */
-    public function getFormValue(string $name, $default = null, ?string $separator = null)
+    public function getFormValue(string $name, $default = null, string $separator = null)
    {
        $test = new stdClass();

@ -261,7 +261,7 @@ class PageObject extends FlexPageObject
    /**
     * @param UserInterface|null $user
     */
-    public function check(?UserInterface $user = null): void
+    public function check(UserInterface $user = null): void
    {
        parent::check($user);

--- a/system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageContentTrait.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageContentTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageLegacyTrait.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageLegacyTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageRoutableTrait.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageRoutableTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -32,7 +32,7 @@ trait PageRoutableTrait
     * @return PageInterface|null the parent page object if it exists.
     */

-    public function parent(?PageInterface $var = null)
+    public function parent(PageInterface $var = null)
    {
        if (Utils::isAdminPlugin()) {
            return parent::parent();
--- a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageTranslateTrait.php
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageTranslateTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupCollection.php
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupCollection.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -38,7 +38,7 @@ class UserGroupCollection extends FlexCollection
     * @param  string|null $scope
     * @return bool|null
     */
-    public function authorize(string $action, ?string $scope = null): ?bool
+    public function authorize(string $action, string $scope = null): ?bool
    {
        $authorized = null;
        /** @var UserGroupObject $object */
--- a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupIndex.php
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupIndex.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -57,7 +57,7 @@ class UserGroupObject extends FlexObject implements UserGroupInterface
     * @param  string|null $scope
     * @return bool|null
     */
-    public function authorize(string $action, ?string $scope = null): ?bool
+    public function authorize(string $action, string $scope = null): ?bool
    {
        if ($scope === 'test') {
            $scope = null;
--- a/system/src/Grav/Common/Flex/Types/Users/Storage/UserFileStorage.php
+++ b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFileStorage.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -23,7 +23,7 @@ class UserFileStorage extends FileStorage
     * {@inheritdoc}
     * @see FlexStorageInterface::getMediaPath()
     */
-    public function getMediaPath(?string $key = null): ?string
+    public function getMediaPath(string $key = null): ?string
    {
        // There is no media support for file storage (fallback to common location).
        return null;
--- a/system/src/Grav/Common/Flex/Types/Users/Storage/UserFolderStorage.php
+++ b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFolderStorage.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Users/Traits/UserObjectLegacyTrait.php
+++ b/system/src/Grav/Common/Flex/Types/Users/Traits/UserObjectLegacyTrait.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Users/UserCollection.php
+++ b/system/src/Grav/Common/Flex/Types/Users/UserCollection.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/Flex/Types/Users/UserIndex.php
+++ b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -197,7 +197,7 @@ class UserIndex extends FlexIndex implements UserCollectionInterface

        /** @var Logger $logger */
        $logger = $grav['log'];
-        $logger->debug($message);
+        $logger->addDebug($message);

        /** @var Debugger $debugger */
        $debugger = $grav['debugger'];
--- a/system/src/Grav/Common/Flex/Types/Users/UserObject.php
+++ b/system/src/Grav/Common/Flex/Types/Users/UserObject.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 /**
 * @package    Grav\Common\Flex
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

@ -92,9 +92,9 @@ class UserObject extends FlexObject implements UserInterface, Countable
    protected $_uploads_original;
    /** @var FileInterface|null */
    protected $_storage;
-    /** @var UserGroupIndex|null */
+    /** @var UserGroupIndex */
    protected $_groups;
-    /** @var Access|null */
+    /** @var Access */
    protected $_access;
    /** @var array|null */
    protected $access;
@ -270,7 +270,7 @@ class UserObject extends FlexObject implements UserInterface, Countable
     * @param  string|null $scope
     * @return bool|null
     */
-    public function authorize(string $action, ?string $scope = null): ?bool
+    public function authorize(string $action, string $scope = null): ?bool
    {
        if ($scope === 'test') {
            // Special scope to test user permissions.
@ -557,7 +557,7 @@ class UserObject extends FlexObject implements UserInterface, Countable
     * @param FileInterface|null $storage Optionally enter a new storage.
     * @return FileInterface|null
     */
-    public function file(?FileInterface $storage = null)
+    public function file(FileInterface $storage = null)
    {
        if (null !== $storage) {
            $this->_storage = $storage;
--- a/system/src/Grav/Common/Form/FormFlash.php
+++ b/system/src/Grav/Common/Form/FormFlash.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\Form
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/GPM/AbstractCollection.php
+++ b/system/src/Grav/Common/GPM/AbstractCollection.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\GPM
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\GPM
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/GPM/Common/CachedCollection.php
+++ b/system/src/Grav/Common/GPM/Common/CachedCollection.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\GPM
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/system/src/Grav/Common/GPM/Common/Package.php
+++ b/system/src/Grav/Common/GPM/Common/Package.php
@ -3,7 +3,7 @@
 /**
 * @package    Grav\Common\GPM
 *
- * @copyright  Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
 * @license    MIT License; see LICENSE file for details.
 */

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rotzbua	d798859acd	chore(ci): update GH Actions php test (#3867 ) - php versions should be strings - caching updated to current recommendation - fixed env var name	2025-02-05 11:16:51 -07:00
Andy Miller	08d74df6e3	Fix parse error: #3894 Signed-off-by: Andy Miller <rhuk@mac.com>	2025-01-24 15:23:06 -07:00
Olivier Dolbeau	2620e836d4	Update code blocks in README (#3886 )	2025-01-18 12:39:11 +00:00
Andy Miller	7e723eb7f5	actions/cache@v4 cache for tests Signed-off-by: Andy Miller <rhuk@mac.com>	2025-01-13 12:30:17 +00:00
Rotzbua	1d1d8da431	fix: twig filter `exif_read_data` throws critical error (#3878 )	2025-01-07 13:53:09 +00:00
Andy Miller	4097d85daa	updated copyright date to current year Signed-off-by: Andy Miller <rhuk@mac.com>	2025-01-06 14:14:42 +00:00
Andy Miller	2e975dfa90	bug in AbastractLazyCollection Signed-off-by: Andy Miller <rhuk@mac.com>	2024-12-03 15:33:32 -07:00
Bob Conan	a1e583f657	Updated SECURITY.md, fix typo(s) (#3870 )	2024-11-13 14:01:07 -07:00