Merge branch 'master' into adopt-debug

yiisoft · Nov 2, 2024 · ceba6d9 · ceba6d9
2 parents df2e95f + fc9a219
commit ceba6d9
Show file tree

Hide file tree

Showing 55 changed files with 35,759 additions and 214 deletions.
diff --git a/.github/workflows/blog-api_build.yml b/.github/workflows/blog-api_build.yml
@@ -49,8 +49,7 @@ jobs:
           - windows-latest
 
         php:
-          - 8.1
-          - 8.2
+          - 8.3
 
     steps:
       - name: Checkout
@@ -96,18 +95,5 @@ jobs:
         working-directory: ${{ env.working_directory }}
 
       - name: Run tests codeception
-        if: matrix.os != 'ubuntu-latest' || matrix.php != '8.0'
         run: vendor/bin/codecept run
         working-directory: ${{ env.working_directory }}
-
-      - name: Run tests codeception with coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
-        run: vendor/bin/codecept run --coverage-xml
-        working-directory: ${{ env.working_directory }}
-
-      - name: Upload coverage to codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
-        uses: codecov/codecov-action@v3
-        with:
-          file: tests/_output/coverage.xml
-          working-directory: ${{ env.working_directory }}
diff --git a/.github/workflows/blog-api_dependency.yml b/.github/workflows/blog-api_dependency.yml
@@ -45,7 +45,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.1
+          - 8.3
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/blog-api_static.yml b/.github/workflows/blog-api_static.yml
@@ -45,7 +45,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.1
+          - 8.3
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/blog_build.yml b/.github/workflows/blog_build.yml
@@ -49,8 +49,7 @@ jobs:
           - windows-latest
 
         php:
-          - 8.1
-          - 8.2
+          - 8.3
 
     steps:
       - name: Checkout
@@ -100,18 +99,5 @@ jobs:
         working-directory: ${{ env.working_directory }}
 
       - name: Run tests codeception
-        if: matrix.os != 'ubuntu-latest' || matrix.php != '8.0'
         run: vendor/bin/codecept run
         working-directory: ${{ env.working_directory }}
-
-      - name: Run tests codeception with coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
-        run: vendor/bin/codecept run --coverage-xml
-        working-directory: ${{ env.working_directory }}
-
-      - name: Upload coverage to codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
-        uses: codecov/codecov-action@v3
-        with:
-          file: tests/_output/coverage.xml
-          working-directory: ${{ env.working_directory }}
diff --git a/.github/workflows/blog_dependency.yml b/.github/workflows/blog_dependency.yml
@@ -45,7 +45,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.1
+          - 8.3
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/blog_static.yml b/.github/workflows/blog_static.yml
@@ -45,7 +45,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.1
+          - 8.3
 
     steps:
       - name: Checkout

diff --git a/blog-api/.gitignore b/blog-api/.gitignore
@@ -15,8 +15,6 @@ Thumbs.db
 # composer vendor dir
 /vendor
 
-/composer.lock
-
 # composer itself is not needed
 composer.phar
 

diff --git a/blog-api/.scrutinizer.yml b/blog-api/.scrutinizer.yml
diff --git a/blog-api/README.md b/blog-api/README.md
@@ -9,7 +9,6 @@
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/demo-api/v/stable.png)](https://packagist.org/packages/yiisoft/demo-api)
 [![Total Downloads](https://poser.pugx.org/yiisoft/demo-api/downloads.png)](https://packagist.org/packages/yiisoft/demo-api)
 [![Build status](https://github.com/yiisoft/demo-api/workflows/build/badge.svg)](https://github.com/yiisoft/demo-api/actions?query=workflow%3Abuild)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yiisoft/demo-api/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yiisoft/demo-api/?branch=master)
 [![static analysis](https://github.com/yiisoft/demo-api/workflows/static%20analysis/badge.svg)](https://github.com/yiisoft/demo-api/actions?query=workflow%3A%22static+analysis%22)
 
 API Demo application for Yii 3.

diff --git a/blog-api/composer.json b/blog-api/composer.json
@@ -20,9 +20,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^8.1",
+        "php": "8.3.*",
         "ext-intl": "*",
         "cebe/markdown": "^1.2@dev",
+        "cycle/annotated": "^3.5",
         "cycle/database": "^2.0",
         "cycle/entity-behavior": "^1.0",
         "cycle/orm": "^2.0",
@@ -63,17 +64,18 @@
         "yiisoft/translator": "^3.0",
         "yiisoft/translator-message-php": "^1.1",
         "yiisoft/user": "^2.0",
-        "yiisoft/validator": "^1.0",
+        "yiisoft/validator": "^2.0",
         "yiisoft/yii-console": "^2.0",
         "yiisoft/yii-cycle": "^1.0",
-        "yiisoft/yii-debug": "^3.0@dev",
+        "yiisoft/yii-debug": "dev-master",
         "yiisoft/yii-event": "^2.0",
         "yiisoft/yii-http": "^1.0",
         "yiisoft/yii-middleware": "^1.0",
         "yiisoft/queue": "3.0.x-dev",
         "yiisoft/yii-runner-console": "^2.0",
         "yiisoft/yii-runner-http": "^2.0",
-        "yiisoft/yii-swagger": "^2.0"
+        "yiisoft/yii-swagger": "^2.0",
+        "zircote/swagger-php": "^4.0"
     },
     "require-dev": {
         "codeception/c3": "^2.6",
@@ -86,6 +88,7 @@
         "codeception/module-rest": "^3.1",
         "phpunit/phpunit": "^9.5",
         "roave/infection-static-analysis-plugin": "^1.16",
+        "roave/security-advisories": "dev-latest",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.18",
         "yiisoft/json": "^1.0",