Skip to content

Commit 007a641

Browse files
authored
Merge pull request #210 from acrobat/allow-sf6
Allow symfony 6
2 parents 4375ec5 + f9cf57e commit 007a641

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

.github/workflows/test-application.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
- php-version: '7.4'
3737
symfony-version: '5.0.*'
3838
- php-version: '8.0'
39+
- php-version: '8.0'
40+
symfony-version: '6.0.*'
3941

4042
steps:
4143
- name: Checkout project

composer.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
"require": {
1212
"php": "^7.1|^8.0",
1313
"doctrine/data-fixtures": "^1.2",
14-
"symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0"
14+
"symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0"
1515
},
1616
"require-dev": {
1717
"doctrine/doctrine-bundle": "^1.8 || ^2.0",
1818
"doctrine/phpcr-bundle": "^1.3 || ^2.0.0",
19-
"symfony/console": "^3.4.26 || ^4.3.8 || ^5.0",
20-
"symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0",
21-
"symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0",
22-
"symfony/framework-bundle": "^3.4.26 || ^4.3.8 || ^5.0",
23-
"symfony/http-kernel": "^3.4.26 || ^4.3.8 || ^5.0",
19+
"symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
20+
"symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
21+
"symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
22+
"symfony/framework-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
23+
"symfony/http-kernel": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
2424
"symfony/monolog-bundle": "^3.5",
25-
"symfony/security-bundle": "^3.4.26 || ^4.3.8 || ^5.0",
26-
"symfony/twig-bundle": "^3.4.26 || ^4.3.8 || ^5.0",
27-
"symfony/phpunit-bridge": "^5.2.1"
25+
"symfony/security-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
26+
"symfony/twig-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
27+
"symfony/phpunit-bridge": "^5.4"
2828
},
2929
"autoload": {
3030
"psr-4": {
@@ -37,7 +37,10 @@
3737
}
3838
},
3939
"config": {
40-
"sort-packages": true
40+
"sort-packages": true,
41+
"allow-plugins": {
42+
"composer/package-versions-deprecated": true
43+
}
4144
},
4245
"extra": {
4346
"branch-alias": {

src/Functional/BaseTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected static function createKernel(array $options = []): KernelInterface
7575
*
7676
* Overwritten to set the kernel configuration from getKernelConfiguration.
7777
*/
78-
protected static function bootKernel(array $options = [])
78+
protected static function bootKernel(array $options = []): KernelInterface
7979
{
8080
return parent::bootKernel(static::getKernelConfiguration());
8181
}

src/HttpKernel/TestKernel.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ public function addBundle(BundleInterface $bundle)
143143
}
144144

145145
/**
146-
* {inheritDoc}.
146+
* {@inheritDoc}.
147147
*
148148
* Here we return our list of bundles
149149
*/
150-
public function registerBundles()
150+
public function registerBundles(): iterable
151151
{
152152
return $this->requiredBundles;
153153
}
@@ -162,7 +162,7 @@ public function getKernelDir()
162162
return $this->getProjectDir();
163163
}
164164

165-
public function getProjectDir()
165+
public function getProjectDir(): string
166166
{
167167
$refl = new \ReflectionClass($this);
168168
$fname = $refl->getFileName();
@@ -171,7 +171,7 @@ public function getProjectDir()
171171
return $kernelDir;
172172
}
173173

174-
public function getCacheDir()
174+
public function getCacheDir(): string
175175
{
176176
return implode('/', [
177177
$this->getKernelDir(),
@@ -180,7 +180,7 @@ public function getCacheDir()
180180
]);
181181
}
182182

183-
public function getLogDir()
183+
public function getLogDir(): string
184184
{
185185
return implode('/', [
186186
$this->getKernelDir(),

0 commit comments

Comments
 (0)