diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0b726d6..e0cd9b49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,9 @@ jobs: - name: Check platform requirements run: composer check-platform-reqs + - name: Generate test configuration + run: php console/console.php ci-bootstrap + - name: Ensure build directory exists run: mkdir -p build/logs diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 1d2f8b80..759c9712 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -14,6 +14,8 @@ jobs: contents: read pull-requests: write checks: write + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -21,6 +23,5 @@ jobs: fetch-depth: 0 - name: Qodana Scan + if: env.QODANA_TOKEN != '' uses: JetBrains/qodana-action@42dad391966aca8ca344ca2340a7f43a5507e9b2 # v2025.3.1 - env: - QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 1af72f5e..2a077424 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Setup PHP - uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2 + uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # v2.40.0 with: php-version: "8.4" extensions: intl, mbstring, mysqli @@ -37,6 +37,9 @@ jobs: - name: Install dependencies run: composer update --prefer-stable --no-interaction --prefer-dist --no-progress + - name: Generate test configuration + run: php console/console.php ci-bootstrap + - name: Ensure build directory exists run: mkdir -p build/logs diff --git a/composer.json.dist b/composer.json.dist index 725319cb..e36fb0db 100644 --- a/composer.json.dist +++ b/composer.json.dist @@ -9,15 +9,42 @@ "Xmf\\": "./xoops_lib/Xmf/" } }, - "repositories": [ - { - "type": "path", - "url": "../base-requires" - } - ], "require": { "php": "^8.4", - "xoops/base-requires": "dev-master" + "ext-pdo": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-session": "*", + "assetic/framework": "^3.1", + "dflydev/apache-mime-types": "^1.0", + "doctrine/dbal": "^4.3.2", + "embed/embed": "^4.4", + "endroid/qr-code": "^6.0.9", + "ezyang/htmlpurifier": "^4.18", + "firebase/php-jwt": "^7.0", + "geekwright/po": "^2.0", + "kint-php/kint": "^6.0", + "league/container": "^4.2.3", + "matthiasmullie/minify": "^1.3", + "moneyphp/money": "^4.5", + "monolog/monolog": "^3.0", + "php-debugbar/php-debugbar": "^3.3", + "phpmailer/phpmailer": "^6.9.3", + "psr/log": "^2.0|^3.0", + "ptachoire/cssembed": "^1.0", + "punic/punic": "^3.8.1", + "scssphp/scssphp": "^2.0", + "smarty/smarty": "^4.5.6", + "stefangabos/zebra_image": "^2.2", + "symfony/console": "^6.4|^7.2", + "symfony/process": "^6.4|^7.2", + "symfony/yaml": "^6.4|^7.2", + "tecnickcom/tcpdf": "^6.10", + "tedivm/stash": "^1.2.1", + "webmozart/assert": "^1.2", + "wikimedia/less.php": "^5.0", + "xoops/regdom": "^2.0" }, "require-dev": { "phpunit/phpunit": "^11.0", diff --git a/qodana.yaml b/qodana.yaml index c9b55604..9d5f9ec2 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,6 +1,6 @@ version: "1.0" -linter: jetbrains/qodana-php:2025.2 +image: jetbrains/qodana-php:2025.3 profile: name: qodana.recommended