Merge pull request #4 from niden/master

Rework of tests; new interface

Author: niden

Diff for: .github/workflows/main.yml

@@ -19,7 +19,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.0.2
+  PHALCON_VERSION: 5.6.0
 
   # For tests
   LANG: en_US.UTF-8
@@ -28,82 +28,134 @@ env:
 
   # PHP extensions required by Composer
   # (adding phalcon version here until I figure out how to use the variable above)
-  EXTENSIONS: apcu, gettext, gd, igbinary, imagick, intl, json, mbstring, msgpack, memcached, phalcon-5.0.2, sqlite3, yaml, redis, :memcache
+  EXTENSIONS: apcu, phalcon-5.6.0
 
 jobs:
-  phpcs:
-    name: Validate Tests code style
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
 
-    runs-on: ubuntu-20.04
+# Quality Tools
+  quality:
+    name: Quality Tests
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+#      - uses: php-actions/composer@v6
 
-      - name: Run PHP_CodeSniffer
+      - name: Run PHP CodeSniffer
         run: docker run --rm -v $(pwd):/data cytopia/phpcs --standard=./phpcs.xml
 
+#      - name: Get PHPStan PHAR
+#        run: |
+#          curl --silent -H "User-agent: cURL (https://github.com/php-actions)" -L \
+#          "https://www.getrelease.download/phpstan/phpstan/1.8.11/phar" > custom-phpstan.phar
+#
+#      - name: Run PHPStan
+#        uses: php-actions/phpstan@v3
+#        with:
+#          php_version: 8.0
+#          path: src/
+#          vendored_phpstan_path: custom-phpstan.phar
+#          level: max
+#          autoload_file: ./vendor/autoload.php
+
+# Running Tests
   build-and-test:
     name: tests / PHP-${{ matrix.php }}
-
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1' ]
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup platform specific environment
-        shell: pwsh
-        run: |
-          git config --global core.autocrlf false
-          $SessionSavePath = '/tmp' 
-          Write-Output "SESSION_SAVE_PATH=$SessionSavePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.EXTENSIONS }}
           ini-values: apc.enable_cli=on, session.save_path=${{ env.SESSION_SAVE_PATH }}
-          tools: pecl, phpize, php-config, composer:v2
+          tools: pecl, composer:v2
           coverage: xdebug
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Validate composer
+      - name: "Validate composer"
         run: composer validate --no-check-all --no-check-publish
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
+      - name: "Install development dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          composer-options: "--prefer-dist"
+
+      - name: Run Unit Tests
+        if: always()
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          vendor/bin/phpunit tests/unit --testdox --process-isolation -v 
+
+
+# Qodana
+  qodana:
+    name: Qodana
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
 
-      - name: Setup Composer Cache
-        uses: actions/cache@v2
+    steps:
+      - uses: actions/checkout@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
 
-      - run: composer install --prefer-dist
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          extensions: ${{ env.EXTENSIONS }}
+          ini-values: apc.enable_cli=on, session.save_path=${{ env.SESSION_SAVE_PATH }}
+          tools: pecl, composer:v2
+          coverage: xdebug
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup Tests
-        shell: bash
-        run: |
-          cp tests/_config/.env.default .env
-          vendor/bin/codecept build
-#          php tests/_config/generate-db-schemas.php
+      - name: "Validate composer"
+        run: composer validate --no-check-all --no-check-publish
+
+      - name: "Install development dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          composer-options: "--prefer-dist"
 
       - name: Run Unit Tests
         if: always()
-        run: vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php }}.xml --ext DotReporter unit
+        run: |
+          vendor/bin/phpunit tests/unit \
+            --process-isolation \
+            -v \
+            --coverage-php tests/support/output/coverage.xml
 
-      - name: Upload coverage to Codecov
-        if: success()
-        uses: codecov/codecov-action@v3
+      - name: 'Qodana Scan'
+        uses: JetBrains/[email protected]
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
         with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          directory: ./tests/_output/
-          files: coverage-7.4.xml,coverage-8.0.xml,coverage-8.1.xml
+          args: --baseline,qodana.sarif.json
+
+      - name: "Upload to Qodana"
+        run: |
+          docker run \
+            -v $(pwd):/data/project/ \
+            -v ./tests/support/output/:/data/coverage \
+            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
+            jetbrains/qodana-php

Diff for: .gitignore

@@ -1 +1,3 @@
-/vendor
+/vendor
+/tests/support/output/
+.env

Diff for: CODE_OF_CONDUCT.md

@@ -20,6 +20,6 @@ disagree.
 
 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 [[email protected]](mailto:[email protected])
+server, or you can email us at [[email protected]](mailto:[email protected])
 
 The core team maintains the final decision on any conflict that may arise.

Diff for: README.md

@@ -1,6 +1,7 @@
 # Phalcon Framework - Proxy PSR-3
 
-[![Phalcon CI][actions_badge]](https://github.com/phalcon/proxy-psr3/actions/workflows/main.yml) [![codecov][codecov_badge]](https://codecov.io/gh/phalcon/proxy-psr3)
+[![PDS Skeleton][pds_skeleton]](https://github.com/php-pds/skeleton)
+[![Phalcon CI][actions_badge]](https://github.com/phalcon/proxy-psr3/actions/workflows/main.yml)
 
 Phalcon is an open source web framework delivered as a C extension for the PHP language providing high performance and lower resource consumption.
 
@@ -36,5 +37,5 @@ composer require phalcon/proxy-psr3
 <!-- External links should be here -->
 [actions_badge]: https://github.com/phalcon/proxy-psr3/actions/workflows/main.yml/badge.svg
 [codecov_badge]: https://codecov.io/gh/phalcon/proxy-psr3/branch/master/graph/badge.svg?token=J2WQtnpAyT
-
-[discord-badge]:            https://img.shields.io/discord/310910488152375297?label=Discord&logo=discord&style=flat-square
+[pds_skeleton]: https://img.shields.io/badge/pds-skeleton-blue.svg?style=flat-square
+[discord-badge]: https://img.shields.io/discord/310910488152375297?label=Discord&logo=discord&style=flat-square

Diff for: codeception.yml

@@ -9,15 +9,13 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.4 <9.0",
-        "psr/log": "^1.1"
+        "php": ">=8.0 <9.0",
+        "psr/log": "^3.0"
     },
     "autoload": {
         "psr-4": {
-            "Phalcon\\Logger\\": "fake/Logger/",
-            "Phalcon\\Traits\\": "fake/Traits/",
             "Phalcon\\Proxy\\Psr3\\": "src/",
-            "Phalcon\\Proxy\\Psr3\\Tests\\Fixtures\\": "tests/_data/fixtures/",
+            "Phalcon\\Proxy\\Psr3\\Tests\\Support\\": "tests/support/",
             "Phalcon\\Proxy\\Psr3\\Tests\\Unit\\": "tests/unit/"
         }
     },
@@ -27,14 +25,20 @@
         "sort-packages": true
     },
     "require-dev": {
-        "codeception/codeception": "^4.1",
-        "codeception/module-asserts": "^2.0",
-        "codeception/module-filesystem": "^2.0",
-        "friendsofphp/php-cs-fixer": "^3.7",
         "pds/skeleton": "^1.0",
-        "phalcon/ide-stubs": "^5.0",
-        "phpstan/phpstan": "^1.4",
-        "squizlabs/php_codesniffer": "^3.6",
-        "vimeo/psalm": "^4.22"
+        "phalcon/ide-stubs": "^5.6",
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9.6",
+        "squizlabs/php_codesniffer": "^3.8",
+        "vimeo/psalm": "^5.19",
+        "vlucas/phpdotenv": "^5.6"
+    },
+    "scripts": {
+        "cs": "phpcs --standard=phpcs.xml",
+        "cs-fix": "phpcbf --standard=phpcs.xml",
+        "test-unit": "phpunit tests/unit --testdox --process-isolation -v",
+        "test-coverage-text": "phpunit tests/unit --testdox --process-isolation -v --coverage-text",
+        "test-coverage-clover": "phpunit tests/unit --testdox --process-isolation -v --coverage-clover tests/support/output/clover.xml",
+        "test-coverage-html": "phpunit tests/unit --testdox --process-isolation -v --coverage-html tests/support/output/"
     }
 }