Fix nullable errors. Bump php-di to 7. Remove spatie data transfer

Author: MlKilderkin

.github/workflows/analysis.yml

@@ -3,10 +3,16 @@ name: PHP Code Sniffer and Static Analysis
 on:
   push:
     branches:
-      - 4.x
+      - 5.x
+      - '5.0.0'
   pull_request:
     paths:
-      - 'src/**.php'
+      - 'src/**/*.php'
+      - 'tests/phpcs.xml'
+      - 'tests/phpstan.neon'
+      - 'composer.json'
+      - 'composer.lock'
+      - '.github/workflows/analysis.yml'
 
 jobs:
   analyze:
@@ -16,14 +22,14 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-versions: [ '8.0' ]
+        php-versions: [ '8.2' ]
 
     env:
-      cache_version: 1 # increment to flush all caches
-      php_extensions: tokenizer, xmlwriter, simplexml
+      cache_version: 2
+      php_extensions: tokenizer, xmlwriter, simplexml, mbstring
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP extension cache
         id: cache-php-extensions
@@ -34,7 +40,7 @@ jobs:
           key: ${{ matrix.operating-system }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}
 
       - name: Cache PHP extensions
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-php-extensions.outputs.dir }}
           key: ${{ steps.cache-php-extensions.outputs.key }}
@@ -46,24 +52,24 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: ${{ env.php_extensions }}
           coverage: none
-          tools: composer
+          tools: composer:v2
 
-      - name: Validate composer.json and composer.lock
-        run: composer validate
+      - name: Validate composer.json
+        run: composer validate --no-check-publish --no-check-lock
 
       - 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: Check for Cached Composer Dependencies
-        id: cache-composer-dependencies
-        uses: actions/cache@v2
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}-composer-${{ hashFiles('composer.json') }}
-          restore-keys: ${{ runner.os }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}-composer-
+          key: ${{ runner.os }}-${{ env.cache_version }}-php${{ matrix.php-versions }}-composer-${{ hashFiles('composer.json', 'composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache_version }}-php${{ matrix.php-versions }}-composer-
 
-      - name: Install updated composer dependencies
+      - name: Install Composer dependencies
         run: composer update --prefer-stable --prefer-dist --no-interaction --optimize-autoloader
 
       - name: Run PHPCS code sniffer

.github/workflows/ci.yml

@@ -3,7 +3,8 @@ name: Codeception Tests
 on:
   push:
     branches:
-      - 4.x
+      - 5.x
+      - '5.0.0'
   pull_request:
 
 jobs:
@@ -14,47 +15,47 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-versions: [ '7.4', '8.0', '8.1' ]
-        wordpress-version: [ 'latest', '5.3.12', '5.9.3' ]
-        exclude:
-          - php-versions: '8.0'
-            wordpress-version: '5.3.12'
-          - php-versions: '8.1'
-            wordpress-version: '5.3.12'
+        php-versions: [ '8.1', '8.2', '8.3' ]
+        wordpress-version: [ 'latest', '6.4.5', '6.7.2' ]
       fail-fast: false
 
     env:
-      cache_version: 1 # increment to flush all caches
+      cache_version: 2
       php_extensions: memcached, mysql, bz2, gd, igbinary, imagick, imap, mbstring, bcmath, zip, intl
       PROJECT_ID: square1
       COMPOSE_INTERACTIVE_NO_CLI: 1
       WP_ROOT_FOLDER: ${{ github.workspace }}/tests/wordpress
-      WP_DOMAIN: "tribe-libs.tribe"
-      WP_ADMIN_PATH: "/wp-admin"
-      WP_ADMIN_USERNAME: "admin"
-      WP_ADMIN_PASSWORD: "password"
-      WP_URL: "http://tribe-libs.tribe"
+      WP_DOMAIN: tribe-libs.tribe
+      WP_ADMIN_PATH: /wp-admin
+      WP_ADMIN_USERNAME: admin
+      WP_ADMIN_PASSWORD: password
+      WP_URL: http://tribe-libs.tribe
       TEST_DB_HOST: 127.0.0.1
-      TEST_DB_NAME: wordpress
+      TEST_DB_NAME: tribe_libs_test
       TEST_DB_USER: root
       TEST_DB_PASSWORD: password
-      TABLE_PREFIX: "tribe_"
+      TABLE_PREFIX: tribe_
       TEST_CONFIG_FILE: ${{ github.workspace }}/tests/wp-config-environment.php
 
     services:
 
       mysql:
-        image: mariadb:10
+        image: mariadb:10.11
         env:
           MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: wordpress
+          MYSQL_DATABASE: tribe_libs_test
         ports:
           - 3306:3306
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
 
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP extension cache
         id: cache-php-extensions
@@ -65,7 +66,7 @@ jobs:
           key: ${{ matrix.operating-system }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}-${{ matrix.wordpress-version }}
 
       - name: Cache PHP extensions
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-php-extensions.outputs.dir }}
           key: ${{ steps.cache-php-extensions.outputs.key }}
@@ -77,36 +78,49 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: ${{ env.php_extensions }}
           coverage: none
-          tools: codeception, composer
+          tools: composer:v2
 
       - name: Download WordPress
         working-directory: ./tests
         run: |
-          wget "https://wordpress.org/wordpress-${{ matrix.wordpress-version }}.tar.gz" -O ./wordpress.tar.gz
+          wget -q "https://wordpress.org/wordpress-${{ matrix.wordpress-version }}.tar.gz" -O ./wordpress.tar.gz
           tar xzf wordpress.tar.gz
           rm wordpress.tar.gz
 
-      - name: Create config files
+      - name: Create test environment file
         run: |
-          touch ./tests/.env
+          {
+            echo "WP_ROOT_FOLDER=${{ env.WP_ROOT_FOLDER }}"
+            echo "WP_DOMAIN=${{ env.WP_DOMAIN }}"
+            echo "WP_URL=${{ env.WP_URL }}"
+            echo "WP_ADMIN_PATH=${{ env.WP_ADMIN_PATH }}"
+            echo "WP_ADMIN_USERNAME=${{ env.WP_ADMIN_USERNAME }}"
+            echo "WP_ADMIN_PASSWORD=${{ env.WP_ADMIN_PASSWORD }}"
+            echo "TEST_DB_HOST=${{ env.TEST_DB_HOST }}"
+            echo "TEST_DB_NAME=${{ env.TEST_DB_NAME }}"
+            echo "TEST_DB_USER=${{ env.TEST_DB_USER }}"
+            echo "TEST_DB_PASSWORD=${{ env.TEST_DB_PASSWORD }}"
+            echo "TABLE_PREFIX=${{ env.TABLE_PREFIX }}"
+            echo "TEST_CONFIG_FILE=${{ env.TEST_CONFIG_FILE }}"
+          } > ./tests/.env
 
       - 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: Check for Cached Composer Dependencies
-        id: cache-composer-dependencies
-        uses: actions/cache@v2
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}-composer-${{ hashFiles('composer.json') }}
-          restore-keys: ${{ runner.os }}-${{ env.cache_version }}-phpextensions-${{ matrix.php-versions }}-composer-
+          key: ${{ runner.os }}-${{ env.cache_version }}-php${{ matrix.php-versions }}-composer-${{ hashFiles('composer.json', 'composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache_version }}-php${{ matrix.php-versions }}-composer-
 
-      - name: Install updated composer dependencies
+      - name: Install Composer dependencies
         run: composer update --prefer-stable --prefer-dist --no-interaction --optimize-autoloader
 
-      - name: Install test dependencies
-        run: composer -- test:install-plugins
+      - name: Install test plugins
+        run: composer test:install-plugins
 
       - name: Run unit tests
         run: composer test:unit

.github/workflows/monorepo.yml

@@ -15,35 +15,33 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.2'
           coverage: none
+          tools: composer:v2
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - uses: ramsey/composer-install@v3
 
       - name: Set repo matrix
         id: set-matrix
-        run: echo "matrix=$(php ./dev/monorepo/scripts/repo-map.php)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(php ./dev/monorepo/scripts/repo-map.php)" >> "$GITHUB_OUTPUT"
 
   split:
     needs: list-repos
     runs-on: ubuntu-latest
     env:
-      # This should be changed based on the branch where this action lives to match
-      # the versions that will be released, so for a "4.x" branch would be 4.0.0 <= 5.0.0.
-      # Branches MUST EXIST in the sub-repos for this to work, so use the
-      # sub-repo-branch-create.yml GitHub action to create those branches first.
-      # If you branch from this, ensure to change the split_branch to a new major version!
-      split_branch: '4.x'
+      # Match the major release line for this branch (create `5.x` in sub-repos first
+      # via sub-repo-branch-create.yml if missing).
+      split_branch: '5.x'
     strategy:
       fail-fast: false
       matrix:
         package: ${{ fromJson(needs.list-repos.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -59,4 +57,3 @@ jobs:
           user_name: '${{ github.actor }}'
           user_email: '${{ github.actor }}@users.noreply.github.com'
           branch: '${{ env.split_branch }}'
-

.github/workflows/sub-repo-branch-create.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'The branch name to create in all sub-repos'
+        description: 'The branch name to create in all sub-repos (e.g. 5.x)'
         required: true
 
 jobs:
@@ -16,17 +16,18 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.2'
           coverage: none
+          tools: composer:v2
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - uses: ramsey/composer-install@v2
+      - uses: ramsey/composer-install@v3
 
       - name: Set repo matrix
         id: set-matrix
-        run: echo "::set-output name=matrix::$(./monorepo.sh packages-json)"
+        run: echo "matrix=$(./monorepo.sh packages-json)" >> "$GITHUB_OUTPUT"
 
   create-sub-repo-branches:
     needs: list-repos
@@ -39,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout sub-repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.org }}/${{ matrix.package }}
           token: ${{ secrets.TR1B0T_TRIBE_LIBS_MONOREPO_TOKEN }}
@@ -51,5 +52,3 @@ jobs:
           git config --local user.name "Tr1b0t"
           git checkout -b ${{ github.event.inputs.branch }}
           git push -u origin ${{ github.event.inputs.branch }}
-
-

.lando.yml

@@ -2,7 +2,7 @@ name: tribe-libs
 recipe: wordpress
 
 config:
-  php: '8.0'
+  php: '8.2'
   composer_version: 2-latest
   via: nginx
   xdebug: false

CHANGELOG.md

@@ -4,15 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-## 4.2.3 - 2025-12-02
-
-## 4.2.3 - 2025-12-02
-
-## 4.2.3 - 2025-12-02
-
-## 4.2.3 - 2025-12-02
-
-## 4.2.3 - 2025-12-02
+## 5.0.0 - TBD
+
+- Changed: Minimum PHP version to **8.1** (`^8.1`).
+- Changed: Upgraded `php-di/php-di` from `^6.0` to **`^7.0`** for PHP 8 compatibility.
+- Changed: Removed abandoned `spatie/data-transfer-object`. Field Models use a first-party DTO layer under `Tribe\Libs\Field_Models\DTO` while keeping Spatie-compatible extension points (`castValue`, `castType`, validator property names) and class aliases under `Spatie\DataTransferObject\*` when Spatie is not installed.
+- Changed: Subpackage interdependencies use `self.version` (monorepo) until a 5.0 release sets mutual versions; branch alias `5.0-dev`.
+- Fixed: Implicit nullable parameter declarations for PHP 8.4+ (`Type $x = null` → `?Type $x = null`).
+- Changed: Dev tooling constraints (PHPUnit, PHPStan, Symfony Console) for PHP 8.1+.
+- Added: `composer test:functional` alias for the integration suite.
+- Changed: GitHub Actions for PHP 8.1–8.3, WordPress latest/6.4/6.7, modern action versions, `5.x` monorepo split branch.
 
 ## 4.2.2 - 2025-11-25