Skip to content

Commit 6f1e0c4

Browse files
derrabusderrabus
authored
Bump dev tools and CI workflows (#93)
1 parent 6e6ce1e commit 6f1e0c4

File tree

13 files changed

+21
-43
lines changed

13 files changed

+21
-43
lines changed

‎.github/workflows/coding-standards.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
1616
with:
1717
composer-root-version: "1.4"
18-
php-version: "8.1"

‎.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
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@1.4.1"
15+
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0"
1616
with:
17-
php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1"]'
17+
php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
1818
composer-root-version: "1.4"

‎.github/workflows/phpbench.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
phpbench:
1818
name: "PHPBench"
19-
runs-on: "ubuntu-20.04"
19+
runs-on: "ubuntu-22.04"
2020

2121
strategy:
2222
matrix:
@@ -37,7 +37,7 @@ jobs:
3737
ini-values: "zend.assertions=1"
3838

3939
- name: "Cache dependencies installed with composer"
40-
uses: "actions/cache@v2"
40+
uses: "actions/cache@v3"
4141
with:
4242
path: "~/.composer/cache"
4343
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"

‎.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@1.4.1"
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: "Static Analysis"
15-
uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.4.1"
15+
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
1616
with:
1717
composer-root-version: "1.4"
18-
php-version: "8.1"

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"require-dev": {
2222
"ext-phar": "*",
2323
"ext-pdo": "*",
24-
"doctrine/coding-standard": "^9",
24+
"doctrine/coding-standard": "^9 || ^11",
2525
"phpbench/phpbench": "^0.16 || ^1",
2626
"phpstan/phpstan": "^1.4",
2727
"phpstan/phpstan-phpunit": "^1",
2828
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
29-
"vimeo/psalm": "^4.22"
29+
"vimeo/psalm": "^4.30 || ^5.4"
3030
},
3131
"autoload": {
3232
"psr-4": {

‎phpstan.neon.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ includes:
44

55
parameters:
66
level: max
7-
phpVersion: 80103
7+
phpVersion: 80200
88
paths:
99
- src
1010
- tests

‎psalm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<psalm
33
errorLevel="7"
4-
phpVersion="8.1"
4+
phpVersion="8.2"
55
resolveFromConfigFile="true"
66
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
77
xmlns="https://getpsalm.org/schema/config"

‎src/Doctrine/Instantiator/Instantiator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ final class Instantiator implements InstantiatorInterface
6060
public function instantiate($className)
6161
{
6262
if (isset(self::$cachedCloneables[$className])) {
63-
/**
64-
* @phpstan-var T
65-
*/
63+
/** @phpstan-var T */
6664
$cachedCloneable = self::$cachedCloneables[$className];
6765

6866
return clone $cachedCloneable;

‎tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceBench.php

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,31 @@ public function init(): void
3131
$this->instantiator->instantiate(UnCloneableAsset::class);
3232
}
3333

34-
/**
35-
* @Revs(20000)
36-
*/
34+
/** @Revs(20000) */
3735
public function benchInstantiateSelf(): void
3836
{
3937
$this->instantiator->instantiate(self::class);
4038
}
4139

42-
/**
43-
* @Revs(20000)
44-
*/
40+
/** @Revs(20000) */
4541
public function benchInstantiateInternalClass(): void
4642
{
4743
$this->instantiator->instantiate(ArrayObject::class);
4844
}
4945

50-
/**
51-
* @Revs(20000)
52-
*/
46+
/** @Revs(20000) */
5347
public function benchInstantiateSimpleSerializableAssetClass(): void
5448
{
5549
$this->instantiator->instantiate(SimpleSerializableAsset::class);
5650
}
5751

58-
/**
59-
* @Revs(20000)
60-
*/
52+
/** @Revs(20000) */
6153
public function benchInstantiateSerializableArrayObjectAsset(): void
6254
{
6355
$this->instantiator->instantiate(SerializableArrayObjectAsset::class);
6456
}
6557

66-
/**
67-
* @Revs(20000)
68-
*/
58+
/** @Revs(20000) */
6959
public function benchInstantiateUnCloneableAsset(): void
7060
{
7161
$this->instantiator->instantiate(UnCloneableAsset::class);

0 commit comments

Comments
 (0)