Merge pull request #42 from niden-code/develop

PHPStan

Author: niden

.github/workflows/main.yml

@@ -25,9 +25,6 @@ env:
   LANGUAGE: en_US.UTF-8
   LC_ALL: en_US.UTF-8
 
-  # Windows specific
-  TOOLS_DIR: 'C:\tools'
-
   # PHP extensions required by Composer
   EXTENSIONS: intl, json, mbstring, msgpack
 
@@ -38,22 +35,22 @@ jobs:
     name: "Validate Tests code style"
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
-    #    needs: [ generate ]
-
     permissions:
       contents: read
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: true
       matrix:
         php:
-          - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+          - '8.4'
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -66,13 +63,17 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install development dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--prefer-dist"
 
-      - name: "PHPCS"
+      - name: "Code Sniffer"
+        run: |
+          composer cs
+
+      - name: "Code Analysis"
         run: |
-          vendor/bin/phpcs --standard=./phpcs.xml
+          composer cs
 
 
   unit-tests:
@@ -81,49 +82,30 @@ jobs:
     permissions:
       contents: read # to fetch code (actions/checkout)
 
-    name: Unit tests / PHP-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
+    name: Unit tests / PHP-${{ matrix.php }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         php:
-          - '8.0'
           - '8.1'
           - '8.2'
-        ts:
-          - 'nts'
-          - 'ts'
-        name:
-          - ubuntu-gcc
-          - macos-clang
-        # matrix names should be in next format:
-        #     {php}-{ts}-{os.name}-{compiler}-{arch}
-        include:
-          # Linux
-          - { name: ubuntu-gcc, os: ubuntu-20.04, compiler: gcc }
-          # macOS
-          - { name: macos-clang, os: macos-11, compiler: clang }
-          # Windows
-          - { php: '8.0', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
-          - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
-          - { php: '8.1', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
-          - { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
+          - '8.3'
+          - '8.4'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Setup platform specific environment"
         shell: pwsh
         run: |
           git config --global core.autocrlf false
-          $SessionSavePath = if ("${{ runner.os }}" -eq "Windows") { 'C:\temp' } else { '/tmp' }
-          Write-Output "SESSION_SAVE_PATH=$SessionSavePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - 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 }}
+          ini-values: apc.enable_cli=on
           tools: pecl, composer:v2
           coverage: pcov
         env:
@@ -134,65 +116,71 @@ jobs:
         run: composer validate --no-check-all --no-check-publish
 
       - name: "Install development dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--prefer-dist"
 
       - name: "Setup Tests"
         shell: bash
         run: |
-          cp config/.env.example .env
-          vendor/bin/codecept build
+          cp -v config/.env.example .env
 
       - name: "Run Unit Tests"
         if: always()
         run: |
-          vendor/bin/codecept run --coverage-xml=coverage.xml --ext DotReporter unit
+          composer test-unit-coverage
 
       - name: "Upload coverage file artifact"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
-          name: "unit-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}.coverage"
+          name: "unit-${{ matrix.php }}.coverage"
           path: "tests/_output/coverage.xml"
 
   upload-coverage:
     permissions:
       contents: read
 
-    name: "Upload coverage to Codecov/Codacy"
-    runs-on: "ubuntu-22.04"
+    name: "Upload coverage to Sonarcloud"
+    runs-on: ubuntu-latest
     needs:
       - "unit-tests"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
-          fetch-depth: 2
+          fetch-depth: 0
 
       - name: "Display structure of downloaded files"
         run: |
-          mkdir -p reports
+          mkdir -p cv
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
-          path: "reports"
+          path: "cv"
 
       - name: "Display structure of downloaded files"
-        run: ls -R
-        working-directory: reports
-
-      - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v3"
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          directory: reports
-          fail_ci_if_error: true
-          verbose: true
-
-      - name: "Upload to Codacy"
-        uses: codacy/codacy-coverage-reporter-action@v1
+        run: |
+          mv cv/unit-8.1.coverage/coverage.xml      cv/01.xml
+          mv cv/unit-8.2.coverage/coverage.xml      cv/02.xml
+          mv cv/unit-8.3.coverage/coverage.xml      cv/03.xml
+          mv cv/unit-8.4.coverage/coverage.xml      cv/04.xml
+          ls -la cv/
+
+      - name: SonarCloud Scan
+        uses: SonarSource/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: reports/unit-8.0-ts-ubuntu-gcc.coverage/coverage.xml, reports/unit-8.1-ts-ubuntu-gcc.coverage/coverage.xml, reports/unit-8.2-ts-ubuntu-gcc.coverage/coverage.xml
+          projectBaseDir: ./
+          args: >
+            -Dsonar.organization=${{ secrets.SONAR_ORGANIZATION }}
+            -Dsonar.projectKey=${{ secrets.SONAR_PROJECT_KEY }}
+            -Dsonar.sources=src/
+            -Dsonar.exclusions=vendor/**,cv/**,tests/**
+            -Dsonar.sourceEncoding=UTF-8
+            -Dsonar.language=php
+            -Dsonar.tests=tests/
+            -Dsonar.php.coverage.reportPaths=cv/01.xml,cv/02.xml,cv/03.xml,cv/04.xml

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-present The Phalcon PHP Framework
+Copyright (c) 2012-present The Phalcon PHP Framework
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -19,7 +19,7 @@
     "autoload": {
         "psr-4": {
             "Phalcon\\Traits\\": "src/",
-            "Phalcon\\Tests\\Fixtures\\": "tests/_data/fixtures/",
+            "Phalcon\\Tests\\Fixtures\\": "tests/support/fixtures/",
             "Phalcon\\Tests\\Unit\\": "tests/unit/"
         }
     },
@@ -35,8 +35,16 @@
         "codeception/module-phpbrowser": "^3.0",
         "pds/skeleton": "^1.0",
         "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.7",
-        "vimeo/psalm": "^5.4",
         "vlucas/phpdotenv": "^5.5"
+    },
+    "scripts": {
+        "analyze": "vendor/bin/phpstan analyse -c config/phpstan.neon",
+        "cs": "vendor/bin/phpcs --standard=./config/phpcs.xml",
+        "cs-fix": "vendor/bin/phpcbf --standard=./config/phpcs.xml",
+        "test-unit": "vendor/bin/phpunit -c ./config/phpunit.xml.dist",
+        "test-unit-coverage": "vendor/bin/phpunit  -c ./config/phpunit.xml.dist --coverage-clover tests/_output/coverage.xml",
+        "test-unit-coverage-html": "vendor/bin/phpunit  -c ./config/phpunit.xml.dist --coverage-html tests/_output/coverage/"
     }
 }