Skip to content

Commit b3e6ae4

Browse files
committed
Make sure we are compatible with sf6
1 parent bcf6a3a commit b3e6ae4

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,50 @@ jobs:
1616
- ''
1717
- 'lowest'
1818
symfony:
19-
- '3.4.*'
2019
- '4.4.*'
21-
- '5.0.*'
20+
- '5.3.*'
2221
- '6.0.*'
2322
exclude:
24-
- php: '7.2'
25-
symfony: '3.4.*'
26-
dependency: 'lowest'
2723
- php: '7.2'
2824
symfony: '4.4.*'
2925
dependency: 'lowest'
3026
- php: '7.2'
3127
symfony: '6.0.*'
32-
- php: '7.3'
33-
symfony: '3.4.*'
3428
- php: '7.3'
3529
symfony: '4.4.*'
3630
- php: '7.3'
3731
symfony: '6.0.*'
38-
- php: '7.4'
39-
symfony: '3.4.*'
4032
- php: '7.4'
4133
symfony: '4.4.*'
4234
- php: '7.4'
4335
symfony: '6.0.*'
44-
- php: '8.0'
45-
symfony: '3.4.*'
4636
- php: '8.0'
4737
symfony: '4.4.*'
4838
fail-fast: false
4939
steps:
5040
- name: Checkout
51-
uses: actions/checkout@v1
41+
uses: actions/checkout@v2
5242

5343
- name: Setup PHP
5444
uses: shivammathur/setup-php@v2
5545
with:
5646
php-version: ${{ matrix.php }}
57-
extensions: composer, flex, pcov
47+
extensions: pcov
48+
tools: flex
5849

5950
- name: Configure Symfony
6051
run: composer config extra.symfony.require "${{ matrix.symfony }}"
6152

6253
- name: Prefer unstable Composer dependencies if Symfony 6.0
63-
if: matrix.symfony == '6.0.x'
54+
if: matrix.symfony == '6.0.*'
6455
run: composer config prefer-stable false
6556

6657
- name: Get Composer Cache Directory
6758
id: composer-cache
6859
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
6960

7061
- name: Cache dependencies
71-
uses: actions/cache@v1
62+
uses: actions/cache@v2
7263
with:
7364
path: ${{ steps.composer-cache.outputs.dir }}
7465
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
matrix:
119119
operating-system: [ ubuntu-latest, windows-latest ]
120120
php: [ '7.4', '8.0' ]
121-
symfony: ['4.4', '5.3']
121+
symfony: ['^4.4', '^5.3']
122122

123123
steps:
124124
- uses: actions/checkout@master

src/AppKernel.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ public function addConfigFile($configFile)
7878
$this->configFiles[] = $configFile;
7979
}
8080

81-
public function getCacheDir()
81+
public function getCacheDir(): string
8282
{
8383
return sys_get_temp_dir().'/NyholmBundleTest/'.$this->cachePrefix;
8484
}
8585

86-
public function getLogDir()
86+
public function getLogDir(): string
8787
{
8888
return sys_get_temp_dir().'/NyholmBundleTest/log';
8989
}
9090

91-
public function getProjectDir()
91+
public function getProjectDir(): string
9292
{
9393
if (null === $this->fakedProjectDir) {
9494
return realpath(__DIR__.'/../../../../');
@@ -113,7 +113,7 @@ public function setProjectDir($projectDir)
113113
$this->fakedProjectDir = $projectDir;
114114
}
115115

116-
public function registerBundles()
116+
public function registerBundles(): iterable
117117
{
118118
$this->bundlesToRegister = array_unique($this->bundlesToRegister);
119119
$bundles = [];
@@ -182,7 +182,7 @@ public function loadRoutes(LoaderInterface $loader)
182182
/**
183183
* {@inheritdoc}
184184
*/
185-
protected function buildContainer()
185+
protected function buildContainer(): ContainerBuilder
186186
{
187187
$container = parent::buildContainer();
188188

0 commit comments

Comments
 (0)