Skip to content

Commit d5180d1

Browse files
Merge branch '5.4' into 6.2
* 5.4: CS fix Fix test provider
2 parents 57f0d8f + abd6575 commit d5180d1

13 files changed

+18
-3
lines changed

Request.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,7 @@ public function getProtocolVersion(): ?string
14361436
* @param bool $asResource If true, a resource will be returned
14371437
*
14381438
* @return string|resource
1439+
*
14391440
* @psalm-return ($asResource is true ? resource : string)
14401441
*/
14411442
public function getContent(bool $asResource = false)

Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
441441
return $dsn;
442442
}
443443
}
444-
// If "unix_socket" is not in the query, we continue with the same process as pgsql
445-
// no break
444+
// If "unix_socket" is not in the query, we continue with the same process as pgsql
445+
// no break
446446
case 'pgsql':
447447
$dsn ??= 'pgsql:';
448448

Session/Storage/NativeSessionStorage.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ public function setMetadataBag(MetadataBag $metaBag = null)
305305
trigger_deprecation('symfony/http-foundation', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
306306
}
307307
$this->metadataBag = $metaBag ?? new MetadataBag();
308-
309308
}
310309

311310
/**

Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
/**
1818
* @requires extension redis
19+
*
1920
* @group time-sensitive
2021
*/
2122
abstract class AbstractRedisSessionHandlerTestCase extends TestCase

Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
/**
2020
* @author Markus Bachmann <markus.bachmann@bachi.biz>
21+
*
2122
* @group time-sensitive
23+
*
2224
* @requires extension mongodb
2325
*/
2426
class MongoDbSessionHandlerTest extends TestCase

Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @author Drak <drak@zikula.org>
2222
*
2323
* @runTestsInSeparateProcesses
24+
*
2425
* @preserveGlobalState disabled
2526
*/
2627
class NativeFileSessionHandlerTest extends TestCase

Tests/Session/Storage/Handler/NullSessionHandlerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* @author Drak <drak@zikula.org>
2323
*
2424
* @runTestsInSeparateProcesses
25+
*
2526
* @preserveGlobalState disabled
2627
*/
2728
class NullSessionHandlerTest extends TestCase

Tests/Session/Storage/Handler/PdoSessionHandlerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
/**
1818
* @requires extension pdo_sqlite
19+
*
1920
* @group time-sensitive
2021
*/
2122
class PdoSessionHandlerTest extends TestCase

Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* @author Simon <simon.chrzanowski@quentic.com>
2323
*
2424
* @runTestsInSeparateProcesses
25+
*
2526
* @preserveGlobalState disabled
2627
*/
2728
class SessionHandlerFactoryTest extends TestCase

Tests/Session/Storage/NativeSessionStorageTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* These tests require separate processes.
2828
*
2929
* @runTestsInSeparateProcesses
30+
*
3031
* @preserveGlobalState disabled
3132
*/
3233
class NativeSessionStorageTest extends TestCase

0 commit comments

Comments
 (0)