Skip to content

Commit e9dfd50

Browse files
paxucluspaxuclus
authored
Merge pull request #48 from netlogix/fix/missing-doubleqoutes-in-tests
fix: Expect quoted string representations
2 parents f37f783 + 848256a commit e9dfd50

3 files changed

Lines changed: 41 additions & 45 deletions

File tree

‎.github/workflows/functionaltests.yml‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php-version: [ 8.0, 8.1, 8.2, 8.3 ]
14-
flow-version: [ 8.0, 9.0 ]
15-
exclude:
16-
- php-version: 8.0
17-
flow-version: 9.0
18-
- php-version: 8.1
19-
flow-version: 9.0
13+
php-version: [ 8.3, 8.4, 8.5 ]
14+
flow-version: [ "~8.3.0", "~9.0.0" ]
2015

2116
env:
2217
APP_ENV: true
@@ -30,27 +25,30 @@ jobs:
3025
extensions: mbstring, xml, json, zlib, iconv, intl, pdo_sqlite
3126
ini-values: opcache.fast_shutdown=0
3227

33-
- name: "[1/5] Create composer project - Cache composer dependencies"
34-
uses: actions/cache@v4
35-
with:
36-
path: ~/.composer/cache
37-
key: php-${{ matrix.php-version }}-flow-${{ matrix.flow-version }}-composer-${{ hashFiles('composer.json') }}
38-
restore-keys: |
39-
php-${{ matrix.php-version }}-flow-${{ matrix.flow-version }}-composer-
40-
php-${{ matrix.php-version }}-flow-
28+
- name: "Create composer project - No install"
29+
run: composer create-project --prefer-dist --no-progress --no-install neos/flow-base-distribution ${{ env.FLOW_DIST_FOLDER }} "${{ matrix.flow-version }}"
4130

42-
- name: "[2/5] Create composer project - No install"
43-
run: composer create-project neos/flow-base-distribution ${{ env.FLOW_DIST_FOLDER }} --prefer-dist --no-progress --no-install "^${{ matrix.flow-version }}"
44-
45-
- name: "[3/5] Allow neos composer plugin"
31+
- name: "Allow neos composer plugin"
4632
run: composer config --no-plugins allow-plugins.neos/composer-plugin true
4733
working-directory: ${{ env.FLOW_DIST_FOLDER }}
4834

49-
- name: "[4/5] Create composer project - Require behat in compatible version"
35+
- name: "Create composer project - Require behat in compatible version"
5036
run: composer require --dev --no-update "neos/behat:@dev"
5137
working-directory: ${{ env.FLOW_DIST_FOLDER }}
5238

53-
- name: "[5/5] Create composer project - Install project"
39+
- name: Get composer cache directory
40+
id: composer-cache
41+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
42+
working-directory: ${{ env.FLOW_DIST_FOLDER }}
43+
44+
- name: Cache dependencies
45+
uses: actions/cache@v4
46+
with:
47+
path: ${{ steps.composer-cache.outputs.dir }}
48+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
49+
restore-keys: ${{ runner.os }}-composer-
50+
51+
- name: "Create composer project - Install project"
5452
run: composer install
5553
working-directory: ${{ env.FLOW_DIST_FOLDER }}
5654

‎.github/workflows/unittests.yml‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php-version: [ 8.0, 8.1, 8.2, 8.3 ]
14-
flow-version: [ 8.3, 9.0 ]
15-
exclude:
16-
- php-version: 8.0
17-
flow-version: 9.0
18-
- php-version: 8.1
19-
flow-version: 9.0
13+
php-version: [ 8.3, 8.4, 8.5 ]
14+
flow-version: [ "~8.3.0", "~9.0.0" ]
2015

2116
env:
2217
APP_ENV: true
@@ -30,27 +25,30 @@ jobs:
3025
extensions: mbstring, xml, json, zlib, iconv, intl, pdo_sqlite
3126
ini-values: opcache.fast_shutdown=0
3227

33-
- name: "[1/5] Create composer project - Cache composer dependencies"
34-
uses: actions/cache@v4
35-
with:
36-
path: ~/.composer/cache
37-
key: php-${{ matrix.php-version }}-flow-${{ matrix.flow-version }}-composer-${{ hashFiles('composer.json') }}
38-
restore-keys: |
39-
php-${{ matrix.php-version }}-flow-${{ matrix.flow-version }}-composer-
40-
php-${{ matrix.php-version }}-flow-
28+
- name: "Create composer project - No install"
29+
run: composer create-project --prefer-dist --no-progress --no-install neos/flow-base-distribution ${{ env.FLOW_DIST_FOLDER }} "${{ matrix.flow-version }}"
4130

42-
- name: "[2/5] Create composer project - No install"
43-
run: composer create-project neos/flow-base-distribution ${{ env.FLOW_DIST_FOLDER }} --prefer-dist --no-progress --no-install "^${{ matrix.flow-version }}"
44-
45-
- name: "[3/5] Allow neos composer plugin"
31+
- name: "Allow neos composer plugin"
4632
run: composer config --no-plugins allow-plugins.neos/composer-plugin true
4733
working-directory: ${{ env.FLOW_DIST_FOLDER }}
4834

49-
- name: "[4/5] Create composer project - Require behat in compatible version"
35+
- name: "Create composer project - Require behat in compatible version"
5036
run: composer require --dev --no-update "neos/behat:@dev"
5137
working-directory: ${{ env.FLOW_DIST_FOLDER }}
5238

53-
- name: "[5/5] Create composer project - Install project"
39+
- name: Get composer cache directory
40+
id: composer-cache
41+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
42+
working-directory: ${{ env.FLOW_DIST_FOLDER }}
43+
44+
- name: Cache dependencies
45+
uses: actions/cache@v4
46+
with:
47+
path: ${{ steps.composer-cache.outputs.dir }}
48+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
49+
restore-keys: ${{ runner.os }}-composer-
50+
51+
- name: "Create composer project - Install project"
5452
run: composer install
5553
working-directory: ${{ env.FLOW_DIST_FOLDER }}
5654

‎Tests/Unit/Scope/Extra/VariablesFromStackProviderTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function Render_simple_values_as_single_line_information(): void
3333
self::assertEquals([
3434
[
3535
'foo::bar()' => [
36-
'baz' => 'some value'
36+
'baz' => '"some value"'
3737
]
3838
]
3939
], $result);
@@ -65,8 +65,8 @@ public function Render_complex_values_as_multi_line_information(): void
6565
self::assertEquals([
6666
[
6767
'foo::bar()' => [
68-
'baz.name' => 'Stephan',
69-
'baz.gender' => 'male',
68+
'baz.name' => '"Stephan"',
69+
'baz.gender' => '"male"',
7070
]
7171
]
7272
], $result);

0 commit comments

Comments
 (0)