Skip to content

Commit f999b3a

Browse files
committed
require php >= 8.1
1 parent 67ddc27 commit f999b3a

File tree

9 files changed

+22
-91
lines changed

9 files changed

+22
-91
lines changed

.github/workflows/coding-standards.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
push:
88
branches:
9-
- "1.x.x"
9+
- "3.x.x"
1010

1111
jobs:
1212
coding-standards:
@@ -19,9 +19,8 @@ jobs:
1919
dependencies:
2020
- "locked"
2121
php-version:
22-
- "7.4"
23-
- "8.0"
2422
- "8.1"
23+
- "8.2"
2524
operating-system:
2625
- "ubuntu-latest"
2726

.github/workflows/mutation-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
push:
88
branches:
9-
- "1.x.x"
9+
- "3.x.x"
1010

1111
jobs:
1212
mutation-tests:
@@ -19,9 +19,8 @@ jobs:
1919
dependencies:
2020
- "locked"
2121
php-version:
22-
- "7.4"
23-
- "8.0"
2422
- "8.1"
23+
- "8.2"
2524
operating-system:
2625
- "ubuntu-latest"
2726

@@ -62,4 +61,4 @@ jobs:
6261
env:
6362
INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
6463
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
65-
64+

.github/workflows/phpunit.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
push:
88
branches:
9-
- "1.x.x"
9+
- "3.x.x"
1010

1111
jobs:
1212
phpunit:
@@ -19,9 +19,8 @@ jobs:
1919
dependencies:
2020
- "locked"
2121
php-version:
22-
- "7.4"
23-
- "8.0"
2422
- "8.1"
23+
- "8.2"
2524
operating-system:
2625
- "ubuntu-latest"
2726

.github/workflows/psalm.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
push:
88
branches:
9-
- "1.x.x"
9+
- "3.x.x"
1010

1111
jobs:
1212
static-analysis-psalm:
@@ -19,9 +19,8 @@ jobs:
1919
dependencies:
2020
- "locked"
2121
php-version:
22-
- "7.4"
23-
- "8.0"
2422
- "8.1"
23+
- "8.2"
2524
operating-system:
2625
- "ubuntu-latest"
2726

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

Lines changed: 0 additions & 67 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.4.0|^8.0",
20-
"psr/container": "^1.0"
19+
"php": "~8.1.0 || ~8.2.0",
20+
"psr/container": "^2.0"
2121
},
2222
"require-dev": {
23-
"infection/infection": "^0.25",
2423
"phpro/grumphp": "^1.0",
2524
"phpstan/phpstan": "^1.2",
2625
"phpunit/phpunit": "^9.0",
27-
"roave/infection-static-analysis-plugin": "^1.11",
26+
"roave/infection-static-analysis-plugin": "^1.32",
2827
"squizlabs/php_codesniffer": "^3.4",
2928
"symfony/var-dumper": "^5.0",
3029
"vimeo/psalm": "^4.0.0"
@@ -60,6 +59,10 @@
6059
}
6160
},
6261
"config": {
63-
"sort-packages": true
62+
"sort-packages": true,
63+
"allow-plugins": {
64+
"infection/extension-installer": true,
65+
"phpro/grumphp": true
66+
}
6467
}
6568
}

psalm.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0"?>
22
<psalm
3-
totallyTyped="false"
43
errorLevel="1"
54
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
65
xmlns="https://getpsalm.org/schema/config"

src/Container.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct(ContainerConfig $configuredDependencies, bool $autow
2424
$this->resolver = new InstanceResolver($this->configuredDependencies, $this->loadedDependencies, $this);
2525
}
2626

27-
public function get($id)
27+
public function get(string $id)
2828
{
2929
if ($this->loadedDependencies->has($id)) {
3030
return $this->loadedDependencies->get($id);
@@ -40,7 +40,7 @@ public function get($id)
4040
return $this->loadedDependencies->get($id);
4141
}
4242

43-
public function has($id): bool
43+
public function has(string $id): bool
4444
{
4545
return $this->loadedDependencies->has($id)
4646
|| $this->configuredDependencies->has($id);

tests/BuilderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ public function testItShouldCreateAConfiguredContainerFromFrameworkConfigWithCon
128128
InvalidArgumentException::class => [
129129
'class' => InvalidArgumentException::class,
130130
'arguments' => [
131-
'message' => 'Oh Oh!!',
132-
'code' => 0,
133-
'previous' => null,
131+
'$message' => 'Oh Oh!!',
132+
'$code' => 0,
133+
'$previous' => null,
134134
]
135135
],
136136
],

0 commit comments

Comments
 (0)