diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..fa2cbe2b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # Keep the SHA-pinned GitHub Actions current. Dependabot opens reviewable
+  # pull requests that bump both the commit SHA and the trailing "# version"
+  # comment; it never merges on its own.
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "docker"
+    directory: "/resources/docker"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index df05078a..e366ac98 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,96 +1,303 @@
-name: Testing Suite
+name: "REST API CI"
 
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+  pull_request:
+  workflow_dispatch:
 
 env:
-  DATA_API_MYSQL_HOST: '127.0.0.1'
-  DATA_API_REDIS_HOST: '127.0.0.1'
+  # Phalcon v5 C extension constraint (installed from source via PIE)
+  PHALCON_CONSTRAINT: "^5.0"
+  EXTENSIONS: "mbstring, intl, json, openssl, redis, pdo_mysql"
+  # The application reads DATA_API_*; Talon reads DATA_* for its own settings.
+  # Both resolve getenv() before $_ENV, so these beat the files that point at
+  # the compose service names (.env for the app, tests/.env.test for Talon).
+  DATA_API_MYSQL_HOST: "127.0.0.1"
+  DATA_API_REDIS_HOST: "127.0.0.1"
+  DATA_MYSQL_HOST: "127.0.0.1"
+  DATA_REDIS_HOST: "127.0.0.1"
+  # The api suite crosses a real HTTP boundary; this is the built-in server
+  # started below. APP_URL stays http://localhost:8080 - it is what the app
+  # echoes back in `links`, and the expectations must match the app.
+  TALON_REST_URL: "http://127.0.0.1:8080"
+
+permissions: { }
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
-  run:
+  quality:
+    name: "Code quality"
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
-    name: Workflow - PHP-${{ matrix.php }}
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          fetch-depth: 1
 
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2
+        with:
+          php-version: '8.3'
+          extensions: ${{ env.EXTENSIONS }}
+          tools: composer:v2
+
+      # The quality tools do not need the Phalcon extension: phpstan analyses the
+      # phalcon/phalcon (v6) source pulled in by Composer.
+      - name: "Validate composer"
+        run: composer validate --no-check-all --no-check-publish
+
+      - name: "Install dependencies"
+        uses: ramsey/composer-install@26d8a556604053a9612623447203a691f406fbe6 # v4
+        with:
+          composer-options: "--prefer-dist"
+
+      - name: "PHPCS"
+        run: composer cs
+
+      - name: "PHP CS Fixer (dry-run)"
+        run: composer cs-fixer
+
+      - name: "PHPStan"
+        run: composer analyze
+
+  tests:
+    name: "Tests (PHP ${{ matrix.php }}, Phalcon ${{ matrix.variant }})"
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    needs:
+      - quality
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+        variant:
+          # v5 = cphalcon C extension; v6 = phalcon/phalcon composer package
+          - 'v5'
+          - 'v6'
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         ports:
           - "3306:3306"
         env:
           MYSQL_ROOT_PASSWORD: secret
-          MYSQL_USER: phalcon
           MYSQL_DATABASE: phalcon_api
-          MYSQL_PASSWORD: secret
+        options: >-
+          --health-cmd "mysqladmin ping --silent"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       redis:
-        image: redis:5-alpine
+        image: redis:alpine
         ports:
           - "6379:6379"
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['8.0', '8.1' ]
-
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
-      - uses: actions/checkout@v1
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          fetch-depth: 1
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2
         with:
           php-version: ${{ matrix.php }}
-          tools: pecl
-          extensions: mbstring, intl, json, phalcon-5.0.0RC4
-          coverage: xdebug
+          extensions: ${{ env.EXTENSIONS }}
+          tools: composer:v2
+
+      # v5 = cphalcon C extension, built from source via PIE (pecl caps at PHP 8.4).
+      # v6 needs no extension: it runs on the phalcon/phalcon composer package (a require-dev dep).
+      - name: "Install Phalcon v5 (cphalcon) via PIE"
+        if: matrix.variant == 'v5'
+        run: |
+          curl -fsSL https://github.com/php/pie/releases/latest/download/pie.phar -o pie.phar
+          sudo "$(which php)" pie.phar install --no-interaction "phalcon/cphalcon:${{ env.PHALCON_CONSTRAINT }}"
+          php -m | grep -i phalcon
+
+      - name: "Install dependencies"
+        uses: ramsey/composer-install@26d8a556604053a9612623447203a691f406fbe6 # v4
+        with:
+          composer-options: "--prefer-dist"
+
+      - name: "Prepare environment"
+        run: |
+          cp resources/.env.example .env
+          sed -i 's/^DATA_API_MYSQL_HOST=.*/DATA_API_MYSQL_HOST=127.0.0.1/' .env
+          sed -i 's/^DATA_API_REDIS_HOST=.*/DATA_API_REDIS_HOST=127.0.0.1/' .env
+          # storage/logs is not tracked (only the cache dirs carry .gitignore
+          # placeholders), so a fresh checkout has nowhere to write the log.
+          mkdir -p storage/logs storage/cache/data storage/cache/metadata tests/_output
 
-      - name: Init Database
+      - name: "Migrate"
+        run: composer migrate
+
+      # The api suite talks to this over the network. .htrouter.php is a router
+      # script: it serves anything that exists under public/ and hands the rest
+      # to public/index.php.
+      - name: "Start the application"
         run: |
-          mysql -uroot -h127.0.0.1 -psecret -e 'CREATE DATABASE IF NOT EXISTS `phalcon_api`;'
+          php -S 127.0.0.1:8080 .htrouter.php > storage/logs/server.log 2>&1 &
+          # Any HTTP status means the application answered - /sommething is
+          # expected to 404. curl reports "000" when it could not connect at
+          # all, which is the only case worth waiting on.
+          for i in $(seq 1 30); do
+            code=$(curl -sS -o /dev/null -w '%{http_code}' "${TALON_REST_URL}/sommething" 2>/dev/null || true)
+            if [ "$code" != "000" ]; then
+              echo "application answered with HTTP ${code} after ${i}s"
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "the application did not answer within 30s"
+          cat storage/logs/server.log || true
+          exit 1
 
-      - name: Validate composer.json and composer.lock
-        run: composer validate
+      - name: "Tests"
+        run: vendor/bin/talon run all
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: "Server log"
+        if: failure()
+        run: cat storage/logs/server.log || true
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
+  coverage:
+    name: "Coverage"
+    permissions:
+      contents: read
+      pull-requests: write
+      actions: read
+    runs-on: ubuntu-latest
+    needs:
+      - quality
+    services:
+      mysql:
+        image: mysql:8.0
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: secret
+          MYSQL_DATABASE: phalcon_api
+        options: >-
+          --health-cmd "mysqladmin ping --silent"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis:alpine
+        ports:
+          - "6379:6379"
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ matrix.php }}-composer-
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          # SonarQube needs full history for blame/new-code detection;
+          # octocov uses it for the base-branch diff.
+          fetch-depth: 0
 
-      - name: Install Composer dependencies
-        run: composer install --prefer-dist --no-progress --no-suggest
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2
+        with:
+          php-version: '8.3'
+          extensions: ${{ env.EXTENSIONS }}
+          coverage: pcov
+          tools: composer:v2
 
-      - name: Run PHPCS
-        if: always()
-        run: vendor/bin/phpcs
+      # pecl's phalcon release metadata caps at PHP 8.4; PIE builds it from source.
+      - name: "Install Phalcon (v5) via PIE"
+        run: |
+          curl -fsSL https://github.com/php/pie/releases/latest/download/pie.phar -o pie.phar
+          sudo "$(which php)" pie.phar install --no-interaction "phalcon/cphalcon:${{ env.PHALCON_CONSTRAINT }}"
+          php -m | grep -i phalcon
 
-      - name: Env file
-        if: always()
-        run: cp -v ./storage/config/.env.ci ./.env
+      - name: "Install dependencies"
+        uses: ramsey/composer-install@26d8a556604053a9612623447203a691f406fbe6 # v4
+        with:
+          composer-options: "--prefer-dist"
 
-      - name: Run migrations
-        if: always()
+      - name: "Prepare environment"
         run: |
-          vendor/bin/phinx migrate
+          cp resources/.env.example .env
+          sed -i 's/^DATA_API_MYSQL_HOST=.*/DATA_API_MYSQL_HOST=127.0.0.1/' .env
+          sed -i 's/^DATA_API_REDIS_HOST=.*/DATA_API_REDIS_HOST=127.0.0.1/' .env
+          mkdir -p storage/logs storage/cache/data storage/cache/metadata tests/_output
 
-      - name: Run tests
-        if: always()
+      - name: "Migrate"
+        run: composer migrate
+
+      - name: "Start the application"
         run: |
-          sudo php -S 0.0.0.0 -t ./.htrouter.php &
-          vendor/bin/codecept build
-          vendor/bin/codecept run unit --coverage-xml=unit-coverage.xml
-          vendor/bin/codecept run integration --coverage-xml=integration-coverage.xml
-          vendor/bin/codecept run cli --coverage-xml=cli-coverage.xml
-#          vendor/bin/codecept run api --coverage-xml=api-coverage.xml
-
-      - name: Upload to codecov
-        uses: codecov/codecov-action@v3
+          php -S 127.0.0.1:8080 .htrouter.php > storage/logs/server.log 2>&1 &
+          for i in $(seq 1 30); do
+            code=$(curl -sS -o /dev/null -w '%{http_code}' "${TALON_REST_URL}/sommething" 2>/dev/null || true)
+            if [ "$code" != "000" ]; then
+              echo "application answered with HTTP ${code} after ${i}s"
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "the application did not answer within 30s"
+          cat storage/logs/server.log || true
+          exit 1
+
+      # Runs phpunit over resources/phpunit.xml.dist directly rather than
+      # through talon: `talon run all` starts one process per suite, and each
+      # would overwrite the others' coverage.xml. One process, all four suites,
+      # one merged report.
+      #
+      # NOTE: the api suite exercises the application in the php -S process
+      # above, which pcov does not instrument - so the controllers read as 0%
+      # covered here despite being tested. See resources/octocov.yml.
+      - name: "Tests with coverage"
+        run: composer test-coverage
+
+      # SonarQube first (push only) so a failing octocov gate can't skip the upload.
+      - name: "SonarQube Scan"
+        if: github.event_name == 'push'
+        uses: SonarSource/sonarqube-scan-action@713881670b6b3676cda39549040e2d88c70d582e # v8.2.0
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.organization=phalcon
+            -Dsonar.projectKey=phalcon_rest-api
+            -Dsonar.sources=src
+            -Dsonar.tests=tests
+            -Dsonar.exclusions=resources/**
+            -Dsonar.php.coverage.reportPaths=tests/_output/coverage.xml
+
+      # octocov last: PR comment + coverage gate (strict on PRs via
+      # octocov.pr.yml, floor only on pushes via octocov.yml), stores the
+      # baseline report on the default branch, and writes the badge SVG.
+      - name: "octocov"
+        uses: k1LoW/octocov-action@b3b6ee60482a667950f87553abf1df63217235d9 # v1.5.1
+        with:
+          config: ${{ github.event_name == 'pull_request' && 'resources/octocov.pr.yml' || 'resources/octocov.yml' }}
+
+      - name: "Upload coverage badge"
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-          directory: ./tests/_output/
-          files: unit-coverage.xml,integration-coverage.xml,cli-coverage.xml
-          name: codecov-umbrella # optional
-          fail_ci_if_error: false
-          verbose: true # optional (default = false)
+          name: coverage-badge
+          path: tests/_output/coverage.svg
+          if-no-files-found: ignore
diff --git a/.htrouter.php b/.htrouter.php
index 302df6a5..6f6a64c8 100644
--- a/.htrouter.php
+++ b/.htrouter.php
@@ -4,10 +4,10 @@
     parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );
 
-if ($uri !== '/' && file_exists(__DIR__ . '/public' . $uri)) {
+if ($uri !== '/' && file_exists(dirname(__FILE__) . '/public' . $uri)) {
     return false;
 }
 
 $_GET['_url'] = $_SERVER['REQUEST_URI'];
 
-require_once __DIR__ . '/api/public/index.php';
+require_once dirname(__FILE__) . '/public/index.php';
diff --git a/.scrutinizer.yml_bak b/.scrutinizer.yml_bak
deleted file mode 100644
index 5c14e50a..00000000
--- a/.scrutinizer.yml_bak
+++ /dev/null
@@ -1,216 +0,0 @@
-build:
-    root_path: './'
-    environment:
-        selenium: false
-        memcached: true
-        elasticsearch: false
-        rabbitmq: false
-        postgresql: false
-        redis: false
-        node: false
-        php:
-          version: 7.1.12
-          ini:
-            'date.timezone': 'UTC'
-        hosts:
-          api.phalcon.ld: '127.0.0.1'
-        apache2:
-          modules: ['rewrite']
-          sites:
-            api:
-              web_root: 'public'
-              host: 'api.phalcon.ld'
-        variables:
-          DATA_API_MYSQL_HOST: "localhost"
-          DATA_API_MYSQL_PASS: "password"
-          DATA_API_MYSQL_USER: "root"
-          DATA_API_MYSQL_NAME: "gonano"
-          DATA_API_MEMCACHED_HOST: "127.0.0.1"
-          DATA_API_MEMCACHED_PORT: 11211
-          DATA_API_MEMCACHED_WEIGHT: 100
-          APP_IP: "api.phalcon.ld"
-
-    cache:
-        directories:
-          - ~/cphalcon
-
-    dependencies:
-        before:
-          - cd /home/scrutinizer/build
-          - cp storage/ci/.env.example .env
-          - cp storage/ci/phinx.php.example phinx.php
-          - command: 'cd ~/ && git clone https://github.com/jbboehr/php-psr.git && cd php-psr && phpize && ./configure && make && make test && sudo make install'
-          - sed -i '$ a \\nextension=psr.so\n' /home/scrutinizer/.phpenv/versions/7.1.12/etc/php.ini
-          -
-            command: 'cd ~/ && git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b 4.0.x && cd cphalcon/build && ./install'
-            not_if: 'test -e /home/scrutinizer/cphalcon/build/php7/64bits/modules/phalcon.so'
-          -
-            command: 'cp -v /home/scrutinizer/cphalcon/build/php7/64bits/modules/phalcon.so  /home/scrutinizer/.phpenv/versions/7.1.12/lib/php/extensions/no-debug-zts-20160303/'
-            only_if: 'test -e /home/scrutinizer/cphalcon/build/php7/64bits/modules/phalcon.so'
-          - sed -i '$ a \\n[Phalcon]\nextension=phalcon.so\n' /home/scrutinizer/.phpenv/versions/7.1.12/etc/php.ini
-          - php -m | grep -i Phalcon
-          - sudo /etc/init.d/apache2 restart
-          - mysql -e "CREATE DATABASE gonano"
-          - mysql -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('password');"
-          - mysql -e "FLUSH PRIVILEGES"
-          - cd /home/scrutinizer/build
-          - composer install --no-interaction
-          - ./vendor/bin/phinx migrate
-          - ./vendor/bin/codecept build
-
-#    project_setup:
-#        override: true
-
-    tests:
-        override:
-          - phpcs-run --standard=PSR2 --extensions=php --ignore=tests/*,storage/*,vendor/* ./
-          -
-            command: './vendor/bin/codecept run --coverage-xml'
-            coverage:
-              file: './tests/_output/coverage.xml'
-              format: 'clover'
-          - php-scrutinizer-run --enable-security-analysis
-
-filter:
-  paths: ['./*']
-  excluded_paths:
-    - 'tests/*'
-    - 'storage/*'
-    - 'vendor/*'
-    - 'phinx.php'
-
-build_failure_conditions:
-    # No classes/methods with a rating of D or worse
-    - 'elements.rating(<= C).exists'
-    # No new classes/methods with a rating of D or worse allowed
-    - 'elements.rating(<= C).new.exists'
-
-    # No coding style issues allowed - Removing it for now until we fix index.php
-    - 'issues.label("coding-style").exists'
-    # No new coding style issues allowed
-    - 'issues.label("coding-style").new.exists'
-
-    # More than 5 new coding style issues.
-    - 'issues.label("coding-style").new.count > 5'
-    # New issues of major or higher severity
-    - 'issues.severity(>= MAJOR).new.exists'
-
-    # Code Quality Rating drops below 8
-    - 'project.metric("scrutinizer.quality", < 8)'
-    # Code Coverage drops below 60%
-    - 'project.metric("scrutinizer.test_coverage", < 0.60)'
-
-    # Code Coverage decreased from previous inspection by more than 10%
-    - 'project.metric_change("scrutinizer.test_coverage", < -0.10)'
-
-tools:
-  php_analyzer: true
-  php_mess_detector: true
-  php_code_sniffer:
-    config:
-      standard: PSR2
-  php_loc:
-    enabled: true
-    excluded_dirs: ['vendor', 'tests', 'storage']
-  php_cpd:
-    enabled: true
-    excluded_dirs: ['vendor', 'tests', 'storage']
-
-checks:
-  php:
-    verify_property_names: true
-    verify_argument_usable_as_reference: true
-    verify_access_scope_valid: true
-    variable_existence: true
-    useless_calls: true
-    use_statement_alias_conflict: true
-    unused_variables: true
-    unused_properties: true
-    unused_parameters: true
-    unused_methods: true
-    unreachable_code: true
-    too_many_arguments: true
-    symfony_request_injection: true
-    switch_fallthrough_commented: true
-    sql_injection_vulnerabilities: true
-    simplify_boolean_return: true
-    security_vulnerabilities: true
-    return_in_constructor: true
-    return_doc_comments: true
-    return_doc_comment_if_not_inferrable: true
-    require_scope_for_methods: true
-    require_php_tag_first: true
-    property_assignments: true
-    properties_in_camelcaps: true
-    precedence_mistakes: true
-    precedence_in_conditions: true
-    phpunit_assertions: true
-    parse_doc_comments: true
-    parameters_in_camelcaps: true
-    parameter_non_unique: true
-    parameter_doc_comments: true
-    param_doc_comment_if_not_inferrable: true
-    overriding_private_members: true
-    overriding_parameter: true
-    non_commented_empty_catch_block: true
-    no_trait_type_hints: true
-    no_trailing_whitespace: true
-    no_short_variable_names:
-      minimum: '3'
-    no_short_open_tag: true
-    no_short_method_names:
-      minimum: '3'
-    no_property_on_interface: true
-    no_non_implemented_abstract_methods: true
-    no_long_variable_names:
-      maximum: '20'
-    no_goto: true
-    no_exit: true
-    no_eval: true
-    no_error_suppression: true
-    no_debug_code: true
-    more_specific_types_in_doc_comments: true
-    missing_arguments: true
-    method_calls_on_non_object: true
-    instanceof_class_exists: true
-    foreach_usable_as_reference: true
-    foreach_traversable: true
-    fix_use_statements:
-      remove_unused: true
-      preserve_multiple: true
-      preserve_blanklines: false
-      order_alphabetically: true
-    fix_line_ending: true
-    fix_doc_comments: true
-    encourage_shallow_comparison: true
-    duplication: true
-    deprecated_code_usage: true
-    deadlock_detection_in_loops: true
-    comparison_always_same_result: true
-    code_rating: true
-    closure_use_not_conflicting: true
-    closure_use_modifiable: true
-    check_method_contracts:
-      verify_interface_like_constraints: true
-      verify_documented_constraints: true
-      verify_parent_constraints: true
-    catch_class_exists: true
-    call_to_parent_method: true
-    avoid_superglobals: true
-    avoid_length_functions_in_loops: true
-    avoid_duplicate_types: true
-    avoid_closing_tag: true
-    assignment_of_null_return: true
-    argument_type_checks: true
-    remove_extra_empty_lines: true
-    naming_conventions:
-      local_variable: '^[a-z][a-zA-Z0-9]*$'
-      abstract_class_name: ^Abstract|Factory$
-      utility_class_name: '^[A-Z][a-zA-Z0-9]*$'
-      constant_name: '^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$'
-      property_name: '^[a-z][a-zA-Z0-9]*$'
-      method_name: '^(?:[a-z]|__)[a-zA-Z0-9]*$'
-      parameter_name: '^[a-z][a-zA-Z0-9]*$'
-      interface_name: '^[A-Z][a-zA-Z0-9]*Interface$'
-      exception_name: '^[A-Z][a-zA-Z0-9]*Exception$'
-      isser_method_name: '^(?:is|has|should|may|supports|before|after)'
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..634f5e97
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,25 @@
+# Contributor Covenant Code of Conduct
+
+## TL;DR
+
+Common sense rules. Treat people the same way you want to be treated.
+
+## Detail
+
+This is an open source project. Everyone and anyone is welcome to contribute
+to it as much or as little as they want to.
+
+Personal views of contributors have no effect on the project and should be
+kept in the personal realm not this project.
+
+It is a requirement to treat other contributors as well as maintainers with
+respect, when communicating in the realm of this project. It is OK to agree to
+disagree.
+
+## Conflict
+
+If ever conflict arises, please bring it to the attention of the maintainers
+privately. You can always find us on our [Discord](https://phalcon.io/discord)
+server or you can send us an email at [team@phalcon.io](mailto:team@phalcon.io)
+
+The core team maintains the final decision on any conflict that may arise.
diff --git a/README.md b/README.md
index d6063a9e..73ceb646 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,23 @@ Sample API using Phalcon
 Implementation of an API application using the Phalcon Framework [https://phalcon.io](https://phalcon.io)
 
 ### Installation
-- Clone the project
-- In the project folder run `nanobox run php-server`
-- Hit the IP address with postman
 
-**NOTE** This requires [nanobox](https://nanobox.io) to be present in your system. Visit their site for installation instructions.
+Requires [Docker](https://docs.docker.com/get-docker/) with the Compose plugin.
+
+- Clone the project
+- Copy the environment template: `cp resources/.env.example .env`
+- If your host user is not `1000:1000`, set `UID` and `GID` in `.env` to match the output of `id -u` and `id -g`
+- Start the stack: `docker compose up -d --build`
+- Install the dependencies: `docker compose exec app composer install`
+- Hit `http://localhost:8080` with postman
+
+The project directory is mounted at `/srv` inside the container, which masks the
+`vendor/` directory baked into the image — hence the `composer install` step
+above. It only needs repeating when `composer.lock` changes.
+
+The host port is configurable via `APP_PORT` in `.env`, so this app can run
+alongside the other Phalcon sample applications. `PHP_VERSION` (8.1 minimum) and
+`PHALCON_VARIANT` select the PHP and Phalcon versions the image is built with.
 
 ### Features
 ##### JWT Tokens
diff --git a/api/controllers/Companies/AddController.php b/api/controllers/Companies/AddController.php
deleted file mode 100644
index 69231577..00000000
--- a/api/controllers/Companies/AddController.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Api\Controllers\Companies;
-
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Traits\FractalTrait;
-use Phalcon\Api\Transformers\BaseTransformer;
-use Phalcon\Api\Validation\CompaniesValidator;
-use Phalcon\Filter\Filter;
-use Phalcon\Mvc\Controller;
-
-use function Phalcon\Api\Core\appUrl;
-
-/**
- * Class AddController
- *
- * @property Response $response
- */
-class AddController extends Controller
-{
-    use FractalTrait;
-
-    /**
-     * Adds a record in the database
-     *
-     * @throws ModelException
-     */
-    public function callAction()
-    {
-        $validator = new CompaniesValidator();
-        $messages  = $validator->validate($this->request->getPost());
-
-        /**
-         * If no messages are returned, go ahead with the query
-         */
-        if (0 === count($messages)) {
-            $name    = $this->request->getPost('name', Filter::FILTER_STRING);
-            $address = $this->request->getPost('address', Filter::FILTER_STRING, '');
-            $city    = $this->request->getPost('city', Filter::FILTER_STRING, '');
-            $phone   = $this->request->getPost('phone', Filter::FILTER_STRING, '');
-
-            $company = new Companies();
-            $result  = $company
-                ->set('name', $name)
-                ->set('address', $address)
-                ->set('city', $city)
-                ->set('phone', $phone)
-                ->save()
-            ;
-
-            if (false !== $result) {
-                $data = $this->format(
-                    'item',
-                    $company,
-                    BaseTransformer::class,
-                    'companies'
-                );
-
-                $this
-                    ->response
-                    ->setHeader('Location', appUrl(Relationships::COMPANIES, $company->get('id')))
-                    ->setJsonContent($data)
-                    ->setStatusCode($this->response::CREATED)
-                ;
-            } else {
-                /**
-                 * Errors happened store them
-                 */
-                $this
-                    ->response
-                    ->setPayloadErrors($company->getMessages())
-                ;
-            }
-        } else {
-            /**
-             * Set the errors in the payload
-             */
-            $this
-                ->response
-                ->setPayloadErrors($messages)
-            ;
-        }
-    }
-}
diff --git a/cli/cli.php b/bin/cli
old mode 100644
new mode 100755
similarity index 78%
rename from cli/cli.php
rename to bin/cli
index b6dfbbda..76ec92ac
--- a/cli/cli.php
+++ b/bin/cli
@@ -1,5 +1,5 @@
+#!/usr/bin/env php
 <?php
-declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon API.
@@ -10,8 +10,10 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Phalcon\Api\Bootstrap\Cli;
 
-require_once __DIR__ . '/../library/Core/autoload.php';
+require_once dirname(__FILE__, 2) . '/src/Core/autoload.php';
 
 (new Cli())->run();
diff --git a/codeception.yml b/codeception.yml
deleted file mode 100644
index 681098cb..00000000
--- a/codeception.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Can be changed while bootstrapping project
-actor_suffix: Tester
-
-paths:
-  # Where the modules stored
-  tests: tests
-  output: tests/_output
-  # Directory for fixture data
-  data: tests/_data
-  # Directory for custom modules (helpers)
-  support: tests/_support
-  envs: tests/_envs
-
-# The name of bootstrap that will be used.
-# Each bootstrap file should be inside a suite directory.
-bootstrap: _bootstrap.php
-
-settings:
-  colors: true
-  # Tests (especially functional) can take a lot of memory
-  # We set a high limit for them by default.
-  memory_limit: 128M
-  log: true
-
-coverage:
-  enabled: true
-  remote: false
-  include:
-    - ./*.php
-  exclude:
-    - phinx.php
-    - storage/*
-    - tests/*
-    - vendor/*
-
-extensions:
-  enabled:
-    - Codeception\Extension\RunFailed # default extension
-
-# Global modules configuration.
-modules:
-  config:
-    Phalcon:
-      bootstrap: "tests/_ci/bootstrap.php"
-      cleanup: false
-      savepoints: false
-    DB:
-      dsn: 'mysql:host=%DATA_API_MYSQL_HOST%;dbname=%DATA_API_MYSQL_NAME%'
-      user: '%DATA_API_MYSQL_USER%'
-      password: '%DATA_API_MYSQL_PASS%'
-      dump: 'tests/_data/dump.sql'
-      populate: false
-      cleanup: false
-      reconnect: true
-
-# Get params from .env file
-params:
-  - .env
-
-error_level: "E_ALL"
diff --git a/composer.json b/composer.json
index 34edf5bb..f57a11c3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "phalcon/rest-api",
-    "type": "library",
-    "description": "This is a sample API REST application for the Phalcon PHP Framework",
+    "type": "project",
+    "description": "This is a sample REST API application for the Phalcon PHP Framework",
     "keywords": [
         "phalcon",
         "framework",
@@ -19,33 +19,56 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ext-json": "*",
         "ext-openssl": "*",
-        "ext-phalcon": "^5.0.0RC4",
-        "league/fractal": "^0.20.1",
-        "robmorgan/phinx": "^0.12.12",
-        "vlucas/phpdotenv": "^5.4"
+        "league/fractal": "^0.21.0",
+        "robmorgan/phinx": "^0.16.12",
+        "vlucas/phpdotenv": "^5.6"
     },
-    "require-dev": {
-        "codeception/codeception": "^5.0",
-        "codeception/module-asserts": "^3.0",
-        "codeception/module-cli": "^2.0",
-        "codeception/module-filesystem": "^3.0",
-        "codeception/module-phalcon5": "^2.0",
-        "codeception/module-phpbrowser": "^3.0",
-        "codeception/module-rest": "^3.3",
-        "phalcon/ide-stubs": "^v5.0.0-RC1",
-        "phpstan/phpstan": "^1.8",
-        "squizlabs/php_codesniffer": "^3.7",
-        "vimeo/psalm": "^4.27"
+    "suggest": {
+        "ext-phalcon": "Install the Phalcon v5 C extension to run on v5 (the default); alternatively run on v6 via the phalcon/phalcon package - see the Dockerfile PHALCON_VARIANT build arg and the README."
+    },
+    "autoload": {
+        "psr-4": {
+            "Phalcon\\Api\\": "src/"
+        }
     },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3",
+        "pds/composer-script-names": "^1.0",
+        "pds/skeleton": "^1.0",
+        "phalcon/ide-stubs": "^5.16",
+        "phalcon/phalcon": "v6.0.x-dev",
+        "phalcon/phql": "1.0.x-dev",
+        "phalcon/talon": "^0.8.0",
+        "phpstan/phpstan": "^2.2",
+        "phpunit/phpunit": "^10.5",
+        "squizlabs/php_codesniffer": "^4.0"
     },
     "scripts": {
-        "phpcs": "phpcs --standard=PSR12"
+        "analyze": "phpstan analyse -c resources/phpstan.neon --memory-limit 1024M",
+        "cs": "phpcs --standard=resources/phpcs.xml",
+        "cs-fix": "phpcbf --standard=resources/phpcs.xml",
+        "cs-fixer": "php-cs-fixer fix --config=resources/php-cs-fixer.php --dry-run --diff",
+        "cs-fixer-fix": "php-cs-fixer fix --config=resources/php-cs-fixer.php",
+        "test": "talon run",
+        "test-mutation": "infection --configuration=resources/infection.json5 --threads=1 --test-framework-options=--testsuite=unit,integration,cli",
+        "test-coverage": "phpunit -c resources/phpunit.xml.dist --coverage-clover tests/_output/coverage.xml",
+        "test-coverage-html": "phpunit -c resources/phpunit.xml.dist --coverage-html tests/_output/coverage",
+        "migrate": "phinx migrate -c resources/phinx.php",
+        "seed": "phinx seed:run -c resources/phinx.php",
+        "post-create-project-cmd": [
+            "@php -r \"file_exists('.env') || copy('resources/.env.example', '.env');\"",
+            "@php -r \"echo PHP_EOL . 'The Phalcon REST API is ready (.env created from resources/.env.example). Next steps:' . PHP_EOL . '  docker: docker compose up -d --build, then composer install && composer migrate' . PHP_EOL . '  tests:  vendor/bin/talon run' . PHP_EOL;\""
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
index 7e80a6ff..f4684a64 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,25 +4,89 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bba5b028fab1210394cb8f18090e2b49",
+    "content-hash": "1af45bf0ac93076694409e074fe499ac",
     "packages": [
+        {
+            "name": "cakephp/chronos",
+            "version": "3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cakephp/chronos.git",
+                "reference": "e6e777b534244911566face8a5dbdbd7f7bda5a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cakephp/chronos/zipball/e6e777b534244911566face8a5dbdbd7f7bda5a6",
+                "reference": "e6e777b534244911566face8a5dbdbd7f7bda5a6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/clock": "^1.0"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "require-dev": {
+                "cakephp/cakephp-codesniffer": "^5.0",
+                "phpunit/phpunit": "^10.5.58 || ^11.5.3 || ^12.1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cake\\Chronos\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Nesbitt",
+                    "email": "brian@nesbot.com",
+                    "homepage": "http://nesbot.com"
+                },
+                {
+                    "name": "The CakePHP Team",
+                    "homepage": "https://cakephp.org"
+                }
+            ],
+            "description": "A simple API extension for DateTime.",
+            "homepage": "https://cakephp.org",
+            "keywords": [
+                "date",
+                "datetime",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/cakephp/chronos/issues",
+                "source": "https://github.com/cakephp/chronos"
+            },
+            "time": "2026-04-10T02:50:39+00:00"
+        },
         {
             "name": "cakephp/core",
-            "version": "4.4.5",
+            "version": "5.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/core.git",
-                "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b"
+                "reference": "f18f37c04832831ca37f5300212b1adddcc54b86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/core/zipball/77e53e3784863c1b8006464b82ab842ee7c58e6b",
-                "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b",
+                "url": "https://api.github.com/repos/cakephp/core/zipball/f18f37c04832831ca37f5300212b1adddcc54b86",
+                "reference": "f18f37c04832831ca37f5300212b1adddcc54b86",
                 "shasum": ""
             },
             "require": {
-                "cakephp/utility": "^4.0",
-                "php": ">=7.4.0"
+                "cakephp/utility": "5.2.*@dev",
+                "league/container": "^4.2",
+                "php": ">=8.1",
+                "psr/container": "^1.1 || ^2.0"
+            },
+            "provide": {
+                "psr/container-implementation": "^2.0"
             },
             "suggest": {
                 "cakephp/cache": "To use Configure::store() and restore().",
@@ -30,6 +94,11 @@
                 "league/container": "To use Container and ServiceProvider classes"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-5.x": "5.2.x-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "functions.php"
@@ -61,31 +130,43 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/core"
             },
-            "time": "2022-08-26T02:01:18+00:00"
+            "time": "2025-11-14T14:52:55+00:00"
         },
         {
             "name": "cakephp/database",
-            "version": "4.4.5",
+            "version": "5.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/database.git",
-                "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef"
+                "reference": "5f271aa7e6243ea72914a3bb47b0bf60b2142e0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/database/zipball/eec6239b0734e2a4dfe212dc93bcd505c7d296ef",
-                "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef",
+                "url": "https://api.github.com/repos/cakephp/database/zipball/5f271aa7e6243ea72914a3bb47b0bf60b2142e0d",
+                "reference": "5f271aa7e6243ea72914a3bb47b0bf60b2142e0d",
                 "shasum": ""
             },
             "require": {
-                "cakephp/core": "^4.0",
-                "cakephp/datasource": "^4.0",
-                "php": ">=7.4.0"
+                "cakephp/chronos": "^3.1",
+                "cakephp/core": "5.2.*@dev",
+                "cakephp/datasource": "5.2.*@dev",
+                "php": ">=8.1",
+                "psr/log": "^3.0"
+            },
+            "require-dev": {
+                "cakephp/i18n": "5.2.*@dev",
+                "cakephp/log": "5.2.*@dev"
             },
             "suggest": {
-                "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types."
+                "cakephp/i18n": "If you are using locale-aware datetime formats.",
+                "cakephp/log": "If you want to use query logging without providing a logger yourself."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-5.x": "5.2.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cake\\Database\\": "."
@@ -116,27 +197,31 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/database"
             },
-            "time": "2022-08-18T21:01:25+00:00"
+            "time": "2026-07-16T03:58:12+00:00"
         },
         {
             "name": "cakephp/datasource",
-            "version": "4.4.5",
+            "version": "5.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/datasource.git",
-                "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c"
+                "reference": "906a8b719b6dc241fa81a55be20c9adc51c31f74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/datasource/zipball/6fbd1f49833dedf3bd351e1a98b18133a6b9e86c",
-                "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c",
+                "url": "https://api.github.com/repos/cakephp/datasource/zipball/906a8b719b6dc241fa81a55be20c9adc51c31f74",
+                "reference": "906a8b719b6dc241fa81a55be20c9adc51c31f74",
                 "shasum": ""
             },
             "require": {
-                "cakephp/core": "^4.0",
-                "php": ">=7.4.0",
-                "psr/log": "^1.0 || ^2.0",
-                "psr/simple-cache": "^1.0 || ^2.0"
+                "cakephp/core": "5.2.*@dev",
+                "php": ">=8.1",
+                "psr/simple-cache": "^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "cakephp/cache": "5.2.*@dev",
+                "cakephp/collection": "5.2.*@dev",
+                "cakephp/utility": "5.2.*@dev"
             },
             "suggest": {
                 "cakephp/cache": "If you decide to use Query caching.",
@@ -144,6 +229,11 @@
                 "cakephp/utility": "If you decide to use EntityTrait."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-5.x": "5.2.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cake\\Datasource\\": "."
@@ -174,31 +264,36 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/datasource"
             },
-            "time": "2022-08-18T20:55:21+00:00"
+            "time": "2025-11-14T14:52:55+00:00"
         },
         {
             "name": "cakephp/utility",
-            "version": "4.4.5",
+            "version": "5.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/utility.git",
-                "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5"
+                "reference": "df9bc4e420db3b4a02cafad896398bad48813e50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/utility/zipball/7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5",
-                "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5",
+                "url": "https://api.github.com/repos/cakephp/utility/zipball/df9bc4e420db3b4a02cafad896398bad48813e50",
+                "reference": "df9bc4e420db3b4a02cafad896398bad48813e50",
                 "shasum": ""
             },
             "require": {
-                "cakephp/core": "^4.0",
-                "php": ">=7.4.0"
+                "cakephp/core": "5.2.*@dev",
+                "php": ">=8.1"
             },
             "suggest": {
                 "ext-intl": "To use Text::transliterate() or Text::slug()",
                 "lib-ICU": "To use Text::transliterate() or Text::slug()"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-5.x": "5.2.x-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -233,28 +328,28 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/utility"
             },
-            "time": "2022-08-19T06:02:03+00:00"
+            "time": "2025-11-14T14:52:55+00:00"
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.0",
+            "version": "v1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
+                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
-                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/e01f4a821471308ba86aa202fed6698b6b695e3b",
+                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9"
+                "phpoption/phpoption": "^1.9.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
+                "phpunit/phpunit": "^8.5.41 || ^9.6.22 || ^10.5.45 || ^11.5.7"
             },
             "type": "library",
             "autoload": {
@@ -283,7 +378,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.4"
             },
             "funding": [
                 {
@@ -295,20 +390,102 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-30T15:56:11+00:00"
+            "time": "2025-12-27T19:43:20+00:00"
+        },
+        {
+            "name": "league/container",
+            "version": "4.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/container.git",
+                "reference": "d3cebb0ff4685ff61c749e54b27db49319e2ec00"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/d3cebb0ff4685ff61c749e54b27db49319e2ec00",
+                "reference": "d3cebb0ff4685ff61c749e54b27db49319e2ec00",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "psr/container": "^1.1 || ^2.0"
+            },
+            "provide": {
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "orno/di": "~2.0"
+            },
+            "require-dev": {
+                "nette/php-generator": "^3.4",
+                "nikic/php-parser": "^4.10",
+                "phpstan/phpstan": "^0.12.47",
+                "phpunit/phpunit": "^8.5.17",
+                "roave/security-advisories": "dev-latest",
+                "scrutinizer/ocular": "^1.8",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev",
+                    "dev-2.x": "2.x-dev",
+                    "dev-3.x": "3.x-dev",
+                    "dev-4.x": "4.x-dev",
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Container\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Bennett",
+                    "email": "mail@philbennett.co.uk",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fast and intuitive dependency injection container.",
+            "homepage": "https://github.com/thephpleague/container",
+            "keywords": [
+                "container",
+                "dependency",
+                "di",
+                "injection",
+                "league",
+                "provider",
+                "service"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/container/issues",
+                "source": "https://github.com/thephpleague/container/tree/4.2.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/philipobenito",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-05-20T12:55:37+00:00"
         },
         {
             "name": "league/fractal",
-            "version": "0.20.1",
+            "version": "0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/fractal.git",
-                "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62"
+                "reference": "9e817358dc451dfdcf656d6757f0c04e92dea0e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/fractal/zipball/8b9d39b67624db9195c06f9c1ffd0355151eaf62",
-                "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62",
+                "url": "https://api.github.com/repos/thephpleague/fractal/zipball/9e817358dc451dfdcf656d6757f0c04e92dea0e8",
+                "reference": "9e817358dc451dfdcf656d6757f0c04e92dea0e8",
                 "shasum": ""
             },
             "require": {
@@ -316,19 +493,19 @@
             },
             "require-dev": {
                 "doctrine/orm": "^2.5",
+                "friendsofphp/php-cs-fixer": "^3.91",
                 "illuminate/contracts": "~5.0",
+                "laminas/laminas-paginator": "~2.12",
                 "mockery/mockery": "^1.3",
-                "pagerfanta/pagerfanta": "~1.0.0",
+                "pagerfanta/pagerfanta": "~1.0.0|~4.0.0",
                 "phpstan/phpstan": "^1.4",
                 "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "~3.4",
-                "vimeo/psalm": "^4.22",
-                "zendframework/zend-paginator": "~2.3"
+                "vimeo/psalm": "^4.30"
             },
             "suggest": {
                 "illuminate/pagination": "The Illuminate Pagination component.",
-                "pagerfanta/pagerfanta": "Pagerfanta Paginator",
-                "zendframework/zend-paginator": "Zend Framework Paginator"
+                "laminas/laminas-paginator": "Laminas Framework Paginator",
+                "pagerfanta/pagerfanta": "Pagerfanta Paginator"
             },
             "type": "library",
             "extra": {
@@ -363,36 +540,36 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/fractal/issues",
-                "source": "https://github.com/thephpleague/fractal/tree/0.20.1"
+                "source": "https://github.com/thephpleague/fractal/tree/0.21"
             },
-            "time": "2022-04-11T12:47:17+00:00"
+            "time": "2025-12-08T21:14:52+00:00"
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.0",
+            "version": "1.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
+                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
-                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/75365b91986c2405cf5e1e012c5595cd487a98be",
+                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8",
-                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -428,7 +605,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.5"
             },
             "funding": [
                 {
@@ -440,7 +617,55 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-30T15:51:26+00:00"
+            "time": "2025-12-27T19:41:33+00:00"
+        },
+        {
+            "name": "psr/clock",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/clock.git",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Clock\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for reading the clock.",
+            "homepage": "https://github.com/php-fig/clock",
+            "keywords": [
+                "clock",
+                "now",
+                "psr",
+                "psr-20",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/clock/issues",
+                "source": "https://github.com/php-fig/clock/tree/1.0.0"
+            },
+            "time": "2022-11-25T14:36:26+00:00"
         },
         {
             "name": "psr/container",
@@ -497,16 +722,16 @@
         },
         {
             "name": "psr/log",
-            "version": "2.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
-                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -515,7 +740,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -541,22 +766,22 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/2.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:41:46+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psr/simple-cache",
-            "version": "2.0.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a"
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/8707bf3cea6f710bf6ef05491234e3ab06f6432a",
-                "reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
                 "shasum": ""
             },
             "require": {
@@ -565,7 +790,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -592,38 +817,39 @@
                 "simple-cache"
             ],
             "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/2.0.0"
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
             },
-            "time": "2021-10-29T13:22:09+00:00"
+            "time": "2021-10-29T13:26:27+00:00"
         },
         {
             "name": "robmorgan/phinx",
-            "version": "0.12.12",
+            "version": "0.16.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/phinx.git",
-                "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115"
+                "reference": "1cce44387a9146dc04c312e6a231b17fb30385cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/phinx/zipball/9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115",
-                "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115",
+                "url": "https://api.github.com/repos/cakephp/phinx/zipball/1cce44387a9146dc04c312e6a231b17fb30385cd",
+                "reference": "1cce44387a9146dc04c312e6a231b17fb30385cd",
                 "shasum": ""
             },
             "require": {
-                "cakephp/database": "^4.0",
-                "php": ">=7.2",
-                "psr/container": "^1.0 || ^2.0",
-                "symfony/config": "^3.4|^4.0|^5.0|^6.0",
-                "symfony/console": "^3.4|^4.0|^5.0|^6.0"
+                "cakephp/database": "^5.0.2",
+                "composer-runtime-api": "^2.0",
+                "php-64bit": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/config": "^4.0|^5.0|^6.0|^7.0|^8.0",
+                "symfony/console": "^6.0|^7.0|^8.0"
             },
             "require-dev": {
-                "cakephp/cakephp-codesniffer": "^4.0",
+                "cakephp/cakephp-codesniffer": "^5.0",
+                "cakephp/i18n": "^5.0",
                 "ext-json": "*",
                 "ext-pdo": "*",
-                "phpunit/phpunit": "^8.5|^9.3",
-                "sebastian/comparator": ">=1.2.3",
-                "symfony/yaml": "^3.4|^4.0|^5.0"
+                "phpunit/phpunit": "^10.5",
+                "symfony/yaml": "^4.0|^5.0|^6.0|^7.0|^8.0"
             },
             "suggest": {
                 "ext-json": "Install if using JSON configuration format",
@@ -678,43 +904,40 @@
             ],
             "support": {
                 "issues": "https://github.com/cakephp/phinx/issues",
-                "source": "https://github.com/cakephp/phinx/tree/0.12.12"
+                "source": "https://github.com/cakephp/phinx/tree/0.16.12"
             },
-            "time": "2022-07-09T18:53:51+00:00"
+            "time": "2026-07-03T07:27:17+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v6.0.11",
+            "version": "v6.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "956d4ec5df274dda91a4cedfccc2bfd063f6f649"
+                "reference": "922d980c90a69ffdd63e6ee551efb338b58be677"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/956d4ec5df274dda91a4cedfccc2bfd063f6f649",
-                "reference": "956d4ec5df274dda91a4cedfccc2bfd063f6f649",
+                "url": "https://api.github.com/repos/symfony/config/zipball/922d980c90a69ffdd63e6ee551efb338b58be677",
+                "reference": "922d980c90a69ffdd63e6ee551efb338b58be677",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/filesystem": "^5.4|^6.0",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-php81": "^1.22"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/filesystem": "^5.4|^6.0|^7.0",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/finder": "<4.4"
+                "symfony/finder": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/messenger": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/yaml": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -742,7 +965,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v6.0.11"
+                "source": "https://github.com/symfony/config/tree/v6.4.42"
             },
             "funding": [
                 {
@@ -753,32 +976,37 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T17:10:44+00:00"
+            "time": "2026-06-09T07:36:15+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.0.12",
+            "version": "v6.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c5c2e313aa682530167c25077d6bdff36346251e"
+                "reference": "9ef84af84a7b66396da483634227650506428639"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c5c2e313aa682530167c25077d6bdff36346251e",
-                "reference": "c5c2e313aa682530167c25077d6bdff36346251e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9ef84af84a7b66396da483634227650506428639",
+                "reference": "9ef84af84a7b66396da483634227650506428639",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<5.4",
@@ -792,18 +1020,16 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -832,12 +1058,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.0.12"
+                "source": "https://github.com/symfony/console/tree/v6.4.42"
             },
             "funding": [
                 {
@@ -848,38 +1074,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-23T20:52:30+00:00"
+            "time": "2026-06-15T05:35:29+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.2",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
+                "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/f3202fa1b5097b0af062dc978b32ecf63404e31d",
+                "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -904,7 +1134,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.1"
             },
             "funding": [
                 {
@@ -915,32 +1145,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2026-06-05T06:23:12+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.0.12",
+            "version": "v6.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "a36b782dc19dce3ab7e47d4b92b13cefb3511da3"
+                "reference": "c507b077756b4e3e09adbbe7975fac81cd3722ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a36b782dc19dce3ab7e47d4b92b13cefb3511da3",
-                "reference": "a36b782dc19dce3ab7e47d4b92b13cefb3511da3",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c507b077756b4e3e09adbbe7975fac81cd3722ca",
+                "reference": "c507b077756b4e3e09adbbe7975fac81cd3722ca",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -967,7 +1204,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.0.12"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.39"
             },
             "funding": [
                 {
@@ -978,29 +1215,33 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-02T16:01:06+00:00"
+            "time": "2026-05-07T13:11:42+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -1010,12 +1251,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1049,7 +1287,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -1060,41 +1298,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.26.0",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
+                "reference": "e9247d281d694a5120554d9afaf54e070e88a603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603",
+                "reference": "e9247d281d694a5120554d9afaf54e070e88a603",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1130,7 +1369,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -1141,41 +1380,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-05-26T05:58:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.26.0",
+            "version": "v1.38.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
+                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
+                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1214,7 +1454,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
             },
             "funding": [
                 {
@@ -1225,29 +1465,34 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-05-25T13:48:31+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "ext-iconv": "*",
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -1257,12 +1502,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1297,7 +1539,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -1308,38 +1550,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-05-27T06:59:30+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.26.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1380,7 +1623,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -1391,49 +1634,55 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-10T07:21:04+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.26.0",
+            "name": "symfony/service-contracts",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
-                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/c0a284bab1ed8aa0417e3d69250ab437739563a0",
+                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
+                    "Symfony\\Contracts\\Service\\": ""
                 },
-                "classmap": [
-                    "Resources/stubs"
+                "exclude-from-classmap": [
+                    "/Test/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1450,16 +1699,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "description": "Generic abstractions related to writing services",
             "homepage": "https://symfony.com",
             "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.1"
             },
             "funding": [
                 {
@@ -1470,124 +1721,46 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-06-16T09:55:08+00:00"
         },
         {
-            "name": "symfony/service-contracts",
-            "version": "v3.0.2",
+            "name": "symfony/string",
+            "version": "v6.4.39",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66"
+                "url": "https://github.com/symfony/string.git",
+                "reference": "62e3c927de664edadb5bef260987eb047a17a113"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
+                "url": "https://api.github.com/repos/symfony/string/zipball/62e3c927de664edadb5bef260987eb047a17a113",
+                "reference": "62e3c927de664edadb5bef260987eb047a17a113",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "psr/container": "^2.0"
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "ext-psr": "<1.1|>=2"
+                "symfony/translation-contracts": "<2.5"
             },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-30T19:17:58+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v6.0.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0",
-                "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.2",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/translation-contracts": "<2.0"
-            },
-            "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+            "require-dev": {
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -1626,7 +1799,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.12"
+                "source": "https://github.com/symfony/string/tree/v6.4.39"
             },
             "funding": [
                 {
@@ -1637,48 +1810,56 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-12T18:05:20+00:00"
+            "time": "2026-05-12T11:44:19+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.4.1",
+            "version": "v5.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f"
+                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/416df702837983f8d5ff48c9c3fee4f5f57b980b",
+                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.0.2",
-                "php": "^7.1.3 || ^8.0",
-                "phpoption/phpoption": "^1.8",
-                "symfony/polyfill-ctype": "^1.23",
-                "symfony/polyfill-mbstring": "^1.23.1",
-                "symfony/polyfill-php80": "^1.23.1"
+                "graham-campbell/result-type": "^1.1.4",
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.5",
+                "symfony/polyfill-ctype": "^1.26",
+                "symfony/polyfill-mbstring": "^1.26",
+                "symfony/polyfill-php80": "^1.26"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-filter": "*",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
             },
             "suggest": {
                 "ext-filter": "Required to use the boolean validator."
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "5.4-dev"
+                    "dev-master": "5.6-dev"
                 }
             },
             "autoload": {
@@ -1710,7 +1891,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.4"
             },
             "funding": [
                 {
@@ -1722,49 +1903,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-12T23:22:04+00:00"
+            "time": "2026-07-06T19:11:50+00:00"
         }
     ],
     "packages-dev": [
         {
-            "name": "amphp/amp",
-            "version": "v2.6.2",
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=5.3",
+                "react/stream": "^1.2"
             },
             "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
-                "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "psalm/phar": "^3.11@dev",
-                "react/promise": "^2"
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ],
                 "psr-4": {
-                    "Amp\\": "lib"
+                    "Clue\\React\\NDJson\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1773,86 +1941,76 @@
             ],
             "authors": [
                 {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
                 }
             ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "https://amphp.org/amp",
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
             "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.2"
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/amphp",
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
                     "type": "github"
                 }
             ],
-            "time": "2022-02-20T17:52:18+00:00"
+            "time": "2022-12-23T10:58:28+00:00"
         },
         {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.1",
+            "name": "composer/pcre",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/d5a341b3fb61f3001970940afb1d332968a183ed",
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed",
                 "shasum": ""
             },
             "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<2.2.2"
             },
             "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^9"
             },
             "type": "library",
             "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
                 "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
+                    "Composer\\Pcre\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1861,71 +2019,64 @@
             ],
             "authors": [
                 {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
                 }
             ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "http://amphp.org/byte-stream",
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
             "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.4.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/amphp",
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
                     "type": "github"
                 }
             ],
-            "time": "2021-03-30T17:13:30+00:00"
+            "time": "2026-06-07T11:47:49+00:00"
         },
         {
-            "name": "behat/gherkin",
-            "version": "v4.9.0",
+            "name": "composer/semver",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4"
+                "url": "https://github.com/composer/semver.git",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4",
-                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.2|~8.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "cucumber/cucumber": "dev-gherkin-22.0.0",
-                "phpunit/phpunit": "~8|~9",
-                "symfony/yaml": "~3|~4|~5"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1934,109 +2085,74 @@
             ],
             "authors": [
                 {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
                 }
             ],
-            "description": "Gherkin DSL parser for PHP",
-            "homepage": "http://behat.org/",
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
             "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
             ],
             "support": {
-                "issues": "https://github.com/Behat/Gherkin/issues",
-                "source": "https://github.com/Behat/Gherkin/tree/v4.9.0"
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.4.4"
             },
-            "time": "2021-10-12T13:05:09+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-20T19:15:30+00:00"
         },
         {
-            "name": "codeception/codeception",
-            "version": "5.0.2",
+            "name": "composer/xdebug-handler",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "69f5c85d0c733826395271566a7677d2bc19bd21"
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/69f5c85d0c733826395271566a7677d2bc19bd21",
-                "reference": "69f5c85d0c733826395271566a7677d2bc19bd21",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "^4.6.2",
-                "codeception/lib-asserts": "2.0.*@dev",
-                "codeception/stub": "^3.7 | ^4.0",
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "php": "^8.0",
-                "phpunit/php-code-coverage": "^9.2",
-                "phpunit/php-text-template": "^2.0",
-                "phpunit/php-timer": "^5.0.3",
-                "phpunit/phpunit": "^9.5",
-                "psy/psysh": "^0.11.2",
-                "sebastian/comparator": "^4.0.5",
-                "sebastian/diff": "^4.0.3",
-                "symfony/console": ">=4.4.24 <7.0",
-                "symfony/css-selector": ">=4.4.24 <7.0",
-                "symfony/event-dispatcher": ">=4.4.24 <7.0",
-                "symfony/finder": ">=4.4.24 <7.0",
-                "symfony/var-dumper": ">=4.4.24 < 7.0",
-                "symfony/yaml": ">=4.4.24 <7.0"
-            },
-            "conflict": {
-                "codeception/lib-innerbrowser": "<3.1",
-                "codeception/module-filesystem": "<3.0",
-                "codeception/module-phpbrowser": "<2.5"
-            },
-            "replace": {
-                "codeception/phpunit-wrapper": "*"
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
-                "codeception/lib-innerbrowser": "*@dev",
-                "codeception/lib-web": "^1.0",
-                "codeception/module-asserts": "*@dev",
-                "codeception/module-cli": "*@dev",
-                "codeception/module-db": "*@dev",
-                "codeception/module-filesystem": "*@dev",
-                "codeception/module-phpbrowser": "*@dev",
-                "codeception/util-universalframework": "*@dev",
-                "ext-simplexml": "*",
-                "symfony/dotenv": ">=4.4.24 <7.0",
-                "symfony/process": ">=4.4.24 <7.0",
-                "vlucas/phpdotenv": "^5.1"
-            },
-            "suggest": {
-                "codeception/specify": "BDD-style code blocks",
-                "codeception/verify": "BDD-style assertions",
-                "ext-simplexml": "For loading params from XML files",
-                "stecman/symfony-console-completion": "For BASH autocompletion",
-                "symfony/dotenv": "For loading params from .env files",
-                "symfony/phpunit-bridge": "For phpunit-bridge support",
-                "vlucas/phpdotenv": "For loading params from .env files"
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
-            "bin": [
-                "codecept"
-            ],
             "type": "library",
             "autoload": {
-                "files": [
-                    "functions.php"
-                ],
                 "psr-4": {
-                    "Codeception\\": "src/Codeception",
-                    "Codeception\\Extension\\": "ext"
-                },
-                "classmap": [
-                    "src/PHPUnit/TestCase.php"
-                ]
+                    "Composer\\XdebugHandler\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2044,56 +2160,84 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert.ua@gmail.com",
-                    "homepage": "https://codeception.com"
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
                 }
             ],
-            "description": "BDD-style testing framework",
-            "homepage": "https://codeception.com/",
+            "description": "Restarts a process without Xdebug.",
             "keywords": [
-                "BDD",
-                "TDD",
-                "acceptance testing",
-                "functional testing",
-                "unit testing"
+                "Xdebug",
+                "performance"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/5.0.2"
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-08-20T18:19:54+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
-            "name": "codeception/lib-asserts",
-            "version": "2.0.0",
+            "name": "ergebnis/agent-detector",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/lib-asserts.git",
-                "reference": "df9c8346722ddde4a20e6372073c09c8df87c296"
+                "url": "https://github.com/ergebnis/agent-detector.git",
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/df9c8346722ddde4a20e6372073c09c8df87c296",
-                "reference": "df9c8346722ddde4a20e6372073c09c8df87c296",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/e211f17928c8b95a51e06040792d57f5462fb271",
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271",
                 "shasum": ""
             },
             "require": {
-                "codeception/phpunit-wrapper": "^7.7.1 | ^8.0.3 | ^9.0",
-                "ext-dom": "*",
-                "php": "^7.4 | ^8.0"
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.51.0",
+                "ergebnis/license": "^2.7.0",
+                "ergebnis/php-cs-fixer-config": "^6.60.2",
+                "ergebnis/phpstan-rules": "^2.13.1",
+                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
+                "ergebnis/rector-rules": "^1.18.1",
+                "fakerphp/faker": "^1.24.1",
+                "infection/infection": "^0.26.6",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.54",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
+                "phpstan/phpstan-phpunit": "^2.0.16",
+                "phpstan/phpstan-strict-rules": "^2.0.10",
+                "phpunit/phpunit": "^9.6.34",
+                "rector/rector": "^2.4.2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2-dev"
+                },
+                "composer-normalize": {
+                    "indent-size": 2,
+                    "indent-style": "space"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Ergebnis\\AgentDetector\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2101,64 +2245,45 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
-                },
-                {
-                    "name": "Gintautas Miselis"
-                },
-                {
-                    "name": "Gustavo Nieves",
-                    "homepage": "https://medium.com/@ganieves"
+                    "name": "Andreas Möller",
+                    "email": "am@localheinz.com",
+                    "homepage": "https://localheinz.com"
                 }
             ],
-            "description": "Assertion methods used by Codeception core and Asserts module",
-            "homepage": "https://codeception.com/",
-            "keywords": [
-                "codeception"
-            ],
+            "description": "Provides a detector for detecting the presence of an agent.",
+            "homepage": "https://github.com/ergebnis/agent-detector",
             "support": {
-                "issues": "https://github.com/Codeception/lib-asserts/issues",
-                "source": "https://github.com/Codeception/lib-asserts/tree/2.0.0"
+                "issues": "https://github.com/ergebnis/agent-detector/issues",
+                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
+                "source": "https://github.com/ergebnis/agent-detector"
             },
-            "time": "2021-12-03T12:40:37+00:00"
+            "time": "2026-05-07T08:19:07+00:00"
         },
         {
-            "name": "codeception/lib-innerbrowser",
-            "version": "3.1.2",
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/lib-innerbrowser.git",
-                "reference": "bc91300ad6794c3ac5c83d80ea2460ad7a57250c"
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/bc91300ad6794c3ac5c83d80ea2460ad7a57250c",
-                "reference": "bc91300ad6794c3ac5c83d80ea2460ad7a57250c",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "codeception/lib-web": "^1.0.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/browser-kit": "^4.4.24 || ^5.4 || ^6.0",
-                "symfony/dom-crawler": "^4.4.30 || ^5.4 || ^6.0"
-            },
-            "conflict": {
-                "codeception/codeception": "<5.0.0-alpha3"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "codeception/util-universalframework": "dev-master"
+                "phpunit/phpunit": "^9 || ^6"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Evenement\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2166,57 +2291,54 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "https://codegyre.com"
-                },
-                {
-                    "name": "Gintautas Miselis"
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
                 }
             ],
-            "description": "Parent library for all Codeception framework modules and PhpBrowser",
-            "homepage": "https://codeception.com/",
+            "description": "Événement is a very simple event dispatching library for PHP",
             "keywords": [
-                "codeception"
+                "event-dispatcher",
+                "event-emitter"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/lib-innerbrowser/issues",
-                "source": "https://github.com/Codeception/lib-innerbrowser/tree/3.1.2"
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
             },
-            "time": "2022-04-09T08:43:01+00:00"
+            "time": "2023-08-08T05:53:35+00:00"
         },
         {
-            "name": "codeception/lib-web",
-            "version": "1.0.1",
+            "name": "fidry/cpu-core-counter",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/lib-web.git",
-                "reference": "91e35c5a849479a626f79daf4754ca4ba4e3227f"
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-web/zipball/91e35c5a849479a626f79daf4754ca4ba4e3227f",
-                "reference": "91e35c5a849479a626f79daf4754ca4ba4e3227f",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "guzzlehttp/psr7": "^2.0",
-                "php": "^8.0",
-                "symfony/css-selector": ">=4.4.24 <7.0"
-            },
-            "conflict": {
-                "codeception/codeception": "<5.0.0-alpha3"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "php-webdriver/webdriver": "^1.12",
-                "phpunit/phpunit": "^9.5 | ^10.0"
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Fidry\\CpuCoreCounter\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2224,96 +2346,97 @@
             ],
             "authors": [
                 {
-                    "name": "Gintautas Miselis"
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
                 }
             ],
-            "description": "Library containing files used by module-webdriver and lib-innerbrowser or module-phpbrowser",
-            "homepage": "https://codeception.com/",
+            "description": "Tiny utility to get the number of CPU cores.",
             "keywords": [
-                "codeception"
+                "CPU",
+                "core"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/lib-web/issues",
-                "source": "https://github.com/Codeception/lib-web/tree/1.0.1"
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0"
             },
-            "time": "2022-04-09T08:17:46+00:00"
-        },
-        {
-            "name": "codeception/lib-xml",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/lib-xml.git",
-                "reference": "d6e4c094fb83958bcf254a20815cea5ac31e98d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-xml/zipball/d6e4c094fb83958bcf254a20815cea5ac31e98d0",
-                "reference": "d6e4c094fb83958bcf254a20815cea5ac31e98d0",
-                "shasum": ""
-            },
-            "require": {
-                "codeception/lib-web": "^1.0",
-                "ext-dom": "*",
-                "php": "^8.0",
-                "phpunit/phpunit": "^9.5 | ^10.0",
-                "symfony/css-selector": ">=4.4.24 <7.0"
-            },
-            "conflict": {
-                "codeception/codeception": "<5.0.0-alpha3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Gintautas Miselis"
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
                 }
             ],
-            "description": "Files used by module-rest and module-soap",
-            "homepage": "https://codeception.com/",
-            "keywords": [
-                "codeception"
-            ],
-            "support": {
-                "issues": "https://github.com/Codeception/lib-xml/issues",
-                "source": "https://github.com/Codeception/lib-xml/tree/1.0.1"
-            },
-            "time": "2022-09-11T14:09:09+00:00"
+            "time": "2025-08-14T07:29:31+00:00"
         },
         {
-            "name": "codeception/module-asserts",
-            "version": "3.0.0",
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.95.15",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-asserts.git",
-                "reference": "1b6b150b30586c3614e7e5761b31834ed7968603"
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "3e47e5d50046f87e3244acde2fe655d1a3b72555"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/1b6b150b30586c3614e7e5761b31834ed7968603",
-                "reference": "1b6b150b30586c3614e7e5761b31834ed7968603",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3e47e5d50046f87e3244acde2fe655d1a3b72555",
+                "reference": "3e47e5d50046f87e3244acde2fe655d1a3b72555",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "codeception/lib-asserts": "^2.0",
-                "php": "^8.0"
+                "clue/ndjson-react": "^1.3",
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.5",
+                "ergebnis/agent-detector": "^1.2",
+                "ext-filter": "*",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.3",
+                "php": "^7.4 || ^8.0",
+                "react/child-process": "^0.6.6",
+                "react/event-loop": "^1.5",
+                "react/socket": "^1.16",
+                "react/stream": "^1.4",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0 || ^9.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.37",
+                "symfony/polyfill-php80": "^1.37",
+                "symfony/polyfill-php81": "^1.37",
+                "symfony/polyfill-php84": "^1.37",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2 || ^8.0",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
-            "conflict": {
-                "codeception/codeception": "<5.0"
+            "require-dev": {
+                "facile-it/paraunit": "^1.3.1 || ^2.11.0",
+                "infection/infection": "^0.32.7",
+                "justinrainbow/json-schema": "^6.10.0",
+                "keradus/cli-executor": "^2.3",
+                "mikey179/vfsstream": "^1.6.12",
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.8",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.8",
+                "phpunit/phpunit": "^9.6.35 || ^10.5.64 || ^11.5.56 || ^12.5.31",
+                "symfony/polyfill-php85": "^1.38",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.36 || ^7.4.8 || ^8.1.0",
+                "symfony/yaml": "^5.4.53 || ^6.4.41 || ^7.4.13 || ^8.1.0"
             },
-            "type": "library",
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
             "autoload": {
-                "classmap": [
-                    "src/"
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "exclude-from-classmap": [
+                    "src/**/Internal/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2322,55 +2445,64 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
-                    "name": "Gustavo Nieves",
-                    "homepage": "https://medium.com/@ganieves"
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
                 }
             ],
-            "description": "Codeception module containing various assertions",
-            "homepage": "https://codeception.com/",
+            "description": "A tool to automatically fix PHP code style",
             "keywords": [
-                "assertions",
-                "asserts",
-                "codeception"
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-asserts/issues",
-                "source": "https://github.com/Codeception/module-asserts/tree/3.0.0"
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.15"
             },
-            "time": "2022-02-16T19:48:08+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-07-15T09:51:47+00:00"
         },
         {
-            "name": "codeception/module-cli",
-            "version": "2.0.0",
+            "name": "masterminds/html5",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-cli.git",
-                "reference": "aa9bdd8346983eebc3aa3f21e902399ceefec372"
+                "url": "https://github.com/Masterminds/html5-php.git",
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-cli/zipball/aa9bdd8346983eebc3aa3f21e902399ceefec372",
-                "reference": "aa9bdd8346983eebc3aa3f21e902399ceefec372",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fd5018f6815fff903946d0564977b44ce8010e29",
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "php": "^7.4 || ^8.0"
+                "ext-dom": "*",
+                "php": ">=5.3.0"
             },
-            "conflict": {
-                "codeception/codeception": "<4.0"
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9 || ^10"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Masterminds\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2378,48 +2510,71 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk"
+                    "name": "Matt Butcher",
+                    "email": "technosophos@gmail.com"
+                },
+                {
+                    "name": "Matt Farina",
+                    "email": "matt@mattfarina.com"
+                },
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
                 }
             ],
-            "description": "Codeception module for testing basic shell commands and shell output",
-            "homepage": "https://codeception.com/",
+            "description": "An HTML5 parser and serializer.",
+            "homepage": "http://masterminds.github.io/html5-php",
             "keywords": [
-                "codeception"
+                "HTML5",
+                "dom",
+                "html",
+                "parser",
+                "querypath",
+                "serializer",
+                "xml"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-cli/issues",
-                "source": "https://github.com/Codeception/module-cli/tree/2.0.0"
+                "issues": "https://github.com/Masterminds/html5-php/issues",
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.1"
             },
-            "time": "2021-12-01T01:21:55+00:00"
+            "time": "2026-06-23T18:43:15+00:00"
         },
         {
-            "name": "codeception/module-db",
-            "version": "3.0.1",
+            "name": "matthiasmullie/minify",
+            "version": "1.3.75",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-db.git",
-                "reference": "4ec1208d6d5f546b72decd733a94bf4488683a74"
+                "url": "https://github.com/matthiasmullie/minify.git",
+                "reference": "76ba4a5f555fd7bf4aa408af608e991569076671"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-db/zipball/4ec1208d6d5f546b72decd733a94bf4488683a74",
-                "reference": "4ec1208d6d5f546b72decd733a94bf4488683a74",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/76ba4a5f555fd7bf4aa408af608e991569076671",
+                "reference": "76ba4a5f555fd7bf4aa408af608e991569076671",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "ext-json": "*",
-                "ext-pdo": "*",
-                "php": "^8.0"
+                "ext-pcre": "*",
+                "matthiasmullie/path-converter": "~1.1",
+                "php": ">=5.3.0"
             },
-            "conflict": {
-                "codeception/codeception": "<5.0"
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": ">=2.0",
+                "matthiasmullie/scrapbook": ">=1.3",
+                "phpunit/phpunit": ">=4.8"
+            },
+            "suggest": {
+                "psr/cache-implementation": "Cache implementation to use with Minify::cache"
             },
+            "bin": [
+                "bin/minifycss",
+                "bin/minifyjs"
+            ],
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "MatthiasMullie\\Minify\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2427,52 +2582,59 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
+                    "name": "Matthias Mullie",
+                    "email": "minify@mullie.eu",
+                    "homepage": "https://www.mullie.eu",
+                    "role": "Developer"
                 }
             ],
-            "description": "DB module for Codeception",
-            "homepage": "https://codeception.com/",
+            "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.",
+            "homepage": "https://github.com/matthiasmullie/minify",
             "keywords": [
-                "codeception",
-                "database-testing",
-                "db-testing"
+                "JS",
+                "css",
+                "javascript",
+                "minifier",
+                "minify"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-db/issues",
-                "source": "https://github.com/Codeception/module-db/tree/3.0.1"
+                "issues": "https://github.com/matthiasmullie/minify/issues",
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.75"
             },
-            "time": "2022-03-05T19:26:44+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/matthiasmullie",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-06-25T09:56:19+00:00"
         },
         {
-            "name": "codeception/module-filesystem",
-            "version": "3.0.0",
+            "name": "matthiasmullie/path-converter",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-filesystem.git",
-                "reference": "326ef1c1edf90f52ceec2965ff240a8d93c1ba63"
+                "url": "https://github.com/matthiasmullie/path-converter.git",
+                "reference": "e7d13b2c7e2f2268e1424aaed02085518afa02d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-filesystem/zipball/326ef1c1edf90f52ceec2965ff240a8d93c1ba63",
-                "reference": "326ef1c1edf90f52ceec2965ff240a8d93c1ba63",
+                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/e7d13b2c7e2f2268e1424aaed02085518afa02d9",
+                "reference": "e7d13b2c7e2f2268e1424aaed02085518afa02d9",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "php": "^8.0",
-                "symfony/finder": "^4.4 || ^5.4 || ^6.0"
+                "ext-pcre": "*",
+                "php": ">=5.3.0"
             },
-            "conflict": {
-                "codeception/codeception": "<5.0"
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "MatthiasMullie\\PathConverter\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2480,507 +2642,476 @@
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
+                    "name": "Matthias Mullie",
+                    "email": "pathconverter@mullie.eu",
+                    "homepage": "http://www.mullie.eu",
+                    "role": "Developer"
                 }
             ],
-            "description": "Codeception module for testing local filesystem",
-            "homepage": "https://codeception.com/",
+            "description": "Relative path converter",
+            "homepage": "http://github.com/matthiasmullie/path-converter",
             "keywords": [
-                "codeception",
-                "filesystem"
+                "converter",
+                "path",
+                "paths",
+                "relative"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-filesystem/issues",
-                "source": "https://github.com/Codeception/module-filesystem/tree/3.0.0"
+                "issues": "https://github.com/matthiasmullie/path-converter/issues",
+                "source": "https://github.com/matthiasmullie/path-converter/tree/1.1.3"
             },
-            "time": "2022-03-14T18:48:55+00:00"
+            "time": "2019-02-05T23:41:09+00:00"
         },
         {
-            "name": "codeception/module-phalcon5",
-            "version": "v2.0.0",
+            "name": "myclabs/deep-copy",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-phalcon5.git",
-                "reference": "c331afda2f4c3cd94f78f3efa0370b555ab2489b"
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-phalcon5/zipball/c331afda2f4c3cd94f78f3efa0370b555ab2489b",
-                "reference": "c331afda2f4c3cd94f78f3efa0370b555ab2489b",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "^5.0.0-RC1",
-                "codeception/module-asserts": "^3.0",
-                "codeception/module-db": "^3.0",
-                "codeception/module-phpbrowser": "^3.0",
-                "ext-json": "*",
-                "php": ">=8.0"
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
-                "codeception/util-robohelpers": "dev-master",
-                "phalcon/ide-stubs": "^5.0.0RC1",
-                "squizlabs/php_codesniffer": "^3.6",
-                "vimeo/psalm": "^4.23",
-                "vlucas/phpdotenv": "^5.4"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Phalcon Team",
-                    "email": "team@phalcon.io",
-                    "homepage": "https://phalcon.io/en/team"
-                },
-                {
-                    "name": "Codeception Team",
-                    "email": "team@codeception.com",
-                    "homepage": "https://codeception.com/"
-                }
-            ],
-            "description": "Codeception module for Phalcon 5 framework",
-            "homepage": "https://codeception.com/",
+            "description": "Create deep copies (clones) of your objects",
             "keywords": [
-                "codeception",
-                "phalcon",
-                "phalcon5"
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-phalcon5/issues",
-                "source": "https://github.com/Codeception/module-phalcon5/tree/v2.0.0"
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
-            "time": "2022-06-03T15:18:31+00:00"
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
-            "name": "codeception/module-phpbrowser",
-            "version": "3.0.0",
+            "name": "nikic/php-parser",
+            "version": "v5.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-phpbrowser.git",
-                "reference": "8e1fdcc85e182e6b61399b35a35a562862c3be62"
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/8e1fdcc85e182e6b61399b35a35a562862c3be62",
-                "reference": "8e1fdcc85e182e6b61399b35a35a562862c3be62",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/044a6a392ff8ad0d61f14370a5fbbd0a0107152f",
+                "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "*@dev",
-                "codeception/lib-innerbrowser": "*@dev",
                 "ext-json": "*",
-                "guzzlehttp/guzzle": "^7.4",
-                "php": "^8.0",
-                "symfony/browser-kit": "^5.4 || ^6.0"
-            },
-            "conflict": {
-                "codeception/codeception": "<5.0",
-                "codeception/lib-innerbrowser": "<3.0"
+                "ext-tokenizer": "*",
+                "php": ">=7.4"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^3.199",
-                "codeception/module-rest": "^2.0 || *@dev",
-                "ext-curl": "*"
-            },
-            "suggest": {
-                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^9.0"
             },
+            "bin": [
+                "bin/php-parse"
+            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
+                    "name": "Nikita Popov"
                 }
             ],
-            "description": "Codeception module for testing web application over HTTP",
-            "homepage": "https://codeception.com/",
+            "description": "A PHP parser written in PHP",
             "keywords": [
-                "codeception",
-                "functional-testing",
-                "http"
+                "parser",
+                "php"
             ],
             "support": {
-                "issues": "https://github.com/Codeception/module-phpbrowser/issues",
-                "source": "https://github.com/Codeception/module-phpbrowser/tree/3.0.0"
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.8.0"
             },
-            "time": "2022-02-19T18:22:27+00:00"
+            "time": "2026-07-04T14:30:18+00:00"
         },
         {
-            "name": "codeception/module-rest",
-            "version": "3.3.0",
+            "name": "pds/composer-script-names",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/module-rest.git",
-                "reference": "57b35f9732bcebd744119c054fdb1b82345147a7"
+                "url": "https://github.com/php-pds/composer-script-names.git",
+                "reference": "e6a78aaeaee7cef82a995718ab2f5d0445ef8073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-rest/zipball/57b35f9732bcebd744119c054fdb1b82345147a7",
-                "reference": "57b35f9732bcebd744119c054fdb1b82345147a7",
+                "url": "https://api.github.com/repos/php-pds/composer-script-names/zipball/e6a78aaeaee7cef82a995718ab2f5d0445ef8073",
+                "reference": "e6a78aaeaee7cef82a995718ab2f5d0445ef8073",
                 "shasum": ""
             },
-            "require": {
-                "codeception/codeception": "^5.0.0-alpha2",
-                "codeception/lib-xml": "^1.0",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "justinrainbow/json-schema": "~5.2.9",
-                "php": "^8.0",
-                "softcreatr/jsonpath": "^0.8"
-            },
-            "conflict": {
-                "codeception/codeception": "<5.0.0-alpha3"
-            },
-            "require-dev": {
-                "codeception/lib-innerbrowser": "^3.0",
-                "codeception/stub": "^4.0",
-                "codeception/util-universalframework": "^1.0",
-                "ext-libxml": "*",
-                "ext-simplexml": "*"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "For using AWS Auth"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
+            "type": "standard",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gintautas Miselis"
-                }
-            ],
-            "description": "REST module for Codeception",
-            "homepage": "https://codeception.com/",
-            "keywords": [
-                "codeception",
-                "rest"
+                "CC-BY-SA-4.0"
             ],
+            "description": "Standard for Composer script names.",
+            "homepage": "https://github.com/php-pds/composer-script-names",
             "support": {
-                "issues": "https://github.com/Codeception/module-rest/issues",
-                "source": "https://github.com/Codeception/module-rest/tree/3.3.0"
+                "issues": "https://github.com/php-pds/composer-script-names/issues",
+                "source": "https://github.com/php-pds/composer-script-names/tree/1.0.0"
             },
-            "time": "2022-08-22T07:10:02+00:00"
+            "time": "2023-04-06T13:42:16+00:00"
         },
         {
-            "name": "codeception/stub",
-            "version": "4.0.2",
+            "name": "pds/skeleton",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "18a148dacd293fc7b044042f5aa63a82b08bff5d"
+                "url": "https://github.com/php-pds/skeleton.git",
+                "reference": "95e476e5d629eadacbd721c5a9553e537514a231"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/18a148dacd293fc7b044042f5aa63a82b08bff5d",
-                "reference": "18a148dacd293fc7b044042f5aa63a82b08bff5d",
+                "url": "https://api.github.com/repos/php-pds/skeleton/zipball/95e476e5d629eadacbd721c5a9553e537514a231",
+                "reference": "95e476e5d629eadacbd721c5a9553e537514a231",
                 "shasum": ""
             },
-            "require": {
-                "php": "^7.4 | ^8.0",
-                "phpunit/phpunit": "^8.4 | ^9.0 | ^10.0 | 10.0.x-dev"
-            },
-            "require-dev": {
-                "consolidation/robo": "^3.0"
-            },
-            "type": "library",
+            "bin": [
+                "bin/pds-skeleton"
+            ],
+            "type": "standard",
             "autoload": {
                 "psr-4": {
-                    "Codeception\\": "src/"
+                    "Pds\\Skeleton\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "CC-BY-SA-4.0"
             ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "description": "Standard for PHP package skeletons.",
+            "homepage": "https://github.com/php-pds/skeleton",
             "support": {
-                "issues": "https://github.com/Codeception/Stub/issues",
-                "source": "https://github.com/Codeception/Stub/tree/4.0.2"
+                "issues": "https://github.com/php-pds/skeleton/issues",
+                "source": "https://github.com/php-pds/skeleton/tree/1.x"
             },
-            "time": "2022-01-31T19:25:15+00:00"
+            "time": "2017-01-25T23:30:41+00:00"
         },
         {
-            "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.5",
+            "name": "phalcon/cli-options-parser",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d"
+                "url": "https://github.com/phalcon/cli-options-parser.git",
+                "reference": "ec4d4cd0b7e61046b88957a4028ad01dfa14f4e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d",
-                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d",
+                "url": "https://api.github.com/repos/phalcon/cli-options-parser/zipball/ec4d4cd0b7e61046b88957a4028ad01dfa14f4e6",
+                "reference": "ec4d4cd0b7e61046b88957a4028ad01dfa14f4e6",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.1.0 || ^2.0",
-                "php": "^7 || ^8"
-            },
-            "replace": {
-                "ocramius/package-versions": "1.11.99"
+                "php": ">=8.0"
             },
             "require-dev": {
-                "composer/composer": "^1.9.3 || ^2.0@dev",
-                "ext-zip": "^1.13",
-                "phpunit/phpunit": "^6.5 || ^7"
+                "pds/skeleton": "^1.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.6",
+                "squizlabs/php_codesniffer": "^3.7"
             },
-            "type": "composer-plugin",
+            "type": "library",
             "extra": {
-                "class": "PackageVersions\\Installer",
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "1.1-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
+                    "Phalcon\\Cop\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
+                    "name": "Phalcon Team",
+                    "email": "team@phalconphp.com",
+                    "homepage": "https://phalconphp.com/en/team"
                 },
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
+                    "name": "Contributors",
+                    "homepage": "https://github.com/phalcon/cli-options-parser/graphs/contributors"
                 }
             ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+            "description": "Command line arguments/options parser.",
+            "homepage": "https://phalconphp.com",
+            "keywords": [
+                "argparse",
+                "cli",
+                "command",
+                "command-line",
+                "getopt",
+                "line",
+                "option",
+                "optparse",
+                "parser",
+                "terminal"
+            ],
             "support": {
-                "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5"
+                "discord": "https://phalcon.io/discord/",
+                "issues": "https://github.com/phalcon/cli-options-parser/issues",
+                "source": "https://github.com/phalcon/cli-options-parser"
             },
             "funding": [
                 {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
+                    "url": "https://github.com/phalcon",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-01-17T14:14:24+00:00"
+            "time": "2023-11-24T16:04:00+00:00"
         },
         {
-            "name": "composer/pcre",
-            "version": "3.0.0",
+            "name": "phalcon/ide-stubs",
+            "version": "v5.16.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
+                "url": "https://github.com/phalcon/ide-stubs.git",
+                "reference": "3eea65770216ee93d349802f6e8d8711478d9a5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
-                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/3eea65770216ee93d349802f6e8d8711478d9a5c",
+                "reference": "3eea65770216ee93d349802f6e8d8711478d9a5c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
+                "pds/composer-script-names": "^1.0",
+                "pds/skeleton": "^1.0",
+                "squizlabs/php_codesniffer": "^4.0",
+                "vimeo/psalm": "^6.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
+                    "name": "Phalcon Team",
+                    "email": "team@phalcon.io",
+                    "homepage": "https://phalcon.io/en-us/team"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors"
                 }
             ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.",
+            "homepage": "https://phalcon.io",
             "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
+                "Devtools",
+                "Eclipse",
+                "autocomplete",
+                "ide",
+                "netbeans",
+                "phalcon",
+                "phpstorm",
+                "stub",
+                "stubs"
             ],
             "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.0.0"
+                "discussions": "https://phalcon.io/discussions/",
+                "issues": "https://github.com/phalcon/ide-stubs/issues",
+                "source": "https://github.com/phalcon/ide-stubs"
             },
             "funding": [
                 {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
+                    "url": "https://github.com/phalcon",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-02-25T20:21:48+00:00"
+            "time": "2026-06-22T18:56:53+00:00"
         },
         {
-            "name": "composer/semver",
-            "version": "3.3.2",
+            "name": "phalcon/phalcon",
+            "version": "v6.0.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+                "url": "https://github.com/phalcon/phalcon.git",
+                "reference": "17f4299d3bdf46487638fb6869fedca65396f3b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "url": "https://api.github.com/repos/phalcon/phalcon/zipball/17f4299d3bdf46487638fb6869fedca65396f3b2",
+                "reference": "17f4299d3bdf46487638fb6869fedca65396f3b2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "ext-fileinfo": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-pdo": "*",
+                "ext-xml": "*",
+                "matthiasmullie/minify": "^1.3",
+                "phalcon/traits": "^4.0",
+                "php": ">=8.1 <9.0",
+                "psr/event-dispatcher": "^1.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "ext-gettext": "*",
+                "ext-yaml": "*",
+                "friendsofphp/php-cs-fixer": "^3.95",
+                "pds/composer-script-names": "^1.0",
+                "pds/skeleton": "^1.0",
+                "phalcon/phql": "1.0.x-dev",
+                "phalcon/talon": "^0.6.0",
+                "phalcon/volt": "1.0.x-dev",
+                "phpbench/phpbench": "^1.4",
+                "phpstan/phpstan": "^2.2",
+                "phpunit/phpunit": "^10.5",
+                "predis/predis": "^3.4",
+                "squizlabs/php_codesniffer": "^4.0",
+                "vlucas/phpdotenv": "^5.6"
             },
+            "suggest": {
+                "ext-apcu": "to use Cache\\Adapter\\Apcu, Storage\\Adapter\\Apcu",
+                "ext-gd": "to use Image\\Adapter\\Gd",
+                "ext-igbinary": "to use Storage\\Serializer\\Igbinary",
+                "ext-imagick": "to use Image\\Adapter\\Imagick",
+                "ext-memcached": "to use Cache\\Adapter\\Libmemcached, Session\\Adapter\\Libmemcached, Storage\\Adapter\\Libmemcached",
+                "ext-openssl": "to use Encryption\\Crypt",
+                "ext-pcntl": "to use signal-based graceful shutdown in Queue\\Consumer\\Worker",
+                "ext-redis": "to use Cache\\Adapter\\Redis, Session\\Adapter\\Redis, Storage\\Adapter\\Redis",
+                "ext-yaml": "to use Config\\Adapter\\Yaml"
+            },
+            "default-branch": true,
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Composer\\Semver\\": "src"
+                    "Phalcon\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "description": "Phalcon Framework",
             "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
+                "framework",
+                "php"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.3.2"
+                "issues": "https://github.com/phalcon/phalcon/issues",
+                "source": "https://github.com/phalcon/phalcon/tree/v6.0.x"
             },
             "funding": [
                 {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
+                    "url": "https://github.com/phalcon",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-04-01T19:23:25+00:00"
+            "time": "2026-07-15T23:27:22+00:00"
         },
         {
-            "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "name": "phalcon/phql",
+            "version": "1.0.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "url": "https://github.com/phalcon/phql.git",
+                "reference": "eb0500b5ca39245576ce6608cf6efcc2ca6df058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/phalcon/phql/zipball/eb0500b5ca39245576ce6608cf6efcc2ca6df058",
+                "reference": "eb0500b5ca39245576ce6608cf6efcc2ca6df058",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1 || ^2 || ^3",
-                "php": "^7.2.5 || ^8.0",
-                "psr/log": "^1 || ^2 || ^3"
+                "ext-mbstring": "*",
+                "php": ">=8.1 <9.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "friendsofphp/php-cs-fixer": "^3.95",
+                "pds/composer-script-names": "^1.0",
+                "pds/skeleton": "^1.0",
+                "phalcon/talon": "^0.6.0 || ^0.7.0",
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "squizlabs/php_codesniffer": "^4.0"
+            },
+            "suggest": {
+                "phalcon/phalcon": "The Phalcon framework this module integrates with"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
+                "files": [
+                    "resources/files/parser.php"
+                ],
                 "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
+                    "Phalcon\\Phql\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2989,405 +3120,338 @@
             ],
             "authors": [
                 {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
+                    "name": "Phalcon Team",
+                    "email": "team@phalcon.io",
+                    "homepage": "https://phalcon.io"
                 }
             ],
-            "description": "Restarts a process without Xdebug.",
+            "description": "Phalcon Query Language (PHQL)",
+            "homepage": "https://phalcon.io",
             "keywords": [
-                "Xdebug",
-                "performance"
+                "framework",
+                "phalcon",
+                "php",
+                "phql",
+                "query",
+                "sql"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "issues": "https://github.com/phalcon/phql/issues",
+                "source": "https://github.com/phalcon/phql"
             },
             "funding": [
                 {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
+                    "url": "https://github.com/phalcon",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2026-07-12T21:11:02+00:00"
         },
         {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
+            "name": "phalcon/talon",
+            "version": "v0.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
+                "url": "https://github.com/phalcon/talon.git",
+                "reference": "b8557e7056395df23ed2634d284b6b54362c4c25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "url": "https://api.github.com/repos/phalcon/talon/zipball/b8557e7056395df23ed2634d284b6b54362c4c25",
+                "reference": "b8557e7056395df23ed2634d284b6b54362c4c25",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "phalcon/cli-options-parser": "^2.0",
+                "php": "^8.1",
+                "symfony/browser-kit": "^6.4 || ^7.0",
+                "symfony/dom-crawler": "^6.4 || ^7.0",
+                "symfony/http-client": "^6.4 || ^7.0",
+                "symfony/mime": "^6.4 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
+                "ext-pdo": "*",
+                "ext-sqlite3": "*",
+                "friendsofphp/php-cs-fixer": "^3",
+                "pds/composer-script-names": "^1",
+                "pds/skeleton": "^1",
+                "phalcon/phalcon": "^6.0@alpha",
+                "phpstan/phpstan": "^2",
+                "phpunit/phpunit": "^10.5",
+                "predis/predis": "^2 || ^3",
+                "squizlabs/php_codesniffer": "^3 || ^4"
+            },
+            "suggest": {
+                "ext-memcached": "For the Services (Memcached) helpers",
+                "ext-phalcon": "Phalcon C extension (^5) - one of ext-phalcon or phalcon/phalcon is required",
+                "phalcon/phalcon": "Phalcon PHP implementation (^6) - alternative to the C extension",
+                "predis/predis": "For the Services (Redis) helpers"
             },
+            "bin": [
+                "bin/talon"
+            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "XdgBaseDir\\": "src/"
+                    "Phalcon\\Talon\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
+            ],
+            "description": "Test harness and Phalcon bootstrapping for PHPUnit and beyond",
+            "keywords": [
+                "harness",
+                "phalcon",
+                "phpunit",
+                "test",
+                "testing"
             ],
-            "description": "implementation of xdg base directory specification for php",
             "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+                "issues": "https://github.com/phalcon/talon/issues",
+                "source": "https://github.com/phalcon/talon/tree/v0.8.0"
             },
-            "time": "2019-12-04T15:06:13+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/phalcon",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2026-07-15T19:50:31+00:00"
         },
         {
-            "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "name": "phalcon/traits",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "url": "https://github.com/phalcon/traits.git",
+                "reference": "4e4412a78475af2d08f7e82e48e577e2a40b6896"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/phalcon/traits/zipball/4e4412a78475af2d08f7e82e48e577e2a40b6896",
+                "reference": "4e4412a78475af2d08f7e82e48e577e2a40b6896",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1 <9.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "friendsofphp/php-cs-fixer": "^3.75",
+                "infection/infection": "^0.29.9",
+                "pds/composer-script-names": "^1.0",
+                "pds/skeleton": "^1.0",
+                "phalcon/talon": "^0.7",
+                "phpstan/phpstan": "^2.2",
+                "phpunit/phpunit": "^10.5",
+                "squizlabs/php_codesniffer": "^4.0"
+            },
+            "suggest": {
+                "ext-apcu": "For Php\\ApcuTrait",
+                "ext-gettext": "For the gettext-based translation helpers",
+                "ext-igbinary": "For Php\\IgbinaryTrait",
+                "ext-msgpack": "For Php\\MsgpackTrait",
+                "ext-yaml": "For Php\\YamlTrait"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Phalcon\\Traits\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
+                    "name": "Phalcon Team",
+                    "email": "team@phalcon.io",
+                    "homepage": "https://phalcon.io/en/team"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/phalcon/traits/graphs/contributors"
                 }
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "description": "Phalcon Framework reusable traits",
+            "homepage": "https://phalcon.io",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "framework",
+                "phalcon",
+                "php",
+                "traits"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "discord": "https://phalcon.io/discord/",
+                "issues": "https://github.com/phalcon/traits/issues",
+                "source": "https://github.com/phalcon/traits"
             },
             "funding": [
                 {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
+                    "url": "https://github.com/phalcon",
+                    "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/phalcon",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2026-07-10T19:24:02+00:00"
         },
         {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
+            "name": "phar-io/manifest",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
                 }
             },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "ISC"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
                 }
             ],
-            "description": "A more advanced JSONRPC implementation",
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-06-11T22:34:44+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
-            "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
+            "name": "phar-io/version",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "*",
-                "squizlabs/php_codesniffer": "^3.1",
-                "vimeo/psalm": "^4.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "LanguageServerProtocol\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "ISC"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "PHP classes for the Language Server Protocol",
-            "keywords": [
-                "language",
-                "microsoft",
-                "php",
-                "server"
-            ],
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
-            },
-            "time": "2022-03-02T22:36:06+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "7.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.9 || ^2.4",
-                "php": "^7.2.5 || ^8.0",
-                "psr/http-client": "^1.0",
-                "symfony/deprecation-contracts": "^2.2 || ^3.0"
-            },
-            "provide": {
-                "psr/http-client-implementation": "1.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
-                "ext-curl": "*",
-                "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
-                "psr/log": "^1.1 || ^2.0 || ^3.0"
-            },
-            "suggest": {
-                "ext-curl": "Required for CURL handler support",
-                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "7.5-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Jeremy Lindblom",
-                    "email": "jeremeamia@gmail.com",
-                    "homepage": "https://github.com/jeremeamia"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 },
                 {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
                 },
                 {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
                 }
             ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "psr-18",
-                "psr-7",
-                "rest",
-                "web service"
-            ],
+            "description": "Library for handling version information and constraints",
             "support": {
-                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-08-28T15:39:27+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
-            "name": "guzzlehttp/promises",
-            "version": "1.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
-            },
+            "name": "phpstan/phpstan",
+            "version": "2.2.5",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0",
+                "reference": "909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.4|^8.0"
             },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
             },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
             "autoload": {
                 "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                }
+                    "bootstrap.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3395,384 +3459,147 @@
             ],
             "authors": [
                 {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
+                    "name": "Ondřej Mirtes"
                 },
                 {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
+                    "name": "Markus Staab"
                 },
                 {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
+                    "name": "Vincent Langlet"
                 }
             ],
-            "description": "Guzzle promises library",
+            "description": "PHPStan - PHP Static Analysis Tool",
             "keywords": [
-                "promise"
+                "dev",
+                "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.2"
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
             },
             "funding": [
                 {
-                    "url": "https://github.com/GrahamCampbell",
+                    "url": "https://github.com/ondrejmirtes",
                     "type": "github"
                 },
                 {
-                    "url": "https://github.com/Nyholm",
+                    "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:55:35+00:00"
+            "time": "2026-07-05T06:31:06+00:00"
         },
         {
-            "name": "guzzlehttp/psr7",
-            "version": "2.4.1",
+            "name": "phpunit/php-code-coverage",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5 || ^8.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
-                "ralouphie/getallheaders": "^3.0"
-            },
-            "provide": {
-                "psr/http-factory-implementation": "1.0",
-                "psr/http-message-implementation": "1.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
-                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
-                },
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://sagikazarmark.hu"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
             "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
+                "coverage",
+                "testing",
+                "xunit"
             ],
             "support": {
-                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
+                    "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-08-28T14:45:39+00:00"
-        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "5.2.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
-                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
-                "json-schema/json-schema-test-suite": "1.2.0",
-                "phpunit/phpunit": "^4.8.35"
-            },
-            "bin": [
-                "bin/validate-json"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "JsonSchema\\": "src/JsonSchema/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
-            },
-            "time": "2022-04-13T08:02:27+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.6.8",
-                "doctrine/common": "^2.13.3 || ^3.2.2",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ],
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
-            },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
-            "name": "netresearch/jsonmapper",
-            "version": "v4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
-                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0"
-            },
-            "time": "2020-12-01T19:48:11+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v4.15.1",
+            "name": "phpunit/php-file-iterator",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^10.0"
             },
-            "bin": [
-                "bin/php-parse"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "PhpParser\\": "lib/PhpParser"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3780,165 +3607,58 @@
             ],
             "authors": [
                 {
-                    "name": "Nikita Popov"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "A PHP parser written in PHP",
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
             "keywords": [
-                "parser",
-                "php"
+                "filesystem",
+                "iterator"
             ],
             "support": {
-                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
-            },
-            "time": "2022-09-04T07:30:47+00:00"
-        },
-        {
-            "name": "openlss/lib-array2xml",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nullivex/lib-array2xml.git",
-                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
-                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "LSS": ""
-                }
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Bryan Tong",
-                    "email": "bryan@nullivex.com",
-                    "homepage": "https://www.nullivex.com"
-                },
+            "funding": [
                 {
-                    "name": "Tony Butler",
-                    "email": "spudz76@gmail.com",
-                    "homepage": "https://www.nullivex.com"
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
                 }
             ],
-            "description": "Array2XML conversion library credit to lalit.org",
-            "homepage": "https://www.nullivex.com",
-            "keywords": [
-                "array",
-                "array conversion",
-                "xml",
-                "xml conversion"
-            ],
-            "support": {
-                "issues": "https://github.com/nullivex/lib-array2xml/issues",
-                "source": "https://github.com/nullivex/lib-array2xml/tree/master"
-            },
-            "time": "2019-03-29T20:06:56+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
-            "name": "phalcon/ide-stubs",
-            "version": "v5.0.1",
+            "name": "phpunit/php-invoker",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phalcon/ide-stubs.git",
-                "reference": "6009efb3af9300d2c24dfc06c5d0850b9b88f641"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/6009efb3af9300d2c24dfc06c5d0850b9b88f641",
-                "reference": "6009efb3af9300d2c24dfc06c5d0850b9b88f641",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "squizlabs/php_codesniffer": "3.*",
-                "vimeo/psalm": "^3.4"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Phalcon Team",
-                    "email": "team@phalcon.io",
-                    "homepage": "https://phalcon.io/en-us/team"
-                },
-                {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors"
-                }
-            ],
-            "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.",
-            "homepage": "https://phalcon.io",
-            "keywords": [
-                "Devtools",
-                "Eclipse",
-                "autocomplete",
-                "ide",
-                "netbeans",
-                "phalcon",
-                "phpstorm",
-                "stub",
-                "stubs"
-            ],
-            "support": {
-                "forum": "https://forum.phalcon.io/",
-                "issues": "https://github.com/phalcon/ide-stubs/issues",
-                "source": "https://github.com/phalcon/ide-stubs"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/phalcon",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/phalcon",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2022-09-23T18:22:45+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
-                "shasum": ""
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^10.0"
             },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "ext-xmlwriter": "*",
-                "phar-io/version": "^3.0.1",
-                "php": "^7.2 || ^8.0"
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -3951,47 +3671,55 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de",
-                    "role": "Developer"
+                    "role": "lead"
                 }
             ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
             "support": {
-                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
-            "name": "phar-io/version",
-            "version": "3.2.1",
+            "name": "phpunit/php-text-template",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
-                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -4002,170 +3730,208 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de",
-                    "role": "Developer"
+                    "role": "lead"
                 }
             ],
-            "description": "Library for handling version information and constraints",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
             "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
-            "time": "2022-02-21T01:04:05+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
+            "name": "phpunit/php-timer",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-2.x": "2.x-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
-            "time": "2020-06-27T09:03:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "name": "phpunit/phpunit",
+            "version": "10.5.64",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "0e8c1d19cea35ad97d4887f363d07c78e30fbf06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e8c1d19cea35ad97d4887f363d07c78e30fbf06",
+                "reference": "0e8c1d19cea35ad97d4887f363d07c78e30fbf06",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
                 "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.13.4",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.16",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.5",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.4",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.1",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
             },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+            "suggest": {
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
+            "bin": [
+                "phpunit"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.x-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.64"
             },
-            "time": "2021-10-19T17:43:47+00:00"
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsoring.html",
+                    "type": "other"
+                }
+            ],
+            "time": "2026-07-06T14:50:35+00:00"
         },
         {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
+                "php": ">=7.2.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
+                    "Psr\\EventDispatcher\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4174,518 +3940,497 @@
             ],
             "authors": [
                 {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
             },
-            "time": "2022-03-15T21:29:03+00:00"
+            "time": "2019-01-08T18:20:26+00:00"
         },
         {
-            "name": "phpstan/phpstan",
-            "version": "1.8.6",
+            "name": "react/cache",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618"
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0"
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
             },
-            "conflict": {
-                "phpstan/phpstan-shim": "*"
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
             },
-            "bin": [
-                "phpstan",
-                "phpstan.phar"
-            ],
             "type": "library",
             "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "PHPStan - PHP Static Analysis Tool",
-            "keywords": [
-                "dev",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.6"
-            },
-            "funding": [
+            "authors": [
                 {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
                 },
                 {
-                    "url": "https://github.com/phpstan",
-                    "type": "github"
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-09-23T09:54:39+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "9.2.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.14",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "description": "Async, Promise-based cache interface for ReactPHP",
             "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-08-30T12:24:04+00:00"
+            "time": "2022-11-30T15:59:55+00:00"
         },
         {
-            "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "name": "react/child-process",
+            "version": "v0.6.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/970f0e71945556422ee4570ccbabaedc3cf04ad3",
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\ChildProcess\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "description": "Event-driven library for executing child processes with ReactPHP.",
             "keywords": [
-                "filesystem",
-                "iterator"
+                "event-driven",
+                "process",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.7"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2025-12-23T15:25:20+00:00"
         },
         {
-            "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "name": "react/dns",
+            "version": "v1.14.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/7562c05391f42701c1fccf189c8225fece1cd7c3",
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
             },
             "require-dev": {
-                "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-pcntl": "*"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Invoke callables with a timeout",
-            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "description": "Async DNS resolver for ReactPHP",
             "keywords": [
-                "process"
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.14.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2025-11-18T19:34:28+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "name": "react/event-loop",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
             },
+            "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\EventLoop\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
             "keywords": [
-                "template"
+                "asynchronous",
+                "event-loop"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.6.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2025-11-17T20:46:25+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "name": "react/promise",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
             "keywords": [
-                "timer"
+                "promise",
+                "promises"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2025-08-19T18:57:03+00:00"
         },
         {
-            "name": "phpunit/phpunit",
-            "version": "9.5.24",
+            "name": "react/socket",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
-                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/ef5b17b81f6f60504c539313f94f2d826c5faa08",
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.13",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.1",
-                "sebastian/version": "^3.0.2"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.13",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
             },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3.3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.11"
             },
-            "bin": [
-                "phpunit"
-            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.5-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "src/Framework/Assert/Functions.php"
-                ],
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\Socket\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
             "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.17.0"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/sponsors.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-08-30T07:42:16+00:00"
+            "time": "2025-11-19T20:47:34+00:00"
         },
         {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
+            "name": "react/stream",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
+                    "React\\Stream\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4694,326 +4439,389 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Standard interfaces for event handling.",
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
             "keywords": [
-                "events",
-                "psr",
-                "psr-14"
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
             },
-            "time": "2019-01-08T18:20:26+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
         },
         {
-            "name": "psr/http-client",
-            "version": "1.0.1",
+            "name": "sebastian/cli-parser",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Client\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Common interface for HTTP clients",
-            "homepage": "https://github.com/php-fig/http-client",
-            "keywords": [
-                "http",
-                "http-client",
-                "psr",
-                "psr-18"
-            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T07:12:49+00:00"
         },
         {
-            "name": "psr/http-factory",
-            "version": "1.0.1",
+            "name": "sebastian/code-unit",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
-            "keywords": [
-                "factory",
-                "http",
-                "message",
-                "psr",
-                "psr-17",
-                "psr-7",
-                "request",
-                "response"
-            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:58:43+00:00"
         },
         {
-            "name": "psr/http-message",
-            "version": "1.0.1",
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
-            "name": "psy/psysh",
-            "version": "v0.11.8",
+            "name": "sebastian/comparator",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "f455acf3645262ae389b10e9beba0c358aa6994e"
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e",
-                "reference": "f455acf3645262ae389b10e9beba0c358aa6994e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55dfef806eb7dfeb6e7a6935601fef866f8ca48d",
+                "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "ext-tokenizer": "*",
-                "nikic/php-parser": "^4.0 || ^3.1",
-                "php": "^8.0 || ^7.0.8",
-                "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
-                "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
-            },
-            "conflict": {
-                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.2"
-            },
-            "suggest": {
-                "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
-                "ext-pdo-sqlite": "The doc command requires SQLite to work.",
-                "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+                "phpunit/phpunit": "^10.5"
             },
-            "bin": [
-                "bin/psysh"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.11.x-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "Psy\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Justin Hileman",
-                    "email": "justin@justinhileman.info",
-                    "homepage": "http://justinhileman.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
                 }
             ],
-            "description": "An interactive shell for modern PHP.",
-            "homepage": "http://psysh.org",
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
-                "REPL",
-                "console",
-                "interactive",
-                "shell"
+                "comparator",
+                "compare",
+                "equality"
             ],
             "support": {
-                "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.8"
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.5"
             },
-            "time": "2022-07-28T14:25:11+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-01-24T09:25:16+00:00"
         },
         {
-            "name": "ralouphie/getallheaders",
-            "version": "3.0.3",
+            "name": "sebastian/complexity",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^5 || ^6.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.2-dev"
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/getallheaders.php"
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "A polyfill for getallheaders.",
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
-                "issues": "https://github.com/ralouphie/getallheaders/issues",
-                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
-            "time": "2019-03-08T08:55:37+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
-            "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "name": "sebastian/diff",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -5028,15 +4836,25 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
-            "description": "Library for parsing CLI options",
-            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -5044,32 +4862,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
-            "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "name": "sebastian/environment",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -5084,15 +4905,20 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Collection of value objects that represent the PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "https://github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -5100,32 +4926,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "name": "sebastian/exporter",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "0735b90f4da94969541dac1da743446e276defa6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0735b90f4da94969541dac1da743446e276defa6",
+                "reference": "0735b90f4da94969541dac1da743446e276defa6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -5141,48 +4969,82 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.4"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-09-28T05:30:19+00:00"
+            "time": "2025-09-24T06:09:11+00:00"
         },
         {
-            "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "name": "sebastian/global-state",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -5198,30 +5060,17 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
                 }
             ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "description": "Snapshotting of global state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
-                "comparator",
-                "compare",
-                "equality"
+                "global state"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -5229,33 +5078,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
         },
         {
-            "name": "sebastian/complexity",
+            "name": "sebastian/lines-of-code",
             "version": "2.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
-                "php": ">=7.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -5274,11 +5123,12 @@
                     "role": "lead"
                 }
             ],
-            "description": "Library for calculating the complexity of PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -5286,33 +5136,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
-            "name": "sebastian/diff",
-            "version": "4.0.4",
+            "name": "sebastian/object-enumerator",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5328,23 +5179,13 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
                 }
             ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
             },
             "funding": [
                 {
@@ -5352,35 +5193,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-02-03T07:08:32+00:00"
         },
         {
-            "name": "sebastian/environment",
-            "version": "5.1.4",
+            "name": "sebastian/object-reflector",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-posix": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5398,16 +5236,11 @@
                     "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
             },
             "funding": [
                 {
@@ -5415,34 +5248,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T07:06:18+00:00"
         },
         {
-            "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "name": "sebastian/recursion-context",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a",
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5463,67 +5294,62 @@
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
                 },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
                 }
             ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "https://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2025-08-10T07:50:56+00:00"
         },
         {
-            "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "name": "sebastian/type",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5538,17 +5364,15 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -5556,33 +5380,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
-            "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "name": "sebastian/version",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5601,11 +5421,11 @@
                     "role": "lead"
                 }
             ],
-            "description": "Library for counting the lines of code in PHP source code",
-            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
             "funding": [
                 {
@@ -5613,378 +5433,517 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
-            "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
+            "name": "squizlabs/php_codesniffer",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5",
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=7.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"
             },
+            "bin": [
+                "bin/phpcbf",
+                "bin/phpcs"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "name": "Greg Sherwood",
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://github.com/PHPCSStandards",
                     "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2020-10-26T13:12:34+00:00"
+            "time": "2025-11-10T16:43:36+00:00"
         },
         {
-            "name": "sebastian/object-reflector",
-            "version": "2.0.4",
+            "name": "symfony/browser-kit",
+            "version": "v6.4.42",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "94d0d5413126d81bffcd0de509fb9daf0363babd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/94d0d5413126d81bffcd0de509fb9daf0363babd",
+                "reference": "94d0d5413126d81bffcd0de509fb9daf0363babd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1",
+                "symfony/dom-crawler": "^5.4|^6.0|^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/mime": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+                "source": "https://github.com/symfony/browser-kit/tree/v6.4.42"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-10-26T13:14:26+00:00"
+            "time": "2026-06-08T07:06:12+00:00"
         },
         {
-            "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "name": "symfony/dom-crawler",
+            "version": "v6.4.40",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "7e65f76c28f5ed8d933f2c86698a3e2bf0de1b10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7e65f76c28f5ed8d933f2c86698a3e2bf0de1b10",
+                "reference": "7e65f76c28f5ed8d933f2c86698a3e2bf0de1b10",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "masterminds/html5": "^2.6",
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "symfony/css-selector": "^5.4|^6.0|^7.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
+                "psr-4": {
+                    "Symfony\\Component\\DomCrawler\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "description": "Eases DOM navigation for HTML and XML documents",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.40"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2026-05-19T20:33:22+00:00"
         },
         {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "name": "symfony/event-dispatcher",
+            "version": "v6.4.37",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "2e3bf817ba9347341ab15926700fb6320367c0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2e3bf817ba9347341ab15926700fb6320367c0e1",
+                "reference": "2e3bf817ba9347341ab15926700fb6320367c0e1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.37"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2026-04-13T14:11:12+00:00"
         },
         {
-            "name": "sebastian/type",
-            "version": "3.2.0",
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c7de7a00ffb67842132da02ea92988a39ccd9f4e",
+                "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Collection of value objects that represent the types of the PHP type system",
-            "homepage": "https://github.com/sebastianbergmann/type",
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.1"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2026-06-05T06:23:12+00:00"
         },
         {
-            "name": "sebastian/version",
-            "version": "3.0.2",
+            "name": "symfony/finder",
+            "version": "v6.4.42",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "0b73dac42493acbadbba644207a715b254e9b029"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/0b73dac42493acbadbba644207a715b254e9b029",
+                "reference": "0b73dac42493acbadbba644207a715b254e9b029",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
             },
+            "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "source": "https://github.com/symfony/finder/tree/v6.4.42"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2026-06-26T15:18:24+00:00"
         },
         {
-            "name": "softcreatr/jsonpath",
-            "version": "0.8.0",
+            "name": "symfony/http-client",
+            "version": "v6.4.42",
             "source": {
                 "type": "git",
-                "url": "https://github.com/SoftCreatR/JSONPath.git",
-                "reference": "c2f4a164c2d9be754e2d47811157a31fe93067d0"
+                "url": "https://github.com/symfony/http-client.git",
+                "reference": "b71b312ca0f211fbb19a20a51bde50fbefb66a99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/c2f4a164c2d9be754e2d47811157a31fe93067d0",
-                "reference": "c2f4a164c2d9be754e2d47811157a31fe93067d0",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/b71b312ca0f211fbb19a20a51bde50fbefb66a99",
+                "reference": "b71b312ca0f211fbb19a20a51bde50fbefb66a99",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "php": ">=8.0"
+                "php": ">=8.1",
+                "psr/log": "^1|^2|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/http-client-contracts": "~3.4.4|^3.5.2",
+                "symfony/polyfill-php83": "^1.29",
+                "symfony/service-contracts": "^2.5|^3"
             },
-            "replace": {
-                "flow/jsonpath": "*"
+            "conflict": {
+                "php-http/discovery": "<1.15",
+                "symfony/http-foundation": "<6.3"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "*",
+                "php-http/client-implementation": "*",
+                "psr/http-client-implementation": "1.0",
+                "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5",
-                "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.6"
+                "amphp/amp": "^2.5",
+                "amphp/http-client": "^4.2.1",
+                "amphp/http-tunnel": "^1.0",
+                "amphp/socket": "^1.1",
+                "guzzlehttp/promises": "^1.4|^2.0",
+                "nyholm/psr7": "^1.0",
+                "php-http/httplug": "^1.0|^2.0",
+                "psr/http-client": "^1.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Flow\\JSONPath\\": "src/"
-                }
+                    "Symfony\\Component\\HttpClient\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5992,124 +5951,165 @@
             ],
             "authors": [
                 {
-                    "name": "Stephen Frank",
-                    "email": "stephen@flowsa.com",
-                    "homepage": "https://prismaticbytes.com",
-                    "role": "Developer"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
-                    "name": "Sascha Greuel",
-                    "email": "hello@1-2.dev",
-                    "homepage": "https://1-2.dev",
-                    "role": "Developer"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "JSONPath implementation for parsing, searching and flattening arrays",
+            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "http"
+            ],
             "support": {
-                "email": "hello@1-2.dev",
-                "forum": "https://github.com/SoftCreatR/JSONPath/discussions",
-                "issues": "https://github.com/SoftCreatR/JSONPath/issues",
-                "source": "https://github.com/SoftCreatR/JSONPath"
+                "source": "https://github.com/symfony/http-client/tree/v6.4.42"
             },
             "funding": [
                 {
-                    "url": "https://ecologi.com/softcreatr?r=61212ab3fc69b8eb8a2014f4",
+                    "url": "https://symfony.com/sponsor",
                     "type": "custom"
                 },
                 {
-                    "url": "https://github.com/softcreatr",
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-01-31T14:22:15+00:00"
+            "time": "2026-06-12T09:42:32+00:00"
         },
         {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.7.1",
+            "name": "symfony/http-client-contracts",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
+                "url": "https://github.com/symfony/http-client-contracts.git",
+                "reference": "41fc42d276aeff21192465331ebbab7d83a743c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/41fc42d276aeff21192465331ebbab7d83a743c0",
+                "reference": "41fc42d276aeff21192465331ebbab7d83a743c0",
                 "shasum": ""
             },
             "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "php": ">=8.1"
             },
-            "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
-            ],
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\HttpClient\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "description": "Generic abstractions related to HTTP clients",
+            "homepage": "https://symfony.com",
             "keywords": [
-                "phpcs",
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
                 "standards"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.7.1"
             },
-            "time": "2022-06-18T07:21:10+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-06-05T06:23:12+00:00"
         },
         {
-            "name": "symfony/browser-kit",
-            "version": "v6.0.11",
+            "name": "symfony/mime",
+            "version": "v6.4.41",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "92e4b59bf2ef0f7a01d2620c4c87108e5c143d36"
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "5575d37f8841e4e31d5df79ab3db078ae557ff8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/92e4b59bf2ef0f7a01d2620c4c87108e5c143d36",
-                "reference": "92e4b59bf2ef0f7a01d2620c4c87108e5c143d36",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/5575d37f8841e4e31d5df79ab3db078ae557ff8e",
+                "reference": "5575d37f8841e4e31d5df79ab3db078ae557ff8e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/dom-crawler": "^5.4|^6.0"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
             },
-            "require-dev": {
-                "symfony/css-selector": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/mime": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0"
+            "conflict": {
+                "egulias/email-validator": "~3.0.0",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/mailer": "<5.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
-            "suggest": {
-                "symfony/process": ""
+            "require-dev": {
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
+                "league/html-to-markdown": "^5.0",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.4|^7.0",
+                "symfony/property-access": "^5.4|^6.0|^7.0",
+                "symfony/property-info": "^5.4|^6.0|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
+                    "Symfony\\Component\\Mime\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6129,10 +6129,14 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
+            "description": "Allows manipulating MIME messages",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "mime",
+                "mime-type"
+            ],
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v6.0.11"
+                "source": "https://github.com/symfony/mime/tree/v6.4.41"
             },
             "funding": [
                 {
@@ -6143,34 +6147,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-27T15:50:26+00:00"
+            "time": "2026-05-23T14:40:34+00:00"
         },
         {
-            "name": "symfony/css-selector",
-            "version": "v6.0.11",
+            "name": "symfony/options-resolver",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9"
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "eeaa8cabe54c7b3516938c72a4a161c0cc80a34f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab2746acddc4f03a7234c8441822ac5d5c63efe9",
-                "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/eeaa8cabe54c7b3516938c72a4a161c0cc80a34f",
+                "reference": "eeaa8cabe54c7b3516938c72a4a161c0cc80a34f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
+                    "Symfony\\Component\\OptionsResolver\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6185,19 +6194,20 @@
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
                 },
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Converts CSS selectors to XPath expressions",
+            "description": "Provides an improved replacement for the array_replace PHP function",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.0.11"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -6208,50 +6218,52 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T17:10:44+00:00"
+            "time": "2025-11-12T13:06:53+00:00"
         },
         {
-            "name": "symfony/dom-crawler",
-            "version": "v6.0.12",
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "c69331ec49913a91f32737e29ed451ecee8cbea2"
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "dc21118016c039a66235cf93d96b435ffb282412"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c69331ec49913a91f32737e29ed451ecee8cbea2",
-                "reference": "c69331ec49913a91f32737e29ed451ecee8cbea2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/dc21118016c039a66235cf93d96b435ffb282412",
+                "reference": "dc21118016c039a66235cf93d96b435ffb282412",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "masterminds/html5": "<2.6"
-            },
-            "require-dev": {
-                "masterminds/html5": "^2.6",
-                "symfony/css-selector": "^5.4|^6.0"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
-                "symfony/css-selector": ""
+                "ext-intl": "For best performance"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6259,18 +6271,30 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Eases DOM navigation for HTML and XML documents",
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.0.12"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -6281,59 +6305,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-04T19:18:27+00:00"
+            "time": "2026-05-25T15:22:23+00:00"
         },
         {
-            "name": "symfony/event-dispatcher",
-            "version": "v6.0.9",
+            "name": "symfony/polyfill-php81",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "5c85b58422865d42c6eb46f7693339056db098a8"
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8",
-                "reference": "5c85b58422865d42c6eb46f7693339056db098a8",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
+                "reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/event-dispatcher-contracts": "^2|^3"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<5.4"
-            },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0|3.0"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
+                    "Symfony\\Polyfill\\Php81\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6342,18 +6357,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -6364,48 +6385,51 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-05T16:45:52+00:00"
+            "time": "2026-05-26T12:45:58+00:00"
         },
         {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.2",
+            "name": "symfony/polyfill-php83",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/796a26abb75ce49f3a84433cd81bf1009d73d5f8",
+                "reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "psr/event-dispatcher": "^1"
-            },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Contracts\\EventDispatcher\\": ""
-                }
+                    "Symfony\\Polyfill\\Php83\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6421,18 +6445,16 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Generic abstractions related to dispatching event",
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -6443,37 +6465,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2026-05-27T06:51:48+00:00"
         },
         {
-            "name": "symfony/finder",
-            "version": "v6.0.11",
+            "name": "symfony/polyfill-php84",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1"
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/09cb683ba5720385ea6966e5e06be2a34f2568b1",
-                "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
+                "reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
+                    "Symfony\\Polyfill\\Php84\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6482,18 +6517,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Finds files and directories via an intuitive fluent interface",
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.0.11"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -6504,57 +6545,38 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-29T07:39:48+00:00"
+            "time": "2026-05-26T12:51:13+00:00"
         },
         {
-            "name": "symfony/var-dumper",
-            "version": "v6.0.11",
+            "name": "symfony/process",
+            "version": "v6.4.41",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07"
+                "url": "https://github.com/symfony/process.git",
+                "reference": "c8fc09bdfe9fde9aaa89b415a4477feaccec16a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2672bdc01c1971e3d8879ce153ec4c3621be5f07",
-                "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c8fc09bdfe9fde9aaa89b415a4477feaccec16a7",
+                "reference": "c8fc09bdfe9fde9aaa89b415a4477feaccec16a7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.3",
-                "symfony/console": "<5.4"
-            },
-            "require-dev": {
-                "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/uid": "^5.4|^6.0",
-                "twig/twig": "^2.13|^3.0.4"
-            },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
+                "php": ">=8.1"
             },
-            "bin": [
-                "Resources/bin/var-dump-server"
-            ],
             "type": "library",
             "autoload": {
-                "files": [
-                    "Resources/functions/dump.php"
-                ],
                 "psr-4": {
-                    "Symfony\\Component\\VarDumper\\": ""
+                    "Symfony\\Component\\Process\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6566,22 +6588,18 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "debug",
-                "dump"
-            ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.0.11"
+                "source": "https://github.com/symfony/process/tree/v6.4.41"
             },
             "funding": [
                 {
@@ -6592,47 +6610,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:45:53+00:00"
+            "time": "2026-05-23T13:47:21+00:00"
         },
         {
-            "name": "symfony/yaml",
-            "version": "v6.0.12",
+            "name": "symfony/stopwatch",
+            "version": "v6.4.24",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "8c68efb08b038ec02753da6f16e1601a6ed4ef17"
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/8c68efb08b038ec02753da6f16e1601a6ed4ef17",
-                "reference": "8c68efb08b038ec02753da6f16e1601a6ed4ef17",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b67e94e06a05d9572c2fa354483b3e13e3cb1898",
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "symfony/console": "<5.4"
-            },
-            "require-dev": {
-                "symfony/console": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
+                "php": ">=8.1",
+                "symfony/service-contracts": "^2.5|^3"
             },
-            "bin": [
-                "Resources/bin/yaml-lint"
-            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
+                    "Symfony\\Component\\Stopwatch\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6652,10 +6662,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Loads and dumps YAML files",
+            "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.0.12"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.4.24"
             },
             "funding": [
                 {
@@ -6666,25 +6676,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-02T16:01:06+00:00"
+            "time": "2025-07-10T08:14:14+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c",
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c",
                 "shasum": ""
             },
             "require": {
@@ -6713,7 +6727,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.1"
             },
             "funding": [
                 {
@@ -6721,239 +6735,22 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "vimeo/psalm",
-            "version": "4.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff",
-                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2.4.2",
-                "amphp/byte-stream": "^1.5",
-                "composer/package-versions-deprecated": "^1.8.0",
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0",
-                "dnoegel/php-xdg-base-dir": "^0.1.1",
-                "ext-ctype": "*",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.0.3",
-                "felixfbecker/language-server-protocol": "^1.5",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "nikic/php-parser": "^4.13",
-                "openlss/lib-array2xml": "^1.0",
-                "php": "^7.1|^8",
-                "sebastian/diff": "^3.0 || ^4.0",
-                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
-                "symfony/polyfill-php80": "^1.25",
-                "webmozart/path-util": "^2.3"
-            },
-            "provide": {
-                "psalm/psalm": "self.version"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.2",
-                "brianium/paratest": "^4.0||^6.0",
-                "ext-curl": "*",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpdocumentor/reflection-docblock": "^5",
-                "phpmyadmin/sql-parser": "5.1.0||dev-master",
-                "phpspec/prophecy": ">=1.9.0",
-                "phpunit/phpunit": "^9.0",
-                "psalm/plugin-phpunit": "^0.16",
-                "slevomat/coding-standard": "^7.0",
-                "squizlabs/php_codesniffer": "^3.5",
-                "symfony/process": "^4.3 || ^5.0 || ^6.0",
-                "weirdan/prophecy-shim": "^1.0 || ^2.0"
-            },
-            "suggest": {
-                "ext-curl": "In order to send data to shepherd",
-                "ext-igbinary": "^2.0.5 is required, used to serialize caching data"
-            },
-            "bin": [
-                "psalm",
-                "psalm-language-server",
-                "psalm-plugin",
-                "psalm-refactor",
-                "psalter"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions.php",
-                    "src/spl_object_id.php"
-                ],
-                "psr-4": {
-                    "Psalm\\": "src/Psalm/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Brown"
-                }
-            ],
-            "description": "A static analysis tool for finding errors in PHP applications",
-            "keywords": [
-                "code",
-                "inspection",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.27.0"
-            },
-            "time": "2022-08-31T13:47:09+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
-            },
-            "time": "2022-06-03T18:03:27+00:00"
-        },
-        {
-            "name": "webmozart/path-util",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/path-util.git",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "webmozart/assert": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\PathUtil\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
-            "support": {
-                "issues": "https://github.com/webmozart/path-util/issues",
-                "source": "https://github.com/webmozart/path-util/tree/2.3.0"
-            },
-            "abandoned": "symfony/filesystem",
-            "time": "2015-12-17T08:42:14+00:00"
+            "time": "2025-11-17T20:03:58+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "ext-phalcon": 5,
-        "phalcon/ide-stubs": 5
+        "phalcon/phalcon": 20,
+        "phalcon/phql": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ext-json": "*",
-        "ext-openssl": "*",
-        "ext-phalcon": "^5.0.0RC4"
+        "ext-openssl": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f75fe56..eebdee0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,95 +1,59 @@
-version: '3'
 services:
-  
-  # Application - REST API 8.0
-  application-8.0:
-    build: docker/8.0
-    container_name: rest-api-app-8.0
-    restart: unless-stopped
-    tty: true
-    working_dir: /var/www
-    depends_on:
-      - nginx-8.0
-      - redis
-      - mysql
+  app:
+    build:
+      context: .
+      dockerfile: resources/docker/Dockerfile
+      args:
+        PHP_VERSION: ${PHP_VERSION:-8.4}
+        PHALCON_VARIANT: ${PHALCON_VARIANT:-v5}
+        UID: ${UID:-1000}
+        GID: ${GID:-1000}
+    container_name: ${PROJECT_PREFIX:-rest-api}-app
+    hostname: ${PROJECT_PREFIX:-rest-api}-app
     volumes:
-      - ./:/var/www
-      - ./storage/config/extra.ini:/usr/local/etc/php/conf.d/extra.ini
-    networks:
-      - rest-api-network
-
-  # Application - REST API 8.1
-  application-8.1:
-    build: docker/8.1
-    container_name: rest-api-app-8.1
-    restart: unless-stopped
-    tty: true
-    working_dir: /var/www
+      - .:/srv
+    env_file: .env
     depends_on:
-      - nginx-8.1
-      - redis
-      - mysql
-    volumes:
-      - ./:/var/www
-      - ./storage/config/extra.ini:/usr/local/etc/php/conf.d/extra.ini
-    networks:
-      - rest-api-network
-
-  # Webserver - nginX 8.0
-  nginx-8.0:
-    image: nginx:alpine
-    container_name: rest-api-nginx-8.0
-    restart: unless-stopped
-    tty: true
-    volumes:
-      - ./:/var/www
-      - ./storage/config/nginx/8.0/:/etc/nginx/conf.d/
-    networks:
-      - rest-api-network
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
 
-  # Webserver - nginX 8.0
-  nginx-8.1:
+  nginx:
     image: nginx:alpine
-    container_name: rest-api-nginx-8.1
-    restart: unless-stopped
-    tty: true
+    container_name: ${PROJECT_PREFIX:-rest-api}-nginx
+    hostname: ${PROJECT_PREFIX:-rest-api}-nginx
+    ports:
+      # Host port is configurable (APP_PORT) so multiple apps can coexist;
+      # the container always listens on 80.
+      - "${APP_PORT:-8080}:80"
     volumes:
-      - ./:/var/www
-      - ./storage/config/nginx/8.1/:/etc/nginx/conf.d/
-    networks:
-      - rest-api-network
+      - .:/srv
+      - ./resources/docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      - app
 
-  # Database - Mysql
   mysql:
-    image: mysql:5.7.22
-    container_name: rest-api-mysql
-    restart: unless-stopped
-    tty: true
+    image: mysql:8.0
+    container_name: ${PROJECT_PREFIX:-rest-api}-mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=secret
-      - MYSQL_USER=phalcon
-      - MYSQL_DATABASE=phalcon_api
-      - MYSQL_PASSWORD=secret
-    volumes:
-      - rest-api-volume:/var/lib/mysql/
-      - ./storage/config/my.cnf:/etc/mysql/my.cnf
-    networks:
-      - rest-api-network
+      MYSQL_ROOT_PASSWORD: ${DATA_API_MYSQL_PASS:-secret}
+      MYSQL_DATABASE: ${DATA_API_MYSQL_NAME:-phalcon_api}
+    # No host port published: the app reaches the DB over the internal compose
+    # network as mysql:3306. Not exposed to the host by design.
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-p${DATA_API_MYSQL_PASS:-secret}"]
+      interval: 5s
+      timeout: 5s
+      retries: 12
 
-  # Cache - Redis
   redis:
-    container_name: rest-api-cache
-    image: redis:5-alpine
-    restart: "always"
-    networks:
-      - rest-api-network
-
-# Network
-networks:
-  rest-api-network:
-    driver: bridge
-
-# Volumes
-volumes:
-  rest-api-volume:
-    driver: local
+    image: redis:alpine
+    container_name: ${PROJECT_PREFIX:-rest-api}-redis
+    # No host port published: the app reaches the cache over the internal
+    # compose network as redis:6379. Not exposed to the host by design.
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 12
diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile
deleted file mode 100644
index 82cde1c1..00000000
--- a/docker/8.0/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM composer:latest as composer
-FROM php:8.0-fpm
-
-# Set working directory
-WORKDIR /var/www
-
-LABEL vendor="Phalcon" \
-      maintainer="Phalcon Team <team@phalcon.io>" \
-      description="The PHP image to test the REST API example concepts"
-
-ENV PHALCON_VERSION="5.0.1" \
-    PHP_VERSION="8.0"
-
-# Update
-RUN apt update -y && \
-    apt install -y \
-        apt-utils \
-        gettext \
-        git \
-        libzip-dev \
-        nano \
-        sudo \
-        wget \
-        zip
-
-# PECL Packages
-RUN pecl install -o -f redis && \
-    pecl install phalcon-${PHALCON_VERSION}  \
-      xdebug
-
-# Install PHP extensions
-RUN docker-php-ext-install \
-      gettext \
-      pdo_mysql \
-      zip
-
-# Install PHP extensions
-RUN docker-php-ext-enable \
-      opcache \
-      phalcon \
-      redis \
-      xdebug
-
-# Clear cache
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Add user
-RUN groupadd -g 1000 phalcon
-RUN useradd -u 1000 -ms /bin/bash -g phalcon phalcon
-
-# Composer
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-
-# Copy existing application directory contents
-COPY . /var/www
-
-# Bash script with helper aliases
-COPY ./config/.bashrc /root/.bashrc
-COPY ./config/.bashrc /home/phalcon/.bashrc
-
-# Copy existing application directory permissions
-COPY --chown=phalcon:phalcon . /var/www
-
-# Change current user to phalcon
-USER phalcon
-
-# Expose port 9000 and start php-fpm server
-EXPOSE 9000
-
-CMD ["php-fpm"]
diff --git a/docker/8.0/config/.bashrc b/docker/8.0/config/.bashrc
deleted file mode 100644
index e106a759..00000000
--- a/docker/8.0/config/.bashrc
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-# Easier navigation: .., ..., ...., ....., ~ and -
-alias ..="cd .."
-alias ...="cd ../.."
-alias ....="cd ../../.."
-alias .....="cd ../../../.."
-alias ~="cd ~" # `cd` is probably faster to type though
-alias -- -="cd -"
-
-# Shortcuts
-alias g="git"
-alias h="history"
-
-# Detect which `ls` flavor is in use
-if ls --color > /dev/null 2>&1; then # GNU `ls`
-	colorflag="--color"
-else # OS X `ls`
-	colorflag="-G"
-fi
-
-# List all files colorized in long format
-# shellcheck disable=SC2139
-alias l="ls -lF ${colorflag}"
-
-# List all files colorized in long format, including dot files
-# shellcheck disable=SC2139
-alias la="ls -laF ${colorflag}"
-
-# List only directories
-# shellcheck disable=SC2139
-alias lsd="ls -lF ${colorflag} | grep --color=never '^d'"
-
-# See: https://superuser.com/a/656746/280737
-alias ll='LC_ALL="C.UTF-8" ls -alF'
-
-# Always use color output for `ls`
-# shellcheck disable=SC2139
-alias ls="command ls ${colorflag}"
-export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:'
-
-# Always enable colored `grep` output
-alias grep='grep --color=auto '
-
-# Enable aliases to be sudo’ed
-alias sudo='sudo '
-
-# Get week number
-alias week='date +%V'
-
-# Stopwatch
-alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'
-
-# Canonical hex dump; some systems have this symlinked
-command -v hd > /dev/null || alias hd="hexdump -C"
-
-# vhosts
-alias hosts='sudo nano /etc/hosts'
-
-# copy working directory
-alias cwd='pwd | tr -d "\r\n" | xclip -selection clipboard'
-
-# copy file interactive
-alias cp='cp -i'
-
-# move file interactive
-alias mv='mv -i'
-
-# untar
-alias untar='tar xvf'
-
-# Zephir related
-alias untar='tar xvf'
-
-PATH=$PATH:./vendor/bin
diff --git a/docker/8.0/config/extra.ini b/docker/8.0/config/extra.ini
deleted file mode 100644
index ec632f51..00000000
--- a/docker/8.0/config/extra.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-error_reporting = E_ALL
-display_errors = "On"
-display_startup_errors = "On"
-log_errors = "On"
-error_log = /srv/storage/logs/php_errors.log
-memory_limit = 512M
-apc.enable_cli = "On"
-session.save_path = "/tmp"
diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile
deleted file mode 100644
index 61353a6f..00000000
--- a/docker/8.1/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM composer:latest as composer
-FROM php:8.1-fpm
-
-# Set working directory
-WORKDIR /var/www
-
-LABEL vendor="Phalcon" \
-      maintainer="Phalcon Team <team@phalcon.io>" \
-      description="The PHP image to test the REST API example concepts"
-
-ENV PHALCON_VERSION="5.0.1" \
-    PHP_VERSION="8.1"
-
-# Update
-RUN apt update -y && \
-    apt install -y \
-        apt-utils \
-        gettext \
-        git \
-        libzip-dev \
-        nano \
-        sudo \
-        wget \
-        zip
-
-# PECL Packages
-RUN pecl install -o -f redis && \
-    pecl install phalcon-${PHALCON_VERSION}  \
-      xdebug
-
-# Install PHP extensions
-RUN docker-php-ext-install \
-      gettext \
-      pdo_mysql \
-      zip
-
-# Install PHP extensions
-RUN docker-php-ext-enable \
-      opcache \
-      phalcon \
-      redis \
-      xdebug
-
-# Clear cache
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Add user
-RUN groupadd -g 1000 phalcon
-RUN useradd -u 1000 -ms /bin/bash -g phalcon phalcon
-
-# Composer
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-
-# Copy existing application directory contents
-COPY . /var/www
-
-# Bash script with helper aliases
-COPY ./config/.bashrc /root/.bashrc
-COPY ./config/.bashrc /home/phalcon/.bashrc
-
-# Copy existing application directory permissions
-COPY --chown=phalcon:phalcon . /var/www
-
-# Change current user to phalcon
-USER phalcon
-
-# Expose port 9000 and start php-fpm server
-EXPOSE 9000
-
-CMD ["php-fpm"]
diff --git a/docker/8.1/config/extra.ini b/docker/8.1/config/extra.ini
deleted file mode 100644
index ec632f51..00000000
--- a/docker/8.1/config/extra.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-error_reporting = E_ALL
-display_errors = "On"
-display_startup_errors = "On"
-log_errors = "On"
-error_log = /srv/storage/logs/php_errors.log
-memory_limit = 512M
-apc.enable_cli = "On"
-session.save_path = "/tmp"
diff --git a/library/Core/autoload.php b/library/Core/autoload.php
deleted file mode 100644
index fc37988f..00000000
--- a/library/Core/autoload.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-use Dotenv\Dotenv;
-use Phalcon\Autoload\Loader;
-
-use function Phalcon\Api\Core\appPath;
-
-// Register the autoloader
-require __DIR__ . '/functions.php';
-
-$loader     = new Loader();
-$namespaces = [
-    'Phalcon\Api'                 => appPath('/library'),
-    'Phalcon\Api\Api\Controllers' => appPath('/api/controllers'),
-    'Phalcon\Api\Cli\Tasks'       => appPath('/cli/tasks'),
-    'Phalcon\Api\Tests'           => appPath('/tests'),
-];
-
-$loader->setNamespaces($namespaces);
-$loader->register();
-
-/**
- * Composer Autoloader
- */
-require appPath('/vendor/autoload.php');
-
-// Load environment
-(Dotenv::createImmutable(appPath()))->load();
diff --git a/library/Middleware/AuthenticationMiddleware.php b/library/Middleware/AuthenticationMiddleware.php
deleted file mode 100755
index 793f0ce9..00000000
--- a/library/Middleware/AuthenticationMiddleware.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Middleware;
-
-use Phalcon\Api\Http\Request;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Traits\QueryTrait;
-use Phalcon\Api\Traits\ResponseTrait;
-use Phalcon\Mvc\Micro;
-use Phalcon\Mvc\Micro\MiddlewareInterface;
-
-/**
- * Class AuthenticationMiddleware
- */
-class AuthenticationMiddleware implements MiddlewareInterface
-{
-    use ResponseTrait;
-    use QueryTrait;
-
-    /**
-     * Call me
-     *
-     * @param Micro $api
-     *
-     * @return bool
-     */
-    public function call(Micro $api): bool
-    {
-        /** @var Request $request */
-        $request = $api->getService('request');
-        /** @var Response $response */
-        $response = $api->getService('response');
-
-        if (
-            true !== $request->isLoginPage() &&
-            true === $request->isEmptyBearerToken()
-        ) {
-            $this->halt(
-                $api,
-                $response::OK,
-                'Invalid Token'
-            );
-
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/library/Middleware/TokenBase.php b/library/Middleware/TokenBase.php
deleted file mode 100755
index ff4d1a33..00000000
--- a/library/Middleware/TokenBase.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Middleware;
-
-use Phalcon\Api\Http\Request;
-use Phalcon\Api\Traits\QueryTrait;
-use Phalcon\Api\Traits\ResponseTrait;
-use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Mvc\Micro\MiddlewareInterface;
-
-/**
- * Class AuthenticationMiddleware
- */
-abstract class TokenBase implements MiddlewareInterface
-{
-    use ResponseTrait;
-    use TokenTrait;
-    use QueryTrait;
-
-    /**
-     * @param Request $request
-     *
-     * @return bool
-     */
-    protected function isValidCheck(Request $request): bool
-    {
-        return (
-            true !== $request->isLoginPage() &&
-            true !== $request->isEmptyBearerToken()
-        );
-    }
-}
diff --git a/library/Middleware/TokenUserMiddleware.php b/library/Middleware/TokenUserMiddleware.php
deleted file mode 100755
index e6846d80..00000000
--- a/library/Middleware/TokenUserMiddleware.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Middleware;
-
-use Phalcon\Api\Http\Request;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Models\Users;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
-use Phalcon\Mvc\Micro;
-
-/**
- * Class TokenUserMiddleware
- */
-class TokenUserMiddleware extends TokenBase
-{
-    /**
-     * @param Micro $api
-     *
-     * @return bool
-     */
-    public function call(Micro $api): bool
-    {
-        /** @var Cache $cache */
-        $cache = $api->getService('cache');
-        /** @var Config $config */
-        $config = $api->getService('config');
-        /** @var Request $request */
-        $request = $api->getService('request');
-        /** @var Response $response */
-        $response = $api->getService('response');
-        if (true === $this->isValidCheck($request)) {
-            /**
-             * This is where we will find if the user exists based on
-             * the token passed using Bearer Authentication
-             */
-            $token = $this->getToken($request->getBearerTokenFromHeader());
-
-            /** @var Users|null $user */
-            $user = $this->getUserByToken($config, $cache, $token);
-            if (null === $user) {
-                $this->halt(
-                    $api,
-                    $response::OK,
-                    'Invalid token (user)'
-                );
-
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/library/Middleware/TokenValidationMiddleware.php b/library/Middleware/TokenValidationMiddleware.php
deleted file mode 100755
index d0d97c9a..00000000
--- a/library/Middleware/TokenValidationMiddleware.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Middleware;
-
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Http\Request;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Models\Users;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
-use Phalcon\Mvc\Micro;
-use Phalcon\Encryption\Security\JWT\Exceptions\ValidatorException;
-use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-use Phalcon\Encryption\Security\JWT\Validator;
-
-use function implode;
-
-/**
- * Class TokenValidationMiddleware
- */
-class TokenValidationMiddleware extends TokenBase
-{
-    /**
-     * @param Micro $api
-     *
-     * @return bool
-     * @throws ModelException
-     */
-    public function call(Micro $api): bool
-    {
-        /** @var Cache $cache */
-        $cache = $api->getService('cache');
-        /** @var Config $config */
-        $config = $api->getService('config');
-        /** @var Request $request */
-        $request = $api->getService('request');
-        /** @var Response $response */
-        $response = $api->getService('response');
-        if (true === $this->isValidCheck($request)) {
-            /**
-             * This is where we will validate the token that was sent to us
-             * using Bearer Authentication
-             *
-             * Find the user attached to this token
-             */
-            $token = $this->getToken($request->getBearerTokenFromHeader());
-
-            /** @var Users $user */
-            $user   = $this->getUserByToken($config, $cache, $token);
-            $errors = $token->validate($user->getValidationData());
-
-            if (true !== empty($errors)) {
-                $this->halt(
-                    $api,
-                    $response::OK,
-                    'Invalid Token [' . implode('; ', $errors) . ']'
-                );
-
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/library/Middleware/TokenVerificationMiddleware.php b/library/Middleware/TokenVerificationMiddleware.php
deleted file mode 100755
index d28b2d13..00000000
--- a/library/Middleware/TokenVerificationMiddleware.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Middleware;
-
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Http\Request;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Models\Users;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
-use Phalcon\Mvc\Micro;
-use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-use Phalcon\Encryption\Security\JWT\Validator;
-
-/**
- * Class AuthenticationMiddleware
- */
-class TokenVerificationMiddleware extends TokenBase
-{
-    /**
-     * @param Micro $api
-     *
-     * @return bool
-     * @throws ModelException
-     */
-    public function call(Micro $api): bool
-    {
-        /** @var Cache $cache */
-        $cache = $api->getService('cache');
-        /** @var Config $config */
-        $config = $api->getService('config');
-        /** @var Request $request */
-        $request = $api->getService('request');
-        /** @var Response $response */
-        $response = $api->getService('response');
-        if (true === $this->isValidCheck($request)) {
-            /**
-             * This is where we will validate the token that was sent to us
-             * using Bearer Authentication
-             *
-             * Find the user attached to this token
-             */
-            $token  = $this->getToken($request->getBearerTokenFromHeader());
-            $signer = new Hmac();
-
-            /** @var Users $user */
-            $user = $this->getUserByToken($config, $cache, $token);
-            if (false === $token->verify($signer, $user->get('tokenPassword'))) {
-                $this->halt(
-                    $api,
-                    $response::OK,
-                    'Invalid Token (verification)'
-                );
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/library/Traits/QueryTrait.php b/library/Traits/QueryTrait.php
deleted file mode 100644
index 7043c43d..00000000
--- a/library/Traits/QueryTrait.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Traits;
-
-use Phalcon\Api\Constants\Flags;
-use Phalcon\Api\Models\Users;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
-use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Encryption\Security\JWT\Token\Enum;
-use Phalcon\Encryption\Security\JWT\Token\Token;
-
-use function json_encode;
-use function sha1;
-use function sprintf;
-
-/**
- * Trait QueryTrait
- */
-trait QueryTrait
-{
-    /**
-     * Gets a user from the database based on the JWT token
-     *
-     * @param Config $config
-     * @param Cache  $cache
-     * @param Token  $token
-     *
-     * @return Users|null
-     */
-    protected function getUserByToken(
-        Config $config,
-        Cache $cache,
-        Token $token
-    ): ?Users {
-        $parameters = [
-            'issuer'  => $token->getClaims()
-                               ->get(Enum::ISSUER),
-            'tokenId' => $token->getClaims()
-                               ->get(Enum::ID),
-            'status'  => Flags::ACTIVE,
-        ];
-
-        $result = $this->getRecords($config, $cache, Users::class, $parameters);
-
-        return $result[0] ?? null;
-    }
-
-    /**
-     * Gets a user from the database based on the username and password
-     *
-     * @param Config $config
-     * @param Cache  $cache
-     * @param string $username
-     * @param string $password
-     *
-     * @return Users|null
-     */
-    protected function getUserByUsernameAndPassword(
-        Config $config,
-        Cache $cache,
-        string $username,
-        string $password
-    ): ?Users {
-        $parameters = [
-            'username' => $username,
-            'password' => $password,
-            'status'   => Flags::ACTIVE,
-        ];
-
-        $result = $this->getRecords($config, $cache, Users::class, $parameters);
-
-        return $result[0] ?? null;
-    }
-
-    /**
-     * Runs a query using the builder
-     *
-     * @param Config $config
-     * @param Cache  $cache
-     * @param string $class
-     * @param array  $where
-     * @param string $orderBy
-     *
-     * @return ResultsetInterface
-     */
-    protected function getRecords(
-        Config $config,
-        Cache $cache,
-        string $class,
-        array $where = [],
-        string $orderBy = ''
-    ): ResultsetInterface {
-        $builder = new Builder();
-        $builder->addFrom($class, 't1');
-
-        foreach ($where as $field => $value) {
-            $builder->andWhere(
-                sprintf('%s = :%s:', $field, $field),
-                [$field => $value]
-            );
-        }
-
-        if (true !== empty($orderBy)) {
-            $builder->orderBy($orderBy);
-        }
-
-        return $this->getResults($config, $cache, $builder, $where);
-    }
-
-    /**
-     * Runs the builder query if there is no cached data
-     *
-     * @param Config  $config
-     * @param Cache   $cache
-     * @param Builder $builder
-     * @param array   $where
-     *
-     * @return ResultsetInterface
-     */
-    private function getResults(
-        Config $config,
-        Cache $cache,
-        Builder $builder,
-        array $where = []
-    ): ResultsetInterface {
-        /**
-         * Calculate the cache key
-         */
-        $phql     = $builder->getPhql();
-        $params   = json_encode($where);
-        $cacheKey = sha1(sprintf('%s-%s.cache', $phql, $params));
-        if (
-            true !== $config->path('app.devMode') &&
-            true === $cache->has($cacheKey)
-        ) {
-            /** @var ResultsetInterface $data */
-            $data = $cache->get($cacheKey);
-        } else {
-            $data = $builder->getQuery()
-                            ->execute()
-            ;
-            $cache->set($cacheKey, $data);
-        }
-
-        return $data;
-    }
-}
diff --git a/library/Transformers/BaseTransformer.php b/library/Transformers/BaseTransformer.php
deleted file mode 100644
index eab50b48..00000000
--- a/library/Transformers/BaseTransformer.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon API.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Api\Transformers;
-
-use League\Fractal\Resource\Collection;
-use League\Fractal\Resource\Item;
-use League\Fractal\TransformerAbstract;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Mvc\Model\AbstractModel;
-
-use function array_intersect;
-use function array_keys;
-
-/**
- * Class BaseTransformer
- */
-class BaseTransformer extends TransformerAbstract
-{
-    /** @var array */
-    private array $fields = [];
-
-    /** @var string */
-    private string $resource = '';
-
-    /**
-     * BaseTransformer constructor.
-     *
-     * @param array  $fields
-     * @param string $resource
-     */
-    public function __construct(array $fields = [], string $resource = '')
-    {
-        $this->fields   = $fields;
-        $this->resource = $resource;
-    }
-
-    /**
-     * @param AbstractModel $model
-     *
-     * @return array
-     * @throws ModelException
-     */
-    public function transform(AbstractModel $model): array
-    {
-        $modelFields     = array_keys($model->getModelFilters());
-        $requestedFields = $this->fields[$this->resource] ?? $modelFields;
-        $fields          = array_intersect($modelFields, $requestedFields);
-        $data            = [];
-        foreach ($fields as $field) {
-            $data[$field] = $model->get($field);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param string        $method
-     * @param AbstractModel $model
-     * @param string        $transformer
-     * @param string        $resource
-     *
-     * @return Collection|Item
-     */
-    protected function getRelatedData(
-        string $method,
-        AbstractModel $model,
-        string $transformer,
-        string $resource
-    ): Collection|Item {
-        /** @var AbstractModel $data */
-        $data = $model->getRelated($resource);
-
-        return $this->$method(
-            $data,
-            new $transformer($this->fields, $resource),
-            $resource
-        );
-    }
-}
diff --git a/psalm.xml.dist b/psalm.xml.dist
deleted file mode 100644
index ba8ab1b1..00000000
--- a/psalm.xml.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    resolveFromConfigFile="true"
-    allowStringToStandInForClass="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    autoloader="library/Core/autoload.php"
->
-    <projectFiles>
-        <directory name="library" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
diff --git a/api/public/.htaccess b/public/.htaccess
similarity index 100%
rename from api/public/.htaccess
rename to public/.htaccess
diff --git a/api/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from api/public/favicon.ico
rename to public/favicon.ico
diff --git a/api/public/index.php b/public/index.php
similarity index 83%
rename from api/public/index.php
rename to public/index.php
index dbca2f0e..9e94f009 100644
--- a/api/public/index.php
+++ b/public/index.php
@@ -12,6 +12,6 @@
 
 use Phalcon\Api\Bootstrap\Api;
 
-require_once __DIR__ . '/../../library/Core/autoload.php';
+require_once dirname(__FILE__, 2) . '/src/Core/autoload.php';
 
 (new Api())->run();
diff --git a/resources/.env.example b/resources/.env.example
new file mode 100644
index 00000000..f5318f8a
--- /dev/null
+++ b/resources/.env.example
@@ -0,0 +1,33 @@
+# Docker / project
+PROJECT_PREFIX=rest-api
+APP_PORT=8080
+PHP_VERSION=8.4
+PHALCON_VARIANT=v5
+# Override these to match your host user if it is not 1000:1000
+UID=1000
+GID=1000
+
+# Application
+APP_DEBUG=true
+APP_ENV=development
+APP_URL=http://localhost:8080
+APP_NAME="Phalcon API"
+APP_BASE_URI=/
+APP_SUPPORT_EMAIL=team@phalcon.io
+APP_TIMEZONE=UTC
+APP_IP=127.0.0.1
+
+# Database (host is the compose service name)
+DATA_API_MYSQL_HOST=mysql
+DATA_API_MYSQL_USER=root
+DATA_API_MYSQL_PASS=secret
+DATA_API_MYSQL_NAME=phalcon_api
+
+# Cache (host is the compose service name)
+DATA_API_REDIS_HOST=redis
+CACHE_PREFIX=api_cache_
+CACHE_LIFETIME=86400
+
+TOKEN_AUDIENCE=https://phalcon.io
+LOGGER_DEFAULT_FILENAME=api
+VERSION=20180401
diff --git a/docker/8.1/config/.bashrc b/resources/docker/.bashrc
similarity index 97%
rename from docker/8.1/config/.bashrc
rename to resources/docker/.bashrc
index e106a759..9fafb48e 100644
--- a/docker/8.1/config/.bashrc
+++ b/resources/docker/.bashrc
@@ -69,7 +69,6 @@ alias mv='mv -i'
 # untar
 alias untar='tar xvf'
 
-# Zephir related
-alias untar='tar xvf'
-
+# Make project binaries available
 PATH=$PATH:./vendor/bin
+export PATH
diff --git a/resources/docker/Dockerfile b/resources/docker/Dockerfile
new file mode 100644
index 00000000..de0f668e
--- /dev/null
+++ b/resources/docker/Dockerfile
@@ -0,0 +1,79 @@
+# syntax=docker/dockerfile:1
+ARG PHP_VERSION=8.4
+
+FROM php:${PHP_VERSION}-fpm AS base
+
+ARG PHP_VERSION=8.4
+ARG PHALCON_VARIANT=v5
+ARG PHALCON_V5_CONSTRAINT="^5.0"
+ARG UID=1000
+ARG GID=1000
+ARG USER=phalcon
+ARG GROUP=phalcon
+
+# System packages, PHP extensions and an unprivileged user matching the host UID
+RUN <<EOT
+set -eux
+groupadd -g "${GID}" "${GROUP}"
+useradd -l -m -u "${UID}" -g "${GID}" -s /bin/bash "${USER}"
+apt-get update -y
+apt-get install -yq --no-install-recommends \
+    curl \
+    default-mysql-client \
+    git \
+    libicu-dev \
+    libzip-dev \
+    unzip \
+    zip
+docker-php-ext-install intl pdo_mysql zip
+docker-php-ext-enable opcache
+apt-get clean -y
+rm -rf /var/lib/apt/lists/*
+EOT
+
+# Composer
+COPY --from=composer/composer:2 /usr/bin/composer /usr/bin/composer
+
+RUN <<EOT
+set -eux
+apt-get update -y
+apt-get install -yq --no-install-recommends ${PHPIZE_DEPS} libtool
+curl -fsSL https://github.com/php/pie/releases/latest/download/pie.phar -o /usr/local/bin/pie
+chmod +x /usr/local/bin/pie
+# pcov for code coverage (all variants)
+pie install --no-interaction pecl/pcov
+# redis for the cache service
+pie install --no-interaction phpredis/phpredis
+# Phalcon v5 C extension (v5 variant only; v6 uses the phalcon/phalcon composer package)
+if [ "${PHALCON_VARIANT}" = "v5" ]; then
+    pie install --no-interaction phalcon/cphalcon:${PHALCON_V5_CONSTRAINT}
+    php -m | grep -i phalcon
+fi
+apt-get clean -y
+rm -rf /var/lib/apt/lists/*
+EOT
+
+COPY resources/docker/extra.ini /usr/local/etc/php/conf.d/zz-rest-api.ini
+COPY --chown=${UID}:${GID} resources/docker/.bashrc /home/${USER}/.bashrc
+
+# Writable HOME / Composer home for the unprivileged user. Docker does not reliably set HOME
+# on a USER switch, and we never use /tmp; keep the cache in the user's home (outside /srv).
+ENV HOME=/home/${USER} \
+    COMPOSER_HOME=/home/${USER}/.composer
+
+# Create /srv owned by the unprivileged user so `composer install` can write vendor/
+RUN install -d -m 0775 -o "${USER}" -g "${GROUP}" /srv
+
+WORKDIR /srv
+COPY --chown=${UID}:${GID} . /srv
+
+USER ${USER}
+
+# Install dependencies. Phalcon is provided by:
+#  - v5: the C extension installed above (the phalcon/phalcon dev package stays dormant)
+#  - v6: the phalcon/phalcon package (a dev dependency) since no extension is installed
+RUN composer install --prefer-dist --no-interaction --no-progress
+
+EXPOSE 9000
+
+CMD ["php-fpm"]
diff --git a/resources/docker/extra.ini b/resources/docker/extra.ini
new file mode 100644
index 00000000..efda3757
--- /dev/null
+++ b/resources/docker/extra.ini
@@ -0,0 +1,6 @@
+display_errors=On
+display_startup_errors=On
+error_reporting=E_ALL
+log_errors=On
+memory_limit=256M
+date.timezone=UTC
diff --git a/storage/config/nginx/8.0/app-8.0.conf b/resources/docker/nginx/default.conf
similarity index 56%
rename from storage/config/nginx/8.0/app-8.0.conf
rename to resources/docker/nginx/default.conf
index e55a28b3..4d3fa614 100644
--- a/storage/config/nginx/8.0/app-8.0.conf
+++ b/resources/docker/nginx/default.conf
@@ -1,20 +1,28 @@
 server {
     listen 80;
     index index.php index.html;
-    error_log  /var/www/storage/logs/nginx-error.log;
-    access_log /var/www/storage/logs/nginx-access.log;
-    root /var/www/api/public;
+    error_log  /srv/storage/logs/nginx-error.log;
+    access_log /srv/storage/logs/nginx-access.log;
+    root /srv/public;
+
     location ~ \.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass rest-api-app-8.0:9000;
+        fastcgi_pass app:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
     }
+
     location / {
         try_files $uri $uri/ /index.php?$query_string;
         gzip_static on;
     }
+
+    # public/.htaccess is an Apache artifact and inert here, but the docroot is
+    # served as static files; without this it would be readable over HTTP.
+    location ~ /\.ht {
+        deny all;
+    }
 }
diff --git a/resources/infection.json5 b/resources/infection.json5
new file mode 100644
index 00000000..12056564
--- /dev/null
+++ b/resources/infection.json5
@@ -0,0 +1,155 @@
+{
+    "$schema": "../vendor/infection/infection/resources/schema.json",
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "logs": {
+        "text": "../tests/_output/infection/infection.log",
+        "summary": "../tests/_output/infection/summary.log"
+    },
+    "tmpDir": "../tests/_output/infection/tmp",
+    // Bootstrap and provider code is covered by every integration test, since
+    // each one boots the whole application; a mutant there re-runs the entire
+    // suite, and each test now truncates its tables and clears the cache. The
+    // default 10s is not enough for that, and the shortfall shows up as false
+    // timeouts rather than real verdicts.
+    "timeout": 30,
+    "phpUnit": {
+        "configDir": "."
+    },
+    "mutators": {
+        "@default": true,
+
+        // Visibility mutators are equivalent across this codebase. protected ->
+        // private never shows without a subclass leaning on the wider access,
+        // and there is none. The public -> protected cases that remain are all
+        // framework hooks the framework still reaches (Model::initialize and
+        // validation, Validation::initialize) or transformer include methods
+        // that League Fractal calls through $this-> from the parent class,
+        // where protected reads exactly like public.
+        "ProtectedVisibility": false,
+        "PublicVisibility": false,
+
+        // memory_get_usage()/1_000_000 and hrtime()/1_000_000: at the two and
+        // four decimals number_format() keeps, +/-1 on the divisor is below the
+        // rounding for any real measurement. TokenTrait and the Users token
+        // leeway carry the same shape - an integer literal whose +/-1 neighbour
+        // is indistinguishable from a moving clock.
+        "IncrementInteger": {
+            "ignore": [
+                "Phalcon\\Api\\ErrorHandler::shutdown",
+                "Phalcon\\Api\\Models\\Users::getValidationData",
+                "Phalcon\\Api\\Traits\\TokenTrait::getTokenTimeExpiration",
+                "Phalcon\\Api\\Traits\\TokenTrait::getTokenTimeNotBefore"
+            ]
+        },
+        "DecrementInteger": {
+            "ignore": [
+                "Phalcon\\Api\\ErrorHandler::shutdown",
+                "Phalcon\\Api\\Models\\Users::getValidationData",
+                "Phalcon\\Api\\Traits\\TokenTrait::getTokenTimeExpiration",
+                "Phalcon\\Api\\Traits\\TokenTrait::getTokenTimeNotBefore"
+            ]
+        },
+        // time() + 0 and time() - 0 are the same instant.
+        "Plus": {
+            "ignore": [
+                "Phalcon\\Api\\Traits\\TokenTrait::getTokenTimeNotBefore"
+            ]
+        },
+
+        // The help banner is built from empty-string and PHP_EOL fragments;
+        // every reshuffle of those produces byte-identical output. BaseTest
+        // asserts the whole banner and still cannot tell the mutants apart.
+        "Concat": {
+            "ignore": [
+                "Phalcon\\Api\\Cli\\Tasks\\MainTask::mainAction"
+            ]
+        },
+        "ConcatOperandRemoval": {
+            "ignore": [
+                "Phalcon\\Api\\Cli\\Tasks\\MainTask::mainAction"
+            ]
+        },
+
+        // getopt() reads the real process arguments, which phpunit cannot set.
+        // With no arguments every branch of processArguments leaves the task as
+        // Main, so mutating the option map or its loop changes nothing the suite
+        // can observe.
+        "UnwrapArrayKeys": {
+            "ignore": [
+                "Phalcon\\Api\\Bootstrap\\Cli::processArguments"
+            ]
+        },
+        "Foreach_": {
+            "ignore": [
+                "Phalcon\\Api\\Bootstrap\\Cli::processArguments"
+            ]
+        },
+
+        // The '.' entry is redundant with the isDir() guard right below, which
+        // already skips the current directory, and del() never returns 0 for a
+        // key keys('*') just handed back, so > 0 and >= 0 cannot differ.
+        "GreaterThan": {
+            "ignore": [
+                "Phalcon\\Api\\Cli\\Tasks\\ClearcacheTask::clearRedis"
+            ]
+        },
+
+        // setup() only tunes phql literals and not-null validation; the suite
+        // sets every field it saves, so neither flag - nor the call itself, nor
+        // the parent::initialize() that carries it - changes an observable
+        // outcome. Model::initialize keeps its setSource/relationship calls
+        // regardless, which the model tests do assert.
+        // setFilters applies the string filter, which only escapes markup - it
+        // never empties a value, so it cannot change the presence check's
+        // outcome and is invisible to validate()'s messages.
+        "MethodCallRemoval": {
+            "ignore": [
+                "Phalcon\\Api\\Models\\Companies::initialize",
+                "Phalcon\\Api\\Models\\CompaniesXProducts::initialize",
+                "Phalcon\\Api\\Models\\Individuals::initialize",
+                "Phalcon\\Api\\Models\\IndividualTypes::initialize",
+                "Phalcon\\Api\\Models\\ProductTypes::initialize",
+                "Phalcon\\Api\\Models\\Products::initialize",
+                "Phalcon\\Api\\Mvc\\Model\\AbstractModel::initialize",
+                "Phalcon\\Api\\Repositories\\UsersRepository::getByUsernameAndPassword",
+                "Phalcon\\Api\\Validation\\CompaniesValidator::initialize"
+            ]
+        },
+        "ArrayItemRemoval": {
+            "ignore": [
+                "Phalcon\\Api\\Bootstrap\\Cli::processArguments",
+                "Phalcon\\Api\\Cli\\Tasks\\ClearcacheTask::clearFileCache",
+                "Phalcon\\Api\\Mvc\\Model\\AbstractModel::initialize"
+            ]
+        },
+        "FalseValue": {
+            "ignore": [
+                "Phalcon\\Api\\Mvc\\Model\\AbstractModel::initialize",
+                "Phalcon\\Api\\Repositories\\UsersRepository::getByUsernameAndPassword"
+            ]
+        },
+        "TrueValue": {
+            "ignore": [
+                "Phalcon\\Api\\Bootstrap\\Cli::processArguments"
+            ]
+        },
+        "Identical": {
+            "ignore": [
+                "Phalcon\\Api\\Bootstrap\\Cli::processArguments"
+            ]
+        },
+
+        // getByToken looks up by issuer AND tokenId AND status. Turning one
+        // '=>' into '>' drops a key but the surviving keys still resolve the
+        // same single row either way, so the lookup is unchanged.
+        "ArrayItem": {
+            "ignore": [
+                "Phalcon\\Api\\Repositories\\UsersRepository::getByToken"
+            ]
+        }
+    }
+}
diff --git a/storage/db/migrations/20180508203845_add_users_table.php b/resources/migrations/20180508203845_add_users_table.php
similarity index 100%
rename from storage/db/migrations/20180508203845_add_users_table.php
rename to resources/migrations/20180508203845_add_users_table.php
diff --git a/storage/db/migrations/20180509232740_add_token_and_audience_fields_to_users.php b/resources/migrations/20180509232740_add_token_and_audience_fields_to_users.php
similarity index 100%
rename from storage/db/migrations/20180509232740_add_token_and_audience_fields_to_users.php
rename to resources/migrations/20180509232740_add_token_and_audience_fields_to_users.php
diff --git a/storage/db/migrations/20180510004748_add_token_id_in_users.php b/resources/migrations/20180510004748_add_token_id_in_users.php
similarity index 100%
rename from storage/db/migrations/20180510004748_add_token_id_in_users.php
rename to resources/migrations/20180510004748_add_token_id_in_users.php
diff --git a/storage/db/migrations/20180525210751_increase_token_size.php b/resources/migrations/20180525210751_increase_token_size.php
similarity index 100%
rename from storage/db/migrations/20180525210751_increase_token_size.php
rename to resources/migrations/20180525210751_increase_token_size.php
diff --git a/storage/db/migrations/20180528011826_split_token_field.php b/resources/migrations/20180528011826_split_token_field.php
similarity index 100%
rename from storage/db/migrations/20180528011826_split_token_field.php
rename to resources/migrations/20180528011826_split_token_field.php
diff --git a/storage/db/migrations/20180604160513_add_token_password_in_users.php b/resources/migrations/20180604160513_add_token_password_in_users.php
similarity index 100%
rename from storage/db/migrations/20180604160513_add_token_password_in_users.php
rename to resources/migrations/20180604160513_add_token_password_in_users.php
diff --git a/storage/db/migrations/20180607165746_remove_token_fields_from_users.php b/resources/migrations/20180607165746_remove_token_fields_from_users.php
similarity index 100%
rename from storage/db/migrations/20180607165746_remove_token_fields_from_users.php
rename to resources/migrations/20180607165746_remove_token_fields_from_users.php
diff --git a/storage/db/migrations/20180612191624_rename_domain_to_issuer.php b/resources/migrations/20180612191624_rename_domain_to_issuer.php
similarity index 100%
rename from storage/db/migrations/20180612191624_rename_domain_to_issuer.php
rename to resources/migrations/20180612191624_rename_domain_to_issuer.php
diff --git a/storage/db/migrations/20180715202028_add_companies_table.php b/resources/migrations/20180715202028_add_companies_table.php
similarity index 100%
rename from storage/db/migrations/20180715202028_add_companies_table.php
rename to resources/migrations/20180715202028_add_companies_table.php
diff --git a/storage/db/migrations/20180715221034_add_products_table.php b/resources/migrations/20180715221034_add_products_table.php
similarity index 100%
rename from storage/db/migrations/20180715221034_add_products_table.php
rename to resources/migrations/20180715221034_add_products_table.php
diff --git a/storage/db/migrations/20180717231009_add_product_types_table.php b/resources/migrations/20180717231009_add_product_types_table.php
similarity index 100%
rename from storage/db/migrations/20180717231009_add_product_types_table.php
rename to resources/migrations/20180717231009_add_product_types_table.php
diff --git a/storage/db/migrations/20180717231024_add_individuals_table.php b/resources/migrations/20180717231024_add_individuals_table.php
similarity index 100%
rename from storage/db/migrations/20180717231024_add_individuals_table.php
rename to resources/migrations/20180717231024_add_individuals_table.php
diff --git a/storage/db/migrations/20180717231029_add_individual_types_table.php b/resources/migrations/20180717231029_add_individual_types_table.php
similarity index 100%
rename from storage/db/migrations/20180717231029_add_individual_types_table.php
rename to resources/migrations/20180717231029_add_individual_types_table.php
diff --git a/storage/db/migrations/20180717231052_add_companies_to_products_table.php b/resources/migrations/20180717231052_add_companies_to_products_table.php
similarity index 100%
rename from storage/db/migrations/20180717231052_add_companies_to_products_table.php
rename to resources/migrations/20180717231052_add_companies_to_products_table.php
diff --git a/storage/db/migrations/20180717232102_add_product_type_to_products.php b/resources/migrations/20180717232102_add_product_type_to_products.php
similarity index 100%
rename from storage/db/migrations/20180717232102_add_product_type_to_products.php
rename to resources/migrations/20180717232102_add_product_type_to_products.php
diff --git a/storage/db/migrations/20180723152114_rename_table_fields.php b/resources/migrations/20180723152114_rename_table_fields.php
similarity index 100%
rename from storage/db/migrations/20180723152114_rename_table_fields.php
rename to resources/migrations/20180723152114_rename_table_fields.php
diff --git a/resources/octocov.pr.yml b/resources/octocov.pr.yml
new file mode 100644
index 00000000..bf06948a
--- /dev/null
+++ b/resources/octocov.pr.yml
@@ -0,0 +1,35 @@
+# octocov configuration - https://github.com/k1LoW/octocov
+#
+# Pull-request config: identical to octocov.yml except the gate adds the
+# no-regression check (diff >= 0), so a PR cannot lower coverage versus the
+# base branch. The default branch deliberately omits this check (floor only)
+# to avoid a coverage blip red-Xing master; keep the rest of this file in sync
+# with octocov.yml.
+#
+# Paths below are relative to THIS file's directory (resources/), not the
+# repo root - octocov resolves them that way, so everything is prefixed `../`.
+coverage:
+  paths:
+    - ../tests/_output/coverage.xml
+  acceptable: "current >= 75% && diff >= 0"
+  badge:
+    path: ../tests/_output/coverage.svg
+codeToTestRatio:
+  code:
+    - ../src/**/*.php
+  test:
+    - ../tests/**/*.php
+testExecutionTime:
+  steps:
+    - Tests with coverage
+comment:
+  if: is_pull_request
+summary:
+  if: true
+diff:
+  datastores:
+    - artifact://${GITHUB_REPOSITORY}
+report:
+  if: is_default_branch
+  datastores:
+    - artifact://${GITHUB_REPOSITORY}
diff --git a/resources/octocov.yml b/resources/octocov.yml
new file mode 100644
index 00000000..3c6800d5
--- /dev/null
+++ b/resources/octocov.yml
@@ -0,0 +1,46 @@
+# octocov configuration - https://github.com/k1LoW/octocov
+#
+# Default config: used on pushes (including the default branch).
+# The gate here is a stable FLOOR only, so a coverage measurement blip on the
+# default branch never red-Xs the build. Pull requests use octocov.pr.yml,
+# which adds the no-regression (diff >= 0) ratchet on top of this floor.
+# (octocov's `acceptable` cannot branch on is_pull_request, so the two gates
+# live in separate files selected by the workflow.)
+#
+# Paths below are relative to THIS file's directory (resources/), not the
+# repo root - octocov resolves them that way, so everything is prefixed `../`.
+#
+# `../tests/_output/coverage.xml` is generated by `composer test-coverage` in
+# the "Tests with coverage" workflow step - the same file the SonarQube scan
+# reads, so the two dashboards never disagree with each other.
+#
+# The floor is 75% rather than vokuro's 97% because the api suite drives a real
+# HTTP server in a separate process, which pcov cannot instrument: every
+# controller reads as 0% covered even though 52 api tests exercise it. Raising
+# this means either measuring the server process or moving those tests
+# in-process - a deliberate open question, not an oversight.
+coverage:
+  paths:
+    - ../tests/_output/coverage.xml
+  acceptable: "current >= 75%"
+  badge:
+    path: ../tests/_output/coverage.svg
+codeToTestRatio:
+  code:
+    - ../src/**/*.php
+  test:
+    - ../tests/**/*.php
+testExecutionTime:
+  steps:
+    - Tests with coverage
+comment:
+  if: is_pull_request
+summary:
+  if: true
+diff:
+  datastores:
+    - artifact://${GITHUB_REPOSITORY}
+report:
+  if: is_default_branch
+  datastores:
+    - artifact://${GITHUB_REPOSITORY}
diff --git a/phinx.php b/resources/phinx.php
similarity index 88%
rename from phinx.php
rename to resources/phinx.php
index 757d1ff2..91d54d5f 100644
--- a/phinx.php
+++ b/resources/phinx.php
@@ -3,13 +3,12 @@
 use function Phalcon\Api\Core\appPath;
 use function Phalcon\Api\Core\envValue;
 
-// This file will end up in the root of the project
-require_once './library/Core/autoload.php';
+require_once dirname(__FILE__, 2) . '/src/Core/autoload.php';
 
 return [
     'paths'         => [
-        'migrations' => appPath('/storage/db/migrations'),
-        'seeds'      => appPath('/storage/db/seeds'),
+        'migrations' => appPath('/resources/migrations'),
+        'seeds'      => appPath('/resources/seeds'),
     ],
     'environments'  => [
         'default_migration_table' => 'ut_migrations',
diff --git a/resources/php-cs-fixer.php b/resources/php-cs-fixer.php
new file mode 100644
index 00000000..d6a32b91
--- /dev/null
+++ b/resources/php-cs-fixer.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+$root = dirname(__FILE__, 2);
+
+$finder = Finder::create()
+    ->in(
+        [
+            $root . '/src',
+            $root . '/tests',
+        ]
+    )
+    // Build artifacts - phpstan's container cache and this fixer's own cache
+    // file live here. phpcs excludes it for the same reason.
+    ->exclude('_output');
+
+return (new Config())
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    // declare_strict_types is a risky rule.
+    ->setRiskyAllowed(true)
+    ->setUsingCache(true)
+    ->setCacheFile($root . '/tests/_output/.php-cs-fixer.cache')
+    ->setRules(
+        [
+            // The two rules below are a local addition on top of the ordering
+            // rules shared with the other Phalcon projects. They are kept here
+            // until the global coding standard is agreed, at which point they
+            // should move into the shared set rather than stay a divergence.
+            // PSR-12 (via phpcs) checks neither, so nothing else enforces them.
+            'declare_strict_types'   => true,
+            'no_unused_imports'      => true,
+            'ordered_imports'        => [
+                'sort_algorithm' => 'alpha',
+                'imports_order'  => ['class', 'function', 'const'],
+            ],
+            'ordered_class_elements' => [
+                'sort_algorithm' => 'alpha',
+                'order'          => [
+                    'use_trait',
+                    'case',
+                    'constant_public',
+                    'constant_protected',
+                    'constant_private',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'phpunit',
+                    'method_public_static',
+                    'method_protected_static',
+                    'method_private_static',
+                    'method_public',
+                    'method_protected',
+                    'method_private',
+                ],
+            ],
+        ]
+    )
+    ->setFinder($finder);
diff --git a/phpcs.xml b/resources/phpcs.xml
similarity index 80%
rename from phpcs.xml
rename to resources/phpcs.xml
index 564a16b1..04305cd8 100644
--- a/phpcs.xml
+++ b/resources/phpcs.xml
@@ -11,8 +11,7 @@
     </rule>
     <exclude-pattern>*/public/*</exclude-pattern>
     <exclude-pattern>*/_output/*</exclude-pattern>
-    <exclude-pattern>*/_support/*</exclude-pattern>
-    <file>./api</file>
-    <file>./library</file>
-    <file>./tests</file>
+    <file>../bin</file>
+    <file>../src</file>
+    <file>../tests</file>
 </ruleset>
diff --git a/resources/phpstan.neon b/resources/phpstan.neon
new file mode 100644
index 00000000..7d5ca519
--- /dev/null
+++ b/resources/phpstan.neon
@@ -0,0 +1,23 @@
+parameters:
+    paths:
+        - ../src
+        - ../public/index.php
+    # Climbing towards max. Raise one level at a time, clearing the errors each
+    # step introduces before moving up.
+    level: 8
+    reportUnmatchedIgnoredErrors: false
+    tmpDir: ../tests/_output
+    # The application registers its own namespaces via library/Core/autoload.php,
+    # but that file also loads Dotenv and therefore needs a .env present. Bootstrap
+    # from Composer only; the analysed paths above cover the application's classes.
+    bootstrapFiles:
+        - ../vendor/autoload.php
+    ignoreErrors:
+        # Phalcon\Mvc\Model is generic (@template T) in the v6 source; the v5 C
+        # extension's model is not, so AbstractModel cannot parametrize it and
+        # still run on both variants.
+        - '#extends generic class Phalcon\\Mvc\\Model but does not specify its types#'
+        # Loader::setNamespaces() is typed array<string, array<string, string>>,
+        # but it documents and accepts a plain directory string per namespace -
+        # which is what src/Core/autoload.php passes, on both variants.
+        - '#Parameter \#1 \$namespaces of method Phalcon\\Autoload\\Loader::setNamespaces\(\) expects#'
diff --git a/resources/phpunit.xml.dist b/resources/phpunit.xml.dist
new file mode 100644
index 00000000..d8de0499
--- /dev/null
+++ b/resources/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<phpunit bootstrap="../tests/bootstrap.php"
+         cacheDirectory="../tests/_output/.phpunit.cache"
+         colors="true">
+    <testsuites>
+        <testsuite name="unit">
+            <directory>../tests/Unit</directory>
+        </testsuite>
+        <testsuite name="integration">
+            <directory>../tests/Integration</directory>
+        </testsuite>
+        <testsuite name="api">
+            <directory>../tests/Api</directory>
+        </testsuite>
+        <testsuite name="cli">
+            <directory>../tests/Cli</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/runCli b/runCli
deleted file mode 100755
index 0973eeb6..00000000
--- a/runCli
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-EXEC_PATH="`dirname \"$0\"`"
-
-PHP_BINARY="`which php`"
-$PHP_BINARY $EXEC_PATH/cli/cli.php $*
\ No newline at end of file
diff --git a/runTests b/runTests
deleted file mode 100755
index 51361088..00000000
--- a/runTests
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
- 
-./vendor/bin/codecept run --coverage --coverage-html --coverage-xml
diff --git a/api/controllers/BaseController.php b/src/Api/Controllers/BaseController.php
similarity index 81%
rename from api/controllers/BaseController.php
rename to src/Api/Controllers/BaseController.php
index ae095aa9..906abdfe 100644
--- a/api/controllers/BaseController.php
+++ b/src/Api/Controllers/BaseController.php
@@ -14,16 +14,14 @@
 namespace Phalcon\Api\Api\Controllers;
 
 use Phalcon\Api\Http\Response;
+use Phalcon\Api\Services\QueryService;
 use Phalcon\Api\Traits\FractalTrait;
-use Phalcon\Api\Traits\QueryTrait;
 use Phalcon\Api\Traits\ResponseTrait;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Filter\Exception;
 use Phalcon\Filter\Filter;
 use Phalcon\Mvc\Controller;
 use Phalcon\Mvc\Micro;
-use Phalcon\Mvc\Model\MetaData\Libmemcached as ModelsMetadataCache;
 
 use function explode;
 use function implode;
@@ -35,38 +33,40 @@
 /**
  * Class BaseController
  *
- * @property Micro               $application
- * @property Cache               $cache
- * @property Config              $config
- * @property ModelsMetadataCache $modelsMetadata
- * @property Response            $response
+ * @property Micro        $application
+ * @property QueryService $queryService
+ * @property Response     $response
  */
 class BaseController extends Controller
 {
     use FractalTrait;
-    use QueryTrait;
     use ResponseTrait;
 
-    /** @var string */
-    protected string $model = '';
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [];
 
     /** @var string */
     protected string $method = 'collection';
 
+    /** @var string */
+    protected string $model = '';
+
     /** @var string */
     protected string $orderBy = 'name';
 
     /** @var string */
     protected string $resource = '';
 
-    /** @var array */
+    /** @var array<string, bool> */
     protected array $sortFields = [];
 
-    /** @var string */
-    protected string $transformer = '';
+    /**
+     * Defaults to the base transformer rather than an empty string: every
+     * concrete controller names its own, and '' was never a usable value.
+     *
+     * @var class-string<BaseTransformer>
+     */
+    protected string $transformer = BaseTransformer::class;
 
     /**
      * Get the company/companies
@@ -86,15 +86,18 @@ public function callAction(mixed $id = 0): void
         if (true !== $validSort) {
             $this->sendError($this->response::BAD_REQUEST);
         } else {
-            $results = $this->getRecords(
-                $this->config,
-                $this->cache,
+            $results = $this->queryService->getRecords(
                 $this->model,
                 $parameters,
                 $this->orderBy
             );
 
-            if (count($parameters) > 0 && 0 === count($results)) {
+            /**
+             * A record was asked for by id and nothing came back. `getFirst()`
+             * rather than `count()`: ResultsetInterface declares the former and
+             * not the latter, however countable the concrete Resultset is.
+             */
+            if (true !== empty($parameters) && null === $results->getFirst()) {
                 $this->sendError($this->response::NOT_FOUND);
             } else {
                 $data = $this->format(
@@ -114,7 +117,7 @@ public function callAction(mixed $id = 0): void
     }
 
     /**
-     * @return array
+     * @return array<string, array<int, string>>
      */
     private function checkFields(): array
     {
@@ -136,7 +139,7 @@ private function checkFields(): array
      *
      * @param mixed $recordId
      *
-     * @return array
+     * @return array<string, int>
      * @throws Exception
      */
     private function checkIdParameter(mixed $recordId = 0): array
@@ -156,7 +159,7 @@ private function checkIdParameter(mixed $recordId = 0): array
     /**
      * Processes the includes requested; Unknown includes are ignored
      *
-     * @return array
+     * @return array<int, string>
      */
     private function checkIncludes(): array
     {
@@ -202,7 +205,7 @@ private function checkSort(): bool
         /**
          * Check the results. If we have something update the $orderBy
          */
-        if (count($sortArray) > 0) {
+        if (true !== empty($sortArray)) {
             $this->orderBy = implode(',', $sortArray);
         }
 
@@ -215,7 +218,7 @@ private function checkSort(): bool
      *
      * @param string $field
      *
-     * @return array
+     * @return array{0: string, 1: string} The field name and its direction
      */
     private function getFieldAndDirection(string $field): array
     {
@@ -237,8 +240,10 @@ private function getFieldAndDirection(string $field): array
      * Sets the response with an error code
      *
      * @param int $code
+     *
+     * @return void
      */
-    private function sendError(int $code)
+    private function sendError(int $code): void
     {
         $this
             ->response
diff --git a/src/Api/Controllers/Companies/AddController.php b/src/Api/Controllers/Companies/AddController.php
new file mode 100644
index 00000000..0d49ff3c
--- /dev/null
+++ b/src/Api/Controllers/Companies/AddController.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Api\Controllers\Companies;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Http\Response;
+use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Traits\FractalTrait;
+use Phalcon\Api\Transformers\BaseTransformer;
+use Phalcon\Api\Validation\CompaniesValidator;
+use Phalcon\Filter\Filter;
+use Phalcon\Mvc\Controller;
+
+use function Phalcon\Api\Core\appUrl;
+
+/**
+ * Class AddController
+ *
+ * @property Response $response
+ */
+class AddController extends Controller
+{
+    use FractalTrait;
+
+    /**
+     * Adds a record in the database
+     *
+     * @return void
+     * @throws ModelException
+     */
+    public function callAction(): void
+    {
+        $validator = new CompaniesValidator();
+        $messages  = $validator->validate($this->request->getPost());
+
+        /**
+         * validate() answers false when a beforeValidation handler cancels the
+         * run, which is not the same as "nothing was wrong" - so it must not
+         * fall through to the insert. CompaniesValidator installs no such
+         * handler today, but the signature allows it and the old
+         * `count($messages)` would have been fatal on false rather than caught.
+         */
+        if (false === $messages) {
+            $this
+                ->response
+                ->setPayloadError('The company could not be validated')
+            ;
+
+            return;
+        }
+
+        if (0 !== $messages->count()) {
+            $this
+                ->response
+                ->setPayloadErrors($messages)
+            ;
+
+            return;
+        }
+
+        $name    = $this->request->getPost('name', Filter::FILTER_STRING);
+        $address = $this->request->getPost('address', Filter::FILTER_STRING, '');
+        $city    = $this->request->getPost('city', Filter::FILTER_STRING, '');
+        $phone   = $this->request->getPost('phone', Filter::FILTER_STRING, '');
+
+        $company = new Companies();
+        $result  = $company
+            ->set('name', $name)
+            ->set('address', $address)
+            ->set('city', $city)
+            ->set('phone', $phone)
+            ->save()
+        ;
+
+        if (false === $result) {
+            /**
+             * Errors happened store them
+             */
+            $this
+                ->response
+                ->setPayloadErrors($company->getMessages())
+            ;
+
+            return;
+        }
+
+        $data = $this->format(
+            'item',
+            $company,
+            BaseTransformer::class,
+            'companies'
+        );
+
+        $this
+            ->response
+            ->setHeader('Location', appUrl(Relationships::COMPANIES, $company->get('id')))
+            ->setJsonContent($data)
+            ->setStatusCode($this->response::CREATED)
+        ;
+    }
+}
diff --git a/api/controllers/Companies/GetController.php b/src/Api/Controllers/Companies/GetController.php
similarity index 86%
rename from api/controllers/Companies/GetController.php
rename to src/Api/Controllers/Companies/GetController.php
index 6ed401fc..c313e6e8 100644
--- a/api/controllers/Companies/GetController.php
+++ b/src/Api/Controllers/Companies/GetController.php
@@ -16,6 +16,7 @@
 use Phalcon\Api\Api\Controllers\BaseController;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Api\Transformers\CompaniesTransformer;
 
 /**
@@ -23,19 +24,18 @@
  */
 class GetController extends BaseController
 {
-    /** @var string */
-    protected string $model = Companies::class;
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [
         Relationships::INDIVIDUALS,
         Relationships::PRODUCTS,
     ];
+    /** @var string */
+    protected string $model = Companies::class;
 
     /** @var string */
     protected string $resource = Relationships::COMPANIES;
 
-    /** @var array<string|boolean> */
+    /** @var array<string, bool> */
     protected array $sortFields = [
         'id'      => true,
         'name'    => true,
@@ -44,6 +44,6 @@ class GetController extends BaseController
         'phone'   => true,
     ];
 
-    /** @var string */
+    /** @var class-string<BaseTransformer> */
     protected string $transformer = CompaniesTransformer::class;
 }
diff --git a/api/controllers/IndividualTypes/GetController.php b/src/Api/Controllers/IndividualTypes/GetController.php
similarity index 89%
rename from api/controllers/IndividualTypes/GetController.php
rename to src/Api/Controllers/IndividualTypes/GetController.php
index 04cee0bb..79f5450b 100644
--- a/api/controllers/IndividualTypes/GetController.php
+++ b/src/Api/Controllers/IndividualTypes/GetController.php
@@ -16,6 +16,7 @@
 use Phalcon\Api\Api\Controllers\BaseController;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Api\Transformers\IndividualTypesTransformer;
 
 /**
@@ -23,13 +24,12 @@
  */
 class GetController extends BaseController
 {
-    /** @var string */
-    protected string $model = IndividualTypes::class;
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [
         Relationships::INDIVIDUALS,
     ];
+    /** @var string */
+    protected string $model = IndividualTypes::class;
 
     /** @var string */
     protected string $resource = Relationships::INDIVIDUAL_TYPES;
@@ -41,6 +41,6 @@ class GetController extends BaseController
         'description' => false,
     ];
 
-    /** @var string */
+    /** @var class-string<BaseTransformer> */
     protected string $transformer = IndividualTypesTransformer::class;
 }
diff --git a/api/controllers/Individuals/GetController.php b/src/Api/Controllers/Individuals/GetController.php
similarity index 91%
rename from api/controllers/Individuals/GetController.php
rename to src/Api/Controllers/Individuals/GetController.php
index abead545..3af3354f 100644
--- a/api/controllers/Individuals/GetController.php
+++ b/src/Api/Controllers/Individuals/GetController.php
@@ -16,6 +16,7 @@
 use Phalcon\Api\Api\Controllers\BaseController;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Individuals;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Api\Transformers\IndividualsTransformer;
 
 /**
@@ -23,20 +24,19 @@
  */
 class GetController extends BaseController
 {
-    /** @var string */
-    protected string $model = Individuals::class;
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [
         Relationships::COMPANIES,
         Relationships::INDIVIDUAL_TYPES,
     ];
+    /** @var string */
+    protected string $model = Individuals::class;
 
     /** @var string */
-    protected string $resource = Relationships::INDIVIDUALS;
+    protected string $orderBy = 'last, first';
 
     /** @var string */
-    protected string $transformer = IndividualsTransformer::class;
+    protected string $resource = Relationships::INDIVIDUALS;
 
     /** @var array<string,bool> */
     protected array $sortFields = [
@@ -50,6 +50,6 @@ class GetController extends BaseController
         'suffix'    => true,
     ];
 
-    /** @var string */
-    protected string $orderBy = 'last, first';
+    /** @var class-string<BaseTransformer> */
+    protected string $transformer = IndividualsTransformer::class;
 }
diff --git a/api/controllers/LoginController.php b/src/Api/Controllers/LoginController.php
similarity index 76%
rename from api/controllers/LoginController.php
rename to src/Api/Controllers/LoginController.php
index 58c337b0..c3ef1bcb 100644
--- a/api/controllers/LoginController.php
+++ b/src/Api/Controllers/LoginController.php
@@ -17,26 +17,19 @@
 use Phalcon\Api\Http\Request;
 use Phalcon\Api\Http\Response;
 use Phalcon\Api\Models\Users;
-use Phalcon\Api\Traits\QueryTrait;
-use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
+use Phalcon\Api\Repositories\UsersRepository;
 use Phalcon\Filter\Filter;
 use Phalcon\Mvc\Controller;
 
 /**
  * Class LoginController
  *
- * @property Cache    $cache
- * @property Config   $config
- * @property Request  $request
- * @property Response $response
+ * @property Request         $request
+ * @property Response        $response
+ * @property UsersRepository $usersRepository
  */
 class LoginController extends Controller
 {
-    use TokenTrait;
-    use QueryTrait;
-
     /**
      * Default action logging in
      *
@@ -49,9 +42,7 @@ public function callAction()
         $password = $this->request->getPost('password', Filter::FILTER_STRING);
 
         /** @var Users|null $user */
-        $user = $this->getUserByUsernameAndPassword(
-            $this->config,
-            $this->cache,
+        $user = $this->usersRepository->getByUsernameAndPassword(
             $username,
             $password
         );
diff --git a/api/controllers/ProductTypes/GetController.php b/src/Api/Controllers/ProductTypes/GetController.php
similarity index 89%
rename from api/controllers/ProductTypes/GetController.php
rename to src/Api/Controllers/ProductTypes/GetController.php
index 72da8c6d..854c1ba8 100644
--- a/api/controllers/ProductTypes/GetController.php
+++ b/src/Api/Controllers/ProductTypes/GetController.php
@@ -16,6 +16,7 @@
 use Phalcon\Api\Api\Controllers\BaseController;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Api\Transformers\ProductTypesTransformer;
 
 /**
@@ -23,13 +24,12 @@
  */
 class GetController extends BaseController
 {
-    /** @var string */
-    protected string $model = ProductTypes::class;
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [
         Relationships::PRODUCTS,
     ];
+    /** @var string */
+    protected string $model = ProductTypes::class;
 
     /** @var string */
     protected string $resource = Relationships::PRODUCT_TYPES;
@@ -41,6 +41,6 @@ class GetController extends BaseController
         'description' => false,
     ];
 
-    /** @var string */
+    /** @var class-string<BaseTransformer> */
     protected string $transformer = ProductTypesTransformer::class;
 }
diff --git a/api/controllers/Products/GetController.php b/src/Api/Controllers/Products/GetController.php
similarity index 90%
rename from api/controllers/Products/GetController.php
rename to src/Api/Controllers/Products/GetController.php
index a10fe6e3..0e41ab4f 100644
--- a/api/controllers/Products/GetController.php
+++ b/src/Api/Controllers/Products/GetController.php
@@ -16,6 +16,7 @@
 use Phalcon\Api\Api\Controllers\BaseController;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Products;
+use Phalcon\Api\Transformers\BaseTransformer;
 use Phalcon\Api\Transformers\ProductsTransformer;
 
 /**
@@ -23,14 +24,13 @@
  */
 class GetController extends BaseController
 {
-    /** @var string */
-    protected string $model = Products::class;
-
-    /** @var array */
+    /** @var array<int, string> */
     protected array $includes = [
         Relationships::COMPANIES,
         Relationships::PRODUCT_TYPES,
     ];
+    /** @var string */
+    protected string $model = Products::class;
 
     /** @var string */
     protected string $resource = Relationships::PRODUCTS;
@@ -45,6 +45,6 @@ class GetController extends BaseController
         'price'       => true,
     ];
 
-    /** @var string */
+    /** @var class-string<BaseTransformer> */
     protected string $transformer = ProductsTransformer::class;
 }
diff --git a/api/controllers/Users/GetController.php b/src/Api/Controllers/Users/GetController.php
similarity index 96%
rename from api/controllers/Users/GetController.php
rename to src/Api/Controllers/Users/GetController.php
index efa7342f..36ecdcfb 100644
--- a/api/controllers/Users/GetController.php
+++ b/src/Api/Controllers/Users/GetController.php
@@ -27,10 +27,10 @@ class GetController extends BaseController
     protected string $model = Users::class;
 
     /** @var string */
-    protected string $resource = Relationships::USERS;
+    protected string $orderBy = 'username';
 
     /** @var string */
-    protected string $transformer = BaseTransformer::class;
+    protected string $resource = Relationships::USERS;
 
     /** @var array<string,bool> */
     protected array $sortFields = [
@@ -43,6 +43,6 @@ class GetController extends BaseController
         'tokenId'       => false,
     ];
 
-    /** @var string */
-    protected string $orderBy = 'username';
+    /** @var class-string<BaseTransformer> */
+    protected string $transformer = BaseTransformer::class;
 }
diff --git a/api/config/providers.php b/src/Api/providers.php
similarity index 85%
rename from api/config/providers.php
rename to src/Api/providers.php
index ce2f827a..e3d10d69 100644
--- a/api/config/providers.php
+++ b/src/Api/providers.php
@@ -17,9 +17,11 @@
 use Phalcon\Api\Providers\ErrorHandlerProvider;
 use Phalcon\Api\Providers\LoggerProvider;
 use Phalcon\Api\Providers\ModelsMetadataProvider;
+use Phalcon\Api\Providers\QueryServiceProvider;
 use Phalcon\Api\Providers\RequestProvider;
 use Phalcon\Api\Providers\ResponseProvider;
 use Phalcon\Api\Providers\RouterProvider;
+use Phalcon\Api\Providers\UsersRepositoryProvider;
 
 /**
  * Enabled providers. Order does matter
@@ -34,4 +36,6 @@
     ResponseProvider::class,
     RouterProvider::class,
     CacheDataProvider::class,
+    QueryServiceProvider::class,
+    UsersRepositoryProvider::class,
 ];
diff --git a/library/Bootstrap/AbstractBootstrap.php b/src/Bootstrap/AbstractBootstrap.php
similarity index 57%
rename from library/Bootstrap/AbstractBootstrap.php
rename to src/Bootstrap/AbstractBootstrap.php
index d620287a..158228f7 100644
--- a/library/Bootstrap/AbstractBootstrap.php
+++ b/src/Bootstrap/AbstractBootstrap.php
@@ -25,17 +25,22 @@
 abstract class AbstractBootstrap
 {
     /**
-     * @var Console|Micro|null
+     * Both are set by the time the constructor returns - the container either
+     * by a subclass before parent::__construct() or by it, the application by
+     * setupApplication(). Declared without a null default so that is the type
+     * rather than a promise.
+     *
+     * @var Console|Micro
      */
-    protected Console|Micro|null $application = null;
+    protected Console|Micro $application;
 
-    /** @var FactoryDefault|PhCli|null */
-    protected FactoryDefault|PhCli|null $container = null;
+    /** @var FactoryDefault|PhCli */
+    protected FactoryDefault|PhCli $container;
 
-    /** @var array */
+    /** @var array<string, string> */
     protected array $options = [];
 
-    /** @var array */
+    /** @var array<int, class-string<ServiceProviderInterface>> */
     protected array $providers = [];
 
     /**
@@ -43,12 +48,12 @@ abstract class AbstractBootstrap
      */
     public function __construct()
     {
-        if (null === $this->container) {
+        if (false === isset($this->container)) {
             $this->container = new FactoryDefault();
         }
 
         if ([] === $this->providers) {
-            $this->providers = require appPath('api/config/providers.php');
+            $this->providers = require appPath($this->providersPath());
         }
 
         $this
@@ -58,17 +63,17 @@ public function __construct()
     }
 
     /**
-     * @return Console|Micro|null
+     * @return Console|Micro
      */
-    public function getApplication(): Console|Micro|null
+    public function getApplication(): Console|Micro
     {
         return $this->application;
     }
 
     /**
-     * @return FactoryDefault|PhCli|null
+     * @return FactoryDefault|PhCli
      */
-    public function getContainer(): FactoryDefault|PhCli|null
+    public function getContainer(): FactoryDefault|PhCli
     {
         return $this->container;
     }
@@ -86,6 +91,21 @@ public function getResponse(): Response
      */
     abstract public function run();
 
+    /**
+     * The application class this bootstrap builds - a Micro for HTTP, a Console
+     * for the command line.
+     *
+     * @return class-string<Console|Micro>
+     */
+    abstract protected function applicationClass(): string;
+
+    /**
+     * The provider list this application registers, relative to the app root.
+     *
+     * @return string
+     */
+    abstract protected function providersPath(): string;
+
     /**
      * Set up the application object in the container
      *
@@ -93,7 +113,9 @@ abstract public function run();
      */
     protected function setupApplication(): AbstractBootstrap
     {
-        $this->application = new Micro($this->container);
+        $class             = $this->applicationClass();
+        $this->application = new $class($this->container);
+
         $this->container->setShared('application', $this->application);
 
         return $this;
diff --git a/library/Bootstrap/Api.php b/src/Bootstrap/Api.php
similarity index 68%
rename from library/Bootstrap/Api.php
rename to src/Bootstrap/Api.php
index 39fa3006..f5f62838 100644
--- a/library/Bootstrap/Api.php
+++ b/src/Bootstrap/Api.php
@@ -33,4 +33,20 @@ public function run()
 
         return $this->application->handle($uri);
     }
+
+    /**
+     * @return class-string<Micro>
+     */
+    protected function applicationClass(): string
+    {
+        return Micro::class;
+    }
+
+    /**
+     * @return string
+     */
+    protected function providersPath(): string
+    {
+        return 'src/Api/providers.php';
+    }
 }
diff --git a/library/Bootstrap/Cli.php b/src/Bootstrap/Cli.php
similarity index 77%
rename from library/Bootstrap/Cli.php
rename to src/Bootstrap/Cli.php
index 5ac03fab..83a71a03 100644
--- a/library/Bootstrap/Cli.php
+++ b/src/Bootstrap/Cli.php
@@ -16,8 +16,6 @@
 use Phalcon\Cli\Console;
 use Phalcon\Di\FactoryDefault\Cli as PhCli;
 
-use function Phalcon\Api\Core\appPath;
-
 /**
  * Class Cli
  *
@@ -31,13 +29,10 @@ class Cli extends AbstractBootstrap
     public function __construct()
     {
         $this->container = new PhCli();
-        $this->providers = require appPath('cli/config/providers.php');
 
         $this->processArguments();
 
         parent::__construct();
-
-        return $this;
     }
 
     /**
@@ -51,16 +46,19 @@ public function run()
     }
 
     /**
-     * Set up the application object in the container
-     *
-     * @return Cli
+     * @return class-string<Console>
      */
-    protected function setupApplication(): Cli
+    protected function applicationClass(): string
     {
-        $this->application = new Console($this->container);
-        $this->container->setShared('application', $this->application);
+        return Console::class;
+    }
 
-        return $this;
+    /**
+     * @return string
+     */
+    protected function providersPath(): string
+    {
+        return 'src/Cli/providers.php';
     }
 
     /**
diff --git a/library/Bootstrap/Tests.php b/src/Bootstrap/Tests.php
similarity index 100%
rename from library/Bootstrap/Tests.php
rename to src/Bootstrap/Tests.php
diff --git a/cli/tasks/ClearcacheTask.php b/src/Cli/Tasks/ClearcacheTask.php
similarity index 84%
rename from cli/tasks/ClearcacheTask.php
rename to src/Cli/Tasks/ClearcacheTask.php
index febd9656..ca22713c 100755
--- a/cli/tasks/ClearcacheTask.php
+++ b/src/Cli/Tasks/ClearcacheTask.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon API.
@@ -10,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Phalcon\Api\Cli\Tasks;
 
 use Phalcon\Cache\Cache;
@@ -17,10 +18,10 @@
 use Phalcon\Config\Config;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
-
 use Redis;
 
 use function in_array;
+use function is_array;
 use function Phalcon\Api\Core\appPath;
 
 use const PHP_EOL;
@@ -35,8 +36,10 @@ class ClearcacheTask extends PhTask
 {
     /**
      * Clears the data cache from the application
+     *
+     * @return void
      */
-    public function mainAction()
+    public function mainAction(): void
     {
         $this->clearFileCache();
         $this->clearRedis();
@@ -44,8 +47,10 @@ public function mainAction()
 
     /**
      * Clears file based cache
+     *
+     * @return void
      */
-    private function clearFileCache()
+    private function clearFileCache(): void
     {
         echo 'Clearing Cache folders' . PHP_EOL;
 
@@ -78,8 +83,10 @@ private function clearFileCache()
 
     /**
      * Clears redis data cache
+     *
+     * @return void
      */
-    private function clearRedis()
+    private function clearRedis(): void
     {
         echo 'Clearing data cache' . PHP_EOL;
 
@@ -92,8 +99,12 @@ private function clearRedis()
             $options['options']['port']
         );
 
-        $keys = $redis->keys("*");
-        $keys = $keys ?: [];
+        /**
+         * keys() is typed array|Redis because phpredis answers itself when the
+         * connection is in pipeline mode. It is not, here.
+         */
+        $keys = $redis->keys('*');
+        $keys = is_array($keys) ? $keys : [];
         echo sprintf('Found %s keys', count($keys)) . PHP_EOL;
         foreach ($keys as $key) {
             if ('api-data' === substr($key, 0, 8)) {
diff --git a/cli/tasks/MainTask.php b/src/Cli/Tasks/MainTask.php
similarity index 90%
rename from cli/tasks/MainTask.php
rename to src/Cli/Tasks/MainTask.php
index 330d82ad..c071fc30 100755
--- a/cli/tasks/MainTask.php
+++ b/src/Cli/Tasks/MainTask.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon API.
@@ -10,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Phalcon\Api\Cli\Tasks;
 
 use Phalcon\Cli\Task as PhTask;
@@ -20,8 +21,10 @@ class MainTask extends PhTask
 {
     /**
      * Executes the main action of the cli mapping passed parameters to tasks
+     *
+     * @return void
      */
-    public function mainAction()
+    public function mainAction(): void
     {
         // 'green' => "\033[0;32m(%s)\033[0m",
         // 'red'   => "\033[0;31m(%s)\033[0m",
@@ -31,7 +34,7 @@ public function mainAction()
             . " Phalcon Team | (C) {$year}" . PHP_EOL
             . "******************************************************" . PHP_EOL
             . "" . PHP_EOL
-            . "Usage: runCli <command>" . PHP_EOL
+            . "Usage: bin/cli <command>" . PHP_EOL
             . "" . PHP_EOL
             . "  --help         \e[0;32m(safe)\e[0m shows the help screen/available commands" . PHP_EOL
             . "  --clear-cache  \e[0;32m(safe)\e[0m clears the cache folders" . PHP_EOL
diff --git a/cli/config/providers.php b/src/Cli/providers.php
similarity index 100%
rename from cli/config/providers.php
rename to src/Cli/providers.php
diff --git a/library/Constants/Flags.php b/src/Constants/Flags.php
similarity index 100%
rename from library/Constants/Flags.php
rename to src/Constants/Flags.php
diff --git a/library/Constants/Relationships.php b/src/Constants/Relationships.php
similarity index 100%
rename from library/Constants/Relationships.php
rename to src/Constants/Relationships.php
diff --git a/src/Core/autoload.php b/src/Core/autoload.php
new file mode 100644
index 00000000..3758b02e
--- /dev/null
+++ b/src/Core/autoload.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Dotenv\Dotenv;
+use Phalcon\Autoload\Loader;
+
+use function Phalcon\Api\Core\appPath;
+
+// appPath() and friends; needed before anything can be located
+require __DIR__ . '/functions.php';
+
+/**
+ * Composer first. On the v5 variant Phalcon is a C extension and its classes
+ * exist unconditionally, but on v6 the framework IS a Composer package - so
+ * `new Loader()` below cannot be reached without Composer's autoloader already
+ * registered. Loading it second worked only because the extension happened to
+ * be there.
+ */
+require appPath('/vendor/autoload.php');
+
+/**
+ * The loader resolves by namespace prefix, so a single entry covers the whole
+ * source tree: Phalcon\Api\Models\Users -> src/Models/Users.php, and
+ * Phalcon\Api\Api\Controllers\LoginController -> src/Api/Controllers/LoginController.php.
+ */
+$loader     = new Loader();
+$namespaces = [
+    'Phalcon\Api'       => appPath('/src'),
+    'Phalcon\Api\Tests' => appPath('/tests'),
+];
+
+$loader->setNamespaces($namespaces);
+$loader->register();
+
+// Load environment
+(Dotenv::createImmutable(appPath()))->load();
diff --git a/library/Core/config.php b/src/Core/config.php
similarity index 56%
rename from library/Core/config.php
rename to src/Core/config.php
index e81137fe..226b9fcf 100644
--- a/library/Core/config.php
+++ b/src/Core/config.php
@@ -16,6 +16,22 @@
 
 use function Phalcon\Api\Core\envValue;
 
+/**
+ * The cache and the production metadata store are the same Redis, differing
+ * only in the prefix they namespace their keys with. Stated once: the last time
+ * these two blocks were maintained separately, a `lifetime` that arrived as a
+ * string had to be cast in both, and missing either one returns HTTP 500 from
+ * every endpoint that reads a record.
+ */
+$redisOptions = static fn (string $prefix): array => [
+    'host'     => envValue('DATA_API_REDIS_HOST', '127.0.0.1'),
+    'port'     => envValue('DATA_API_REDIS_PORT', 6379),
+    'index'    => envValue('DATA_API_REDIS_WEIGHT', 0),
+    // Env values arrive as strings; AbstractAdapter::getTtl() returns int.
+    'lifetime' => (int) envValue('CACHE_LIFETIME', 86400),
+    'prefix'   => $prefix,
+];
+
 return [
     'app'      => [
         'version'      => envValue('VERSION', time()),
@@ -29,13 +45,7 @@
     ],
     'cache'    => [
         'adapter' => 'redis',
-        'options' => [
-            'host'     => envValue('DATA_API_REDIS_HOST', '127.0.0.1'),
-            'port'     => envValue('DATA_API_REDIS_PORT', 6379),
-            'index'    => envValue('DATA_API_REDIS_WEIGHT', 0),
-            'lifetime' => envValue('CACHE_LIFETIME', 86400),
-            'prefix'   => 'data-',
-        ],
+        'options' => $redisOptions('data-'),
     ],
     'metadata' => [
         'dev'  => [
@@ -44,13 +54,7 @@
         ],
         'prod' => [
             'adapter' => Redis::class,
-            'options' => [
-                'host'     => envValue('DATA_API_REDIS_HOST', '127.0.0.1'),
-                'port'     => envValue('DATA_API_REDIS_PORT', 6379),
-                'index'    => envValue('DATA_API_REDIS_WEIGHT', 0),
-                'lifetime' => envValue('CACHE_LIFETIME', 86400),
-                'prefix'   => 'metadata-',
-            ],
+            'options' => $redisOptions('metadata-'),
         ],
     ],
 ];
diff --git a/library/Core/functions.php b/src/Core/functions.php
similarity index 68%
rename from library/Core/functions.php
rename to src/Core/functions.php
index 7aa04347..308607f5 100644
--- a/library/Core/functions.php
+++ b/src/Core/functions.php
@@ -32,7 +32,16 @@ function appPath(string $path = ''): string
 if (true !== function_exists('Phalcon\Api\Core\envValue')) {
     /**
      * Gets a variable from the environment, returns it properly formatted or the
-     * default if it does not exist
+     * default if it does not exist.
+     *
+     * The real environment is consulted first, then $_ENV, then the default.
+     * Reading $_ENV alone is not enough: $_ENV is only populated from the
+     * environment when php's `variables_order` contains `E` (the container sets
+     * EGPCS; a stock CI runner does not), and phpdotenv is immutable - when a
+     * variable already exists in the environment it declines to copy it into
+     * $_ENV. Between the two, an exported variable would otherwise be invisible
+     * here AND suppress the .env entry of the same name, leaving only the
+     * default.
      *
      * @param string     $variable
      * @param mixed|null $default
@@ -41,7 +50,12 @@ function appPath(string $path = ''): string
      */
     function envValue(string $variable, mixed $default = null): mixed
     {
-        $value  = $_ENV[$variable] ?? $default;
+        $value = getenv($variable);
+
+        if (false === $value) {
+            $value = $_ENV[$variable] ?? $default;
+        }
+
         $values = [
             'false' => false,
             'true'  => true,
diff --git a/library/ErrorHandler.php b/src/ErrorHandler.php
similarity index 88%
rename from library/ErrorHandler.php
rename to src/ErrorHandler.php
index 41445d30..0789def9 100644
--- a/library/ErrorHandler.php
+++ b/src/ErrorHandler.php
@@ -52,7 +52,7 @@ public function __construct(Logger $logger, Config $config)
      * @param string $file
      * @param int    $line
      *
-     * @return void
+     * @return bool
      * @throws Exception
      */
     public function handle(
@@ -60,7 +60,7 @@ public function handle(
         string $message,
         string $file = '',
         int $line = 0
-    ): void {
+    ): bool {
         $this
             ->logger
             ->error(
@@ -73,6 +73,13 @@ public function handle(
                 )
             )
         ;
+
+        /**
+         * The error is handled: it has been logged. Returning nothing would
+         * hand it on to PHP's internal handler as well, which is the contract
+         * set_error_handler() documents for a falsy return.
+         */
+        return true;
     }
 
     /**
diff --git a/library/Exception/Exception.php b/src/Exception/Exception.php
similarity index 100%
rename from library/Exception/Exception.php
rename to src/Exception/Exception.php
diff --git a/library/Exception/HttpException.php b/src/Exception/HttpException.php
similarity index 100%
rename from library/Exception/HttpException.php
rename to src/Exception/HttpException.php
diff --git a/library/Exception/ModelException.php b/src/Exception/ModelException.php
similarity index 100%
rename from library/Exception/ModelException.php
rename to src/Exception/ModelException.php
diff --git a/library/Http/Request.php b/src/Http/Request.php
similarity index 94%
rename from library/Http/Request.php
rename to src/Http/Request.php
index 3d7bed81..727e55a7 100644
--- a/library/Http/Request.php
+++ b/src/Http/Request.php
@@ -40,6 +40,6 @@ public function isEmptyBearerToken(): bool
      */
     public function isLoginPage(): bool
     {
-        return ('/login' === $this->getURI());
+        return '/login' === $this->getURI();
     }
 }
diff --git a/library/Http/Response.php b/src/Http/Response.php
similarity index 89%
rename from library/Http/Response.php
rename to src/Http/Response.php
index 2fb199b1..3374fb13 100644
--- a/library/Http/Response.php
+++ b/src/Http/Response.php
@@ -15,7 +15,7 @@
 
 use Phalcon\Http\Response as PhResponse;
 use Phalcon\Http\ResponseInterface;
-use Phalcon\Messages\Messages;
+use Phalcon\Messages\MessageInterface;
 
 use function date;
 use function is_array;
@@ -25,21 +25,22 @@
 
 class Response extends PhResponse
 {
-    public const OK                    = 200;
-    public const CREATED               = 201;
     public const ACCEPTED              = 202;
-    public const MOVED_PERMANENTLY     = 301;
-    public const FOUND                 = 302;
-    public const TEMPORARY_REDIRECT    = 307;
-    public const PERMANENTLY_REDIRECT  = 308;
+    public const BAD_GATEWAY           = 502;
     public const BAD_REQUEST           = 400;
-    public const UNAUTHORIZED          = 401;
+    public const CREATED               = 201;
     public const FORBIDDEN             = 403;
-    public const NOT_FOUND             = 404;
+    public const FOUND                 = 302;
     public const INTERNAL_SERVER_ERROR = 500;
+    public const MOVED_PERMANENTLY     = 301;
+    public const NOT_FOUND             = 404;
     public const NOT_IMPLEMENTED       = 501;
-    public const BAD_GATEWAY           = 502;
+    public const OK                    = 200;
+    public const PERMANENTLY_REDIRECT  = 308;
+    public const TEMPORARY_REDIRECT    = 307;
+    public const UNAUTHORIZED          = 401;
 
+    /** @var array<int, string> */
     private array $codes = [
         200 => 'OK',
         301 => 'Moved Permanently',
@@ -83,7 +84,7 @@ public function send(): ResponseInterface
         $hash      = sha1($timestamp . $content);
         $eTag      = sha1($content);
 
-        /** @var array $content */
+        /** @var array<string, mixed> $content */
         $content = json_decode($this->getContent(), true);
         $jsonapi = [
             'jsonapi' => [
@@ -125,9 +126,13 @@ public function setPayloadError(string $detail = ''): Response
     }
 
     /**
-     * Traverses the errors collection and sets the errors in the payload
+     * Traverses the errors collection and sets the errors in the payload.
+     *
+     * Documented as Messages for years while every caller passed something
+     * else: Model::getMessages() answers a plain array. All this needs is
+     * something iterable whose items carry getMessage().
      *
-     * @param Messages $errors
+     * @param iterable<MessageInterface> $errors
      *
      * @return Response
      */
@@ -146,7 +151,7 @@ public function setPayloadErrors($errors): Response
     /**
      * Sets the payload code as Success
      *
-     * @param null|string|array $content The content
+     * @param array<string, mixed>|string|null $content The content
      *
      * @return Response
      */
diff --git a/src/Middleware/AuthenticationMiddleware.php b/src/Middleware/AuthenticationMiddleware.php
new file mode 100755
index 00000000..21e20037
--- /dev/null
+++ b/src/Middleware/AuthenticationMiddleware.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Middleware;
+
+use Phalcon\Api\Http\Request;
+use Phalcon\Api\Http\Response;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Repositories\UsersRepository;
+use Phalcon\Api\Traits\ResponseTrait;
+use Phalcon\Api\Traits\TokenTrait;
+use Phalcon\Encryption\Security\JWT\Signer\Hmac;
+use Phalcon\Mvc\Micro;
+use Phalcon\Mvc\Micro\MiddlewareInterface;
+
+use function implode;
+
+/**
+ * Authorizes the request.
+ *
+ * The bearer token is parsed once and the user resolved once, then the three
+ * phases of authorization run in order:
+ *
+ *   1. is the user carried by the token one that we know?
+ *   2. was the token signed with that user's passphrase?
+ *   3. do the token's claims match the ones we expect?
+ *
+ * The login route is exempt - it is what issues the token in the first place.
+ */
+class AuthenticationMiddleware implements MiddlewareInterface
+{
+    use ResponseTrait;
+    use TokenTrait;
+
+    /**
+     * Call me
+     *
+     * @param Micro $api
+     *
+     * @return bool
+     */
+    public function call(Micro $api): bool
+    {
+        /** @var Request $request */
+        $request = $api->getService('request');
+        /** @var Response $response */
+        $response = $api->getService('response');
+        /** @var UsersRepository $usersRepository */
+        $usersRepository = $api->getService('usersRepository');
+
+        if (true === $request->isLoginPage()) {
+            return true;
+        }
+
+        if (true === $request->isEmptyBearerToken()) {
+            $this->halt($api, $response::OK, 'Invalid Token');
+
+            return false;
+        }
+
+        $token = $this->getToken($request->getBearerTokenFromHeader());
+
+        /**
+         * Phase 1 - is the user attached to this token in the database?
+         */
+        /** @var Users|null $user */
+        $user = $usersRepository->getByToken($token);
+        if (null === $user) {
+            $this->halt($api, $response::OK, 'Invalid token (user)');
+
+            return false;
+        }
+
+        /**
+         * Phase 2 - was the token signed with this user's passphrase?
+         */
+        if (false === $token->verify(new Hmac(), $user->get('tokenPassword'))) {
+            $this->halt($api, $response::OK, 'Invalid Token (verification)');
+
+            return false;
+        }
+
+        /**
+         * Phase 3 - do the claims the token carries match this user's?
+         */
+        $errors = $token->validate($user->getValidationData($token));
+        if (true !== empty($errors)) {
+            $this->halt(
+                $api,
+                $response::OK,
+                'Invalid Token [' . implode('; ', $errors) . ']'
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/library/Middleware/NotFoundMiddleware.php b/src/Middleware/NotFoundMiddleware.php
similarity index 100%
rename from library/Middleware/NotFoundMiddleware.php
rename to src/Middleware/NotFoundMiddleware.php
diff --git a/library/Middleware/ResponseMiddleware.php b/src/Middleware/ResponseMiddleware.php
similarity index 100%
rename from library/Middleware/ResponseMiddleware.php
rename to src/Middleware/ResponseMiddleware.php
diff --git a/library/Models/Companies.php b/src/Models/Companies.php
similarity index 90%
rename from library/Models/Companies.php
rename to src/Models/Companies.php
index 68a9aff3..0cd42a70 100644
--- a/library/Models/Companies.php
+++ b/src/Models/Companies.php
@@ -24,6 +24,35 @@
  */
 class Companies extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'id'      => Filter::FILTER_ABSINT,
+            'name'    => Filter::FILTER_STRING,
+            'address' => Filter::FILTER_STRING,
+            'city'    => Filter::FILTER_STRING,
+            'phone'   => Filter::FILTER_STRING,
+        ];
+    }
+    /**
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'name',
+            'address',
+            'city',
+            'phone',
+        ];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -59,22 +88,6 @@ public function initialize(): void
         parent::initialize();
     }
 
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'id'      => Filter::FILTER_ABSINT,
-            'name'    => Filter::FILTER_STRING,
-            'address' => Filter::FILTER_STRING,
-            'city'    => Filter::FILTER_STRING,
-            'phone'   => Filter::FILTER_STRING,
-        ];
-    }
-
     /**
      * Validates the company name
      *
diff --git a/library/Models/CompaniesXProducts.php b/src/Models/CompaniesXProducts.php
similarity index 83%
rename from library/Models/CompaniesXProducts.php
rename to src/Models/CompaniesXProducts.php
index 190a738c..2edb4913 100644
--- a/library/Models/CompaniesXProducts.php
+++ b/src/Models/CompaniesXProducts.php
@@ -22,6 +22,30 @@
  */
 class CompaniesXProducts extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'companyId' => Filter::FILTER_ABSINT,
+            'productId' => Filter::FILTER_ABSINT,
+        ];
+    }
+
+    /**
+     * Nothing. This is the companies/products junction; it is not an API
+     * resource and has no route, controller or transformer of its own.
+     *
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -53,17 +77,4 @@ public function initialize(): void
 
         parent::initialize();
     }
-
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'companyId' => Filter::FILTER_ABSINT,
-            'productId' => Filter::FILTER_ABSINT,
-        ];
-    }
 }
diff --git a/library/Models/IndividualTypes.php b/src/Models/IndividualTypes.php
similarity index 86%
rename from library/Models/IndividualTypes.php
rename to src/Models/IndividualTypes.php
index c93d626a..d926e751 100644
--- a/library/Models/IndividualTypes.php
+++ b/src/Models/IndividualTypes.php
@@ -22,6 +22,32 @@
  */
 class IndividualTypes extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'id'          => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+        ];
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'name',
+            'description',
+        ];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -43,18 +69,4 @@ public function initialize(): void
 
         parent::initialize();
     }
-
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'id'          => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-        ];
-    }
 }
diff --git a/library/Models/Individuals.php b/src/Models/Individuals.php
similarity index 84%
rename from library/Models/Individuals.php
rename to src/Models/Individuals.php
index 3fd5eb6d..4136fad4 100644
--- a/library/Models/Individuals.php
+++ b/src/Models/Individuals.php
@@ -22,6 +22,42 @@
  */
 class Individuals extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'id'        => Filter::FILTER_ABSINT,
+            'companyId' => Filter::FILTER_ABSINT,
+            'typeId'    => Filter::FILTER_ABSINT,
+            'prefix'    => Filter::FILTER_STRING,
+            'first'     => Filter::FILTER_STRING,
+            'middle'    => Filter::FILTER_STRING,
+            'last'      => Filter::FILTER_STRING,
+            'suffix'    => Filter::FILTER_STRING,
+        ];
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'companyId',
+            'typeId',
+            'prefix',
+            'first',
+            'middle',
+            'last',
+            'suffix',
+        ];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -53,23 +89,4 @@ public function initialize(): void
 
         parent::initialize();
     }
-
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'id'        => Filter::FILTER_ABSINT,
-            'companyId' => Filter::FILTER_ABSINT,
-            'typeId'    => Filter::FILTER_ABSINT,
-            'prefix'    => Filter::FILTER_STRING,
-            'first'     => Filter::FILTER_STRING,
-            'middle'    => Filter::FILTER_STRING,
-            'last'      => Filter::FILTER_STRING,
-            'suffix'    => Filter::FILTER_STRING,
-        ];
-    }
 }
diff --git a/library/Models/ProductTypes.php b/src/Models/ProductTypes.php
similarity index 86%
rename from library/Models/ProductTypes.php
rename to src/Models/ProductTypes.php
index ed53de19..aeb27238 100644
--- a/library/Models/ProductTypes.php
+++ b/src/Models/ProductTypes.php
@@ -22,6 +22,32 @@
  */
 class ProductTypes extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'id'          => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+        ];
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'name',
+            'description',
+        ];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -43,18 +69,4 @@ public function initialize(): void
 
         parent::initialize();
     }
-
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'id'          => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-        ];
-    }
 }
diff --git a/library/Models/Products.php b/src/Models/Products.php
similarity index 86%
rename from library/Models/Products.php
rename to src/Models/Products.php
index ca8324cd..1f347918 100644
--- a/library/Models/Products.php
+++ b/src/Models/Products.php
@@ -22,6 +22,38 @@
  */
 class Products extends AbstractModel
 {
+    /**
+     * Model filters
+     *
+     * @return array<string,string>
+     */
+    public function getModelFilters(): array
+    {
+        return [
+            'id'          => Filter::FILTER_ABSINT,
+            'typeId'      => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+            'quantity'    => Filter::FILTER_ABSINT,
+            'price'       => Filter::FILTER_FLOAT,
+        ];
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'typeId',
+            'name',
+            'description',
+            'quantity',
+            'price',
+        ];
+    }
+
     /**
      * Initialize relationships and model properties
      *
@@ -56,21 +88,4 @@ public function initialize(): void
 
         parent::initialize();
     }
-
-    /**
-     * Model filters
-     *
-     * @return array<string,string>
-     */
-    public function getModelFilters(): array
-    {
-        return [
-            'id'          => Filter::FILTER_ABSINT,
-            'typeId'      => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-            'quantity'    => Filter::FILTER_ABSINT,
-            'price'       => Filter::FILTER_FLOAT,
-        ];
-    }
 }
diff --git a/library/Models/Users.php b/src/Models/Users.php
similarity index 69%
rename from library/Models/Users.php
rename to src/Models/Users.php
index b73817e2..77d67928 100644
--- a/library/Models/Users.php
+++ b/src/Models/Users.php
@@ -16,12 +16,13 @@
 use Phalcon\Api\Exception\ModelException;
 use Phalcon\Api\Mvc\Model\AbstractModel;
 use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Filter\Filter;
 use Phalcon\Encryption\Security\JWT\Builder;
 use Phalcon\Encryption\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Encryption\Security\JWT\Signer\Hmac;
+use Phalcon\Encryption\Security\JWT\Token\Enum;
 use Phalcon\Encryption\Security\JWT\Token\Token;
 use Phalcon\Encryption\Security\JWT\Validator;
+use Phalcon\Filter\Filter;
 
 /**
  * Class Users
@@ -30,16 +31,6 @@ class Users extends AbstractModel
 {
     use TokenTrait;
 
-    /**
-     * Returns the source table from the database
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        $this->setSource('co_users');
-    }
-
     /**
      * Model filters
      *
@@ -58,6 +49,24 @@ public function getModelFilters(): array
         ];
     }
 
+    /**
+     * `password` and `tokenPassword` are deliberately absent. `tokenPassword`
+     * is the passphrase the token signature is verified against - publishing it
+     * would let any caller forge a token for this user.
+     *
+     * @return array<int, string>
+     */
+    public function getPublicFields(): array
+    {
+        return [
+            'id',
+            'status',
+            'username',
+            'issuer',
+            'tokenId',
+        ];
+    }
+
     /**
      * Returns the string token
      *
@@ -72,20 +81,37 @@ public function getToken(): string
     }
 
     /**
-     * Returns the Validator object for this record (JWT)
+     * Returns the Validator for the token that was sent to us, carrying the
+     * values this record and the environment expect that token to hold.
+     *
+     * @param Token $token The token from the request - it is the one validated
      *
      * @return Validator
      * @throws ModelException
      */
-    public function getValidationData(): Validator
+    public function getValidationData(Token $token): Validator
     {
-        $token = $this->getBuilderToken();
+        $validator = new Validator($token, 10);
+
+        return $validator
+            ->set(Enum::AUDIENCE, $this->getTokenAudience())
+            ->set(Enum::ISSUER, $this->get('issuer'))
+            ->set(Enum::ID, $this->get('tokenId'))
+        ;
+    }
 
-        return new Validator($token, 10);
+    /**
+     * Returns the source table from the database
+     *
+     * @return void
+     */
+    public function initialize(): void
+    {
+        $this->setSource('co_users');
     }
 
     /**
-     * @return Builder
+     * @return Token
      * @throws ModelException
      * @throws ValidatorException
      */
diff --git a/library/Mvc/Model/AbstractModel.php b/src/Mvc/Model/AbstractModel.php
similarity index 67%
rename from library/Mvc/Model/AbstractModel.php
rename to src/Mvc/Model/AbstractModel.php
index 632100be..db426cdd 100644
--- a/library/Mvc/Model/AbstractModel.php
+++ b/src/Mvc/Model/AbstractModel.php
@@ -22,21 +22,6 @@
 
 abstract class AbstractModel extends PhModel
 {
-    /**
-     * Master initializer
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        $this->setup(
-            [
-                'phqlLiterals'       => false,
-                'notNullValidations' => false,
-            ]
-        );
-    }
-
     /**
      * Gets a field from this model
      *
@@ -78,7 +63,38 @@ public function getModelMessages(Logger $logger = null): string
     }
 
     /**
-     * Sets a field in the model sanitized
+     * The fields this model is willing to publish through the API.
+     *
+     * Deliberately separate from getModelFilters(): that map answers how a
+     * field is sanitised, which is not the same question as whether the world
+     * may see it. Every model must answer this one for itself, so that adding
+     * a column never publishes it by accident.
+     *
+     * @return array<int, string>
+     */
+    abstract public function getPublicFields(): array;
+
+    /**
+     * Master initializer
+     *
+     * @return void
+     */
+    public function initialize(): void
+    {
+        $this->setup(
+            [
+                'phqlLiterals'       => false,
+                'notNullValidations' => false,
+            ]
+        );
+    }
+
+    /**
+     * Sets a field in the model.
+     *
+     * The value is stored as it was given. Sanitising is get()'s job - doing it
+     * here as well escaped everything twice, so a stored '&' came back out as
+     * '&amp;amp;'.
      *
      * @param string $field The name of the field
      * @param mixed  $value The value of the field
@@ -94,7 +110,12 @@ public function set($field, $value): AbstractModel
     }
 
     /**
-     * Gets or sets a field and sanitizes it if necessary
+     * Gets or sets a field, sanitising on the way out only.
+     *
+     * Both directions used to sanitise, which escaped every value twice: set()
+     * turned '&' into '&amp;' and get() then turned that into '&amp;amp;'. The
+     * filter map is still consulted for both, so an unknown field is rejected
+     * either way.
      *
      * @param string $type
      * @param string $field
@@ -121,7 +142,7 @@ private function getSetFields(string $type, string $field, $value = ''): mixed
         if ('get' === $type) {
             $return = $this->sanitize($this->$field, $filter);
         } else {
-            $this->$field = $this->sanitize($value, $filter);
+            $this->$field = $value;
         }
 
         return $return;
@@ -130,17 +151,24 @@ private function getSetFields(string $type, string $field, $value = ''): mixed
     /**
      * Uses the Phalcon Filter to sanitize the variable passed
      *
-     * @param mixed        $value  The value to sanitize
-     * @param string|array $filter The filter to apply
+     * @param mixed                     $value  The value to sanitize
+     * @param string|array<int, string>  $filter The filter, or a chain of them
      *
      * @return mixed
+     * @throws ModelException
      */
     private function sanitize($value, $filter): mixed
     {
+        $container = $this->getDI();
+
+        if (null === $container) {
+            throw new ModelException(
+                'A model cannot sanitize its fields without a container'
+            );
+        }
+
         /** @var Filter $filterService */
-        $filterService = $this->getDI()
-                              ->get('filter')
-        ;
+        $filterService = $container->get('filter');
 
         return $filterService->sanitize($value, $filter);
     }
diff --git a/library/Providers/CacheDataProvider.php b/src/Providers/CacheDataProvider.php
similarity index 100%
rename from library/Providers/CacheDataProvider.php
rename to src/Providers/CacheDataProvider.php
diff --git a/library/Providers/CliDispatcherProvider.php b/src/Providers/CliDispatcherProvider.php
similarity index 100%
rename from library/Providers/CliDispatcherProvider.php
rename to src/Providers/CliDispatcherProvider.php
diff --git a/library/Providers/ConfigProvider.php b/src/Providers/ConfigProvider.php
similarity index 91%
rename from library/Providers/ConfigProvider.php
rename to src/Providers/ConfigProvider.php
index 3b21acca..8d359006 100644
--- a/library/Providers/ConfigProvider.php
+++ b/src/Providers/ConfigProvider.php
@@ -29,7 +29,7 @@ public function register(DiInterface $container): void
         $container->setShared(
             'config',
             function () {
-                $data = require appPath('library/Core/config.php');
+                $data = require appPath('src/Core/config.php');
 
                 return new Config($data);
             }
diff --git a/library/Providers/DatabaseProvider.php b/src/Providers/DatabaseProvider.php
similarity index 100%
rename from library/Providers/DatabaseProvider.php
rename to src/Providers/DatabaseProvider.php
diff --git a/library/Providers/ErrorHandlerProvider.php b/src/Providers/ErrorHandlerProvider.php
similarity index 97%
rename from library/Providers/ErrorHandlerProvider.php
rename to src/Providers/ErrorHandlerProvider.php
index e5f64d5e..d236c54a 100644
--- a/library/Providers/ErrorHandlerProvider.php
+++ b/src/Providers/ErrorHandlerProvider.php
@@ -38,7 +38,7 @@ public function register(DiInterface $container): void
     {
         /** @var Logger $logger */
         $logger = $container->getShared('logger');
-        /** @var Config $registry */
+        /** @var Config $config */
         $config = $container->getShared('config');
 
         date_default_timezone_set($config->path('app.timezone'));
diff --git a/library/Providers/LoggerProvider.php b/src/Providers/LoggerProvider.php
similarity index 100%
rename from library/Providers/LoggerProvider.php
rename to src/Providers/LoggerProvider.php
diff --git a/library/Providers/ModelsMetadataProvider.php b/src/Providers/ModelsMetadataProvider.php
similarity index 63%
rename from library/Providers/ModelsMetadataProvider.php
rename to src/Providers/ModelsMetadataProvider.php
index 6a2a5ad9..d54d165a 100644
--- a/library/Providers/ModelsMetadataProvider.php
+++ b/src/Providers/ModelsMetadataProvider.php
@@ -37,19 +37,27 @@ function () use ($config) {
                 $metadata = $config->get('metadata');
                 $devMode  = $config->path('app.devMode');
                 $key      = (true === $devMode) ? 'dev' : 'prod';
-                $options  = $metadata->get($key, [])
+                $entry    = $metadata->get($key, [])
                                      ->toArray()
                 ;
-                $adapter  = $options['adapter'] ?? Redis::class;
 
-                if ($adapter === Memory::class) {
-                    return new $adapter($options);
-                } else {
-                    $serializer     = new SerializerFactory();
-                    $adapterFactory = new AdapterFactory($serializer);
+                /**
+                 * The entry is ['adapter' => ..., 'options' => [...]]; the
+                 * adapter wants the inner array. Handing it the outer one costs
+                 * it the host and sends it to 127.0.0.1.
+                 */
+                $adapter = $entry['adapter'] ?? Redis::class;
+                $options = $entry['options'] ?? [];
 
-                    return new $adapter($adapterFactory, $options);
+                if ($adapter === Memory::class) {
+                    // Memory declares no constructor; it takes no options.
+                    return new Memory();
                 }
+
+                $serializer     = new SerializerFactory();
+                $adapterFactory = new AdapterFactory($serializer);
+
+                return new $adapter($adapterFactory, $options);
             }
         );
     }
diff --git a/src/Providers/QueryServiceProvider.php b/src/Providers/QueryServiceProvider.php
new file mode 100644
index 00000000..b9dfcf72
--- /dev/null
+++ b/src/Providers/QueryServiceProvider.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Providers;
+
+use Phalcon\Api\Services\QueryService;
+use Phalcon\Di\DiInterface;
+use Phalcon\Di\ServiceProviderInterface;
+
+class QueryServiceProvider implements ServiceProviderInterface
+{
+    /**
+     * Registers the query service
+     *
+     * @param DiInterface $container
+     */
+    public function register(DiInterface $container): void
+    {
+        $container->setShared(
+            'queryService',
+            /**
+             * Resolved lazily - `cache` is registered after this provider runs.
+             */
+            function () use ($container) {
+                return new QueryService(
+                    $container->getShared('config'),
+                    $container->getShared('cache')
+                );
+            }
+        );
+    }
+}
diff --git a/library/Providers/RequestProvider.php b/src/Providers/RequestProvider.php
similarity index 100%
rename from library/Providers/RequestProvider.php
rename to src/Providers/RequestProvider.php
diff --git a/library/Providers/ResponseProvider.php b/src/Providers/ResponseProvider.php
similarity index 100%
rename from library/Providers/ResponseProvider.php
rename to src/Providers/ResponseProvider.php
diff --git a/library/Providers/RouterProvider.php b/src/Providers/RouterProvider.php
similarity index 83%
rename from library/Providers/RouterProvider.php
rename to src/Providers/RouterProvider.php
index 48a6c386..94c5ba7d 100644
--- a/library/Providers/RouterProvider.php
+++ b/src/Providers/RouterProvider.php
@@ -25,9 +25,6 @@
 use Phalcon\Api\Middleware\AuthenticationMiddleware;
 use Phalcon\Api\Middleware\NotFoundMiddleware;
 use Phalcon\Api\Middleware\ResponseMiddleware;
-use Phalcon\Api\Middleware\TokenUserMiddleware;
-use Phalcon\Api\Middleware\TokenValidationMiddleware;
-use Phalcon\Api\Middleware\TokenVerificationMiddleware;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Events\Manager;
@@ -69,11 +66,15 @@ private function attachMiddleware(
         $middleware = $this->getMiddleware();
 
         /**
-         * Get the events manager and attach the middleware to it
+         * Get the events manager and attach the middleware to it. One instance
+         * per middleware, shared by the events manager and the application -
+         * two instances would give each its own state.
          */
         foreach ($middleware as $class => $function) {
-            $eventsManager->attach('micro', new $class());
-            $application->{$function}(new $class());
+            $object = new $class();
+
+            $eventsManager->attach('micro', $object);
+            $application->{$function}($object);
         }
     }
 
@@ -103,24 +104,48 @@ private function attachRoutes(Micro $application): void
     /**
      * Returns the array for the middleware with the action to attach
      *
-     * @return array
+     * @return array<class-string, string> Middleware class => the Micro hook it attaches to
      */
     private function getMiddleware(): array
     {
         return [
-            NotFoundMiddleware::class          => 'before',
-            AuthenticationMiddleware::class    => 'before',
-            TokenUserMiddleware::class         => 'before',
-            TokenVerificationMiddleware::class => 'before',
-            TokenValidationMiddleware::class   => 'before',
-            ResponseMiddleware::class          => 'after',
+            NotFoundMiddleware::class       => 'before',
+            AuthenticationMiddleware::class => 'before',
+            ResponseMiddleware::class       => 'after',
+        ];
+    }
+
+    /**
+     * Adds multiple routes for the same handler abiding by the JSONAPI standard
+     *
+     * @param array<int, array{0: class-string, 1: string, 2: string, 3: string}> $routes
+     * @param class-string                                                        $class
+     * @param string                                                              $relationship
+     *
+     * @return array<int, array{0: class-string, 1: string, 2: string, 3: string}>
+     */
+    private function getMultiRoutes(
+        array $routes,
+        string $class,
+        string $relationship
+    ): array {
+        $routes[] = [$class, '/' . $relationship, 'get', '/'];
+        $routes[] = [$class, '/' . $relationship, 'get', '/{recordId:[0-9]+}'];
+        $routes[] = [$class, '/' . $relationship, 'get', '/{recordId:[0-9]+}/{relationships:[a-zA-Z-,.]+}'];
+        $routes[] = [
+            $class,
+            '/' . $relationship,
+            'get',
+            '/{recordId:[0-9]+}/relationships/{relationships:[a-zA-Z-,.]+}',
         ];
+
+        return $routes;
     }
 
     /**
      * Returns the array for the routes
      *
-     * @return array
+     * @return array<int, array{0: class-string, 1: string, 2: string, 3: string}> Handler, prefix, verb, route
      */
     private function getRoutes(): array
     {
@@ -160,31 +185,4 @@ private function getRoutes(): array
 
         return $routes;
     }
-
-    /**
-     * Adds multiple routes for the same handler abiding by the JSONAPI standard
-     *
-     * @param array  $routes
-     * @param string $class
-     * @param string $relationship
-     *
-     * @return array
-     */
-    private function getMultiRoutes(
-        array $routes,
-        string $class,
-        string $relationship
-    ): array {
-        $routes[] = [$class, '/' . $relationship, 'get', '/'];
-        $routes[] = [$class, '/' . $relationship, 'get', '/{recordId:[0-9]+}'];
-        $routes[] = [$class, '/' . $relationship, 'get', '/{recordId:[0-9]+}/{relationships:[a-zA-Z-,.]+}'];
-        $routes[] = [
-            $class,
-            '/' . $relationship,
-            'get',
-            '/{recordId:[0-9]+}/relationships/{relationships:[a-zA-Z-,.]+}',
-        ];
-
-        return $routes;
-    }
 }
diff --git a/src/Providers/UsersRepositoryProvider.php b/src/Providers/UsersRepositoryProvider.php
new file mode 100644
index 00000000..1b285478
--- /dev/null
+++ b/src/Providers/UsersRepositoryProvider.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Providers;
+
+use Phalcon\Api\Repositories\UsersRepository;
+use Phalcon\Di\DiInterface;
+use Phalcon\Di\ServiceProviderInterface;
+
+class UsersRepositoryProvider implements ServiceProviderInterface
+{
+    /**
+     * Registers the users repository
+     *
+     * @param DiInterface $container
+     */
+    public function register(DiInterface $container): void
+    {
+        $container->setShared(
+            'usersRepository',
+            function () use ($container) {
+                return new UsersRepository(
+                    $container->getShared('queryService'),
+                    $container->getShared('security')
+                );
+            }
+        );
+    }
+}
diff --git a/src/Repositories/UsersRepository.php b/src/Repositories/UsersRepository.php
new file mode 100644
index 00000000..dcaef1af
--- /dev/null
+++ b/src/Repositories/UsersRepository.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Repositories;
+
+use Phalcon\Api\Constants\Flags;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Services\QueryService;
+use Phalcon\Encryption\Security;
+use Phalcon\Encryption\Security\JWT\Token\Enum;
+use Phalcon\Encryption\Security\JWT\Token\Token;
+
+/**
+ * Looks users up. The knowledge of how a user is identified - by token claims
+ * or by credentials - lives here rather than in a general purpose query helper.
+ */
+class UsersRepository
+{
+    /**
+     * A valid bcrypt hash of a value nobody knows. Checked against when no user
+     * matches, so that a miss costs the same bcrypt round as a hit and the
+     * response time stops telling an attacker which usernames exist.
+     */
+    private const DUMMY_HASH = '$2y$10$jG0Drp7/ZBXXPPsW1zzG6uCNpNMMwTOucqTCnX5ikNmicIJ0kqcEq';
+
+    /**
+     * @param QueryService $queryService
+     * @param Security     $security
+     */
+    public function __construct(
+        private readonly QueryService $queryService,
+        private readonly Security $security
+    ) {
+    }
+
+    /**
+     * Gets a user from the database based on the JWT token
+     *
+     * @param Token $token
+     *
+     * @return Users|null
+     */
+    public function getByToken(Token $token): ?Users
+    {
+        $parameters = [
+            'issuer'  => $token->getClaims()
+                               ->get(Enum::ISSUER),
+            'tokenId' => $token->getClaims()
+                               ->get(Enum::ID),
+            'status'  => Flags::ACTIVE,
+        ];
+
+        /**
+         * getFirst() rather than [0]: ResultsetInterface declares the former,
+         * and answers null on an empty set.
+         *
+         * @var Users|null $user
+         */
+        $user = $this->queryService->getRecords(Users::class, $parameters)
+                                   ->getFirst()
+        ;
+
+        return $user;
+    }
+
+    /**
+     * Gets a user from the database based on the username and password.
+     *
+     * The password is not part of the query: hashes are salted, so the same
+     * password hashes differently every time and no `password = :password:`
+     * comparison could ever match. The record is fetched by username and the
+     * password checked against the stored hash afterwards - which also keeps
+     * the plain password out of the query cache key.
+     *
+     * The cache is bypassed: with the password out of the query, the entry is
+     * keyed on the username alone, so a cached row would keep answering with a
+     * stale hash - rejecting the new password and accepting the old one for as
+     * long as the entry lived.
+     *
+     * @param string $username
+     * @param string $password
+     *
+     * @return Users|null
+     */
+    public function getByUsernameAndPassword(
+        string $username,
+        string $password
+    ): ?Users {
+        $parameters = [
+            'username' => $username,
+            'status'   => Flags::ACTIVE,
+        ];
+
+        $result = $this->queryService->getRecords(
+            Users::class,
+            $parameters,
+            '',
+            false
+        );
+        /** @var Users|null $user */
+        $user = $result->getFirst();
+
+        if (null === $user) {
+            $this->security->checkHash($password, self::DUMMY_HASH);
+
+            return null;
+        }
+
+        return true === $this->security->checkHash($password, $user->get('password'))
+            ? $user
+            : null;
+    }
+}
diff --git a/src/Services/QueryService.php b/src/Services/QueryService.php
new file mode 100644
index 00000000..a4da2939
--- /dev/null
+++ b/src/Services/QueryService.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Services;
+
+use Phalcon\Cache\Cache;
+use Phalcon\Config\Config;
+use Phalcon\Mvc\Model\Query\Builder;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+use function json_encode;
+use function sha1;
+use function sprintf;
+
+/**
+ * Reads records through the query builder, serving them from the cache when
+ * one is warm and the application is not in dev mode.
+ *
+ * The config and the cache are collaborators, held once, rather than arguments
+ * threaded through every call.
+ */
+class QueryService
+{
+    /**
+     * @param Config $config
+     * @param Cache  $cache
+     */
+    public function __construct(
+        private readonly Config $config,
+        private readonly Cache $cache
+    ) {
+    }
+
+    /**
+     * Runs a query using the builder
+     *
+     * @param string               $class
+     * @param array<string, mixed> $where
+     * @param string               $orderBy
+     * @param bool                 $useCache Pass false for anything that must
+     *                                       read the current row - see
+     *                                       getResults()
+     *
+     * @return ResultsetInterface
+     */
+    public function getRecords(
+        string $class,
+        array $where = [],
+        string $orderBy = '',
+        bool $useCache = true
+    ): ResultsetInterface {
+        $builder = new Builder();
+        $builder->addFrom($class, 't1');
+
+        foreach ($where as $field => $value) {
+            $builder->andWhere(
+                sprintf('%s = :%s:', $field, $field),
+                [$field => $value]
+            );
+        }
+
+        if (true !== empty($orderBy)) {
+            $builder->orderBy($orderBy);
+        }
+
+        return $this->getResults($builder, $where, $useCache);
+    }
+
+    /**
+     * Runs the builder query if there is no cached data.
+     *
+     * The cache key is derived from the query and its bound values, so a row
+     * whose other columns changed is still served from the entry keyed on the
+     * columns that did not. That is fine for the read endpoints and wrong for a
+     * credential check, which is why the caller can opt out.
+     *
+     * @param Builder              $builder
+     * @param array<string, mixed> $where
+     * @param bool                 $useCache
+     *
+     * @return ResultsetInterface
+     */
+    private function getResults(
+        Builder $builder,
+        array $where = [],
+        bool $useCache = true
+    ): ResultsetInterface {
+        /**
+         * Calculate the cache key
+         */
+        $phql     = $builder->getPhql();
+        $params   = json_encode($where);
+        $cacheKey = sha1(sprintf('%s-%s.cache', $phql, $params));
+
+        /**
+         * One decision, used for both the read and the write. A query that is
+         * never read back is not written either: dev mode means no caching
+         * rather than write-only caching, and an opted-out query keeps the
+         * users' hashes out of the cache entirely.
+         */
+        $isCacheable = true === $useCache &&
+            true !== $this->config->path('app.devMode');
+
+        if (true === $isCacheable && true === $this->cache->has($cacheKey)) {
+            /** @var ResultsetInterface $data */
+            $data = $this->cache->get($cacheKey);
+        } else {
+            $data = $builder->getQuery()
+                            ->execute()
+            ;
+
+            if (true === $isCacheable) {
+                $this->cache->set($cacheKey, $data);
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/library/Traits/FractalTrait.php b/src/Traits/FractalTrait.php
similarity index 52%
rename from library/Traits/FractalTrait.php
rename to src/Traits/FractalTrait.php
index d2932e97..0cbc8e86 100644
--- a/library/Traits/FractalTrait.php
+++ b/src/Traits/FractalTrait.php
@@ -14,7 +14,9 @@
 namespace Phalcon\Api\Traits;
 
 use League\Fractal\Manager;
+use League\Fractal\Resource\ResourceInterface;
 use League\Fractal\Serializer\JsonApiSerializer;
+use Phalcon\Api\Transformers\BaseTransformer;
 
 use function Phalcon\Api\Core\envValue;
 use function sprintf;
@@ -28,14 +30,14 @@ trait FractalTrait
     /**
      * Format results based on a transformer
      *
-     * @param string $method
-     * @param mixed  $results
-     * @param string $transformer
-     * @param string $resource
-     * @param array  $relationships
-     * @param array  $fields
+     * @param string                            $method        'collection' or 'item'
+     * @param mixed                             $results
+     * @param class-string<BaseTransformer>     $transformer
+     * @param string                            $resource
+     * @param array<int, string>                $relationships
+     * @param array<string, array<int, string>> $fields
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function format(
         string $method,
@@ -52,16 +54,20 @@ protected function format(
         /**
          * Process relationships
          */
-        if (count($relationships) > 0) {
+        if (true !== empty($relationships)) {
             $manager->parseIncludes($relationships);
         }
 
-        $class    = sprintf('League\Fractal\Resource\%s', ucfirst($method));
-        $resource = new $class($results, new $transformer($fields, $resource), $resource);
-        $results  = $manager->createData($resource)
-                            ->toArray()
-        ;
+        /** @var class-string<ResourceInterface> $class */
+        $class = sprintf('League\Fractal\Resource\%s', ucfirst($method));
 
-        return $results;
+        /**
+         * Scope::toArray() is typed nullable; an empty document is an empty
+         * array here rather than null.
+         */
+        return $manager
+            ->createData(new $class($results, new $transformer($fields, $resource), $resource))
+            ->toArray() ?? []
+        ;
     }
 }
diff --git a/library/Traits/ResponseTrait.php b/src/Traits/ResponseTrait.php
similarity index 100%
rename from library/Traits/ResponseTrait.php
rename to src/Traits/ResponseTrait.php
diff --git a/library/Traits/TokenTrait.php b/src/Traits/TokenTrait.php
similarity index 92%
rename from library/Traits/TokenTrait.php
rename to src/Traits/TokenTrait.php
index 7b19269d..adce3cf7 100644
--- a/library/Traits/TokenTrait.php
+++ b/src/Traits/TokenTrait.php
@@ -50,32 +50,32 @@ protected function getTokenAudience(): string
     }
 
     /**
-     * Returns the time the token is issued at
+     * Returns the expiry time for the token
      *
      * @return int
      */
-    protected function getTokenTimeIssuedAt(): int
+    protected function getTokenTimeExpiration(): int
     {
-        return time();
+        return time() + envValue('TOKEN_EXPIRATION', 86400);
     }
 
     /**
-     * Returns the time drift i.e. token will be valid not before
+     * Returns the time the token is issued at
      *
      * @return int
      */
-    protected function getTokenTimeNotBefore(): int
+    protected function getTokenTimeIssuedAt(): int
     {
-        return (time() + envValue('TOKEN_NOT_BEFORE', 0));
+        return time();
     }
 
     /**
-     * Returns the expiry time for the token
+     * Returns the time drift i.e. token will be valid not before
      *
      * @return int
      */
-    protected function getTokenTimeExpiration(): int
+    protected function getTokenTimeNotBefore(): int
     {
-        return (time() + envValue('TOKEN_EXPIRATION', 86400));
+        return time() + envValue('TOKEN_NOT_BEFORE', 0);
     }
 }
diff --git a/src/Transformers/BaseTransformer.php b/src/Transformers/BaseTransformer.php
new file mode 100644
index 00000000..8f00cdd3
--- /dev/null
+++ b/src/Transformers/BaseTransformer.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Transformers;
+
+use League\Fractal\Resource\Collection;
+use League\Fractal\Resource\Item;
+use League\Fractal\TransformerAbstract;
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Mvc\Model\AbstractModel;
+
+use function array_intersect;
+
+/**
+ * Class BaseTransformer
+ */
+class BaseTransformer extends TransformerAbstract
+{
+    /** @var array<string, array<int, string>> */
+    private array $fields = [];
+
+    /** @var string */
+    private string $resource = '';
+
+    /**
+     * BaseTransformer constructor.
+     *
+     * @param array<string, array<int, string>> $fields
+     * @param string                            $resource
+     */
+    public function __construct(array $fields = [], string $resource = '')
+    {
+        $this->fields   = $fields;
+        $this->resource = $resource;
+    }
+
+    /**
+     * @param AbstractModel $model
+     *
+     * @return array<string, mixed>
+     * @throws ModelException
+     */
+    public function transform(AbstractModel $model): array
+    {
+        /**
+         * The model decides what may be published. A caller asking for a field
+         * outside that set - `?fields[users]=password` - gets nothing back for
+         * it, because the intersection is taken against the public set and not
+         * against every column the model happens to have.
+         */
+        $publicFields    = $model->getPublicFields();
+        $requestedFields = $this->fields[$this->resource] ?? $publicFields;
+        $fields          = array_intersect($publicFields, $requestedFields);
+        $data            = [];
+        foreach ($fields as $field) {
+            $data[$field] = $model->get($field);
+        }
+
+        return $data;
+    }
+
+    /**
+     * A related resource holding many records.
+     *
+     * Split from getRelatedItem() rather than switched on a method-name string:
+     * one method returning Collection|Item cannot tell a caller which it got,
+     * so every includeXxx() declaring `: Collection` was lying by half.
+     *
+     * @param AbstractModel                 $model
+     * @param class-string<BaseTransformer> $transformer
+     * @param string                        $resource
+     *
+     * @return Collection
+     */
+    protected function getRelatedCollection(
+        AbstractModel $model,
+        string $transformer,
+        string $resource
+    ): Collection {
+        return $this->collection(
+            $model->getRelated($resource),
+            new $transformer($this->fields, $resource),
+            $resource
+        );
+    }
+
+    /**
+     * A related resource holding a single record.
+     *
+     * @param AbstractModel                 $model
+     * @param class-string<BaseTransformer> $transformer
+     * @param string                        $resource
+     *
+     * @return Item
+     */
+    protected function getRelatedItem(
+        AbstractModel $model,
+        string $transformer,
+        string $resource
+    ): Item {
+        return $this->item(
+            $model->getRelated($resource),
+            new $transformer($this->fields, $resource),
+            $resource
+        );
+    }
+}
diff --git a/library/Transformers/CompaniesTransformer.php b/src/Transformers/CompaniesTransformer.php
similarity index 87%
rename from library/Transformers/CompaniesTransformer.php
rename to src/Transformers/CompaniesTransformer.php
index a44679ee..cdad7c79 100644
--- a/library/Transformers/CompaniesTransformer.php
+++ b/src/Transformers/CompaniesTransformer.php
@@ -22,9 +22,7 @@
  */
 class CompaniesTransformer extends BaseTransformer
 {
-    /**
-     * @var array
-     */
+    /** @var array<int, string> */
     protected array $availableIncludes = [
         Relationships::PRODUCTS,
         Relationships::INDIVIDUALS,
@@ -37,8 +35,7 @@ class CompaniesTransformer extends BaseTransformer
      */
     public function includeIndividuals(Companies $company): Collection
     {
-        return $this->getRelatedData(
-            'collection',
+        return $this->getRelatedCollection(
             $company,
             IndividualsTransformer::class,
             Relationships::INDIVIDUALS
@@ -52,8 +49,7 @@ public function includeIndividuals(Companies $company): Collection
      */
     public function includeProducts(Companies $company): Collection
     {
-        return $this->getRelatedData(
-            'collection',
+        return $this->getRelatedCollection(
             $company,
             ProductsTransformer::class,
             Relationships::PRODUCTS
diff --git a/library/Transformers/IndividualTypesTransformer.php b/src/Transformers/IndividualTypesTransformer.php
similarity index 83%
rename from library/Transformers/IndividualTypesTransformer.php
rename to src/Transformers/IndividualTypesTransformer.php
index ee4c15a8..2c9126e1 100644
--- a/library/Transformers/IndividualTypesTransformer.php
+++ b/src/Transformers/IndividualTypesTransformer.php
@@ -22,14 +22,11 @@
  */
 class IndividualTypesTransformer extends BaseTransformer
 {
-    /** @var array */
+    /** @var array<int, string> */
     protected array $availableIncludes = [
         Relationships::INDIVIDUALS,
     ];
 
-    /** @var string */
-    protected string $resource = Relationships::INDIVIDUAL_TYPES;
-
     /**
      * @param IndividualTypes $type
      *
@@ -37,8 +34,7 @@ class IndividualTypesTransformer extends BaseTransformer
      */
     public function includeIndividuals(IndividualTypes $type): Collection
     {
-        return $this->getRelatedData(
-            'collection',
+        return $this->getRelatedCollection(
             $type,
             IndividualsTransformer::class,
             Relationships::INDIVIDUALS
diff --git a/library/Transformers/IndividualsTransformer.php b/src/Transformers/IndividualsTransformer.php
similarity index 82%
rename from library/Transformers/IndividualsTransformer.php
rename to src/Transformers/IndividualsTransformer.php
index 607e882c..3e9b0d2d 100644
--- a/library/Transformers/IndividualsTransformer.php
+++ b/src/Transformers/IndividualsTransformer.php
@@ -22,15 +22,12 @@
  */
 class IndividualsTransformer extends BaseTransformer
 {
-    /** @var array */
+    /** @var array<int, string> */
     protected array $availableIncludes = [
         Relationships::COMPANIES,
         Relationships::INDIVIDUAL_TYPES,
     ];
 
-    /** @var string */
-    protected string $resource = Relationships::INDIVIDUALS;
-
     /**
      * Includes the companies
      *
@@ -40,8 +37,7 @@ class IndividualsTransformer extends BaseTransformer
      */
     public function includeCompanies(Individuals $individual): Item
     {
-        return $this->getRelatedData(
-            'item',
+        return $this->getRelatedItem(
             $individual,
             CompaniesTransformer::class,
             Relationships::COMPANIES
@@ -57,10 +53,9 @@ public function includeCompanies(Individuals $individual): Item
      */
     public function includeIndividualTypes(Individuals $individual): Item
     {
-        return $this->getRelatedData(
-            'item',
+        return $this->getRelatedItem(
             $individual,
-            BaseTransformer::class,
+            IndividualTypesTransformer::class,
             Relationships::INDIVIDUAL_TYPES
         );
     }
diff --git a/library/Transformers/ProductTypesTransformer.php b/src/Transformers/ProductTypesTransformer.php
similarity index 91%
rename from library/Transformers/ProductTypesTransformer.php
rename to src/Transformers/ProductTypesTransformer.php
index ae216c20..5198d80a 100644
--- a/library/Transformers/ProductTypesTransformer.php
+++ b/src/Transformers/ProductTypesTransformer.php
@@ -22,6 +22,7 @@
  */
 class ProductTypesTransformer extends BaseTransformer
 {
+    /** @var array<int, string> */
     protected array $availableIncludes = [
         Relationships::PRODUCTS,
     ];
@@ -33,8 +34,7 @@ class ProductTypesTransformer extends BaseTransformer
      */
     public function includeProducts(ProductTypes $type): Collection
     {
-        return $this->getRelatedData(
-            'collection',
+        return $this->getRelatedCollection(
             $type,
             ProductsTransformer::class,
             Relationships::PRODUCTS
diff --git a/library/Transformers/ProductsTransformer.php b/src/Transformers/ProductsTransformer.php
similarity index 88%
rename from library/Transformers/ProductsTransformer.php
rename to src/Transformers/ProductsTransformer.php
index 495bdcfa..890bae1b 100644
--- a/library/Transformers/ProductsTransformer.php
+++ b/src/Transformers/ProductsTransformer.php
@@ -23,6 +23,7 @@
  */
 class ProductsTransformer extends BaseTransformer
 {
+    /** @var array<int, string> */
     protected array $availableIncludes = [
         Relationships::COMPANIES,
         Relationships::PRODUCT_TYPES,
@@ -37,8 +38,7 @@ class ProductsTransformer extends BaseTransformer
      */
     public function includeCompanies(Products $product): Collection
     {
-        return $this->getRelatedData(
-            'collection',
+        return $this->getRelatedCollection(
             $product,
             CompaniesTransformer::class,
             Relationships::COMPANIES
@@ -54,10 +54,9 @@ public function includeCompanies(Products $product): Collection
      */
     public function includeProductTypes(Products $product): Item
     {
-        return $this->getRelatedData(
-            'item',
+        return $this->getRelatedItem(
             $product,
-            BaseTransformer::class,
+            ProductTypesTransformer::class,
             Relationships::PRODUCT_TYPES
         );
     }
diff --git a/library/Validation/CompaniesValidator.php b/src/Validation/CompaniesValidator.php
similarity index 100%
rename from library/Validation/CompaniesValidator.php
rename to src/Validation/CompaniesValidator.php
diff --git a/storage/config/extra.ini b/storage/config/extra.ini
deleted file mode 100644
index 124fbb22..00000000
--- a/storage/config/extra.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-error_reporting=E_ALL
-display_errors="On"
-display_startup_errors="On"
-log_errors="On"
-error_log=/code/storage/logs/php_errors.log
-memory_limit=512M
-apc.enable_cli="On"
-session.save_path="/tmp"
diff --git a/storage/config/my.cnf b/storage/config/my.cnf
deleted file mode 100644
index 1c50b026..00000000
--- a/storage/config/my.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-[mysqld]
-general_log = 1
-general_log_file = /var/lib/mysql/general.log
diff --git a/storage/config/nginx/8.1/app-8.1.conf b/storage/config/nginx/8.1/app-8.1.conf
deleted file mode 100644
index 9a359a28..00000000
--- a/storage/config/nginx/8.1/app-8.1.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-server {
-    listen 80;
-    index index.php index.html;
-    error_log  /var/www/storage/logs/nginx-error.log;
-    access_log /var/www/storage/logs/nginx-access.log;
-    root /var/www/api/public;
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass rest-api-app-8.1:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-    }
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-        gzip_static on;
-    }
-}
diff --git a/talon.php b/talon.php
new file mode 100644
index 00000000..3e173298
--- /dev/null
+++ b/talon.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Talon suite map.
+ *
+ * Without this file Talon derives one suite per `phpunit*.xml*` file and names
+ * it after the filename. All four suites live in a single PHPUnit config, so
+ * they are mapped here instead and told apart with `--testsuite`. That keeps
+ * `talon run api` working while the configuration stays in one place.
+ *
+ * `talon run all` runs every suite below, each as its own PHPUnit process.
+ */
+return [
+    'default' => 'unit',
+    'suites'  => [
+        'unit'        => [
+            'config' => 'resources/phpunit.xml.dist',
+            'args'   => ['--testsuite', 'unit'],
+        ],
+        'integration' => [
+            'config' => 'resources/phpunit.xml.dist',
+            'args'   => ['--testsuite', 'integration'],
+        ],
+        'api'         => [
+            'config' => 'resources/phpunit.xml.dist',
+            'args'   => ['--testsuite', 'api'],
+        ],
+        'cli'         => [
+            'config' => 'resources/phpunit.xml.dist',
+            'args'   => ['--testsuite', 'cli'],
+        ],
+    ],
+];
diff --git a/tests/.env.test b/tests/.env.test
new file mode 100644
index 00000000..c80a0430
--- /dev/null
+++ b/tests/.env.test
@@ -0,0 +1,20 @@
+# Talon's own settings (Settings::fromEnv) read DATA_MYSQL_* / DATA_REDIS_*,
+# which the application's DATA_API_* variables do not cover. Hosts are the
+# compose service names; getenv() wins over these, so a native run can override
+# them with real environment variables.
+
+DATA_MYSQL_HOST=mysql
+DATA_MYSQL_PORT=3306
+DATA_MYSQL_USER=root
+DATA_MYSQL_PASS=secret
+DATA_MYSQL_NAME=phalcon_api
+DATA_MYSQL_CHARSET=utf8mb4
+
+DATA_REDIS_HOST=redis
+DATA_REDIS_PORT=6379
+
+# The api suite drives the running application over real HTTP. nginx listens on
+# 80 inside the compose network; the 8080 in APP_URL is the host-side mapping
+# only and does not resolve from here. APP_URL stays as it is - it is what the
+# application echoes back in its `links`, and both sides must agree on it.
+TALON_REST_URL=http://nginx
diff --git a/tests/Api/AbstractApiTestCase.php b/tests/Api/AbstractApiTestCase.php
new file mode 100644
index 00000000..3be19be5
--- /dev/null
+++ b/tests/Api/AbstractApiTestCase.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api;
+
+use Phalcon\Api\Constants\Flags;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Talon\Http\HttpCode;
+use Phalcon\Talon\Traits\RestAssertionsTrait;
+use Phalcon\Talon\Traits\RestTrait;
+
+use function json_decode;
+use function json_encode;
+use function sha1;
+
+/**
+ * Ported from the Codeception `ApiTester` actor.
+ *
+ * The suite pairs the application container with real HTTP: records are created
+ * in-process through the models, while requests cross the network to the running
+ * server. That is what `api.suite.yml` described as `Helper\Integration` plus
+ * `REST: depends: PhpBrowser`, and it is why this extends the integration case
+ * rather than Talon's AbstractRestTestCase - the record helpers and the REST
+ * surface are both needed, and PHP allows only one parent.
+ */
+abstract class AbstractApiTestCase extends AbstractIntegrationTestCase
+{
+    use RestAssertionsTrait;
+    use RestTrait;
+
+    protected function addApiUserRecord(): Users
+    {
+        return $this->haveRecordWithFields(
+            Users::class,
+            [
+                'status'        => Flags::ACTIVE,
+                'username'      => Data::$testUsername,
+                'password'      => Data::$testPasswordHash,
+                'issuer'        => Data::$testIssuer,
+                'tokenPassword' => Data::$testTokenPassword,
+                'tokenId'       => Data::$testTokenId,
+            ]
+        );
+    }
+
+    protected function apiLogin(): string
+    {
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $response = json_decode($this->grabResponse(), true);
+        $data     = $response['data'] ?? [];
+
+        return $data['token'] ?? '';
+    }
+
+    protected function assertErrorJsonResponse(string $message): void
+    {
+        $this->assertResponseContainsJson(
+            [
+                'jsonapi' => [
+                    'version' => '1.0',
+                ],
+                'errors'  => [
+                    $message,
+                ],
+            ]
+        );
+    }
+
+    protected function assertResponseIs400(): void
+    {
+        $this->assertErrorResponse(HttpCode::BAD_REQUEST);
+    }
+
+    protected function assertResponseIs404(): void
+    {
+        $this->assertErrorResponse(HttpCode::NOT_FOUND);
+    }
+
+    protected function assertResponseIsSuccessful(int $code = HttpCode::OK): void
+    {
+        $this->assertResponseIsJson();
+        $this->assertResponseCodeIs($code);
+        $this->assertResponseMatchesJsonType(
+            [
+                'jsonapi' => [
+                    'version' => 'string',
+                ],
+                'meta'    => [
+                    'timestamp' => 'string:date',
+                    'hash'      => 'string',
+                ],
+            ]
+        );
+
+        $this->assertHash();
+    }
+
+    /**
+     * @param array<array-key, mixed> $data
+     */
+    protected function assertSuccessJsonResponse(string $key = 'data', array $data = []): void
+    {
+        $this->assertResponseContainsJson([$key => $data]);
+    }
+
+    /**
+     * Sends a GET carrying the bearer token, then drops the header again.
+     *
+     * The header is per-test rather than per-request state, so leaving it set
+     * would leak into whatever the test does next.
+     *
+     * @param string $token
+     * @param string $url
+     */
+    protected function sendGetAs(string $token, string $url): void
+    {
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $token);
+        $this->sendGet($url);
+        $this->unsetHttpHeader('Authorization');
+    }
+
+    private function assertErrorResponse(int $code): void
+    {
+        $this->assertResponseIsJson();
+        $this->assertResponseCodeIs($code);
+        $this->assertResponseMatchesJsonType(
+            [
+                'jsonapi' => [
+                    'version' => 'string',
+                ],
+                'meta'    => [
+                    'timestamp' => 'string:date',
+                    'hash'      => 'string',
+                ],
+            ]
+        );
+
+        $response = json_decode($this->grabResponse(), true);
+        $this->assertSame(HttpCode::getDescription($code), $response['errors'][0]);
+
+        $this->assertHash();
+    }
+
+    /**
+     * The application signs each payload: sha1 over the timestamp followed by
+     * the body with the `meta` and `jsonapi` envelopes removed.
+     */
+    private function assertHash(): void
+    {
+        $response  = json_decode($this->grabResponse(), true);
+        $timestamp = $response['meta']['timestamp'];
+        $hash      = $response['meta']['hash'];
+
+        unset($response['meta'], $response['jsonapi']);
+
+        $this->assertSame($hash, sha1($timestamp . json_encode($response)));
+    }
+}
diff --git a/tests/Api/Companies/AbstractGetTestCase.php b/tests/Api/Companies/AbstractGetTestCase.php
new file mode 100644
index 00000000..26561d6a
--- /dev/null
+++ b/tests/Api/Companies/AbstractGetTestCase.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
+
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+
+/**
+ * Ported from the Codeception `GetBase` helper.
+ */
+abstract class AbstractGetTestCase extends AbstractApiTestCase
+{
+    /**
+     * Returns [$company, $prdOne, $prdTwo, $indOne, $indTwo].
+     *
+     * @return array<int, mixed>
+     */
+    protected function addRecords(): array
+    {
+        $company = $this->addCompanyRecord('com-a');
+        $indType = $this->addIndividualTypeRecord('type-a-');
+        $indOne  = $this->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
+        $indTwo  = $this->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
+        $prdType = $this->addProductTypeRecord('type-a-');
+        $prdOne  = $this->addProductRecord('prd-a-', $prdType->get('id'));
+        $prdTwo  = $this->addProductRecord('prd-b-', $prdType->get('id'));
+
+        $this->addCompanyXProduct($company->get('id'), $prdOne->get('id'));
+        $this->addCompanyXProduct($company->get('id'), $prdTwo->get('id'));
+
+        return [$company, $prdOne, $prdTwo, $indOne, $indTwo];
+    }
+}
diff --git a/tests/Api/Companies/AddTest.php b/tests/Api/Companies/AddTest.php
new file mode 100644
index 00000000..022ceb28
--- /dev/null
+++ b/tests/Api/Companies/AddTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Http\Response;
+use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
+
+use function Phalcon\Api\Core\appUrl;
+use function uniqid;
+
+final class AddTest extends AbstractApiTestCase
+{
+    public function testAddNewCompany(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+        $name  = uniqid('com');
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $token);
+        $this->sendPost(
+            Data::$companiesUrl,
+            Data::companyAddJson(
+                $name,
+                '123 Phalcon way',
+                'World',
+                '555-444-7777'
+            )
+        );
+        $this->unsetHttpHeader('Authorization');
+        $this->assertResponseIsSuccessful(Response::CREATED);
+
+        $company = $this->getRecordWithFields(
+            Companies::class,
+            [
+                'name' => $name,
+            ]
+        );
+        $this->assertNotEquals(false, $company);
+
+        $this->assertHttpHeader('Location', appUrl(Relationships::COMPANIES, $company->get('id')));
+        $this->assertSuccessJsonResponse(
+            'data',
+            Data::companiesAddResponse($company)
+        );
+
+        $this->assertNotEquals(false, $company->delete());
+    }
+
+    public function testAddNewCompanyWithExistingName(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+        $name  = uniqid('com');
+
+        $this->haveRecordWithFields(
+            Companies::class,
+            [
+                'name' => $name,
+            ]
+        );
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $token);
+        $this->sendPost(
+            Data::$companiesUrl,
+            Data::companyAddJson(
+                $name,
+                '123 Phalcon way',
+                'World',
+                '555-444-7777'
+            )
+        );
+        $this->unsetHttpHeader('Authorization');
+        $this->assertErrorJsonResponse('The company name already exists in the database');
+    }
+
+    public function testAddNewCompanyWithoutPostingName(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $token);
+        $this->sendPost(
+            Data::$companiesUrl,
+            Data::companyAddJson(
+                '',
+                '123 Phalcon way',
+                'World',
+                '555-444-7777'
+            )
+        );
+        $this->unsetHttpHeader('Authorization');
+        $this->assertErrorJsonResponse('The company name is required');
+    }
+}
diff --git a/tests/api/Companies/GetFieldsCest.php b/tests/Api/Companies/GetFieldsTest.php
similarity index 59%
rename from tests/api/Companies/GetFieldsCest.php
rename to tests/Api/Companies/GetFieldsTest.php
index 7f3b61b4..dfdb211e 100644
--- a/tests/api/Companies/GetFieldsCest.php
+++ b/tests/Api/Companies/GetFieldsTest.php
@@ -1,34 +1,46 @@
 <?php
 
-namespace Phalcon\Api\Tests\api\Companies;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
 
-use ApiTester;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Tests\Support\Data;
 
+use function count;
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
 
-class GetFieldsCest extends GetBase
+final class GetFieldsTest extends AbstractGetTestCase
 {
-    public function getCompaniesWithIncludesAndFields(ApiTester $I)
+    public function testGetCompaniesWithIncludesAndFields(): void
     {
-        $this->runTestsCompaniesWithIncludesAndFields($I);
+        $this->runCompaniesWithIncludesAndFields();
     }
 
-    public function getCompaniesWithIncludesAndUnknownFields(ApiTester $I)
+    public function testGetCompaniesWithIncludesAndUnknownFields(): void
     {
-        $this->runTestsCompaniesWithIncludesAndFields($I, ',unknown-product-field');
+        $this->runCompaniesWithIncludesAndFields(',unknown-product-field');
     }
 
-    private function runTestsCompaniesWithIncludesAndFields(ApiTester $I, string $fields = '')
+    private function runCompaniesWithIncludesAndFields(string $fields = ''): void
     {
-        list($com, $prdOne, $prdTwo) = $this->addRecords($I);
+        [$com, $prdOne, $prdTwo] = $this->addRecords();
 
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
 
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
+        $this->sendGetAs(
+            $token,
             sprintf(
                 Data::$companiesRecordIncludesUrl,
                 $com->get('id'),
@@ -37,15 +49,11 @@ private function runTestsCompaniesWithIncludesAndFields(ApiTester $I, string $fi
             '&fields[' . Relationships::COMPANIES . ']=id,name,city' .
             '&fields[' . Relationships::PRODUCTS . ']=id,name,price' . $fields
         );
+        $this->assertResponseIsSuccessful();
 
-        $I->deleteHeader('Authorization');
-
-        $I->seeResponseIsSuccessful();
-
-        $included = [];
-        $element  = [
+        $element = [
             'type'       => Relationships::COMPANIES,
-            'id'         => $com->get('id'),
+            'id'         => (string) $com->get('id'),
             'attributes' => [
                 'name' => $com->get('name'),
                 'city' => $com->get('city'),
@@ -80,22 +88,23 @@ private function runTestsCompaniesWithIncludesAndFields(ApiTester $I, string $fi
             'data'  => [
                 [
                     'type' => Relationships::PRODUCTS,
-                    'id'   => $prdOne->get('id'),
+                    'id'   => (string) $prdOne->get('id'),
                 ],
                 [
                     'type' => Relationships::PRODUCTS,
-                    'id'   => $prdTwo->get('id'),
+                    'id'   => (string) $prdTwo->get('id'),
                 ],
             ],
         ];
 
+        $included   = [];
         $included[] = Data::productFieldsResponse($prdOne);
         $included[] = Data::productFieldsResponse($prdTwo);
 
-        $I->seeSuccessJsonResponse('data', [$element]);
+        $this->assertSuccessJsonResponse('data', [$element]);
 
         if (count($included) > 0) {
-            $I->seeSuccessJsonResponse('included', $included);
+            $this->assertSuccessJsonResponse('included', $included);
         }
     }
 }
diff --git a/tests/api/Companies/GetIncludesCest.php b/tests/Api/Companies/GetIncludesTest.php
similarity index 65%
rename from tests/api/Companies/GetIncludesCest.php
rename to tests/Api/Companies/GetIncludesTest.php
index 83bc23e4..1274c072 100644
--- a/tests/api/Companies/GetIncludesCest.php
+++ b/tests/Api/Companies/GetIncludesTest.php
@@ -1,82 +1,83 @@
 <?php
 
-namespace Phalcon\Api\Tests\api\Companies;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
 
-use ApiTester;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Tests\Support\Data;
 
+use function count;
+use function implode;
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
 
-class GetIncludesCest extends GetBase
+final class GetIncludesTest extends AbstractGetTestCase
 {
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompanyUnknownInclude(ApiTester $I)
+    public function testGetCompaniesWithIncludesAllIncludes(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $company = $I->addCompanyRecord('com-a-');
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesRecordIncludesUrl, $company->get('id'), 'unknown'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($company),
-            ]
-        );
+        $this->checkIncludes([Relationships::INDIVIDUALS, Relationships::PRODUCTS]);
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompaniesWithIncludesAllIncludes(ApiTester $I)
+    public function testGetCompaniesWithIncludesIndividuals(): void
     {
-        $this->checkIncludes($I, [Relationships::INDIVIDUALS, Relationships::PRODUCTS]);
+        $this->checkIncludes([Relationships::INDIVIDUALS]);
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompaniesWithIncludesIndividuals(ApiTester $I)
+    public function testGetCompaniesWithIncludesProducts(): void
     {
-        $this->checkIncludes($I, [Relationships::INDIVIDUALS]);
+        $this->checkIncludes([Relationships::PRODUCTS]);
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompaniesWithIncludesProducts(ApiTester $I)
+    public function testGetCompanyUnknownInclude(): void
     {
-        $this->checkIncludes($I, [Relationships::PRODUCTS]);
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $company = $this->addCompanyRecord('com-a-');
+
+        $this->sendGetAs($token, sprintf(Data::$companiesRecordIncludesUrl, $company->get('id'), 'unknown'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($company),
+            ]
+        );
     }
 
-    private function checkIncludes(ApiTester $I, array $includes = [])
+    /**
+     * @param array<int, string> $includes
+     */
+    private function checkIncludes(array $includes = []): void
     {
-        list($com, $prdOne, $prdTwo, $indOne, $indTwo) = $this->addRecords($I);
+        [$com, $prdOne, $prdTwo, $indOne, $indTwo] = $this->addRecords();
 
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
 
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
+        $this->sendGetAs(
+            $token,
             sprintf(
                 Data::$companiesRecordIncludesUrl,
                 $com->get('id'),
                 implode(',', $includes)
             )
         );
-
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
+        $this->assertResponseIsSuccessful();
 
         $element = [
             'type'       => Relationships::COMPANIES,
-            'id'         => $com->get('id'),
+            'id'         => (string) $com->get('id'),
             'attributes' => [
                 'name'    => $com->get('name'),
                 'address' => $com->get('address'),
@@ -116,11 +117,11 @@ private function checkIncludes(ApiTester $I, array $includes = [])
                     'data'  => [
                         [
                             'type' => Relationships::INDIVIDUALS,
-                            'id'   => $indOne->get('id'),
+                            'id'   => (string) $indOne->get('id'),
                         ],
                         [
                             'type' => Relationships::INDIVIDUALS,
-                            'id'   => $indTwo->get('id'),
+                            'id'   => (string) $indTwo->get('id'),
                         ],
                     ],
                 ];
@@ -150,11 +151,11 @@ private function checkIncludes(ApiTester $I, array $includes = [])
                     'data'  => [
                         [
                             'type' => Relationships::PRODUCTS,
-                            'id'   => $prdOne->get('id'),
+                            'id'   => (string) $prdOne->get('id'),
                         ],
                         [
                             'type' => Relationships::PRODUCTS,
-                            'id'   => $prdTwo->get('id'),
+                            'id'   => (string) $prdTwo->get('id'),
                         ],
                     ],
                 ];
@@ -164,10 +165,10 @@ private function checkIncludes(ApiTester $I, array $includes = [])
             }
         }
 
-        $I->seeSuccessJsonResponse('data', [$element]);
+        $this->assertSuccessJsonResponse('data', [$element]);
 
         if (count($included) > 0) {
-            $I->seeSuccessJsonResponse('included', $included);
+            $this->assertSuccessJsonResponse('included', $included);
         }
     }
 }
diff --git a/tests/Api/Companies/GetSortTest.php b/tests/Api/Companies/GetSortTest.php
new file mode 100644
index 00000000..b94fa36d
--- /dev/null
+++ b/tests/Api/Companies/GetSortTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
+
+use Phalcon\Api\Tests\Support\Data;
+
+use function sprintf;
+
+final class GetSortTest extends AbstractGetTestCase
+{
+    public function testGetCompaniesInvalidSort(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->addCompanyRecord('com-a-', '', 'city-b');
+        $this->addCompanyRecord('com-b-', '', 'city-b');
+
+        $this->sendGetAs($token, sprintf(Data::$companiesSortUrl, 'unknown'));
+        $this->assertResponseIs400();
+    }
+
+    public function testGetCompaniesMultipleSort(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $comOne = $this->addCompanyRecord('com-a-', '', 'city-b');
+        $comTwo = $this->addCompanyRecord('com-b-', '', 'city-b');
+
+        $this->sendGetAs($token, sprintf(Data::$companiesSortUrl, 'city,name'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($comOne),
+                Data::companiesResponse($comTwo),
+            ]
+        );
+
+        $this->sendGetAs($token, sprintf(Data::$companiesSortUrl, 'city,-name'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($comTwo),
+                Data::companiesResponse($comOne),
+            ]
+        );
+    }
+
+    public function testGetCompaniesSingleSort(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $comOne = $this->addCompanyRecord('com-a-');
+        $comTwo = $this->addCompanyRecord('com-b-');
+
+        $this->sendGetAs($token, sprintf(Data::$companiesSortUrl, 'name'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($comOne),
+                Data::companiesResponse($comTwo),
+            ]
+        );
+
+        $this->sendGetAs($token, sprintf(Data::$companiesSortUrl, '-name'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($comTwo),
+                Data::companiesResponse($comOne),
+            ]
+        );
+    }
+}
diff --git a/tests/Api/Companies/GetTest.php b/tests/Api/Companies/GetTest.php
new file mode 100644
index 00000000..6655d91e
--- /dev/null
+++ b/tests/Api/Companies/GetTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Companies;
+
+use Phalcon\Api\Tests\Support\Data;
+
+use function sprintf;
+
+final class GetTest extends AbstractGetTestCase
+{
+    public function testGetCompanies(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $comOne = $this->addCompanyRecord('com-a-');
+        $comTwo = $this->addCompanyRecord('com-b-');
+
+        $this->sendGetAs($token, Data::$companiesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($comOne),
+                Data::companiesResponse($comTwo),
+            ]
+        );
+    }
+
+    public function testGetCompaniesNoData(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$companiesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse();
+    }
+
+    public function testGetCompany(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $company = $this->addCompanyRecord('com-a-');
+
+        $this->sendGetAs($token, sprintf(Data::$companiesRecordUrl, $company->get('id')));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::companiesResponse($company),
+            ]
+        );
+    }
+
+    public function testGetUnknownCompany(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, sprintf(Data::$companiesRecordUrl, 1));
+        $this->assertResponseIs404();
+    }
+}
diff --git a/tests/api/IndividualTypes/GetCest.php b/tests/Api/IndividualTypes/GetTest.php
similarity index 50%
rename from tests/api/IndividualTypes/GetCest.php
rename to tests/Api/IndividualTypes/GetTest.php
index df876e76..d8d8c470 100644
--- a/tests/api/IndividualTypes/GetCest.php
+++ b/tests/Api/IndividualTypes/GetTest.php
@@ -1,35 +1,38 @@
 <?php
 
-namespace Phalcon\Api\Tests\api\IndividualTypes;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\IndividualTypes;
 
-use ApiTester;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Individuals;
-use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
 
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
 
-class GetCest
+final class GetTest extends AbstractApiTestCase
 {
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getIndividualTypes(ApiTester $I)
+    public function testGetIndividualTypes(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $typeOne = $I->addIndividualTypeRecord('type-a-');
-        $typeTwo = $I->addIndividualTypeRecord('type-b-');
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$individualTypesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $typeOne = $this->addIndividualTypeRecord('type-a-');
+        $typeTwo = $this->addIndividualTypeRecord('type-b-');
+
+        $this->sendGetAs($token, Data::$individualTypesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
             'data',
             [
                 Data::individualTypeResponse($typeOne),
@@ -38,54 +41,41 @@ public function getIndividualTypes(ApiTester $I)
         );
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getUnknownIndividualTypes(ApiTester $I)
+    public function testGetIndividualTypesNoData(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
 
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$individualTypesRecordUrl, 1));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs404();
+        $this->sendGetAs($token, Data::$individualTypesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse();
     }
 
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getIndividualTypesWithIncludesIndividuals(ApiTester $I)
+    public function testGetIndividualTypesWithIncludesIndividuals(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var  $company */
-        $company = $I->addCompanyRecord('com-a');
-        /** @var IndividualTypes $individualType */
-        $individualType = $I->addIndividualTypeRecord('type-a-');
-        /** @var Individuals $individualOne */
-        $individualOne = $I->addIndividualRecord('prd-a-', $company->get('id'), $individualType->get('id'));
-        /** @var Individuals $individualTwo */
-        $individualTwo = $I->addIndividualRecord('prd-b-', $company->get('id'), $individualType->get('id'));
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $company        = $this->addCompanyRecord('com-a');
+        $individualType = $this->addIndividualTypeRecord('type-a-');
+        $individualOne  = $this->addIndividualRecord('prd-a-', $company->get('id'), $individualType->get('id'));
+        $individualTwo  = $this->addIndividualRecord('prd-b-', $company->get('id'), $individualType->get('id'));
+
+        $this->sendGetAs(
+            $token,
             sprintf(
                 Data::$individualTypesRecordIncludesUrl,
                 $individualType->get('id'),
                 Relationships::INDIVIDUALS
             )
         );
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
             'data',
             [
                 [
                     'type'          => Relationships::INDIVIDUAL_TYPES,
-                    'id'            => $individualType->get('id'),
+                    'id'            => (string) $individualType->get('id'),
                     'attributes'    => [
                         'name'        => $individualType->get('name'),
                         'description' => $individualType->get('description'),
@@ -119,11 +109,11 @@ public function getIndividualTypesWithIncludesIndividuals(ApiTester $I)
                             'data'  => [
                                 [
                                     'type' => Relationships::INDIVIDUALS,
-                                    'id'   => $individualOne->get('id'),
+                                    'id'   => (string) $individualOne->get('id'),
                                 ],
                                 [
                                     'type' => Relationships::INDIVIDUALS,
-                                    'id'   => $individualTwo->get('id'),
+                                    'id'   => (string) $individualTwo->get('id'),
                                 ],
                             ],
                         ],
@@ -132,7 +122,7 @@ public function getIndividualTypesWithIncludesIndividuals(ApiTester $I)
             ]
         );
 
-        $I->seeSuccessJsonResponse(
+        $this->assertSuccessJsonResponse(
             'included',
             [
                 Data::individualResponse($individualOne),
@@ -141,18 +131,12 @@ public function getIndividualTypesWithIncludesIndividuals(ApiTester $I)
         );
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getIndividualTypesNoData(ApiTester $I)
+    public function testGetUnknownIndividualTypes(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$individualTypesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, sprintf(Data::$individualTypesRecordUrl, 1));
+        $this->assertResponseIs404();
     }
 }
diff --git a/tests/Api/Individuals/GetTest.php b/tests/Api/Individuals/GetTest.php
new file mode 100644
index 00000000..cfbd4ed3
--- /dev/null
+++ b/tests/Api/Individuals/GetTest.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Individuals;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
+
+use function count;
+use function implode;
+use function Phalcon\Api\Core\envValue;
+use function sprintf;
+
+final class GetTest extends AbstractApiTestCase
+{
+    public function testGetIndividual(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $company        = $this->addCompanyRecord('com-a-');
+        $individualType = $this->addIndividualTypeRecord('prt-a-');
+        $individual     = $this->addIndividualRecord('prd-a-', $company->get('id'), $individualType->get('id'));
+
+        $this->sendGetAs($token, sprintf(Data::$individualsRecordUrl, $individual->get('id')));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::individualResponse($individual),
+            ]
+        );
+    }
+
+    public function testGetIndividuals(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $company        = $this->addCompanyRecord('com-a-');
+        $individualType = $this->addIndividualTypeRecord('prt-a-');
+        $individualOne  = $this->addIndividualRecord('ind-a-', $company->get('id'), $individualType->get('id'));
+        $individualTwo  = $this->addIndividualRecord('ind-b-', $company->get('id'), $individualType->get('id'));
+
+        $this->sendGetAs($token, Data::$individualsUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::individualResponse($individualOne),
+                Data::individualResponse($individualTwo),
+            ]
+        );
+    }
+
+    public function testGetIndividualsNoData(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$individualsUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse();
+    }
+
+    public function testGetIndividualsWithIncludesAllIncludes(): void
+    {
+        $this->checkIncludes([Relationships::COMPANIES, Relationships::INDIVIDUAL_TYPES]);
+    }
+
+    public function testGetIndividualsWithIncludesCompanies(): void
+    {
+        $this->checkIncludes([Relationships::COMPANIES]);
+    }
+
+    public function testGetIndividualsWithRelationshipIndividualTypes(): void
+    {
+        $this->checkIncludes([Relationships::INDIVIDUAL_TYPES]);
+    }
+
+    public function testGetUnknownIndividual(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, sprintf(Data::$individualsRecordUrl, 1));
+        $this->assertResponseIs404();
+    }
+
+    /**
+     * Returns [$individual, $individualType, $company].
+     *
+     * @return array<int, mixed>
+     */
+    private function addRecords(): array
+    {
+        $company        = $this->addCompanyRecord('com-a');
+        $individualType = $this->addIndividualTypeRecord('prt-a-');
+        $individual     = $this->addIndividualRecord('ind-a-', $company->get('id'), $individualType->get('id'));
+
+        return [$individual, $individualType, $company];
+    }
+
+    /**
+     * @param array<int, string> $includes
+     */
+    private function checkIncludes(array $includes = []): void
+    {
+        [$individual, $individualType, $company] = $this->addRecords();
+
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs(
+            $token,
+            sprintf(
+                Data::$individualsRecordIncludesUrl,
+                $individual->get('id'),
+                implode(',', $includes)
+            )
+        );
+        $this->assertResponseIsSuccessful();
+
+        $element = [
+            'type'       => Relationships::INDIVIDUALS,
+            'id'         => (string) $individual->get('id'),
+            'attributes' => [
+                'companyId' => $individual->get('companyId'),
+                'typeId'    => $individual->get('typeId'),
+                'prefix'    => $individual->get('prefix'),
+                'first'     => $individual->get('first'),
+                'middle'    => $individual->get('middle'),
+                'last'      => $individual->get('last'),
+                'suffix'    => $individual->get('suffix'),
+            ],
+            'links'      => [
+                'self' => sprintf(
+                    '%s/%s/%s',
+                    envValue('APP_URL', 'localhost'),
+                    Relationships::INDIVIDUALS,
+                    $individual->get('id')
+                ),
+            ],
+        ];
+
+        $included = [];
+        foreach ($includes as $include) {
+            if (Relationships::COMPANIES === $include) {
+                $element['relationships'][Relationships::COMPANIES] = [
+                    'links' => [
+                        'self'    => sprintf(
+                            '%s/%s/%s/relationships/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::INDIVIDUALS,
+                            $individual->get('id'),
+                            Relationships::COMPANIES
+                        ),
+                        'related' => sprintf(
+                            '%s/%s/%s/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::INDIVIDUALS,
+                            $individual->get('id'),
+                            Relationships::COMPANIES
+                        ),
+                    ],
+                    'data'  => [
+                        'type' => Relationships::COMPANIES,
+                        'id'   => (string) $company->get('id'),
+                    ],
+                ];
+
+                $included[] = Data::companiesResponse($company);
+            }
+
+            if (Relationships::INDIVIDUAL_TYPES === $include) {
+                $element['relationships'][Relationships::INDIVIDUAL_TYPES] = [
+                    'links' => [
+                        'self'    => sprintf(
+                            '%s/%s/%s/relationships/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::INDIVIDUALS,
+                            $individual->get('id'),
+                            Relationships::INDIVIDUAL_TYPES
+                        ),
+                        'related' => sprintf(
+                            '%s/%s/%s/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::INDIVIDUALS,
+                            $individual->get('id'),
+                            Relationships::INDIVIDUAL_TYPES
+                        ),
+                    ],
+                    'data'  => [
+                        'type' => Relationships::INDIVIDUAL_TYPES,
+                        'id'   => (string) $individualType->get('id'),
+                    ],
+                ];
+
+                $included[] = Data::individualTypeResponse($individualType);
+            }
+        }
+
+        $this->assertSuccessJsonResponse('data', [$element]);
+
+        if (count($included) > 0) {
+            $this->assertSuccessJsonResponse('included', $included);
+        }
+    }
+}
diff --git a/tests/Api/LoginTest.php b/tests/Api/LoginTest.php
new file mode 100644
index 00000000..85663f85
--- /dev/null
+++ b/tests/Api/LoginTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api;
+
+use Phalcon\Api\Constants\Flags;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Tests\Support\Data;
+
+use function json_decode;
+
+final class LoginTest extends AbstractApiTestCase
+{
+    public function testLoginKnownUser(): void
+    {
+        $this->haveRecordWithFields(
+            Users::class,
+            [
+                'status'        => Flags::ACTIVE,
+                'username'      => Data::$testUsername,
+                'password'      => Data::$testPasswordHash,
+                'issuer'        => Data::$testIssuer,
+                'tokenPassword' => Data::$strongPassphrase,
+                'tokenId'       => Data::$testTokenId,
+            ]
+        );
+
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $response = json_decode($this->grabResponse(), true);
+
+        $this->assertTrue(isset($response['data']));
+        $this->assertTrue(isset($response['data']['token']));
+        $this->assertTrue(isset($response['meta']));
+    }
+
+    public function testLoginUnknownUser(): void
+    {
+        $this->sendPost(
+            Data::$loginUrl,
+            [
+                'username' => 'user',
+                'password' => 'pass',
+            ]
+        );
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Incorrect credentials');
+    }
+}
diff --git a/tests/Api/NotFoundTest.php b/tests/Api/NotFoundTest.php
new file mode 100644
index 00000000..bfa9e9b5
--- /dev/null
+++ b/tests/Api/NotFoundTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api;
+
+use Phalcon\Api\Tests\Support\Data;
+
+final class NotFoundTest extends AbstractApiTestCase
+{
+    public function testCheckNotFoundRoute(): void
+    {
+        $this->sendGet(Data::$wrongUrl);
+        $this->assertResponseIs404();
+    }
+}
diff --git a/tests/api/ProductTypes/GetCest.php b/tests/Api/ProductTypes/GetTest.php
similarity index 52%
rename from tests/api/ProductTypes/GetCest.php
rename to tests/Api/ProductTypes/GetTest.php
index 1b102c6c..52a13316 100644
--- a/tests/api/ProductTypes/GetCest.php
+++ b/tests/Api/ProductTypes/GetTest.php
@@ -1,35 +1,38 @@
 <?php
 
-namespace Phalcon\Api\Tests\api\ProductTypes;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\ProductTypes;
 
-use ApiTester;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Products;
-use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
 
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
 
-class GetCest
+final class GetTest extends AbstractApiTestCase
 {
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getProductTypes(ApiTester $I)
+    public function testGetProductTypes(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $typeOne = $I->addProductTypeRecord('type-a-');
-        $typeTwo = $I->addProductTypeRecord('type-b-');
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$productTypesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $typeOne = $this->addProductTypeRecord('type-a-');
+        $typeTwo = $this->addProductTypeRecord('type-b-');
+
+        $this->sendGetAs($token, Data::$productTypesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
             'data',
             [
                 Data::productTypeResponse($typeOne),
@@ -38,53 +41,40 @@ public function getProductTypes(ApiTester $I)
         );
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getUnknownProductTypes(ApiTester $I)
+    public function testGetProductTypesNoData(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
 
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$productTypesRecordUrl, 1));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs404();
+        $this->sendGetAs($token, Data::$productTypesUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse();
     }
 
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getProductTypesWithIncludesProducts(ApiTester $I)
+    public function testGetProductTypesWithIncludesProducts(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var ProductTypes $productType */
-        $productType = $I->addProductTypeRecord('type-a-');
-        /** @var Products $productOne */
-        $productOne = $I->addProductRecord('prd-a-', $productType->get('id'));
-        /** @var Products $productTwo */
-        $productTwo = $I->addProductRecord('prd-b-', $productType->get('id'));
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $productType = $this->addProductTypeRecord('type-a-');
+        $productOne  = $this->addProductRecord('prd-a-', $productType->get('id'));
+        $productTwo  = $this->addProductRecord('prd-b-', $productType->get('id'));
+
+        $this->sendGetAs(
+            $token,
             sprintf(
                 Data::$productTypesRecordIncludesUrl,
                 $productType->get('id'),
                 Relationships::PRODUCTS
             )
         );
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-
-        $I->seeSuccessJsonResponse(
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
             'data',
             [
                 [
                     'type'          => Relationships::PRODUCT_TYPES,
-                    'id'            => $productType->get('id'),
+                    'id'            => (string) $productType->get('id'),
                     'attributes'    => [
                         'name'        => $productType->get('name'),
                         'description' => $productType->get('description'),
@@ -118,11 +108,11 @@ public function getProductTypesWithIncludesProducts(ApiTester $I)
                             'data'  => [
                                 [
                                     'type' => Relationships::PRODUCTS,
-                                    'id'   => $productOne->get('id'),
+                                    'id'   => (string) $productOne->get('id'),
                                 ],
                                 [
                                     'type' => Relationships::PRODUCTS,
-                                    'id'   => $productTwo->get('id'),
+                                    'id'   => (string) $productTwo->get('id'),
                                 ],
                             ],
                         ],
@@ -131,7 +121,7 @@ public function getProductTypesWithIncludesProducts(ApiTester $I)
             ]
         );
 
-        $I->seeSuccessJsonResponse(
+        $this->assertSuccessJsonResponse(
             'included',
             [
                 Data::productResponse($productOne),
@@ -140,18 +130,12 @@ public function getProductTypesWithIncludesProducts(ApiTester $I)
         );
     }
 
-    /**
-     * @param ApiTester $I
-     */
-    public function getProductTypesNoData(ApiTester $I)
+    public function testGetUnknownProductTypes(): void
     {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$productTypesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse();
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, sprintf(Data::$productTypesRecordUrl, 1));
+        $this->assertResponseIs404();
     }
 }
diff --git a/tests/Api/Products/GetTest.php b/tests/Api/Products/GetTest.php
new file mode 100644
index 00000000..d9a24f40
--- /dev/null
+++ b/tests/Api/Products/GetTest.php
@@ -0,0 +1,227 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Products;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
+
+use function count;
+use function implode;
+use function Phalcon\Api\Core\envValue;
+use function sprintf;
+
+final class GetTest extends AbstractApiTestCase
+{
+    public function testGetProduct(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $productType = $this->addProductTypeRecord('prt-a-');
+        $product     = $this->addProductRecord('prd-a-', $productType->get('id'));
+
+        $this->sendGetAs($token, sprintf(Data::$productsRecordUrl, $product->get('id')));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::productResponse($product),
+            ]
+        );
+    }
+
+    public function testGetProducts(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $productType = $this->addProductTypeRecord('prt-a-');
+        $productOne  = $this->addProductRecord('prd-a-', $productType->get('id'));
+        $productTwo  = $this->addProductRecord('prd-b-', $productType->get('id'));
+
+        $this->sendGetAs($token, Data::$productsUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::productResponse($productOne),
+                Data::productResponse($productTwo),
+            ]
+        );
+    }
+
+    public function testGetProductsNoData(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$productsUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse();
+    }
+
+    public function testGetProductsWithIncludesAllIncludes(): void
+    {
+        $this->checkIncludes([Relationships::COMPANIES, Relationships::PRODUCT_TYPES]);
+    }
+
+    public function testGetProductsWithIncludesCompanies(): void
+    {
+        $this->checkIncludes([Relationships::COMPANIES]);
+    }
+
+    public function testGetProductsWithIncludesProductTypes(): void
+    {
+        $this->checkIncludes([Relationships::PRODUCT_TYPES]);
+    }
+
+    public function testGetUnknownProduct(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, sprintf(Data::$productsRecordUrl, 1));
+        $this->assertResponseIs404();
+    }
+
+    /**
+     * Returns [$product, $productType, $comOne, $comTwo].
+     *
+     * @return array<int, mixed>
+     */
+    private function addRecords(): array
+    {
+        $comOne      = $this->addCompanyRecord('com-a');
+        $comTwo      = $this->addCompanyRecord('com-b');
+        $productType = $this->addProductTypeRecord('prt-a-');
+        $product     = $this->addProductRecord('prd-a-', $productType->get('id'));
+
+        $this->addCompanyXProduct($comOne->get('id'), $product->get('id'));
+        $this->addCompanyXProduct($comTwo->get('id'), $product->get('id'));
+
+        return [$product, $productType, $comOne, $comTwo];
+    }
+
+    /**
+     * @param array<int, string> $includes
+     */
+    private function checkIncludes(array $includes = []): void
+    {
+        [$product, $productType, $comOne, $comTwo] = $this->addRecords();
+
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs(
+            $token,
+            sprintf(
+                Data::$productsRecordIncludesUrl,
+                $product->get('id'),
+                implode(',', $includes)
+            )
+        );
+        $this->assertResponseIsSuccessful();
+
+        $element = [
+            'type'       => Relationships::PRODUCTS,
+            'id'         => (string) $product->get('id'),
+            'attributes' => [
+                'typeId'      => $productType->get('id'),
+                'name'        => $product->get('name'),
+                'description' => $product->get('description'),
+                'quantity'    => $product->get('quantity'),
+                'price'       => $product->get('price'),
+            ],
+            'links'      => [
+                'self' => sprintf(
+                    '%s/%s/%s',
+                    envValue('APP_URL', 'localhost'),
+                    Relationships::PRODUCTS,
+                    $product->get('id')
+                ),
+            ],
+        ];
+
+        $included = [];
+        foreach ($includes as $include) {
+            if (Relationships::COMPANIES === $include) {
+                $element['relationships'][Relationships::COMPANIES] = [
+                    'links' => [
+                        'self'    => sprintf(
+                            '%s/%s/%s/relationships/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::PRODUCTS,
+                            $product->get('id'),
+                            Relationships::COMPANIES
+                        ),
+                        'related' => sprintf(
+                            '%s/%s/%s/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::PRODUCTS,
+                            $product->get('id'),
+                            Relationships::COMPANIES
+                        ),
+                    ],
+                    'data'  => [
+                        [
+                            'type' => Relationships::COMPANIES,
+                            'id'   => (string) $comOne->get('id'),
+                        ],
+                        [
+                            'type' => Relationships::COMPANIES,
+                            'id'   => (string) $comTwo->get('id'),
+                        ],
+                    ],
+                ];
+
+                $included[] = Data::companiesResponse($comOne);
+                $included[] = Data::companiesResponse($comTwo);
+            }
+
+            if (Relationships::PRODUCT_TYPES === $include) {
+                $element['relationships'][Relationships::PRODUCT_TYPES] = [
+                    'links' => [
+                        'self'    => sprintf(
+                            '%s/%s/%s/relationships/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::PRODUCTS,
+                            $product->get('id'),
+                            Relationships::PRODUCT_TYPES
+                        ),
+                        'related' => sprintf(
+                            '%s/%s/%s/%s',
+                            envValue('APP_URL', 'localhost'),
+                            Relationships::PRODUCTS,
+                            $product->get('id'),
+                            Relationships::PRODUCT_TYPES
+                        ),
+                    ],
+                    'data'  => [
+                        'type' => Relationships::PRODUCT_TYPES,
+                        'id'   => (string) $productType->get('id'),
+                    ],
+                ];
+
+                $included[] = Data::productTypeResponse($productType);
+            }
+        }
+
+        $this->assertSuccessJsonResponse('data', [$element]);
+
+        if (count($included) > 0) {
+            $this->assertSuccessJsonResponse('included', $included);
+        }
+    }
+}
diff --git a/tests/Api/Users/GetTest.php b/tests/Api/Users/GetTest.php
new file mode 100644
index 00000000..86faf855
--- /dev/null
+++ b/tests/Api/Users/GetTest.php
@@ -0,0 +1,269 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Api\Users;
+
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Tests\Api\AbstractApiTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\TokenTrait;
+use Phalcon\Encryption\Security\JWT\Builder;
+use Phalcon\Encryption\Security\JWT\Signer\Hmac;
+
+use function explode;
+use function json_decode;
+use function time;
+use function usleep;
+
+final class GetTest extends AbstractApiTestCase
+{
+    use TokenTrait;
+
+    public function testGetManyUsers(): void
+    {
+        $userOne = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'status'        => 1,
+                'username'      => Data::$testUsername,
+                'password'      => Data::$testPasswordHash,
+                'issuer'        => Data::$testIssuer,
+                'tokenPassword' => Data::$strongPassphrase,
+                'tokenId'       => Data::$testTokenId,
+            ]
+        );
+
+        $userTwo = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'status'        => 1,
+                'username'      => Data::$testUsername . '1',
+                'password'      => Data::$testPassword . '1',
+                'issuer'        => Data::$testIssuer . '1',
+                'tokenPassword' => Data::$strongPassphrase . '1',
+                'tokenId'       => Data::$testTokenId . '1',
+            ]
+        );
+
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$usersUrl);
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::userResponse($userOne),
+                Data::userResponse($userTwo),
+            ]
+        );
+    }
+
+    public function testGetManyUsersWithNoData(): void
+    {
+        $this->addApiUserRecord();
+        $token = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$usersUrl);
+        $this->assertResponseIsSuccessful();
+    }
+
+    /**
+     * The suite asserts JSON subsets, so extra attributes in a response pass
+     * silently - which is how `password` and `tokenPassword` were published for
+     * as long as they were. This asserts their absence explicitly.
+     *
+     * The stored password is a hash, so it is the hash that would leak - not
+     * the plain password, which never reaches the database.
+     */
+    public function testGetUserDoesNotPublishSecrets(): void
+    {
+        $record = $this->addApiUserRecord();
+        $token  = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+
+        $this->assertResponseNotContains('password');
+        $this->assertResponseNotContains(Data::$testPasswordHash);
+        $this->assertResponseNotContains(Data::$testTokenPassword);
+    }
+
+    public function testLoginKnownUserCorrectToken(): void
+    {
+        $this->addApiUserRecord();
+        $this->apiLogin();
+    }
+
+    public function testLoginKnownUserExpiredToken(): void
+    {
+        $record = $this->addApiUserRecord();
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+
+        $token = $builder
+            ->setIssuer(Data::$testIssuer)
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setIssuedAt(time() - 3600)
+            ->setNotBefore(time() - 3590)
+            ->setExpirationTime(time())
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        usleep(1000000);
+        $expiredToken = $token->getToken();
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $expiredToken);
+        $this->sendGet(Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Invalid Token (verification)');
+    }
+
+    public function testLoginKnownUserGetUnknownUser(): void
+    {
+        $record = $this->addApiUserRecord();
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $response = json_decode($this->grabResponse(), true);
+        $token    = $response['data']['token'];
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $token);
+        /**
+         * This test creates a single user, which owns the lowest id, so the
+         * next id up cannot exist. Asking for a fixed `1` only ever worked
+         * while ids ran into the thousands; now that tearDown truncates and
+         * they restart from one, `1` is the user we just made.
+         */
+        $this->sendGet(Data::$usersUrl . '/' . ($record->get('id') + 1));
+        $this->assertResponseIs404();
+    }
+
+    public function testLoginKnownUserIncorrectSignature(): void
+    {
+        $record = $this->addApiUserRecord();
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+
+        $token = $builder
+            ->setIssuer(Data::$testIssuer)
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setIssuedAt(time() - 3600)
+            ->setNotBefore(time() - 3590)
+            ->setExpirationTime(time() + 3000)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $wrongToken = $token->getToken();
+        $parts      = explode('.', $wrongToken);
+        $wrongToken = $parts[0] . '.' . $parts[1] . '.';
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $wrongToken);
+        $this->sendGet(Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Invalid Token (verification)');
+    }
+
+    public function testLoginKnownUserInvalidToken(): void
+    {
+        $record = $this->addApiUserRecord();
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+
+        $token = $builder
+            ->setIssuer(Data::$testIssuer)
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setIssuedAt(time())
+            ->setNotBefore(time())
+            ->setExpirationTime(time() + 3000)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $invalidToken = $token->getToken() . 'xx';
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $invalidToken);
+        $this->sendGet(Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Invalid Token (verification)');
+    }
+
+    public function testLoginKnownUserInvalidUserInToken(): void
+    {
+        $record = $this->addApiUserRecord();
+        $this->unsetHttpHeader('Authorization');
+        $this->sendPost(Data::$loginUrl, Data::loginJson());
+        $this->assertResponseIsSuccessful();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+
+        $token = $builder
+            ->setIssuer(Data::$testIssuer)
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setIssuedAt(time() - 3600)
+            ->setNotBefore(time() - 3590)
+            ->setExpirationTime(time() + 3000)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $invalidToken = $token->getToken();
+
+        $this->haveHttpHeader('Authorization', 'Bearer ' . $invalidToken);
+        $this->sendGet(Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Invalid Token (verification)');
+    }
+
+    public function testLoginKnownUserNoToken(): void
+    {
+        $this->unsetHttpHeader('Authorization');
+        $this->sendGet(Data::$usersUrl . '/1');
+        $this->assertResponseIsSuccessful();
+        $this->assertErrorJsonResponse('Invalid Token');
+    }
+
+    public function testLoginKnownUserValidToken(): void
+    {
+        $record = $this->addApiUserRecord();
+        $token  = $this->apiLogin();
+
+        $this->sendGetAs($token, Data::$usersUrl . '/' . $record->get('id'));
+        $this->assertResponseIsSuccessful();
+        $this->assertSuccessJsonResponse(
+            'data',
+            [
+                Data::userResponse($record),
+            ]
+        );
+    }
+}
diff --git a/tests/Cli/CheckHelpTaskTest.php b/tests/Cli/CheckHelpTaskTest.php
new file mode 100644
index 00000000..02fd0ca4
--- /dev/null
+++ b/tests/Cli/CheckHelpTaskTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Cli;
+
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function dirname;
+use function exec;
+use function implode;
+
+use const PHP_EOL;
+
+/**
+ * Ported from the Codeception `CheckHelpTaskCest`. Codeception's Cli module
+ * supplied `runShellCommand()`; Talon has no equivalent, so the binary is
+ * invoked directly. The path is absolute because the working directory a test
+ * runs from is not guaranteed.
+ */
+final class CheckHelpTaskTest extends AbstractUnitTestCase
+{
+    public function testCheckHelp(): void
+    {
+        $output   = [];
+        $exitCode = 1;
+
+        exec(dirname(__FILE__, 3) . '/bin/cli 2>&1', $output, $exitCode);
+
+        $shellOutput = implode(PHP_EOL, $output);
+
+        $this->assertSame(0, $exitCode);
+        $this->assertStringContainsString('--help', $shellOutput);
+        $this->assertStringContainsString('--clear-cache', $shellOutput);
+    }
+}
diff --git a/tests/_support/Helper/Integration.php b/tests/Integration/AbstractIntegrationTestCase.php
similarity index 55%
rename from tests/_support/Helper/Integration.php
rename to tests/Integration/AbstractIntegrationTestCase.php
index 3e7f6a15..7dd15e58 100644
--- a/tests/_support/Helper/Integration.php
+++ b/tests/Integration/AbstractIntegrationTestCase.php
@@ -1,438 +1,429 @@
-<?php
-
-namespace Helper;
-
-use Codeception\Exception\TestRuntimeException;
-use Codeception\Module;
-use Codeception\TestInterface;
-use Phalcon\Api\Bootstrap\Api;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Models\CompaniesXProducts;
-use Phalcon\Api\Models\Individuals;
-use Phalcon\Api\Models\IndividualTypes;
-use Phalcon\Api\Models\Products;
-use Phalcon\Api\Models\ProductTypes;
-use Phalcon\Api\Mvc\Model\AbstractModel;
-use Phalcon\Config\Config as PhConfig;
-use Phalcon\DI\FactoryDefault as PhDI;
-
-use function array_keys;
-use function array_map;
-use function array_merge;
-use function call_user_func;
-use function implode;
-use function is_array;
-use function rtrim;
-use function sprintf;
-use function uniqid;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Integration extends Module
-{
-    /**
-     * @var null|PhDI
-     */
-    protected $diContainer  = null;
-    protected $savedModels  = [];
-    protected $savedRecords = [];
-    protected $options      = ['rollback' => false];
-
-    /**
-     * Test initializer
-     */
-    public function _before(TestInterface $test)
-    {
-        PhDI::reset();
-
-        $app               = new Api();
-        $this->diContainer = $app->getContainer();
-
-        if ($this->options['rollback']) {
-            $this->diContainer->get('db')
-                              ->begin()
-            ;
-        }
-        $this->savedModels  = [];
-        $this->savedRecords = [];
-    }
-
-    public function _after(TestInterface $test)
-    {
-        if (!$this->options['rollback']) {
-            foreach ($this->savedRecords as $record) {
-                $record->delete();
-            }
-        } else {
-            $this->diContainer->get('db')
-                              ->rollback()
-            ;
-        }
-        $this->diContainer->get('db')
-                          ->close()
-        ;
-    }
-
-    /**
-     * @param string $namePrefix
-     * @param string $addressPrefix
-     * @param string $cityPrefix
-     * @param string $phonePrefix
-     *
-     * @return Companies
-     */
-    public function addCompanyRecord(
-        string $namePrefix = '',
-        string $addressPrefix = '',
-        string $cityPrefix = '',
-        string $phonePrefix = ''
-    ) {
-        return $this->haveRecordWithFields(
-            Companies::class,
-            [
-                'name'    => uniqid($namePrefix),
-                'address' => uniqid($addressPrefix),
-                'city'    => uniqid($cityPrefix),
-                'phone'   => uniqid($phonePrefix),
-            ]
-        );
-    }
-
-    /**
-     * @param int $companyId
-     * @param int $productId
-     *
-     * @return CompaniesXProducts
-     */
-    public function addCompanyXProduct(int $companyId, int $productId)
-    {
-        return $this->haveRecordWithFields(
-            CompaniesXProducts::class,
-            [
-                'companyId' => $companyId,
-                'productId' => $productId,
-            ]
-        );
-    }
-
-    /**
-     * @param string $namePrefix
-     *
-     * @return IndividualTypes
-     */
-    public function addIndividualTypeRecord(string $namePrefix = '')
-    {
-        return $this->haveRecordWithFields(
-            IndividualTypes::class,
-            [
-                'name'        => uniqid($namePrefix),
-                'description' => uniqid(),
-            ]
-        );
-    }
-
-    /**
-     * @param string $namePrefix
-     * @param int    $comId
-     * @param int    $typeId
-     *
-     * @return Individuals
-     */
-    public function addIndividualRecord(string $namePrefix = '', int $comId = 0, int $typeId = 0)
-    {
-        return $this->haveRecordWithFields(
-            Individuals::class,
-            [
-                'companyId' => $comId,
-                'typeId'    => $typeId,
-                'prefix'    => uniqid(),
-                'first'     => uniqid($namePrefix),
-                'middle'    => uniqid(),
-                'last'      => uniqid(),
-                'suffix'    => uniqid(),
-            ]
-        );
-    }
-
-    /**
-     * @param string $namePrefix
-     * @param int    $typeId
-     *
-     * @return Products
-     */
-    public function addProductRecord(string $namePrefix = '', int $typeId = 0)
-    {
-        return $this->haveRecordWithFields(
-            Products::class,
-            [
-                'name'        => uniqid($namePrefix),
-                'typeId'      => $typeId,
-                'description' => uniqid(),
-                'quantity'    => 25,
-                'price'       => 19.99,
-            ]
-        );
-    }
-
-    /**
-     * @param string $namePrefix
-     *
-     * @return ProductTypes
-     */
-    public function addProductTypeRecord(string $namePrefix = '')
-    {
-        return $this->haveRecordWithFields(
-            ProductTypes::class,
-            [
-                'name'        => uniqid($namePrefix),
-                'description' => uniqid(),
-            ]
-        );
-    }
-
-    /**
-     * @return mixed
-     */
-    public function grabDi()
-    {
-        return $this->diContainer;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return mixed
-     */
-    public function grabFromDi(string $name)
-    {
-        return $this->diContainer->get($name);
-    }
-
-    /**
-     * Returns the relationships that a model has
-     *
-     * @param string $class
-     *
-     * @return array
-     */
-    public function getModelRelationships(string $class): array
-    {
-        /** @var AbstractModel $class */
-        $model         = new $class();
-        $manager       = $model->getModelsManager();
-        $relationships = $manager->getRelations($class);
-
-        $data = [];
-        foreach ($relationships as $relationship) {
-            $data[] = [
-                $relationship->getType(),
-                $relationship->getFields(),
-                $relationship->getReferencedModel(),
-                $relationship->getReferencedFields(),
-                $relationship->getOptions(),
-            ];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Get a record from $modelName with fields provided
-     *
-     * @param string $modelName
-     * @param array  $fields
-     *
-     * @return bool|AbstractModel
-     */
-    public function getRecordWithFields(string $modelName, $fields = [])
-    {
-        $record = false;
-        if (count($fields) > 0) {
-            $conditions = '';
-            $bind       = [];
-            foreach ($fields as $field => $value) {
-                $conditions   .= sprintf(
-                    '%s = :%s: AND ',
-                    $field,
-                    $field
-                );
-                $bind[$field] = $value;
-            }
-
-            $conditions = rtrim($conditions, ' AND ');
-
-            /** @var AbstractModel $record */
-            $record = $modelName::findFirst(
-                [
-                    'conditions' => $conditions,
-                    'bind'       => $bind,
-                ]
-            );
-        }
-
-        return $record;
-    }
-
-    /**
-     * @param array $configData
-     */
-    public function haveConfig(array $configData)
-    {
-        $config = new PhConfig($configData);
-        $this->diContainer->set('config', $config);
-    }
-
-    /**
-     * Checks model fields
-     *
-     * @param string $modelName
-     * @param array  $fields
-     */
-    public function haveModelDefinition(string $modelName, array $fields)
-    {
-        /** @var AbstractModel $model */
-        $model      = new $modelName;
-        $metadata   = $model->getModelsMetaData();
-        $attributes = $metadata->getAttributes($model);
-
-        $this->assertEquals(
-            count($fields),
-            count($attributes),
-            "Field count not correct for $modelName"
-        );
-
-        foreach ($fields as $value) {
-            $this->assertContains(
-                $value,
-                $attributes,
-                "Field not exists in $modelName"
-            );
-        }
-    }
-
-    /**
-     * Create a record for $modelName with fields provided
-     *
-     * @param string $modelName
-     * @param array  $fields
-     *
-     * @return mixed
-     */
-    public function haveRecordWithFields(string $modelName, array $fields = [])
-    {
-        $record = new $modelName;
-        foreach ($fields as $key => $val) {
-            $record->set($key, $val);
-        }
-
-        $result                        = $record->save();
-        $this->savedModels[$modelName] = $fields;
-        $this->assertNotSame(false, $result);
-
-        $this->savedRecords[] = $record;
-
-        return $record;
-    }
-
-    /**
-     * @param string $name
-     * @param mixed  $service
-     */
-    public function haveService(string $name, $service)
-    {
-        $this->diContainer->set($name, $service);
-    }
-
-    /**
-     * @param string $name
-     */
-    public function removeService(string $name)
-    {
-        if ($this->diContainer->has($name)) {
-            $this->diContainer->remove($name);
-        }
-    }
-
-    /**
-     * Check that record created with haveRecordWithFields can be fetched and
-     * all its fields contain valid values
-     *
-     * @param       $modelName
-     * @param       $by
-     * @param array $except
-     *
-     * @return mixed
-     */
-    public function seeRecordFieldsValid($modelName, $by, array $except = [])
-    {
-        if (!isset($this->savedModels[$modelName])) {
-            throw new TestRuntimeException(
-                'Should be used after haveModelWithFields with ' . $modelName
-            );
-        }
-        $fields = $this->savedModels[$modelName];
-        if (!is_array($by)) {
-            $by = [$by];
-        }
-        $bySelector = implode(
-            ' AND ',
-            array_map(
-                function ($key) {
-                    return "$key = :$key:";
-                },
-                $by
-            )
-        );
-        $byBind     = [];
-        foreach ($by as $byVal) {
-            if (!isset($fields[$byVal])) {
-                throw new TestRuntimeException("Field $byVal is not set");
-            }
-            $byBind[$byVal] = $fields[$byVal];
-        }
-        $record = call_user_func(
-            [
-                $modelName, 'findFirst',
-            ],
-            [
-                'conditions' => $bySelector,
-                'bind'       => $byBind,
-            ]
-        );
-        if (!$record) {
-            $this->fail("Record $modelName for $by not found");
-        }
-
-        foreach ($fields as $key => $val) {
-            if (isset($except[$key])) {
-                continue;
-            }
-            $this->assertEquals(
-                $val,
-                $record->get($key),
-                "Field in $modelName for $key not valid"
-            );
-        }
-
-        return $record;
-    }
-
-    /**
-     * Checks that record exists and has provided fields
-     *
-     * @param $model
-     * @param $by
-     * @param $fields
-     */
-    public function seeRecordSaved($model, $by, $fields)
-    {
-        $this->savedModels[$model] = array_merge($by, $fields);
-        $record                    = $this->seeRecordFieldsValid(
-            $model,
-            array_keys($by),
-            array_keys($by)
-        );
-        $this->savedRecords[]      = $record;
-    }
-}
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration;
+
+use Phalcon\Api\Bootstrap\Api;
+use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Models\CompaniesXProducts;
+use Phalcon\Api\Models\Individuals;
+use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Models\Products;
+use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Mvc\Model\AbstractModel;
+use Phalcon\Config\Config as PhConfig;
+use Phalcon\Di\DiInterface;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+use RuntimeException;
+
+use function array_keys;
+use function array_map;
+use function array_merge;
+use function call_user_func;
+use function count;
+use function implode;
+use function is_array;
+use function rtrim;
+use function sprintf;
+use function uniqid;
+
+/**
+ * Ported from the Codeception `Helper\Integration` module. Boots the application
+ * container for each test.
+ *
+ * No transactions, no rollback, no bookkeeping of created records. A test that
+ * writes to the database owns what it wrote and removes it itself. Wrapping each
+ * test in a transaction the harness controlled made it impossible to ever assert
+ * a real commit or rollback, and deleting through the models under test fell
+ * apart the moment mutation testing broke those models.
+ */
+abstract class AbstractIntegrationTestCase extends AbstractUnitTestCase
+{
+    /**
+     * Every table a test may write to. tearDown() empties them all, which is
+     * what keeps the suite idempotent now that nothing is rolled back. Order is
+     * irrelevant: the foreign keys are switched off around the truncation.
+     *
+     * @var array<int, string>
+     */
+    private const TABLES = [
+        'co_companies',
+        'co_companies_x_products',
+        'co_individual_types',
+        'co_individuals',
+        'co_product_types',
+        'co_products',
+        'co_users',
+    ];
+
+    protected ?DiInterface $diContainer = null;
+
+    /** @var array<string, array<string, mixed>> */
+    protected array $savedModels = [];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $app               = new Api();
+        $this->diContainer = $app->getContainer();
+
+        $this->savedModels = [];
+
+        /**
+         * The data cache is Redis, shared with the running server the api suite
+         * drives over HTTP. A record cached under one test would still answer a
+         * later test that expects it gone, so each test starts from an empty
+         * cache as well as an empty database.
+         */
+        $this->diContainer->get('cache')->clear();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->truncateTables();
+        $this->diContainer->get('db')->close();
+
+        parent::tearDown();
+    }
+
+    protected function addCompanyRecord(
+        string $namePrefix = '',
+        string $addressPrefix = '',
+        string $cityPrefix = '',
+        string $phonePrefix = ''
+    ): Companies {
+        return $this->haveRecordWithFields(
+            Companies::class,
+            [
+                'name'    => uniqid($namePrefix),
+                'address' => uniqid($addressPrefix),
+                'city'    => uniqid($cityPrefix),
+                'phone'   => uniqid($phonePrefix),
+            ]
+        );
+    }
+
+    protected function addCompanyXProduct(int $companyId, int $productId): CompaniesXProducts
+    {
+        return $this->haveRecordWithFields(
+            CompaniesXProducts::class,
+            [
+                'companyId' => $companyId,
+                'productId' => $productId,
+            ]
+        );
+    }
+
+    protected function addIndividualRecord(string $namePrefix = '', int $comId = 0, int $typeId = 0): Individuals
+    {
+        return $this->haveRecordWithFields(
+            Individuals::class,
+            [
+                'companyId' => $comId,
+                'typeId'    => $typeId,
+                'prefix'    => uniqid(),
+                'first'     => uniqid($namePrefix),
+                'middle'    => uniqid(),
+                'last'      => uniqid(),
+                'suffix'    => uniqid(),
+            ]
+        );
+    }
+
+    protected function addIndividualTypeRecord(string $namePrefix = ''): IndividualTypes
+    {
+        return $this->haveRecordWithFields(
+            IndividualTypes::class,
+            [
+                'name'        => uniqid($namePrefix),
+                'description' => uniqid(),
+            ]
+        );
+    }
+
+    protected function addProductRecord(string $namePrefix = '', int $typeId = 0): Products
+    {
+        return $this->haveRecordWithFields(
+            Products::class,
+            [
+                'name'        => uniqid($namePrefix),
+                'typeId'      => $typeId,
+                'description' => uniqid(),
+                'quantity'    => 25,
+                'price'       => 19.99,
+            ]
+        );
+    }
+
+    protected function addProductTypeRecord(string $namePrefix = ''): ProductTypes
+    {
+        return $this->haveRecordWithFields(
+            ProductTypes::class,
+            [
+                'name'        => uniqid($namePrefix),
+                'description' => uniqid(),
+            ]
+        );
+    }
+
+    /**
+     * Returns the relationships that a model has.
+     *
+     * @return array<int, array<int, mixed>>
+     */
+    protected function getModelRelationships(string $class): array
+    {
+        /** @var AbstractModel $model */
+        $model         = new $class();
+        $manager       = $model->getModelsManager();
+        $relationships = $manager->getRelations($class);
+
+        $data = [];
+        foreach ($relationships as $relationship) {
+            $data[] = [
+                $relationship->getType(),
+                $relationship->getFields(),
+                $relationship->getReferencedModel(),
+                $relationship->getReferencedFields(),
+                $relationship->getOptions(),
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get a record from $modelName with the fields provided.
+     *
+     * @param array<string, mixed> $fields
+     *
+     * @return bool|AbstractModel
+     */
+    protected function getRecordWithFields(string $modelName, array $fields = [])
+    {
+        $record = false;
+        if (count($fields) > 0) {
+            $conditions = '';
+            $bind       = [];
+            foreach ($fields as $field => $value) {
+                $conditions   .= sprintf(
+                    '%s = :%s: AND ',
+                    $field,
+                    $field
+                );
+                $bind[$field] = $value;
+            }
+
+            $conditions = rtrim($conditions, ' AND ');
+
+            /** @var AbstractModel $record */
+            $record = $modelName::findFirst(
+                [
+                    'conditions' => $conditions,
+                    'bind'       => $bind,
+                ]
+            );
+        }
+
+        return $record;
+    }
+
+    protected function grabDi(): ?DiInterface
+    {
+        return $this->diContainer;
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function grabFromDi(string $name)
+    {
+        return $this->diContainer->get($name);
+    }
+
+    /**
+     * @param array<string, mixed> $configData
+     */
+    protected function haveConfig(array $configData): void
+    {
+        $config = new PhConfig($configData);
+        $this->diContainer->set('config', $config);
+    }
+
+    /**
+     * Checks model fields.
+     *
+     * @param array<int, string> $fields
+     */
+    protected function haveModelDefinition(string $modelName, array $fields): void
+    {
+        /** @var AbstractModel $model */
+        $model      = new $modelName();
+        $metadata   = $model->getModelsMetaData();
+        $attributes = $metadata->getAttributes($model);
+
+        $this->assertEquals(
+            count($fields),
+            count($attributes),
+            "Field count not correct for $modelName"
+        );
+
+        foreach ($fields as $value) {
+            $this->assertContains(
+                $value,
+                $attributes,
+                "Field not exists in $modelName"
+            );
+        }
+    }
+
+    /**
+     * Create a record for $modelName with the fields provided.
+     *
+     * @param array<string, mixed> $fields
+     *
+     * @return mixed
+     */
+    protected function haveRecordWithFields(string $modelName, array $fields = [])
+    {
+        $record = new $modelName();
+        foreach ($fields as $key => $val) {
+            $record->set($key, $val);
+        }
+
+        $result                        = $record->save();
+        $this->savedModels[$modelName] = $fields;
+        $this->assertNotSame(false, $result);
+
+        return $record;
+    }
+
+    /**
+     * @param mixed $service
+     */
+    protected function haveService(string $name, $service): void
+    {
+        $this->diContainer->set($name, $service);
+    }
+
+    protected function removeService(string $name): void
+    {
+        if ($this->diContainer->has($name)) {
+            $this->diContainer->remove($name);
+        }
+    }
+
+    /**
+     * Check that a record created with haveRecordWithFields can be fetched and
+     * that all its fields contain valid values.
+     *
+     * @param string|array<int, string> $by
+     * @param array<string, mixed>      $except
+     *
+     * @return mixed
+     */
+    protected function seeRecordFieldsValid(string $modelName, $by, array $except = [])
+    {
+        if (!isset($this->savedModels[$modelName])) {
+            throw new RuntimeException(
+                'Should be used after haveModelWithFields with ' . $modelName
+            );
+        }
+
+        $fields = $this->savedModels[$modelName];
+        if (!is_array($by)) {
+            $by = [$by];
+        }
+
+        $bySelector = implode(
+            ' AND ',
+            array_map(
+                static function ($key) {
+                    return "$key = :$key:";
+                },
+                $by
+            )
+        );
+
+        $byBind = [];
+        foreach ($by as $byVal) {
+            if (!isset($fields[$byVal])) {
+                throw new RuntimeException("Field $byVal is not set");
+            }
+            $byBind[$byVal] = $fields[$byVal];
+        }
+
+        $record = call_user_func(
+            [
+                $modelName, 'findFirst',
+            ],
+            [
+                'conditions' => $bySelector,
+                'bind'       => $byBind,
+            ]
+        );
+
+        if (!$record) {
+            $this->fail("Record $modelName not found");
+        }
+
+        foreach ($fields as $key => $val) {
+            if (isset($except[$key])) {
+                continue;
+            }
+
+            $this->assertEquals(
+                $val,
+                $record->get($key),
+                "Field in $modelName for $key not valid"
+            );
+        }
+
+        return $record;
+    }
+
+    /**
+     * Checks that a record exists and has the provided fields.
+     *
+     * @param array<string, mixed> $by
+     * @param array<string, mixed> $fields
+     */
+    protected function seeRecordSaved(string $model, array $by, array $fields): void
+    {
+        $this->savedModels[$model] = array_merge($by, $fields);
+
+        $this->seeRecordFieldsValid(
+            $model,
+            array_keys($by),
+            array_keys($by)
+        );
+    }
+
+    /**
+     * Empties every table a test may have written to, at the database level so
+     * a broken model cannot get in the way. Foreign keys are switched off for
+     * the duration: with them on a plain TRUNCATE refuses on any table another
+     * one references, and the point is precisely to clear all of them.
+     */
+    private function truncateTables(): void
+    {
+        $db = $this->diContainer->get('db');
+
+        $db->execute('SET FOREIGN_KEY_CHECKS = 0');
+        foreach (self::TABLES as $table) {
+            $db->execute('TRUNCATE TABLE ' . $table);
+        }
+        $db->execute('SET FOREIGN_KEY_CHECKS = 1');
+    }
+}
diff --git a/tests/Integration/Library/ModelTest.php b/tests/Integration/Library/ModelTest.php
new file mode 100644
index 00000000..db38d5f7
--- /dev/null
+++ b/tests/Integration/Library/ModelTest.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library;
+
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Logger\Adapter\Stream;
+use Phalcon\Logger\Logger;
+use Phalcon\Messages\Message;
+
+use function Phalcon\Api\Core\appPath;
+use function uniqid;
+
+final class ModelTest extends AbstractIntegrationTestCase
+{
+    public function testCheckModelMessages(): void
+    {
+        $user = $this->mockWithConstructor(
+            Users::class,
+            [],
+            [
+                'save'        => false,
+                'getMessages' => [
+                    new Message('error 1'),
+                    new Message('error 2'),
+                ],
+            ]
+        );
+
+        $result = $user
+            ->set('username', 'test')
+            ->save()
+        ;
+        $this->assertFalse($result);
+
+        $this->assertSame('error 1<br />error 2<br />', $user->getModelMessages());
+    }
+
+    public function testCheckModelMessagesWithLogger(): void
+    {
+        $user = $this->mockWithConstructor(
+            Users::class,
+            [],
+            [
+                'save'        => false,
+                'getMessages' => [
+                    new Message('error 1'),
+                    new Message('error 2'),
+                ],
+            ]
+        );
+
+        $result = $user
+            ->set('username', 'test')
+            ->save()
+        ;
+        $this->assertFalse($result);
+        $this->assertSame('error 1<br />error 2<br />', $user->getModelMessages());
+
+        /**
+         * A fresh, empty log file. The shared api.log is only ever appended to,
+         * so asserting against it passed even with the logging removed - the
+         * lines were left over from an earlier test. This one holds only what
+         * this call writes.
+         */
+        $logFile = appPath('storage/logs/') . uniqid('model-test-') . '.log';
+        $logger  = new Logger('test', ['main' => new Stream($logFile)]);
+
+        $user->getModelMessages($logger);
+
+        $this->assertFileContentsContains($logFile, 'error 1');
+        $this->assertFileContentsContains($logFile, 'error 2');
+
+        $this->safeDeleteFile($logFile);
+    }
+
+    public function testModelGetNonExistingFields(): void
+    {
+        /** @var Users $user */
+        $user = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username'      => 'testusername',
+                'password'      => 'testpass',
+                'status'        => 1,
+                'issuer'        => 'phalcon.io',
+                'tokenPassword' => '12345',
+                'tokenId'       => '00110011',
+            ]
+        );
+
+        $this->expectException(ModelException::class);
+
+        $user->get('some_field');
+    }
+    public function testModelGetSetFields(): void
+    {
+        $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username'      => 'testusername',
+                'password'      => 'testpass',
+                'status'        => 1,
+                'issuer'        => 'phalcon.io',
+                'tokenPassword' => '12345',
+                'tokenId'       => '00110011',
+            ]
+        );
+    }
+
+    public function testModelSetNonExistingFields(): void
+    {
+        $this->expectException(ModelException::class);
+
+        $fixture = new Users();
+        $fixture->set('id', 1000)
+                ->set('some_field', true)
+                ->save()
+        ;
+    }
+
+    public function testModelUpdateFields(): void
+    {
+        /** @var Users $user */
+        $user = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username'      => 'testusername',
+                'password'      => 'testpass',
+                'status'        => 1,
+                'issuer'        => 'phalcon.io',
+                'tokenPassword' => '12345',
+                'tokenId'       => '00110011',
+            ]
+        );
+
+        $user->set('username', 'testusername')
+             ->save()
+        ;
+
+        $this->assertSame($user->get('username'), 'testusername');
+        $this->assertSame($user->get('password'), 'testpass');
+        $this->assertSame($user->get('issuer'), 'phalcon.io');
+        $this->assertSame($user->get('tokenPassword'), '12345');
+        $this->assertSame($user->get('tokenId'), '00110011');
+    }
+
+    public function testModelUpdateFieldsNotSanitized(): void
+    {
+        /** @var Users $user */
+        $user = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username'      => 'testusername',
+                'password'      => 'testpass',
+                'status'        => 1,
+                'issuer'        => 'phalcon.io',
+                'tokenPassword' => '12345',
+                'tokenId'       => '00110011',
+
+            ]
+        );
+
+        $user->set('password', 'abcde\nfg')
+             ->save()
+        ;
+        $this->assertSame($user->get('password'), 'abcde\nfg');
+
+        /** Not sanitized */
+        $user->set('password', 'abcde\nfg', false)
+             ->save()
+        ;
+        $this->assertSame($user->get('password'), 'abcde\nfg');
+    }
+}
diff --git a/tests/integration/library/Models/CompaniesCest.php b/tests/Integration/Library/Models/CompaniesTest.php
similarity index 62%
rename from tests/integration/library/Models/CompaniesCest.php
rename to tests/Integration/Library/Models/CompaniesTest.php
index 89d3e65b..0615c687 100644
--- a/tests/integration/library/Models/CompaniesCest.php
+++ b/tests/Integration/Library/Models/CompaniesTest.php
@@ -1,25 +1,44 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Models;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
 
-use IntegrationTester;
 use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\Individuals;
 use Phalcon\Api\Models\Products;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
 use Phalcon\Filter\Filter;
 
-class CompaniesCest
+use function count;
+
+final class CompaniesTest extends AbstractIntegrationTestCase
 {
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
+    public function testValidateFilters(): void
+    {
+        $model    = new Companies();
+        $expected = [
+            'id'      => Filter::FILTER_ABSINT,
+            'name'    => Filter::FILTER_STRING,
+            'address' => Filter::FILTER_STRING,
+            'city'    => Filter::FILTER_STRING,
+            'phone'   => Filter::FILTER_STRING,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
     {
-        $I->haveModelDefinition(
+        $this->haveModelDefinition(
             Companies::class,
             [
                 'id',
@@ -31,59 +50,30 @@ public function validateModel(IntegrationTester $I)
         );
     }
 
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new Companies();
-        $expected = [
-            'id'      => Filter::FILTER_ABSINT,
-            'name'    => Filter::FILTER_STRING,
-            'address' => Filter::FILTER_STRING,
-            'city'    => Filter::FILTER_STRING,
-            'phone'   => Filter::FILTER_STRING,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
+    public function testValidateRelationships(): void
     {
-        $actual   = $I->getModelRelationships(Companies::class);
+        $actual   = $this->getModelRelationships(Companies::class);
         $expected = [
             [
                 2,
                 'id',
                 Individuals::class,
                 'companyId',
-                ['alias' => Relationships::INDIVIDUALS, 'reusable' => true]
+                ['alias' => Relationships::INDIVIDUALS, 'reusable' => true],
             ],
             [
                 4,
                 'id',
                 Products::class,
                 'id',
-                ['alias' => Relationships::PRODUCTS, 'reusable' => true]
+                ['alias' => Relationships::PRODUCTS, 'reusable' => true],
             ],
         ];
 
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     * @throws ModelException
-     */
-    public function validateUniqueName(IntegrationTester $I)
+    public function testValidateUniqueName(): void
     {
         $companyOne = new Companies();
         /** @var Companies $companyOne */
@@ -94,7 +84,7 @@ public function validateUniqueName(IntegrationTester $I)
             ->set('phone', '555-999-4444')
             ->save()
         ;
-        $I->assertNotEquals(false, $result);
+        $this->assertNotEquals(false, $result);
 
         $companyTwo = new Companies();
         /** @var Companies $companyTwo */
@@ -105,15 +95,15 @@ public function validateUniqueName(IntegrationTester $I)
             ->set('phone', '555-999-4444')
             ->save()
         ;
-        $I->assertSame(false, $result);
-        $I->assertSame(1, count($companyTwo->getMessages()));
+        $this->assertSame(false, $result);
+        $this->assertSame(1, count($companyTwo->getMessages()));
 
         $messages = $companyTwo->getMessages();
         $expected = 'The company name already exists in the database';
         $actual   = $messages[0]->getMessage();
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
 
         $result = $companyOne->delete();
-        $I->assertNotEquals(false, $result);
+        $this->assertNotEquals(false, $result);
     }
 }
diff --git a/tests/integration/library/Models/CompaniesXProductsCest.php b/tests/Integration/Library/Models/CompaniesXProductsTest.php
similarity index 53%
rename from tests/integration/library/Models/CompaniesXProductsCest.php
rename to tests/Integration/Library/Models/CompaniesXProductsTest.php
index 6c817d0c..1f59783b 100644
--- a/tests/integration/library/Models/CompaniesXProductsCest.php
+++ b/tests/Integration/Library/Models/CompaniesXProductsTest.php
@@ -1,24 +1,39 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Models;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
 
-use IntegrationTester;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\CompaniesXProducts;
 use Phalcon\Api\Models\Products;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
 use Phalcon\Filter\Filter;
 
-class CompaniesXProductsCest
+final class CompaniesXProductsTest extends AbstractIntegrationTestCase
 {
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
+    public function testValidateFilters(): void
+    {
+        $model    = new CompaniesXProducts();
+        $expected = [
+            'companyId' => Filter::FILTER_ABSINT,
+            'productId' => Filter::FILTER_ABSINT,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
     {
-        $I->haveModelDefinition(
+        $this->haveModelDefinition(
             CompaniesXProducts::class,
             [
                 'companyId',
@@ -27,45 +42,25 @@ public function validateModel(IntegrationTester $I)
         );
     }
 
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new CompaniesXProducts();
-        $expected = [
-            'companyId' => Filter::FILTER_ABSINT,
-            'productId' => Filter::FILTER_ABSINT,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
+    public function testValidateRelationships(): void
     {
-        $actual   = $I->getModelRelationships(CompaniesXProducts::class);
+        $actual   = $this->getModelRelationships(CompaniesXProducts::class);
         $expected = [
             [
                 0,
                 'companyId',
                 Companies::class,
                 'id',
-                ['alias' => Relationships::COMPANIES, 'reusable' => true]
+                ['alias' => Relationships::COMPANIES, 'reusable' => true],
             ],
             [
                 0,
                 'productId',
                 Products::class,
                 'id',
-                ['alias' => Relationships::PRODUCTS, 'reusable' => true]
+                ['alias' => Relationships::PRODUCTS, 'reusable' => true],
             ],
         ];
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/Integration/Library/Models/IndividualTypesTest.php b/tests/Integration/Library/Models/IndividualTypesTest.php
new file mode 100644
index 00000000..1f034ff9
--- /dev/null
+++ b/tests/Integration/Library/Models/IndividualTypesTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Models\Individuals;
+use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Filter\Filter;
+
+final class IndividualTypesTest extends AbstractIntegrationTestCase
+{
+    public function testValidateFilters(): void
+    {
+        $model    = new IndividualTypes();
+        $expected = [
+            'id'          => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
+    {
+        $this->haveModelDefinition(
+            IndividualTypes::class,
+            [
+                'id',
+                'name',
+                'description',
+            ]
+        );
+    }
+
+    public function testValidateRelationships(): void
+    {
+        $actual   = $this->getModelRelationships(IndividualTypes::class);
+        $expected = [
+            [
+                2,
+                'id',
+                Individuals::class,
+                'typeId',
+                ['alias' => Relationships::INDIVIDUALS, 'reusable' => true],
+            ],
+        ];
+        $this->assertSame($expected, $actual);
+    }
+}
diff --git a/tests/integration/library/Models/IndividualsCest.php b/tests/Integration/Library/Models/IndividualsTest.php
similarity index 63%
rename from tests/integration/library/Models/IndividualsCest.php
rename to tests/Integration/Library/Models/IndividualsTest.php
index 13d2eeb7..aadcffb8 100644
--- a/tests/integration/library/Models/IndividualsCest.php
+++ b/tests/Integration/Library/Models/IndividualsTest.php
@@ -1,24 +1,45 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Models;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
 
-use IntegrationTester;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\Individuals;
 use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
 use Phalcon\Filter\Filter;
 
-class IndividualsCest
+final class IndividualsTest extends AbstractIntegrationTestCase
 {
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
+    public function testValidateFilters(): void
+    {
+        $model    = new Individuals();
+        $expected = [
+            'id'        => Filter::FILTER_ABSINT,
+            'companyId' => Filter::FILTER_ABSINT,
+            'typeId'    => Filter::FILTER_ABSINT,
+            'prefix'    => Filter::FILTER_STRING,
+            'first'     => Filter::FILTER_STRING,
+            'middle'    => Filter::FILTER_STRING,
+            'last'      => Filter::FILTER_STRING,
+            'suffix'    => Filter::FILTER_STRING,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
     {
-        $I->haveModelDefinition(
+        $this->haveModelDefinition(
             Individuals::class,
             [
                 'id',
@@ -33,51 +54,25 @@ public function validateModel(IntegrationTester $I)
         );
     }
 
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new Individuals();
-        $expected = [
-            'id'        => Filter::FILTER_ABSINT,
-            'companyId' => Filter::FILTER_ABSINT,
-            'typeId'    => Filter::FILTER_ABSINT,
-            'prefix'    => Filter::FILTER_STRING,
-            'first'     => Filter::FILTER_STRING,
-            'middle'    => Filter::FILTER_STRING,
-            'last'      => Filter::FILTER_STRING,
-            'suffix'    => Filter::FILTER_STRING,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
+    public function testValidateRelationships(): void
     {
-        $actual   = $I->getModelRelationships(Individuals::class);
+        $actual   = $this->getModelRelationships(Individuals::class);
         $expected = [
             [
                 0,
                 'companyId',
                 Companies::class,
                 'id',
-                ['alias' => Relationships::COMPANIES, 'reusable' => true]
+                ['alias' => Relationships::COMPANIES, 'reusable' => true],
             ],
             [
                 1,
                 'typeId',
                 IndividualTypes::class,
                 'id',
-                ['alias' => Relationships::INDIVIDUAL_TYPES, 'reusable' => true]
+                ['alias' => Relationships::INDIVIDUAL_TYPES, 'reusable' => true],
             ],
         ];
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/Integration/Library/Models/ProductTypesTest.php b/tests/Integration/Library/Models/ProductTypesTest.php
new file mode 100644
index 00000000..b65dacb7
--- /dev/null
+++ b/tests/Integration/Library/Models/ProductTypesTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Models\Products;
+use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Filter\Filter;
+
+final class ProductTypesTest extends AbstractIntegrationTestCase
+{
+    public function testValidateFilters(): void
+    {
+        $model    = new ProductTypes();
+        $expected = [
+            'id'          => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
+    {
+        $this->haveModelDefinition(
+            ProductTypes::class,
+            [
+                'id',
+                'name',
+                'description',
+            ]
+        );
+    }
+
+    public function testValidateRelationships(): void
+    {
+        $actual   = $this->getModelRelationships(ProductTypes::class);
+        $expected = [
+            [
+                2,
+                'id',
+                Products::class,
+                'typeId',
+                ['alias' => Relationships::PRODUCTS, 'reusable' => true],
+            ],
+        ];
+        $this->assertSame($expected, $actual);
+    }
+}
diff --git a/tests/integration/library/Models/ProductsCest.php b/tests/Integration/Library/Models/ProductsTest.php
similarity index 60%
rename from tests/integration/library/Models/ProductsCest.php
rename to tests/Integration/Library/Models/ProductsTest.php
index 007225b7..8dd8ab69 100644
--- a/tests/integration/library/Models/ProductsCest.php
+++ b/tests/Integration/Library/Models/ProductsTest.php
@@ -1,24 +1,43 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Models;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
 
-use IntegrationTester;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\Products;
 use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
 use Phalcon\Filter\Filter;
 
-class ProductsCest
+final class ProductsTest extends AbstractIntegrationTestCase
 {
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
+    public function testValidateFilters(): void
+    {
+        $model    = new Products();
+        $expected = [
+            'id'          => Filter::FILTER_ABSINT,
+            'typeId'      => Filter::FILTER_ABSINT,
+            'name'        => Filter::FILTER_STRING,
+            'description' => Filter::FILTER_STRING,
+            'quantity'    => Filter::FILTER_ABSINT,
+            'price'       => Filter::FILTER_FLOAT,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+    public function testValidateModel(): void
     {
-        $I->haveModelDefinition(
+        $this->haveModelDefinition(
             Products::class,
             [
                 'id',
@@ -31,50 +50,26 @@ public function validateModel(IntegrationTester $I)
         );
     }
 
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new Products();
-        $expected = [
-            'id'          => Filter::FILTER_ABSINT,
-            'typeId'      => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-            'quantity'    => Filter::FILTER_ABSINT,
-            'price'       => Filter::FILTER_FLOAT,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
+    public function testValidateRelationships(): void
     {
-        $actual   = $I->getModelRelationships(Products::class);
+        $actual   = $this->getModelRelationships(Products::class);
         $expected = [
             [
                 0,
                 'typeId',
                 ProductTypes::class,
                 'id',
-                ['alias' => Relationships::PRODUCT_TYPES, 'reusable' => true]
+                ['alias' => Relationships::PRODUCT_TYPES, 'reusable' => true],
             ],
             [
                 4,
                 'id',
                 Companies::class,
                 'id',
-                ['alias' => Relationships::COMPANIES, 'reusable' => true]
+                ['alias' => Relationships::COMPANIES, 'reusable' => true],
             ],
         ];
 
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/Integration/Library/Models/UsersTest.php b/tests/Integration/Library/Models/UsersTest.php
new file mode 100644
index 00000000..8adc785a
--- /dev/null
+++ b/tests/Integration/Library/Models/UsersTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Models;
+
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\TokenTrait;
+use Phalcon\Encryption\Security\JWT\Builder;
+use Phalcon\Encryption\Security\JWT\Signer\Hmac;
+use Phalcon\Encryption\Security\JWT\Token\Enum;
+use Phalcon\Encryption\Security\JWT\Validator;
+use Phalcon\Filter\Filter;
+
+use function count;
+use function time;
+
+final class UsersTest extends AbstractIntegrationTestCase
+{
+    use TokenTrait;
+
+    public function testCheckValidationData(): void
+    {
+        /** @var Users $user */
+        $user = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username'      => Data::$testUsername,
+                'password'      => Data::$testPassword,
+                'status'        => 1,
+                'issuer'        => 'https://niden.net',
+                'tokenPassword' => Data::$strongPassphrase,
+                'tokenId'       => Data::$testTokenId,
+            ]
+        );
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+        $token   = $builder
+            ->setIssuer('https://niden.net')
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setExpirationTime(time() + 10)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $class  = Validator::class;
+        $actual = $user->getValidationData($token);
+        $this->assertInstanceOf($class, $actual);
+    }
+
+    /**
+     * Guards the field whitelist at the model, where it is declared. The api
+     * suite asserts JSON subsets, so it cannot prove absence on its own.
+     */
+    public function testGetPublicFields(): void
+    {
+        $expected = [
+            'id',
+            'status',
+            'username',
+            'issuer',
+            'tokenId',
+        ];
+
+        $actual = (new Users())->getPublicFields();
+
+        $this->assertSame($expected, $actual);
+        $this->assertNotContains('password', $actual);
+        $this->assertNotContains('tokenPassword', $actual);
+    }
+
+    /**
+     * getToken() builds and signs the token from the record, which is what the
+     * login endpoint hands back.
+     */
+    public function testGetToken(): void
+    {
+        /** @var Users $user */
+        $user = $this->haveRecordWithFields(
+            Users::class,
+            [
+                'status'        => 1,
+                'username'      => Data::$testUsername,
+                'password'      => Data::$testPasswordHash,
+                'issuer'        => Data::$testIssuer,
+                'tokenPassword' => Data::$strongPassphrase,
+                'tokenId'       => Data::$testTokenId,
+            ]
+        );
+
+        $token  = $user->getToken();
+        $parsed = $this->getToken($token);
+        $claims = $parsed->getClaims();
+
+        $this->assertSame(Data::$testIssuer, $claims->get(Enum::ISSUER));
+        $this->assertSame(Data::$testTokenId, $claims->get(Enum::ID));
+        $this->assertSame([$this->getTokenAudience()], $claims->get(Enum::AUDIENCE));
+
+        /**
+         * The signature must verify against the record's passphrase - that is
+         * the whole point of the token.
+         *
+         * Asserted against get('tokenPassword') rather than the raw constant:
+         * get() sanitises, so a passphrase containing '&' comes back as
+         * '&amp;'. Signing and verification both read through get(), so the key
+         * in use is the sanitised form, not the string handed to set().
+         */
+        $passphrase = $user->get('tokenPassword');
+
+        $this->assertTrue($parsed->verify(new Hmac(), $passphrase));
+        $this->assertFalse($parsed->verify(new Hmac(), 'not-the-passphrase'));
+
+        /**
+         * Issued in the past, expiring in the future.
+         */
+        $now = time();
+        $this->assertLessThanOrEqual($now, $claims->get(Enum::ISSUED_AT));
+        $this->assertLessThanOrEqual($now, $claims->get(Enum::NOT_BEFORE));
+        $this->assertGreaterThan($now, $claims->get(Enum::EXPIRATION_TIME));
+    }
+
+    public function testValidateFilters(): void
+    {
+        $model    = new Users();
+        $expected = [
+            'id'            => Filter::FILTER_ABSINT,
+            'status'        => Filter::FILTER_ABSINT,
+            'username'      => Filter::FILTER_STRING,
+            'password'      => Filter::FILTER_STRING,
+            'issuer'        => Filter::FILTER_STRING,
+            'tokenPassword' => Filter::FILTER_STRING,
+            'tokenId'       => Filter::FILTER_STRING,
+        ];
+        $this->assertSame($expected, $model->getModelFilters());
+    }
+
+    public function testValidateModel(): void
+    {
+        $this->haveModelDefinition(
+            Users::class,
+            [
+                'id',
+                'status',
+                'username',
+                'password',
+                'issuer',
+                'tokenPassword',
+                'tokenId',
+            ]
+        );
+    }
+
+    public function testValidateRelationships(): void
+    {
+        $actual = $this->getModelRelationships(Users::class);
+        $this->assertSame(0, count($actual));
+    }
+}
diff --git a/tests/Integration/Library/Repositories/UsersRepositoryTest.php b/tests/Integration/Library/Repositories/UsersRepositoryTest.php
new file mode 100644
index 00000000..23ab4c71
--- /dev/null
+++ b/tests/Integration/Library/Repositories/UsersRepositoryTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Repositories;
+
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Models\Users;
+use Phalcon\Api\Repositories\UsersRepository;
+use Phalcon\Api\Services\QueryService;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\TokenTrait;
+use Phalcon\Cache\Cache;
+use Phalcon\Config\Config;
+use Phalcon\Encryption\Security;
+use Phalcon\Encryption\Security\JWT\Builder;
+use Phalcon\Encryption\Security\JWT\Signer\Hmac;
+
+final class UsersRepositoryTest extends AbstractIntegrationTestCase
+{
+    use TokenTrait;
+
+    public function testGetByTokenReturnsUser(): void
+    {
+        $this->addUserRecord();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+        $token   = $builder
+            ->setIssuer('phalcon.io')
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $dbUser = $this->getRepository()->getByToken($token);
+
+        /**
+         * The lookup is by issuer and token id together; a mutant that breaks
+         * either key out of the parameter array stops the match, so asserting
+         * the user comes back is what proves both are still in play.
+         */
+        $this->assertNotNull($dbUser);
+        $this->assertSame(Data::$testUsername, $dbUser->get('username'));
+    }
+
+    public function testGetByUsernameAndPassword(): void
+    {
+        $this->addUserRecord();
+
+        $dbUser = $this->getRepository()->getByUsernameAndPassword(
+            Data::$testUsername,
+            Data::$testPassword
+        );
+
+        $this->assertNotNull($dbUser);
+    }
+
+    /**
+     * The username has to be part of the query, not just the active status.
+     * A record whose password matches but whose name does not must never be
+     * returned - otherwise any active user's credentials would unlock the
+     * first active row the database happened to hand back.
+     */
+    public function testGetByUsernameDoesNotMatchOnStatusAlone(): void
+    {
+        $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username' => 'someone-else',
+                'password' => Data::$testPasswordHash,
+                'status'   => 1,
+                'issuer'   => 'phalcon.io',
+                'tokenId'  => Data::$testTokenId,
+            ]
+        );
+
+        $dbUser = $this->getRepository()->getByUsernameAndPassword(
+            Data::$testUsername,
+            Data::$testPassword
+        );
+
+        $this->assertNull($dbUser);
+    }
+
+    /**
+     * @throws ModelException
+     */
+    public function testGetByWrongTokenReturnsNull(): void
+    {
+        $this->addUserRecord();
+
+        $signer  = new Hmac();
+        $builder = new Builder($signer);
+        $token   = $builder
+            ->setIssuer('https://somedomain.com')
+            ->setAudience($this->getTokenAudience())
+            ->setId(Data::$testTokenId)
+            ->setPassphrase(Data::$strongPassphrase)
+            ->getToken()
+        ;
+
+        $actual = $this->getRepository()->getByToken($token);
+
+        $this->assertNull($actual);
+    }
+
+    public function testGetByWrongUsernameAndPasswordReturnsNull(): void
+    {
+        $this->addUserRecord();
+
+        $dbUser = $this->getRepository()->getByUsernameAndPassword(
+            Data::$testUsername,
+            'nothing'
+        );
+
+        $this->assertNull($dbUser);
+    }
+
+    private function addUserRecord(): Users
+    {
+        return $this->haveRecordWithFields(
+            Users::class,
+            [
+                'username' => Data::$testUsername,
+                'password' => Data::$testPasswordHash,
+                'status'   => 1,
+                'issuer'   => 'phalcon.io',
+                'tokenId'  => Data::$testTokenId,
+            ]
+        );
+    }
+
+    private function getRepository(): UsersRepository
+    {
+        /** @var Cache $cache */
+        $cache = $this->grabFromDi('cache');
+        /** @var Config $config */
+        $config = $this->grabFromDi('config');
+        /** @var Security $security */
+        $security = $this->grabFromDi('security');
+
+        return new UsersRepository(new QueryService($config, $cache), $security);
+    }
+}
diff --git a/tests/Integration/Library/Services/QueryServiceTest.php b/tests/Integration/Library/Services/QueryServiceTest.php
new file mode 100644
index 00000000..e0a7ea6e
--- /dev/null
+++ b/tests/Integration/Library/Services/QueryServiceTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Services;
+
+use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Services\QueryService;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Cache\Cache;
+use Phalcon\Config\Config;
+
+use function count;
+use function Phalcon\Api\Core\appPath;
+use function uniqid;
+
+final class QueryServiceTest extends AbstractIntegrationTestCase
+{
+    public function testGetCompaniesCachedData(): void
+    {
+        $configData = require appPath('./src/Core/config.php');
+        $this->assertTrue($configData['app']['devMode']);
+
+        $configData['app']['devMode'] = false;
+        /** @var Config $config */
+        $config    = new Config($configData);
+        $container = $this->grabDi();
+        $container->set('config', $config);
+        $this->assertFalse($config->path('app.devMode'));
+
+        /** @var Cache $cache */
+        $cache = $this->grabFromDi('cache');
+        $cache->clear();
+        /** @var Config $config */
+        $config = $this->grabFromDi('config');
+        $this->assertFalse($config->path('app.devMode'));
+
+        $queryService = new QueryService($config, $cache);
+
+        /**
+         * Company 1
+         */
+        $comName = uniqid('com-cached-');
+        $comOne  = $this->haveRecordWithFields(
+            Companies::class,
+            [
+                'name'    => $comName,
+                'address' => uniqid(),
+                'city'    => uniqid(),
+                'phone'   => uniqid(),
+            ]
+        );
+
+        $results = $queryService->getRecords(Companies::class);
+        $this->assertSame(1, count($results));
+        $this->assertSame($comName, $results[0]->get('name'));
+        $this->assertSame($comOne->get('address'), $results[0]->get('address'));
+        $this->assertSame($comOne->get('city'), $results[0]->get('city'));
+        $this->assertSame($comOne->get('phone'), $results[0]->get('phone'));
+
+        /**
+         * Get the record again but ensure the name has been changed
+         */
+        $result = $comOne->set('name', 'com-cached-change')
+                         ->save()
+        ;
+        $this->assertNotEquals(false, $result);
+
+        /**
+         * This should return the cached result
+         */
+        $results = $queryService->getRecords(Companies::class);
+        $this->assertSame(1, count($results));
+        $this->assertSame($comName, $results[0]->get('name'));
+        $this->assertSame($comOne->get('address'), $results[0]->get('address'));
+        $this->assertSame($comOne->get('city'), $results[0]->get('city'));
+        $this->assertSame($comOne->get('phone'), $results[0]->get('phone'));
+    }
+}
diff --git a/tests/Integration/Library/Transformers/BaseTransformerTest.php b/tests/Integration/Library/Transformers/BaseTransformerTest.php
new file mode 100644
index 00000000..7f6d3c8c
--- /dev/null
+++ b/tests/Integration/Library/Transformers/BaseTransformerTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
+
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Models\Companies;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Transformers\BaseTransformer;
+
+final class BaseTransformerTest extends AbstractIntegrationTestCase
+{
+    /**
+     * @throws ModelException
+     */
+    public function testTransformer(): void
+    {
+        /** @var Companies $company */
+        $company = $this->haveRecordWithFields(
+            Companies::class,
+            [
+                'name'    => 'acme',
+                'address' => '123 Phalcon way',
+                'city'    => 'World',
+                'phone'   => '555-999-4444',
+            ]
+        );
+
+        $transformer = new BaseTransformer();
+        $expected    = [
+            'id'      => $company->get('id'),
+            'name'    => $company->get('name'),
+            'address' => $company->get('address'),
+            'city'    => $company->get('city'),
+            'phone'   => $company->get('phone'),
+        ];
+
+        $this->assertSame($expected, $transformer->transform($company));
+    }
+
+    /**
+     * Field selection is intersected against the model's public set: a request
+     * is never widened to the full set, and never trusted as given. Asking for
+     * one public field alongside one that is not public returns only the public
+     * one - which pins the coalesce and the intersection down at once, since
+     * dropping either would hand back every field or reach for a column the
+     * model does not publish.
+     *
+     * @throws ModelException
+     */
+    public function testTransformerReturnsOnlyTheRequestedPublicFields(): void
+    {
+        /** @var Companies $company */
+        $company = $this->haveRecordWithFields(
+            Companies::class,
+            [
+                'name'    => 'acme',
+                'address' => '123 Phalcon way',
+                'city'    => 'World',
+                'phone'   => '555-999-4444',
+            ]
+        );
+
+        $transformer = new BaseTransformer(
+            ['companies' => ['name', 'secret']],
+            'companies'
+        );
+
+        $this->assertSame(
+            ['name' => $company->get('name')],
+            $transformer->transform($company)
+        );
+    }
+}
diff --git a/tests/Integration/Library/Transformers/CompaniesTransformerTest.php b/tests/Integration/Library/Transformers/CompaniesTransformerTest.php
new file mode 100644
index 00000000..c0d21b4b
--- /dev/null
+++ b/tests/Integration/Library/Transformers/CompaniesTransformerTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\FractalTrait;
+use Phalcon\Api\Transformers\CompaniesTransformer;
+
+/**
+ * Goes through FractalTrait::format() rather than building the Manager by hand,
+ * because that is the path the controllers actually take.
+ */
+final class CompaniesTransformerTest extends AbstractIntegrationTestCase
+{
+    use FractalTrait;
+
+    /**
+     * @throws ModelException
+     */
+    public function testTransformer(): void
+    {
+        $company    = $this->addCompanyRecord('com-a-');
+        $indType    = $this->addIndividualTypeRecord('type-a-');
+        $individual = $this->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
+        $prdType    = $this->addProductTypeRecord('prt-a-');
+        $product    = $this->addProductRecord('prd-a-', $prdType->get('id'));
+
+        $this->addCompanyXProduct($company->get('id'), $product->get('id'));
+
+        $results = $this->format(
+            'collection',
+            [$company],
+            CompaniesTransformer::class,
+            Relationships::COMPANIES,
+            [Relationships::PRODUCTS, Relationships::INDIVIDUALS]
+        );
+
+        /**
+         * companiesResponse() carries the relationship links; asking for the
+         * includes is what adds the `data` identifiers alongside them.
+         */
+        $element = Data::companiesResponse($company);
+
+        $element['relationships'][Relationships::PRODUCTS]['data']    = [
+            [
+                'type' => Relationships::PRODUCTS,
+                'id'   => (string) $product->get('id'),
+            ],
+        ];
+        $element['relationships'][Relationships::INDIVIDUALS]['data'] = [
+            [
+                'type' => Relationships::INDIVIDUALS,
+                'id'   => (string) $individual->get('id'),
+            ],
+        ];
+
+        /**
+         * Each included resource advertises its own relationships, because its
+         * transformer declares availableIncludes of its own.
+         */
+        $includedProduct = Data::productResponse($product) + [
+            'relationships' => [
+                Relationships::COMPANIES     => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::PRODUCTS,
+                        $product->get('id'),
+                        Relationships::COMPANIES
+                    ),
+                ],
+                Relationships::PRODUCT_TYPES => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::PRODUCTS,
+                        $product->get('id'),
+                        Relationships::PRODUCT_TYPES
+                    ),
+                ],
+            ],
+        ];
+
+        $includedIndividual = Data::individualResponse($individual) + [
+            'relationships' => [
+                Relationships::COMPANIES        => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::INDIVIDUALS,
+                        $individual->get('id'),
+                        Relationships::COMPANIES
+                    ),
+                ],
+                Relationships::INDIVIDUAL_TYPES => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::INDIVIDUALS,
+                        $individual->get('id'),
+                        Relationships::INDIVIDUAL_TYPES
+                    ),
+                ],
+            ],
+        ];
+
+        $expected = [
+            'data'     => [$element],
+            'included' => [$includedProduct, $includedIndividual],
+        ];
+
+        $this->assertSame($expected, $results);
+    }
+}
diff --git a/tests/Integration/Library/Transformers/IndividualTypesTransformerTest.php b/tests/Integration/Library/Transformers/IndividualTypesTransformerTest.php
new file mode 100644
index 00000000..93b95e05
--- /dev/null
+++ b/tests/Integration/Library/Transformers/IndividualTypesTransformerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\FractalTrait;
+use Phalcon\Api\Transformers\IndividualTypesTransformer;
+
+/**
+ * Goes through FractalTrait::format() rather than building the Manager by hand,
+ * because that is the path the controllers actually take.
+ */
+final class IndividualTypesTransformerTest extends AbstractIntegrationTestCase
+{
+    use FractalTrait;
+
+    /**
+     * @throws ModelException
+     */
+    public function testTransformer(): void
+    {
+        $company    = $this->addCompanyRecord('com-a-');
+        $indType    = $this->addIndividualTypeRecord('type-a-');
+        $individual = $this->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
+
+        $results = $this->format(
+            'collection',
+            [$indType],
+            IndividualTypesTransformer::class,
+            Relationships::INDIVIDUAL_TYPES,
+            [Relationships::INDIVIDUALS]
+        );
+
+        $element = Data::individualTypeResponse($indType) + [
+            'relationships' => [
+                Relationships::INDIVIDUALS => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::INDIVIDUAL_TYPES,
+                        $indType->get('id'),
+                        Relationships::INDIVIDUALS
+                    ),
+                    'data'  => [
+                        [
+                            'type' => Relationships::INDIVIDUALS,
+                            'id'   => (string) $individual->get('id'),
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $includedIndividual = Data::individualResponse($individual) + [
+            'relationships' => [
+                Relationships::COMPANIES        => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::INDIVIDUALS,
+                        $individual->get('id'),
+                        Relationships::COMPANIES
+                    ),
+                ],
+                Relationships::INDIVIDUAL_TYPES => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::INDIVIDUALS,
+                        $individual->get('id'),
+                        Relationships::INDIVIDUAL_TYPES
+                    ),
+                ],
+            ],
+        ];
+
+        $expected = [
+            'data'     => [$element],
+            'included' => [$includedIndividual],
+        ];
+
+        $this->assertSame($expected, $results);
+    }
+}
diff --git a/tests/integration/library/Transformers/IndividualsTransformerCest.php b/tests/Integration/Library/Transformers/IndividualsTransformerTest.php
similarity index 77%
rename from tests/integration/library/Transformers/IndividualsTransformerCest.php
rename to tests/Integration/Library/Transformers/IndividualsTransformerTest.php
index 647e83a4..06e3a2e8 100644
--- a/tests/integration/library/Transformers/IndividualsTransformerCest.php
+++ b/tests/Integration/Library/Transformers/IndividualsTransformerTest.php
@@ -1,33 +1,43 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Transformers;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
 
-use IntegrationTester;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Exception\ModelException;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\Individuals;
 use Phalcon\Api\Models\IndividualTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
 use Phalcon\Api\Transformers\IndividualsTransformer;
 
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
 use function uniqid;
 
-class IndividualsTransformerCest
+final class IndividualsTransformerTest extends AbstractIntegrationTestCase
 {
     /**
-     * @param IntegrationTester $I
-     *
      * @throws ModelException
      */
-    public function checkTransformer(IntegrationTester $I)
+    public function testTransformer(): void
     {
         /** @var Companies $company */
-        $company = $I->haveRecordWithFields(
+        $company = $this->haveRecordWithFields(
             Companies::class,
             [
                 'name'    => uniqid('com-a-'),
@@ -38,7 +48,7 @@ public function checkTransformer(IntegrationTester $I)
         );
 
         /** @var IndividualTypes $individualType */
-        $individualType = $I->haveRecordWithFields(
+        $individualType = $this->haveRecordWithFields(
             IndividualTypes::class,
             [
                 'name'        => 'my type',
@@ -47,7 +57,7 @@ public function checkTransformer(IntegrationTester $I)
         );
 
         /** @var Individuals $individual */
-        $individual = $I->haveRecordWithFields(
+        $individual = $this->haveRecordWithFields(
             Individuals::class,
             [
                 'companyId' => $company->get('id'),
@@ -140,10 +150,26 @@ public function checkTransformer(IntegrationTester $I)
             ],
             'included' => [
                 Data::companiesResponse($company),
-                Data::individualTypeResponse($individualType),
+                /**
+                 * The included type carries its own relationships now that the
+                 * include uses IndividualTypesTransformer rather than the base
+                 * one - which is what makes `?includes=individual-types.individuals`
+                 * resolvable.
+                 */
+                Data::individualTypeResponse($individualType) + [
+                    'relationships' => [
+                        Relationships::INDIVIDUALS => [
+                            'links' => Data::relationshipLinks(
+                                Relationships::INDIVIDUAL_TYPES,
+                                $individualType->get('id'),
+                                Relationships::INDIVIDUALS
+                            ),
+                        ],
+                    ],
+                ],
             ],
         ];
 
-        $I->assertSame($expected, $results);
+        $this->assertSame($expected, $results);
     }
 }
diff --git a/tests/Integration/Library/Transformers/ProductTypesTransformerTest.php b/tests/Integration/Library/Transformers/ProductTypesTransformerTest.php
new file mode 100644
index 00000000..8a942461
--- /dev/null
+++ b/tests/Integration/Library/Transformers/ProductTypesTransformerTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Api\Exception\ModelException;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
+use Phalcon\Api\Traits\FractalTrait;
+use Phalcon\Api\Transformers\ProductTypesTransformer;
+
+/**
+ * Goes through FractalTrait::format() rather than building the Manager by hand,
+ * because that is the path the controllers actually take.
+ */
+final class ProductTypesTransformerTest extends AbstractIntegrationTestCase
+{
+    use FractalTrait;
+
+    /**
+     * @throws ModelException
+     */
+    public function testTransformer(): void
+    {
+        $prdType = $this->addProductTypeRecord('prt-a-');
+        $product = $this->addProductRecord('prd-a-', $prdType->get('id'));
+
+        $results = $this->format(
+            'collection',
+            [$prdType],
+            ProductTypesTransformer::class,
+            Relationships::PRODUCT_TYPES,
+            [Relationships::PRODUCTS]
+        );
+
+        $element = Data::productTypeResponse($prdType) + [
+            'relationships' => [
+                Relationships::PRODUCTS => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::PRODUCT_TYPES,
+                        $prdType->get('id'),
+                        Relationships::PRODUCTS
+                    ),
+                    'data'  => [
+                        [
+                            'type' => Relationships::PRODUCTS,
+                            'id'   => (string) $product->get('id'),
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $includedProduct = Data::productResponse($product) + [
+            'relationships' => [
+                Relationships::COMPANIES     => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::PRODUCTS,
+                        $product->get('id'),
+                        Relationships::COMPANIES
+                    ),
+                ],
+                Relationships::PRODUCT_TYPES => [
+                    'links' => Data::relationshipLinks(
+                        Relationships::PRODUCTS,
+                        $product->get('id'),
+                        Relationships::PRODUCT_TYPES
+                    ),
+                ],
+            ],
+        ];
+
+        $expected = [
+            'data'     => [$element],
+            'included' => [$includedProduct],
+        ];
+
+        $this->assertSame($expected, $results);
+    }
+}
diff --git a/tests/integration/library/Transformers/ProductsTransformerCest.php b/tests/Integration/Library/Transformers/ProductsTransformerTest.php
similarity index 77%
rename from tests/integration/library/Transformers/ProductsTransformerCest.php
rename to tests/Integration/Library/Transformers/ProductsTransformerTest.php
index e27a6e7a..58190b21 100644
--- a/tests/integration/library/Transformers/ProductsTransformerCest.php
+++ b/tests/Integration/Library/Transformers/ProductsTransformerTest.php
@@ -1,33 +1,44 @@
 <?php
 
-namespace Phalcon\Api\Tests\integration\library\Transformers;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Transformers;
 
-use IntegrationTester;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Page\Data;
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Exception\ModelException;
 use Phalcon\Api\Models\Companies;
 use Phalcon\Api\Models\CompaniesXProducts;
 use Phalcon\Api\Models\Products;
 use Phalcon\Api\Models\ProductTypes;
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Tests\Support\Data;
 use Phalcon\Api\Transformers\ProductsTransformer;
 
 use function Phalcon\Api\Core\envValue;
+use function sprintf;
+use function uniqid;
 
-class ProductsTransformerCest
+final class ProductsTransformerTest extends AbstractIntegrationTestCase
 {
     /**
-     * @param IntegrationTester $I
-     *
      * @throws ModelException
      */
-    public function checkTransformer(IntegrationTester $I)
+    public function testTransformer(): void
     {
         /** @var Companies $company */
-        $company = $I->haveRecordWithFields(
+        $company = $this->haveRecordWithFields(
             Companies::class,
             [
                 'name'    => uniqid('com-a-'),
@@ -38,7 +49,7 @@ public function checkTransformer(IntegrationTester $I)
         );
 
         /** @var ProductTypes $productType */
-        $productType = $I->haveRecordWithFields(
+        $productType = $this->haveRecordWithFields(
             ProductTypes::class,
             [
                 'name'        => 'my type',
@@ -47,7 +58,7 @@ public function checkTransformer(IntegrationTester $I)
         );
 
         /** @var Products $product */
-        $product = $I->haveRecordWithFields(
+        $product = $this->haveRecordWithFields(
             Products::class,
             [
                 'name'        => 'my product',
@@ -59,7 +70,7 @@ public function checkTransformer(IntegrationTester $I)
         );
 
         /** @var CompaniesXProducts $glue */
-        $glue = $I->haveRecordWithFields(
+        $glue = $this->haveRecordWithFields(
             CompaniesXProducts::class,
             [
                 'companyId' => $company->get('id'),
@@ -147,10 +158,26 @@ public function checkTransformer(IntegrationTester $I)
             ],
             'included' => [
                 Data::companiesResponse($company),
-                Data::productTypeResponse($productType),
+                /**
+                 * The included type carries its own relationships now that the
+                 * include uses ProductTypesTransformer rather than the base one
+                 * - which is what makes `?includes=product-types.products`
+                 * resolvable.
+                 */
+                Data::productTypeResponse($productType) + [
+                    'relationships' => [
+                        Relationships::PRODUCTS => [
+                            'links' => Data::relationshipLinks(
+                                Relationships::PRODUCT_TYPES,
+                                $productType->get('id'),
+                                Relationships::PRODUCTS
+                            ),
+                        ],
+                    ],
+                ],
             ],
         ];
 
-        $I->assertEquals($expected, $results);
+        $this->assertEquals($expected, $results);
     }
 }
diff --git a/tests/Integration/Library/Validation/CompaniesValidatorTest.php b/tests/Integration/Library/Validation/CompaniesValidatorTest.php
new file mode 100644
index 00000000..c2e52bf5
--- /dev/null
+++ b/tests/Integration/Library/Validation/CompaniesValidatorTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Integration\Library\Validation;
+
+use Phalcon\Api\Tests\Integration\AbstractIntegrationTestCase;
+use Phalcon\Api\Validation\CompaniesValidator;
+
+use function count;
+
+final class CompaniesValidatorTest extends AbstractIntegrationTestCase
+{
+    public function testValidator(): void
+    {
+        $validation = new CompaniesValidator();
+        $_POST      = [
+            'name'    => '',
+            'address' => '123 Phalcon way',
+            'city'    => 'World',
+            'phone'   => '555-999-4444',
+        ];
+        $messages   = $validation->validate($_POST);
+        $this->assertSame(1, count($messages));
+        $this->assertSame('The company name is required', $messages[0]->getMessage());
+    }
+}
diff --git a/tests/_support/Page/Data.php b/tests/Support/Data.php
similarity index 53%
rename from tests/_support/Page/Data.php
rename to tests/Support/Data.php
index 471acc9d..cfb5e400 100644
--- a/tests/_support/Page/Data.php
+++ b/tests/Support/Data.php
@@ -1,6 +1,17 @@
 <?php
 
-namespace Page;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Support;
 
 use Phalcon\Api\Constants\Relationships;
 use Phalcon\Api\Exception\ModelException;
@@ -16,61 +27,38 @@
 
 class Data
 {
+    public static $companiesRecordIncludesUrl       = '/companies/%s?includes=%s';
+    public static $companiesRecordUrl               = '/companies/%s';
     public static $companiesSortUrl                 = '/companies?sort=%s';
     public static $companiesUrl                     = '/companies';
-    public static $companiesRecordUrl               = '/companies/%s';
-    public static $companiesRecordIncludesUrl       = '/companies/%s?includes=%s';
-    public static $loginUrl                         = '/login';
-    public static $individualsUrl                   = '/individuals';
-    public static $individualsRecordUrl             = '/individuals/%s';
     public static $individualsRecordIncludesUrl     = '/individuals/%s?includes=%s';
-    public static $individualTypesUrl               = '/individual-types';
-    public static $individualTypesRecordUrl         = '/individual-types/%s';
+    public static $individualsRecordUrl             = '/individuals/%s';
+    public static $individualsUrl                   = '/individuals';
     public static $individualTypesRecordIncludesUrl = '/individual-types/%s?includes=%s';
-    public static $productsUrl                      = '/products';
-    public static $productsRecordUrl                = '/products/%s';
+    public static $individualTypesRecordUrl         = '/individual-types/%s';
+    public static $individualTypesUrl               = '/individual-types';
+    public static $loginUrl                         = '/login';
     public static $productsRecordIncludesUrl        = '/products/%s?includes=%s';
-    public static $productTypesUrl                  = '/product-types';
-    public static $productTypesRecordUrl            = '/product-types/%s';
+    public static $productsRecordUrl                = '/products/%s';
+    public static $productsUrl                      = '/products';
     public static $productTypesRecordIncludesUrl    = '/product-types/%s?includes=%s';
-    public static $usersUrl                         = '/users';
-    public static $wrongUrl                         = '/sommething';
-
-    public static $strongPassphrase  = 'DR^3*ZwnAHKc9yP$YSpW98dsmHJBax5&';
-    public static $testIssuer        = 'https://niden.net';
-    public static $testPassword      = 'testpass';
-    public static $testTokenId       = '110011';
-    public static $testTokenPassword = 'DR^4*ZwnAHKc0yP$YSpW09dsmHJBax6&';
-    public static $testUsername      = 'testuser';
-
-    /**
-     * @return array
-     */
-    public static function loginJson()
-    {
-        return [
-            'username' => self::$testUsername,
-            'password' => self::$testPassword,
-        ];
-    }
+    public static $productTypesRecordUrl            = '/product-types/%s';
+    public static $productTypesUrl                  = '/product-types';
 
+    public static $strongPassphrase = 'DR^3*ZwnAHKc9yP$YSpW98dsmHJBax5&';
+    public static $testIssuer       = 'https://niden.net';
+    public static $testPassword     = 'testpass';
     /**
-     * @param        $name
-     * @param string $address
-     * @param string $city
-     * @param string $phone
-     *
-     * @return array
+     * The bcrypt hash of $testPassword. Hardcoded on purpose: fixtures store
+     * the hash, requests send the plain password, and hashing on every insert
+     * would cost a bcrypt round per fixture for no benefit.
      */
-    public static function companyAddJson($name, $address = '', $city = '', $phone = '')
-    {
-        return [
-            'name'    => $name,
-            'address' => $address,
-            'city'    => $city,
-            'phone'   => $phone,
-        ];
-    }
+    public static $testPasswordHash    = '$2y$10$DSCDlw9tZtmQikTY8cwbGuUZSMcPo64YfRYCTREygVUMJTDqjTHFu';
+    public static $testTokenId         = '110011';
+    public static $testTokenPassword   = 'DR^4*ZwnAHKc0yP$YSpW09dsmHJBax6&';
+    public static $testUsername        = 'testuser';
+    public static $usersUrl                         = '/users';
+    public static $wrongUrl                         = '/sommething';
 
     /**
      * @param Companies $record
@@ -80,24 +68,16 @@ public static function companyAddJson($name, $address = '', $city = '', $phone =
      */
     public static function companiesAddResponse(Companies $record): array
     {
-        return [
-            'type'       => Relationships::COMPANIES,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
+        return self::resource(
+            Relationships::COMPANIES,
+            $record,
+            [
                 'name'    => $record->get('name'),
                 'address' => $record->get('address'),
                 'city'    => $record->get('city'),
                 'phone'   => $record->get('phone'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::COMPANIES,
-                    $record->get('id')
-                ),
-            ],
-        ];
+            ]
+        );
     }
 
     /**
@@ -108,60 +88,55 @@ public static function companiesAddResponse(Companies $record): array
      */
     public static function companiesResponse(Companies $record): array
     {
-        return [
-            'type'          => Relationships::COMPANIES,
-            'id'            => (string) $record->get('id'),
-            'attributes'    => [
+        $recordId = $record->get('id');
+
+        return self::resource(
+            Relationships::COMPANIES,
+            $record,
+            [
                 'name'    => $record->get('name'),
                 'address' => $record->get('address'),
                 'city'    => $record->get('city'),
                 'phone'   => $record->get('phone'),
-            ],
-            'links'         => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::COMPANIES,
-                    $record->get('id')
-                ),
-            ],
+            ]
+        ) + [
             'relationships' => [
                 Relationships::PRODUCTS    => [
-                    'links' => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/products',
-                            envValue('APP_URL'),
-                            Relationships::COMPANIES,
-                            $record->get('id')
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/products',
-                            envValue('APP_URL'),
-                            Relationships::COMPANIES,
-                            $record->get('id')
-                        ),
-                    ]
+                    'links' => self::relationshipLinks(
+                        Relationships::COMPANIES,
+                        $recordId,
+                        Relationships::PRODUCTS
+                    ),
                 ],
                 Relationships::INDIVIDUALS => [
-                    "links" => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/individuals',
-                            envValue('APP_URL'),
-                            Relationships::COMPANIES,
-                            $record->get('id')
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/individuals',
-                            envValue('APP_URL'),
-                            Relationships::COMPANIES,
-                            $record->get('id')
-                        ),
-                    ],
+                    'links' => self::relationshipLinks(
+                        Relationships::COMPANIES,
+                        $recordId,
+                        Relationships::INDIVIDUALS
+                    ),
                 ],
             ],
         ];
     }
 
+    /**
+     * @param        $name
+     * @param string $address
+     * @param string $city
+     * @param string $phone
+     *
+     * @return array
+     */
+    public static function companyAddJson($name, $address = '', $city = '', $phone = '')
+    {
+        return [
+            'name'    => $name,
+            'address' => $address,
+            'city'    => $city,
+            'phone'   => $phone,
+        ];
+    }
+
     /**
      * @param Individuals $record
      *
@@ -170,10 +145,10 @@ public static function companiesResponse(Companies $record): array
      */
     public static function individualResponse(Individuals $record): array
     {
-        return [
-            'type'       => Relationships::INDIVIDUALS,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
+        return self::resource(
+            Relationships::INDIVIDUALS,
+            $record,
+            [
                 'companyId' => $record->get('companyId'),
                 'typeId'    => $record->get('typeId'),
                 'prefix'    => $record->get('prefix'),
@@ -181,16 +156,8 @@ public static function individualResponse(Individuals $record): array
                 'middle'    => $record->get('middle'),
                 'last'      => $record->get('last'),
                 'suffix'    => $record->get('suffix'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::INDIVIDUALS,
-                    $record->get('id')
-                ),
-            ],
-        ];
+            ]
+        );
     }
 
     /**
@@ -201,24 +168,45 @@ public static function individualResponse(Individuals $record): array
      */
     public static function individualTypeResponse(IndividualTypes $record): array
     {
-        return [
-            'type'       => Relationships::INDIVIDUAL_TYPES,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
+        return self::resource(
+            Relationships::INDIVIDUAL_TYPES,
+            $record,
+            [
                 'name'        => $record->get('name'),
                 'description' => $record->get('description'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::INDIVIDUAL_TYPES,
-                    $record->get('id')
-                ),
-            ],
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public static function loginJson()
+    {
+        return [
+            'username' => self::$testUsername,
+            'password' => self::$testPassword,
         ];
     }
 
+    /**
+     * @param Products $record
+     *
+     * @return array
+     * @throws ModelException
+     */
+    public static function productFieldsResponse(Products $record): array
+    {
+        return self::resource(
+            Relationships::PRODUCTS,
+            $record,
+            [
+                'name'  => $record->get('name'),
+                'price' => $record->get('price'),
+            ]
+        );
+    }
+
     /**
      * @param Products $record
      *
@@ -227,73 +215,85 @@ public static function individualTypeResponse(IndividualTypes $record): array
      */
     public static function productResponse(Products $record): array
     {
-        return [
-            'type'       => Relationships::PRODUCTS,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
+        return self::resource(
+            Relationships::PRODUCTS,
+            $record,
+            [
                 'typeId'      => $record->get('typeId'),
                 'name'        => $record->get('name'),
                 'description' => $record->get('description'),
                 'quantity'    => $record->get('quantity'),
                 'price'       => $record->get('price'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::PRODUCTS,
-                    $record->get('id')
-                ),
-            ],
-        ];
+            ]
+        );
     }
 
     /**
-     * @param Products $record
+     * @param ProductTypes $record
      *
      * @return array
      * @throws ModelException
      */
-    public static function productFieldsResponse(Products $record): array
+    public static function productTypeResponse(ProductTypes $record): array
     {
+        return self::resource(
+            Relationships::PRODUCT_TYPES,
+            $record,
+            [
+                'name'        => $record->get('name'),
+                'description' => $record->get('description'),
+            ]
+        );
+    }
+
+    /**
+     * The self/related pair a relationship carries.
+     *
+     * @param string $type
+     * @param mixed  $recordId
+     * @param string $relationship
+     *
+     * @return array
+     */
+    public static function relationshipLinks(
+        string $type,
+        $recordId,
+        string $relationship
+    ): array {
+        $base = sprintf('%s/%s/%s', envValue('APP_URL'), $type, $recordId);
+
         return [
-            'type'       => Relationships::PRODUCTS,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
-                'name'  => $record->get('name'),
-                'price' => $record->get('price'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::PRODUCTS,
-                    $record->get('id')
-                ),
-            ],
+            'self'    => $base . '/relationships/' . $relationship,
+            'related' => $base . '/' . $relationship,
         ];
     }
 
     /**
-     * @param ProductTypes $record
+     * The JSON:API envelope every resource shares - type, id, attributes and a
+     * self link. Only the attributes differ between resources, so only the
+     * attributes are worth stating at each call site.
+     *
+     * @param string        $type
+     * @param AbstractModel $record
+     * @param array         $attributes
      *
      * @return array
      * @throws ModelException
      */
-    public static function productTypeResponse(ProductTypes $record): array
-    {
+    public static function resource(
+        string $type,
+        AbstractModel $record,
+        array $attributes
+    ): array {
         return [
-            'type'       => Relationships::PRODUCT_TYPES,
+            'type'       => $type,
             'id'         => (string) $record->get('id'),
-            'attributes' => [
-                'name'        => $record->get('name'),
-                'description' => $record->get('description'),
-            ],
+            'attributes' => $attributes,
             'links'      => [
                 'self' => sprintf(
                     '%s/%s/%s',
                     envValue('APP_URL'),
-                    Relationships::PRODUCT_TYPES,
+                    $type,
                     $record->get('id')
                 ),
             ],
@@ -308,24 +308,15 @@ public static function productTypeResponse(ProductTypes $record): array
      */
     public static function userResponse(AbstractModel $record)
     {
-        return [
-            'type'       => Relationships::USERS,
-            'id'         => (string) $record->get('id'),
-            'attributes' => [
-                'status'        => $record->get('status'),
-                'username'      => $record->get('username'),
-                'issuer'        => $record->get('issuer'),
-                'tokenPassword' => $record->get('tokenPassword'),
-                'tokenId'       => $record->get('tokenId'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL'),
-                    Relationships::USERS,
-                    $record->get('id')
-                ),
-            ],
-        ];
+        return self::resource(
+            Relationships::USERS,
+            $record,
+            [
+                'status'   => $record->get('status'),
+                'username' => $record->get('username'),
+                'issuer'   => $record->get('issuer'),
+                'tokenId'  => $record->get('tokenId'),
+            ]
+        );
     }
 }
diff --git a/tests/Unit/BootstrapTest.php b/tests/Unit/BootstrapTest.php
new file mode 100644
index 00000000..663b1dd7
--- /dev/null
+++ b/tests/Unit/BootstrapTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit;
+
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function Phalcon\Api\Core\appPath;
+
+final class BootstrapTest extends AbstractUnitTestCase
+{
+    public function testBootstrap(): void
+    {
+        ob_start();
+        require appPath('public/index.php');
+        $actual = ob_get_contents();
+        ob_end_clean();
+
+        $results = json_decode($actual, true);
+        $this->assertSame('1.0', $results['jsonapi']['version']);
+        $this->assertTrue(empty($results['data']));
+        // Was Codeception's HttpCode::getDescription(404), which renders exactly this.
+        $this->assertSame('404 (Not Found)', $results['errors'][0]);
+    }
+}
diff --git a/tests/unit/cli/BaseCest.php b/tests/Unit/Cli/BaseTest.php
old mode 100755
new mode 100644
similarity index 64%
rename from tests/unit/cli/BaseCest.php
rename to tests/Unit/Cli/BaseTest.php
index 330a445c..8359c824
--- a/tests/unit/cli/BaseCest.php
+++ b/tests/Unit/Cli/BaseTest.php
@@ -1,10 +1,21 @@
 <?php
 
-namespace Phalcon\Api\Tests\unit\cli;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Cli;
 
 use Phalcon\Api\Cli\Tasks\MainTask;
 use Phalcon\Di\FactoryDefault\Cli;
-use UnitTester;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
 
 use function ob_end_clean;
 use function ob_get_contents;
@@ -12,9 +23,9 @@
 
 use const PHP_EOL;
 
-class BaseCest
+final class BaseTest extends AbstractUnitTestCase
 {
-    public function checkOutput(UnitTester $I)
+    public function testOutput(): void
     {
         $container = new Cli();
         $task      = new MainTask();
@@ -31,12 +42,12 @@ public function checkOutput(UnitTester $I)
             . " Phalcon Team | (C) {$year}" . PHP_EOL
             . "******************************************************" . PHP_EOL
             . "" . PHP_EOL
-            . "Usage: runCli <command>" . PHP_EOL
+            . "Usage: bin/cli <command>" . PHP_EOL
             . "" . PHP_EOL
             . "  --help         \e[0;32m(safe)\e[0m shows the help screen/available commands" . PHP_EOL
             . "  --clear-cache  \e[0;32m(safe)\e[0m clears the cache folders" . PHP_EOL
             . PHP_EOL;
 
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/cli/BootstrapCest.php b/tests/Unit/Cli/BootstrapTest.php
similarity index 56%
rename from tests/unit/cli/BootstrapCest.php
rename to tests/Unit/Cli/BootstrapTest.php
index a3cdc410..e48f85dc 100644
--- a/tests/unit/cli/BootstrapCest.php
+++ b/tests/Unit/Cli/BootstrapTest.php
@@ -1,19 +1,30 @@
 <?php
 
-namespace Phalcon\Api\Tests\unit\cli;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-use CliTester;
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Cli;
+
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
 
 use function Phalcon\Api\Core\appPath;
 
 use const PHP_EOL;
 
-class BootstrapCest
+final class BootstrapTest extends AbstractUnitTestCase
 {
-    public function checkBootstrap(CliTester $I)
+    public function testBootstrap(): void
     {
         ob_start();
-        require appPath('cli/cli.php');
+        require appPath('bin/cli');
         $actual = ob_get_contents();
         ob_end_clean();
 
@@ -23,12 +34,12 @@ public function checkBootstrap(CliTester $I)
             . " Phalcon Team | (C) {$year}" . PHP_EOL
             . "******************************************************" . PHP_EOL
             . "" . PHP_EOL
-            . "Usage: runCli <command>" . PHP_EOL
+            . "Usage: bin/cli <command>" . PHP_EOL
             . "" . PHP_EOL
             . "  --help         \e[0;32m(safe)\e[0m shows the help screen/available commands" . PHP_EOL
             . "  --clear-cache  \e[0;32m(safe)\e[0m clears the cache folders" . PHP_EOL
             . PHP_EOL;
 
-        $I->assertSame($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/Unit/Cli/ClearCacheTest.php b/tests/Unit/Cli/ClearCacheTest.php
new file mode 100644
index 00000000..3c565fee
--- /dev/null
+++ b/tests/Unit/Cli/ClearCacheTest.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Cli;
+
+use FilesystemIterator;
+use Phalcon\Api\Cli\Tasks\ClearcacheTask;
+use Phalcon\Api\Providers\CacheDataProvider;
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Config\Config;
+use Phalcon\Di\FactoryDefault\Cli;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Redis;
+use SplFileInfo;
+
+use function chmod;
+use function fclose;
+use function file_exists;
+use function file_put_contents;
+use function fopen;
+use function fwrite;
+use function iterator_count;
+use function ob_end_clean;
+use function ob_get_contents;
+use function ob_start;
+use function Phalcon\Api\Core\appPath;
+use function uniqid;
+use function unlink;
+
+use const PHP_EOL;
+
+final class ClearCacheTest extends AbstractUnitTestCase
+{
+    /**
+     * Tracked files that the task's whitelist deliberately spares. The task
+     * clears the real cache tree, so a mutant that drops '.gitignore' from
+     * that whitelist deletes them for good: the working tree goes dirty and
+     * every later run of this test measures the wreckage instead of the task.
+     * Put them back first so each run starts from the same tree.
+     */
+    private const KEPT_FILES = [
+        '/storage/cache/.gitignore',
+        '/storage/cache/data/.gitignore',
+        '/storage/cache/metadata/.gitignore',
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        foreach (self::KEPT_FILES as $file) {
+            $path = appPath($file);
+
+            if (false === file_exists($path)) {
+                file_put_contents($path, '*' . PHP_EOL . '!.gitignore' . PHP_EOL);
+                // Restore the tracked mode; recreating them would leave the
+                // working tree dirty on the permission bits alone.
+                chmod($path, 0755);
+            }
+        }
+    }
+
+    public function testClearCache(): void
+    {
+        require appPath('vendor/autoload.php');
+
+        $dataPath  = appPath('/storage/cache/data');
+        $container = new Cli();
+        $config    = new ConfigProvider();
+        $config->register($container);
+        $cache = new CacheDataProvider();
+        $cache->register($container);
+        $task = new ClearcacheTask();
+        $task->setDI($container);
+
+        /**
+         * The task reports counts and prints a dot per item cleared, so the
+         * output is only deterministic if the state going in is. Empty the
+         * whole tree bar the whitelisted .gitignore files, then seed exactly
+         * four cache files.
+         */
+        $this->emptyCacheTree();
+        $this->createFile();
+        $this->createFile();
+        $this->createFile();
+        $this->createFile();
+
+        $redis = $this->connectRedis($container);
+        $redis->flushAll();
+        $redis->set('api-data-one', 'x');
+        $redis->set('api-data-two', 'y');
+        // A key outside the api-data namespace the task must leave untouched.
+        $redis->set('other-key', 'z');
+
+        ob_start();
+        $task->mainAction();
+        $actual = ob_get_contents();
+        ob_end_clean();
+
+        /**
+         * The exact transcript, asserted whole: the phase banners, the two
+         * counts, and one dot per item. A bare "contains" check let the
+         * newlines wander and the counts drift; this pins every operand of
+         * every line down.
+         */
+        $expected = 'Clearing Cache folders' . PHP_EOL
+            . 'Found 4 files' . PHP_EOL
+            . '....'
+            . PHP_EOL . 'Cleared Cache folders' . PHP_EOL
+            . 'Clearing data cache' . PHP_EOL
+            . 'Found 3 keys' . PHP_EOL
+            . '..'
+            . PHP_EOL . 'Cleared data cache' . PHP_EOL;
+
+        $this->assertSame($expected, $actual);
+
+        // The four seeded files are gone; only the .gitignore remains.
+        $iterator = new FilesystemIterator($dataPath, FilesystemIterator::SKIP_DOTS);
+        $this->assertSame(1, iterator_count($iterator));
+
+        // The api-data keys were deleted, the unrelated key was spared.
+        $this->assertSame(0, $redis->exists('api-data-one', 'api-data-two'));
+        $this->assertSame(1, $redis->exists('other-key'));
+
+        $redis->flushAll();
+    }
+
+    private function connectRedis(Cli $container): Redis
+    {
+        /** @var Config $config */
+        $config  = $container->get('config');
+        $options = $config->path('cache')
+                          ->toArray()['options']
+        ;
+
+        $redis = new Redis();
+        $redis->connect($options['host'], (int) $options['port']);
+
+        return $redis;
+    }
+
+    private function createFile(): void
+    {
+        $name    = appPath('/storage/cache/data/') . uniqid('cache_') . '.cache';
+        $pointer = fopen($name, 'wb');
+        fwrite($pointer, 'test');
+        fclose($pointer);
+    }
+
+    private function emptyCacheTree(): void
+    {
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(
+                appPath('storage/cache'),
+                FilesystemIterator::SKIP_DOTS
+            ),
+            RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        /** @var SplFileInfo $file */
+        foreach ($iterator as $file) {
+            if (true !== $file->isDir() && '.gitignore' !== $file->getFilename()) {
+                unlink($file->getPathname());
+            }
+        }
+    }
+}
diff --git a/tests/Unit/Config/AutoloaderTest.php b/tests/Unit/Config/AutoloaderTest.php
new file mode 100644
index 00000000..785d4f74
--- /dev/null
+++ b/tests/Unit/Config/AutoloaderTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Config;
+
+use Phalcon\Api\Http\Response;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function function_exists;
+use function Phalcon\Api\Core\appPath;
+
+final class AutoloaderTest extends AbstractUnitTestCase
+{
+    public function testAutoloader(): void
+    {
+        require appPath('src/Core/autoload.php');
+
+        $class = new Response();
+        $this->assertTrue($class instanceof Response);
+        $this->assertTrue(function_exists('Phalcon\Api\Core\envValue'));
+    }
+
+    public function testDotenvVariables(): void
+    {
+        require appPath('src/Core/autoload.php');
+
+        $this->assertNotEquals(false, $_ENV['APP_DEBUG']);
+        $this->assertNotEquals(false, $_ENV['APP_ENV']);
+        $this->assertNotEquals(false, $_ENV['APP_URL']);
+        $this->assertNotEquals(false, $_ENV['APP_NAME']);
+        $this->assertNotEquals(false, $_ENV['APP_BASE_URI']);
+        $this->assertNotEquals(false, $_ENV['APP_SUPPORT_EMAIL']);
+        $this->assertNotEquals(false, $_ENV['APP_TIMEZONE']);
+        $this->assertNotEquals(false, $_ENV['CACHE_PREFIX']);
+        $this->assertNotEquals(false, $_ENV['CACHE_LIFETIME']);
+        $this->assertNotEquals(false, $_ENV['DATA_API_MYSQL_NAME']);
+        $this->assertNotEquals(false, $_ENV['LOGGER_DEFAULT_FILENAME']);
+        $this->assertNotEquals(false, $_ENV['VERSION']);
+
+        $this->assertSame('true', $_ENV['APP_DEBUG']);
+        $this->assertSame('development', $_ENV['APP_ENV']);
+        $this->assertSame('http://localhost:8080', $_ENV['APP_URL']);
+        $this->assertSame('/', $_ENV['APP_BASE_URI']);
+        $this->assertSame('team@phalcon.io', $_ENV['APP_SUPPORT_EMAIL']);
+        $this->assertSame('UTC', $_ENV['APP_TIMEZONE']);
+        $this->assertSame('api_cache_', $_ENV['CACHE_PREFIX']);
+        $this->assertSame('86400', $_ENV['CACHE_LIFETIME']);
+        $this->assertSame('api', $_ENV['LOGGER_DEFAULT_FILENAME']);
+        $this->assertSame('20180401', $_ENV['VERSION']);
+    }
+}
diff --git a/tests/Unit/Config/ConfigTest.php b/tests/Unit/Config/ConfigTest.php
new file mode 100644
index 00000000..0a6ad949
--- /dev/null
+++ b/tests/Unit/Config/ConfigTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Config;
+
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function is_array;
+use function Phalcon\Api\Core\appPath;
+
+final class ConfigTest extends AbstractUnitTestCase
+{
+    public function testConfig(): void
+    {
+        $config = require(appPath('src/Core/config.php'));
+
+        $this->assertTrue(is_array($config));
+        $this->assertTrue(isset($config['app']));
+        $this->assertTrue(isset($config['cache']));
+    }
+}
diff --git a/tests/Unit/Config/FunctionsTest.php b/tests/Unit/Config/FunctionsTest.php
new file mode 100644
index 00000000..cce03983
--- /dev/null
+++ b/tests/Unit/Config/FunctionsTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Config;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function Phalcon\Api\Core\appPath;
+use function Phalcon\Api\Core\appUrl;
+use function Phalcon\Api\Core\envValue;
+
+final class FunctionsTest extends AbstractUnitTestCase
+{
+    private array $store;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->store = $_ENV ?? [];
+    }
+
+    protected function tearDown(): void
+    {
+        $_ENV = $this->store;
+
+        parent::tearDown();
+    }
+
+    public function testAppPath(): void
+    {
+        $path = dirname(__FILE__, 4);
+
+        $this->assertSame($path, appPath());
+    }
+
+    public function testAppPathWithParameter(): void
+    {
+        $path = dirname(__FILE__, 4) . '/src/Core/config.php';
+
+        $this->assertSame($path, appPath('src/Core/config.php'));
+    }
+
+    public function testAppUrlWithUrl(): void
+    {
+        $this->assertSame(
+            'http://localhost:8080/companies/1',
+            appUrl(Relationships::COMPANIES, 1)
+        );
+    }
+
+    public function testEnvValueAsFalse(): void
+    {
+        $_ENV['SOMEVAL'] = false;
+
+        $this->assertFalse(envValue('SOMEVAL'));
+    }
+
+    public function testEnvValueAsTrue(): void
+    {
+        $_ENV['SOMEVAL'] = true;
+
+        $this->assertTrue(envValue('SOMEVAL'));
+    }
+
+    public function testEnvValueWithValue(): void
+    {
+        $_ENV['SOMEVAL'] = 'someval';
+
+        $this->assertSame('someval', envValue('SOMEVAL'));
+    }
+}
diff --git a/tests/Unit/Config/ProvidersTest.php b/tests/Unit/Config/ProvidersTest.php
new file mode 100644
index 00000000..3429f0e4
--- /dev/null
+++ b/tests/Unit/Config/ProvidersTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Config;
+
+use Phalcon\Api\Providers\CliDispatcherProvider;
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Api\Providers\DatabaseProvider;
+use Phalcon\Api\Providers\ErrorHandlerProvider;
+use Phalcon\Api\Providers\LoggerProvider;
+use Phalcon\Api\Providers\ModelsMetadataProvider;
+use Phalcon\Api\Providers\RequestProvider;
+use Phalcon\Api\Providers\ResponseProvider;
+use Phalcon\Api\Providers\RouterProvider;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function Phalcon\Api\Core\appPath;
+
+final class ProvidersTest extends AbstractUnitTestCase
+{
+    public function testApiProviders(): void
+    {
+        $providers = require(appPath('src/Api/providers.php'));
+
+        $this->assertSame(ConfigProvider::class, $providers[0]);
+        $this->assertSame(LoggerProvider::class, $providers[1]);
+        $this->assertSame(ErrorHandlerProvider::class, $providers[2]);
+        $this->assertSame(DatabaseProvider::class, $providers[3]);
+        $this->assertSame(ModelsMetadataProvider::class, $providers[4]);
+        $this->assertSame(RequestProvider::class, $providers[5]);
+        $this->assertSame(ResponseProvider::class, $providers[6]);
+        $this->assertSame(RouterProvider::class, $providers[7]);
+    }
+
+    public function testCliProviders(): void
+    {
+        $providers = require(appPath('src/Cli/providers.php'));
+
+        $this->assertSame(ConfigProvider::class, $providers[0]);
+        $this->assertSame(LoggerProvider::class, $providers[1]);
+        $this->assertSame(ErrorHandlerProvider::class, $providers[2]);
+        $this->assertSame(DatabaseProvider::class, $providers[3]);
+        $this->assertSame(ModelsMetadataProvider::class, $providers[4]);
+        $this->assertSame(CliDispatcherProvider::class, $providers[5]);
+    }
+}
diff --git a/tests/Unit/Library/BootstrapTest.php b/tests/Unit/Library/BootstrapTest.php
new file mode 100644
index 00000000..30509f79
--- /dev/null
+++ b/tests/Unit/Library/BootstrapTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library;
+
+use Phalcon\Api\Bootstrap\Api;
+use Phalcon\Api\Http\Response;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Mvc\Micro;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class BootstrapTest extends AbstractUnitTestCase
+{
+    public function testBootstrap(): void
+    {
+        $bootstrap = new Api();
+
+        $this->assertTrue($bootstrap->getContainer() instanceof FactoryDefault);
+        $this->assertTrue($bootstrap->getResponse() instanceof Response);
+        $this->assertTrue($bootstrap->getApplication() instanceof Micro);
+    }
+}
diff --git a/tests/Unit/Library/Constants/FlagsTest.php b/tests/Unit/Library/Constants/FlagsTest.php
new file mode 100644
index 00000000..6392b848
--- /dev/null
+++ b/tests/Unit/Library/Constants/FlagsTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Constants;
+
+use Phalcon\Api\Constants\Flags;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class FlagsTest extends AbstractUnitTestCase
+{
+    public function testConstants(): void
+    {
+        $this->assertSame(1, Flags::ACTIVE);
+        $this->assertSame(2, Flags::INACTIVE);
+    }
+}
diff --git a/tests/Unit/Library/Constants/RelationshipsTest.php b/tests/Unit/Library/Constants/RelationshipsTest.php
new file mode 100644
index 00000000..9b9e38c2
--- /dev/null
+++ b/tests/Unit/Library/Constants/RelationshipsTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Constants;
+
+use Phalcon\Api\Constants\Relationships;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class RelationshipsTest extends AbstractUnitTestCase
+{
+    public function testConstants(): void
+    {
+        $this->assertSame('companies', Relationships::COMPANIES);
+        $this->assertSame('individual-types', Relationships::INDIVIDUAL_TYPES);
+        $this->assertSame('individuals', Relationships::INDIVIDUALS);
+        $this->assertSame('product-types', Relationships::PRODUCT_TYPES);
+        $this->assertSame('products', Relationships::PRODUCTS);
+        $this->assertSame('users', Relationships::USERS);
+    }
+}
diff --git a/tests/Unit/Library/ErrorHandlerTest.php b/tests/Unit/Library/ErrorHandlerTest.php
new file mode 100644
index 00000000..86fdb587
--- /dev/null
+++ b/tests/Unit/Library/ErrorHandlerTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library;
+
+use Phalcon\Api\ErrorHandler;
+use Phalcon\Api\Providers\LoggerProvider;
+use Phalcon\Config\Config;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Logger\Logger;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function file_exists;
+use function file_get_contents;
+use function hrtime;
+use function Phalcon\Api\Core\appPath;
+use function preg_match;
+use function str_replace;
+
+final class ErrorHandlerTest extends AbstractUnitTestCase
+{
+    private string $logFile = '';
+
+    /**
+     * The logger appends. Left alone, the file still holds what earlier tests
+     * - and earlier runs - wrote, so every assertion here would pass even with
+     * the logging removed outright. Start each test from an empty slate.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->logFile = appPath('storage/logs/api.log');
+
+        $this->safeDeleteFile($this->logFile);
+    }
+
+    public function testLogErrorOnError(): void
+    {
+        $handler = new ErrorHandler($this->getLogger(), $this->getConfig(true));
+
+        $result = $handler->handle(1, 'test error', 'file.php', 4);
+
+        $this->assertFileContentsContains(
+            $this->logFile,
+            '[error] [#:1]-[L: 4] : test error (file.php)'
+        );
+
+        /**
+         * set_error_handler() reads a falsy return as "not handled" and runs
+         * PHP's own handler as well. The error has been logged, so it is.
+         */
+        $this->assertTrue($result);
+    }
+
+    /**
+     * Not every caller knows where the error came from; the signature defaults
+     * say so, and the log line has to stay readable when they are taken.
+     */
+    public function testLogErrorOnErrorWithoutFileAndLine(): void
+    {
+        $handler = new ErrorHandler($this->getLogger(), $this->getConfig(true));
+
+        $handler->handle(2, 'no location');
+
+        $this->assertFileContentsContains(
+            $this->logFile,
+            '[error] [#:2]-[L: 0] : no location ()'
+        );
+    }
+
+    public function testLogErrorOnShutdown(): void
+    {
+        $handler = new ErrorHandler($this->getLogger(), $this->getConfig(true));
+
+        $handler->shutdown();
+
+        $contents = (string) file_get_contents($this->logFile);
+
+        /**
+         * The numbers move with the machine, so pin their shape instead: four
+         * decimals for the milliseconds, two for the megabytes, which is what
+         * the number_format() precision arguments promise.
+         */
+        $pattern = '/\[info\] Shutdown completed '
+            . '\[([\d,]+\.\d{4})\]ms - \[([\d,]+\.\d{2})\]MB/';
+
+        $this->assertMatchesRegularExpression($pattern, $contents);
+
+        preg_match($pattern, $contents, $matches);
+
+        $execution = (float) str_replace(',', '', $matches[1]);
+        $memory    = (float) str_replace(',', '', $matches[2]);
+
+        /**
+         * Bounds, not values: one division turns nanoseconds into
+         * milliseconds, the other bytes into megabytes. Get the operator or
+         * the operand wrong and the result lands orders of magnitude away,
+         * which is the only part worth asserting on a moving number.
+         */
+        $this->assertGreaterThanOrEqual(0, $execution);
+        $this->assertLessThan(60000, $execution);
+        $this->assertLessThan(1000, $memory);
+    }
+
+    /**
+     * The metrics are a development aid. Outside devMode the shutdown has
+     * nothing to say, and saying it anyway would put timings in production
+     * logs.
+     */
+    public function testNoLogOnShutdownWhenNotInDevMode(): void
+    {
+        $handler = new ErrorHandler($this->getLogger(), $this->getConfig(false));
+
+        $handler->shutdown();
+
+        $contents = true === file_exists($this->logFile)
+            ? (string) file_get_contents($this->logFile)
+            : '';
+
+        $this->assertStringNotContainsString('Shutdown completed', $contents);
+    }
+
+    private function getConfig(bool $devMode): Config
+    {
+        return new Config(
+            [
+                'app' => [
+                    'devMode' => $devMode,
+                    'time'    => hrtime(true),
+                ],
+            ]
+        );
+    }
+
+    private function getLogger(): Logger
+    {
+        $container = new FactoryDefault();
+
+        (new LoggerProvider())->register($container);
+
+        /** @var Logger $logger */
+        $logger = $container->getShared('logger');
+
+        return $logger;
+    }
+}
diff --git a/tests/Unit/Library/Http/ResponseTest.php b/tests/Unit/Library/Http/ResponseTest.php
new file mode 100644
index 00000000..c9028138
--- /dev/null
+++ b/tests/Unit/Library/Http/ResponseTest.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Http;
+
+use Phalcon\Api\Http\Response;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function is_string;
+use function json_decode;
+use function ob_end_clean;
+use function ob_start;
+use function sha1;
+
+final class ResponseTest extends AbstractUnitTestCase
+{
+    public function testHttpCodes(): void
+    {
+        $response = new Response();
+        $this->assertSame('200 (OK)', $response->getHttpCodeDescription($response::OK));
+        $this->assertSame('301 (Moved Permanently)', $response->getHttpCodeDescription($response::MOVED_PERMANENTLY));
+        $this->assertSame('302 (Found)', $response->getHttpCodeDescription($response::FOUND));
+        $this->assertSame('307 (Temporary Redirect)', $response->getHttpCodeDescription($response::TEMPORARY_REDIRECT));
+        $this->assertSame('308 (Permanent Redirect)', $response->getHttpCodeDescription($response::PERMANENTLY_REDIRECT));
+        $this->assertSame('400 (Bad Request)', $response->getHttpCodeDescription($response::BAD_REQUEST));
+        $this->assertSame('401 (Unauthorized)', $response->getHttpCodeDescription($response::UNAUTHORIZED));
+        $this->assertSame('403 (Forbidden)', $response->getHttpCodeDescription($response::FORBIDDEN));
+        $this->assertSame('404 (Not Found)', $response->getHttpCodeDescription($response::NOT_FOUND));
+        $this->assertSame(
+            '500 (Internal Server Error)',
+            $response->getHttpCodeDescription($response::INTERNAL_SERVER_ERROR)
+        );
+        $this->assertSame('501 (Not Implemented)', $response->getHttpCodeDescription($response::NOT_IMPLEMENTED));
+        $this->assertSame('502 (Bad Gateway)', $response->getHttpCodeDescription($response::BAD_GATEWAY));
+        $this->assertSame('999 (Undefined code)', $response->getHttpCodeDescription(999));
+    }
+
+    public function testResponseWithArrayPayload(): void
+    {
+        $response = new Response();
+
+        $response
+            ->setPayloadSuccess(['a' => 'b'])
+        ;
+
+        $payload = $this->checkPayload($response);
+
+        $this->assertFalse(isset($payload['errors']));
+        $this->assertSame(['a' => 'b'], $payload['data']);
+    }
+
+    public function testResponseWithErrorCode(): void
+    {
+        $response = new Response();
+
+        $response
+            ->setPayloadError('error content')
+        ;
+
+        $payload = $this->checkPayload($response, true);
+
+        $this->assertFalse(isset($payload['data']));
+        $this->assertSame('error content', $payload['errors'][0]);
+    }
+
+    public function testResponseWithModelErrors(): void
+    {
+        $messages = [
+            new Message('hello'),
+            new Message('goodbye'),
+        ];
+        $response = new Response();
+        $response
+            ->setPayloadErrors($messages)
+        ;
+
+        $payload = $this->checkPayload($response, true);
+
+        $this->assertFalse(isset($payload['data']));
+        $this->assertSame(2, count($payload['errors']));
+        $this->assertSame('hello', $payload['errors'][0]);
+        $this->assertSame('goodbye', $payload['errors'][1]);
+    }
+
+    public function testResponseWithStringPayload(): void
+    {
+        $response = new Response();
+
+        $response
+            ->setPayloadSuccess('test')
+        ;
+
+        $contents = $response->getContent();
+        $this->assertTrue(is_string($contents));
+
+        $payload = $this->checkPayload($response);
+
+        $this->assertFalse(isset($payload['errors']));
+        $this->assertSame('test', $payload['data']);
+    }
+
+    public function testResponseWithValidationErrors(): void
+    {
+        $group   = new Messages();
+        $message = new Message('hello');
+        $group->appendMessage($message);
+        $message = new Message('goodbye');
+        $group->appendMessage($message);
+
+        $response = new Response();
+        $response
+            ->setPayloadErrors($group)
+        ;
+
+        $payload = $this->checkPayload($response, true);
+
+        $this->assertFalse(isset($payload['data']));
+        $this->assertSame(2, count($payload['errors']));
+        $this->assertSame('hello', $payload['errors'][0]);
+        $this->assertSame('goodbye', $payload['errors'][1]);
+    }
+
+    public function testSendWrapsPayloadWithMetaAndHash(): void
+    {
+        $response = new Response();
+        $response->setPayloadSuccess(['a' => 'b']);
+
+        $original = $response->getContent();
+
+        ob_start();
+        $response->send();
+        ob_end_clean();
+
+        $payload = json_decode($response->getContent(), true);
+
+        /**
+         * The meta envelope and both of its members have to survive - dropping
+         * either leaves clients without the timestamp or the integrity hash.
+         */
+        $this->assertArrayHasKey('meta', $payload);
+        $this->assertArrayHasKey('timestamp', $payload['meta']);
+        $this->assertArrayHasKey('hash', $payload['meta']);
+
+        /**
+         * The hash is sha1 over the timestamp followed by the original body, in
+         * that order. Reversing the operands or dropping either one produces a
+         * different digest, which is what the recomputation here pins down.
+         */
+        $this->assertSame(
+            sha1($payload['meta']['timestamp'] . $original),
+            $payload['meta']['hash']
+        );
+
+        $this->assertSame(sha1($original), $response->getHeaders()->get('E-Tag'));
+
+        $this->assertSame('1.0', $payload['jsonapi']['version']);
+        $this->assertSame(['a' => 'b'], $payload['data']);
+    }
+
+    /**
+     * An input that already carries a `data` key must be sent as-is, not nested
+     * under a second `data`. The two branches of setPayloadSuccess only diverge
+     * for this shape, so it is what nails the is_array test down; a plain array
+     * takes the same path either way.
+     */
+    public function testSetPayloadSuccessDoesNotDoubleWrapDataKey(): void
+    {
+        $response = new Response();
+        $response->setPayloadSuccess(['data' => 'value']);
+
+        $payload = $this->checkPayload($response);
+
+        $this->assertSame('value', $payload['data']);
+    }
+
+    private function checkPayload(Response $response, bool $error = false): array
+    {
+        $contents = $response->getContent();
+        $this->assertTrue(is_string($contents));
+
+        $payload = json_decode($contents, true);
+        if (true === $error) {
+            $this->assertTrue(isset($payload['errors']));
+        } else {
+            $this->assertTrue(isset($payload['data']));
+        }
+
+        return $payload;
+    }
+}
diff --git a/tests/Unit/Library/Providers/CacheTest.php b/tests/Unit/Library/Providers/CacheTest.php
new file mode 100644
index 00000000..97665c5d
--- /dev/null
+++ b/tests/Unit/Library/Providers/CacheTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\CacheDataProvider;
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Cache\Cache;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class CacheTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $config      = new ConfigProvider();
+        $config->register($diContainer);
+        $provider = new CacheDataProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('cache'));
+        /** @var Cache $cache */
+        $cache = $diContainer->getShared('cache');
+        $this->assertTrue($cache instanceof Cache);
+    }
+}
diff --git a/tests/Unit/Library/Providers/ConfigTest.php b/tests/Unit/Library/Providers/ConfigTest.php
new file mode 100644
index 00000000..0f7e0044
--- /dev/null
+++ b/tests/Unit/Library/Providers/ConfigTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Config\Config;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class ConfigTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $provider    = new ConfigProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('config'));
+        $config = $diContainer->getShared('config');
+        $this->assertTrue($config instanceof Config);
+
+        $configArray = $config->toArray();
+        $this->assertTrue(isset($configArray['app']['version']));
+        $this->assertTrue(isset($configArray['app']['timezone']));
+        $this->assertTrue(isset($configArray['app']['debug']));
+        $this->assertTrue(isset($configArray['app']['env']));
+        $this->assertTrue(isset($configArray['app']['devMode']));
+        $this->assertTrue(isset($configArray['app']['baseUri']));
+        $this->assertTrue(isset($configArray['app']['supportEmail']));
+        $this->assertTrue(isset($configArray['app']['time']));
+        $this->assertTrue(isset($configArray['cache']));
+    }
+}
diff --git a/tests/Unit/Library/Providers/DatabaseTest.php b/tests/Unit/Library/Providers/DatabaseTest.php
new file mode 100644
index 00000000..fa9e4dfe
--- /dev/null
+++ b/tests/Unit/Library/Providers/DatabaseTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Api\Providers\DatabaseProvider;
+use Phalcon\Db\Adapter\Pdo\Mysql;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class DatabaseTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $provider    = new ConfigProvider();
+        $provider->register($diContainer);
+        $provider = new DatabaseProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('db'));
+        /** @var Mysql $db */
+        $db = $diContainer->getShared('db');
+        $this->assertTrue($db instanceof Mysql);
+        $this->assertSame('mysql', $db->getType());
+    }
+}
diff --git a/tests/Unit/Library/Providers/ErrorHandlerTest.php b/tests/Unit/Library/Providers/ErrorHandlerTest.php
new file mode 100644
index 00000000..5c613707
--- /dev/null
+++ b/tests/Unit/Library/Providers/ErrorHandlerTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Api\Providers\ErrorHandlerProvider;
+use Phalcon\Api\Providers\LoggerProvider;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+use function date_default_timezone_get;
+
+final class ErrorHandlerTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $provider    = new ConfigProvider();
+        $provider->register($diContainer);
+        $provider = new LoggerProvider();
+        $provider->register($diContainer);
+        $provider = new ErrorHandlerProvider();
+        $provider->register($diContainer);
+
+        $config = $diContainer->getShared('config');
+
+        $this->assertSame(date_default_timezone_get(), $config->path('app.timezone'));
+        $this->assertSame(ini_get('display_errors'), 'Off');
+        $this->assertSame(E_ALL, (int) ini_get('error_reporting'));
+    }
+}
diff --git a/tests/Unit/Library/Providers/LoggerTest.php b/tests/Unit/Library/Providers/LoggerTest.php
new file mode 100644
index 00000000..0400a819
--- /dev/null
+++ b/tests/Unit/Library/Providers/LoggerTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Api\Providers\LoggerProvider;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Logger\Logger;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class LoggerTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $provider    = new ConfigProvider();
+        $provider->register($diContainer);
+        $provider = new LoggerProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('logger'));
+        /** @var Logger $logger */
+        $logger = $diContainer->getShared('logger');
+        $this->assertTrue($logger instanceof Logger);
+        $this->assertSame('api', $logger->getName());
+    }
+}
diff --git a/tests/Unit/Library/Providers/ModelsMetadataTest.php b/tests/Unit/Library/Providers/ModelsMetadataTest.php
new file mode 100644
index 00000000..585b1427
--- /dev/null
+++ b/tests/Unit/Library/Providers/ModelsMetadataTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Providers\ConfigProvider;
+use Phalcon\Api\Providers\ModelsMetadataProvider;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Mvc\Model\MetaData\Memory;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class ModelsMetadataTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $config      = new ConfigProvider();
+        $config->register($diContainer);
+        $provider = new ModelsMetadataProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('modelsMetadata'));
+        /** @var Memory $metadata */
+        $metadata = $diContainer->getShared('modelsMetadata');
+        $this->assertTrue($metadata instanceof Memory);
+    }
+}
diff --git a/tests/Unit/Library/Providers/ResponseTest.php b/tests/Unit/Library/Providers/ResponseTest.php
new file mode 100644
index 00000000..4c04c17c
--- /dev/null
+++ b/tests/Unit/Library/Providers/ResponseTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
+
+use Phalcon\Api\Http\Response;
+use Phalcon\Api\Providers\ResponseProvider;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
+
+final class ResponseTest extends AbstractUnitTestCase
+{
+    public function testRegistration(): void
+    {
+        $diContainer = new FactoryDefault();
+        $provider    = new ResponseProvider();
+        $provider->register($diContainer);
+
+        $this->assertTrue($diContainer->has('response'));
+        /** @var Response $response */
+        $response = $diContainer->getShared('response');
+        $this->assertTrue($response instanceof Response);
+    }
+}
diff --git a/tests/unit/library/Providers/RouterCest.php b/tests/Unit/Library/Providers/RouterTest.php
similarity index 77%
rename from tests/unit/library/Providers/RouterCest.php
rename to tests/Unit/Library/Providers/RouterTest.php
index 55741577..b0961b0e 100644
--- a/tests/unit/library/Providers/RouterCest.php
+++ b/tests/Unit/Library/Providers/RouterTest.php
@@ -1,21 +1,28 @@
 <?php
 
-namespace Phalcon\Api\Tests\unit\library\Providers;
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Api\Tests\Unit\Library\Providers;
 
-use Phalcon\Api\Logger;
 use Phalcon\Api\Providers\ConfigProvider;
 use Phalcon\Api\Providers\RouterProvider;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\RouterInterface;
-use UnitTester;
+use Phalcon\Talon\PHPUnit\AbstractUnitTestCase;
 
-class RouterCest
+final class RouterTest extends AbstractUnitTestCase
 {
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
+    public function testRegistration(): void
     {
         $diContainer = new FactoryDefault();
         $application = new Micro($diContainer);
@@ -55,10 +62,10 @@ public function checkRegistration(UnitTester $I)
             ['GET', '/product-types/{recordId:[0-9]+}/relationships/{relationships:[a-zA-Z-,.]+}'],
         ];
 
-        $I->assertSame(24, count($routes));
+        $this->assertSame(24, count($routes));
         foreach ($routes as $index => $route) {
-            $I->assertSame($expected[$index][0], $route->getHttpMethods());
-            $I->assertSame($expected[$index][1], $route->getPattern());
+            $this->assertSame($expected[$index][0], $route->getHttpMethods());
+            $this->assertSame($expected[$index][1], $route->getPattern());
         }
     }
 }
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
deleted file mode 100644
index eca86772..00000000
--- a/tests/_bootstrap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-define('API_TESTS', true);
-
-/**
- * As current request is inside CLI
- * There are no REQUEST URI
- */
-$_SERVER['REQUEST_URI'] = '/';
-
-require __DIR__ . '/../library/Core/autoload.php';
-
-ini_set('date.timezone', 'UTC');
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/_support/ApiTester.php b/tests/_support/ApiTester.php
deleted file mode 100644
index 43a7c3ca..00000000
--- a/tests/_support/ApiTester.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-use Codeception\Actor;
-use Codeception\Lib\Friend;
-use Codeception\Util\HttpCode;
-use Page\Data as DataPage;
-use Phalcon\Api\Constants\Flags;
-use Phalcon\Api\Models\Users;
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
- */
-class ApiTester extends Actor
-{
-    use _generated\ApiTesterActions;
-
-    /**
-     * Checks if the response was successful
-     *
-     * @param int $code
-     *
-     * @return void
-     */
-    public function seeResponseIsSuccessful(int $code = HttpCode::OK): void
-    {
-        $this->seeResponseIsJson();
-        $this->seeResponseCodeIs($code);
-        $this->seeResponseMatchesJsonType(
-            [
-                'jsonapi' => [
-                    'version' => 'string'
-                ],
-                //                'data'    => 'array',
-                //                'errors'  => 'array',
-                'meta'    => [
-                    'timestamp' => 'string:date',
-                    'hash'      => 'string',
-                ]
-            ]
-        );
-
-        $this->checkHash();
-    }
-
-    /**
-     * Checks if the response was successful
-     *
-     * @return void
-     */
-    public function seeResponseIs400(): void
-    {
-        $this->checkErrorResponse(HttpCode::BAD_REQUEST);
-    }
-
-    /**
-     * Checks if the response was successful
-     *
-     * @return void
-     */
-    public function seeResponseIs404(): void
-    {
-        $this->checkErrorResponse(HttpCode::NOT_FOUND);
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return void
-     */
-    public function seeErrorJsonResponse(string $message)
-    {
-        $this->seeResponseContainsJson(
-            [
-                'jsonapi' => [
-                    'version' => '1.0',
-                ],
-                'errors'  => [
-                    $message,
-                ],
-            ]
-        );
-    }
-
-    /**
-     * @param string $key
-     * @param array  $data
-     *
-     * @return void
-     */
-    public function seeSuccessJsonResponse(string $key = 'data', array $data = [])
-    {
-        $this->seeResponseContainsJson([$key => $data]);
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function apiLogin()
-    {
-        $this->deleteHeader('Authorization');
-        $this->sendPOST(DataPage::$loginUrl, DataPage::loginJson());
-        $this->seeResponseIsSuccessful();
-
-        $response = $this->grabResponse();
-        $response = json_decode($response, true);
-        $data     = $response['data'] ?? [];
-        $token    = $data['token'] ?? '';
-
-        return $token;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function addApiUserRecord()
-    {
-        return $this->haveRecordWithFields(
-            Users::class,
-            [
-                'status'        => Flags::ACTIVE,
-                'username'      => DataPage::$testUsername,
-                'password'      => DataPage::$testPassword,
-                'issuer'        => DataPage::$testIssuer,
-                'tokenPassword' => DataPage::$testTokenPassword,
-                'tokenId'       => DataPage::$testTokenId,
-            ]
-        );
-    }
-
-    /**
-     * @return void
-     */
-    private function checkHash(): void
-    {
-        $response  = $this->grabResponse();
-        $response  = json_decode($response, true);
-        $timestamp = $response['meta']['timestamp'];
-        $hash      = $response['meta']['hash'];
-        unset($response['meta'], $response['jsonapi']);
-
-        $actual = sha1($timestamp . json_encode($response));
-        $this->assertEquals($hash, $actual);
-    }
-
-    /**
-     * @param int $code
-     *
-     * @return void
-     */
-    private function checkErrorResponse(int $code): void
-    {
-        $this->seeResponseMatchesJsonType(
-            [
-                'jsonapi' => [
-                    'version' => 'string'
-                ],
-                'meta'    => [
-                    'timestamp' => 'string:date',
-                    'hash'      => 'string',
-                ]
-            ]
-        );
-
-        $response  = $this->grabResponse();
-        $response  = json_decode($response, true);
-        $timestamp = $response['meta']['timestamp'];
-        $hash      = $response['meta']['hash'];
-        $this->assertEquals(HttpCode::getDescription($code), $response['errors'][0]);
-        unset($response['jsonapi'], $response['meta']);
-        $this->assertEquals($hash, sha1($timestamp . json_encode($response)));
-
-
-        $this->seeResponseIsJson();
-        $this->seeResponseCodeIs($code);
-        $this->seeResponseMatchesJsonType(
-            [
-                'jsonapi' => [
-                    'version' => 'string'
-                ],
-                'meta'    => [
-                    'timestamp' => 'string:date',
-                    'hash'      => 'string',
-                ]
-            ]
-        );
-
-        $this->checkHash();
-    }
-}
diff --git a/tests/_support/CliTester.php b/tests/_support/CliTester.php
deleted file mode 100644
index c899029d..00000000
--- a/tests/_support/CliTester.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-use Codeception\Actor;
-use Codeception\Lib\Friend;
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
- */
-class CliTester extends Actor
-{
-    use _generated\CliTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}
diff --git a/tests/_support/Helper/Api.php b/tests/_support/Helper/Api.php
deleted file mode 100644
index 397e972e..00000000
--- a/tests/_support/Helper/Api.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Helper;
-
-use Codeception\Module;
-
-/**
- * Acceptance Helper
- *
- * Here you can define custom actions
- * all public methods declared in helper class will be available in $I
- *
- * @package Helper
- */
-class Api extends Module
-{
-    public function seeResponseRegexp($regexp, $content)
-    {
-        $this->assertRegExp($regexp, $content);
-    }
-}
diff --git a/tests/_support/Helper/Cli.php b/tests/_support/Helper/Cli.php
deleted file mode 100644
index b8ab791e..00000000
--- a/tests/_support/Helper/Cli.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-use Codeception\Module;
-
-class Cli extends Module
-{
-
-}
diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
deleted file mode 100644
index 7159e23d..00000000
--- a/tests/_support/Helper/Unit.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Helper;
-
-use Codeception\Module;
-
-/**
- * Unit Helper
- *
- * Here you can define custom actions
- * all public methods declared in helper class will be available in $I
- *
- * @package Helper
- */
-class Unit extends Module
-{
-    public function getNewFileName($prefix = '', $suffix = 'log')
-    {
-        $prefix = ($prefix) ? $prefix . '_' : '';
-        $suffix = ($suffix) ? $suffix : 'log';
-
-        return uniqid($prefix, true) . '.' . $suffix;
-    }
-
-    public function cleanFile($fileName)
-    {
-        if (true === file_exists($fileName)) {
-            unlink($fileName);
-        }
-    }
-}
diff --git a/tests/_support/IntegrationTester.php b/tests/_support/IntegrationTester.php
deleted file mode 100644
index 93cee4d5..00000000
--- a/tests/_support/IntegrationTester.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-use Codeception\Actor;
-use Codeception\Lib\Friend;
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
- */
-class IntegrationTester extends Actor
-{
-    use _generated\IntegrationTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
deleted file mode 100644
index 9c79d3b6..00000000
--- a/tests/_support/UnitTester.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-use Codeception\Actor;
-use Codeception\Lib\Friend;
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
- */
-class UnitTester extends Actor
-{
-    use _generated\UnitTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}
diff --git a/tests/_support/_generated/.gitignore b/tests/_support/_generated/.gitignore
deleted file mode 100644
index 005717ea..00000000
--- a/tests/_support/_generated/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/api.suite.yml b/tests/api.suite.yml
deleted file mode 100644
index cc04769a..00000000
--- a/tests/api.suite.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for API tests.
-
-actor: ApiTester
-modules:
-  enabled:
-    - Asserts
-    - Helper\Api
-    - \Helper\Integration
-    - REST:
-        depends: PhpBrowser
-        url: 'http://%CODECEPTION_URL%:%CODECEPTION_PORT%'
-        curl:
-          CURLOPT_RETURNTRANSFER: true
diff --git a/tests/api/Companies/AddCest.php b/tests/api/Companies/AddCest.php
deleted file mode 100644
index 88553f43..00000000
--- a/tests/api/Companies/AddCest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Companies;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Models\Companies;
-
-use function Phalcon\Api\Core\appUrl;
-use function uniqid;
-
-class AddCest
-{
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function addNewCompany(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-        $name  = uniqid('com');
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendPOST(
-            Data::$companiesUrl,
-            Data::companyAddJson(
-                $name,
-                '123 Phalcon way',
-                'World',
-                '555-444-7777'
-            )
-        );
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful(Response::CREATED);
-
-        $company = $I->getRecordWithFields(
-            Companies::class,
-            [
-                'name' => $name,
-            ]
-        );
-        $I->assertNotEquals(false, $company);
-
-        $I->seeHttpHeader('Location', appUrl(Relationships::COMPANIES, $company->get('id')));
-        $I->seeSuccessJsonResponse(
-            'data',
-            Data::companiesAddResponse($company)
-        );
-
-        $I->assertNotEquals(false, $company->delete());
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function addNewCompanyWithExistingName(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-        $name  = uniqid('com');
-        $I->haveRecordWithFields(
-            Companies::class,
-            [
-                'name' => $name,
-            ]
-        );
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendPOST(
-            Data::$companiesUrl,
-            Data::companyAddJson(
-                $name,
-                '123 Phalcon way',
-                'World',
-                '555-444-7777'
-            )
-        );
-        $I->deleteHeader('Authorization');
-        $I->seeErrorJsonResponse('The company name already exists in the database');
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function addNewCompanyWithoutPostingName(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendPOST(
-            Data::$companiesUrl,
-            Data::companyAddJson(
-                '',
-                '123 Phalcon way',
-                'World',
-                '555-444-7777'
-            )
-        );
-        $I->deleteHeader('Authorization');
-        $I->deleteHeader('Authorization');
-        $I->seeErrorJsonResponse('The company name is required');
-    }
-}
diff --git a/tests/api/Companies/GetBase.php b/tests/api/Companies/GetBase.php
deleted file mode 100644
index 4cbbcbcf..00000000
--- a/tests/api/Companies/GetBase.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Companies;
-
-use ApiTester;
-use Phalcon\Api\Models\Companies;
-
-class GetBase
-{
-    protected function addRecords(ApiTester $I): array
-    {
-        /** @var Companies $comOne */
-        $company = $I->addCompanyRecord('com-a');
-        $indType = $I->addIndividualTypeRecord('type-a-');
-        $indOne  = $I->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
-        $indTwo  = $I->addIndividualRecord('ind-a-', $company->get('id'), $indType->get('id'));
-        $prdType = $I->addProductTypeRecord('type-a-');
-        $prdOne  = $I->addProductRecord('prd-a-', $prdType->get('id'));
-        $prdTwo  = $I->addProductRecord('prd-b-', $prdType->get('id'));
-        $I->addCompanyXProduct($company->get('id'), $prdOne->get('id'));
-        $I->addCompanyXProduct($company->get('id'), $prdTwo->get('id'));
-
-        return [$company, $prdOne, $prdTwo, $indOne, $indTwo];
-    }
-}
diff --git a/tests/api/Companies/GetCest.php b/tests/api/Companies/GetCest.php
deleted file mode 100644
index 5a3c0b23..00000000
--- a/tests/api/Companies/GetCest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Companies;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-
-class GetCest extends GetBase
-{
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompany(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $company = $I->addCompanyRecord('com-a-');
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesRecordUrl, $company->get('id')));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($company),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getUnknownCompany(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesRecordUrl, 1));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs404();
-    }
-
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getCompanies(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $comOne */
-        $comOne = $I->addCompanyRecord('com-a-');
-        /** @var Companies $comTwo */
-        $comTwo = $I->addCompanyRecord('com-b-');
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$companiesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($comOne),
-                Data::companiesResponse($comTwo),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompaniesNoData(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$companiesUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse();
-    }
-}
diff --git a/tests/api/Companies/GetSortCest.php b/tests/api/Companies/GetSortCest.php
deleted file mode 100644
index cf8558e2..00000000
--- a/tests/api/Companies/GetSortCest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Companies;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-
-class GetSortCest extends GetBase
-{
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getCompaniesSingleSort(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $comOne */
-        $comOne = $I->addCompanyRecord('com-a-');
-        /** @var Companies $comTwo */
-        $comTwo = $I->addCompanyRecord('com-b-');
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesSortUrl, 'name'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($comOne),
-                Data::companiesResponse($comTwo),
-            ]
-        );
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesSortUrl, '-name'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($comTwo),
-                Data::companiesResponse($comOne),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getCompaniesMultipleSort(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $comOne */
-        $comOne = $I->addCompanyRecord('com-a-', '', 'city-b');
-        /** @var Companies $comTwo */
-        $comTwo = $I->addCompanyRecord('com-b-', '', 'city-b');
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesSortUrl, 'city,name'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($comOne),
-                Data::companiesResponse($comTwo),
-            ]
-        );
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesSortUrl, 'city,-name'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::companiesResponse($comTwo),
-                Data::companiesResponse($comOne),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getCompaniesInvalidSort(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $comOne */
-        $I->addCompanyRecord('com-a-', '', 'city-b');
-        /** @var Companies $comTwo */
-        $I->addCompanyRecord('com-b-', '', 'city-b');
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$companiesSortUrl, 'unknown'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs400();
-    }
-}
diff --git a/tests/api/Individuals/GetCest.php b/tests/api/Individuals/GetCest.php
deleted file mode 100644
index def81ee8..00000000
--- a/tests/api/Individuals/GetCest.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Individuals;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Models\Individuals;
-use Phalcon\Api\Models\IndividualTypes;
-
-use function Phalcon\Api\Core\envValue;
-
-class GetCest
-{
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getIndividual(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $company */
-        $company = $I->addCompanyRecord('com-a-');
-        /** @var IndividualTypes $individualType */
-        $individualType = $I->addIndividualTypeRecord('prt-a-');
-        /** @var Individuals $individual */
-        $individual = $I->addIndividualRecord('prd-a-', $company->get('id'), $individualType->get('id'));
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$individualsRecordUrl, $individual->get('id')));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::individualResponse($individual),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getUnknownIndividual(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$individualsRecordUrl, 1));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs404();
-    }
-
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getIndividuals(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var Companies $company */
-        $company = $I->addCompanyRecord('com-a-');
-        /** @var IndividualTypes $individualType */
-        $individualType = $I->addIndividualTypeRecord('prt-a-');
-        /** @var Individuals $individualOne */
-        $individualOne = $I->addIndividualRecord('ind-a-', $company->get('id'), $individualType->get('id'));
-        /** @var Individuals $individualTwo */
-        $individualTwo = $I->addIndividualRecord('ind-b-', $company->get('id'), $individualType->get('id'));
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$individualsUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::individualResponse($individualOne),
-                Data::individualResponse($individualTwo),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getIndividualsWithIncludesAllIncludes(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::COMPANIES, Relationships::INDIVIDUAL_TYPES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getIndividualsWithIncludesCompanies(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::COMPANIES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getIndividualsWithRelationshipIndividualTypes(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::INDIVIDUAL_TYPES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getIndividualsNoData(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$individualsUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse();
-    }
-
-    private function addRecords(ApiTester $I): array
-    {
-        /** @var Companies $company */
-        $company = $I->addCompanyRecord('com-a');
-        /** @var IndividualTypes $individualType */
-        $individualType = $I->addIndividualTypeRecord('prt-a-');
-        /** @var Individuals $individual */
-        $individual = $I->addIndividualRecord('ind-a-', $company->get('id'), $individualType->get('id'));
-
-
-        return [$individual, $individualType, $company];
-    }
-
-    private function checkIncludes(ApiTester $I, array $includes = [])
-    {
-        list($individual, $individualType, $company) = $this->addRecords($I);
-
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
-            sprintf(
-                Data::$individualsRecordIncludesUrl,
-                $individual->get('id'),
-                implode(',', $includes)
-            )
-        );
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-
-        $element = [
-            'type'       => Relationships::INDIVIDUALS,
-            'id'         => $individual->get('id'),
-            'attributes' => [
-                'companyId' => $individual->get('companyId'),
-                'typeId'    => $individual->get('typeId'),
-                'prefix'    => $individual->get('prefix'),
-                'first'     => $individual->get('first'),
-                'middle'    => $individual->get('middle'),
-                'last'      => $individual->get('last'),
-                'suffix'    => $individual->get('suffix'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL', 'localhost'),
-                    Relationships::INDIVIDUALS,
-                    $individual->get('id')
-                ),
-            ],
-        ];
-
-        $included = [];
-        foreach ($includes as $include) {
-            if (Relationships::COMPANIES === $include) {
-                $element['relationships'][Relationships::COMPANIES] = [
-                    'links' => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::INDIVIDUALS,
-                            $individual->get('id'),
-                            Relationships::COMPANIES
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::INDIVIDUALS,
-                            $individual->get('id'),
-                            Relationships::COMPANIES
-                        ),
-                    ],
-                    'data'  => [
-                        'type' => Relationships::COMPANIES,
-                        'id'   => $company->get('id'),
-                    ],
-                ];
-
-                $included[] = Data::companiesResponse($company);
-            }
-
-            if (Relationships::INDIVIDUAL_TYPES === $include) {
-                $element['relationships'][Relationships::INDIVIDUAL_TYPES] = [
-                    'links' => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::INDIVIDUALS,
-                            $individual->get('id'),
-                            Relationships::INDIVIDUAL_TYPES
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::INDIVIDUALS,
-                            $individual->get('id'),
-                            Relationships::INDIVIDUAL_TYPES
-                        ),
-                    ],
-                    'data'  => [
-                        'type' => Relationships::INDIVIDUAL_TYPES,
-                        'id'   => $individualType->get('id'),
-                    ],
-                ];
-
-                $included[] = Data::individualTypeResponse($individualType);
-            }
-        }
-
-        $I->seeSuccessJsonResponse('data', [$element]);
-
-        if (count($included) > 0) {
-            $I->seeSuccessJsonResponse('included', $included);
-        }
-    }
-}
diff --git a/tests/api/LoginCest.php b/tests/api/LoginCest.php
deleted file mode 100644
index 1f482f49..00000000
--- a/tests/api/LoginCest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Constants\Flags;
-use Phalcon\Api\Models\Users;
-
-use function json_decode;
-
-class LoginCest
-{
-    public function loginUnknownUser(ApiTester $I)
-    {
-        $I->sendPOST(
-            Data::$loginUrl,
-            [
-                'username' => 'user',
-                'password' => 'pass',
-            ]
-        );
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Incorrect credentials');
-    }
-
-    public function loginKnownUser(ApiTester $I)
-    {
-        $I->haveRecordWithFields(
-            Users::class,
-            [
-                'status'        => Flags::ACTIVE,
-                'username'      => Data::$testUsername,
-                'password'      => Data::$testPassword,
-                'issuer'        => Data::$testIssuer,
-                'tokenPassword' => Data::$strongPassphrase,
-                'tokenId'       => Data::$testTokenId,
-            ]
-        );
-
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-        $response = $I->grabResponse();
-        $data     = json_decode($response, true);
-        $I->assertTrue(isset($data['data']));
-        $I->assertTrue(isset($data['data']['token']));
-        $I->assertTrue(isset($data['meta']));
-    }
-}
diff --git a/tests/api/NotFoundCest.php b/tests/api/NotFoundCest.php
deleted file mode 100644
index fdbbcb60..00000000
--- a/tests/api/NotFoundCest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api;
-
-use ApiTester;
-use Page\Data;
-
-class NotFoundCest
-{
-    public function checkNotFoundRoute(ApiTester $I)
-    {
-        $I->sendGET(Data::$wrongUrl);
-        $I->seeResponseIs404();
-    }
-}
diff --git a/tests/api/Products/GetCest.php b/tests/api/Products/GetCest.php
deleted file mode 100644
index b96bb9c7..00000000
--- a/tests/api/Products/GetCest.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Products;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Models\Products;
-use Phalcon\Api\Models\ProductTypes;
-
-use function Phalcon\Api\Core\envValue;
-
-class GetCest
-{
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getProduct(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var ProductTypes $productType */
-        $productType = $I->addProductTypeRecord('prt-a-');
-        /** @var Products $product */
-        $product = $I->addProductRecord('prd-a-', $productType->get('id'));
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$productsRecordUrl, $product->get('id')));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::productResponse($product),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getUnknownProduct(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(sprintf(Data::$productsRecordUrl, 1));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIs404();
-    }
-
-    /**
-     * @param ApiTester $I
-     *
-     * @throws ModelException
-     */
-    public function getProducts(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        /** @var ProductTypes $productType */
-        $productType = $I->addProductTypeRecord('prt-a-');
-        /** @var Products $productOne */
-        $productOne = $I->addProductRecord('prd-a-', $productType->get('id'));
-        /** @var Products $productTwo */
-        $productTwo = $I->addProductRecord('prd-b-', $productType->get('id'));
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$productsUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::productResponse($productOne),
-                Data::productResponse($productTwo),
-            ]
-        );
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getProductsWithIncludesAllIncludes(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::COMPANIES, Relationships::PRODUCT_TYPES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getProductsWithIncludesCompanies(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::COMPANIES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getProductsWithIncludesProductTypes(ApiTester $I)
-    {
-        $this->checkIncludes($I, [Relationships::PRODUCT_TYPES]);
-    }
-
-    /**
-     * @param ApiTester $I
-     */
-    public function getProductsNoData(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$productsUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse();
-    }
-
-    private function addRecords(ApiTester $I): array
-    {
-        /** @var Companies $comOne */
-        $comOne = $I->addCompanyRecord('com-a');
-        /** @var Companies $comTwo */
-        $comTwo = $I->addCompanyRecord('com-b');
-        /** @var ProductTypes $productType */
-        $productType = $I->addProductTypeRecord('prt-a-');
-        /** @var Products $product */
-        $product = $I->addProductRecord('prd-a-', $productType->get('id'));
-        $I->addCompanyXProduct($comOne->get('id'), $product->get('id'));
-        $I->addCompanyXProduct($comTwo->get('id'), $product->get('id'));
-
-        return [$product, $productType, $comOne, $comTwo];
-    }
-
-    private function checkIncludes(ApiTester $I, array $includes = [])
-    {
-        list($product, $productType, $comOne, $comTwo) = $this->addRecords($I);
-
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(
-            sprintf(
-                Data::$productsRecordIncludesUrl,
-                $product->get('id'),
-                implode(',', $includes)
-            )
-        );
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-
-        $element = [
-            'type'       => Relationships::PRODUCTS,
-            'id'         => $product->get('id'),
-            'attributes' => [
-                'typeId'      => $productType->get('id'),
-                'name'        => $product->get('name'),
-                'description' => $product->get('description'),
-                'quantity'    => $product->get('quantity'),
-                'price'       => $product->get('price'),
-            ],
-            'links'      => [
-                'self' => sprintf(
-                    '%s/%s/%s',
-                    envValue('APP_URL', 'localhost'),
-                    Relationships::PRODUCTS,
-                    $product->get('id')
-                ),
-            ],
-        ];
-
-        $included = [];
-        foreach ($includes as $include) {
-            if (Relationships::COMPANIES === $include) {
-                $element['relationships'][Relationships::COMPANIES] = [
-                    'links' => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::PRODUCTS,
-                            $product->get('id'),
-                            Relationships::COMPANIES
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::PRODUCTS,
-                            $product->get('id'),
-                            Relationships::COMPANIES
-                        ),
-                    ],
-                    'data'  => [
-                        [
-                            'type' => Relationships::COMPANIES,
-                            'id'   => $comOne->get('id'),
-                        ],
-                        [
-                            'type' => Relationships::COMPANIES,
-                            'id'   => $comTwo->get('id'),
-                        ],
-                    ],
-                ];
-
-                $included[] = Data::companiesResponse($comOne);
-                $included[] = Data::companiesResponse($comTwo);
-            }
-
-            if (Relationships::PRODUCT_TYPES === $include) {
-                $element['relationships'][Relationships::PRODUCT_TYPES] = [
-                    'links' => [
-                        'self'    => sprintf(
-                            '%s/%s/%s/relationships/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::PRODUCTS,
-                            $product->get('id'),
-                            Relationships::PRODUCT_TYPES
-                        ),
-                        'related' => sprintf(
-                            '%s/%s/%s/%s',
-                            envValue('APP_URL', 'localhost'),
-                            Relationships::PRODUCTS,
-                            $product->get('id'),
-                            Relationships::PRODUCT_TYPES
-                        ),
-                    ],
-                    'data'  => [
-                        'type' => Relationships::PRODUCT_TYPES,
-                        'id'   => $productType->get('id'),
-                    ],
-                ];
-
-                $included[] = Data::productTypeResponse($productType);
-            }
-        }
-
-        $I->seeSuccessJsonResponse('data', [$element]);
-
-        if (count($included) > 0) {
-            $I->seeSuccessJsonResponse('included', $included);
-        }
-    }
-}
diff --git a/tests/api/Users/GetCest.php b/tests/api/Users/GetCest.php
deleted file mode 100644
index 447cc9be..00000000
--- a/tests/api/Users/GetCest.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\api\Users;
-
-use ApiTester;
-use Page\Data;
-use Phalcon\Api\Models\Users;
-use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Encryption\Security\JWT\Builder;
-use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-
-use function explode;
-use function usleep;
-
-class GetCest
-{
-    use TokenTrait;
-
-    public function loginKnownUserNoToken(ApiTester $I)
-    {
-        $I->deleteHeader('Authorization');
-        $I->sendGET(Data::$usersUrl . '/1');
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Invalid Token');
-    }
-
-    public function loginKnownUserGetUnknownUser(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $I->deleteHeader('Authorization');
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-
-        $response = $I->grabResponse();
-        $response = json_decode($response, true);
-        $data     = $response['data'];
-        $token    = $data['token'];
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$usersUrl . '/1');
-        $I->seeResponseIs404();
-    }
-
-    public function loginKnownUserIncorrectSignature(ApiTester $I)
-    {
-        $record = $I->addApiUserRecord();
-        $I->deleteHeader('Authorization');
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-
-        $token = $builder
-            ->setIssuer(Data::$testIssuer)
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setIssuedAt(time() - 3600)
-            ->setNotBefore(time() - 3590)
-            ->setExpirationTime(time() + 3000)
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        $wrongToken = $token->getToken();
-        $parts      = explode('.', $wrongToken);
-        $wrongToken = $parts[0] . '.' . $parts[1] . '.';
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $wrongToken);
-        $I->sendGET(Data::$usersUrl . '/' . $record->get('id'));
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Invalid Token (verification)');
-    }
-
-    public function loginKnownUserExpiredToken(ApiTester $I)
-    {
-        $record = $I->addApiUserRecord();
-        $I->deleteHeader('Authorization');
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-
-        $token = $builder
-            ->setIssuer(Data::$testIssuer)
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setIssuedAt(time() - 3600)
-            ->setNotBefore(time() - 3590)
-            ->setExpirationTime(time())
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        usleep(1000000);
-        $expiredToken = $token->getToken();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $expiredToken);
-        $I->sendGET(Data::$usersUrl . '/' . $record->get('id'));
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Invalid Token (verification)');
-    }
-
-    public function loginKnownUserInvalidToken(ApiTester $I)
-    {
-        $record = $I->addApiUserRecord();
-        $I->deleteHeader('Authorization');
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-
-        $token = $builder
-            ->setIssuer(Data::$testIssuer)
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setIssuedAt(time())
-            ->setNotBefore(time())
-            ->setExpirationTime(time() + 3000)
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        $invalidToken = $token->getToken() . 'xx';
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $invalidToken);
-        $I->sendGET(Data::$usersUrl . '/' . $record->get('id'));
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Invalid Token (verification)');
-    }
-
-    public function loginKnownUserInvalidUserInToken(ApiTester $I)
-    {
-        $record = $I->addApiUserRecord();
-        $I->deleteHeader('Authorization');
-        $I->sendPOST(Data::$loginUrl, Data::loginJson());
-        $I->seeResponseIsSuccessful();
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-
-        $token = $builder
-            ->setIssuer(Data::$testIssuer)
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setIssuedAt(time() - 3600)
-            ->setNotBefore(time() - 3590)
-            ->setExpirationTime(time() + 3000)
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        $invalidToken = $token->getToken();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $invalidToken);
-        $I->sendGET(Data::$usersUrl . '/' . $record->get('id'));
-        $I->seeResponseIsSuccessful();
-        $I->seeErrorJsonResponse('Invalid Token (verification)');
-    }
-
-    public function loginKnownUserCorrectToken(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $I->apiLogin();
-    }
-
-    public function loginKnownUserValidToken(ApiTester $I)
-    {
-        $record = $I->addApiUserRecord();
-        $token  = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$usersUrl . '/' . $record->get('id'));
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::userResponse($record),
-            ]
-        );
-    }
-
-    public function getManyUsers(ApiTester $I)
-    {
-        $userOne = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'status'        => 1,
-                'username'      => Data::$testUsername,
-                'password'      => Data::$testPassword,
-                'issuer'        => Data::$testIssuer,
-                'tokenPassword' => Data::$strongPassphrase,
-                'tokenId'       => Data::$testTokenId,
-            ]
-        );
-
-        $userTwo = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'status'        => 1,
-                'username'      => Data::$testUsername . '1',
-                'password'      => Data::$testPassword . '1',
-                'issuer'        => Data::$testIssuer . '1',
-                'tokenPassword' => Data::$strongPassphrase . '1',
-                'tokenId'       => Data::$testTokenId . '1',
-            ]
-        );
-
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$usersUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-        $I->seeSuccessJsonResponse(
-            'data',
-            [
-                Data::userResponse($userOne),
-                Data::userResponse($userTwo),
-            ]
-        );
-    }
-
-    public function getManyUsersWithNoData(ApiTester $I)
-    {
-        $I->addApiUserRecord();
-        $token = $I->apiLogin();
-
-        $I->haveHttpHeader('Authorization', 'Bearer ' . $token);
-        $I->sendGET(Data::$usersUrl);
-        $I->deleteHeader('Authorization');
-        $I->seeResponseIsSuccessful();
-    }
-}
diff --git a/tests/api/_bootstrap.php b/tests/api/_bootstrap.php
deleted file mode 100644
index 62817a53..00000000
--- a/tests/api/_bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000..1891403f
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the Phalcon API.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Dotenv\Dotenv;
+use Phalcon\Talon\Settings;
+use Phalcon\Talon\Talon;
+
+define('API_TESTS', true);
+
+/**
+ * The suite runs under the CLI SAPI, where there is no request URI.
+ */
+$_SERVER['REQUEST_URI'] = '/';
+
+/**
+ * Registers the application namespaces, pulls in the Composer autoloader and
+ * loads the root .env.
+ */
+require_once dirname(__FILE__, 2) . '/src/Core/autoload.php';
+
+/**
+ * Talon reads DATA_MYSQL_* / DATA_REDIS_*, while the application reads
+ * DATA_API_*. Settings::fromEnv() checks getenv() before $_ENV, so real
+ * container and CI variables win and this file only fills the gaps.
+ */
+Dotenv::createImmutable(dirname(__FILE__), '.env.test')->safeLoad();
+
+Talon::boot(Settings::fromEnv());
diff --git a/tests/cli.suite.yml b/tests/cli.suite.yml
deleted file mode 100644
index b1237338..00000000
--- a/tests/cli.suite.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-actor: CliTester
-modules:
-  enabled:
-    - Asserts
-    - Helper\Cli
-    - Filesystem
-    - Cli
diff --git a/tests/cli/CheckHelpTaskCest.php b/tests/cli/CheckHelpTaskCest.php
deleted file mode 100644
index 7e63e7d7..00000000
--- a/tests/cli/CheckHelpTaskCest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\cli;
-
-use CliTester;
-
-class CheckHelpTaskCest
-{
-    public function checkHelp(CliTester $I)
-    {
-        $I->runShellCommand('./runCli');
-        $I->seeResultCodeIs(0);
-        $I->seeInShellOutput('--help');
-        $I->seeInShellOutput('--clear-cache');
-    }
-}
diff --git a/tests/cli/_bootstrap.php b/tests/cli/_bootstrap.php
deleted file mode 100644
index b3d9bbc7..00000000
--- a/tests/cli/_bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/tests/integration.suite.yml b/tests/integration.suite.yml
deleted file mode 100644
index 540e214d..00000000
--- a/tests/integration.suite.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-actor: IntegrationTester
-modules:
-  enabled:
-    - Asserts
-    - Filesystem
-    - \Helper\Integration
diff --git a/tests/integration/_bootstrap.php b/tests/integration/_bootstrap.php
deleted file mode 100644
index b3d9bbc7..00000000
--- a/tests/integration/_bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/tests/integration/library/ModelCest.php b/tests/integration/library/ModelCest.php
deleted file mode 100644
index 16b6e085..00000000
--- a/tests/integration/library/ModelCest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library;
-
-use Codeception\Stub;
-use Exception;
-use IntegrationTester;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Users;
-use Phalcon\Logger\Logger;
-use Phalcon\Messages\Message;
-
-use function Phalcon\Api\Core\appPath;
-
-/**
- * Class ModelCest
- */
-class ModelCest
-{
-    /**
-     * @param IntegrationTester $I
-     */
-    public function modelGetSetFields(IntegrationTester $I)
-    {
-        $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username'      => 'testusername',
-                'password'      => 'testpass',
-                'status'        => 1,
-                'issuer'        => 'phalcon.io',
-                'tokenPassword' => '12345',
-                'tokenId'       => '00110011',
-            ]
-        );
-    }
-
-    /**
-     * Tests the model by setting a non existent field
-     *
-     * @param IntegrationTester $I
-     */
-    public function modelSetNonExistingFields(IntegrationTester $I)
-    {
-        $I->expectThrowable(
-            ModelException::class,
-            function () {
-                $fixture = new Users();
-                $fixture->set('id', 1000)
-                        ->set('some_field', true)
-                        ->save()
-                ;
-            }
-        );
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @throws ModelException
-     */
-    public function modelGetNonExistingFields(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $user = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username'      => 'testusername',
-                'password'      => 'testpass',
-                'status'        => 1,
-                'issuer'        => 'phalcon.io',
-                'tokenPassword' => '12345',
-                'tokenId'       => '00110011',
-            ]
-        );
-
-        $I->expectThrowable(
-            ModelException::class,
-            function () use ($user) {
-                $user->get('some_field');
-            }
-        );
-    }
-
-    /**
-     * Tests the model update interactions
-     *
-     * @param IntegrationTester $I
-     *
-     * @throws ModelException
-     */
-    public function modelUpdateFields(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $user = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username'      => 'testusername',
-                'password'      => 'testpass',
-                'status'        => 1,
-                'issuer'        => 'phalcon.io',
-                'tokenPassword' => '12345',
-                'tokenId'       => '00110011',
-            ]
-        );
-
-        $user->set('username', 'testusername')
-             ->save()
-        ;
-
-        $I->assertSame($user->get('username'), 'testusername');
-        $I->assertSame($user->get('password'), 'testpass');
-        $I->assertSame($user->get('issuer'), 'phalcon.io');
-        $I->assertSame($user->get('tokenPassword'), '12345');
-        $I->assertSame($user->get('tokenId'), '00110011');
-    }
-
-    /**
-     * @param IntegrationTester $I
-     */
-    public function modelUpdateFieldsNotSanitized(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $user = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username'      => 'testusername',
-                'password'      => 'testpass',
-                'status'        => 1,
-                'issuer'        => 'phalcon.io',
-                'tokenPassword' => '12345',
-                'tokenId'       => '00110011',
-
-            ]
-        );
-
-        $user->set('password', 'abcde\nfg')
-             ->save()
-        ;
-        $I->assertSame($user->get('password'), 'abcde\nfg');
-
-        /** Not sanitized */
-        $user->set('password', 'abcde\nfg', false)
-             ->save()
-        ;
-        $I->assertSame($user->get('password'), 'abcde\nfg');
-    }
-
-    /**
-     * @param IntegrationTester $I
-     */
-    public function checkModelMessages(IntegrationTester $I)
-    {
-        $user = Stub::construct(
-            Users::class,
-            [],
-            [
-                'save'        => false,
-                'getMessages' => [
-                    new Message('error 1'),
-                    new Message('error 2'),
-                ],
-            ]
-        );
-
-        $result = $user
-            ->set('username', 'test')
-            ->save()
-        ;
-        $I->assertFalse($result);
-
-        $I->assertSame('error 1<br />error 2<br />', $user->getModelMessages());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @throws Exception
-     */
-    public function checkModelMessagesWithLogger(IntegrationTester $I)
-    {
-        /** @var Logger $logger */
-        $logger = $I->grabFromDi('logger');
-        $user   = Stub::construct(
-            Users::class,
-            [],
-            [
-                'save'        => false,
-                'getMessages' => [
-                    new Message('error 1'),
-                    new Message('error 2'),
-                ],
-            ]
-        );
-
-        $fileName = appPath('storage/logs/api.log');
-        $result   = $user
-            ->set('username', 'test')
-            ->save()
-        ;
-        $I->assertFalse($result);
-        $I->assertSame('error 1<br />error 2<br />', $user->getModelMessages());
-
-        $user->getModelMessages($logger);
-
-        $I->openFile($fileName);
-        $I->seeInThisFile("error 1\n");
-        $I->seeInThisFile("error 2\n");
-    }
-}
diff --git a/tests/integration/library/Models/IndividualTypesCest.php b/tests/integration/library/Models/IndividualTypesCest.php
deleted file mode 100644
index 1deaae78..00000000
--- a/tests/integration/library/Models/IndividualTypesCest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Models;
-
-use IntegrationTester;
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Models\Individuals;
-use Phalcon\Api\Models\IndividualTypes;
-use Phalcon\Filter\Filter;
-
-class IndividualTypesCest
-{
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
-    {
-        $I->haveModelDefinition(
-            IndividualTypes::class,
-            [
-                'id',
-                'name',
-                'description',
-            ]
-        );
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new IndividualTypes();
-        $expected = [
-            'id'          => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
-    {
-        $actual   = $I->getModelRelationships(IndividualTypes::class);
-        $expected = [
-            [
-                2,
-                'id',
-                Individuals::class,
-                'typeId',
-                ['alias' => Relationships::INDIVIDUALS, 'reusable' => true]
-            ],
-        ];
-        $I->assertSame($expected, $actual);
-    }
-}
diff --git a/tests/integration/library/Models/ProductTypesCest.php b/tests/integration/library/Models/ProductTypesCest.php
deleted file mode 100644
index c425be88..00000000
--- a/tests/integration/library/Models/ProductTypesCest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Models;
-
-use IntegrationTester;
-use Phalcon\Api\Constants\Relationships;
-use Phalcon\Api\Models\Products;
-use Phalcon\Api\Models\ProductTypes;
-use Phalcon\Filter\Filter;
-
-class ProductTypesCest
-{
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
-    {
-        $I->haveModelDefinition(
-            ProductTypes::class,
-            [
-                'id',
-                'name',
-                'description',
-            ]
-        );
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new ProductTypes();
-        $expected = [
-            'id'          => Filter::FILTER_ABSINT,
-            'name'        => Filter::FILTER_STRING,
-            'description' => Filter::FILTER_STRING,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
-    {
-        $actual   = $I->getModelRelationships(ProductTypes::class);
-        $expected = [
-            [
-                2,
-                'id',
-                Products::class,
-                'typeId',
-                ['alias' => Relationships::PRODUCTS, 'reusable' => true]
-            ],
-        ];
-        $I->assertSame($expected, $actual);
-    }
-}
diff --git a/tests/integration/library/Models/UsersCest.php b/tests/integration/library/Models/UsersCest.php
deleted file mode 100644
index b30626d4..00000000
--- a/tests/integration/library/Models/UsersCest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Models;
-
-use IntegrationTester;
-use Page\Data;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Users;
-use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Encryption\Security\JWT\Exceptions\ValidatorException;
-use Phalcon\Filter\Filter;
-use Phalcon\Encryption\Security\JWT\Builder;
-use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-use Phalcon\Encryption\Security\JWT\Validator;
-
-class UsersCest
-{
-    use TokenTrait;
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateModel(IntegrationTester $I)
-    {
-        $I->haveModelDefinition(
-            Users::class,
-            [
-                'id',
-                'status',
-                'username',
-                'password',
-                'issuer',
-                'tokenPassword',
-                'tokenId',
-            ]
-        );
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateFilters(IntegrationTester $I)
-    {
-        $model    = new Users();
-        $expected = [
-            'id'            => Filter::FILTER_ABSINT,
-            'status'        => Filter::FILTER_ABSINT,
-            'username'      => Filter::FILTER_STRING,
-            'password'      => Filter::FILTER_STRING,
-            'issuer'        => Filter::FILTER_STRING,
-            'tokenPassword' => Filter::FILTER_STRING,
-            'tokenId'       => Filter::FILTER_STRING,
-        ];
-        $I->assertSame($expected, $model->getModelFilters());
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     * @throws ModelException
-     * @throws ValidatorException
-     */
-    public function checkValidationData(IntegrationTester $I)
-    {
-        /** @var Users $user */
-        $user = $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username'      => Data::$testUsername,
-                'password'      => Data::$testPassword,
-                'status'        => 1,
-                'issuer'        => 'https://niden.net',
-                'tokenPassword' => Data::$strongPassphrase,
-                'tokenId'       => Data::$testTokenId,
-            ]
-        );
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-        $token   = $builder
-            ->setIssuer('https://niden.net')
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setExpirationTime(time() + 10)
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        $class  = Validator::class;
-        $actual = $user->getValidationData();
-        $I->assertInstanceOf($class, $actual);
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @return void
-     */
-    public function validateRelationships(IntegrationTester $I)
-    {
-        $actual = $I->getModelRelationships(Users::class);
-        $I->assertSame(0, count($actual));
-    }
-}
diff --git a/tests/integration/library/Traits/QueryCest.php b/tests/integration/library/Traits/QueryCest.php
deleted file mode 100644
index cec2ee92..00000000
--- a/tests/integration/library/Traits/QueryCest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Traits;
-
-use IntegrationTester;
-use Page\Data;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Models\Users;
-use Phalcon\Api\Traits\QueryTrait;
-use Phalcon\Api\Traits\TokenTrait;
-use Phalcon\Cache\Cache;
-use Phalcon\Config\Config;
-use Phalcon\Encryption\Security\JWT\Builder;
-use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-
-use function Phalcon\Api\Core\appPath;
-
-class QueryCest
-{
-    use TokenTrait;
-    use QueryTrait;
-
-    /**
-     * @param IntegrationTester $I
-     *
-     */
-    public function checkGetUserByUsernameAndPassword(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username' => Data::$testUsername,
-                'password' => Data::$testPassword,
-                'status'   => 1,
-                'issuer'   => 'phalcon.io',
-                'tokenId'  => Data::$testTokenId,
-            ]
-        );
-
-        /** @var Cache $cache */
-        $cache = $I->grabFromDi('cache');
-        /** @var Config $config */
-        $config = $I->grabFromDi('config');
-        $dbUser = $this->getUserByUsernameAndPassword(
-            $config,
-            $cache,
-            Data::$testUsername,
-            Data::$testPassword
-        );
-
-        $I->assertNotNull($dbUser);
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     */
-    public function checkGetUserByWrongUsernameAndPasswordReturnsNull(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username' => Data::$testUsername,
-                'password' => Data::$testPassword,
-                'status'   => 1,
-                'issuer'   => 'phalcon.io',
-                'tokenId'  => Data::$testTokenId,
-            ]
-        );
-
-        /** @var Cache $cache */
-        $cache = $I->grabFromDi('cache');
-        /** @var Config $config */
-        $config = $I->grabFromDi('config');
-        $dbUser = $this->getUserByUsernameAndPassword(
-            $config,
-            $cache,
-            Data::$testUsername,
-            'nothing'
-        );
-
-        $I->assertNull($dbUser);
-    }
-
-    /**
-     * @param IntegrationTester $I
-     *
-     * @throws ModelException
-     */
-    public function checkGetUserByWrongTokenReturnsNull(IntegrationTester $I)
-    {
-        /** @var Users $result */
-        $I->haveRecordWithFields(
-            Users::class,
-            [
-                'username' => Data::$testUsername,
-                'password' => Data::$testPassword,
-                'status'   => 1,
-                'issuer'   => 'phalcon.io',
-                'tokenId'  => Data::$testTokenId,
-            ]
-        );
-
-        $signer  = new Hmac();
-        $builder = new Builder($signer);
-        $token   = $builder
-            ->setIssuer('https://somedomain.com')
-            ->setAudience($this->getTokenAudience())
-            ->setId(Data::$testTokenId)
-            ->setPassphrase(Data::$strongPassphrase)
-            ->getToken()
-        ;
-
-        /** @var Cache $cache */
-        $cache = $I->grabFromDi('cache');
-        /** @var Config $config */
-        $config = $I->grabFromDi('config');
-        $actual = $this->getUserByToken($config, $cache, $token);
-
-        $I->assertNull($actual);
-    }
-
-    public function getCompaniesCachedData(IntegrationTester $I)
-    {
-        $configData = require appPath('./library/Core/config.php');
-        $I->assertTrue($configData['app']['devMode']);
-
-        $configData['app']['devMode'] = false;
-        /** @var Config $config */
-        $config    = new Config($configData);
-        $container = $I->grabDi();
-        $container->set('config', $config);
-        $I->assertFalse($config->path('app.devMode'));
-
-        /** @var Cache $cache */
-        $cache = $I->grabFromDi('cache');
-        $cache->clear();
-        /** @var Config $config */
-        $config = $I->grabFromDi('config');
-        $I->assertFalse($config->path('app.devMode'));
-
-        /**
-         * Company 1
-         */
-        $comName = uniqid('com-cached-');
-        $comOne  = $I->haveRecordWithFields(
-            Companies::class,
-            [
-                'name'    => $comName,
-                'address' => uniqid(),
-                'city'    => uniqid(),
-                'phone'   => uniqid(),
-            ]
-        );
-
-        $results = $this->getRecords($config, $cache, Companies::class);
-        $I->assertSame(1, count($results));
-        $I->assertSame($comName, $results[0]->get('name'));
-        $I->assertSame($comOne->get('address'), $results[0]->get('address'));
-        $I->assertSame($comOne->get('city'), $results[0]->get('city'));
-        $I->assertSame($comOne->get('phone'), $results[0]->get('phone'));
-
-        /**
-         * Get the record again but ensure the name has been changed
-         */
-        $result = $comOne->set('name', 'com-cached-change')
-                         ->save()
-        ;
-        $I->assertNotEquals(false, $result);
-
-        /**
-         * This should return the cached result
-         */
-        $results = $this->getRecords($config, $cache, Companies::class);
-        $I->assertSame(1, count($results));
-        $I->assertSame($comName, $results[0]->get('name'));
-        $I->assertSame($comOne->get('address'), $results[0]->get('address'));
-        $I->assertSame($comOne->get('city'), $results[0]->get('city'));
-        $I->assertSame($comOne->get('phone'), $results[0]->get('phone'));
-    }
-}
diff --git a/tests/integration/library/Transformers/BaseTransformerCest.php b/tests/integration/library/Transformers/BaseTransformerCest.php
deleted file mode 100644
index 48e8a685..00000000
--- a/tests/integration/library/Transformers/BaseTransformerCest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Transformers;
-
-use IntegrationTester;
-use Phalcon\Api\Exception\ModelException;
-use Phalcon\Api\Models\Companies;
-use Phalcon\Api\Transformers\BaseTransformer;
-
-class BaseTransformerCest
-{
-    /**
-     * @param IntegrationTester $I
-     *
-     * @throws ModelException
-     */
-    public function checkTransformer(IntegrationTester $I)
-    {
-        /** @var Companies $company */
-        $company = $I->haveRecordWithFields(
-            Companies::class,
-            [
-                'name'    => 'acme',
-                'address' => '123 Phalcon way',
-                'city'    => 'World',
-                'phone'   => '555-999-4444',
-            ]
-        );
-
-        $transformer = new BaseTransformer();
-        $expected    = [
-            'id'      => $company->get('id'),
-            'name'    => $company->get('name'),
-            'address' => $company->get('address'),
-            'city'    => $company->get('city'),
-            'phone'   => $company->get('phone'),
-        ];
-
-        $I->assertSame($expected, $transformer->transform($company));
-    }
-}
diff --git a/tests/integration/library/Validation/CompaniesValidatorCest.php b/tests/integration/library/Validation/CompaniesValidatorCest.php
deleted file mode 100644
index 9b5c2720..00000000
--- a/tests/integration/library/Validation/CompaniesValidatorCest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\integration\library\Transformers;
-
-use IntegrationTester;
-use Phalcon\Api\Validation\CompaniesValidator;
-
-class CompaniesValidatorCest
-{
-    /**
-     * @param IntegrationTester $I
-     */
-    public function checkTransformer(IntegrationTester $I)
-    {
-        $validation = new CompaniesValidator();
-        $_POST      = [
-            'name'    => '',
-            'address' => '123 Phalcon way',
-            'city'    => 'World',
-            'phone'   => '555-999-4444',
-        ];
-        $messages   = $validation->validate($_POST);
-        $I->assertSame(1, count($messages));
-        $I->assertSame('The company name is required', $messages[0]->getMessage());
-    }
-}
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
deleted file mode 100644
index 7ae98b2e..00000000
--- a/tests/unit.suite.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for unit or integration tests.
-
-actor: UnitTester
-modules:
-  enabled:
-    - Asserts
-    - Filesystem
-    - Helper\Unit
diff --git a/tests/unit/BootstrapCest.php b/tests/unit/BootstrapCest.php
deleted file mode 100644
index 565383e9..00000000
--- a/tests/unit/BootstrapCest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit;
-
-use CliTester;
-use Codeception\Util\HttpCode;
-
-use function Phalcon\Api\Core\appPath;
-
-class BootstrapCest
-{
-    public function checkBootstrap(CliTester $I)
-    {
-        ob_start();
-        require appPath('api/public/index.php');
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $results = json_decode($actual, true);
-        $I->assertSame('1.0', $results['jsonapi']['version']);
-        $I->assertTrue(empty($results['data']));
-        $I->assertSame(HttpCode::getDescription(404), $results['errors'][0]);
-    }
-}
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
deleted file mode 100644
index 62817a53..00000000
--- a/tests/unit/_bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/unit/cli/ClearCacheCest.php b/tests/unit/cli/ClearCacheCest.php
deleted file mode 100755
index 2326de6e..00000000
--- a/tests/unit/cli/ClearCacheCest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\cli;
-
-use FilesystemIterator;
-use Phalcon\Api\Cli\Tasks\ClearcacheTask;
-use Phalcon\Api\Providers\CacheDataProvider;
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Di\FactoryDefault\Cli;
-use UnitTester;
-
-use function fclose;
-use function iterator_count;
-use function ob_end_clean;
-use function ob_get_contents;
-use function ob_start;
-use function Phalcon\Api\Core\appPath;
-use function uniqid;
-
-class ClearCacheCest
-{
-    public function checkClearCache(UnitTester $I)
-    {
-        require appPath('vendor/autoload.php');
-
-        $path      = appPath('/storage/cache/data');
-        $container = new Cli();
-        $config    = new ConfigProvider();
-        $config->register($container);
-        $cache = new CacheDataProvider();
-        $cache->register($container);
-        $task = new ClearcacheTask();
-        $task->setDI($container);
-
-        $iterator = new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS);
-        $count    = iterator_count($iterator);
-
-        $this->createFile();
-        $this->createFile();
-        $this->createFile();
-        $this->createFile();
-
-        $iterator = new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS);
-        $I->assertSame($count + 4, iterator_count($iterator));
-
-        ob_start();
-        $task->mainAction();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertGreaterOrEquals(0, strpos($actual, 'Clearing Cache folders'));
-        $I->assertGreaterOrEquals(0, strpos($actual, 'Cleared Cache folders'));
-
-        $iterator = new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS);
-        $I->assertSame(1, iterator_count($iterator));
-    }
-
-    private function createFile()
-    {
-        $name    = appPath('/storage/cache/data/') . uniqid('tmp_') . '.cache';
-        $pointer = fopen($name, 'wb');
-        fwrite($pointer, 'test');
-        fclose($pointer);
-    }
-}
diff --git a/tests/unit/config/AutoloaderCest.php b/tests/unit/config/AutoloaderCest.php
deleted file mode 100755
index 998f7ca0..00000000
--- a/tests/unit/config/AutoloaderCest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\config;
-
-use Phalcon\Api\Http\Response;
-use UnitTester;
-
-use function function_exists;
-use function Phalcon\Api\Core\appPath;
-
-class AutoloaderCest
-{
-    public function checkDotenvVariables(UnitTester $I)
-    {
-        require appPath('library/Core/autoload.php');
-
-        $I->assertNotEquals(false, $_ENV['APP_DEBUG']);
-        $I->assertNotEquals(false, $_ENV['APP_ENV']);
-        $I->assertNotEquals(false, $_ENV['APP_URL']);
-        $I->assertNotEquals(false, $_ENV['APP_NAME']);
-        $I->assertNotEquals(false, $_ENV['APP_BASE_URI']);
-        $I->assertNotEquals(false, $_ENV['APP_SUPPORT_EMAIL']);
-        $I->assertNotEquals(false, $_ENV['APP_TIMEZONE']);
-        $I->assertNotEquals(false, $_ENV['CACHE_PREFIX']);
-        $I->assertNotEquals(false, $_ENV['CACHE_LIFETIME']);
-        $I->assertNotEquals(false, $_ENV['DATA_API_MYSQL_NAME']);
-        $I->assertNotEquals(false, $_ENV['LOGGER_DEFAULT_FILENAME']);
-        $I->assertNotEquals(false, $_ENV['VERSION']);
-
-        $I->assertSame('true', $_ENV['APP_DEBUG']);
-        $I->assertSame('development', $_ENV['APP_ENV']);
-        $I->assertSame('http://api.phalcon.ld', $_ENV['APP_URL']);
-        $I->assertSame('/', $_ENV['APP_BASE_URI']);
-        $I->assertSame('team@phalcon.io', $_ENV['APP_SUPPORT_EMAIL']);
-        $I->assertSame('UTC', $_ENV['APP_TIMEZONE']);
-        $I->assertSame('api_cache_', $_ENV['CACHE_PREFIX']);
-        $I->assertSame('86400', $_ENV['CACHE_LIFETIME']);
-        $I->assertSame('api', $_ENV['LOGGER_DEFAULT_FILENAME']);
-        $I->assertSame('20180401', $_ENV['VERSION']);
-    }
-
-    public function checkAutoloader(UnitTester $I)
-    {
-        require appPath('library/Core/autoload.php');
-
-        $class = new Response();
-        $I->assertTrue($class instanceof Response);
-        $I->assertTrue(function_exists('Phalcon\Api\Core\envValue'));
-    }
-}
diff --git a/tests/unit/config/ConfigCest.php b/tests/unit/config/ConfigCest.php
deleted file mode 100755
index 5cec3af1..00000000
--- a/tests/unit/config/ConfigCest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\config;
-
-use UnitTester;
-
-use function is_array;
-use function Phalcon\Api\Core\appPath;
-
-class ConfigCest
-{
-    public function checkConfig(UnitTester $I)
-    {
-        $config = require(appPath('library/Core/config.php'));
-
-        $I->assertTrue(is_array($config));
-        $I->assertTrue(isset($config['app']));
-        $I->assertTrue(isset($config['cache']));
-    }
-}
diff --git a/tests/unit/config/FunctionsCest.php b/tests/unit/config/FunctionsCest.php
deleted file mode 100755
index 0dde1e6c..00000000
--- a/tests/unit/config/FunctionsCest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\config;
-
-use Phalcon\Api\Constants\Relationships;
-use UnitTester;
-
-use function Phalcon\Api\Core\appPath;
-use function Phalcon\Api\Core\appUrl;
-use function Phalcon\Api\Core\envValue;
-
-class FunctionsCest
-{
-    private array $store;
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function __before(UnitTester $I)
-    {
-        $this->store = $_ENV ?? [];
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function __after(UnitTester $I)
-    {
-        $_ENV = $this->store;
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkApppath(UnitTester $I)
-    {
-        $path = dirname(dirname(dirname(__DIR__)));
-        $I->assertSame($path, appPath());
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkApppathWithParameter(UnitTester $I)
-    {
-        $path = dirname(dirname(dirname(__DIR__))) . '/library/Core/config.php';
-        $I->assertSame($path, appPath('library/Core/config.php'));
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkEnvvalueAsFalse(UnitTester $I)
-    {
-        $_ENV['SOMEVAL'] = false;
-        $I->assertFalse(envValue('SOMEVAL'));
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkEnvvalueAsTrue(UnitTester $I)
-    {
-        $_ENV['SOMEVAL'] = true;
-        $I->assertTrue(envValue('SOMEVAL'));
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkEnvvalueWithValue(UnitTester $I)
-    {
-        $_ENV['SOMEVAL'] = 'someval';
-        $I->assertSame('someval', envValue('SOMEVAL'));
-    }
-
-    /**
-     * @param UnitTester $I
-     *
-     * @return void
-     */
-    public function checkEnvurlWithUrl(UnitTester $I)
-    {
-        $I->assertSame(
-            'http://api.phalcon.ld/companies/1',
-            appUrl(Relationships::COMPANIES, 1)
-        );
-    }
-}
diff --git a/tests/unit/config/ProvidersCest.php b/tests/unit/config/ProvidersCest.php
deleted file mode 100755
index 401b6e12..00000000
--- a/tests/unit/config/ProvidersCest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\config;
-
-use Phalcon\Api\Providers\CliDispatcherProvider;
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\DatabaseProvider;
-use Phalcon\Api\Providers\ErrorHandlerProvider;
-use Phalcon\Api\Providers\LoggerProvider;
-use Phalcon\Api\Providers\ModelsMetadataProvider;
-use Phalcon\Api\Providers\RequestProvider;
-use Phalcon\Api\Providers\ResponseProvider;
-use Phalcon\Api\Providers\RouterProvider;
-use UnitTester;
-
-use function Phalcon\Api\Core\appPath;
-
-class ProvidersCest
-{
-    public function checkApiProviders(UnitTester $I)
-    {
-        $providers = require(appPath('api/config/providers.php'));
-
-        $I->assertSame(ConfigProvider::class, $providers[0]);
-        $I->assertSame(LoggerProvider::class, $providers[1]);
-        $I->assertSame(ErrorHandlerProvider::class, $providers[2]);
-        $I->assertSame(DatabaseProvider::class, $providers[3]);
-        $I->assertSame(ModelsMetadataProvider::class, $providers[4]);
-        $I->assertSame(RequestProvider::class, $providers[5]);
-        $I->assertSame(ResponseProvider::class, $providers[6]);
-        $I->assertSame(RouterProvider::class, $providers[7]);
-    }
-
-    public function checkCliProviders(UnitTester $I)
-    {
-        $providers = require(appPath('cli/config/providers.php'));
-
-        $I->assertSame(ConfigProvider::class, $providers[0]);
-        $I->assertSame(LoggerProvider::class, $providers[1]);
-        $I->assertSame(ErrorHandlerProvider::class, $providers[2]);
-        $I->assertSame(DatabaseProvider::class, $providers[3]);
-        $I->assertSame(ModelsMetadataProvider::class, $providers[4]);
-        $I->assertSame(CliDispatcherProvider::class, $providers[5]);
-    }
-}
diff --git a/tests/unit/library/BootstrapCest.php b/tests/unit/library/BootstrapCest.php
deleted file mode 100755
index 0c155ff8..00000000
--- a/tests/unit/library/BootstrapCest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library;
-
-use Phalcon\Api\Bootstrap\Api;
-use Phalcon\Api\Http\Response;
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Mvc\Micro;
-use UnitTester;
-
-class BootstrapCest
-{
-    public function checkBootstrap(UnitTester $I)
-    {
-        $bootstrap = new Api();
-
-        $I->assertTrue($bootstrap->getContainer() instanceof FactoryDefault);
-        $I->assertTrue($bootstrap->getResponse() instanceof Response);
-        $I->assertTrue($bootstrap->getApplication() instanceof Micro);
-    }
-}
diff --git a/tests/unit/library/Constants/FlagsCest.php b/tests/unit/library/Constants/FlagsCest.php
deleted file mode 100644
index ef32ae64..00000000
--- a/tests/unit/library/Constants/FlagsCest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Constants;
-
-use CliTester;
-use Phalcon\Api\Constants\Flags;
-
-class FlagsCest
-{
-    public function checkConstants(CliTester $I)
-    {
-        $I->assertSame(1, Flags::ACTIVE);
-        $I->assertSame(2, Flags::INACTIVE);
-    }
-}
diff --git a/tests/unit/library/Constants/RelationshipsCest.php b/tests/unit/library/Constants/RelationshipsCest.php
deleted file mode 100644
index 7830a634..00000000
--- a/tests/unit/library/Constants/RelationshipsCest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Constants;
-
-use CliTester;
-use Phalcon\Api\Constants\Relationships;
-
-class RelationshipsCest
-{
-    public function checkConstants(CliTester $I)
-    {
-        $I->assertSame('companies', Relationships::COMPANIES);
-        $I->assertSame('individual-types', Relationships::INDIVIDUAL_TYPES);
-        $I->assertSame('individuals', Relationships::INDIVIDUALS);
-        $I->assertSame('product-types', Relationships::PRODUCT_TYPES);
-        $I->assertSame('products', Relationships::PRODUCTS);
-        $I->assertSame('users', Relationships::USERS);
-    }
-}
diff --git a/tests/unit/library/ErrorHandlerCest.php b/tests/unit/library/ErrorHandlerCest.php
deleted file mode 100755
index 45452ad7..00000000
--- a/tests/unit/library/ErrorHandlerCest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library;
-
-use Phalcon\Api\ErrorHandler;
-use Phalcon\Api\Logger;
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\LoggerProvider;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-use function Phalcon\Api\Core\appPath;
-
-class ErrorHandlerCest
-{
-    public function logErrorOnError(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-        $provider = new LoggerProvider();
-        $provider->register($diContainer);
-
-        /** @var Config $config */
-        $config = $diContainer->getShared('config');
-        /** @var Logger $logger */
-        $logger  = $diContainer->getShared('logger');
-        $handler = new ErrorHandler($logger, $config);
-
-        $handler->handle(1, 'test error', 'file.php', 4);
-        $fileName = appPath('storage/logs/api.log');
-        $I->openFile($fileName);
-        $expected = '[ERROR] [#:1]-[L: 4] : test error (file.php)';
-        $I->seeInThisFile($expected);
-    }
-
-    public function logErrorOnShutdown(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-        $provider = new LoggerProvider();
-        $provider->register($diContainer);
-
-        /** @var Config $config */
-        $config = $diContainer->getShared('config');
-        /** @var Logger $logger */
-        $logger  = $diContainer->getShared('logger');
-        $handler = new ErrorHandler($logger, $config);
-
-        $handler->shutdown();
-        $fileName = appPath('storage/logs/api.log');
-        $I->openFile($fileName);
-        $expected = '[INFO] Shutdown completed';
-        $I->seeInThisFile($expected);
-    }
-}
diff --git a/tests/unit/library/Http/ResponseCest.php b/tests/unit/library/Http/ResponseCest.php
deleted file mode 100755
index 5d9c6764..00000000
--- a/tests/unit/library/Http/ResponseCest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Http;
-
-use Phalcon\Api\Http\Response;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
-use UnitTester;
-
-use function is_string;
-use function json_decode;
-
-class ResponseCest
-{
-    public function checkResponseWithStringPayload(UnitTester $I)
-    {
-        $response = new Response();
-
-        $response
-            ->setPayloadSuccess('test')
-        ;
-
-        $contents = $response->getContent();
-        $I->assertTrue(is_string($contents));
-
-        $payload = $this->checkPayload($I, $response);
-
-        $I->assertFalse(isset($payload['errors']));
-        $I->assertSame('test', $payload['data']);
-    }
-
-    private function checkPayload(UnitTester $I, Response $response, bool $error = false): array
-    {
-        $contents = $response->getContent();
-        $I->assertTrue(is_string($contents));
-
-        $payload = json_decode($contents, true);
-        if (true === $error) {
-            $I->assertTrue(isset($payload['errors']));
-        } else {
-            $I->assertTrue(isset($payload['data']));
-        }
-
-        return $payload;
-    }
-
-    public function checkResponseWithArrayPayload(UnitTester $I)
-    {
-        $response = new Response();
-
-        $response
-            ->setPayloadSuccess(['a' => 'b'])
-        ;
-
-        $payload = $this->checkPayload($I, $response);
-
-        $I->assertFalse(isset($payload['errors']));
-        $I->assertSame(['a' => 'b'], $payload['data']);
-    }
-
-    public function checkResponseWithErrorCode(UnitTester $I)
-    {
-        $response = new Response();
-
-        $response
-            ->setPayloadError('error content')
-        ;
-
-        $payload = $this->checkPayload($I, $response, true);
-
-        $I->assertFalse(isset($payload['data']));
-        $I->assertSame('error content', $payload['errors'][0]);
-    }
-
-    public function checkResponseWithModelErrors(UnitTester $I)
-    {
-        $messages = [
-            new Message('hello'),
-            new Message('goodbye'),
-        ];
-        $response = new Response();
-        $response
-            ->setPayloadErrors($messages)
-        ;
-
-        $payload = $this->checkPayload($I, $response, true);
-
-        $I->assertFalse(isset($payload['data']));
-        $I->assertSame(2, count($payload['errors']));
-        $I->assertSame('hello', $payload['errors'][0]);
-        $I->assertSame('goodbye', $payload['errors'][1]);
-    }
-
-    public function checkResponseWithValidationErrors(UnitTester $I)
-    {
-        $group   = new Messages();
-        $message = new Message('hello');
-        $group->appendMessage($message);
-        $message = new Message('goodbye');
-        $group->appendMessage($message);
-
-        $response = new Response();
-        $response
-            ->setPayloadErrors($group)
-        ;
-
-        $payload = $this->checkPayload($I, $response, true);
-
-        $I->assertFalse(isset($payload['data']));
-        $I->assertSame(2, count($payload['errors']));
-        $I->assertSame('hello', $payload['errors'][0]);
-        $I->assertSame('goodbye', $payload['errors'][1]);
-    }
-
-    public function checkHttpCodes(UnitTester $I)
-    {
-        $response = new Response();
-        $I->assertSame('200 (OK)', $response->getHttpCodeDescription($response::OK));
-        $I->assertSame('301 (Moved Permanently)', $response->getHttpCodeDescription($response::MOVED_PERMANENTLY));
-        $I->assertSame('302 (Found)', $response->getHttpCodeDescription($response::FOUND));
-        $I->assertSame('307 (Temporary Redirect)', $response->getHttpCodeDescription($response::TEMPORARY_REDIRECT));
-        $I->assertSame('308 (Permanent Redirect)', $response->getHttpCodeDescription($response::PERMANENTLY_REDIRECT));
-        $I->assertSame('400 (Bad Request)', $response->getHttpCodeDescription($response::BAD_REQUEST));
-        $I->assertSame('401 (Unauthorized)', $response->getHttpCodeDescription($response::UNAUTHORIZED));
-        $I->assertSame('403 (Forbidden)', $response->getHttpCodeDescription($response::FORBIDDEN));
-        $I->assertSame('404 (Not Found)', $response->getHttpCodeDescription($response::NOT_FOUND));
-        $I->assertSame('500 (Internal Server Error)', $response->getHttpCodeDescription($response::INTERNAL_SERVER_ERROR));
-        $I->assertSame('501 (Not Implemented)', $response->getHttpCodeDescription($response::NOT_IMPLEMENTED));
-        $I->assertSame('502 (Bad Gateway)', $response->getHttpCodeDescription($response::BAD_GATEWAY));
-        $I->assertSame('999 (Undefined code)', $response->getHttpCodeDescription(999));
-    }
-}
diff --git a/tests/unit/library/Providers/CacheCest.php b/tests/unit/library/Providers/CacheCest.php
deleted file mode 100644
index fbe4c460..00000000
--- a/tests/unit/library/Providers/CacheCest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\CacheDataProvider;
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Cache\Cache;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-class CacheCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $config      = new ConfigProvider();
-        $config->register($diContainer);
-        $provider = new CacheDataProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('cache'));
-        /** @var Cache $cache */
-        $cache = $diContainer->getShared('cache');
-        $I->assertTrue($cache instanceof Cache);
-    }
-}
diff --git a/tests/unit/library/Providers/ConfigCest.php b/tests/unit/library/Providers/ConfigCest.php
deleted file mode 100644
index 04604f25..00000000
--- a/tests/unit/library/Providers/ConfigCest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Config\Config;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-class ConfigCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('config'));
-        $config = $diContainer->getShared('config');
-        $I->assertTrue($config instanceof Config);
-
-        $configArray = $config->toArray();
-        $I->assertTrue(isset($configArray['app']['version']));
-        $I->assertTrue(isset($configArray['app']['timezone']));
-        $I->assertTrue(isset($configArray['app']['debug']));
-        $I->assertTrue(isset($configArray['app']['env']));
-        $I->assertTrue(isset($configArray['app']['devMode']));
-        $I->assertTrue(isset($configArray['app']['baseUri']));
-        $I->assertTrue(isset($configArray['app']['supportEmail']));
-        $I->assertTrue(isset($configArray['app']['time']));
-        $I->assertTrue(isset($configArray['cache']));
-    }
-}
diff --git a/tests/unit/library/Providers/DatabaseCest.php b/tests/unit/library/Providers/DatabaseCest.php
deleted file mode 100644
index aa933d39..00000000
--- a/tests/unit/library/Providers/DatabaseCest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\DatabaseProvider;
-use Phalcon\Db\Adapter\Pdo\Mysql;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-class DatabaseCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-        $provider = new DatabaseProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('db'));
-        /** @var Mysql $db */
-        $db = $diContainer->getShared('db');
-        $I->assertTrue($db instanceof Mysql);
-        $I->assertSame('mysql', $db->getType());
-    }
-}
diff --git a/tests/unit/library/Providers/ErrorHandlerCest.php b/tests/unit/library/Providers/ErrorHandlerCest.php
deleted file mode 100644
index 1992e7c9..00000000
--- a/tests/unit/library/Providers/ErrorHandlerCest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\ErrorHandlerProvider;
-use Phalcon\Api\Providers\LoggerProvider;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-use function date_default_timezone_get;
-
-class ErrorHandlerCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-        $provider = new LoggerProvider();
-        $provider->register($diContainer);
-        $provider = new ErrorHandlerProvider();
-        $provider->register($diContainer);
-
-        $config = $diContainer->getShared('config');
-
-        $I->assertSame(date_default_timezone_get(), $config->path('app.timezone'));
-        $I->assertSame(ini_get('display_errors'), 'Off');
-        $I->assertSame(E_ALL, (int) ini_get('error_reporting'));
-    }
-}
diff --git a/tests/unit/library/Providers/LoggerCest.php b/tests/unit/library/Providers/LoggerCest.php
deleted file mode 100644
index 96f19d11..00000000
--- a/tests/unit/library/Providers/LoggerCest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\LoggerProvider;
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Logger\Logger;
-use UnitTester;
-
-class LoggerCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ConfigProvider();
-        $provider->register($diContainer);
-        $provider = new LoggerProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('logger'));
-        /** @var Logger $logger */
-        $logger = $diContainer->getShared('logger');
-        $I->assertTrue($logger instanceof Logger);
-        $I->assertSame('api', $logger->getName());
-    }
-}
diff --git a/tests/unit/library/Providers/ModelsMetadataCest.php b/tests/unit/library/Providers/ModelsMetadataCest.php
deleted file mode 100644
index 406d8584..00000000
--- a/tests/unit/library/Providers/ModelsMetadataCest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Providers\ConfigProvider;
-use Phalcon\Api\Providers\ModelsMetadataProvider;
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Mvc\Model\MetaData\Memory;
-use UnitTester;
-
-class ModelsMetadataCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $config      = new ConfigProvider();
-        $config->register($diContainer);
-        $provider = new ModelsMetadataProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('modelsMetadata'));
-        /** @var Memory $metadata */
-        $metadata = $diContainer->getShared('modelsMetadata');
-        $I->assertTrue($metadata instanceof Memory);
-    }
-}
diff --git a/tests/unit/library/Providers/ResponseCest.php b/tests/unit/library/Providers/ResponseCest.php
deleted file mode 100644
index 658c8af3..00000000
--- a/tests/unit/library/Providers/ResponseCest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Phalcon\Api\Tests\unit\library\Providers;
-
-use Phalcon\Api\Http\Response;
-use Phalcon\Api\Providers\ResponseProvider;
-use Phalcon\Di\FactoryDefault;
-use UnitTester;
-
-class ResponseCest
-{
-    /**
-     * @param UnitTester $I
-     */
-    public function checkRegistration(UnitTester $I)
-    {
-        $diContainer = new FactoryDefault();
-        $provider    = new ResponseProvider();
-        $provider->register($diContainer);
-
-        $I->assertTrue($diContainer->has('response'));
-        /** @var Response $response */
-        $response = $diContainer->getShared('response');
-        $I->assertTrue($response instanceof Response);
-    }
-}