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

Merge branch '4.2' into 4.3

Browse Source 
* 4.2:
  fix Debug component dependencies
  [travis] not all components have a master branch
This commit is contained in:
Christian Flothmann 2019-06-28 14:12:54 +02:00
commit a1de01c6ff
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/build-packages.php vendored
View File

@ -57,7 +57,7 @@ foreach ($dirs as $k => $dir) {
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json')); $versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
$versions = json_decode($versions)->packages->{$package->name}; $versions = json_decode($versions)->packages->{$package->name};
if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) { if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
unset($versions->{'dev-master'}); unset($versions->{'dev-master'});
} }

1
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -20,6 +20,7 @@
"ext-xml": "*", "ext-xml": "*",
"symfony/cache": "~4.3", "symfony/cache": "~4.3",
"symfony/config": "~4.2", "symfony/config": "~4.2",
"symfony/debug": "~4.0",
"symfony/dependency-injection": "^4.3", "symfony/dependency-injection": "^4.3",
"symfony/http-foundation": "^4.3", "symfony/http-foundation": "^4.3",
"symfony/http-kernel": "^4.3", "symfony/http-kernel": "^4.3",

1
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -18,6 +18,7 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/config": "~4.2", "symfony/config": "~4.2",
"symfony/debug": "~4.0",
"symfony/twig-bridge": "^4.3", "symfony/twig-bridge": "^4.3",
"symfony/http-foundation": "~4.3", "symfony/http-foundation": "~4.3",
"symfony/http-kernel": "~4.1", "symfony/http-kernel": "~4.1",

18
src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
View File

@ -61,7 +61,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
} }
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception); $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
$this->assertSame($translatedMessage, $exception->getMessage()); $this->assertRegExp($translatedMessage, $exception->getMessage());
$this->assertSame($error['type'], $exception->getSeverity()); $this->assertSame($error['type'], $exception->getSeverity());
$this->assertSame($error['file'], $exception->getFile()); $this->assertSame($error['file'], $exception->getFile());
$this->assertSame($error['line'], $exception->getLine()); $this->assertSame($error['line'], $exception->getLine());
@ -82,7 +82,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'WhizBangFactory\' not found', 'message' => 'Class \'WhizBangFactory\' not found',
], ],
"Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?", "/^Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement\?$/",
], ],
[ [
[ [
@ -91,7 +91,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found', 'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
], ],
"Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?", "/^Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
], ],
[ [
[ [
@ -100,7 +100,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'UndefinedFunctionException\' not found', 'message' => 'Class \'UndefinedFunctionException\' not found',
], ],
"Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?", "/^Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
], ],
[ [
[ [
@ -109,7 +109,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'PEARClass\' not found', 'message' => 'Class \'PEARClass\' not found',
], ],
"Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?", "/^Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"\?$/",
], ],
[ [
[ [
@ -118,7 +118,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
], ],
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?", "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
], ],
[ [
[ [
@ -127,7 +127,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
], ],
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?", "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
[$autoloader, 'loadClass'], [$autoloader, 'loadClass'],
], ],
[ [
@ -137,7 +137,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
], ],
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?", "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?/",
[$debugClassLoader, 'loadClass'], [$debugClassLoader, 'loadClass'],
], ],
[ [
@ -147,7 +147,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
'file' => 'foo.php', 'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
], ],
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?", "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
function ($className) { /* do nothing here */ }, function ($className) { /* do nothing here */ },
], ],
]; ];