Skip to content

Commit 4d90b67

Browse files
authored
Bump tools and workflows (#321)
1 parent b394aaa commit 4d90b67

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
1616
with:
1717
composer-root-version: "2.5"

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
phpunit:
1414
name: "PHPUnit"
15-
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0"
15+
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0"
1616
with:
1717
composer-root-version: "2.5"
1818
php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'

.github/workflows/release-on-milestone-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: "Static Analysis"
15-
uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
15+
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
1616
with:
1717
composer-root-version: "2.5"

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
},
3030
"require-dev": {
3131
"composer/package-versions-deprecated": "^1.11",
32-
"phpstan/phpstan": "~1.4.10 || 1.8.8",
32+
"phpstan/phpstan": "~1.4.10 || 1.9.4",
3333
"doctrine/annotations": "^1.0",
34-
"doctrine/coding-standard": "^9 || ^10",
34+
"doctrine/coding-standard": "^9 || ^11",
3535
"doctrine/common": "^3.0",
3636
"phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
3737
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
38-
"vimeo/psalm": "4.29.0"
38+
"vimeo/psalm": "4.30.0 || 5.3.0"
3939
},
4040
"conflict": {
4141
"doctrine/annotations": "<1.0 || >=2.0",

psalm.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,11 @@
4747
<file name="tests/Persistence/Mapping/FileDriverTest.php"/>
4848
</errorLevel>
4949
</MoreSpecificReturnType>
50+
<RedundantCast>
51+
<errorLevel type="suppress">
52+
<!-- We're filtering invalid input- -->
53+
<file name="src/Persistence/Mapping/Driver/SymfonyFileLocator.php"/>
54+
</errorLevel>
55+
</RedundantCast>
5056
</issueHandlers>
5157
</psalm>

src/Persistence/Reflection/RuntimePublicReflectionProperty.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ public function setValue($object, $value = null)
6161

6262
$originalInitializer = $object->__getInitializer();
6363
$object->__setInitializer(null);
64+
6465
parent::setValue($object, $value);
66+
6567
$object->__setInitializer($originalInitializer);
6668
}
6769
}

0 commit comments

Comments
 (0)