Maintaining php8.4 + remplacing Codeception to PHPUnit

.gitattributes

@@ -0,0 +1,9 @@
+/.github export-ignore
+/docker export-ignore
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/docker-compose.yml export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore

.github/workflows/tests.yml

@@ -7,7 +7,6 @@ jobs:
     name: PHP ${{ matrix.php-versions }}
 
     runs-on: ubuntu-latest
-    container: ubuntu
 
     services:
       mailpit:
@@ -17,15 +16,17 @@ jobs:
           - 8025:8025
 
     env:
-      extensions: mbstring, intl, json, xdebug, phalcon-5.2.1
+      extensions: mbstring, intl, json, xdebug, phalcon-5.9.3
       key: cache-v0.0.2
 
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup cache environment
         id: cache-env
@@ -36,7 +37,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -54,7 +55,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -65,8 +66,8 @@ jobs:
 
       - name: Setup Tests
         run: |
-          cp tests/_ci/.env.default .env
-          vendor/bin/codecept build
+          cp .env.default .env
+          sed -i "s/DATA_MAILPIT_HOST_URI='mailpit'/DATA_MAILPIT_HOST_URI='localhost'/" .env
 
       - name: Install Mailpit and create a symbolic link to sendmail command
         run: |
@@ -75,11 +76,11 @@ jobs:
 
       - name: Run test suites
         if: success()
-        run: vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php-versions }}.xml
+        run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover coverage-${{ matrix.php-versions }}.xml
 
       - name: Upload coverage to Codecov
         if: success()
         uses: codecov/codecov-action@v1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
-          file: ./tests/_output/coverage-*.xml
+          file: ./tests/_output/coverage-*.xml

.github/workflows/validations.yml

@@ -5,7 +5,7 @@ jobs:
     name: PSR-12 Code style
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -15,7 +15,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -31,17 +31,19 @@ jobs:
     name: Static Code with PHP ${{ matrix.php-versions }}
     runs-on: ubuntu-latest
     env:
-      extensions: mbstring, intl, json, phalcon-5.2.1
+      extensions: mbstring, intl, json, phalcon-5.9.3
       key: cache-v0.0.2
     needs: validate-code-style
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup cache environment
         id: cache-env
@@ -52,7 +54,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -70,7 +72,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -79,10 +81,6 @@ jobs:
       - name: Install Composer dependencies
         run: composer require --prefer-dist
 
-      - name: Run Psalm
-        if: always()
-        run: vendor/bin/psalm --show-info=false
-
       - name: Run PHPStan
         if: always()
-        run: vendor/bin/phpstan analyse -l 5 src
+        run: vendor/bin/phpstan analyse -l 5 src

.gitignore

@@ -1,7 +1,4 @@
-composer.phar
 /vendor/
 .env
-
-# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
+tests/fixtures/views/mail/*.volt.php
+.phpunit.cache

composer.json

@@ -29,23 +29,20 @@
         "forum": "https://forum.phalcon.io"
     },
     "require": {
-        "php": ">=7.4",
-        "ext-phalcon": "^5.0",
-        "ext-json": "*",
+        "php": ">=8.1",
+        "ext-phalcon": "^5.9.3",
         "phpmailer/phpmailer": "^6.7"
     },
     "require-dev": {
-        "phalcon/ide-stubs": "^5.0",
+        "phalcon/ide-stubs": "^5.9.3",
         "vlucas/phpdotenv": "^5.5",
-        "codeception/codeception": "^4.2",
-        "codeception/module-asserts": "^2.0",
-        "vimeo/psalm": "^5.9",
         "phpstan/phpstan": "^1.10",
-        "squizlabs/php_codesniffer": "^3.7"
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpunit/phpunit": "^10.5"
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.1.32"
         }
     },
     "autoload": {
@@ -55,8 +52,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Phalcon\\Incubator\\Mailer\\Tests\\Unit\\": "tests/unit/",
-            "Phalcon\\Incubator\\Mailer\\Tests\\Functional\\": "tests/functional/"
+            "Phalcon\\Incubator\\Mailer\\Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev",
@@ -71,8 +67,7 @@
             "codeception.yml",
             "phpcs.xml.dist",
             "phpstan.neon.dist",
-            "phpunit.xml.dist",
-            "psalm.xml.dist"
+            "phpunit.xml.dist"
         ]
     }
 }