Skip to content

Commit

Permalink
Merge branch '1.5.x' into 2.0.x
Browse files Browse the repository at this point in the history
* 1.5.x:
  Make data providers static (doctrine#106)
  Doctrine CS 12 (doctrine#107)
  Bump CI workflows (doctrine#105)
  Ignore issue about undefined variable
  Adapt ignore error message
  PHP 8.3 support tests.
  • Loading branch information
derrabus committed Dec 9, 2023
2 parents f49f6a8 + 12be248 commit 6c0ee61
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
with:
composer-root-version: "1.4"
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
phpunit:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@4.0.0"
with:
php-versions: '["8.1", "8.2"]'
php-versions: '["8.1", "8.2", "8.3"]'
composer-root-version: "1.4"
4 changes: 3 additions & 1 deletion .github/workflows/phpbench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ jobs:
matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
with:
fetch-depth: 2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"
with:
composer-root-version: "1.4"
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"require-dev": {
"ext-phar": "*",
"ext-pdo": "*",
"doctrine/coding-standard": "^11",
"doctrine/coding-standard": "^12",
"phpbench/phpbench": "^1.2",
"phpstan/phpstan": "^1.9.4",
"phpstan/phpstan-phpunit": "^1.3",
"phpunit/phpunit": "^10.1.0",
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.4"
},
"autoload": {
Expand Down
8 changes: 8 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,12 @@
<directory name="vendor" />
</ignoreFiles>
</projectFiles>
<issueHandlers>
<!-- Issue about &error; should go away with Psalm v6 -->
<UndefinedVariable>
<errorLevel type="suppress">
<file name="src/Doctrine/Instantiator/Instantiator.php" />
</errorLevel>
</UndefinedVariable>
</issueHandlers>
</psalm>

0 comments on commit 6c0ee61

Please sign in to comment.