diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Lock][Process][FrameworkBundle] fix tests

Browse Source
This commit is contained in:
Nicolas Grekas 2017-11-22 11:17:59 +01:00
parent 4c930284ac
commit 878b08cd46
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1182,6 +1182,7 @@ class FrameworkExtension extends Extension
return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
})
->in($dirs)
->sortByName()
;
foreach ($finder as $file) {
@ -1302,7 +1303,7 @@ class FrameworkExtension extends Extension
private function registerMappingFilesFromDir($dir, callable $fileRecorder)
{
foreach (Finder::create()->followLinks()->files()->in($dir)->name('/\.(xml|ya?ml)$/') as $file) {
foreach (Finder::create()->followLinks()->files()->in($dir)->name('/\.(xml|ya?ml)$/')->sortByName() as $file) {
$fileRecorder($file->getExtension(), $file->getRealPath());
}
}

18
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -18,7 +18,7 @@
"require": {
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
"symfony/security": "~3.4-beta5|~4.0-beta5",
"symfony/security": "~3.4-rc1|~4.0-rc1",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/http-kernel": "~3.3|~4.0",
"symfony/polyfill-php70": "~1.0"
@ -30,19 +30,19 @@
"symfony/css-selector": "~2.8|~3.0|~4.0",
"symfony/dom-crawler": "~2.8|~3.0|~4.0",
"symfony/event-dispatcher": "^3.3.1|~4.0",
"symfony/form": "^2.8.18|^3.2.5|~4.0",
"symfony/framework-bundle": "^3.4|~4.0",
"symfony/http-foundation": "~2.8|~3.0|~4.0",
"symfony/form": "^3.4|~4.0",
"symfony/framework-bundle": "^3.4-rc1|~4.0-rc1",
"symfony/http-foundation": "~3.3|~4.0",
"symfony/security-acl": "~2.8|~3.0",
"symfony/translation": "~2.8|~3.0|~4.0",
"symfony/translation": "~3.4|~4.0",
"symfony/twig-bundle": "~3.4|~4.0",
"symfony/twig-bridge": "~3.4|~4.0",
"symfony/process": "~2.8|~3.0|~4.0",
"symfony/validator": "^3.2.5|~4.0",
"symfony/process": "~3.3|~4.0",
"symfony/validator": "^3.4|~4.0",
"symfony/var-dumper": "~3.3|~4.0",
"symfony/yaml": "~2.8|~3.0|~4.0",
"symfony/yaml": "~3.4|~4.0",
"symfony/expression-language": "~2.8|~3.0|~4.0",
"doctrine/doctrine-bundle": "~1.4",
"doctrine/doctrine-bundle": "~1.5",
"twig/twig": "~1.34|~2.4"
},
"conflict": {

5
src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
View File

@ -26,7 +26,10 @@ class MemcachedStoreTest extends AbstractStoreTest
{
$memcached = new \Memcached();
$memcached->addServer(getenv('MEMCACHED_HOST'), 11211);
if (false === $memcached->getStats()) {
$memcached->get('foo');
$code = $memcached->getResultCode();
if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
self::markTestSkipped('Unable to connect to the memcache host');
}
}

2
src/Symfony/Component/Process/Tests/ProcessTest.php
View File

@ -1539,7 +1539,7 @@ Array
)
EOTXT;
$this->assertSame($expected, $p->getOutput());
$this->assertSame($expected, str_replace('Standard input code', '-', $p->getOutput()));
}
public function provideEscapeArgument()