10000 minor #25104 [Lock][Process][FrameworkBundle] fix tests (nicolas-grekas) · weaverryan/symfony@259ac66 · GitHub
[go: up one dir, main page]
Skip to content

Commit 259ac66

Browse files
nicolas-grekasnicolas-grekas
committed
minor symfony#25104 [Lock][Process][FrameworkBundle] fix tests (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- [Lock][Process][FrameworkBundle] fix tests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When running tests locally, I have several failures. This fixes them. Commits ------- 878b08c [Lock][Process][FrameworkBundle] fix tests
2 parents 4b38150 + 878b08c commit 259ac66

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11861186
return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
11871187
})
11881188
->in($dirs)
1189+
->sortByName()
11891190
;
11901191

11911192
foreach ($finder as $file) {
@@ -1306,7 +1307,7 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
13061307

13071308
private function registerMappingFilesFromDir($dir, callable $fileRecorder)
13081309
{
1309-
foreach (Finder::create()->followLinks()->files()->in($dir)->name('/\.(xml|ya?ml)$/') as $file) {
1310+
foreach (Finder::create()->followLinks()->files()->in($dir)->name('/\.(xml|ya?ml)$/')->sortByName() as $file) {
13101311
$fileRecorder($file->getExtension(), $file->getRealPath());
13111312
}
13121313
}

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
2020
"ext-xml": "*",
21-
"symfony/security": "~3.4-beta5|~4.0-beta5",
21+
"symfony/security": "~3.4-rc1|~4.0-rc1",
2222
"symfony/dependency-injection": "~3.4|~4.0",
2323
"symfony/http-kernel": "~3.3|~4.0",
2424
"symfony/polyfill-php70": "~1.0"
@@ -30,19 +30,19 @@
3030
"symfony/css-selector": "~2.8|~3.0|~4.0",
3131
"symfony/dom-crawler": "~2.8|~3.0|~4.0",
3232
"symfony/event-dispatcher": "^3.3.1|~4.0",
33-
"symfony/form": "^2.8.18|^3.2.5|~4.0",
34-
"symfony/framework-bundle": "^3.4|~4.0",
35-
"symfony/http-foundation": "~2.8|~3.0|~4.0",
33+
"symfony/form": "^3.4|~4.0",
34+
"symfony/framework-bundle": "^3.4-rc1|~4.0-rc1",
35+
"symfony/http-foundation": "~3.3|~4.0",
3636
"symfony/security-acl": "~2.8|~3.0",
37-
"symfony/translation": "~2.8|~3.0|~4.0",
37+
"symfony/translation": "~3.4|~4.0",
3838
"symfony/twig-bundle": "~3.4|~4.0",
3939
"symfony/twig-bridge": "~3.4|~4.0",
40-
"symfony/process": "~2.8|~3.0|~4.0",
41-
"symfony/validator": "^3.2.5|~4.0",
40+
"symfony/process": "~3.3|~4.0",
41+
"symfony/validator": "^3.4|~4.0",
4242
"symfony/var-dumper": "~3.3|~4.0",
43-
"symfony/yaml": "~2.8|~3.0|~4.0",
43+
"symfony/yaml": "~3.4|~4.0",
4444
"symfony/expression-language": "~2.8|~3.0|~4.0",
45-
"doctrine/doctrine-bundle": "~1.4",
45+
"doctrine/doctrine-bundle": "~1.5",
4646
"twig/twig": "~1.34|~2.4"
4747
},
4848
"conflict": {

‎src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public static function setupBeforeClass()
2626
{
2727
$memcached = new \Memcached();
2828
$memcached->addServer(getenv('MEMCACHED_HOST'), 11211);
29-
if (false === $memcached->getStats()) {
29+
$memcached->get('foo');
30+
$code = $memcached->getResultCode();
31+
32+
if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
3033
self::markTestSkipped('Unable to connect to the memcache host');
3134
}
3235
}

‎src/Symfony/Component/Process/Tests/ProcessTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ public function testRawCommandLine()
15391539
)
15401540
15411541
EOTXT;
1542-
$this->assertSame($expected, $p->getOutput());
1542+
$this->assertSame($expected, str_replace('Standard input code', '-', $p->getOutput()));
15431543
}
15441544

15451545
public function provideEscapeArgument()

0 commit comments

Comments
 (0)
0