8000 Merge branch '6.0' into 6.1 · symfony/symfony@ba67bc9 · GitHub
[go: up one dir, main page]
Skip to content

Commit ba67bc9

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.0' into 6.1
* 6.0: [HttpFoundation] fix tests Fix low-deps
2 parents 082223d + 828fd2d commit ba67bc9

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

‎.github/workflows/unit-tests.yml‎

Lines changed: 3 additions & 0 deletions
< 8000 /div>
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,14 @@ jobs:
179179
fi
180180
181181
(cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb)
182+
(cd src/Symfony/Component/Lock; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb)
182183
183184
# matrix.mode = high-deps
184185
echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1
185186
186187
# get a list of the patched components (relies on .github/build-packages.php being called in the previous step)
187188
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
189+
(cd src/Symfony/Component/Lock; mv composer.bak composer.json)
188190
PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
189191
190192
# for 5.4 LTS, checkout and test previous major with the patched components (only for patched components)
@@ -198,6 +200,7 @@ jobs:
198200
git checkout -m FETCH_HEAD
199201
PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true)
200202
(cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
203+
(cd src/Symfony/Component/Lock; composer require --dev --no-update mongodb/mongodb)
201204
if [[ $PATCHED_COMPONENTS ]]; then
202205
echo "::group::install phpunit"
203206
./phpunit install

‎src/Symfony/Bridge/Doctrine/composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
},
5353
"conflict": {
5454
"doctrine/dbal": "<2.13.1",
55+
"doctrine/lexer": "<1.1",
5556
"doctrine/orm": "<2.7.3",
5657
"phpunit/phpunit": "<5.4.3",
5758
"symfony/cache": "<5.4",

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ public function testCreateRedisHandlerFromDsn()
7272

7373
$ttlProperty = $reflection->getProperty('ttl');
7474
$ttlProperty->setAccessible(true);
75-
$this->assertSame('3600', $ttlProperty->getValue($handler));
75+
$this->assertSame(3600, $ttlProperty->getValue($handler));
7676
}
7777
}

‎src/Symfony/Component/Lock/composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
},
2222
"require-dev": {
2323
"doctrine/dbal": "^2.13|^3.0",
24-
"mongodb/mongodb": "~1.1",
2524
"predis/predis": "~1.0"
2625
},
2726
"conflict": {

0 commit comments

Comments
 (0)
0