Skip to content

Commit e2a0836

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
2 parents 0bada06 + f3d5d5f commit e2a0836

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ jobs:
6565
test-php:
6666
name: Test on PHP ${{ matrix.php-version }}, ${{ matrix.composer-dependency }} and ${{ matrix.os }}
6767
runs-on: ${{ matrix.os }}
68-
continue-on-error: ${{ matrix.php-version == '8.5' }}
68+
continue-on-error: ${{ matrix.php-version == '8.6' }}
6969
strategy:
7070
matrix:
71-
php-version: ['8.2', '8.3', '8.4']
71+
php-version: ['8.2', '8.3', '8.4', '8.5']
7272
os: [ubuntu-latest]
7373
composer-dependency: [locked, highest]
7474
php-extensions: ['mbstring, iconv, mysqli, zip, gd, bz2']
7575
include:
76-
- php-version: '8.5'
76+
- php-version: '8.6'
7777
os: ubuntu-latest
7878
composer-dependency: locked
7979
composer-options: '--ignore-platform-req=php+'

‎tests/unit/Command/TwigLintCommandTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public function testGetFilesInfoInvalidFile(): void
101101
self::assertArrayHasKey('exception', $filesFound[1]);
102102
$exception = $filesFound[1]['exception'];
103103
self::assertInstanceOf(SyntaxError::class, $exception);
104-
self::assertSame(
105-
'Unexpected "}" in "' . $path . DIRECTORY_SEPARATOR . 'foo-invalid.twig" at line 1.',
104+
self::assertStringMatchesFormat(
105+
'Unexpected "}" in "%s%efoo-invalid.twig" at line %s.',
106106
$exception->getMessage(),
107107
);
108108
}

‎tests/unit/Plugins/Auth/AuthenticationSignonTest.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,13 @@ public function testSetCookieParamsDefaults(): void
365365
'domain' => '',
366366
'secure' => false,
367367
'partitioned' => false,
368-
'httponly' => false,
369-
'samesite' => '',
368+
'httponly' => true,
369+
'samesite' => 'Lax',
370370
];
371+
if (PHP_VERSION_ID < 80600) {
372+
$defaultOptions['httponly'] = false;
373+
$defaultOptions['samesite'] = '';
374+
}
371375

372376
if (PHP_VERSION_ID < 80500) {
373377
unset($defaultOptions['partitioned']);

0 commit comments

Comments
 (0)