+ A +
++ B + C +
+ + +HTML +); + + $xpath = new \DOMXPath($document); + $nodeList = $xpath->query($translator->cssToXPath('span:only-of-type')); + + $this->assertSame(1, $nodeList->length); + $this->assertSame('A', $nodeList->item(0)->textContent); + } + public function getXpathLiteralTestData() { return [ @@ -187,7 +202,7 @@ class TranslatorTest extends TestCase ['e:first-of-type', '*/e[position() = 1]'], ['e:last-of-type', '*/e[position() = last()]'], ['e:only-child', "*/*[(name() = 'e') and (last() = 1)]"], - ['e:only-of-type', 'e[last() = 1]'], + ['e:only-of-type', 'e[count(preceding-sibling::e)=0 and count(following-sibling::e)=0]'], ['e:empty', 'e[not(*) and not(string-length())]'], ['e:EmPTY', 'e[not(*) and not(string-length())]'], ['e:root', 'e[not(parent::*)]'], diff --git a/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php b/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php index 0571b3b76..f27878b14 100644 --- a/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php +++ b/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php @@ -44,9 +44,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -56,9 +55,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -68,9 +66,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -84,9 +81,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -101,9 +97,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -117,9 +112,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -134,9 +128,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ @@ -150,9 +143,8 @@ class AttributeMatchingExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value + * @param string $attribute + * @param string $value * * @return XPathExpr */ diff --git a/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php b/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php index a8e0b69f1..2b8aa6a19 100644 --- a/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php +++ b/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php @@ -46,10 +46,8 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * @param bool $last - * @param bool $addNameTest + * @param bool $last + * @param bool $addNameTest * * @return XPathExpr * diff --git a/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php b/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php index 27fe47f9a..288a9e695 100644 --- a/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php +++ b/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php @@ -123,11 +123,13 @@ class PseudoClassExtension extends AbstractExtension */ public function translateOnlyOfType(XPathExpr $xpath) { - if ('*' === $xpath->getElement()) { + $element = $xpath->getElement(); + + if ('*' === $element) { throw new ExpressionErrorException('"*:only-of-type" is not implemented.'); } - return $xpath->addCondition('last() = 1'); + return $xpath->addCondition(sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element)); } /** diff --git a/lib/symfony/css-selector/XPath/Translator.php b/lib/symfony/css-selector/XPath/Translator.php index d07812677..738886031 100644 --- a/lib/symfony/css-selector/XPath/Translator.php +++ b/lib/symfony/css-selector/XPath/Translator.php @@ -180,9 +180,7 @@ class Translator implements TranslatorInterface } /** - * @param string $combiner - * @param NodeInterface $xpath - * @param NodeInterface $combinedXpath + * @param string $combiner * * @return XPathExpr * @@ -212,8 +210,7 @@ class Translator implements TranslatorInterface } /** - * @param XPathExpr $xpath - * @param string $pseudoClass + * @param string $pseudoClass * * @return XPathExpr * @@ -229,10 +226,9 @@ class Translator implements TranslatorInterface } /** - * @param XPathExpr $xpath - * @param string $operator - * @param string $attribute - * @param string $value + * @param string $operator + * @param string $attribute + * @param string $value * * @return XPathExpr * diff --git a/lib/symfony/css-selector/XPath/TranslatorInterface.php b/lib/symfony/css-selector/XPath/TranslatorInterface.php index 0b5de83d5..fdbdf2255 100644 --- a/lib/symfony/css-selector/XPath/TranslatorInterface.php +++ b/lib/symfony/css-selector/XPath/TranslatorInterface.php @@ -38,8 +38,7 @@ interface TranslatorInterface /** * Translates a parsed selector node to an XPath expression. * - * @param SelectorNode $selector - * @param string $prefix + * @param string $prefix * * @return string */ diff --git a/lib/symfony/debug/DebugClassLoader.php b/lib/symfony/debug/DebugClassLoader.php index 13ab9e700..b0174187a 100644 --- a/lib/symfony/debug/DebugClassLoader.php +++ b/lib/symfony/debug/DebugClassLoader.php @@ -317,6 +317,12 @@ class DebugClassLoader return $deprecations; } + /** + * @param string $file + * @param string $class + * + * @return array|null + */ public function checkCase(\ReflectionClass $refl, $file, $class) { $real = explode('\\', $class.strrchr($file, '.')); @@ -333,7 +339,7 @@ class DebugClassLoader array_splice($tail, 0, $i + 1); if (!$tail) { - return; + return null; } $tail = \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $tail); @@ -349,6 +355,8 @@ class DebugClassLoader ) { return [substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)]; } + + return null; } /** @@ -396,7 +404,7 @@ class DebugClassLoader } if (isset($dirFiles[$file])) { - return $real .= $dirFiles[$file]; + return $real.$dirFiles[$file]; } $kFile = strtolower($file); @@ -415,7 +423,7 @@ class DebugClassLoader self::$darwinCache[$kDir][1] = $dirFiles; } - return $real .= $dirFiles[$kFile]; + return $real.$dirFiles[$kFile]; } /** diff --git a/lib/symfony/debug/ErrorHandler.php b/lib/symfony/debug/ErrorHandler.php index c7dc3279d..1b39fab5c 100644 --- a/lib/symfony/debug/ErrorHandler.php +++ b/lib/symfony/debug/ErrorHandler.php @@ -382,8 +382,7 @@ class ErrorHandler */ public function handleError($type, $message, $file, $line) { - // @deprecated to be removed in Symfony 5.0 - if (\PHP_VERSION_ID >= 70300 && $message && '"' === $message[0] && 0 === strpos($message, '"continue') && preg_match('/^"continue(?: \d++)?" targeting switch is equivalent to "break(?: \d++)?"\. Did you mean to use "continue(?: \d++)?"\?$/', $message)) { + if (\PHP_VERSION_ID >= 70300 && E_WARNING === $type && '"' === $message[0] && false !== strpos($message, '" targeting switch is equivalent to "break')) { $type = E_DEPRECATED; } @@ -450,7 +449,7 @@ class ErrorHandler self::$silencedErrorCache[$id][$message] = $errorAsException; } if (null === $lightTrace) { - return; + return true; } } else { if ($scope) { @@ -470,7 +469,7 @@ class ErrorHandler } if ($throw) { - if (E_USER_ERROR & $type) { + if (\PHP_VERSION_ID < 70400 && E_USER_ERROR & $type) { for ($i = 1; isset($backtrace[$i]); ++$i) { if (isset($backtrace[$i]['function'], $backtrace[$i]['type'], $backtrace[$i - 1]['function']) && '__toString' === $backtrace[$i]['function'] @@ -599,7 +598,9 @@ class ErrorHandler $this->exceptionHandler = null; try { if (null !== $exceptionHandler) { - return \call_user_func($exceptionHandler, $exception); + $exceptionHandler($exception); + + return; } $handlerException = $handlerException ?: $exception; } catch (\Exception $handlerException) { diff --git a/lib/symfony/debug/Exception/SilencedErrorContext.php b/lib/symfony/debug/Exception/SilencedErrorContext.php index f862b74f4..2bacfd5c9 100644 --- a/lib/symfony/debug/Exception/SilencedErrorContext.php +++ b/lib/symfony/debug/Exception/SilencedErrorContext.php @@ -54,7 +54,7 @@ class SilencedErrorContext implements \JsonSerializable return $this->trace; } - public function JsonSerialize() + public function jsonSerialize() { return [ 'severity' => $this->severity, diff --git a/lib/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/lib/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index 45dcc00d5..9bae6f865 100644 --- a/lib/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/lib/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -33,11 +33,11 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface $notFoundSuffix = '\' not found'; $notFoundSuffixLen = \strlen($notFoundSuffix); if ($notFoundSuffixLen > $messageLen) { - return; + return null; } if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) { - return; + return null; } foreach (['class', 'interface', 'trait'] as $typeName) { @@ -71,6 +71,8 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface return new ClassNotFoundException($message, $exception); } + + return null; } /** @@ -196,6 +198,8 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface return $candidate; } } + + return null; } /** diff --git a/lib/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/lib/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php index 9eddeba5a..77fc7aa26 100644 --- a/lib/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php +++ b/lib/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php @@ -30,17 +30,17 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface $notFoundSuffix = '()'; $notFoundSuffixLen = \strlen($notFoundSuffix); if ($notFoundSuffixLen > $messageLen) { - return; + return null; } if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) { - return; + return null; } $prefix = 'Call to undefined function '; $prefixLen = \strlen($prefix); if (0 !== strpos($error['message'], $prefix)) { - return; + return null; } $fullyQualifiedFunctionName = substr($error['message'], $prefixLen, -$notFoundSuffixLen); diff --git a/lib/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/lib/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php index 1318cb13b..ff2843b68 100644 --- a/lib/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php +++ b/lib/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php @@ -28,7 +28,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface { preg_match('/^Call to undefined method (.*)::(.*)\(\)$/', $error['message'], $matches); if (!$matches) { - return; + return null; } $className = $matches[1]; diff --git a/lib/symfony/debug/Tests/DebugClassLoaderTest.php b/lib/symfony/debug/Tests/DebugClassLoaderTest.php index c6bc3f7d8..0388acba0 100644 --- a/lib/symfony/debug/Tests/DebugClassLoaderTest.php +++ b/lib/symfony/debug/Tests/DebugClassLoaderTest.php @@ -59,12 +59,10 @@ class DebugClassLoaderTest extends TestCase $this->fail('DebugClassLoader did not register'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage boo - */ public function testThrowingClass() { + $this->expectException('Exception'); + $this->expectExceptionMessage('boo'); try { class_exists(__NAMESPACE__.'\Fixtures\Throwing'); $this->fail('Exception expected'); @@ -139,21 +137,17 @@ class DebugClassLoaderTest extends TestCase } } - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage Case mismatch between loaded and declared class names - */ public function testNameCaseMismatch() { + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('Case mismatch between loaded and declared class names'); class_exists(__NAMESPACE__.'\TestingCaseMismatch', true); } - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage Case mismatch between class and real file names - */ public function testFileCaseMismatch() { + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('Case mismatch between class and real file names'); if (!file_exists(__DIR__.'/Fixtures/CaseMismatch.php')) { $this->markTestSkipped('Can only be run on case insensitive filesystems'); } @@ -161,12 +155,10 @@ class DebugClassLoaderTest extends TestCase class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true); } - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage Case mismatch between loaded and declared class names - */ public function testPsr4CaseMismatch() { + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('Case mismatch between loaded and declared class names'); class_exists(__NAMESPACE__.'\Fixtures\Psr4CaseMismatch', true); } @@ -447,5 +439,7 @@ class ClassLoader } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) { eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }'); } + + return null; } } diff --git a/lib/symfony/debug/Tests/ErrorHandlerTest.php b/lib/symfony/debug/Tests/ErrorHandlerTest.php index bb7fe413a..2cf75a0e8 100644 --- a/lib/symfony/debug/Tests/ErrorHandlerTest.php +++ b/lib/symfony/debug/Tests/ErrorHandlerTest.php @@ -283,6 +283,10 @@ class ErrorHandlerTest extends TestCase public function testHandleUserError() { + if (\PHP_VERSION_ID >= 70400) { + $this->markTestSkipped('PHP 7.4 allows __toString to throw exceptions'); + } + try { $handler = ErrorHandler::register(); $handler->throwAt(0, true); @@ -573,11 +577,11 @@ class ErrorHandlerTest extends TestCase } /** - * @expectedException \Exception * @group no-hhvm */ public function testCustomExceptionHandler() { + $this->expectException('Exception'); $handler = new ErrorHandler(); $handler->setExceptionHandler(function ($e) use ($handler) { $handler->handleException($e); diff --git a/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php b/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php index f755a78cf..0290b05ba 100644 --- a/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php +++ b/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php @@ -256,7 +256,7 @@ class FlattenExceptionTest extends TestCase // assertEquals() does not like NAN values. $this->assertEquals($array[$i][0], 'float'); - $this->assertTrue(is_nan($array[$i++][1])); + $this->assertNan($array[$i][1]); } public function testRecursionInArguments() @@ -267,7 +267,7 @@ class FlattenExceptionTest extends TestCase $flattened = FlattenException::create($exception); $trace = $flattened->getTrace(); - $this->assertContains('*DEEP NESTED ARRAY*', serialize($trace)); + $this->assertStringContainsString('*DEEP NESTED ARRAY*', serialize($trace)); } public function testTooBigArray() @@ -291,8 +291,8 @@ class FlattenExceptionTest extends TestCase $serializeTrace = serialize($trace); - $this->assertContains('*SKIPPED over 10000 entries*', $serializeTrace); - $this->assertNotContains('*value1*', $serializeTrace); + $this->assertStringContainsString('*SKIPPED over 10000 entries*', $serializeTrace); + $this->assertStringNotContainsString('*value1*', $serializeTrace); } private function createException($foo) diff --git a/lib/symfony/debug/Tests/ExceptionHandlerTest.php b/lib/symfony/debug/Tests/ExceptionHandlerTest.php index 8a1966495..7a029e06f 100644 --- a/lib/symfony/debug/Tests/ExceptionHandlerTest.php +++ b/lib/symfony/debug/Tests/ExceptionHandlerTest.php @@ -39,8 +39,8 @@ class ExceptionHandlerTest extends TestCase $handler->sendPhpResponse(new \RuntimeException('Foo')); $response = ob_get_clean(); - $this->assertContains('Whoops, looks like something went wrong.', $response); - $this->assertNotContains('', $response);
+ $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+ $this->assertStringNotContainsString('
', $response);
$handler = new ExceptionHandler(true);
@@ -48,8 +48,8 @@ class ExceptionHandlerTest extends TestCase
$handler->sendPhpResponse(new \RuntimeException('Foo'));
$response = ob_get_clean();
- $this->assertContains('Whoops, looks like something went wrong.', $response);
- $this->assertContains('
', $response);
+ $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+ $this->assertStringContainsString('assertDumpEquals($expected, $var);
}
@@ -211,3 +223,10 @@ class MyArrayIterator extends \ArrayIterator
{
private $foo = 123;
}
+
+class BadSplFileInfo extends \SplFileInfo
+{
+ public function __construct()
+ {
+ }
+}
diff --git a/lib/symfony/var-dumper/Tests/Cloner/DataTest.php b/lib/symfony/var-dumper/Tests/Cloner/DataTest.php
index 7d20bced3..d4b6c24c1 100644
--- a/lib/symfony/var-dumper/Tests/Cloner/DataTest.php
+++ b/lib/symfony/var-dumper/Tests/Cloner/DataTest.php
@@ -69,7 +69,7 @@ class DataTest extends TestCase
$children = $data->getValue();
- $this->assertInternalType('array', $children);
+ $this->assertIsArray($children);
$this->assertInstanceOf(Data::class, $children[0]);
$this->assertInstanceOf(Data::class, $children[1]);
diff --git a/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php b/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
index 0bd596c2a..7444d4bf5 100644
--- a/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
+++ b/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
@@ -26,7 +26,7 @@ class FunctionsTest extends TestCase
ob_start();
$return = dump($var1);
- $out = ob_get_clean();
+ ob_end_clean();
$this->assertEquals($var1, $return);
}
@@ -41,7 +41,7 @@ class FunctionsTest extends TestCase
ob_start();
$return = dump($var1, $var2, $var3);
- $out = ob_get_clean();
+ ob_end_clean();
$this->assertEquals([$var1, $var2, $var3], $return);
}
diff --git a/lib/symfony/web-profiler-bundle/Controller/ExceptionController.php b/lib/symfony/web-profiler-bundle/Controller/ExceptionController.php
index d5b0f5e66..e82144b87 100644
--- a/lib/symfony/web-profiler-bundle/Controller/ExceptionController.php
+++ b/lib/symfony/web-profiler-bundle/Controller/ExceptionController.php
@@ -19,6 +19,7 @@ use Symfony\Component\HttpKernel\Profiler\Profiler;
use Twig\Environment;
use Twig\Error\LoaderError;
use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
/**
* ExceptionController.
@@ -118,17 +119,22 @@ class ExceptionController
protected function templateExists($template)
{
$loader = $this->twig->getLoader();
- if ($loader instanceof ExistsLoaderInterface) {
- return $loader->exists($template);
+
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext($template);
+ } else {
+ $loader->getSource($template);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
+ }
+
+ return false;
}
- try {
- $loader->getSource($template);
-
- return true;
- } catch (LoaderError $e) {
- }
-
- return false;
+ return $loader->exists($template);
}
}
diff --git a/lib/symfony/web-profiler-bundle/Controller/RouterController.php b/lib/symfony/web-profiler-bundle/Controller/RouterController.php
index bd4c945b1..7f2a2406a 100644
--- a/lib/symfony/web-profiler-bundle/Controller/RouterController.php
+++ b/lib/symfony/web-profiler-bundle/Controller/RouterController.php
@@ -78,8 +78,7 @@ class RouterController
/**
* Returns the routing traces associated to the given request.
*
- * @param RequestDataCollector $request
- * @param string $method
+ * @param string $method
*
* @return array
*/
diff --git a/lib/symfony/web-profiler-bundle/DependencyInjection/WebProfilerExtension.php b/lib/symfony/web-profiler-bundle/DependencyInjection/WebProfilerExtension.php
index 2b2f00bd3..19b75c59e 100644
--- a/lib/symfony/web-profiler-bundle/DependencyInjection/WebProfilerExtension.php
+++ b/lib/symfony/web-profiler-bundle/DependencyInjection/WebProfilerExtension.php
@@ -64,9 +64,7 @@ class WebProfilerExtension extends Extension
}
/**
- * Returns the base path for the XSD files.
- *
- * @return string The XSD base path
+ * {@inheritdoc}
*/
public function getXsdValidationBasePath()
{
diff --git a/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php b/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
index 630de0c8b..4f8da03cb 100644
--- a/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
+++ b/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
@@ -42,8 +42,7 @@ class TemplateManager
/**
* Gets the template name for a given panel.
*
- * @param Profile $profile
- * @param string $panel
+ * @param string $panel
*
* @return mixed
*
@@ -118,21 +117,22 @@ class TemplateManager
protected function templateExists($template)
{
$loader = $this->twig->getLoader();
- if ($loader instanceof ExistsLoaderInterface) {
- return $loader->exists($template);
- }
- try {
- if ($loader instanceof SourceContextLoaderInterface || method_exists($loader, 'getSourceContext')) {
- $loader->getSourceContext($template);
- } else {
- $loader->getSource($template);
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext($template);
+ } else {
+ $loader->getSource($template);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
}
- return true;
- } catch (LoaderError $e) {
+ return false;
}
- return false;
+ return $loader->exists($template);
}
}
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Collector/translation.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Collector/translation.html.twig
index cd85ce3ba..79c6e60ff 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Collector/translation.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Collector/translation.html.twig
@@ -13,7 +13,7 @@
{% set text %}
', $response);
}
public function testStatusCode()
@@ -60,7 +60,7 @@ class ExceptionHandlerTest extends TestCase
$handler->sendPhpResponse(new NotFoundHttpException('Foo'));
$response = ob_get_clean();
- $this->assertContains('Sorry, the page you are looking for could not be found.', $response);
+ $this->assertStringContainsString('Sorry, the page you are looking for could not be found.', $response);
$expectedHeaders = [
['HTTP/1.0 404', true, null],
@@ -116,7 +116,7 @@ class ExceptionHandlerTest extends TestCase
});
$handler->handle(new \Exception());
- ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/bug.php?id=76563
+ ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/76563
$this->assertSame('ccc', ob_get_clean());
}
@@ -157,7 +157,7 @@ class ExceptionHandlerTest extends TestCase
private function assertThatTheExceptionWasOutput($content, $expectedClass, $expectedTitle, $expectedMessage)
{
- $this->assertContains(sprintf('%s', $expectedClass, $expectedTitle), $content);
- $this->assertContains(sprintf('', $expectedMessage), $content);
+ $this->assertStringContainsString(sprintf('%s', $expectedClass, $expectedTitle), $content);
+ $this->assertStringContainsString(sprintf('', $expectedMessage), $content);
}
}
diff --git a/lib/symfony/dependency-injection/Argument/RewindableGenerator.php b/lib/symfony/dependency-injection/Argument/RewindableGenerator.php
index f8f771d62..b00a36c34 100644
--- a/lib/symfony/dependency-injection/Argument/RewindableGenerator.php
+++ b/lib/symfony/dependency-injection/Argument/RewindableGenerator.php
@@ -20,7 +20,6 @@ class RewindableGenerator implements \IteratorAggregate, \Countable
private $count;
/**
- * @param callable $generator
* @param int|callable $count
*/
public function __construct(callable $generator, $count)
diff --git a/lib/symfony/dependency-injection/ChildDefinition.php b/lib/symfony/dependency-injection/ChildDefinition.php
index 29fbd48f2..123b38747 100644
--- a/lib/symfony/dependency-injection/ChildDefinition.php
+++ b/lib/symfony/dependency-injection/ChildDefinition.php
@@ -89,7 +89,7 @@ class ChildDefinition extends Definition
* @param int|string $index
* @param mixed $value
*
- * @return self the current instance
+ * @return $this
*
* @throws InvalidArgumentException when $index isn't an integer
*/
diff --git a/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php b/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
index cff09d57d..5ca2b2246 100644
--- a/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
+++ b/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
@@ -81,8 +81,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
}
/**
- * @param Definition $definition
- * @param bool $required
+ * @param bool $required
*
* @return \ReflectionFunctionAbstract|null
*
@@ -90,6 +89,10 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
*/
protected function getConstructor(Definition $definition, $required)
{
+ if ($definition->isSynthetic()) {
+ return null;
+ }
+
if (\is_string($factory = $definition->getFactory())) {
if (!\function_exists($factory)) {
throw new RuntimeException(sprintf('Invalid service "%s": function "%s" does not exist.', $this->currentId, $factory));
@@ -137,8 +140,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
}
/**
- * @param Definition $definition
- * @param string $method
+ * @param string $method
*
* @throws RuntimeException
*
diff --git a/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php b/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
index fc4047f90..bff9d4207 100644
--- a/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
@@ -122,7 +122,7 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
$this->lazy = false;
$byConstructor = $this->byConstructor;
- $this->byConstructor = true;
+ $this->byConstructor = $isRoot || $byConstructor;
$this->processValue($value->getFactory());
$this->processValue($value->getArguments());
$this->byConstructor = $byConstructor;
@@ -156,7 +156,7 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
}
if (!$this->container->hasDefinition($id)) {
- return;
+ return null;
}
return $this->container->normalizeId($id);
diff --git a/lib/symfony/dependency-injection/Compiler/AutowirePass.php b/lib/symfony/dependency-injection/Compiler/AutowirePass.php
index c8e7a0f57..91b279c77 100644
--- a/lib/symfony/dependency-injection/Compiler/AutowirePass.php
+++ b/lib/symfony/dependency-injection/Compiler/AutowirePass.php
@@ -79,8 +79,6 @@ class AutowirePass extends AbstractRecursivePass
/**
* Creates a resource to help know if this service has changed.
*
- * @param \ReflectionClass $reflectionClass
- *
* @return AutowireServiceResource
*
* @deprecated since version 3.3, to be removed in 4.0. Use ContainerBuilder::getReflectionClass() instead.
@@ -168,9 +166,6 @@ class AutowirePass extends AbstractRecursivePass
}
/**
- * @param \ReflectionClass $reflectionClass
- * @param array $methodCalls
- *
* @return array
*/
private function autowireCalls(\ReflectionClass $reflectionClass, array $methodCalls)
@@ -205,9 +200,6 @@ class AutowirePass extends AbstractRecursivePass
/**
* Autowires the constructor or a method.
*
- * @param \ReflectionFunctionAbstract $reflectionMethod
- * @param array $arguments
- *
* @return array The autowired arguments
*
* @throws AutowiringFailedException
@@ -318,7 +310,7 @@ class AutowirePass extends AbstractRecursivePass
}
if (!$reference->canBeAutoregistered() || isset($this->types[$type]) || isset($this->ambiguousServiceTypes[$type])) {
- return;
+ return null;
}
if (isset($this->autowired[$type])) {
@@ -328,6 +320,8 @@ class AutowirePass extends AbstractRecursivePass
if (!$this->strictMode) {
return $this->createAutowiredDefinition($type);
}
+
+ return null;
}
/**
@@ -348,8 +342,7 @@ class AutowirePass extends AbstractRecursivePass
/**
* Populates the list of available types for a given definition.
*
- * @param string $id
- * @param Definition $definition
+ * @param string $id
*/
private function populateAvailableType($id, Definition $definition, $onlyAutowiringTypes)
{
@@ -425,7 +418,7 @@ class AutowirePass extends AbstractRecursivePass
private function createAutowiredDefinition($type)
{
if (!($typeHint = $this->container->getReflectionClass($type, false)) || !$typeHint->isInstantiable()) {
- return;
+ return null;
}
$currentId = $this->currentId;
@@ -445,7 +438,7 @@ class AutowirePass extends AbstractRecursivePass
$this->lastFailure = $e->getMessage();
$this->container->log($this, $this->lastFailure);
- return;
+ return null;
} finally {
$this->throwOnAutowiringException = $originalThrowSetting;
$this->currentId = $currentId;
@@ -518,7 +511,7 @@ class AutowirePass extends AbstractRecursivePass
} elseif ($reference->getRequiringClass() && !$reference->canBeAutoregistered() && !$this->strictMode) {
return ' It cannot be auto-registered because it is from a different root namespace.';
} else {
- return;
+ return '';
}
return sprintf(' You should maybe alias this %s to %s.', class_exists($type, false) ? 'class' : 'interface', $message);
@@ -572,5 +565,7 @@ class AutowirePass extends AbstractRecursivePass
if ($aliases) {
return sprintf('Try changing the type-hint%s to "%s" instead.', $extraContext, $aliases[0]);
}
+
+ return null;
}
}
diff --git a/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php b/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
index feb05c049..30a6f524a 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
@@ -81,5 +81,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
}
}
}
+
+ return null;
}
}
diff --git a/lib/symfony/dependency-injection/Compiler/Compiler.php b/lib/symfony/dependency-injection/Compiler/Compiler.php
index a6ae94d8c..bf0d9c3ea 100644
--- a/lib/symfony/dependency-injection/Compiler/Compiler.php
+++ b/lib/symfony/dependency-injection/Compiler/Compiler.php
@@ -73,9 +73,8 @@ class Compiler
/**
* Adds a pass to the PassConfig.
*
- * @param CompilerPassInterface $pass A compiler pass
- * @param string $type The type of the pass
- * @param int $priority Used to sort the passes
+ * @param CompilerPassInterface $pass A compiler pass
+ * @param string $type The type of the pass
*/
public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
{
diff --git a/lib/symfony/dependency-injection/Compiler/PassConfig.php b/lib/symfony/dependency-injection/Compiler/PassConfig.php
index 77f4e9531..323faad57 100644
--- a/lib/symfony/dependency-injection/Compiler/PassConfig.php
+++ b/lib/symfony/dependency-injection/Compiler/PassConfig.php
@@ -113,9 +113,8 @@ class PassConfig
/**
* Adds a pass.
*
- * @param CompilerPassInterface $pass A Compiler pass
- * @param string $type The pass type
- * @param int $priority Used to sort the passes
+ * @param CompilerPassInterface $pass A Compiler pass
+ * @param string $type The pass type
*
* @throws InvalidArgumentException when a pass type doesn't exist
*/
diff --git a/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php b/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
index daff3495a..c7e12536e 100644
--- a/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
+++ b/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
@@ -28,11 +28,10 @@ trait PriorityTaggedServiceTrait
* and knowing that the \SplPriorityQueue class does not respect the FIFO method,
* we should not use that class.
*
- * @see https://bugs.php.net/bug.php?id=53710
- * @see https://bugs.php.net/bug.php?id=60926
+ * @see https://bugs.php.net/53710
+ * @see https://bugs.php.net/60926
*
- * @param string $tagName
- * @param ContainerBuilder $container
+ * @param string $tagName
*
* @return Reference[]
*/
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php b/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
index b80e45256..2559dcf10 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
@@ -56,8 +56,7 @@ class ResolveReferencesToAliasesPass extends AbstractRecursivePass
/**
* Resolves an alias into a definition id.
*
- * @param string $id The definition or alias id to resolve
- * @param ContainerBuilder $container
+ * @param string $id The definition or alias id to resolve
*
* @return string The definition id with aliases resolved
*/
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php b/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
index 51de4d7ac..a7427c5a5 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
@@ -41,6 +41,8 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
}
+ $i = 0;
+
foreach ($arguments[0] as $k => $v) {
if ($v instanceof ServiceClosureArgument) {
continue;
@@ -49,10 +51,13 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k));
}
- if (\is_int($k)) {
+ if ($i === $k) {
unset($arguments[0][$k]);
$k = (string) $v;
+ ++$i;
+ } elseif (\is_int($k)) {
+ $i = null;
}
$arguments[0][$k] = new ServiceClosureArgument($v);
}
@@ -76,9 +81,8 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
}
/**
- * @param ContainerBuilder $container
- * @param Reference[] $refMap
- * @param string|null $callerId
+ * @param Reference[] $refMap
+ * @param string|null $callerId
*
* @return Reference
*/
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
index 23d4745ed..e419e297e 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
@@ -89,9 +89,6 @@ class ServiceReferenceGraph
* @param string $destId
* @param mixed $destValue
* @param string $reference
- * @param bool $lazy
- * @param bool $weak
- * @param bool $byConstructor
*/
public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/*, bool $lazy = false, bool $weak = false, bool $byConstructor = false*/)
{
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
index 5b8c84b6d..911e7a5f5 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
@@ -28,12 +28,10 @@ class ServiceReferenceGraphEdge
private $byConstructor;
/**
- * @param ServiceReferenceGraphNode $sourceNode
- * @param ServiceReferenceGraphNode $destNode
- * @param mixed $value
- * @param bool $lazy
- * @param bool $weak
- * @param bool $byConstructor
+ * @param mixed $value
+ * @param bool $lazy
+ * @param bool $weak
+ * @param bool $byConstructor
*/
public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null, $lazy = false, $weak = false, $byConstructor = false)
{
diff --git a/lib/symfony/dependency-injection/Container.php b/lib/symfony/dependency-injection/Container.php
index f2215acf1..b9f44b0bf 100644
--- a/lib/symfony/dependency-injection/Container.php
+++ b/lib/symfony/dependency-injection/Container.php
@@ -162,8 +162,8 @@ class Container implements ResettableContainerInterface
* Setting a synthetic service to null resets it: has() returns false and get()
* behaves in the same way as if the service was never created.
*
- * @param string $id The service identifier
- * @param object $service The service instance
+ * @param string $id The service identifier
+ * @param object|null $service The service instance
*/
public function set($id, $service)
{
@@ -263,7 +263,7 @@ class Container implements ResettableContainerInterface
* @param string $id The service identifier
* @param int $invalidBehavior The behavior when the service does not exist
*
- * @return object The associated service
+ * @return object|null The associated service
*
* @throws ServiceCircularReferenceException When a circular reference is detected
* @throws ServiceNotFoundException When the service is not defined
@@ -405,7 +405,7 @@ class Container implements ResettableContainerInterface
}
$ids[] = 'service_container';
- return array_map('strval', array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services))));
+ return array_map('strval', array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->aliases), array_keys($this->services))));
}
/**
@@ -444,8 +444,6 @@ class Container implements ResettableContainerInterface
/**
* Creates a service by requiring its factory file.
- *
- * @return object The service created by the file
*/
protected function load($file)
{
diff --git a/lib/symfony/dependency-injection/ContainerBuilder.php b/lib/symfony/dependency-injection/ContainerBuilder.php
index 73145fd8d..f9bfcb521 100644
--- a/lib/symfony/dependency-injection/ContainerBuilder.php
+++ b/lib/symfony/dependency-injection/ContainerBuilder.php
@@ -354,14 +354,14 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
public function getReflectionClass($class, $throw = true)
{
if (!$class = $this->getParameterBag()->resolveValue($class)) {
- return;
+ return null;
}
if (isset(self::$internalTypes[$class])) {
return null;
}
- $resource = null;
+ $resource = $classReflector = null;
try {
if (isset($this->classReflectors[$class])) {
@@ -376,7 +376,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
if ($throw) {
throw $e;
}
- $classReflector = false;
}
if ($this->trackResources) {
@@ -519,8 +518,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
/**
* Sets a service.
*
- * @param string $id The service identifier
- * @param object $service The service instance
+ * @param string $id The service identifier
+ * @param object|null $service The service instance
*
* @throws BadMethodCallException When this ContainerBuilder is compiled
*/
@@ -571,7 +570,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* @param string $id The service identifier
* @param int $invalidBehavior The behavior when the service does not exist
*
- * @return object The associated service
+ * @return object|null The associated service
*
* @throws InvalidArgumentException when no definitions are available
* @throws ServiceCircularReferenceException When a circular reference is detected
@@ -621,7 +620,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$definition = $this->getDefinition($id);
} catch (ServiceNotFoundException $e) {
if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
- return;
+ return null;
}
throw $e;
@@ -946,8 +945,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* This methods allows for simple registration of service definition
* with a fluid interface.
*
- * @param string $id The service identifier
- * @param string $class|null The service class
+ * @param string $id The service identifier
+ * @param string|null $class The service class
*
* @return Definition A Definition instance
*/
@@ -1104,7 +1103,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* @param string $id The service identifier
* @param bool $tryProxy Whether to try proxying the service with a lazy proxy
*
- * @return object The service described by the service definition
+ * @return mixed The service described by the service definition
*
* @throws RuntimeException When the factory definition is incomplete
* @throws RuntimeException When the service is a synthetic service
@@ -1650,8 +1649,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
/**
* Shares a given service in the container.
*
- * @param Definition $definition
- * @param object $service
+ * @param mixed $service
* @param string|null $id
*/
private function shareService(Definition $definition, $service, $id, array &$inlineServices)
diff --git a/lib/symfony/dependency-injection/ContainerInterface.php b/lib/symfony/dependency-injection/ContainerInterface.php
index 2274ec7bb..c5ab4c2ed 100644
--- a/lib/symfony/dependency-injection/ContainerInterface.php
+++ b/lib/symfony/dependency-injection/ContainerInterface.php
@@ -32,8 +32,8 @@ interface ContainerInterface extends PsrContainerInterface
/**
* Sets a service.
*
- * @param string $id The service identifier
- * @param object $service The service instance
+ * @param string $id The service identifier
+ * @param object|null $service The service instance
*/
public function set($id, $service);
@@ -43,7 +43,7 @@ interface ContainerInterface extends PsrContainerInterface
* @param string $id The service identifier
* @param int $invalidBehavior The behavior when the service does not exist
*
- * @return object The associated service
+ * @return object|null The associated service
*
* @throws ServiceCircularReferenceException When a circular reference is detected
* @throws ServiceNotFoundException When the service is not defined
diff --git a/lib/symfony/dependency-injection/Definition.php b/lib/symfony/dependency-injection/Definition.php
index ee5803471..c7d204948 100644
--- a/lib/symfony/dependency-injection/Definition.php
+++ b/lib/symfony/dependency-injection/Definition.php
@@ -796,7 +796,7 @@ class Definition
/**
* Gets the configurator to call after the service is fully initialized.
*
- * @return callable|null The PHP callable to call
+ * @return callable|array|null
*/
public function getConfigurator()
{
@@ -936,8 +936,6 @@ class Definition
* injected in the matching parameters (of the constructor, of methods
* called and of controller actions).
*
- * @param array $bindings
- *
* @return $this
*/
public function setBindings(array $bindings)
diff --git a/lib/symfony/dependency-injection/Dumper/DumperInterface.php b/lib/symfony/dependency-injection/Dumper/DumperInterface.php
index 1ea775ddf..8abc19250 100644
--- a/lib/symfony/dependency-injection/Dumper/DumperInterface.php
+++ b/lib/symfony/dependency-injection/Dumper/DumperInterface.php
@@ -21,9 +21,7 @@ interface DumperInterface
/**
* Dumps the service container.
*
- * @param array $options An array of options
- *
- * @return string The representation of the service container
+ * @return string|array The representation of the service container
*/
public function dump(array $options = []);
}
diff --git a/lib/symfony/dependency-injection/Dumper/PhpDumper.php b/lib/symfony/dependency-injection/Dumper/PhpDumper.php
index 73c868f1e..7596b9953 100644
--- a/lib/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -219,7 +219,7 @@ EOF;
foreach ($ids as $id) {
$c .= ' '.$this->doExport($id)." => true,\n";
}
- $files['removed-ids.php'] = $c .= "];\n";
+ $files['removed-ids.php'] = $c."];\n";
}
foreach ($this->generateServiceFiles() as $file => $c) {
@@ -302,10 +302,10 @@ EOF;
return $this->proxyDumper;
}
- private function analyzeCircularReferences($sourceId, array $edges, &$checkedNodes, &$currentPath = [])
+ private function analyzeCircularReferences($sourceId, array $edges, &$checkedNodes, &$currentPath = [], $byConstructor = true)
{
$checkedNodes[$sourceId] = true;
- $currentPath[$sourceId] = $sourceId;
+ $currentPath[$sourceId] = $byConstructor;
foreach ($edges as $edge) {
$node = $edge->getDestNode();
@@ -314,44 +314,52 @@ EOF;
if (!$node->getValue() instanceof Definition || $sourceId === $id || $edge->isLazy() || $edge->isWeak()) {
// no-op
} elseif (isset($currentPath[$id])) {
- $currentId = $id;
- foreach (array_reverse($currentPath) as $parentId) {
- $this->circularReferences[$parentId][$currentId] = $currentId;
- if ($parentId === $id) {
- break;
- }
- $currentId = $parentId;
- }
+ $this->addCircularReferences($id, $currentPath, $edge->isReferencedByConstructor());
} elseif (!isset($checkedNodes[$id])) {
- $this->analyzeCircularReferences($id, $node->getOutEdges(), $checkedNodes, $currentPath);
+ $this->analyzeCircularReferences($id, $node->getOutEdges(), $checkedNodes, $currentPath, $edge->isReferencedByConstructor());
} elseif (isset($this->circularReferences[$id])) {
- $this->connectCircularReferences($id, $currentPath);
+ $this->connectCircularReferences($id, $currentPath, $edge->isReferencedByConstructor());
}
}
unset($currentPath[$sourceId]);
}
- private function connectCircularReferences($sourceId, &$currentPath, &$subPath = [])
+ private function connectCircularReferences($sourceId, &$currentPath, $byConstructor, &$subPath = [])
{
- $subPath[$sourceId] = $sourceId;
- $currentPath[$sourceId] = $sourceId;
+ $currentPath[$sourceId] = $subPath[$sourceId] = $byConstructor;
- foreach ($this->circularReferences[$sourceId] as $id) {
+ foreach ($this->circularReferences[$sourceId] as $id => $byConstructor) {
if (isset($currentPath[$id])) {
- $currentId = $id;
- foreach (array_reverse($currentPath) as $parentId) {
- $this->circularReferences[$parentId][$currentId] = $currentId;
- if ($parentId === $id) {
- break;
- }
- $currentId = $parentId;
- }
+ $this->addCircularReferences($id, $currentPath, $byConstructor);
} elseif (!isset($subPath[$id]) && isset($this->circularReferences[$id])) {
- $this->connectCircularReferences($id, $currentPath, $subPath);
+ $this->connectCircularReferences($id, $currentPath, $byConstructor, $subPath);
}
}
- unset($currentPath[$sourceId]);
- unset($subPath[$sourceId]);
+ unset($currentPath[$sourceId], $subPath[$sourceId]);
+ }
+
+ private function addCircularReferences($id, $currentPath, $byConstructor)
+ {
+ $currentPath[$id] = $byConstructor;
+ $circularRefs = [];
+
+ foreach (array_reverse($currentPath) as $parentId => $v) {
+ $byConstructor = $byConstructor && $v;
+ $circularRefs[] = $parentId;
+
+ if ($parentId === $id) {
+ break;
+ }
+ }
+
+ $currentId = $id;
+ foreach ($circularRefs as $parentId) {
+ if (empty($this->circularReferences[$parentId][$currentId])) {
+ $this->circularReferences[$parentId][$currentId] = $byConstructor;
+ }
+
+ $currentId = $parentId;
+ }
}
private function collectLineage($class, array &$lineage)
@@ -462,9 +470,8 @@ EOF;
/**
* Generates the service instance.
*
- * @param string $id
- * @param Definition $definition
- * @param bool $isSimpleInstance
+ * @param string $id
+ * @param bool $isSimpleInstance
*
* @return string
*
@@ -501,8 +508,6 @@ EOF;
/**
* Checks if the definition is a trivial instance.
*
- * @param Definition $definition
- *
* @return bool
*/
private function isTrivialInstance(Definition $definition)
@@ -546,8 +551,7 @@ EOF;
/**
* Adds method calls to a service definition.
*
- * @param Definition $definition
- * @param string $variableName
+ * @param string $variableName
*
* @return string
*/
@@ -579,8 +583,7 @@ EOF;
/**
* Adds configurator definition.
*
- * @param Definition $definition
- * @param string $variableName
+ * @param string $variableName
*
* @return string
*/
@@ -616,9 +619,8 @@ EOF;
/**
* Adds a service.
*
- * @param string $id
- * @param Definition $definition
- * @param string &$file
+ * @param string $id
+ * @param string &$file
*
* @return string
*/
@@ -661,7 +663,6 @@ EOF;
$autowired = $definition->isAutowired() ? ' autowired' : '';
if ($definition->isLazy()) {
- unset($this->circularReferences[$id]);
$lazyInitialization = '$lazyLoad = true';
} else {
$lazyInitialization = '';
@@ -736,12 +737,12 @@ EOF;
private function addInlineReference($id, Definition $definition, $targetId, $forConstructor)
{
- list($callCount, $behavior) = $this->serviceCalls[$targetId];
-
while ($this->container->hasAlias($targetId)) {
$targetId = (string) $this->container->getAlias($targetId);
}
+ list($callCount, $behavior) = $this->serviceCalls[$targetId];
+
if ($id === $targetId) {
return $this->addInlineService($id, $definition, $definition);
}
@@ -750,9 +751,13 @@ EOF;
return '';
}
- $hasSelfRef = isset($this->circularReferences[$id][$targetId]);
- $forConstructor = $forConstructor && !isset($this->definitionVariables[$definition]);
- $code = $hasSelfRef && !$forConstructor ? $this->addInlineService($id, $definition, $definition) : '';
+ $hasSelfRef = isset($this->circularReferences[$id][$targetId]) && !isset($this->definitionVariables[$definition]);
+
+ if ($hasSelfRef && !$forConstructor && !$forConstructor = !$this->circularReferences[$id][$targetId]) {
+ $code = $this->addInlineService($id, $definition, $definition);
+ } else {
+ $code = '';
+ }
if (isset($this->referenceVariables[$targetId]) || (2 > $callCount && (!$hasSelfRef || !$forConstructor))) {
return $code;
@@ -785,15 +790,23 @@ EOTXT
private function addInlineService($id, Definition $definition, Definition $inlineDef = null, $forConstructor = true)
{
- $isSimpleInstance = $isRootInstance = null === $inlineDef;
+ $code = '';
+
+ if ($isSimpleInstance = $isRootInstance = null === $inlineDef) {
+ foreach ($this->serviceCalls as $targetId => list($callCount, $behavior, $byConstructor)) {
+ if ($byConstructor && isset($this->circularReferences[$id][$targetId]) && !$this->circularReferences[$id][$targetId]) {
+ $code .= $this->addInlineReference($id, $definition, $targetId, $forConstructor);
+ }
+ }
+ }
if (isset($this->definitionVariables[$inlineDef = $inlineDef ?: $definition])) {
- return '';
+ return $code;
}
$arguments = [$inlineDef->getArguments(), $inlineDef->getFactory()];
- $code = $this->addInlineVariables($id, $definition, $arguments, $forConstructor);
+ $code .= $this->addInlineVariables($id, $definition, $arguments, $forConstructor);
if ($arguments = array_filter([$inlineDef->getProperties(), $inlineDef->getMethodCalls(), $inlineDef->getConfigurator()])) {
$isSimpleInstance = false;
@@ -950,7 +963,7 @@ $bagClass
*/
class $class extends $baseClass
{
- private \$parameters;
+ private \$parameters = [];
private \$targetDirs = [];
public function __construct()
@@ -1452,7 +1465,6 @@ EOF;
/**
* Exports parameters.
*
- * @param array $parameters
* @param string $path
* @param int $indent
*
@@ -1550,7 +1562,7 @@ EOF;
return implode(' && ', $conditions);
}
- private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage $definitions = null, array &$calls = [])
+ private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage $definitions = null, array &$calls = [], $byConstructor = null)
{
if (null === $definitions) {
$definitions = new \SplObjectStorage();
@@ -1558,12 +1570,16 @@ EOF;
foreach ($arguments as $argument) {
if (\is_array($argument)) {
- $this->getDefinitionsFromArguments($argument, $definitions, $calls);
+ $this->getDefinitionsFromArguments($argument, $definitions, $calls, $byConstructor);
} elseif ($argument instanceof Reference) {
$id = $this->container->normalizeId($argument);
+ while ($this->container->hasAlias($id)) {
+ $id = (string) $this->container->getAlias($id);
+ }
+
if (!isset($calls[$id])) {
- $calls[$id] = [0, $argument->getInvalidBehavior()];
+ $calls[$id] = [0, $argument->getInvalidBehavior(), $byConstructor];
} else {
$calls[$id][1] = min($calls[$id][1], $argument->getInvalidBehavior());
}
@@ -1575,8 +1591,10 @@ EOF;
$definitions[$argument] = 1 + $definitions[$argument];
} else {
$definitions[$argument] = 1;
- $arguments = [$argument->getArguments(), $argument->getFactory(), $argument->getProperties(), $argument->getMethodCalls(), $argument->getConfigurator()];
- $this->getDefinitionsFromArguments($arguments, $definitions, $calls);
+ $arguments = [$argument->getArguments(), $argument->getFactory()];
+ $this->getDefinitionsFromArguments($arguments, $definitions, $calls, null === $byConstructor || $byConstructor);
+ $arguments = [$argument->getProperties(), $argument->getMethodCalls(), $argument->getConfigurator()];
+ $this->getDefinitionsFromArguments($arguments, $definitions, $calls, null !== $byConstructor && $byConstructor);
}
}
@@ -1717,6 +1735,11 @@ EOF;
return '$'.$value;
} elseif ($value instanceof Reference) {
$id = $this->container->normalizeId($value);
+
+ while ($this->container->hasAlias($id)) {
+ $id = (string) $this->container->getAlias($id);
+ }
+
if (null !== $this->referenceVariables && isset($this->referenceVariables[$id])) {
return $this->dumpValue($this->referenceVariables[$id], $interpolate);
}
diff --git a/lib/symfony/dependency-injection/Dumper/XmlDumper.php b/lib/symfony/dependency-injection/Dumper/XmlDumper.php
index 67b6dbebb..cfc932843 100644
--- a/lib/symfony/dependency-injection/Dumper/XmlDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/XmlDumper.php
@@ -90,9 +90,8 @@ class XmlDumper extends Dumper
/**
* Adds a service.
*
- * @param Definition $definition
- * @param string $id
- * @param \DOMElement $parent
+ * @param Definition $definition
+ * @param string $id
*/
private function addService($definition, $id, \DOMElement $parent)
{
@@ -221,9 +220,7 @@ class XmlDumper extends Dumper
/**
* Adds a service alias.
*
- * @param string $alias
- * @param Alias $id
- * @param \DOMElement $parent
+ * @param string $alias
*/
private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
{
@@ -261,10 +258,8 @@ class XmlDumper extends Dumper
/**
* Converts parameters.
*
- * @param array $parameters
- * @param string $type
- * @param \DOMElement $parent
- * @param string $keyAttribute
+ * @param string $type
+ * @param string $keyAttribute
*/
private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
{
diff --git a/lib/symfony/dependency-injection/Dumper/YamlDumper.php b/lib/symfony/dependency-injection/Dumper/YamlDumper.php
index 8f3fcddf3..1e795c7da 100644
--- a/lib/symfony/dependency-injection/Dumper/YamlDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/YamlDumper.php
@@ -57,8 +57,7 @@ class YamlDumper extends Dumper
/**
* Adds a service.
*
- * @param string $id
- * @param Definition $definition
+ * @param string $id
*
* @return string
*/
@@ -171,7 +170,6 @@ class YamlDumper extends Dumper
* Adds a service alias.
*
* @param string $alias
- * @param Alias $id
*
* @return string
*/
@@ -230,9 +228,7 @@ class YamlDumper extends Dumper
/**
* Dumps callable to YAML format.
*
- * @param callable $callable
- *
- * @return callable
+ * @param mixed $callable
*/
private function dumpCallable($callable)
{
@@ -337,8 +333,7 @@ class YamlDumper extends Dumper
/**
* Prepares parameters.
*
- * @param array $parameters
- * @param bool $escape
+ * @param bool $escape
*
* @return array
*/
diff --git a/lib/symfony/dependency-injection/EnvVarProcessor.php b/lib/symfony/dependency-injection/EnvVarProcessor.php
index a23b83436..885408093 100644
--- a/lib/symfony/dependency-injection/EnvVarProcessor.php
+++ b/lib/symfony/dependency-injection/EnvVarProcessor.php
@@ -65,7 +65,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
if (false !== $i || 'string' !== $prefix) {
if (null === $env = $getEnv($name)) {
- return;
+ return null;
}
} elseif (isset($_ENV[$name])) {
$env = $_ENV[$name];
@@ -77,7 +77,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
}
if (null === $env = $this->container->getParameter("env($name)")) {
- return;
+ return null;
}
}
diff --git a/lib/symfony/dependency-injection/Extension/Extension.php b/lib/symfony/dependency-injection/Extension/Extension.php
index a9389862c..7df483064 100644
--- a/lib/symfony/dependency-injection/Extension/Extension.php
+++ b/lib/symfony/dependency-injection/Extension/Extension.php
@@ -84,11 +84,12 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
$class = $container->getReflectionClass($class);
$constructor = $class ? $class->getConstructor() : null;
- if ($class && (!$constructor || !$constructor->getNumberOfRequiredParameters())) {
- return $class->newInstance();
- }
+ return $class && (!$constructor || !$constructor->getNumberOfRequiredParameters()) ? $class->newInstance() : null;
}
+ /**
+ * @return array
+ */
final protected function processConfiguration(ConfigurationInterface $configuration, array $configs)
{
$processor = new Processor();
diff --git a/lib/symfony/dependency-injection/Extension/ExtensionInterface.php b/lib/symfony/dependency-injection/Extension/ExtensionInterface.php
index 18de31272..6a7a2cf02 100644
--- a/lib/symfony/dependency-injection/Extension/ExtensionInterface.php
+++ b/lib/symfony/dependency-injection/Extension/ExtensionInterface.php
@@ -37,7 +37,7 @@ interface ExtensionInterface
/**
* Returns the base path for the XSD files.
*
- * @return string The XSD base path
+ * @return string|false
*/
public function getXsdValidationBasePath();
diff --git a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
index f2d0476f6..3946eafaf 100644
--- a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
+++ b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
@@ -30,9 +30,7 @@ interface DumperInterface
/**
* Generates the code to be used to instantiate a proxy in the dumped factory code.
*
- * @param Definition $definition
- * @param string $id Service identifier
- * @param string $factoryCode The code to execute to create the service, will be added to the interface in 4.0
+ * @param string $id Service identifier
*
* @return string
*/
diff --git a/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php b/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
index fb21ba2e4..cb19c729c 100644
--- a/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
+++ b/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
@@ -37,7 +37,7 @@ class ProxyHelper
$type = method_exists($r, 'getReturnType') ? $r->getReturnType() : null;
}
if (!$type) {
- return;
+ return null;
}
if (!\is_string($type)) {
$name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
@@ -53,13 +53,12 @@ class ProxyHelper
return $prefix.$name;
}
if (!$r instanceof \ReflectionMethod) {
- return;
+ return null;
}
if ('self' === $lcName) {
return $prefix.$r->getDeclaringClass()->name;
}
- if ($parent = $r->getDeclaringClass()->getParentClass()) {
- return $prefix.$parent->name;
- }
+
+ return ($parent = $r->getDeclaringClass()->getParentClass()) ? $prefix.$parent->name : null;
}
}
diff --git a/lib/symfony/dependency-injection/Loader/FileLoader.php b/lib/symfony/dependency-injection/Loader/FileLoader.php
index f0d920189..77cad3c04 100644
--- a/lib/symfony/dependency-injection/Loader/FileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/FileLoader.php
@@ -86,8 +86,7 @@ abstract class FileLoader extends BaseFileLoader
/**
* Registers a definition in the container with its instanceof-conditionals.
*
- * @param string $id
- * @param Definition $definition
+ * @param string $id
*/
protected function setDefinition($id, Definition $definition)
{
@@ -150,12 +149,7 @@ abstract class FileLoader extends BaseFileLoader
try {
$r = $this->container->getReflectionClass($class);
} catch (\ReflectionException $e) {
- $classes[$class] = sprintf(
- 'While discovering services from namespace "%s", an error was thrown when processing the class "%s": "%s".',
- $namespace,
- $class,
- $e->getMessage()
- );
+ $classes[$class] = $e->getMessage();
continue;
}
// check to make sure the expected class exists
diff --git a/lib/symfony/dependency-injection/Loader/XmlFileLoader.php b/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
index 718592d8e..c4b9b69a0 100644
--- a/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
@@ -86,8 +86,7 @@ class XmlFileLoader extends FileLoader
/**
* Parses parameters.
*
- * @param \DOMDocument $xml
- * @param string $file
+ * @param string $file
*/
private function parseParameters(\DOMDocument $xml, $file)
{
@@ -99,8 +98,7 @@ class XmlFileLoader extends FileLoader
/**
* Parses imports.
*
- * @param \DOMDocument $xml
- * @param string $file
+ * @param string $file
*/
private function parseImports(\DOMDocument $xml, $file)
{
@@ -121,8 +119,7 @@ class XmlFileLoader extends FileLoader
/**
* Parses multiple definitions.
*
- * @param \DOMDocument $xml
- * @param string $file
+ * @param string $file
*/
private function parseDefinitions(\DOMDocument $xml, $file, $defaults)
{
@@ -193,9 +190,7 @@ class XmlFileLoader extends FileLoader
/**
* Parses an individual Definition.
*
- * @param \DOMElement $service
- * @param string $file
- * @param array $defaults
+ * @param string $file
*
* @return Definition|null
*/
@@ -211,7 +206,7 @@ class XmlFileLoader extends FileLoader
$alias->setPublic($defaults['public']);
}
- return;
+ return null;
}
if ($this->isLoadingInstanceof) {
@@ -394,9 +389,8 @@ class XmlFileLoader extends FileLoader
/**
* Processes anonymous services.
*
- * @param \DOMDocument $xml
- * @param string $file
- * @param array $defaults
+ * @param string $file
+ * @param array $defaults
*/
private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
{
@@ -456,10 +450,9 @@ class XmlFileLoader extends FileLoader
/**
* Returns arguments as valid php types.
*
- * @param \DOMElement $node
- * @param string $name
- * @param string $file
- * @param bool $lowercase
+ * @param string $name
+ * @param string $file
+ * @param bool $lowercase
*
* @return mixed
*/
@@ -546,8 +539,7 @@ class XmlFileLoader extends FileLoader
/**
* Get child elements by name.
*
- * @param \DOMNode $node
- * @param mixed $name
+ * @param mixed $name
*
* @return \DOMElement[]
*/
@@ -566,8 +558,6 @@ class XmlFileLoader extends FileLoader
/**
* Validates a documents XML schema.
*
- * @param \DOMDocument $dom
- *
* @return bool
*
* @throws RuntimeException When extension references a non-existent XSD file
@@ -645,8 +635,7 @@ EOF
/**
* Validates an alias.
*
- * @param \DOMElement $alias
- * @param string $file
+ * @param string $file
*/
private function validateAlias(\DOMElement $alias, $file)
{
@@ -666,8 +655,7 @@ EOF
/**
* Validates an extension.
*
- * @param \DOMDocument $dom
- * @param string $file
+ * @param string $file
*
* @throws InvalidArgumentException When no extension is found corresponding to a tag
*/
@@ -688,8 +676,6 @@ EOF
/**
* Loads from an extension.
- *
- * @param \DOMDocument $xml
*/
private function loadFromExtensions(\DOMDocument $xml)
{
@@ -724,7 +710,7 @@ EOF
*
* @param \DOMElement $element A \DOMElement instance
*
- * @return array A PHP array
+ * @return mixed
*/
public static function convertDomElementToArray(\DOMElement $element)
{
diff --git a/lib/symfony/dependency-injection/Loader/YamlFileLoader.php b/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
index a3a799024..891689bc1 100644
--- a/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -170,7 +170,6 @@ class YamlFileLoader extends FileLoader
/**
* Parses all imports.
*
- * @param array $content
* @param string $file
*/
private function parseImports(array $content, $file)
@@ -200,7 +199,6 @@ class YamlFileLoader extends FileLoader
/**
* Parses definitions.
*
- * @param array $content
* @param string $file
*/
private function parseDefinitions(array $content, $file)
@@ -241,7 +239,6 @@ class YamlFileLoader extends FileLoader
}
/**
- * @param array $content
* @param string $file
*
* @return array
@@ -306,8 +303,6 @@ class YamlFileLoader extends FileLoader
}
/**
- * @param array $service
- *
* @return bool
*/
private function isUsingShortSyntax(array $service)
@@ -327,7 +322,6 @@ class YamlFileLoader extends FileLoader
* @param string $id
* @param array|string $service
* @param string $file
- * @param array $defaults
*
* @throws InvalidArgumentException When tags are invalid
*/
diff --git a/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php b/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
index c4e702181..e13d2824f 100644
--- a/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
+++ b/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
@@ -195,7 +195,7 @@ class ParameterBag implements ParameterBagInterface
* @param string $value The string to resolve
* @param array $resolving An array of keys that are being resolved (used internally to detect circular references)
*
- * @return string The resolved string
+ * @return mixed The resolved string
*
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
* @throws ParameterCircularReferenceException if a circular reference if detected
diff --git a/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php b/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
index cbae0eaaa..509174839 100644
--- a/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
+++ b/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
@@ -90,11 +90,9 @@ class ChildDefinitionTest extends TestCase
$this->assertSame(['index_0' => 'foo'], $def->getArguments());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testReplaceArgumentShouldRequireIntegerIndex()
{
+ $this->expectException('InvalidArgumentException');
$def = new ChildDefinition('foo');
$def->replaceArgument('0', 'foo');
@@ -119,11 +117,9 @@ class ChildDefinitionTest extends TestCase
$this->assertSame([0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'], $def->getArguments());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetArgumentShouldCheckBounds()
{
+ $this->expectException('OutOfBoundsException');
$def = new ChildDefinition('foo');
$def->setArguments([0 => 'foo']);
@@ -137,20 +133,16 @@ class ChildDefinitionTest extends TestCase
$this->assertInstanceOf(ChildDefinition::class, new DefinitionDecorator('foo'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\BadMethodCallException
- */
public function testCannotCallSetAutoconfigured()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\BadMethodCallException');
$def = new ChildDefinition('foo');
$def->setAutoconfigured(true);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\BadMethodCallException
- */
public function testCannotCallSetInstanceofConditionals()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\BadMethodCallException');
$def = new ChildDefinition('foo');
$def->setInstanceofConditionals(['Foo' => new ChildDefinition('')]);
}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
index 0bd94a3e6..66b6e19cc 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
@@ -25,28 +25,28 @@ class AnalyzeServiceReferencesPassTest extends TestCase
{
$container = new ContainerBuilder();
- $a = $container
+ $container
->register('a')
->addArgument($ref1 = new Reference('b'))
;
- $b = $container
+ $container
->register('b')
->addMethodCall('setA', [$ref2 = new Reference('a')])
;
- $c = $container
+ $container
->register('c')
->addArgument($ref3 = new Reference('a'))
->addArgument($ref4 = new Reference('b'))
;
- $d = $container
+ $container
->register('d')
->setProperty('foo', $ref5 = new Reference('b'))
;
- $e = $container
+ $container
->register('e')
->setConfigurator([$ref6 = new Reference('b'), 'methodName'])
;
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
index d029636a7..4e17778f8 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
@@ -17,11 +17,9 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
class AutoAliasServicePassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
- */
public function testProcessWithMissingParameter()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException');
$container = new ContainerBuilder();
$container->register('example')
@@ -31,11 +29,9 @@ class AutoAliasServicePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- */
public function testProcessWithMissingFormat()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$container = new ContainerBuilder();
$container->register('example')
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
index 31fa665ae..c5bcc660a 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
@@ -182,12 +182,10 @@ class AutowirePassTest extends TestCase
$this->assertCount(1, $pass->getAutowiringExceptions());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.
- */
public function testPrivateConstructorThrowsAutowireException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.');
$container = new ContainerBuilder();
$container->autowire('private_service', __NAMESPACE__.'\PrivateConstructor');
@@ -196,12 +194,10 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".
- */
public function testTypeCollision()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".');
$container = new ContainerBuilder();
$container->register('c1', __NAMESPACE__.'\CollisionA');
@@ -214,12 +210,10 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".
- */
public function testTypeNotGuessable()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
$container = new ContainerBuilder();
$container->register('a1', __NAMESPACE__.'\Foo');
@@ -231,12 +225,10 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgumentForSubclass::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".
- */
public function testTypeNotGuessableWithSubclass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgumentForSubclass::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
$container = new ContainerBuilder();
$container->register('a1', __NAMESPACE__.'\B');
@@ -248,12 +240,10 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists.
- */
public function testTypeNotGuessableNoServicesFound()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists.');
$container = new ContainerBuilder();
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
@@ -372,12 +362,10 @@ class AutowirePassTest extends TestCase
$this->assertCount(0, $container->getDefinition('bar')->getArguments());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.
- */
public function testClassNotFoundThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.');
$container = new ContainerBuilder();
$aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
@@ -389,12 +377,11 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadParentTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\OptionalServiceClass" but this class is missing a parent class (Class Symfony\Bug\NotExistClass not found).
- */
public function testParentClassNotFoundThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessageRegExp('{^Cannot autowire service "a": argument "\$r" of method "(Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Compiler\\\\)BadParentTypeHintedArgument::__construct\(\)" has type "\1OptionalServiceClass" but this class is missing a parent class \(Class "?Symfony\\\\Bug\\\\NotExistClass"? not found}');
+
$container = new ContainerBuilder();
$aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
@@ -455,12 +442,10 @@ class AutowirePassTest extends TestCase
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "arg_no_type_hint": argument "$bar" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" is type-hinted "array", you should configure its value explicitly.
- */
public function testScalarArgsCannotBeAutowired()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "arg_no_type_hint": argument "$bar" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" is type-hinted "array", you should configure its value explicitly.');
$container = new ContainerBuilder();
$container->register(A::class);
@@ -473,12 +458,10 @@ class AutowirePassTest extends TestCase
(new AutowirePass())->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "arg_no_type_hint": argument "$foo" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" has no type-hint, you should configure its value explicitly.
- */
public function testNoTypeArgsCannotBeAutowired()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "arg_no_type_hint": argument "$foo" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" has no type-hint, you should configure its value explicitly.');
$container = new ContainerBuilder();
$container->register(A::class);
@@ -606,12 +589,10 @@ class AutowirePassTest extends TestCase
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @exceptedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.
- */
public function testWithNonExistingSetterAndAutowiring()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass": method "setLogger()" does not exist.');
$container = new ContainerBuilder();
$definition = $container->register(CaseSensitiveClass::class, CaseSensitiveClass::class)->setAutowired(true);
@@ -744,12 +725,10 @@ class AutowirePassTest extends TestCase
$this->assertSame('Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".', $e->getMessage());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "my_service": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\K::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" but no such service exists. Did you create a class that implements this interface?
- */
public function testInterfaceWithNoImplementationSuggestToWriteOne()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "my_service": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\K::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" but no such service exists. Did you create a class that implements this interface?');
$container = new ContainerBuilder();
$aDefinition = $container->register('my_service', K::class);
@@ -815,10 +794,10 @@ class AutowirePassTest extends TestCase
/**
* @dataProvider provideNotWireableCalls
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
*/
public function testNotWireableCalls($method, $expectedMsg)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
$container = new ContainerBuilder();
$foo = $container->register('foo', NotWireable::class)->setAutowired(true)
@@ -832,12 +811,8 @@ class AutowirePassTest extends TestCase
$foo->addMethodCall($method, []);
}
- if (method_exists($this, 'expectException')) {
- $this->expectException(RuntimeException::class);
- $this->expectExceptionMessage($expectedMsg);
- } else {
- $this->setExpectedException(RuntimeException::class, $expectedMsg);
- }
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage($expectedMsg);
(new ResolveClassPass())->process($container);
(new AutowireRequiredMethodsPass())->process($container);
@@ -891,12 +866,10 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.
- */
public function testExceptionWhenAliasExists()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.');
$container = new ContainerBuilder();
// multiple I services... but there *is* IInterface available
@@ -911,12 +884,11 @@ class AutowirePassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
- * @expectedExceptionMessage Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. You should maybe alias this class to one of these existing services: "i", "i2".
- */
public function testExceptionWhenAliasDoesNotExist()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+ $this->expectExceptionMessage('Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. You should maybe alias this class to one of these existing services: "i", "i2".');
+
$container = new ContainerBuilder();
// multiple I instances... but no IInterface alias
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
index c1e47b308..9554c23bb 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
@@ -41,11 +41,11 @@ class CheckArgumentsValidityPassTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @dataProvider definitionProvider
*/
public function testException(array $arguments, array $methodCalls)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$definition = $container->register('foo');
$definition->setArguments($arguments);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
index 8423c5616..8d501368e 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -21,11 +21,9 @@ use Symfony\Component\DependencyInjection\Reference;
class CheckCircularReferencesPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testProcess()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->register('a')->addArgument(new Reference('b'));
$container->register('b')->addArgument(new Reference('a'));
@@ -33,11 +31,9 @@ class CheckCircularReferencesPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testProcessWithAliases()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->register('a')->addArgument(new Reference('b'));
$container->setAlias('b', 'c');
@@ -46,11 +42,9 @@ class CheckCircularReferencesPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testProcessWithFactory()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container
@@ -64,11 +58,9 @@ class CheckCircularReferencesPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testProcessDetectsIndirectCircularReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->register('a')->addArgument(new Reference('b'));
$container->register('b')->addArgument(new Reference('c'));
@@ -77,11 +69,9 @@ class CheckCircularReferencesPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testProcessDetectsIndirectCircularReferenceWithFactory()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->register('a')->addArgument(new Reference('b'));
@@ -95,11 +85,9 @@ class CheckCircularReferencesPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testDeepCircularReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->register('a')->addArgument(new Reference('b'));
$container->register('b')->addArgument(new Reference('c'));
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
index e1dd60b66..6caa38c7b 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -17,22 +17,18 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
class CheckDefinitionValidityPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testProcessDetectsSyntheticNonPublicDefinitions()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$container->register('a')->setSynthetic(true)->setPublic(false);
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testProcessDetectsNonSyntheticNonAbstractDefinitionWithoutClass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$container->register('a')->setSynthetic(false)->setAbstract(false);
@@ -65,22 +61,18 @@ class CheckDefinitionValidityPassTest extends TestCase
$this->addToAssertionCount(1);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testInvalidTags()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$container->register('a', 'class')->addTag('foo', ['bar' => ['baz' => 'baz']]);
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException
- */
public function testDynamicPublicServiceName()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
$container = new ContainerBuilder();
$env = $container->getParameterBag()->get('env(BAR)');
$container->register("foo.$env", 'class')->setPublic(true);
@@ -88,11 +80,9 @@ class CheckDefinitionValidityPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException
- */
public function testDynamicPublicAliasName()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
$container = new ContainerBuilder();
$env = $container->getParameterBag()->get('env(BAR)');
$container->setAlias("foo.$env", 'class')->setPublic(true);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
index 38717eaf1..c4f331b18 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -35,11 +35,9 @@ class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
$this->addToAssertionCount(1);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- */
public function testProcessThrowsExceptionOnInvalidReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
$container = new ContainerBuilder();
$container
@@ -50,11 +48,9 @@ class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
$this->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- */
public function testProcessThrowsExceptionOnInvalidReferenceFromInlinedDefinition()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
$container = new ContainerBuilder();
$def = new Definition();
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
index 22b6fd154..85a8a40f1 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
@@ -18,11 +18,9 @@ use Symfony\Component\DependencyInjection\Reference;
class CheckReferenceValidityPassTest extends TestCase
{
- /**
- * @expectedException \RuntimeException
- */
public function testProcessDetectsReferenceToAbstractDefinition()
{
+ $this->expectException('RuntimeException');
$container = new ContainerBuilder();
$container->register('a')->setAbstract(true);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
index ce6f0496e..273261976 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
@@ -18,12 +18,10 @@ use Symfony\Component\DependencyInjection\Definition;
class DefinitionErrorExceptionPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Things went wrong!
- */
public function testThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Things went wrong!');
$container = new ContainerBuilder();
$def = new Definition();
$def->addError('Things went wrong!');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
index 6e5c80a7d..d98db6406 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -111,12 +111,10 @@ class InlineServiceDefinitionsPassTest extends TestCase
$this->assertEquals(new Reference('bar'), $container->getDefinition('foo')->getArgument(0));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- * @expectedExceptionMessage Circular reference detected for service "bar", path: "bar -> foo -> bar".
- */
public function testProcessThrowsOnNonSharedLoops()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+ $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> foo -> bar".');
$container = new ContainerBuilder();
$container
->register('foo')
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php b/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
index 10c34aa48..348d1d7f5 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
@@ -43,7 +43,7 @@ class IntegrationTest extends TestCase
->addArgument(new Reference('c'))
;
- $b = $container
+ $container
->register('b', '\stdClass')
->addArgument(new Reference('c'))
->setPublic(false)
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index 1bef795f2..13692657b 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -85,7 +85,7 @@ class MergeExtensionConfigurationPassTest extends TestCase
$pass = new MergeExtensionConfigurationPass();
$pass->process($container);
- $this->assertContains(new FileResource(__FILE__), $container->getResources(), '', false, false);
+ $this->assertContainsEquals(new FileResource(__FILE__), $container->getResources());
}
public function testOverriddenEnvsAreMerged()
@@ -102,12 +102,10 @@ class MergeExtensionConfigurationPassTest extends TestCase
$this->assertSame(['BAZ' => 1, 'FOO' => 0], $container->getEnvCounters());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Using a cast in "env(int:FOO)" is incompatible with resolution at compile time in "Symfony\Component\DependencyInjection\Tests\Compiler\BarExtension". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.
- */
public function testProcessedEnvsAreIncompatibleWithResolve()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Using a cast in "env(int:FOO)" is incompatible with resolution at compile time in "Symfony\Component\DependencyInjection\Tests\Compiler\BarExtension". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.');
$container = new ContainerBuilder();
$container->registerExtension(new BarExtension());
$container->prependExtensionConfig('bar', []);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
index 3d3fdf769..2c42ba0ce 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -53,12 +53,10 @@ class RegisterEnvVarProcessorsPassTest extends TestCase
$this->assertFalse($container->has('container.env_var_processors_locator'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid type "foo" returned by "Symfony\Component\DependencyInjection\Tests\Compiler\BadProcessor::getProvidedTypes()", expected one of "array", "bool", "float", "int", "string".
- */
public function testBadProcessor()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid type "foo" returned by "Symfony\Component\DependencyInjection\Tests\Compiler\BadProcessor::getProvidedTypes()", expected one of "array", "bool", "float", "int", "string".');
$container = new ContainerBuilder();
$container->register('foo', BadProcessor::class)->addTag('container.env_var_processor');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 0356c9713..a16bfc169 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -28,12 +28,10 @@ require_once __DIR__.'/../Fixtures/includes/classes.php';
class RegisterServiceSubscribersPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Service "foo" must implement interface "Symfony\Component\DependencyInjection\ServiceSubscriberInterface".
- */
public function testInvalidClass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Service "foo" must implement interface "Symfony\Component\DependencyInjection\ServiceSubscriberInterface".');
$container = new ContainerBuilder();
$container->register('foo', CustomDefinition::class)
@@ -44,12 +42,10 @@ class RegisterServiceSubscribersPassTest extends TestCase
(new ResolveServiceSubscribersPass())->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "bar" given for service "foo".
- */
public function testInvalidAttributes()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "bar" given for service "foo".');
$container = new ContainerBuilder();
$container->register('foo', TestServiceSubscriber::class)
@@ -118,12 +114,10 @@ class RegisterServiceSubscribersPassTest extends TestCase
$this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Service key "test" does not exist in the map returned by "Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber::getSubscribedServices()" for service "foo_service".
- */
public function testExtraServiceSubscriber()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Service key "test" does not exist in the map returned by "Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber::getSubscribedServices()" for service "foo_service".');
$container = new ContainerBuilder();
$container->register('foo_service', TestServiceSubscriber::class)
->setAutowired(true)
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
index f9c755c35..2f0a413ca 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -53,11 +53,9 @@ class ReplaceAliasByActualDefinitionPassTest extends TestCase
$this->assertSame('b_alias', (string) $resolvedFactory[0]);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testProcessWithInvalidAlias()
{
+ $this->expectException('InvalidArgumentException');
$container = new ContainerBuilder();
$container->setAlias('a_alias', 'a');
$this->process($container);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
index 7bbecf620..fd526caa9 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -14,9 +14,11 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
+use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
@@ -48,12 +50,10 @@ class ResolveBindingsPassTest extends TestCase
$this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Unused binding "$quz" in service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy".
- */
public function testUnusedBinding()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Unused binding "$quz" in service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy".');
$container = new ContainerBuilder();
$definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
@@ -63,12 +63,11 @@ class ResolveBindingsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegexp Unused binding "$quz" in service [\s\S]+ Invalid service ".*\\ParentNotExists": class NotExists not found\.
- */
public function testMissingParent()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Unused binding "\$quz" in service [\s\S]+/');
+
$container = new ContainerBuilder();
$definition = $container->register(ParentNotExists::class, ParentNotExists::class);
@@ -113,12 +112,10 @@ class ResolveBindingsPassTest extends TestCase
$this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @exceptedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.
- */
public function testWithNonExistingSetterAndBinding()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.');
$container = new ContainerBuilder();
$bindings = [
@@ -132,4 +129,25 @@ class ResolveBindingsPassTest extends TestCase
$pass = new ResolveBindingsPass();
$pass->process($container);
}
+
+ public function testSyntheticServiceWithBind()
+ {
+ $container = new ContainerBuilder();
+ $argument = new BoundArgument('bar');
+
+ $container->register('foo', 'stdClass')
+ ->addArgument(new Reference('synthetic.service'));
+
+ $container->register('synthetic.service')
+ ->setSynthetic(true)
+ ->setBindings(['$apiKey' => $argument]);
+
+ $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class)
+ ->setBindings(['$apiKey' => $argument]);
+
+ (new ResolveBindingsPass())->process($container);
+ (new DefinitionErrorExceptionPass())->process($container);
+
+ $this->assertSame([1 => 'bar'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+ }
}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index 4eca8f707..eee4cf730 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -390,7 +390,7 @@ class ResolveChildDefinitionsPassTest extends TestCase
->setBindings(['a' => '1', 'b' => '2'])
;
- $child = $container->setDefinition('child', new ChildDefinition('parent'))
+ $container->setDefinition('child', new ChildDefinition('parent'))
->setBindings(['b' => 'B', 'c' => 'C'])
;
@@ -432,12 +432,10 @@ class ResolveChildDefinitionsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- * @expectedExceptionMessageRegExp /^Circular reference detected for service "c", path: "c -> b -> a -> c"./
- */
public function testProcessDetectsChildDefinitionIndirectCircularReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+ $this->expectExceptionMessageRegExp('/^Circular reference detected for service "c", path: "c -> b -> a -> c"./');
$container = new ContainerBuilder();
$container->register('a');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
index 48df3843d..81e05fb28 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
@@ -82,15 +82,13 @@ class ResolveClassPassTest extends TestCase
$this->assertSame(self::class, $child->getClass());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.
- */
public function testAmbiguousChildDefinition()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
$container = new ContainerBuilder();
- $parent = $container->register('App\Foo', null);
- $child = $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
+ $container->register('App\Foo', null);
+ $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
(new ResolveClassPass())->process($container);
}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
index 3438fad06..b87fb3db9 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
@@ -71,12 +71,10 @@ class ResolveFactoryClassPassTest extends TestCase
$this->assertSame($factory, $container->getDefinition('factory')->getFactory());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The "factory" service is defined to be created by a factory, but is missing the factory class. Did you forget to define the factory or service class?
- */
public function testNotAnyClassThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The "factory" service is defined to be created by a factory, but is missing the factory class. Did you forget to define the factory or service class?');
$container = new ContainerBuilder();
$factory = $container->register('factory');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index 26560b4ca..83be84bd0 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -172,12 +172,10 @@ class ResolveInstanceofConditionalsPassTest extends TestCase
$this->assertFalse($def->isAutowired());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage "App\FakeInterface" is set as an "instanceof" conditional, but it does not exist.
- */
public function testBadInterfaceThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('"App\FakeInterface" is set as an "instanceof" conditional, but it does not exist.');
$container = new ContainerBuilder();
$def = $container->register('normal_service', self::class);
$def->setInstanceofConditionals([
@@ -200,12 +198,10 @@ class ResolveInstanceofConditionalsPassTest extends TestCase
$this->assertTrue($container->hasDefinition('normal_service'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Autoconfigured instanceof for type "PHPUnit\Framework\TestCase" defines method calls but these are not supported and should be removed.
- */
public function testProcessThrowsExceptionForAutoconfiguredCalls()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines method calls but these are not supported and should be removed\./');
$container = new ContainerBuilder();
$container->registerForAutoconfiguration(parent::class)
->addMethodCall('setFoo');
@@ -213,12 +209,10 @@ class ResolveInstanceofConditionalsPassTest extends TestCase
(new ResolveInstanceofConditionalsPass())->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Autoconfigured instanceof for type "PHPUnit\Framework\TestCase" defines arguments but these are not supported and should be removed.
- */
public function testProcessThrowsExceptionForArguments()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines arguments but these are not supported and should be removed\./');
$container = new ContainerBuilder();
$container->registerForAutoconfiguration(parent::class)
->addArgument('bar');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
index e25d96f53..a10d226f1 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
@@ -60,11 +60,9 @@ class ResolveNamedArgumentsPassTest extends TestCase
$this->assertSame([0 => '123'], $definition->getArguments());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testClassNull()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$definition = $container->register(NamedArgumentsDummy::class);
@@ -74,11 +72,9 @@ class ResolveNamedArgumentsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testClassNotExist()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$definition = $container->register(NotExist::class, NotExist::class);
@@ -88,11 +84,9 @@ class ResolveNamedArgumentsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- */
public function testClassNoConstructor()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
$container = new ContainerBuilder();
$definition = $container->register(NoConstructor::class, NoConstructor::class);
@@ -102,12 +96,10 @@ class ResolveNamedArgumentsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "__construct()" has no argument named "$notFound". Check your service definition.
- */
public function testArgumentNotFound()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "__construct()" has no argument named "$notFound". Check your service definition.');
$container = new ContainerBuilder();
$definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
@@ -117,12 +109,10 @@ class ResolveNamedArgumentsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1": method "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummyWithoutReturnTypes::createTestDefinition1()" has no argument named "$notFound". Check your service definition.
- */
public function testCorrectMethodReportedInException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1": method "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummyWithoutReturnTypes::createTestDefinition1()" has no argument named "$notFound". Check your service definition.');
$container = new ContainerBuilder();
$container->register(FactoryDummyWithoutReturnTypes::class, FactoryDummyWithoutReturnTypes::class);
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
index 55b47057b..2465bb7e3 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
@@ -51,11 +51,9 @@ class ResolveReferencesToAliasesPassTest extends TestCase
$this->assertEquals('foo', (string) $arguments[0]);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testAliasCircularReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$container = new ContainerBuilder();
$container->setAlias('bar', 'foo');
$container->setAlias('foo', 'bar');
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
index 27ee7db53..66af69b54 100644
--- a/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -25,12 +25,10 @@ require_once __DIR__.'/../Fixtures/includes/classes.php';
class ServiceLocatorTagPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set.
- */
public function testNoServices()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set.');
$container = new ContainerBuilder();
$container->register('foo', ServiceLocator::class)
@@ -40,12 +38,10 @@ class ServiceLocatorTagPassTest extends TestCase
(new ServiceLocatorTagPass())->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set, "string" found for key "0".
- */
public function testInvalidServices()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set, "string" found for key "0".');
$container = new ContainerBuilder();
$container->register('foo', ServiceLocator::class)
@@ -118,6 +114,7 @@ class ServiceLocatorTagPassTest extends TestCase
->setArguments([[
'bar' => new Reference('baz'),
new Reference('bar'),
+ 16 => new Reference('baz'),
]])
->addTag('container.service_locator')
;
@@ -128,6 +125,7 @@ class ServiceLocatorTagPassTest extends TestCase
$locator = $container->get('foo');
$this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
+ $this->assertSame(TestDefinition2::class, \get_class($locator(16)));
}
public function testBindingsAreCopied()
diff --git a/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
index eb5fc5a99..51af451c1 100644
--- a/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
+++ b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\DependencyInjection\Tests\Config;
+use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\ResourceCheckerInterface;
use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
@@ -52,15 +53,15 @@ class ContainerParametersResourceCheckerTest extends TestCase
public function isFreshProvider()
{
- yield 'not fresh on missing parameter' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
+ yield 'not fresh on missing parameter' => [function (MockObject $container) {
$container->method('hasParameter')->with('locales')->willReturn(false);
}, false];
- yield 'not fresh on different value' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
+ yield 'not fresh on different value' => [function (MockObject $container) {
$container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
}, false];
- yield 'fresh on every identical parameters' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
+ yield 'fresh on every identical parameters' => [function (MockObject $container) {
$container->expects($this->exactly(2))->method('hasParameter')->willReturn(true);
$container->expects($this->exactly(2))->method('getParameter')
->withConsecutive(
diff --git a/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php b/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
index 46074a67a..f2666ef96 100644
--- a/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
+++ b/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
@@ -128,12 +128,10 @@ class ContainerBuilderTest extends TestCase
$this->assertTrue($builder->has('bar'), '->has() returns true if a service exists');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- * @expectedExceptionMessage You have requested a non-existent service "foo".
- */
public function testGetThrowsExceptionIfServiceDoesNotExist()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+ $this->expectExceptionMessage('You have requested a non-existent service "foo".');
$builder = new ContainerBuilder();
$builder->get('foo');
}
@@ -145,11 +143,9 @@ class ContainerBuilderTest extends TestCase
$this->assertNull($builder->get('foo', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if the service does not exist and NULL_ON_INVALID_REFERENCE is passed as a second argument');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
public function testGetThrowsCircularReferenceExceptionIfServiceHasReferenceToItself()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
$builder = new ContainerBuilder();
$builder->register('baz', 'stdClass')->setArguments([new Reference('baz')]);
$builder->get('baz');
@@ -168,7 +164,7 @@ class ContainerBuilderTest extends TestCase
$builder = new ContainerBuilder();
$builder->register('foo', 'stdClass');
- $this->assertInternalType('object', $builder->get('foo'), '->get() returns the service definition associated with the id');
+ $this->assertIsObject($builder->get('foo'), '->get() returns the service definition associated with the id');
}
public function testGetReturnsRegisteredService()
@@ -197,21 +193,21 @@ class ContainerBuilderTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @dataProvider provideBadId
*/
public function testBadAliasId($id)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$builder = new ContainerBuilder();
$builder->setAlias($id, 'foo');
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @dataProvider provideBadId
*/
public function testBadDefinitionId($id)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$builder = new ContainerBuilder();
$builder->setDefinition($id, new Definition('Foo'));
}
@@ -228,12 +224,10 @@ class ContainerBuilderTest extends TestCase
];
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage You have requested a synthetic service ("foo"). The DIC does not know how to construct this service.
- */
public function testGetUnsetLoadingServiceWhenCreateServiceThrowsAnException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('You have requested a synthetic service ("foo"). The DIC does not know how to construct this service.');
$builder = new ContainerBuilder();
$builder->register('foo', 'stdClass')->setSynthetic(true);
@@ -512,11 +506,9 @@ class ContainerBuilderTest extends TestCase
$this->assertEquals(0, $i);
}
- /**
- * @expectedException \RuntimeException
- */
public function testCreateSyntheticService()
{
+ $this->expectException('RuntimeException');
$builder = new ContainerBuilder();
$builder->register('foo', 'Bar\FooClass')->setSynthetic(true);
$builder->get('foo');
@@ -540,12 +532,10 @@ class ContainerBuilderTest extends TestCase
$this->assertEquals($builder->get('foo'), $builder->resolveServices(new Expression('service("foo")')), '->resolveServices() resolves expressions');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Constructing service "foo" from a parent definition is not supported at build time.
- */
public function testResolveServicesWithDecoratedDefinition()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Constructing service "foo" from a parent definition is not supported at build time.');
$builder = new ContainerBuilder();
$builder->setDefinition('grandpa', new Definition('stdClass'));
$builder->setDefinition('parent', new ChildDefinition('grandpa'));
@@ -621,12 +611,10 @@ class ContainerBuilderTest extends TestCase
$this->assertSame(['AInterface' => $childDefA, 'BInterface' => $childDefB], $container->getAutoconfiguredInstanceof());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage "AInterface" has already been autoconfigured and merge() does not support merging autoconfiguration for the same class/interface.
- */
public function testMergeThrowsExceptionForDuplicateAutomaticInstanceofDefinitions()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('"AInterface" has already been autoconfigured and merge() does not support merging autoconfiguration for the same class/interface.');
$container = new ContainerBuilder();
$config = new ContainerBuilder();
$container->registerForAutoconfiguration('AInterface');
@@ -662,7 +650,7 @@ class ContainerBuilderTest extends TestCase
$container->resolveEnvPlaceholders('%dummy%', true);
$container->resolveEnvPlaceholders('%dummy2%', true);
- $this->assertInternalType('array', $container->resolveEnvPlaceholders('%dummy2%', true));
+ $this->assertIsArray($container->resolveEnvPlaceholders('%dummy2%', true));
foreach ($dummyArray as $key => $value) {
$this->assertArrayHasKey($key, $container->resolveEnvPlaceholders('%dummy2%', true));
@@ -728,12 +716,10 @@ class ContainerBuilderTest extends TestCase
putenv('ARRAY');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type array inside string value "ABC %env(json:ARRAY)%".
- */
public function testCompileWithArrayInStringResolveEnv()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type array inside string value "ABC %env(json:ARRAY)%".');
putenv('ARRAY={"foo":"bar"}');
$container = new ContainerBuilder();
@@ -743,12 +729,10 @@ class ContainerBuilderTest extends TestCase
putenv('ARRAY');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvNotFoundException
- * @expectedExceptionMessage Environment variable not found: "FOO".
- */
public function testCompileWithResolveMissingEnv()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvNotFoundException');
+ $this->expectExceptionMessage('Environment variable not found: "FOO".');
$container = new ContainerBuilder();
$container->setParameter('foo', '%env(FOO)%');
$container->compile(true);
@@ -827,12 +811,10 @@ class ContainerBuilderTest extends TestCase
$this->assertSame(['baz_bar'], array_keys($container->getDefinition('foo')->getArgument(1)));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException
- * @expectedExceptionMessage Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").
- */
public function testCircularDynamicEnv()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException');
+ $this->expectExceptionMessage('Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").');
putenv('DUMMY_ENV_VAR=some%foo%');
$container = new ContainerBuilder();
@@ -846,11 +828,9 @@ class ContainerBuilderTest extends TestCase
}
}
- /**
- * @expectedException \LogicException
- */
public function testMergeLogicException()
{
+ $this->expectException('LogicException');
$container = new ContainerBuilder();
$container->setResourceTracking(false);
$container->compile();
@@ -1053,7 +1033,7 @@ class ContainerBuilderTest extends TestCase
$container->registerExtension($extension = new \ProjectExtension());
$this->assertSame($container->getExtension('project'), $extension, '->registerExtension() registers an extension');
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
+ $this->expectException('LogicException');
$container->getExtension('no_registered');
}
@@ -1100,11 +1080,9 @@ class ContainerBuilderTest extends TestCase
$this->assertInstanceOf('BarClass', $container->get('bar_user')->bar);
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testThrowsExceptionWhenSetServiceOnACompiledContainer()
{
+ $this->expectException('BadMethodCallException');
$container = new ContainerBuilder();
$container->setResourceTracking(false);
$container->register('a', 'stdClass')->setPublic(true);
@@ -1131,11 +1109,9 @@ class ContainerBuilderTest extends TestCase
$this->assertEquals($a, $container->get('a'));
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testThrowsExceptionWhenSetDefinitionOnACompiledContainer()
{
+ $this->expectException('BadMethodCallException');
$container = new ContainerBuilder();
$container->setResourceTracking(false);
$container->compile();
@@ -1227,12 +1203,10 @@ class ContainerBuilderTest extends TestCase
$this->assertNotSame($bar->foo, $barUser->foo);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- * @expectedExceptionMessage Circular reference detected for service "app.test_class", path: "app.test_class -> App\TestClass -> app.test_class".
- */
public function testThrowsCircularExceptionForCircularAliases()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+ $this->expectExceptionMessage('Circular reference detected for service "app.test_class", path: "app.test_class -> App\TestClass -> app.test_class".');
$builder = new ContainerBuilder();
$builder->setAliases([
@@ -1285,63 +1259,53 @@ class ContainerBuilderTest extends TestCase
$this->assertEquals(CaseSensitiveClass::class, $autoloadClass->getClass());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.
- */
public function testNoClassFromGlobalNamespaceClassId()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.');
$container = new ContainerBuilder();
- $definition = $container->register(\DateTime::class);
+ $container->register(\DateTime::class);
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The definition for "\DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.
- */
public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The definition for "\DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.');
$container = new ContainerBuilder();
$container->register('\\'.\DateTime::class);
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.
- */
public function testNoClassFromNamespaceClassIdWithLeadingSlash()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.');
$container = new ContainerBuilder();
$container->register('\\'.FooClass::class);
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The definition for "123_abc" has no class.
- */
public function testNoClassFromNonClassId()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The definition for "123_abc" has no class.');
$container = new ContainerBuilder();
- $definition = $container->register('123_abc');
+ $container->register('123_abc');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The definition for "\foo" has no class.
- */
public function testNoClassFromNsSeparatorId()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The definition for "\foo" has no class.');
$container = new ContainerBuilder();
- $definition = $container->register('\\foo');
+ $container->register('\\foo');
$container->compile();
}
@@ -1423,6 +1387,13 @@ class ContainerBuilderTest extends TestCase
$this->assertEquals((object) ['bar6' => (object) []], $foo6);
$this->assertInstanceOf(\stdClass::class, $container->get('root'));
+
+ $manager3 = $container->get('manager3');
+ $listener3 = $container->get('listener3');
+ $this->assertSame($manager3, $listener3->manager, 'Both should identically be the manager3 service');
+
+ $listener4 = $container->get('listener4');
+ $this->assertInstanceOf('stdClass', $listener4);
}
public function provideAlmostCircular()
diff --git a/lib/symfony/dependency-injection/Tests/ContainerTest.php b/lib/symfony/dependency-injection/Tests/ContainerTest.php
index 5dbec886e..46527e09d 100644
--- a/lib/symfony/dependency-injection/Tests/ContainerTest.php
+++ b/lib/symfony/dependency-injection/Tests/ContainerTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\DependencyInjection\Tests;
use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
@@ -157,7 +156,7 @@ class ContainerTest extends TestCase
$sc = new ProjectServiceContainer();
$sc->set('foo', $obj = new \stdClass());
- $this->assertEquals(['service_container', 'internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'internal_dependency', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by factory methods in the method map, followed by service ids defined by set()');
+ $this->assertEquals(['service_container', 'internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'internal_dependency', 'alias', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by factory methods in the method map, followed by service ids defined by set()');
}
/**
@@ -169,7 +168,7 @@ class ContainerTest extends TestCase
$sc = new LegacyProjectServiceContainer();
$sc->set('foo', $obj = new \stdClass());
- $this->assertEquals(['internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods, followed by service ids defined by set()');
+ $this->assertEquals(['internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container', 'alias', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods, followed by service ids defined by set()');
}
public function testSet()
@@ -331,24 +330,20 @@ class ContainerTest extends TestCase
}
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- * @expectedExceptionMessage The "request" service is synthetic, it needs to be set at boot time before it can be used.
- */
public function testGetSyntheticServiceThrows()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+ $this->expectExceptionMessage('The "request" service is synthetic, it needs to be set at boot time before it can be used.');
require_once __DIR__.'/Fixtures/php/services9_compiled.php';
$container = new \ProjectServiceContainer();
$container->get('request');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- * @expectedExceptionMessage The "inlined" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.
- */
public function testGetRemovedServiceThrows()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+ $this->expectExceptionMessage('The "inlined" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.');
require_once __DIR__.'/Fixtures/php/services9_compiled.php';
$container = new \ProjectServiceContainer();
@@ -430,12 +425,10 @@ class ContainerTest extends TestCase
$this->assertNull($c->get('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE));
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage Something went terribly wrong!
- */
public function testGetThrowsException()
{
+ $this->expectException('Exception');
+ $this->expectExceptionMessage('Something went terribly wrong!');
$c = new ProjectServiceContainer();
try {
diff --git a/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php b/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
index ac58d3455..8d382f81f 100644
--- a/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
+++ b/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
@@ -92,11 +92,9 @@ class DefinitionDecoratorTest extends TestCase
$this->assertEquals(['index_0' => 'foo'], $def->getArguments());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testReplaceArgumentShouldRequireIntegerIndex()
{
+ $this->expectException('InvalidArgumentException');
$def = new DefinitionDecorator('foo');
$def->replaceArgument('0', 'foo');
@@ -117,11 +115,9 @@ class DefinitionDecoratorTest extends TestCase
$this->assertEquals([0 => 'foo', 1 => 'bar', 'index_1' => 'baz'], $def->getArguments());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetArgumentShouldCheckBounds()
{
+ $this->expectException('OutOfBoundsException');
$def = new DefinitionDecorator('foo');
$def->setArguments([0 => 'foo']);
diff --git a/lib/symfony/dependency-injection/Tests/DefinitionTest.php b/lib/symfony/dependency-injection/Tests/DefinitionTest.php
index 3581fe855..1f1cd380f 100644
--- a/lib/symfony/dependency-injection/Tests/DefinitionTest.php
+++ b/lib/symfony/dependency-injection/Tests/DefinitionTest.php
@@ -69,12 +69,8 @@ class DefinitionTest extends TestCase
$def = new Definition('stdClass');
- if (method_exists($this, 'expectException')) {
- $this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage('The decorated service inner name for "foo" must be different than the service name itself.');
- } else {
- $this->setExpectedException('InvalidArgumentException', 'The decorated service inner name for "foo" must be different than the service name itself.');
- }
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The decorated service inner name for "foo" must be different than the service name itself.');
$def->setDecoratedService('foo', 'foo');
}
@@ -101,12 +97,10 @@ class DefinitionTest extends TestCase
$this->assertEquals([['foo', ['foo']]], $def->getMethodCalls(), '->removeMethodCall() removes a method to call');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Method name cannot be empty.
- */
public function testExceptionOnEmptyMethodCall()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Method name cannot be empty.');
$def = new Definition('stdClass');
$def->addMethodCall('');
}
@@ -169,10 +163,10 @@ class DefinitionTest extends TestCase
/**
* @dataProvider invalidDeprecationMessageProvider
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
*/
public function testSetDeprecatedWithInvalidDeprecationTemplate($message)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$def = new Definition('stdClass');
$def->setDeprecated(false, $message);
}
@@ -254,35 +248,29 @@ class DefinitionTest extends TestCase
$this->assertSame(['foo', 'bar'], $def->getArguments());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetArgumentShouldCheckBounds()
{
+ $this->expectException('OutOfBoundsException');
$def = new Definition('stdClass');
$def->addArgument('foo');
$def->getArgument(1);
}
- /**
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage The index "1" is not in the range [0, 0].
- */
public function testReplaceArgumentShouldCheckBounds()
{
+ $this->expectException('OutOfBoundsException');
+ $this->expectExceptionMessage('The index "1" is not in the range [0, 0].');
$def = new Definition('stdClass');
$def->addArgument('foo');
$def->replaceArgument(1, 'bar');
}
- /**
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage Cannot replace arguments if none have been configured yet.
- */
public function testReplaceArgumentWithoutExistingArgumentsShouldCheckBounds()
{
+ $this->expectException('OutOfBoundsException');
+ $this->expectExceptionMessage('Cannot replace arguments if none have been configured yet.');
$def = new Definition('stdClass');
$def->replaceArgument(0, 'bar');
}
diff --git a/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php b/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
index 926933bb0..b2cbb3caf 100644
--- a/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
+++ b/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
@@ -150,10 +150,10 @@ class PhpDumperTest extends TestCase
/**
* @dataProvider provideInvalidParameters
- * @expectedException \InvalidArgumentException
*/
public function testExportParameters($parameters)
{
+ $this->expectException('InvalidArgumentException');
$container = new ContainerBuilder(new ParameterBag($parameters));
$container->compile();
$dumper = new PhpDumper($container);
@@ -284,11 +284,11 @@ class PhpDumperTest extends TestCase
/**
* @dataProvider provideInvalidFactories
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Cannot dump definition
*/
public function testInvalidFactories($factory)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Cannot dump definition');
$container = new ContainerBuilder();
$def = new Definition('stdClass');
$def->setPublic(true);
@@ -448,12 +448,10 @@ class PhpDumperTest extends TestCase
$this->assertStringEqualsFile(__FILE__, $container->getParameter('random'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException
- * @expectedExceptionMessage Environment variables "FOO" are never used. Please, check your container's configuration.
- */
public function testUnusedEnvParameter()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
+ $this->expectExceptionMessage('Environment variables "FOO" are never used. Please, check your container\'s configuration.');
$container = new ContainerBuilder();
$container->getParameter('env(FOO)');
$container->compile();
@@ -461,12 +459,10 @@ class PhpDumperTest extends TestCase
$dumper->dump();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException
- * @expectedExceptionMessage Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").
- */
public function testCircularDynamicEnv()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException');
+ $this->expectExceptionMessage('Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").');
$container = new ContainerBuilder();
$container->setParameter('foo', '%bar%');
$container->setParameter('bar', '%env(resolve:DUMMY_ENV_VAR)%');
@@ -546,12 +542,8 @@ class PhpDumperTest extends TestCase
$dumper = new PhpDumper($container);
$message = 'Circular reference detected for service "foo", path: "foo -> bar -> foo". Try running "composer require symfony/proxy-manager-bridge".';
- if (method_exists($this, 'expectException')) {
- $this->expectException(ServiceCircularReferenceException::class);
- $this->expectExceptionMessage($message);
- } else {
- $this->setExpectedException(ServiceCircularReferenceException::class, $message);
- }
+ $this->expectException(ServiceCircularReferenceException::class);
+ $this->expectExceptionMessage($message);
$dumper->dump();
}
@@ -842,6 +834,13 @@ class PhpDumperTest extends TestCase
$this->assertEquals((object) ['bar6' => (object) []], $foo6);
$this->assertInstanceOf(\stdClass::class, $container->get('root'));
+
+ $manager3 = $container->get('manager3');
+ $listener3 = $container->get('listener3');
+ $this->assertSame($manager3, $listener3->manager);
+
+ $listener4 = $container->get('listener4');
+ $this->assertInstanceOf('stdClass', $listener4);
}
public function provideAlmostCircular()
@@ -887,7 +886,7 @@ class PhpDumperTest extends TestCase
->setPublic(true)
->addArgument($baz);
- $passConfig = $container->getCompiler()->getPassConfig();
+ $container->getCompiler()->getPassConfig();
$container->compile();
$dumper = new PhpDumper($container);
@@ -979,7 +978,6 @@ class PhpDumperTest extends TestCase
$container->compile();
$dumper = new PhpDumper($container);
- $dump = $dumper->dump();
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services_adawson.php', $dumper->dump());
}
@@ -1135,6 +1133,30 @@ class PhpDumperTest extends TestCase
$this->assertTrue($container->has('foo'));
$this->assertSame('some value', $container->get('foo'));
}
+
+ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheServiceArePublic()
+ {
+ $container = new ContainerBuilder();
+
+ $container->register('foo', 'stdClass')->setPublic(true);
+ $container->setAlias('bar', 'foo')->setPublic(true);
+
+ $container->compile();
+
+ // Bar is found in the compiled container
+ $service_ids = $container->getServiceIds();
+ $this->assertContains('bar', $service_ids);
+
+ $dumper = new PhpDumper($container);
+ $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_AliasesCanBeFoundInTheDumpedContainer']);
+ eval('?>'.$dump);
+
+ $container = new \Symfony_DI_PhpDumper_AliasesCanBeFoundInTheDumpedContainer();
+
+ // Bar should still be found in the compiled container
+ $service_ids = $container->getServiceIds();
+ $this->assertContains('bar', $service_ids);
+ }
}
class Rot13EnvVarProcessor implements EnvVarProcessorInterface
diff --git a/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php b/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
index 972350467..2830d46a7 100644
--- a/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
+++ b/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
@@ -98,12 +98,12 @@ class EnvVarProcessorTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Non-numeric env var
* @dataProvider invalidInts
*/
public function testGetEnvIntInvalid($value)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Non-numeric env var');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('int', 'foo', function ($name) use ($value) {
@@ -148,12 +148,12 @@ class EnvVarProcessorTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Non-numeric env var
* @dataProvider invalidFloats
*/
public function testGetEnvFloatInvalid($value)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Non-numeric env var');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('float', 'foo', function ($name) use ($value) {
@@ -197,12 +197,12 @@ class EnvVarProcessorTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage undefined constant
* @dataProvider invalidConsts
*/
public function testGetEnvConstInvalid($value)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('undefined constant');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('const', 'foo', function ($name) use ($value) {
@@ -246,12 +246,10 @@ class EnvVarProcessorTest extends TestCase
$this->assertSame([1], $result);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Syntax error
- */
public function testGetEnvInvalidJson()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Syntax error');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('json', 'foo', function ($name) {
@@ -262,12 +260,12 @@ class EnvVarProcessorTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Invalid JSON env var
* @dataProvider otherJsonValues
*/
public function testGetEnvJsonOther($value)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Invalid JSON env var');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('json', 'foo', function ($name) use ($value) {
@@ -287,12 +285,10 @@ class EnvVarProcessorTest extends TestCase
];
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Unsupported env var prefix
- */
public function testGetEnvUnknown()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Unsupported env var prefix');
$processor = new EnvVarProcessor(new Container());
$processor->getEnv('unknown', 'foo', function ($name) {
diff --git a/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php b/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
index 3c912f2a1..9f35b4a41 100644
--- a/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
+++ b/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
@@ -34,12 +34,10 @@ class ExtensionTest extends TestCase
];
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The config array has no 'enabled' key.
- */
public function testIsConfigEnabledOnNonEnableableConfig()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The config array has no \'enabled\' key.');
$extension = new EnableableExtension();
$extension->isConfigEnabled(new ContainerBuilder(), []);
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
index 44e7cacd2..ba103fce0 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
@@ -4,5 +4,4 @@ namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDi
class Service2
{
-
}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
index 691b42771..d2cff5b95 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
@@ -4,5 +4,4 @@ namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDi
class Service5
{
-
}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php b/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
index 8e1c2a6ce..eed18426a 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
@@ -20,7 +20,6 @@ class StubbedTranslator
{
public function __construct(ContainerInterface $container)
{
-
}
public function addResource($format, $resource, $locale, $domain = null)
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
index df136cfa5..a1f885399 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
@@ -2,7 +2,6 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls;
@@ -102,6 +101,35 @@ $container->register('dispatcher2', 'stdClass')->setPublic($public)
$container->register('subscriber2', 'stdClass')->setPublic(false)
->addArgument(new Reference('manager2'));
+// doctrine-like event system with listener
+
+$container->register('manager3', 'stdClass')
+ ->setLazy(true)
+ ->setPublic(true)
+ ->addArgument(new Reference('connection3'));
+
+$container->register('connection3', 'stdClass')
+ ->setPublic($public)
+ ->setProperty('listener', [new Reference('listener3')]);
+
+$container->register('listener3', 'stdClass')
+ ->setPublic(true)
+ ->setProperty('manager', new Reference('manager3'));
+
+// doctrine-like event system with small differences
+
+$container->register('manager4', 'stdClass')
+ ->setLazy(true)
+ ->addArgument(new Reference('connection4'));
+
+$container->register('connection4', 'stdClass')
+ ->setPublic($public)
+ ->setProperty('listener', [new Reference('listener4')]);
+
+$container->register('listener4', 'stdClass')
+ ->setPublic(true)
+ ->addArgument(new Reference('manager4'));
+
// private service involved in a loop
$container->register('foo6', 'stdClass')
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
index 7495110dd..56f59d9dd 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
index eb573f9ba..9e1abeb44 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
index d322f80a0..2fe30f22e 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
index 68bc1ef8b..c630ad090 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
index ed085a5ef..3c0ced8e9 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
index 9733ba9c6..f7d49dd4d 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
index 1b7443352..961282993 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
index ba564b82f..0e8f581e8 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
index 40ce06dec..52f5cf25f 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
index 664f4dd90..6f6f60451 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
index b277ddd1c..963118e20 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
index 595d12ba6..95055207d 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
index d4019a50a..915d05373 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
index cc78c196a..ce4815ef8 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
index 0e09ec624..6dd0baabd 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
index 2dc415ced..ab7024fa5 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
@@ -277,7 +277,7 @@ class ProjectServiceContainer extends Container
{
private $buildParameters;
private $containerDir;
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct(array $buildParameters = [], $containerDir = __DIR__)
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
index 02e0680da..c9df13b2e 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
index 7986897d3..f4364df7f 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
index 5345aa3b3..775235db6 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
@@ -39,9 +39,13 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
'level4' => 'getLevel4Service',
'level5' => 'getLevel5Service',
'level6' => 'getLevel6Service',
+ 'listener3' => 'getListener3Service',
+ 'listener4' => 'getListener4Service',
'logger' => 'getLoggerService',
'manager' => 'getManagerService',
'manager2' => 'getManager2Service',
+ 'manager3' => 'getManager3Service',
+ 'manager4' => 'getManager4Service',
'multiuse1' => 'getMultiuse1Service',
'root' => 'getRootService',
'subscriber' => 'getSubscriberService',
@@ -53,6 +57,7 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
'level4' => true,
'level5' => true,
'level6' => true,
+ 'manager4' => true,
'multiuse1' => true,
];
@@ -69,6 +74,8 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
'bar6' => true,
'config' => true,
'config2' => true,
+ 'connection3' => true,
+ 'connection4' => true,
'dispatcher' => true,
'dispatcher2' => true,
'foo4' => true,
@@ -81,6 +88,7 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
'level5' => true,
'level6' => true,
'logger2' => true,
+ 'manager4' => true,
'multiuse1' => true,
'subscriber2' => true,
];
@@ -272,6 +280,36 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
return $instance;
}
+ /**
+ * Gets the public 'listener3' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getListener3Service()
+ {
+ $this->services['listener3'] = $instance = new \stdClass();
+
+ $instance->manager = ${($_ = isset($this->services['manager3']) ? $this->services['manager3'] : $this->getManager3Service()) && false ?: '_'};
+
+ return $instance;
+ }
+
+ /**
+ * Gets the public 'listener4' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getListener4Service()
+ {
+ $a = ${($_ = isset($this->services['manager4']) ? $this->services['manager4'] : $this->getManager4Service()) && false ?: '_'};
+
+ if (isset($this->services['listener4'])) {
+ return $this->services['listener4'];
+ }
+
+ return $this->services['listener4'] = new \stdClass($a);
+ }
+
/**
* Gets the public 'logger' shared service.
*
@@ -324,6 +362,24 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
return $this->services['manager2'] = new \stdClass($a);
}
+ /**
+ * Gets the public 'manager3' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getManager3Service($lazyLoad = true)
+ {
+ $a = ${($_ = isset($this->services['listener3']) ? $this->services['listener3'] : $this->getListener3Service()) && false ?: '_'};
+
+ if (isset($this->services['manager3'])) {
+ return $this->services['manager3'];
+ }
+ $b = new \stdClass();
+ $b->listener = [0 => $a];
+
+ return $this->services['manager3'] = new \stdClass($b);
+ }
+
/**
* Gets the public 'root' shared service.
*
@@ -430,6 +486,22 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
return $instance;
}
+ /**
+ * Gets the private 'manager4' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getManager4Service($lazyLoad = true)
+ {
+ $a = new \stdClass();
+
+ $this->services['manager4'] = $instance = new \stdClass($a);
+
+ $a->listener = [0 => ${($_ = isset($this->services['listener4']) ? $this->services['listener4'] : $this->getListener4Service()) && false ?: '_'}];
+
+ return $instance;
+ }
+
/**
* Gets the private 'multiuse1' shared service.
*
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
index b569b335f..d3bab9128 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
@@ -30,6 +30,8 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
'baz6' => 'getBaz6Service',
'connection' => 'getConnectionService',
'connection2' => 'getConnection2Service',
+ 'connection3' => 'getConnection3Service',
+ 'connection4' => 'getConnection4Service',
'dispatcher' => 'getDispatcherService',
'dispatcher2' => 'getDispatcher2Service',
'foo' => 'getFooService',
@@ -46,9 +48,13 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
'level4' => 'getLevel4Service',
'level5' => 'getLevel5Service',
'level6' => 'getLevel6Service',
+ 'listener3' => 'getListener3Service',
+ 'listener4' => 'getListener4Service',
'logger' => 'getLoggerService',
'manager' => 'getManagerService',
'manager2' => 'getManager2Service',
+ 'manager3' => 'getManager3Service',
+ 'manager4' => 'getManager4Service',
'multiuse1' => 'getMultiuse1Service',
'root' => 'getRootService',
'subscriber' => 'getSubscriberService',
@@ -60,6 +66,7 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
'level4' => true,
'level5' => true,
'level6' => true,
+ 'manager4' => true,
'multiuse1' => true,
];
@@ -81,6 +88,7 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
'level5' => true,
'level6' => true,
'logger2' => true,
+ 'manager4' => true,
'multiuse1' => true,
'subscriber2' => true,
];
@@ -212,6 +220,34 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
return $instance;
}
+ /**
+ * Gets the public 'connection3' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getConnection3Service()
+ {
+ $this->services['connection3'] = $instance = new \stdClass();
+
+ $instance->listener = [0 => ${($_ = isset($this->services['listener3']) ? $this->services['listener3'] : $this->getListener3Service()) && false ?: '_'}];
+
+ return $instance;
+ }
+
+ /**
+ * Gets the public 'connection4' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getConnection4Service()
+ {
+ $this->services['connection4'] = $instance = new \stdClass();
+
+ $instance->listener = [0 => ${($_ = isset($this->services['listener4']) ? $this->services['listener4'] : $this->getListener4Service()) && false ?: '_'}];
+
+ return $instance;
+ }
+
/**
* Gets the public 'dispatcher' shared service.
*
@@ -372,6 +408,36 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
return $instance;
}
+ /**
+ * Gets the public 'listener3' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getListener3Service()
+ {
+ $this->services['listener3'] = $instance = new \stdClass();
+
+ $instance->manager = ${($_ = isset($this->services['manager3']) ? $this->services['manager3'] : $this->getManager3Service()) && false ?: '_'};
+
+ return $instance;
+ }
+
+ /**
+ * Gets the public 'listener4' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getListener4Service()
+ {
+ $a = ${($_ = isset($this->services['manager4']) ? $this->services['manager4'] : $this->getManager4Service()) && false ?: '_'};
+
+ if (isset($this->services['listener4'])) {
+ return $this->services['listener4'];
+ }
+
+ return $this->services['listener4'] = new \stdClass($a);
+ }
+
/**
* Gets the public 'logger' shared service.
*
@@ -424,6 +490,22 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
return $this->services['manager2'] = new \stdClass($a);
}
+ /**
+ * Gets the public 'manager3' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getManager3Service($lazyLoad = true)
+ {
+ $a = ${($_ = isset($this->services['connection3']) ? $this->services['connection3'] : $this->getConnection3Service()) && false ?: '_'};
+
+ if (isset($this->services['manager3'])) {
+ return $this->services['manager3'];
+ }
+
+ return $this->services['manager3'] = new \stdClass($a);
+ }
+
/**
* Gets the public 'root' shared service.
*
@@ -530,6 +612,22 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
return $instance;
}
+ /**
+ * Gets the private 'manager4' shared service.
+ *
+ * @return \stdClass
+ */
+ protected function getManager4Service($lazyLoad = true)
+ {
+ $a = ${($_ = isset($this->services['connection4']) ? $this->services['connection4'] : $this->getConnection4Service()) && false ?: '_'};
+
+ if (isset($this->services['manager4'])) {
+ return $this->services['manager4'];
+ }
+
+ return $this->services['manager4'] = new \stdClass($a);
+ }
+
/**
* Gets the private 'multiuse1' shared service.
*
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
index be59456b0..dd1ca0a61 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
index 8582c3e2d..709a3c4f8 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
index ec3c8028b..096b3b396 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
index 4158fc628..0e3eed27f 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
index ad76566b1..e0e4827df 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
index 59582d9eb..841878836 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
index 271aeb668..906b0cdc7 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
index 30dd2c9ba..9a0606173 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Legacy_Privates extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
index 4969b2db0..3826d5a6e 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
index b56063a18..4cea5d2d9 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
index da1d716c5..95995dec6 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
index c7fb579b0..56d73c255 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
index 8d1465c44..a7ad1f1c6 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
index dbb51eab3..ca89e01cc 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
index b14cdebb9..b314feff7 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
index 7a24f72c5..a338c9d52 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
index a4c841cab..9e7e817df 100644
--- a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
{
- private $parameters;
+ private $parameters = [];
private $targetDirs = [];
public function __construct()
diff --git a/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php b/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
index f93965f46..7f757297b 100644
--- a/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
+++ b/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
/**
- * Tests for {@see \Symfony\Component\DependencyInjection\Instantiator\RealServiceInstantiator}.
+ * Tests for {@see \Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator}.
*
* @author Marco Pivetta
*/
diff --git a/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php b/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
index b1b9b399c..5ae149324 100644
--- a/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
+++ b/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper;
/**
- * Tests for {@see \Symfony\Component\DependencyInjection\PhpDumper\NullDumper}.
+ * Tests for {@see \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper}.
*
* @author Marco Pivetta
*/
diff --git a/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
index c7c303b68..b4f969a0e 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
@@ -58,12 +58,10 @@ class DirectoryLoaderTest extends TestCase
$this->assertEquals(['ini' => 'ini', 'yaml' => 'yaml'], $this->container->getParameterBag()->all(), '->load() takes a single file that imports a directory');
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The file "foo" does not exist (in:
- */
public function testExceptionIsRaisedWhenDirectoryDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The file "foo" does not exist (in:');
$this->loader->load('foo/');
}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
index 065acdf1b..ffe58a67e 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
@@ -178,18 +178,16 @@ class FileLoaderTest extends TestCase
$this->assertTrue($container->has(MissingParent::class));
- $this->assertSame(
- ['While discovering services from namespace "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\", an error was thrown when processing the class "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingParent": "Class Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingClass not found".'],
- $container->getDefinition(MissingParent::class)->getErrors()
+ $this->assertRegExp(
+ '{Class "?Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Fixtures\\\\Prototype\\\\BadClasses\\\\MissingClass"? not found}',
+ $container->getDefinition(MissingParent::class)->getErrors()[0]
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Expected to find class "Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\Prototype\\Bar" in file ".+" while importing services from resource "Prototype\/Sub\/\*", but it was not found\! Check the namespace prefix used with the resource/
- */
public function testRegisterClassesWithBadPrefix()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Expected to find class "Symfony\\\Component\\\DependencyInjection\\\Tests\\\Fixtures\\\Prototype\\\Bar" in file ".+" while importing services from resource "Prototype\/Sub\/\*", but it was not found\! Check the namespace prefix used with the resource/');
$container = new ContainerBuilder();
$loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
diff --git a/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
index 1d7d3a93e..6f02b9ff6 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
@@ -95,30 +95,24 @@ class IniFileLoaderTest extends TestCase
];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The file "foo.ini" does not exist (in:
- */
public function testExceptionIsRaisedWhenIniFileDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The file "foo.ini" does not exist (in:');
$this->loader->load('foo.ini');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The "nonvalid.ini" file is not valid.
- */
public function testExceptionIsRaisedWhenIniFileCannotBeParsed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The "nonvalid.ini" file is not valid.');
@$this->loader->load('nonvalid.ini');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The "almostvalid.ini" file is not valid.
- */
public function testExceptionIsRaisedWhenIniFileIsAlmostValid()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The "almostvalid.ini" file is not valid.');
@$this->loader->load('almostvalid.ini');
}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
index 4f7c16890..e1812305e 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
@@ -77,12 +77,10 @@ class PhpFileLoaderTest extends TestCase
}
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The service "child_service" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.
- */
public function testAutoConfigureAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.');
$fixtures = realpath(__DIR__.'/../Fixtures');
$container = new ContainerBuilder();
$loader = new PhpFileLoader($container, new FileLocator());
@@ -90,12 +88,10 @@ class PhpFileLoaderTest extends TestCase
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid factory "factory:method": the `service:method` notation is not available when using PHP-based DI configuration. Use "[ref('factory'), 'method']" instead.
- */
public function testFactoryShortNotationNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid factory "factory:method": the `service:method` notation is not available when using PHP-based DI configuration. Use "[ref(\'factory\'), \'method\']" instead.');
$fixtures = realpath(__DIR__.'/../Fixtures');
$container = new ContainerBuilder();
$loader = new PhpFileLoader($container, new FileLocator());
diff --git a/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
index 03376a641..2b963968d 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
@@ -325,22 +325,18 @@ class XmlFileLoaderTest extends TestCase
}
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- */
public function testParseTagsWithoutNameThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('tag_without_name.xml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /The tag name for service ".+" in .* must be a non-empty string/
- */
public function testParseTagWithEmptyNameThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .* must be a non-empty string/');
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('tag_with_empty_name.xml');
@@ -442,7 +438,7 @@ class XmlFileLoaderTest extends TestCase
$e = $e->getPrevious();
$this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
- $this->assertContains('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+ $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
}
// non-registered extension
@@ -482,7 +478,7 @@ class XmlFileLoaderTest extends TestCase
$e = $e->getPrevious();
$this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
- $this->assertContains('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+ $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
}
}
@@ -730,36 +726,30 @@ class XmlFileLoaderTest extends TestCase
$this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The service "child_service" cannot use the "parent" option in the same file where "instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.
- */
public function testInstanceOfAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The service "child_service" cannot use the "parent" option in the same file where "instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.');
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('services_instanceof_with_parent.xml');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting autoconfigure="false" for the service.
- */
public function testAutoConfigureAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting autoconfigure="false" for the service.');
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('services_autoconfigure_with_parent.xml');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Attribute "autowire" on service "child_service" cannot be inherited from "defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.
- */
public function testDefaultsAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Attribute "autowire" on service "child_service" cannot be inherited from "defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.');
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('services_defaults_with_parent.xml');
@@ -818,7 +808,6 @@ class XmlFileLoaderTest extends TestCase
$container->compile();
$dumper = new PhpDumper($container);
- $dump = $dumper->dump();
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services_tsantos.php', $dumper->dump());
}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
index 05521bf78..1d187848b 100644
--- a/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
+++ b/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -42,12 +42,10 @@ class YamlFileLoaderTest extends TestCase
require_once self::$fixturesPath.'/includes/ProjectExtension.php';
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /The file ".+" does not exist./
- */
public function testLoadUnExistFile()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The file ".+" does not exist./');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
$r = new \ReflectionObject($loader);
$m = $r->getMethod('loadFile');
@@ -56,12 +54,10 @@ class YamlFileLoaderTest extends TestCase
$m->invoke($loader, 'foo.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /The file ".+" does not contain valid YAML./
- */
public function testLoadInvalidYamlFile()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The file ".+" does not contain valid YAML./');
$path = self::$fixturesPath.'/ini';
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator($path));
$r = new \ReflectionObject($loader);
@@ -73,10 +69,10 @@ class YamlFileLoaderTest extends TestCase
/**
* @dataProvider provideInvalidFiles
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
*/
public function testLoadInvalidFile($file)
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load($file.'.yml');
@@ -301,40 +297,32 @@ class YamlFileLoaderTest extends TestCase
$this->assertEquals(['manager' => [['alias' => 'user']]], $definition->getTags());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /The tag name for service ".+" in .+ must be a non-empty string/
- */
public function testTagWithEmptyNameThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('tag_name_empty_string.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageREgExp /The tag name for service "\.+" must be a non-empty string/
- */
public function testTagWithNonStringNameThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('tag_name_no_string.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- */
public function testTypesNotArray()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('bad_types1.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- */
public function testTypeNotString()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('bad_types2.yml');
}
@@ -430,12 +418,10 @@ class YamlFileLoaderTest extends TestCase
$this->assertFalse($container->getDefinition(Prototype\OtherDir\Component2\Dir2\Service5::class)->hasTag('foo'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /A "resource" attribute must be set when the "namespace" attribute is set for service ".+" in .+/
- */
public function testPrototypeWithNamespaceAndNoResource()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/A "resource" attribute must be set when the "namespace" attribute is set for service ".+" in .+/');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services_prototype_namespace_without_resource.yml');
@@ -506,58 +492,48 @@ class YamlFileLoaderTest extends TestCase
$this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The service "child_service" cannot use the "parent" option in the same file where "_instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.
- */
public function testInstanceOfAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The service "child_service" cannot use the "parent" option in the same file where "_instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services_instanceof_with_parent.yml');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting "autoconfigure: false" for the service.
- */
public function testAutoConfigureAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting "autoconfigure: false" for the service.');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services_autoconfigure_with_parent.yml');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Attribute "autowire" on service "child_service" cannot be inherited from "_defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.
- */
public function testDefaultsAndChildDefinitionNotAllowed()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Attribute "autowire" on service "child_service" cannot be inherited from "_defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services_defaults_with_parent.yml');
$container->compile();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage The value of the "decorates" option for the "bar" service must be the id of the service without the "@" prefix (replace "@foo" with "foo").
- */
public function testDecoratedServicesWithWrongSyntaxThrowsException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The value of the "decorates" option for the "bar" service must be the id of the service without the "@" prefix (replace "@foo" with "foo").');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('bad_decorates.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Parameter "tags" must be an array for service "Foo\\Bar" in .+services31_invalid_tags\.yml\. Check your YAML syntax./
- */
public function testInvalidTagsWithDefaults()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in .+services31_invalid_tags\.yml\. Check your YAML syntax./');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services31_invalid_tags.yml');
}
@@ -596,7 +572,7 @@ class YamlFileLoaderTest extends TestCase
// Anonymous service in a callable
$factory = $definition->getFactory();
- $this->assertInternalType('array', $factory);
+ $this->assertIsArray($factory);
$this->assertInstanceOf(Reference::class, $factory[0]);
$this->assertTrue($container->has((string) $factory[0]));
$this->assertRegExp('/^\d+_Quz~[._A-Za-z0-9]{7}$/', (string) $factory[0]);
@@ -646,23 +622,19 @@ class YamlFileLoaderTest extends TestCase
$this->assertFalse($container->has('Bar'));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Creating an alias using the tag "!service" is not allowed in ".+anonymous_services_alias\.yml"\./
- */
public function testAnonymousServicesWithAliases()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Creating an alias using the tag "!service" is not allowed in ".+anonymous_services_alias\.yml"\./');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('anonymous_services_alias.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Using an anonymous service in a parameter is not allowed in ".+anonymous_services_in_parameters\.yml"\./
- */
public function testAnonymousServicesInParameters()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Using an anonymous service in a parameter is not allowed in ".+anonymous_services_in_parameters\.yml"\./');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('anonymous_services_in_parameters.yml');
@@ -678,23 +650,19 @@ class YamlFileLoaderTest extends TestCase
$this->assertFalse($container->getDefinition('override_defaults_settings_to_false')->isAutoconfigured());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Service "_defaults" key must be an array, "NULL" given in ".+bad_empty_defaults\.yml"\./
- */
public function testEmptyDefaultsThrowsClearException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Service "_defaults" key must be an array, "NULL" given in ".+bad_empty_defaults\.yml"\./');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('bad_empty_defaults.yml');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessageRegExp /Service "_instanceof" key must be an array, "NULL" given in ".+bad_empty_instanceof\.yml"\./
- */
public function testEmptyInstanceofThrowsClearException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/Service "_instanceof" key must be an array, "NULL" given in ".+bad_empty_instanceof\.yml"\./');
$container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('bad_empty_instanceof.yml');
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
index e7c88d2bb..4fcb2c840 100644
--- a/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -16,11 +16,9 @@ use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBa
class EnvPlaceholderParameterBagTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- */
public function testGetThrowsInvalidArgumentExceptionIfEnvNameContainsNonWordCharacters()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$bag = new EnvPlaceholderParameterBag();
$bag->get('env(%foo%)');
}
@@ -42,8 +40,8 @@ class EnvPlaceholderParameterBagTest extends TestCase
$placeholder = array_values($placeholderForVariable)[0];
$this->assertCount(1, $placeholderForVariable);
- $this->assertInternalType('string', $placeholder);
- $this->assertContains($envVariableName, $placeholder);
+ $this->assertIsString($placeholder);
+ $this->assertStringContainsString($envVariableName, $placeholder);
}
public function testMergeWhereFirstBagIsEmptyWillWork()
@@ -65,8 +63,8 @@ class EnvPlaceholderParameterBagTest extends TestCase
$placeholder = array_values($placeholderForVariable)[0];
$this->assertCount(1, $placeholderForVariable);
- $this->assertInternalType('string', $placeholder);
- $this->assertContains($envVariableName, $placeholder);
+ $this->assertIsString($placeholder);
+ $this->assertStringContainsString($envVariableName, $placeholder);
}
public function testMergeWherePlaceholderOnlyExistsInSecond()
@@ -129,12 +127,10 @@ class EnvPlaceholderParameterBagTest extends TestCase
$this->assertNull($bag->all()['env(NULL_VAR)']);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.
- */
public function testResolveThrowsOnBadDefaultValue()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.');
$bag = new EnvPlaceholderParameterBag();
$bag->get('env(ARRAY_VAR)');
$bag->set('env(ARRAY_VAR)', []);
@@ -151,12 +147,10 @@ class EnvPlaceholderParameterBagTest extends TestCase
$this->assertNull($bag->all()['env(NULL_VAR)']);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The default value of an env() parameter must be scalar or null, but "array" given to "env(ARRAY_VAR)".
- */
public function testGetThrowsOnBadDefaultValue()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The default value of an env() parameter must be scalar or null, but "array" given to "env(ARRAY_VAR)".');
$bag = new EnvPlaceholderParameterBag();
$bag->set('env(ARRAY_VAR)', []);
$bag->get('env(ARRAY_VAR)');
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
index b168e0c20..ed89c8e4e 100644
--- a/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
@@ -26,38 +26,30 @@ class FrozenParameterBagTest extends TestCase
$this->assertEquals($parameters, $bag->all(), '__construct() takes an array of parameters as its first argument');
}
- /**
- * @expectedException \LogicException
- */
public function testClear()
{
+ $this->expectException('LogicException');
$bag = new FrozenParameterBag([]);
$bag->clear();
}
- /**
- * @expectedException \LogicException
- */
public function testSet()
{
+ $this->expectException('LogicException');
$bag = new FrozenParameterBag([]);
$bag->set('foo', 'bar');
}
- /**
- * @expectedException \LogicException
- */
public function testAdd()
{
+ $this->expectException('LogicException');
$bag = new FrozenParameterBag([]);
$bag->add([]);
}
- /**
- * @expectedException \LogicException
- */
public function testRemove()
{
+ $this->expectException('LogicException');
$bag = new FrozenParameterBag(['foo' => 'bar']);
$bag->remove('foo');
}
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
index e67e393df..0a75b445b 100644
--- a/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
@@ -78,12 +78,8 @@ class ParameterBagTest extends TestCase
'fiz' => ['bar' => ['boo' => 12]],
]);
- if (method_exists($this, 'expectException')) {
- $this->expectException(ParameterNotFoundException::class);
- $this->expectExceptionMessage($exceptionMessage);
- } else {
- $this->setExpectedException(ParameterNotFoundException::class, $exceptionMessage);
- }
+ $this->expectException(ParameterNotFoundException::class);
+ $this->expectExceptionMessage($exceptionMessage);
$bag->get($parameterKey);
}
diff --git a/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php b/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
index aa9ebab68..52466af94 100644
--- a/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
+++ b/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
@@ -58,12 +58,10 @@ class ServiceLocatorTest extends TestCase
$this->assertSame(2, $i);
}
- /**
- * @expectedException \Psr\Container\NotFoundExceptionInterface
- * @expectedExceptionMessage Service "dummy" not found: the container inside "Symfony\Component\DependencyInjection\Tests\ServiceLocatorTest" is a smaller service locator that only knows about the "foo" and "bar" services.
- */
public function testGetThrowsOnUndefinedService()
{
+ $this->expectException('Psr\Container\NotFoundExceptionInterface');
+ $this->expectExceptionMessage('Service "dummy" not found: the container inside "Symfony\Component\DependencyInjection\Tests\ServiceLocatorTest" is a smaller service locator that only knows about the "foo" and "bar" services.');
$locator = new ServiceLocator([
'foo' => function () { return 'bar'; },
'bar' => function () { return 'baz'; },
@@ -72,12 +70,10 @@ class ServiceLocatorTest extends TestCase
$locator->get('dummy');
}
- /**
- * @expectedException \Psr\Container\NotFoundExceptionInterface
- * @expectedExceptionMessage The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.
- */
public function testThrowsOnUndefinedInternalService()
{
+ $this->expectException('Psr\Container\NotFoundExceptionInterface');
+ $this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.');
$locator = new ServiceLocator([
'foo' => function () use (&$locator) { return $locator->get('bar'); },
]);
@@ -85,12 +81,10 @@ class ServiceLocatorTest extends TestCase
$locator->get('foo');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- * @expectedExceptionMessage Circular reference detected for service "bar", path: "bar -> baz -> bar".
- */
public function testThrowsOnCircularReference()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+ $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".');
$locator = new ServiceLocator([
'foo' => function () use (&$locator) { return $locator->get('bar'); },
'bar' => function () use (&$locator) { return $locator->get('baz'); },
@@ -100,12 +94,10 @@ class ServiceLocatorTest extends TestCase
$locator->get('foo');
}
- /**
- * @expectedException \Psr\Container\NotFoundExceptionInterface
- * @expectedExceptionMessage Service "foo" not found: even though it exists in the app's container, the container inside "caller" is a smaller service locator that only knows about the "bar" service. Unless you need extra laziness, try using dependency injection instead. Otherwise, you need to declare it using "SomeServiceSubscriber::getSubscribedServices()".
- */
public function testThrowsInServiceSubscriber()
{
+ $this->expectException('Psr\Container\NotFoundExceptionInterface');
+ $this->expectExceptionMessage('Service "foo" not found: even though it exists in the app\'s container, the container inside "caller" is a smaller service locator that only knows about the "bar" service. Unless you need extra laziness, try using dependency injection instead. Otherwise, you need to declare it using "SomeServiceSubscriber::getSubscribedServices()".');
$container = new Container();
$container->set('foo', new \stdClass());
$subscriber = new SomeServiceSubscriber();
@@ -115,12 +107,10 @@ class ServiceLocatorTest extends TestCase
$subscriber->getFoo();
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- * @expectedExceptionMessage Service "foo" not found: even though it exists in the app's container, the container inside "foo" is a smaller service locator that is empty... Try using dependency injection instead.
- */
public function testGetThrowsServiceNotFoundException()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+ $this->expectExceptionMessage('Service "foo" not found: even though it exists in the app\'s container, the container inside "foo" is a smaller service locator that is empty... Try using dependency injection instead.');
$container = new Container();
$container->set('foo', new \stdClass());
diff --git a/lib/symfony/dotenv/Dotenv.php b/lib/symfony/dotenv/Dotenv.php
index b43529abd..c2475f204 100644
--- a/lib/symfony/dotenv/Dotenv.php
+++ b/lib/symfony/dotenv/Dotenv.php
@@ -38,8 +38,7 @@ final class Dotenv
/**
* Loads one or several .env files.
*
- * @param string $path A file to load
- * @param ...string $paths A list of additional files to load
+ * @param string $path A file to load
*
* @throws FormatException when a file has a syntax error
* @throws PathException when a file does not exist or is not readable
@@ -184,29 +183,24 @@ final class Dotenv
throw $this->createFormatException('Whitespace are not supported before the value');
}
+ $loadedVars = array_flip(explode(',', isset($_SERVER['SYMFONY_DOTENV_VARS']) ? $_SERVER['SYMFONY_DOTENV_VARS'] : (isset($_ENV['SYMFONY_DOTENV_VARS']) ? $_ENV['SYMFONY_DOTENV_VARS'] : '')));
+ unset($loadedVars['']);
$v = '';
do {
if ("'" === $this->data[$this->cursor]) {
- $value = '';
- ++$this->cursor;
+ $len = 0;
- while ("\n" !== $this->data[$this->cursor]) {
- if ("'" === $this->data[$this->cursor]) {
- break;
- }
- $value .= $this->data[$this->cursor];
- ++$this->cursor;
+ do {
+ if ($this->cursor + ++$len === $this->end) {
+ $this->cursor += $len;
- if ($this->cursor === $this->end) {
throw $this->createFormatException('Missing quote to end the value');
}
- }
- if ("\n" === $this->data[$this->cursor]) {
- throw $this->createFormatException('Missing quote to end the value');
- }
- ++$this->cursor;
- $v .= $value;
+ } while ("'" !== $this->data[$this->cursor + $len]);
+
+ $v .= substr($this->data, 1 + $this->cursor, $len - 1);
+ $this->cursor += 1 + $len;
} elseif ('"' === $this->data[$this->cursor]) {
$value = '';
++$this->cursor;
@@ -225,8 +219,8 @@ final class Dotenv
++$this->cursor;
$value = str_replace(['\\"', '\r', '\n'], ['"', "\r", "\n"], $value);
$resolvedValue = $value;
- $resolvedValue = $this->resolveVariables($resolvedValue);
- $resolvedValue = $this->resolveCommands($resolvedValue);
+ $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
+ $resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
$resolvedValue = str_replace('\\\\', '\\', $resolvedValue);
$v .= $resolvedValue;
} else {
@@ -248,8 +242,8 @@ final class Dotenv
}
$value = rtrim($value);
$resolvedValue = $value;
- $resolvedValue = $this->resolveVariables($resolvedValue);
- $resolvedValue = $this->resolveCommands($resolvedValue);
+ $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
+ $resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
$resolvedValue = str_replace('\\\\', '\\', $resolvedValue);
if ($resolvedValue === $value && preg_match('/\s+/', $value)) {
@@ -302,7 +296,7 @@ final class Dotenv
}
}
- private function resolveCommands($value)
+ private function resolveCommands($value, $loadedVars)
{
if (false === strpos($value, '$')) {
return $value;
@@ -318,7 +312,7 @@ final class Dotenv
)
/x';
- return preg_replace_callback($regex, function ($matches) {
+ return preg_replace_callback($regex, function ($matches) use ($loadedVars) {
if ('\\' === $matches[1]) {
return substr($matches[0], 1);
}
@@ -333,7 +327,15 @@ final class Dotenv
$process = new Process('echo '.$matches[0]);
$process->inheritEnvironmentVariables(true);
- $process->setEnv($this->values);
+
+ $env = [];
+ foreach ($this->values as $name => $value) {
+ if (isset($loadedVars[$name]) || (!isset($_ENV[$name]) && !(isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')))) {
+ $env[$name] = $value;
+ }
+ }
+ $process->setEnv($env);
+
try {
$process->mustRun();
} catch (ProcessException $e) {
@@ -344,7 +346,7 @@ final class Dotenv
}, $value);
}
- private function resolveVariables($value)
+ private function resolveVariables($value, array $loadedVars)
{
if (false === strpos($value, '$')) {
return $value;
@@ -360,7 +362,7 @@ final class Dotenv
(?P\})? # optional closing brace
/x';
- $value = preg_replace_callback($regex, function ($matches) {
+ $value = preg_replace_callback($regex, function ($matches) use ($loadedVars) {
// odd number of backslashes means the $ character is escaped
if (1 === \strlen($matches['backslashes']) % 2) {
return substr($matches[0], 1);
@@ -376,14 +378,16 @@ final class Dotenv
}
$name = $matches['name'];
- if (isset($this->values[$name])) {
+ if (isset($loadedVars[$name]) && isset($this->values[$name])) {
$value = $this->values[$name];
- } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
- $value = $_SERVER[$name];
} elseif (isset($_ENV[$name])) {
$value = $_ENV[$name];
+ } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
+ $value = $_SERVER[$name];
+ } elseif (isset($this->values[$name])) {
+ $value = $this->values[$name];
} else {
- $value = (string) getenv($name);
+ $value = '';
}
if (!$matches['opening_brace'] && isset($matches['closing_brace'])) {
diff --git a/lib/symfony/dotenv/Tests/DotenvTest.php b/lib/symfony/dotenv/Tests/DotenvTest.php
index 97ae5090c..1e493f24b 100644
--- a/lib/symfony/dotenv/Tests/DotenvTest.php
+++ b/lib/symfony/dotenv/Tests/DotenvTest.php
@@ -40,6 +40,7 @@ class DotenvTest extends TestCase
['FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n ^ line 1 offset 3"],
['FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n ^ line 1 offset 8"],
['FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n ^ line 1 offset 8"],
+ ['FOO=\'foo'."\n", "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo\\n...\n ^ line 1 offset 9"],
['export FOO', "Unable to unset an environment variable in \".env\" at line 1.\n...export FOO...\n ^ line 1 offset 10"],
['FOO=${FOO', "Unclosed braces on variable expansion in \".env\" at line 1.\n...FOO=\${FOO...\n ^ line 1 offset 9"],
];
@@ -63,6 +64,7 @@ class DotenvTest extends TestCase
public function getEnvData()
{
putenv('LOCAL=local');
+ $_ENV['LOCAL'] = 'local';
$_ENV['REMOTE'] = 'remote';
$tests = [
@@ -104,6 +106,7 @@ class DotenvTest extends TestCase
['FOO="bar\rfoo"', ['FOO' => "bar\rfoo"]],
['FOO=\'bar\nfoo\'', ['FOO' => 'bar\nfoo']],
['FOO=\'bar\rfoo\'', ['FOO' => 'bar\rfoo']],
+ ["FOO='bar\nfoo'", ['FOO' => "bar\nfoo"]],
['FOO=" FOO "', ['FOO' => ' FOO ']],
['FOO=" "', ['FOO' => ' ']],
['PATH="c:\\\\"', ['PATH' => 'c:\\']],
@@ -200,11 +203,9 @@ class DotenvTest extends TestCase
$this->assertSame('BAZ', $bar);
}
- /**
- * @expectedException \Symfony\Component\Dotenv\Exception\PathException
- */
public function testLoadDirectory()
{
+ $this->expectException('Symfony\Component\Dotenv\Exception\PathException');
$dotenv = new Dotenv();
$dotenv->load(__DIR__);
}
@@ -297,4 +298,20 @@ class DotenvTest extends TestCase
$this->assertSame('baz1', getenv('BAZ'));
$this->assertSame('/var/www', getenv('DOCUMENT_ROOT'));
}
+
+ public function testGetVariablesValueFromEnvFirst()
+ {
+ $_ENV['APP_ENV'] = 'prod';
+ $dotenv = new Dotenv(true);
+
+ $test = "APP_ENV=dev\nTEST1=foo1_\${APP_ENV}";
+ $values = $dotenv->parse($test);
+ $this->assertSame('foo1_prod', $values['TEST1']);
+
+ if ('\\' !== \DIRECTORY_SEPARATOR) {
+ $test = "APP_ENV=dev\nTEST2=foo2_\$(php -r 'echo \$_SERVER[\"APP_ENV\"];')";
+ $values = $dotenv->parse($test);
+ $this->assertSame('foo2_prod', $values['TEST2']);
+ }
+ }
}
diff --git a/lib/symfony/dotenv/composer.json b/lib/symfony/dotenv/composer.json
index 3bcfd89c8..e35339c98 100644
--- a/lib/symfony/dotenv/composer.json
+++ b/lib/symfony/dotenv/composer.json
@@ -19,7 +19,7 @@
"php": "^5.5.9|>=7.0.8"
},
"require-dev": {
- "symfony/process": "~3.2|~4.0"
+ "symfony/process": "^3.4.2|^4.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Dotenv\\": "" },
diff --git a/lib/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/lib/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
index aeafd9ec2..1b33e1cab 100644
--- a/lib/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
+++ b/lib/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\EventDispatcher;
+use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -42,7 +43,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
$this->container = $container;
$class = \get_class($this);
- if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
+ if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
$class = get_parent_class($class);
}
if (__CLASS__ !== $class) {
diff --git a/lib/symfony/event-dispatcher/EventDispatcher.php b/lib/symfony/event-dispatcher/EventDispatcher.php
index 968e345b3..207790f06 100644
--- a/lib/symfony/event-dispatcher/EventDispatcher.php
+++ b/lib/symfony/event-dispatcher/EventDispatcher.php
@@ -79,7 +79,7 @@ class EventDispatcher implements EventDispatcherInterface
public function getListenerPriority($eventName, $listener)
{
if (empty($this->listeners[$eventName])) {
- return;
+ return null;
}
if (\is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) {
@@ -97,6 +97,8 @@ class EventDispatcher implements EventDispatcherInterface
}
}
}
+
+ return null;
}
/**
diff --git a/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
index b157659dc..359e6005f 100644
--- a/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@@ -267,7 +267,7 @@ abstract class AbstractEventDispatcherTest extends TestCase
}
/**
- * @see https://bugs.php.net/bug.php?id=62976
+ * @see https://bugs.php.net/62976
*
* This bug affects:
* - The PHP 5.3 branch for versions < 5.3.18
diff --git a/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index 801471b47..61c047af3 100644
--- a/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -22,11 +22,10 @@ class RegisterListenersPassTest extends TestCase
/**
* Tests that event subscribers not implementing EventSubscriberInterface
* trigger an exception.
- *
- * @expectedException \InvalidArgumentException
*/
public function testEventSubscriberWithoutInterface()
{
+ $this->expectException('InvalidArgumentException');
$builder = new ContainerBuilder();
$builder->register('event_dispatcher');
$builder->register('my_event_subscriber', 'stdClass')
@@ -38,10 +37,6 @@ class RegisterListenersPassTest extends TestCase
public function testValidEventSubscriber()
{
- $services = [
- 'my_event_subscriber' => [0 => []],
- ];
-
$builder = new ContainerBuilder();
$eventDispatcherDefinition = $builder->register('event_dispatcher');
$builder->register('my_event_subscriber', 'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService')
@@ -63,12 +58,10 @@ class RegisterListenersPassTest extends TestCase
$this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls());
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "foo" tagged "kernel.event_listener" must not be abstract.
- */
public function testAbstractEventListener()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "foo" tagged "kernel.event_listener" must not be abstract.');
$container = new ContainerBuilder();
$container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', []);
$container->register('event_dispatcher', 'stdClass');
@@ -77,12 +70,10 @@ class RegisterListenersPassTest extends TestCase
$registerListenersPass->process($container);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "foo" tagged "kernel.event_subscriber" must not be abstract.
- */
public function testAbstractEventSubscriber()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "foo" tagged "kernel.event_subscriber" must not be abstract.');
$container = new ContainerBuilder();
$container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', []);
$container->register('event_dispatcher', 'stdClass');
@@ -128,12 +119,10 @@ class RegisterListenersPassTest extends TestCase
$this->assertTrue($container->getDefinition('foo')->hasTag('container.hot_path'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage You have requested a non-existent parameter "subscriber.class"
- */
public function testEventSubscriberUnresolvableClassName()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('You have requested a non-existent parameter "subscriber.class"');
$container = new ContainerBuilder();
$container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);
$container->register('event_dispatcher', 'stdClass');
diff --git a/lib/symfony/event-dispatcher/Tests/GenericEventTest.php b/lib/symfony/event-dispatcher/Tests/GenericEventTest.php
index 461f86161..f0f0d71f2 100644
--- a/lib/symfony/event-dispatcher/Tests/GenericEventTest.php
+++ b/lib/symfony/event-dispatcher/Tests/GenericEventTest.php
@@ -61,14 +61,14 @@ class GenericEventTest extends TestCase
public function testSetArguments()
{
$result = $this->event->setArguments(['foo' => 'bar']);
- $this->assertAttributeSame(['foo' => 'bar'], 'arguments', $this->event);
+ $this->assertSame(['foo' => 'bar'], $this->event->getArguments());
$this->assertSame($this->event, $result);
}
public function testSetArgument()
{
$result = $this->event->setArgument('foo2', 'bar2');
- $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
+ $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
$this->assertEquals($this->event, $result);
}
@@ -78,11 +78,9 @@ class GenericEventTest extends TestCase
$this->assertEquals('Event', $this->event->getArgument('name'));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetArgException()
{
+ $this->expectException('\InvalidArgumentException');
$this->event->getArgument('nameNotExist');
}
@@ -92,20 +90,20 @@ class GenericEventTest extends TestCase
$this->assertEquals('Event', $this->event['name']);
// test getting invalid arg
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
+ $this->expectException('InvalidArgumentException');
$this->assertFalse($this->event['nameNotExist']);
}
public function testOffsetSet()
{
$this->event['foo2'] = 'bar2';
- $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
+ $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
}
public function testOffsetUnset()
{
unset($this->event['name']);
- $this->assertAttributeSame([], 'arguments', $this->event);
+ $this->assertSame([], $this->event->getArguments());
}
public function testOffsetIsset()
diff --git a/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
index c52fefe50..da8502ab9 100644
--- a/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\EventDispatcher\Tests;
+use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
@@ -21,7 +22,7 @@ use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
class ImmutableEventDispatcherTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
private $innerDispatcher;
@@ -39,13 +40,14 @@ class ImmutableEventDispatcherTest extends TestCase
public function testDispatchDelegates()
{
$event = new Event();
+ $resultEvent = new Event();
$this->innerDispatcher->expects($this->once())
->method('dispatch')
->with('event', $event)
- ->willReturn('result');
+ ->willReturn($resultEvent);
- $this->assertSame('result', $this->dispatcher->dispatch('event', $event));
+ $this->assertSame($resultEvent, $this->dispatcher->dispatch('event', $event));
}
public function testGetListenersDelegates()
@@ -53,9 +55,9 @@ class ImmutableEventDispatcherTest extends TestCase
$this->innerDispatcher->expects($this->once())
->method('getListeners')
->with('event')
- ->willReturn('result');
+ ->willReturn(['result']);
- $this->assertSame('result', $this->dispatcher->getListeners('event'));
+ $this->assertSame(['result'], $this->dispatcher->getListeners('event'));
}
public function testHasListenersDelegates()
@@ -63,42 +65,34 @@ class ImmutableEventDispatcherTest extends TestCase
$this->innerDispatcher->expects($this->once())
->method('hasListeners')
->with('event')
- ->willReturn('result');
+ ->willReturn(true);
- $this->assertSame('result', $this->dispatcher->hasListeners('event'));
+ $this->assertTrue($this->dispatcher->hasListeners('event'));
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testAddListenerDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$this->dispatcher->addListener('event', function () { return 'foo'; });
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testAddSubscriberDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->addSubscriber($subscriber);
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testRemoveListenerDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$this->dispatcher->removeListener('event', function () { return 'foo'; });
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testRemoveSubscriberDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->removeSubscriber($subscriber);
diff --git a/lib/symfony/filesystem/Filesystem.php b/lib/symfony/filesystem/Filesystem.php
index a6e372ebf..cd456c784 100644
--- a/lib/symfony/filesystem/Filesystem.php
+++ b/lib/symfony/filesystem/Filesystem.php
@@ -52,7 +52,7 @@ class Filesystem
}
if ($doCopy) {
- // https://bugs.php.net/bug.php?id=64634
+ // https://bugs.php.net/64634
if (false === $source = @fopen($originFile, 'r')) {
throw new IOException(sprintf('Failed to copy "%s" to "%s" because source file could not be opened for reading.', $originFile, $targetFile), 0, null, $originFile);
}
@@ -280,7 +280,7 @@ class Filesystem
if (true !== @rename($origin, $target)) {
if (is_dir($origin)) {
- // See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943
+ // See https://bugs.php.net/54097 & https://php.net/rename#113943
$this->mirror($origin, $target, null, ['override' => $overwrite, 'delete' => $overwrite]);
$this->remove($origin);
@@ -413,12 +413,12 @@ class Filesystem
public function readlink($path, $canonicalize = false)
{
if (!$canonicalize && !is_link($path)) {
- return;
+ return null;
}
if ($canonicalize) {
if (!$this->exists($path)) {
- return;
+ return null;
}
if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -743,6 +743,11 @@ class Filesystem
return 2 === \count($components) ? [$components[0], $components[1]] : [null, $components[0]];
}
+ /**
+ * @param callable $func
+ *
+ * @return mixed
+ */
private static function box($func)
{
self::$lastError = null;
diff --git a/lib/symfony/filesystem/Tests/FilesystemTest.php b/lib/symfony/filesystem/Tests/FilesystemTest.php
index 186b2ef36..a5b7f6dce 100644
--- a/lib/symfony/filesystem/Tests/FilesystemTest.php
+++ b/lib/symfony/filesystem/Tests/FilesystemTest.php
@@ -29,22 +29,18 @@ class FilesystemTest extends FilesystemTestCase
$this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
$targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
$this->filesystem->copy($sourceFilePath, $targetFilePath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyUnreadableFileFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// skip test on Windows; PHP can't easily set file as unreadable on Windows
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test cannot run on Windows.');
@@ -118,11 +114,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyWithOverrideWithReadOnlyTargetFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// skip test on Windows; PHP can't easily set file as unwritable on Windows
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test cannot run on Windows.');
@@ -159,7 +153,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->copy($sourceFilePath, $targetFilePath);
- $this->assertTrue(is_dir($targetFileDirectory));
+ $this->assertDirectoryExists($targetFileDirectory);
$this->assertFileExists($targetFilePath);
$this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
}
@@ -191,7 +185,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mkdir($directory);
- $this->assertTrue(is_dir($directory));
+ $this->assertDirectoryExists($directory);
}
public function testMkdirCreatesDirectoriesFromArray()
@@ -203,9 +197,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mkdir($directories);
- $this->assertTrue(is_dir($basePath.'1'));
- $this->assertTrue(is_dir($basePath.'2'));
- $this->assertTrue(is_dir($basePath.'3'));
+ $this->assertDirectoryExists($basePath.'1');
+ $this->assertDirectoryExists($basePath.'2');
+ $this->assertDirectoryExists($basePath.'3');
}
public function testMkdirCreatesDirectoriesFromTraversableObject()
@@ -217,16 +211,14 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mkdir($directories);
- $this->assertTrue(is_dir($basePath.'1'));
- $this->assertTrue(is_dir($basePath.'2'));
- $this->assertTrue(is_dir($basePath.'3'));
+ $this->assertDirectoryExists($basePath.'1');
+ $this->assertDirectoryExists($basePath.'2');
+ $this->assertDirectoryExists($basePath.'3');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testMkdirCreatesDirectoriesFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$basePath = $this->workspace.\DIRECTORY_SEPARATOR;
$dir = $basePath.'2';
@@ -244,11 +236,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFileExists($file);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTouchFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.'1'.\DIRECTORY_SEPARATOR.'2';
$this->filesystem->touch($file);
@@ -357,7 +347,7 @@ class FilesystemTest extends FilesystemTestCase
// create symlink to dir using trailing forward slash
$this->filesystem->symlink($basePath.'dir/', $basePath.'dir-link');
- $this->assertTrue(is_dir($basePath.'dir-link'));
+ $this->assertDirectoryExists($basePath.'dir-link');
// create symlink to nonexistent dir
rmdir($basePath.'dir');
@@ -380,11 +370,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertTrue($this->filesystem->exists($basePath.'folder'));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testFilesExistsFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
if ('\\' !== \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Long file names are an issue on Windows');
}
@@ -613,11 +601,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertSame($owner, $this->getFileOwner($link));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownSymlinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfSymlinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -630,11 +616,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownLinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfLinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -647,11 +631,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownFail()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfPosixIsMissing();
$dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
@@ -722,11 +704,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertSame($group, $this->getFileGroup($link));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpSymlinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfSymlinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -739,11 +719,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpLinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfLinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -756,11 +734,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpFail()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfPosixIsMissing();
$dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
@@ -781,11 +757,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFileExists($newPath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testRenameThrowsExceptionIfTargetAlreadyExists()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
$newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
@@ -809,11 +783,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFileExists($newPath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testRenameThrowsExceptionOnError()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.uniqid('fs_test_', true);
$newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
@@ -853,7 +825,7 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFalse(is_link($link));
$this->assertFalse(is_file($link));
- $this->assertFalse(is_dir($link));
+ $this->assertDirectoryNotExists($link);
}
public function testSymlinkIsOverwrittenIfPointsToDifferentTarget()
@@ -1198,8 +1170,8 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mirror($sourcePath, $targetPath);
- $this->assertTrue(is_dir($targetPath));
- $this->assertTrue(is_dir($targetPath.'directory'));
+ $this->assertDirectoryExists($targetPath);
+ $this->assertDirectoryExists($targetPath.'directory');
$this->assertFileEquals($file1, $targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1');
$this->assertFileEquals($file2, $targetPath.'file2');
@@ -1232,7 +1204,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mirror($sourcePath, $targetPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->filesystem->remove($sourcePath);
}
@@ -1251,7 +1223,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mirror($sourcePath, $targetPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->assertFileEquals($sourcePath.'file1', $targetPath.'link1');
$this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
}
@@ -1271,7 +1243,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mirror($sourcePath, $targetPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
$this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
}
@@ -1295,7 +1267,7 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->mirror($sourcePath, $targetPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
$this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
$this->assertEquals('\\' === \DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.\DIRECTORY_SEPARATOR.'link1'));
@@ -1318,7 +1290,7 @@ class FilesystemTest extends FilesystemTestCase
chdir($oldPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->assertFileExists($targetPath.'source');
$this->assertFileExists($targetPath.'target');
}
@@ -1343,7 +1315,7 @@ class FilesystemTest extends FilesystemTestCase
chdir($oldPath);
- $this->assertTrue(is_dir($targetPath));
+ $this->assertDirectoryExists($targetPath);
$this->assertFileExists($targetPath.'source');
$this->assertFileNotExists($targetPath.'target');
}
@@ -1420,11 +1392,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFileExists($filename);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithZlibSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$scheme = 'compress.zlib://';
$dirname = $scheme.$this->workspace;
@@ -1445,11 +1415,9 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFileNotExists($filename);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithPharSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// Skip test if Phar disabled phar.readonly must be 0 in php.ini
if (!\Phar::canWrite()) {
$this->markTestSkipped('This test cannot run when phar.readonly is 1.');
@@ -1464,11 +1432,9 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->tempnam($dirname, $pharname.'/bar');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithHTTPSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$scheme = 'http://';
$dirname = $scheme.$this->workspace;
diff --git a/lib/symfony/filesystem/Tests/FilesystemTestCase.php b/lib/symfony/filesystem/Tests/FilesystemTestCase.php
index eb6b35ddf..6fb9eba73 100644
--- a/lib/symfony/filesystem/Tests/FilesystemTestCase.php
+++ b/lib/symfony/filesystem/Tests/FilesystemTestCase.php
@@ -21,7 +21,7 @@ class FilesystemTestCase extends TestCase
protected $longPathNamesWindows = [];
/**
- * @var \Symfony\Component\Filesystem\Filesystem
+ * @var Filesystem
*/
protected $filesystem = null;
@@ -110,9 +110,8 @@ class FilesystemTestCase extends TestCase
$this->markAsSkippedIfPosixIsMissing();
$infos = stat($filepath);
- if ($datas = posix_getpwuid($infos['uid'])) {
- return $datas['name'];
- }
+
+ return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
}
protected function getFileGroup($filepath)
@@ -144,7 +143,7 @@ class FilesystemTestCase extends TestCase
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
}
- // https://bugs.php.net/bug.php?id=69473
+ // https://bugs.php.net/69473
if ($relative && '\\' === \DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {
$this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
}
diff --git a/lib/symfony/filesystem/Tests/LockHandlerTest.php b/lib/symfony/filesystem/Tests/LockHandlerTest.php
index 14eabc021..d130803d4 100644
--- a/lib/symfony/filesystem/Tests/LockHandlerTest.php
+++ b/lib/symfony/filesystem/Tests/LockHandlerTest.php
@@ -21,24 +21,20 @@ use Symfony\Component\Filesystem\LockHandler;
*/
class LockHandlerTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- * @expectedExceptionMessage Failed to create "/a/b/c/d/e": mkdir(): Permission denied.
- */
public function testConstructWhenRepositoryDoesNotExist()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+ $this->expectExceptionMessage('Failed to create "/a/b/c/d/e": mkdir(): Permission denied.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
new LockHandler('lock', '/a/b/c/d/e');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- * @expectedExceptionMessage The directory "/" is not writable.
- */
public function testConstructWhenRepositoryIsNotWriteable()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+ $this->expectExceptionMessage('The directory "/" is not writable.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
diff --git a/lib/symfony/finder/Finder.php b/lib/symfony/finder/Finder.php
index e933f0784..6624e8407 100644
--- a/lib/symfony/finder/Finder.php
+++ b/lib/symfony/finder/Finder.php
@@ -541,7 +541,8 @@ class Finder implements \IteratorAggregate, \Countable
foreach ((array) $dirs as $dir) {
if (is_dir($dir)) {
$resolvedDirs[] = $this->normalizeDir($dir);
- } elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
+ } elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR | GLOB_NOSORT)) {
+ sort($glob);
$resolvedDirs = array_merge($resolvedDirs, array_map([$this, 'normalizeDir'], $glob));
} else {
throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir));
diff --git a/lib/symfony/finder/Iterator/SortableIterator.php b/lib/symfony/finder/Iterator/SortableIterator.php
index 3c7157adb..e67997d11 100644
--- a/lib/symfony/finder/Iterator/SortableIterator.php
+++ b/lib/symfony/finder/Iterator/SortableIterator.php
@@ -38,11 +38,11 @@ class SortableIterator implements \IteratorAggregate
$this->iterator = $iterator;
if (self::SORT_BY_NAME === $sort) {
- $this->sort = function ($a, $b) {
+ $this->sort = static function ($a, $b) {
return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_TYPE === $sort) {
- $this->sort = function ($a, $b) {
+ $this->sort = static function ($a, $b) {
if ($a->isDir() && $b->isFile()) {
return -1;
} elseif ($a->isFile() && $b->isDir()) {
@@ -52,15 +52,15 @@ class SortableIterator implements \IteratorAggregate
return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
- $this->sort = function ($a, $b) {
+ $this->sort = static function ($a, $b) {
return $a->getATime() - $b->getATime();
};
} elseif (self::SORT_BY_CHANGED_TIME === $sort) {
- $this->sort = function ($a, $b) {
+ $this->sort = static function ($a, $b) {
return $a->getCTime() - $b->getCTime();
};
} elseif (self::SORT_BY_MODIFIED_TIME === $sort) {
- $this->sort = function ($a, $b) {
+ $this->sort = static function ($a, $b) {
return $a->getMTime() - $b->getMTime();
};
} elseif (\is_callable($sort)) {
diff --git a/lib/symfony/finder/Tests/FinderTest.php b/lib/symfony/finder/Tests/FinderTest.php
index c0eac6da1..442186d2b 100644
--- a/lib/symfony/finder/Tests/FinderTest.php
+++ b/lib/symfony/finder/Tests/FinderTest.php
@@ -311,11 +311,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->assertIterator($expected, $iterator);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInWithNonExistentDirectory()
{
+ $this->expectException('InvalidArgumentException');
$finder = new Finder();
$finder->in('foobar');
}
@@ -328,11 +326,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInWithNonDirectoryGlob()
{
+ $this->expectException('InvalidArgumentException');
$finder = new Finder();
$finder->in(__DIR__.'/Fixtures/A/a*');
}
@@ -349,11 +345,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
}
- /**
- * @expectedException \LogicException
- */
public function testGetIteratorWithoutIn()
{
+ $this->expectException('LogicException');
$finder = Finder::create();
$finder->getIterator();
}
@@ -481,11 +475,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->assertCount($i, $files);
}
- /**
- * @expectedException \LogicException
- */
public function testCountWithoutIn()
{
+ $this->expectException('LogicException');
$finder = Finder::create()->files();
\count($finder);
}
@@ -710,12 +702,8 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->fail('Finder should throw an exception when opening a non-readable directory.');
} catch (\Exception $e) {
$expectedExceptionClass = 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException';
- if ($e instanceof \PHPUnit_Framework_ExpectationFailedException) {
- $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit_Framework_ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
- }
-
if ($e instanceof \PHPUnit\Framework\ExpectationFailedException) {
- $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, '\PHPUnit\Framework\ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
+ $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit\Framework\ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
}
$this->assertInstanceOf($expectedExceptionClass, $e);
diff --git a/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
index ad0187e03..56d958cb6 100644
--- a/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
+++ b/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
@@ -15,11 +15,9 @@ use Symfony\Component\Finder\Iterator\CustomFilterIterator;
class CustomFilterIteratorTest extends IteratorTestCase
{
- /**
- * @expectedException \InvalidArgumentException
- */
public function testWithInvalidFilter()
{
+ $this->expectException('InvalidArgumentException');
new CustomFilterIterator(new Iterator(), ['foo']);
}
diff --git a/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php b/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
index 796dc6ac3..c7dfd79e3 100644
--- a/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
+++ b/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
@@ -44,9 +44,8 @@ abstract class IteratorTestCase extends TestCase
* $a and $b such that $a goes before $b in $expected, the method
* asserts that any element of $a goes before any element of $b
* in the sequence generated by $iterator
- * @param \Traversable $iterator
*/
- protected function assertOrderedIteratorForGroups($expected, \Traversable $iterator)
+ protected function assertOrderedIteratorForGroups(array $expected, \Traversable $iterator)
{
$values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
@@ -63,11 +62,8 @@ abstract class IteratorTestCase extends TestCase
/**
* Same as IteratorTestCase::assertIterator with foreach usage.
- *
- * @param array $expected
- * @param \Traversable $iterator
*/
- protected function assertIteratorInForeach($expected, \Traversable $iterator)
+ protected function assertIteratorInForeach(array $expected, \Traversable $iterator)
{
$values = [];
foreach ($iterator as $file) {
@@ -83,11 +79,8 @@ abstract class IteratorTestCase extends TestCase
/**
* Same as IteratorTestCase::assertOrderedIterator with foreach usage.
- *
- * @param array $expected
- * @param \Traversable $iterator
*/
- protected function assertOrderedIteratorInForeach($expected, \Traversable $iterator)
+ protected function assertOrderedIteratorInForeach(array $expected, \Traversable $iterator)
{
$values = [];
foreach ($iterator as $file) {
diff --git a/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php b/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
index 57f1e096a..118c4769f 100644
--- a/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
+++ b/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
@@ -33,11 +33,7 @@ class SortableIteratorTest extends RealIteratorTestCase
if (!\is_callable($mode)) {
switch ($mode) {
case SortableIterator::SORT_BY_ACCESSED_TIME:
- if ('\\' === \DIRECTORY_SEPARATOR) {
- touch(self::toAbsolute('.git'));
- } else {
- file_get_contents(self::toAbsolute('.git'));
- }
+ touch(self::toAbsolute('.git'));
sleep(1);
file_get_contents(self::toAbsolute('.bar'));
break;
diff --git a/lib/symfony/framework-bundle/CHANGELOG.md b/lib/symfony/framework-bundle/CHANGELOG.md
index fcbe4ffa7..f04942dbc 100644
--- a/lib/symfony/framework-bundle/CHANGELOG.md
+++ b/lib/symfony/framework-bundle/CHANGELOG.md
@@ -19,17 +19,17 @@ CHANGELOG
* Deprecated the `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` methods.
* Deprecated `AddCacheClearerPass`, use tagged iterator arguments instead.
* Deprecated `AddCacheWarmerPass`, use tagged iterator arguments instead.
- * Deprecated `TranslationDumperPass`, use
+ * Deprecated `TranslationDumperPass`, use
`Symfony\Component\Translation\DependencyInjection\TranslationDumperPass` instead
- * Deprecated `TranslationExtractorPass`, use
+ * Deprecated `TranslationExtractorPass`, use
`Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass` instead
- * Deprecated `TranslatorPass`, use
+ * Deprecated `TranslatorPass`, use
`Symfony\Component\Translation\DependencyInjection\TranslatorPass` instead
* Added `command` attribute to the `console.command` tag which takes the command
name as value, using it makes the command lazy
* Added `cache:pool:prune` command to allow manual stale cache item pruning of supported PSR-6 and PSR-16 cache pool
implementations
- * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use
+ * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use
`Symfony\Component\Translation\Reader\TranslationReader` instead
* Deprecated `translation.loader` service, use `translation.reader` instead
* `AssetsInstallCommand::__construct()` now takes an instance of
diff --git a/lib/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
index 43cbb7968..9e0984dfb 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -16,6 +16,7 @@ use Symfony\Component\Cache\Adapter\AdapterInterface;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Config\Resource\ClassExistenceResource;
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
/**
@@ -54,13 +55,13 @@ abstract class AbstractPhpFileCacheWarmer implements CacheWarmerInterface
{
$arrayAdapter = new ArrayAdapter();
- spl_autoload_register([PhpArrayAdapter::class, 'throwOnRequiredClass']);
+ spl_autoload_register([ClassExistenceResource::class, 'throwOnRequiredClass']);
try {
if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
return;
}
} finally {
- spl_autoload_unregister([PhpArrayAdapter::class, 'throwOnRequiredClass']);
+ spl_autoload_unregister([ClassExistenceResource::class, 'throwOnRequiredClass']);
}
// the ArrayAdapter stores the values serialized
@@ -83,8 +84,18 @@ abstract class AbstractPhpFileCacheWarmer implements CacheWarmerInterface
}
/**
- * @param string $cacheDir
- * @param ArrayAdapter $arrayAdapter
+ * @internal
+ */
+ final protected function ignoreAutoloadException($class, \Exception $exception)
+ {
+ try {
+ ClassExistenceResource::throwOnRequiredClass($class, $exception);
+ } catch (\ReflectionException $e) {
+ }
+ }
+
+ /**
+ * @param string $cacheDir
*
* @return bool false if there is nothing to warm-up
*/
diff --git a/lib/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php
index 3c32cb1c4..3859e07f4 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -31,10 +31,9 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
private $debug;
/**
- * @param Reader $annotationReader
- * @param string $phpArrayFile The PHP file where annotations are cached
- * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
- * @param bool $debug Run in debug mode
+ * @param string $phpArrayFile The PHP file where annotations are cached
+ * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
+ * @param bool $debug Run in debug mode
*/
public function __construct(Reader $annotationReader, $phpArrayFile, CacheItemPoolInterface $fallbackPool, $excludeRegexp = null, $debug = false)
{
@@ -64,17 +63,8 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
}
try {
$this->readAllComponents($reader, $class);
- } catch (\ReflectionException $e) {
- // ignore failing reflection
- } catch (AnnotationException $e) {
- /*
- * Ignore any AnnotationException to not break the cache warming process if an Annotation is badly
- * configured or could not be found / read / etc.
- *
- * In particular cases, an Annotation in your code can be used and defined only for a specific
- * environment but is always added to the annotations.map file by some Symfony default behaviors,
- * and you always end up with a not found Annotation.
- */
+ } catch (\Exception $e) {
+ $this->ignoreAutoloadException($class, $e);
}
}
@@ -84,14 +74,32 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
private function readAllComponents(Reader $reader, $class)
{
$reflectionClass = new \ReflectionClass($class);
- $reader->getClassAnnotations($reflectionClass);
+
+ try {
+ $reader->getClassAnnotations($reflectionClass);
+ } catch (AnnotationException $e) {
+ /*
+ * Ignore any AnnotationException to not break the cache warming process if an Annotation is badly
+ * configured or could not be found / read / etc.
+ *
+ * In particular cases, an Annotation in your code can be used and defined only for a specific
+ * environment but is always added to the annotations.map file by some Symfony default behaviors,
+ * and you always end up with a not found Annotation.
+ */
+ }
foreach ($reflectionClass->getMethods() as $reflectionMethod) {
- $reader->getMethodAnnotations($reflectionMethod);
+ try {
+ $reader->getMethodAnnotations($reflectionMethod);
+ } catch (AnnotationException $e) {
+ }
}
foreach ($reflectionClass->getProperties() as $reflectionProperty) {
- $reader->getPropertyAnnotations($reflectionProperty);
+ try {
+ $reader->getPropertyAnnotations($reflectionProperty);
+ } catch (AnnotationException $e) {
+ }
}
}
}
diff --git a/lib/symfony/framework-bundle/CacheWarmer/SerializerCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/SerializerCacheWarmer.php
index 917ea4723..e74206c86 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/SerializerCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/SerializerCacheWarmer.php
@@ -56,10 +56,10 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
foreach ($loader->getMappedClasses() as $mappedClass) {
try {
$metadataFactory->getMetadataFor($mappedClass);
- } catch (\ReflectionException $e) {
- // ignore failing reflection
} catch (AnnotationException $e) {
// ignore failing annotations
+ } catch (\Exception $e) {
+ $this->ignoreAutoloadException($mappedClass, $e);
}
}
}
diff --git a/lib/symfony/framework-bundle/CacheWarmer/ValidatorCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/ValidatorCacheWarmer.php
index 8ac38133c..93c9eda6f 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -33,9 +33,8 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
private $validatorBuilder;
/**
- * @param ValidatorBuilderInterface $validatorBuilder
- * @param string $phpArrayFile The PHP file where metadata are cached
- * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
+ * @param string $phpArrayFile The PHP file where metadata are cached
+ * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
*/
public function __construct(ValidatorBuilderInterface $validatorBuilder, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
{
@@ -61,10 +60,10 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
if ($metadataFactory->hasMetadataFor($mappedClass)) {
$metadataFactory->getMetadataFor($mappedClass);
}
- } catch (\ReflectionException $e) {
- // ignore failing reflection
} catch (AnnotationException $e) {
// ignore failing annotations
+ } catch (\Exception $e) {
+ $this->ignoreAutoloadException($mappedClass, $e);
}
}
}
diff --git a/lib/symfony/framework-bundle/Command/AboutCommand.php b/lib/symfony/framework-bundle/Command/AboutCommand.php
index ad1590edf..e40114abe 100644
--- a/lib/symfony/framework-bundle/Command/AboutCommand.php
+++ b/lib/symfony/framework-bundle/Command/AboutCommand.php
@@ -123,7 +123,7 @@ EOT
private static function isExpired($date)
{
- $date = \DateTime::createFromFormat('m/Y', $date);
+ $date = \DateTime::createFromFormat('d/m/Y', '01/'.$date);
return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');
}
diff --git a/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php b/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
index fe0d60b55..c03813397 100644
--- a/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
+++ b/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
@@ -14,6 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\Console\Exception\LogicException;
use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\StyleInterface;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -26,6 +27,9 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
*/
abstract class AbstractConfigCommand extends ContainerDebugCommand
{
+ /**
+ * @param OutputInterface|StyleInterface $output
+ */
protected function listBundles($output)
{
$title = 'Available registered bundles with their extension alias if available';
diff --git a/lib/symfony/framework-bundle/Command/CacheClearCommand.php b/lib/symfony/framework-bundle/Command/CacheClearCommand.php
index 14f0dc28c..969ac030b 100644
--- a/lib/symfony/framework-bundle/Command/CacheClearCommand.php
+++ b/lib/symfony/framework-bundle/Command/CacheClearCommand.php
@@ -42,7 +42,6 @@ class CacheClearCommand extends ContainerAwareCommand
/**
* @param CacheClearerInterface $cacheClearer
- * @param Filesystem|null $filesystem
*/
public function __construct($cacheClearer = null, Filesystem $filesystem = null)
{
@@ -267,10 +266,9 @@ EOF
}
/**
- * @param KernelInterface $parent
- * @param string $namespace
- * @param string $parentClass
- * @param string $warmupDir
+ * @param string $namespace
+ * @param string $parentClass
+ * @param string $warmupDir
*
* @return KernelInterface
*/
diff --git a/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php b/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
index 6aa3fbf9b..9919e4657 100644
--- a/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
@@ -104,7 +104,7 @@ EOF
} catch (LogicException $e) {
$errorIo->error($e->getMessage());
- return;
+ return 1;
}
$io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
diff --git a/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php b/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
index 37b179899..a4d2764b1 100644
--- a/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
+++ b/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
@@ -86,7 +86,7 @@ EOF
'For dumping a specific option, add its path as the second argument of this command. (e.g. config:dump-reference FrameworkBundle profiler.matcher to dump the framework.profiler.matcher configuration)',
]);
- return;
+ return null;
}
$extension = $this->findExtension($name);
@@ -129,5 +129,7 @@ EOF
}
$io->writeln(null === $path ? $dumper->dump($configuration, $extension->getNamespace()) : $dumper->dumpAtPath($configuration, $path));
+
+ return null;
}
}
diff --git a/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php b/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
index 72ac54856..84c87521c 100644
--- a/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
+++ b/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
@@ -93,5 +93,7 @@ EOF
}
$io->table([], $tableRows);
+
+ return null;
}
}
diff --git a/lib/symfony/framework-bundle/Command/RouterDebugCommand.php b/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
index b428b9e45..7ef645542 100644
--- a/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
@@ -154,10 +154,13 @@ EOF
}
}
+ /**
+ * @return callable|null
+ */
private function extractCallable(Route $route)
{
if (!$route->hasDefault('_controller')) {
- return;
+ return null;
}
$controller = $route->getDefault('_controller');
@@ -178,5 +181,7 @@ EOF
return $controller;
} catch (\InvalidArgumentException $e) {
}
+
+ return null;
}
}
diff --git a/lib/symfony/framework-bundle/Command/RouterMatchCommand.php b/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
index 972c055bd..d6a1df8a0 100644
--- a/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
+++ b/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
@@ -149,5 +149,7 @@ EOF
return 1;
}
+
+ return null;
}
}
diff --git a/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php b/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
index 2a06b102e..7375450d5 100644
--- a/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
+++ b/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
@@ -242,7 +242,7 @@ EOF
if (!\count($operation->getDomains())) {
$errorIo->warning('No translation messages were found.');
- return;
+ return null;
}
$resultMessage = 'Translation files were successfully updated';
@@ -307,6 +307,8 @@ EOF
}
$errorIo->success($resultMessage.'.');
+
+ return null;
}
private function filterCatalogue(MessageCatalogue $catalogue, $domain)
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
index c7b669fda..23d9ccc77 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
@@ -127,8 +127,6 @@ abstract class Descriptor implements DescriptorInterface
* * name: name of described service
*
* @param Definition|Alias|object $service
- * @param array $options
- * @param ContainerBuilder|null $builder
*/
abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);
@@ -166,8 +164,7 @@ abstract class Descriptor implements DescriptorInterface
/**
* Describes a callable.
*
- * @param callable $callable
- * @param array $options
+ * @param mixed $callable
*/
abstract protected function describeCallable($callable, array $options = []);
@@ -214,8 +211,7 @@ abstract class Descriptor implements DescriptorInterface
}
/**
- * @param ContainerBuilder $builder
- * @param string $serviceId
+ * @param string $serviceId
*
* @return mixed
*/
@@ -235,8 +231,7 @@ abstract class Descriptor implements DescriptorInterface
}
/**
- * @param ContainerBuilder $builder
- * @param bool $showPrivate
+ * @param bool $showPrivate
*
* @return array
*/
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
index c18d27868..ea5d0c7d0 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
@@ -142,7 +142,9 @@ class JsonDescriptor extends Descriptor
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
{
if (!$builder) {
- return $this->writeData($this->getContainerAliasData($alias), $options);
+ $this->writeData($this->getContainerAliasData($alias), $options);
+
+ return;
}
$this->writeData(
@@ -179,8 +181,6 @@ class JsonDescriptor extends Descriptor
/**
* Writes data as json.
- *
- * @return array|string
*/
private function writeData(array $data, array $options)
{
@@ -209,8 +209,7 @@ class JsonDescriptor extends Descriptor
}
/**
- * @param Definition $definition
- * @param bool $omitTags
+ * @param bool $omitTags
*
* @return array
*/
@@ -287,8 +286,7 @@ class JsonDescriptor extends Descriptor
}
/**
- * @param EventDispatcherInterface $eventDispatcher
- * @param string|null $event
+ * @param string|null $event
*
* @return array
*/
@@ -320,7 +318,6 @@ class JsonDescriptor extends Descriptor
/**
* @param callable $callable
- * @param array $options
*
* @return array
*/
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
index 6575b05ec..2c31bdc19 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
@@ -249,7 +249,9 @@ class MarkdownDescriptor extends Descriptor
."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
if (!isset($options['id'])) {
- return $this->write($output);
+ $this->write($output);
+
+ return;
}
$this->write(sprintf("### %s\n\n%s\n", $options['id'], $output));
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
index 911e60c08..f17a1bba2 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
@@ -369,7 +369,7 @@ class TextDescriptor extends Descriptor
return;
}
- return $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
+ $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
}
/**
@@ -425,7 +425,6 @@ class TextDescriptor extends Descriptor
$tableHeaders = ['Order', 'Callable', 'Priority'];
$tableRows = [];
- $order = 1;
foreach ($eventListeners as $order => $listener) {
$tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
}
@@ -434,8 +433,6 @@ class TextDescriptor extends Descriptor
}
/**
- * @param array $config
- *
* @return string
*/
private function formatRouterConfig(array $config)
@@ -494,7 +491,6 @@ class TextDescriptor extends Descriptor
/**
* @param string $content
- * @param array $options
*/
private function writeText($content, array $options = [])
{
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
index 53e2ee1fa..96b9a261a 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
@@ -98,7 +98,9 @@ class XmlDescriptor extends Descriptor
$dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));
if (!$builder) {
- return $this->writeDocument($dom);
+ $this->writeDocument($dom);
+
+ return;
}
$dom->appendChild($dom->importNode($this->getContainerDefinitionDocument($builder->getDefinition((string) $alias), (string) $alias)->childNodes->item(0), true));
@@ -132,8 +134,6 @@ class XmlDescriptor extends Descriptor
/**
* Writes DOM document.
- *
- * @return \DOMDocument|string
*/
private function writeDocument(\DOMDocument $dom)
{
@@ -158,7 +158,6 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param Route $route
* @param string|null $name
*
* @return \DOMDocument
@@ -244,8 +243,7 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param ContainerBuilder $builder
- * @param bool $showPrivate
+ * @param bool $showPrivate
*
* @return \DOMDocument
*/
@@ -268,10 +266,9 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param mixed $service
- * @param string $id
- * @param ContainerBuilder|null $builder
- * @param bool $showArguments
+ * @param mixed $service
+ * @param string $id
+ * @param bool $showArguments
*
* @return \DOMDocument
*/
@@ -296,11 +293,10 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param ContainerBuilder $builder
- * @param string|null $tag
- * @param bool $showPrivate
- * @param bool $showArguments
- * @param callable $filter
+ * @param string|null $tag
+ * @param bool $showPrivate
+ * @param bool $showArguments
+ * @param callable $filter
*
* @return \DOMDocument
*/
@@ -330,7 +326,6 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param Definition $definition
* @param string|null $id
* @param bool $omitTags
*
@@ -454,7 +449,6 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param Alias $alias
* @param string|null $id
*
* @return \DOMDocument
@@ -492,8 +486,7 @@ class XmlDescriptor extends Descriptor
}
/**
- * @param EventDispatcherInterface $eventDispatcher
- * @param string|null $event
+ * @param string|null $event
*
* @return \DOMDocument
*/
diff --git a/lib/symfony/framework-bundle/Controller/ControllerTrait.php b/lib/symfony/framework-bundle/Controller/ControllerTrait.php
index 78e2bd600..cb339cd15 100644
--- a/lib/symfony/framework-bundle/Controller/ControllerTrait.php
+++ b/lib/symfony/framework-bundle/Controller/ControllerTrait.php
@@ -431,7 +431,7 @@ trait ControllerTrait
/**
* Get a user from the Security Token Storage.
*
- * @return mixed
+ * @return object|null
*
* @throws \LogicException If SecurityBundle is not available
*
@@ -446,12 +446,12 @@ trait ControllerTrait
}
if (null === $token = $this->container->get('security.token_storage')->getToken()) {
- return;
+ return null;
}
if (!\is_object($user = $token->getUser())) {
// e.g. anonymous authentication
- return;
+ return null;
}
return $user;
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Configuration.php b/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
index 52369bbff..00316daf5 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
@@ -264,7 +264,7 @@ class Configuration implements ConfigurationInterface
->canBeEnabled()
->beforeNormalization()
->always(function ($v) {
- if (true === $v['enabled']) {
+ if (\is_array($v) && true === $v['enabled']) {
$workflows = $v;
unset($workflows['enabled']);
@@ -470,12 +470,6 @@ class Configuration implements ConfigurationInterface
$rootNode
->children()
->arrayNode('session')
- ->validate()
- ->ifTrue(function ($v) {
- return empty($v['handler_id']) && !empty($v['save_path']);
- })
- ->thenInvalid('Session save path is ignored without a handler service')
- ->end()
->info('session configuration')
->canBeEnabled()
->children()
@@ -504,7 +498,7 @@ class Configuration implements ConfigurationInterface
->defaultTrue()
->setDeprecated('The "%path%.%node%" option is enabled by default and deprecated since Symfony 3.4. It will be always enabled in 4.0.')
->end()
- ->scalarNode('save_path')->end()
+ ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
->integerNode('metadata_update_threshold')
->defaultValue('0')
->info('seconds to wait between 2 session metadata updates')
@@ -935,7 +929,11 @@ class Configuration implements ConfigurationInterface
->ifString()->then(function ($v) { return ['enabled' => true, 'resources' => $v]; })
->end()
->beforeNormalization()
- ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']); })
+ ->ifTrue(function ($v) { return \is_array($v) && !isset($v['enabled']); })
+ ->then(function ($v) { return $v + ['enabled' => true]; })
+ ->end()
+ ->beforeNormalization()
+ ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']) && !isset($v['resource']); })
->then(function ($v) {
$e = $v['enabled'];
unset($v['enabled']);
@@ -954,7 +952,19 @@ class Configuration implements ConfigurationInterface
->end()
->beforeNormalization()
->ifTrue(function ($v) { return \is_array($v) && array_keys($v) === range(0, \count($v) - 1); })
- ->then(function ($v) { return ['default' => $v]; })
+ ->then(function ($v) {
+ $resources = [];
+ foreach ($v as $resource) {
+ $resources = array_merge_recursive(
+ $resources,
+ \is_array($resource) && isset($resource['name'])
+ ? [$resource['name'] => $resource['value']]
+ : ['default' => $resource]
+ );
+ }
+
+ return $resources;
+ })
->end()
->prototype('array')
->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
diff --git a/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php b/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
index 8243ac65f..3e28e52ad 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
@@ -234,7 +234,7 @@ class FrameworkExtension extends Extension
if ($this->isConfigEnabled($container, $config['session'])) {
if (!\extension_loaded('session')) {
- throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
+ throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
}
$this->sessionConfigEnabled = true;
@@ -877,11 +877,6 @@ class FrameworkExtension extends Extension
// session handler (the internal callback registered with PHP session management)
if (null === $config['handler_id']) {
- // If the user set a save_path without using a non-default \SessionHandler, it will silently be ignored
- if (isset($config['save_path'])) {
- throw new LogicException('Session save path is ignored without a handler service');
- }
-
// Set the handler class to be null
$container->getDefinition('session.storage.native')->replaceArgument(1, null);
$container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
@@ -889,10 +884,6 @@ class FrameworkExtension extends Extension
$container->setAlias('session.handler', $config['handler_id'])->setPrivate(true);
}
- if (!isset($config['save_path'])) {
- $config['save_path'] = ini_get('session.save_path');
- }
-
$container->setParameter('session.save_path', $config['save_path']);
if (\PHP_VERSION_ID < 70000) {
@@ -1052,8 +1043,6 @@ class FrameworkExtension extends Extension
$container->getDefinition('assets.url_package')->setPrivate(true);
$container->getDefinition('assets.static_version_strategy')->setPrivate(true);
- $defaultVersion = null;
-
if ($config['version_strategy']) {
$defaultVersion = new Reference($config['version_strategy']);
} else {
@@ -1752,9 +1741,7 @@ class FrameworkExtension extends Extension
}
/**
- * Returns the base path for the XSD files.
- *
- * @return string The XSD base path
+ * {@inheritdoc}
*/
public function getXsdValidationBasePath()
{
diff --git a/lib/symfony/framework-bundle/EventListener/SessionListener.php b/lib/symfony/framework-bundle/EventListener/SessionListener.php
index aa5b4ba68..dc47013b1 100644
--- a/lib/symfony/framework-bundle/EventListener/SessionListener.php
+++ b/lib/symfony/framework-bundle/EventListener/SessionListener.php
@@ -34,10 +34,6 @@ class SessionListener extends AbstractSessionListener
protected function getSession()
{
- if (!$this->container->has('session')) {
- return;
- }
-
- return $this->container->get('session');
+ return $this->container->get('session', ContainerInterface::NULL_ON_INVALID_REFERENCE);
}
}
diff --git a/lib/symfony/framework-bundle/EventListener/TestSessionListener.php b/lib/symfony/framework-bundle/EventListener/TestSessionListener.php
index 55356be04..0e94341e7 100644
--- a/lib/symfony/framework-bundle/EventListener/TestSessionListener.php
+++ b/lib/symfony/framework-bundle/EventListener/TestSessionListener.php
@@ -34,10 +34,6 @@ class TestSessionListener extends AbstractTestSessionListener
protected function getSession()
{
- if (!$this->container->has('session')) {
- return;
- }
-
- return $this->container->get('session');
+ return $this->container->get('session', ContainerInterface::NULL_ON_INVALID_REFERENCE);
}
}
diff --git a/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php b/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
index a8f3ce954..3779792d6 100644
--- a/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
+++ b/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
@@ -29,8 +29,6 @@ trait MicroKernelTrait
*
* $routes->import('config/routing.yml');
* $routes->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
- *
- * @param RouteCollectionBuilder $routes
*/
abstract protected function configureRoutes(RouteCollectionBuilder $routes);
@@ -50,9 +48,6 @@ trait MicroKernelTrait
* Or parameters:
*
* $c->setParameter('halloween', 'lot of fun');
- *
- * @param ContainerBuilder $c
- * @param LoaderInterface $loader
*/
abstract protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader);
diff --git a/lib/symfony/framework-bundle/Resources/config/annotations.xml b/lib/symfony/framework-bundle/Resources/config/annotations.xml
index 02104ba26..9403917ff 100644
--- a/lib/symfony/framework-bundle/Resources/config/annotations.xml
+++ b/lib/symfony/framework-bundle/Resources/config/annotations.xml
@@ -37,7 +37,7 @@
%kernel.cache_dir%/annotations.php
#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!AbstractController$|Controller$))#
+ #^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!.*Controller$))#
%kernel.debug%
diff --git a/lib/symfony/framework-bundle/Routing/Router.php b/lib/symfony/framework-bundle/Routing/Router.php
index a846536a4..ebb5e145c 100644
--- a/lib/symfony/framework-bundle/Routing/Router.php
+++ b/lib/symfony/framework-bundle/Routing/Router.php
@@ -147,7 +147,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
return '%%';
}
- if (preg_match('/^env\(\w+\)$/', $match[1])) {
+ if (preg_match('/^env\((?:\w++:)*+\w++\)$/', $match[1])) {
throw new RuntimeException(sprintf('Using "%%%s%%" is not allowed in routing configuration.', $match[1]));
}
@@ -156,7 +156,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
if (\is_string($resolved) || is_numeric($resolved)) {
$this->collectedParameters[$match[1]] = $resolved;
- return (string) $resolved;
+ return (string) $this->resolve($resolved);
}
throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type %s.', $match[1], $value, \gettype($resolved)));
diff --git a/lib/symfony/framework-bundle/Templating/GlobalVariables.php b/lib/symfony/framework-bundle/Templating/GlobalVariables.php
index 4e07b9b5b..ad5aee77f 100644
--- a/lib/symfony/framework-bundle/Templating/GlobalVariables.php
+++ b/lib/symfony/framework-bundle/Templating/GlobalVariables.php
@@ -36,7 +36,7 @@ class GlobalVariables
public function getToken()
{
if (!$this->container->has('security.token_storage')) {
- return;
+ return null;
}
return $this->container->get('security.token_storage')->getToken();
@@ -45,15 +45,12 @@ class GlobalVariables
public function getUser()
{
if (!$token = $this->getToken()) {
- return;
+ return null;
}
$user = $token->getUser();
- if (!\is_object($user)) {
- return;
- }
- return $user;
+ return \is_object($user) ? $user : null;
}
/**
@@ -61,9 +58,7 @@ class GlobalVariables
*/
public function getRequest()
{
- if ($this->container->has('request_stack')) {
- return $this->container->get('request_stack')->getCurrentRequest();
- }
+ return $this->container->has('request_stack') ? $this->container->get('request_stack')->getCurrentRequest() : null;
}
/**
@@ -71,9 +66,7 @@ class GlobalVariables
*/
public function getSession()
{
- if ($request = $this->getRequest()) {
- return $request->getSession();
- }
+ return ($request = $this->getRequest()) ? $request->getSession() : null;
}
/**
diff --git a/lib/symfony/framework-bundle/Templating/Helper/CodeHelper.php b/lib/symfony/framework-bundle/Templating/Helper/CodeHelper.php
index c8914c3a5..a0a77f8d1 100644
--- a/lib/symfony/framework-bundle/Templating/Helper/CodeHelper.php
+++ b/lib/symfony/framework-bundle/Templating/Helper/CodeHelper.php
@@ -110,7 +110,7 @@ class CodeHelper extends Helper
* @param string $file A file path
* @param int $line The selected line number
*
- * @return string An HTML string
+ * @return string|null An HTML string
*/
public function fileExcerpt($file, $line)
{
@@ -120,12 +120,12 @@ class CodeHelper extends Helper
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
- return;
+ return '';
}
}
// highlight_file could throw warnings
- // see https://bugs.php.net/bug.php?id=25725
+ // see https://bugs.php.net/25725
$code = @highlight_file($file, true);
// remove main code/span tags
$code = preg_replace('#^\s*(.*)\s*#s', '\\1', $code);
@@ -138,6 +138,8 @@ class CodeHelper extends Helper
return '%command.name% command lints a YAML file and outputs to STDOUT
-the first encountered syntax error.
-
-You can validates YAML contents passed from STDIN:
-
- cat filename | php %command.full_name%
-
-You can also validate the syntax of a file:
-
- php %command.full_name% filename
-
-Or of a whole directory:
-
- php %command.full_name% dirname
- php %command.full_name% dirname --format=json
-
Or find all files in a bundle:
php %command.full_name% @AcmeDemoBundle
-
EOF;
- $this->assertEquals($expected, $command->getHelp());
+ $this->assertStringContainsString($expected, $command->getHelp());
}
public function testLintFilesFromBundleDirectory()
@@ -108,7 +89,7 @@ EOF;
);
$this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
- $this->assertContains('[OK] All 0 YAML files contain valid syntax', trim($tester->getDisplay()));
+ $this->assertStringContainsString('[OK] All 0 YAML files contain valid syntax', trim($tester->getDisplay()));
}
/**
diff --git a/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php b/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
index fbc5a7733..50f9478cd 100644
--- a/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
+++ b/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
@@ -160,9 +160,9 @@ class ApplicationTest extends TestCase
$output = $tester->getDisplay();
$this->assertSame(0, $tester->getStatusCode());
- $this->assertContains('Some commands could not be registered:', $output);
- $this->assertContains('throwing', $output);
- $this->assertContains('fine', $output);
+ $this->assertStringContainsString('Some commands could not be registered:', $output);
+ $this->assertStringContainsString('throwing', $output);
+ $this->assertStringContainsString('fine', $output);
}
public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
@@ -188,8 +188,8 @@ class ApplicationTest extends TestCase
$output = $tester->getDisplay();
$this->assertSame(1, $tester->getStatusCode());
- $this->assertContains('Some commands could not be registered:', $output);
- $this->assertContains('Command "fine" is not defined.', $output);
+ $this->assertStringContainsString('Some commands could not be registered:', $output);
+ $this->assertStringContainsString('Command "fine" is not defined.', $output);
}
private function getKernel(array $bundles, $useDispatcher = false)
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
index 91a72821e..3d4a503f2 100644
--- a/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
@@ -127,9 +127,9 @@ class ControllerNameParserTest extends TestCase
if (false === $suggestedBundleName) {
// make sure we don't have a suggestion
- $this->assertNotContains('Did you mean', $e->getMessage());
+ $this->assertStringNotContainsString('Did you mean', $e->getMessage());
} else {
- $this->assertContains(sprintf('Did you mean "%s"', $suggestedBundleName), $e->getMessage());
+ $this->assertStringContainsString(sprintf('Did you mean "%s"', $suggestedBundleName), $e->getMessage());
}
}
}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
index da950ce0c..c03934565 100644
--- a/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
@@ -87,12 +87,10 @@ abstract class ControllerTraitTest extends TestCase
$this->assertNull($controller->getUser());
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage The SecurityBundle is not registered in your application.
- */
public function testGetUserWithEmptyContainer()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('The SecurityBundle is not registered in your application.');
$controller = $this->createController();
$controller->setContainer(new Container());
@@ -188,8 +186,8 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
- $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
}
public function testFileAsInline()
@@ -204,8 +202,8 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
- $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
}
public function testFileWithOwnFileName()
@@ -221,8 +219,8 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
- $this->assertContains($fileName, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
}
public function testFileWithOwnFileNameAsInline()
@@ -238,8 +236,8 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
- $this->assertContains($fileName, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
}
public function testFileFromPath()
@@ -254,8 +252,8 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
- $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
}
public function testFileFromPathWithCustomizedFileName()
@@ -270,19 +268,16 @@ abstract class ControllerTraitTest extends TestCase
if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type'));
}
- $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
- $this->assertContains('test.php', $response->headers->get('content-disposition'));
+ $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+ $this->assertStringContainsString('test.php', $response->headers->get('content-disposition'));
}
- /**
- * @expectedException \Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException
- */
public function testFileWhichDoesNotExist()
{
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
$controller = $this->createController();
- /* @var BinaryFileResponse $response */
- $response = $controller->file('some-file.txt', 'test.php');
+ $controller->file('some-file.txt', 'test.php');
}
public function testIsGranted()
@@ -299,11 +294,9 @@ abstract class ControllerTraitTest extends TestCase
$this->assertTrue($controller->isGranted('foo'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
- */
public function testdenyAccessUnlessGranted()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');
$authorizationChecker = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface')->getMock();
$authorizationChecker->expects($this->once())->method('isGranted')->willReturn(false);
@@ -431,10 +424,10 @@ abstract class ControllerTraitTest extends TestCase
public function testRedirect()
{
$controller = $this->createController();
- $response = $controller->redirect('http://dunglas.fr', 301);
+ $response = $controller->redirect('https://dunglas.fr', 301);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
- $this->assertSame('http://dunglas.fr', $response->getTargetUrl());
+ $this->assertSame('https://dunglas.fr', $response->getTargetUrl());
$this->assertSame(301, $response->getStatusCode());
}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php b/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
index 9dba1c05a..7b4ed8e51 100644
--- a/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
+++ b/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
@@ -77,12 +77,10 @@ class TemplateControllerTest extends TestCase
$this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.
- */
public function testNoTwigNorTemplating()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');
$controller = new TemplateController();
$controller->templateAction('mytemplate')->getContent();
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
index 3681ca204..16f0f68d2 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -63,12 +63,10 @@ class AddConsoleCommandPassTest extends TestCase
];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "my-command" tagged "console.command" must not be abstract.
- */
public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "my-command" tagged "console.command" must not be abstract.');
$container = new ContainerBuilder();
$container->addCompilerPass(new AddConsoleCommandPass());
@@ -80,12 +78,10 @@ class AddConsoleCommandPassTest extends TestCase
$container->compile();
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "my-command" tagged "console.command" must be a subclass of "Symfony\Component\Console\Command\Command".
- */
public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "my-command" tagged "console.command" must be a subclass of "Symfony\Component\Console\Command\Command".');
$container = new ContainerBuilder();
$container->addCompilerPass(new AddConsoleCommandPass());
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
index 6fdf8a51e..1d998395e 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
@@ -46,14 +46,12 @@ class AddConstraintValidatorsPassTest extends TestCase
$this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.
- */
public function testAbstractConstraintValidator()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.');
$container = new ContainerBuilder();
- $validatorFactory = $container->register('validator.validator_factory')
+ $container->register('validator.validator_factory')
->addArgument([]);
$container->register('my_abstract_constraint_validator')
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
index 1e7dc416c..53ea1bf68 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
@@ -93,12 +93,10 @@ class CachePoolPassTest extends TestCase
$this->assertSame(3, $cachePool->getArgument(2));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Invalid "cache.pool" tag for service "app.cache_pool": accepted attributes are
- */
public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "cache.pool" tag for service "app.cache_pool": accepted attributes are');
$container = new ContainerBuilder();
$container->setParameter('kernel.debug', false);
$container->setParameter('kernel.name', 'app');
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
index 2ef2e1535..1439d36f8 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
@@ -56,12 +56,10 @@ class CachePoolPrunerPassTest extends TestCase
$this->assertCount($aliasesBefore, $container->getAliases());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Class "Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\NotFound" used for service "pool.not-found" cannot be found.
- */
public function testCompilerPassThrowsOnInvalidDefinitionClass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Class "Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\NotFound" used for service "pool.not-found" cannot be found.');
$container = new ContainerBuilder();
$container->register('console.command.cache_pool_prune')->addArgument([]);
$container->register('pool.not-found', NotFound::class)->addTag('cache.pool');
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
index b5e3c9f24..a73093e7c 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
@@ -124,12 +124,10 @@ class FormPassTest extends TestCase
];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage extended-type attribute, none was configured for the "my.type_extension" service
- */
public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('extended-type attribute, none was configured for the "my.type_extension" service');
$container = new ContainerBuilder();
$container->addCompilerPass(new FormPass());
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
index b693165f8..99299282a 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -24,11 +24,10 @@ class ProfilerPassTest extends TestCase
* Thus, a fully-valid tag looks something like this:
*
*
-
-
-
-
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session_savepath.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session_savepath.yml
deleted file mode 100644
index 174ebe586..000000000
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session_savepath.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-framework:
- session:
- handler_id: null
- save_path: /some/path
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index ef074bd16..556fd9afd 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -85,7 +85,9 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('property_accessor');
if (!method_exists(PropertyAccessor::class, 'createCache')) {
- return $this->assertFalse($container->hasDefinition('cache.property_access'));
+ $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+ return;
}
$cache = $container->getDefinition('cache.property_access');
@@ -98,7 +100,9 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('property_accessor', ['kernel.debug' => true]);
if (!method_exists(PropertyAccessor::class, 'createCache')) {
- return $this->assertFalse($container->hasDefinition('cache.property_access'));
+ $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+ return;
}
$cache = $container->getDefinition('cache.property_access');
@@ -106,12 +110,10 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertSame(ArrayAdapter::class, $cache->getClass(), 'ArrayAdapter should be used in debug mode');
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage CSRF protection needs sessions to be enabled.
- */
public function testCsrfProtectionNeedsSessionToBeEnabled()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('CSRF protection needs sessions to be enabled.');
$this->createContainerFromFile('csrf_needs_session');
}
@@ -249,42 +251,34 @@ abstract class FrameworkExtensionTest extends TestCase
*/
public function testDeprecatedWorkflowMissingType()
{
- $container = $this->createContainerFromFile('workflows_without_type');
+ $this->createContainerFromFile('workflows_without_type');
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- * @expectedExceptionMessage "type" and "service" cannot be used together.
- */
public function testWorkflowCannotHaveBothTypeAndService()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+ $this->expectExceptionMessage('"type" and "service" cannot be used together.');
$this->createContainerFromFile('workflow_with_type_and_service');
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- * @expectedExceptionMessage "supports" and "support_strategy" cannot be used together.
- */
public function testWorkflowCannotHaveBothSupportsAndSupportStrategy()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+ $this->expectExceptionMessage('"supports" and "support_strategy" cannot be used together.');
$this->createContainerFromFile('workflow_with_support_and_support_strategy');
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- * @expectedExceptionMessage "supports" or "support_strategy" should be configured.
- */
public function testWorkflowShouldHaveOneOfSupportsAndSupportStrategy()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+ $this->expectExceptionMessage('"supports" or "support_strategy" should be configured.');
$this->createContainerFromFile('workflow_without_support_and_support_strategy');
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- * @expectedExceptionMessage "arguments" and "service" cannot be used together.
- */
public function testWorkflowCannotHaveBothArgumentsAndService()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+ $this->expectExceptionMessage('"arguments" and "service" cannot be used together.');
$this->createContainerFromFile('workflow_with_arguments_and_service');
}
@@ -430,11 +424,9 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- */
public function testRouterRequiresResourceOption()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
$container = $this->createContainer();
$loader = new FrameworkExtension();
$loader->load([['router' => true]], $container);
@@ -473,14 +465,6 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- */
- public function testNullSessionHandlerWithSavePath()
- {
- $this->createContainerFromFile('session_savepath');
- }
-
public function testRequest()
{
$container = $this->createContainerFromFile('full');
@@ -645,11 +629,9 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertFalse($container->has('templating.helper.translator'));
}
- /**
- * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
- */
public function testTemplatingRequiresAtLeastOneEngine()
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
$container = $this->createContainer();
$loader = new FrameworkExtension();
$loader->load([['templating' => null]], $container);
@@ -840,9 +822,9 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertSame('addYamlMappings', $calls[4][0]);
$this->assertCount(3, $calls[4][1][0]);
- $this->assertContains('foo.yml', $calls[4][1][0][0]);
- $this->assertContains('validation.yml', $calls[4][1][0][1]);
- $this->assertContains('validation.yaml', $calls[4][1][0][2]);
+ $this->assertStringContainsString('foo.yml', $calls[4][1][0][0]);
+ $this->assertStringContainsString('validation.yml', $calls[4][1][0][1]);
+ $this->assertStringContainsString('validation.yaml', $calls[4][1][0][2]);
}
public function testFormsCanBeEnabledWithoutCsrfProtection()
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index ec39372b1..afccc84d5 100644
--- a/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -23,11 +23,9 @@ class PhpFrameworkExtensionTest extends FrameworkExtensionTest
$loader->load($file.'.php');
}
- /**
- * @expectedException \LogicException
- */
public function testAssetsCannotHavePathAndUrl()
{
+ $this->expectException('LogicException');
$this->createContainerFromClosure(function ($container) {
$container->loadFromExtension('framework', [
'assets' => [
@@ -38,11 +36,9 @@ class PhpFrameworkExtensionTest extends FrameworkExtensionTest
});
}
- /**
- * @expectedException \LogicException
- */
public function testAssetPackageCannotHavePathAndUrl()
{
+ $this->expectException('LogicException');
$this->createContainerFromClosure(function ($container) {
$container->loadFromExtension('framework', [
'assets' => [
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
index 59670fdd1..0ae7669ce 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
@@ -26,7 +26,7 @@ class TestExtension extends Extension implements PrependExtensionInterface
public function load(array $configs, ContainerBuilder $container)
{
$configuration = $this->getConfiguration($configs, $container);
- $config = $this->processConfiguration($configuration, $configs);
+ $this->processConfiguration($configuration, $configs);
$container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
index e30a0e1ee..8a0f6593d 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -31,8 +31,8 @@ class CachePoolClearCommandTest extends AbstractWebTestCase
$tester->execute(['pools' => ['cache.private_pool']], ['decorated' => false]);
$this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
- $this->assertContains('Clearing cache pool: cache.private_pool', $tester->getDisplay());
- $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+ $this->assertStringContainsString('Clearing cache pool: cache.private_pool', $tester->getDisplay());
+ $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
}
public function testClearPublicPool()
@@ -41,8 +41,8 @@ class CachePoolClearCommandTest extends AbstractWebTestCase
$tester->execute(['pools' => ['cache.public_pool']], ['decorated' => false]);
$this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
- $this->assertContains('Clearing cache pool: cache.public_pool', $tester->getDisplay());
- $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+ $this->assertStringContainsString('Clearing cache pool: cache.public_pool', $tester->getDisplay());
+ $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
}
public function testClearPoolWithCustomClearer()
@@ -51,8 +51,8 @@ class CachePoolClearCommandTest extends AbstractWebTestCase
$tester->execute(['pools' => ['cache.pool_with_clearer']], ['decorated' => false]);
$this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
- $this->assertContains('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
- $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+ $this->assertStringContainsString('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
+ $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
}
public function testCallClearer()
@@ -61,16 +61,14 @@ class CachePoolClearCommandTest extends AbstractWebTestCase
$tester->execute(['pools' => ['cache.app_clearer']], ['decorated' => false]);
$this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
- $this->assertContains('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
- $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+ $this->assertStringContainsString('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
+ $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
- * @expectedExceptionMessage You have requested a non-existent service "unknown_pool"
- */
public function testClearUnexistingPool()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+ $this->expectExceptionMessage('You have requested a non-existent service "unknown_pool"');
$this->createCommandTester()
->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
}
@@ -88,7 +86,7 @@ class CachePoolClearCommandTest extends AbstractWebTestCase
$tester->execute(['pools' => []]);
- $this->assertContains('Cache was successfully cleared', $tester->getDisplay());
+ $this->assertStringContainsString('Cache was successfully cleared', $tester->getDisplay());
}
private function createCommandTester()
diff --git a/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php b/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
index ebf6561a6..13815b959 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
@@ -34,7 +34,7 @@ class CachePoolsTest extends AbstractWebTestCase
throw $e;
}
$this->markTestSkipped($e->getMessage());
- } catch (\PHPUnit_Framework_Error_Warning $e) {
+ } catch (\PHPUnit\Framework\Error\Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;
}
@@ -59,7 +59,7 @@ class CachePoolsTest extends AbstractWebTestCase
throw $e;
}
$this->markTestSkipped($e->getMessage());
- } catch (\PHPUnit_Framework_Error_Warning $e) {
+ } catch (\PHPUnit\Framework\Error\Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;
}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
index c10750eaa..a2e88f003 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -36,7 +36,7 @@ class ConfigDebugCommandTest extends AbstractWebTestCase
$ret = $tester->execute(['name' => 'TestBundle']);
$this->assertSame(0, $ret, 'Returns 0 in case of success');
- $this->assertContains('custom: foo', $tester->getDisplay());
+ $this->assertStringContainsString('custom: foo', $tester->getDisplay());
}
public function testDumpBundleOption()
@@ -45,7 +45,7 @@ class ConfigDebugCommandTest extends AbstractWebTestCase
$ret = $tester->execute(['name' => 'TestBundle', 'path' => 'custom']);
$this->assertSame(0, $ret, 'Returns 0 in case of success');
- $this->assertContains('foo', $tester->getDisplay());
+ $this->assertStringContainsString('foo', $tester->getDisplay());
}
public function testParametersValuesAreResolved()
@@ -54,8 +54,8 @@ class ConfigDebugCommandTest extends AbstractWebTestCase
$ret = $tester->execute(['name' => 'framework']);
$this->assertSame(0, $ret, 'Returns 0 in case of success');
- $this->assertContains("locale: '%env(LOCALE)%'", $tester->getDisplay());
- $this->assertContains('secret: test', $tester->getDisplay());
+ $this->assertStringContainsString("locale: '%env(LOCALE)%'", $tester->getDisplay());
+ $this->assertStringContainsString('secret: test', $tester->getDisplay());
}
public function testDumpUndefinedBundleOption()
@@ -63,7 +63,7 @@ class ConfigDebugCommandTest extends AbstractWebTestCase
$tester = $this->createCommandTester();
$tester->execute(['name' => 'TestBundle', 'path' => 'foo']);
- $this->assertContains('Unable to find configuration for "test.foo"', $tester->getDisplay());
+ $this->assertStringContainsString('Unable to find configuration for "test.foo"', $tester->getDisplay());
}
/**
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
index b8ac6645f..aa5dba65c 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
@@ -36,8 +36,8 @@ class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
$ret = $tester->execute(['name' => 'TestBundle']);
$this->assertSame(0, $ret, 'Returns 0 in case of success');
- $this->assertContains('test:', $tester->getDisplay());
- $this->assertContains(' custom:', $tester->getDisplay());
+ $this->assertStringContainsString('test:', $tester->getDisplay());
+ $this->assertStringContainsString(' custom:', $tester->getDisplay());
}
public function testDumpAtPath()
@@ -70,7 +70,7 @@ EOL
]);
$this->assertSame(1, $ret);
- $this->assertContains('[ERROR] The "path" option is only available for the "yaml" format.', $tester->getDisplay());
+ $this->assertStringContainsString('[ERROR] The "path" option is only available for the "yaml" format.', $tester->getDisplay());
}
/**
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
index 21f33df0c..6f936c796 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -44,7 +44,7 @@ class ContainerDebugCommandTest extends AbstractWebTestCase
$tester = new ApplicationTester($application);
$tester->run(['command' => 'debug:container']);
- $this->assertContains('public', $tester->getDisplay());
+ $this->assertStringContainsString('public', $tester->getDisplay());
}
public function testPrivateAlias()
@@ -56,11 +56,11 @@ class ContainerDebugCommandTest extends AbstractWebTestCase
$tester = new ApplicationTester($application);
$tester->run(['command' => 'debug:container', '--show-private' => true]);
- $this->assertContains('public', $tester->getDisplay());
- $this->assertContains('private_alias', $tester->getDisplay());
+ $this->assertStringContainsString('public', $tester->getDisplay());
+ $this->assertStringContainsString('private_alias', $tester->getDisplay());
$tester->run(['command' => 'debug:container']);
- $this->assertContains('public', $tester->getDisplay());
- $this->assertNotContains('private_alias', $tester->getDisplay());
+ $this->assertStringContainsString('public', $tester->getDisplay());
+ $this->assertStringNotContainsString('private_alias', $tester->getDisplay());
}
}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
index 8e55eb5d8..6d163b783 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -29,8 +29,8 @@ class DebugAutowiringCommandTest extends AbstractWebTestCase
$tester = new ApplicationTester($application);
$tester->run(['command' => 'debug:autowiring']);
- $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
- $this->assertContains('alias to http_kernel', $tester->getDisplay());
+ $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+ $this->assertStringContainsString('alias to http_kernel', $tester->getDisplay());
}
public function testSearchArgument()
@@ -43,8 +43,8 @@ class DebugAutowiringCommandTest extends AbstractWebTestCase
$tester = new ApplicationTester($application);
$tester->run(['command' => 'debug:autowiring', 'search' => 'kern']);
- $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
- $this->assertNotContains('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
+ $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+ $this->assertStringNotContainsString('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
}
public function testSearchNoResults()
@@ -57,7 +57,7 @@ class DebugAutowiringCommandTest extends AbstractWebTestCase
$tester = new ApplicationTester($application);
$tester->run(['command' => 'debug:autowiring', 'search' => 'foo_fake'], ['capture_stderr_separately' => true]);
- $this->assertContains('No autowirable classes or interfaces found matching "foo_fake"', $tester->getErrorOutput());
+ $this->assertStringContainsString('No autowirable classes or interfaces found matching "foo_fake"', $tester->getErrorOutput());
$this->assertEquals(1, $tester->getStatusCode());
}
}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php b/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
index ec3c47e76..35c2e63b7 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
@@ -24,16 +24,16 @@ class ProfilerTest extends AbstractWebTestCase
}
$client->request('GET', '/profiler');
- $this->assertFalse($client->getProfile());
+ $this->assertNull($client->getProfile());
// enable the profiler for the next request
$client->enableProfiler();
- $this->assertFalse($client->getProfile());
+ $this->assertNull($client->getProfile());
$client->request('GET', '/profiler');
- $this->assertInternalType('object', $client->getProfile());
+ $this->assertIsObject($client->getProfile());
$client->request('GET', '/profiler');
- $this->assertFalse($client->getProfile());
+ $this->assertNull($client->getProfile());
}
public function getConfigs()
diff --git a/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php b/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
index 0fa8a09b4..3a87f7e4e 100644
--- a/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
+++ b/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
@@ -27,23 +27,23 @@ class SessionTest extends AbstractWebTestCase
// no session
$crawler = $client->request('GET', '/session');
- $this->assertContains('You are new here and gave no name.', $crawler->text());
+ $this->assertStringContainsString('You are new here and gave no name.', $crawler->text());
// remember name
$crawler = $client->request('GET', '/session/drak');
- $this->assertContains('Hello drak, nice to meet you.', $crawler->text());
+ $this->assertStringContainsString('Hello drak, nice to meet you.', $crawler->text());
// prove remembered name
$crawler = $client->request('GET', '/session');
- $this->assertContains('Welcome back drak, nice to meet you.', $crawler->text());
+ $this->assertStringContainsString('Welcome back drak, nice to meet you.', $crawler->text());
// clear session
$crawler = $client->request('GET', '/session_logout');
- $this->assertContains('Session cleared.', $crawler->text());
+ $this->assertStringContainsString('Session cleared.', $crawler->text());
// prove cleared session
$crawler = $client->request('GET', '/session');
- $this->assertContains('You are new here and gave no name.', $crawler->text());
+ $this->assertStringContainsString('You are new here and gave no name.', $crawler->text());
}
/**
@@ -59,14 +59,14 @@ class SessionTest extends AbstractWebTestCase
}
// set flash
- $crawler = $client->request('GET', '/session_setflash/Hello%20world.');
+ $client->request('GET', '/session_setflash/Hello%20world.');
// check flash displays on redirect
- $this->assertContains('Hello world.', $client->followRedirect()->text());
+ $this->assertStringContainsString('Hello world.', $client->followRedirect()->text());
// check flash is gone
$crawler = $client->request('GET', '/session_showflash');
- $this->assertContains('No flash was set.', $crawler->text());
+ $this->assertStringContainsString('No flash was set.', $crawler->text());
}
/**
@@ -91,39 +91,39 @@ class SessionTest extends AbstractWebTestCase
// new session, so no name set.
$crawler1 = $client1->request('GET', '/session');
- $this->assertContains('You are new here and gave no name.', $crawler1->text());
+ $this->assertStringContainsString('You are new here and gave no name.', $crawler1->text());
// set name of client1
$crawler1 = $client1->request('GET', '/session/client1');
- $this->assertContains('Hello client1, nice to meet you.', $crawler1->text());
+ $this->assertStringContainsString('Hello client1, nice to meet you.', $crawler1->text());
// no session for client2
$crawler2 = $client2->request('GET', '/session');
- $this->assertContains('You are new here and gave no name.', $crawler2->text());
+ $this->assertStringContainsString('You are new here and gave no name.', $crawler2->text());
// remember name client2
$crawler2 = $client2->request('GET', '/session/client2');
- $this->assertContains('Hello client2, nice to meet you.', $crawler2->text());
+ $this->assertStringContainsString('Hello client2, nice to meet you.', $crawler2->text());
// prove remembered name of client1
$crawler1 = $client1->request('GET', '/session');
- $this->assertContains('Welcome back client1, nice to meet you.', $crawler1->text());
+ $this->assertStringContainsString('Welcome back client1, nice to meet you.', $crawler1->text());
// prove remembered name of client2
$crawler2 = $client2->request('GET', '/session');
- $this->assertContains('Welcome back client2, nice to meet you.', $crawler2->text());
+ $this->assertStringContainsString('Welcome back client2, nice to meet you.', $crawler2->text());
// clear client1
$crawler1 = $client1->request('GET', '/session_logout');
- $this->assertContains('Session cleared.', $crawler1->text());
+ $this->assertStringContainsString('Session cleared.', $crawler1->text());
// prove client1 data is cleared
$crawler1 = $client1->request('GET', '/session');
- $this->assertContains('You are new here and gave no name.', $crawler1->text());
+ $this->assertStringContainsString('You are new here and gave no name.', $crawler1->text());
// prove remembered name of client2 remains untouched.
$crawler2 = $client2->request('GET', '/session');
- $this->assertContains('Welcome back client2, nice to meet you.', $crawler2->text());
+ $this->assertStringContainsString('Welcome back client2, nice to meet you.', $crawler2->text());
}
/**
diff --git a/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php b/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
index 9fe45527c..414eed17d 100644
--- a/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
+++ b/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
@@ -14,6 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Routing\Router;
use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
@@ -122,23 +123,21 @@ class RouterTest extends TestCase
$routes->add('foo', new Route('/before/%parameter.foo%/after/%%escaped%%'));
$sc = $this->getServiceContainer($routes);
- $sc->setParameter('parameter.foo', 'foo');
+ $sc->setParameter('parameter.foo', 'foo-%%escaped%%');
$router = new Router($sc, 'foo');
$route = $router->getRouteCollection()->get('foo');
$this->assertEquals(
- '/before/foo/after/%escaped%',
+ '/before/foo-%escaped%/after/%escaped%',
$route->getPath()
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Using "%env(FOO)%" is not allowed in routing configuration.
- */
public function testEnvPlaceholders()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Using "%env(FOO)%" is not allowed in routing configuration.');
$routes = new RouteCollection();
$routes->add('foo', new Route('/%env(FOO)%'));
@@ -147,6 +146,22 @@ class RouterTest extends TestCase
$router->getRouteCollection();
}
+ public function testIndirectEnvPlaceholders()
+ {
+ $routes = new RouteCollection();
+
+ $routes->add('foo', new Route('/%foo%'));
+
+ $router = new Router($container = $this->getServiceContainer($routes), 'foo');
+ $container->setParameter('foo', 'foo-%bar%');
+ $container->setParameter('bar', '%env(string:FOO)%');
+
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('Using "%env(string:FOO)%" is not allowed in routing configuration.');
+
+ $router->getRouteCollection();
+ }
+
public function testHostPlaceholders()
{
$routes = new RouteCollection();
@@ -168,12 +183,10 @@ class RouterTest extends TestCase
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
- * @expectedExceptionMessage You have requested a non-existent parameter "nope".
- */
public function testExceptionOnNonExistentParameter()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException');
+ $this->expectExceptionMessage('You have requested a non-existent parameter "nope".');
$routes = new RouteCollection();
$routes->add('foo', new Route('/%nope%'));
@@ -184,12 +197,10 @@ class RouterTest extends TestCase
$router->getRouteCollection()->get('foo');
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type object.
- */
public function testExceptionOnNonStringParameter()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type object.');
$routes = new RouteCollection();
$routes->add('foo', new Route('/%object%'));
diff --git a/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php b/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
index 1fae0526d..547339559 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
@@ -43,12 +43,10 @@ class DelegatingEngineTest extends TestCase
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage No engine is able to work with the template "template.php"
- */
public function testGetInvalidEngine()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('No engine is able to work with the template "template.php"');
$firstEngine = $this->getEngineMock('template.php', false);
$secondEngine = $this->getEngineMock('template.php', false);
$container = $this->getContainerMock([
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
index 03b2ed696..3ac441562 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -52,11 +52,12 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
]);
}
- protected function tearDown()
+ /**
+ * @after
+ */
+ public function doTearDown()
{
$this->engine = null;
-
- parent::tearDown();
}
public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
index bd088078c..e7555b234 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -77,11 +77,12 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
]);
}
- protected function tearDown()
+ /**
+ * @after
+ */
+ public function doTearDown()
{
$this->engine = null;
-
- parent::tearDown();
}
protected function renderForm(FormView $view, array $vars = [])
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php b/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
index c78b7e5b2..b19ce0d27 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
@@ -69,7 +69,7 @@ class TemplateLocatorTest extends TestCase
$locator->locate($template);
$this->fail('->locate() should throw an exception when the file is not found.');
} catch (\InvalidArgumentException $e) {
- $this->assertContains(
+ $this->assertStringContainsString(
$errorMessage,
$e->getMessage(),
'TemplateLocator exception should propagate the FileLocator exception message'
@@ -77,11 +77,9 @@ class TemplateLocatorTest extends TestCase
}
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testThrowsAnExceptionWhenTemplateIsNotATemplateReferenceInterface()
{
+ $this->expectException('InvalidArgumentException');
$locator = new TemplateLocator($this->getFileLocator());
$locator->locate('template');
}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php b/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
index 9628828af..16c668117 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
@@ -43,11 +43,9 @@ class PhpEngineTest extends TestCase
$this->assertEmpty($globals['app']->getRequest());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetInvalidHelper()
{
+ $this->expectException('InvalidArgumentException');
$container = $this->getContainer();
$loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
$engine = new PhpEngine(new TemplateNameParser(), $container, $loader);
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php b/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
index 4460d2ac2..b9cb30859 100644
--- a/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
+++ b/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
@@ -74,11 +74,9 @@ class TemplateNameParserTest extends TestCase
];
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testParseValidNameWithNotFoundBundle()
{
+ $this->expectException('InvalidArgumentException');
$this->parser->parse('BarBundle:Post:index.html.php');
}
diff --git a/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php b/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
index 9dfd861db..e38e11601 100644
--- a/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
+++ b/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
@@ -107,10 +107,10 @@ class TranslatorTest extends TestCase
/**
* @group legacy
* @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
- * @expectedException \InvalidArgumentException
*/
public function testTransWithCachingWithInvalidLocaleOmittingLocale()
{
+ $this->expectException('InvalidArgumentException');
$loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale', null);
@@ -156,13 +156,13 @@ class TranslatorTest extends TestCase
/**
* @group legacy
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Missing third $defaultLocale argument.
*/
public function testGetDefaultLocaleOmittingLocaleWithPsrContainer()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Missing third $defaultLocale argument.');
$container = $this->getMockBuilder(ContainerInterface::class)->getMock();
- $translator = new Translator($container, new MessageFormatter());
+ new Translator($container, new MessageFormatter());
}
/**
@@ -247,12 +247,10 @@ class TranslatorTest extends TestCase
$this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Invalid "invalid locale" locale.
- */
public function testTransWithCachingWithInvalidLocale()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "invalid locale" locale.');
$loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
@@ -282,12 +280,10 @@ class TranslatorTest extends TestCase
$this->assertSame('en', $translator->getLocale());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
- * @expectedExceptionMessage The Translator does not support the following options: 'foo'
- */
public function testInvalidOptions()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The Translator does not support the following options: \'foo\'');
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
(new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']));
diff --git a/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php b/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
index 8afe604c3..1b5409805 100644
--- a/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
+++ b/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
@@ -59,11 +59,9 @@ class ConstraintValidatorFactoryTest extends TestCase
$this->assertSame($validator, $factory->getInstance(new ConstraintAliasStub()));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
- */
public function testGetInstanceInvalidValidatorClass()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
$constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
$constraint
->expects($this->exactly(2))
diff --git a/lib/symfony/framework-bundle/composer.json b/lib/symfony/framework-bundle/composer.json
index 40cff711a..dae941c1f 100644
--- a/lib/symfony/framework-bundle/composer.json
+++ b/lib/symfony/framework-bundle/composer.json
@@ -18,14 +18,14 @@
"require": {
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
- "symfony/cache": "~3.4|~4.0",
+ "symfony/cache": "~3.4.31|^4.3.4",
"symfony/class-loader": "~3.2",
"symfony/dependency-injection": "^3.4.24|^4.2.5",
- "symfony/config": "~3.4|~4.0",
+ "symfony/config": "^3.4.31|^4.3.4",
"symfony/debug": "~2.8|~3.0|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/http-foundation": "^3.3.11|~4.0",
- "symfony/http-kernel": "~3.4|~4.0",
+ "symfony/http-foundation": "^3.4.13|~4.3",
+ "symfony/http-kernel": "^3.4.31|^4.3.4",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~2.8|~3.0|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
@@ -36,11 +36,11 @@
"fig/link-util": "^1.0",
"symfony/asset": "~3.3|~4.0",
"symfony/browser-kit": "~2.8|~3.0|~4.0",
- "symfony/console": "~3.4|~4.0",
+ "symfony/console": "~3.4.31|^4.3.4",
"symfony/css-selector": "~2.8|~3.0|~4.0",
"symfony/dom-crawler": "~2.8|~3.0|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
- "symfony/form": "^3.4.22|~4.1.11|^4.2.3",
+ "symfony/form": "^3.4.31|^4.3.4",
"symfony/expression-language": "~2.8|~3.0|~4.0",
"symfony/process": "~2.8|~3.0|~4.0",
"symfony/security-core": "~3.2|~4.0",
@@ -56,7 +56,7 @@
"symfony/property-info": "~3.3|~4.0",
"symfony/lock": "~3.4|~4.0",
"symfony/web-link": "~3.3|~4.0",
- "doctrine/annotations": "~1.0",
+ "doctrine/annotations": "~1.7",
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
"twig/twig": "~1.34|~2.4"
},
diff --git a/lib/symfony/http-foundation/AcceptHeaderItem.php b/lib/symfony/http-foundation/AcceptHeaderItem.php
index f6e896874..96bb0c443 100644
--- a/lib/symfony/http-foundation/AcceptHeaderItem.php
+++ b/lib/symfony/http-foundation/AcceptHeaderItem.php
@@ -25,7 +25,6 @@ class AcceptHeaderItem
/**
* @param string $value
- * @param array $attributes
*/
public function __construct($value, array $attributes = [])
{
diff --git a/lib/symfony/http-foundation/BinaryFileResponse.php b/lib/symfony/http-foundation/BinaryFileResponse.php
index 6c9a995e9..f43114111 100644
--- a/lib/symfony/http-foundation/BinaryFileResponse.php
+++ b/lib/symfony/http-foundation/BinaryFileResponse.php
@@ -327,12 +327,12 @@ class BinaryFileResponse extends Response
if (null !== $content) {
throw new \LogicException('The content cannot be set on a BinaryFileResponse instance.');
}
+
+ return $this;
}
/**
* {@inheritdoc}
- *
- * @return false
*/
public function getContent()
{
diff --git a/lib/symfony/http-foundation/CHANGELOG.md b/lib/symfony/http-foundation/CHANGELOG.md
index 7bfde80ff..c0d890167 100644
--- a/lib/symfony/http-foundation/CHANGELOG.md
+++ b/lib/symfony/http-foundation/CHANGELOG.md
@@ -21,7 +21,7 @@ CHANGELOG
-----
* the `Request::setTrustedProxies()` method takes a new `$trustedHeaderSet` argument,
- see http://symfony.com/doc/current/components/http_foundation/trusting_proxies.html for more info,
+ see https://symfony.com/doc/current/deployment/proxies.html for more info,
* deprecated the `Request::setTrustedHeaderName()` and `Request::getTrustedHeaderName()` methods,
* added `File\Stream`, to be passed to `BinaryFileResponse` when the size of the served file is unknown,
disabling `Range` and `Content-Length` handling, switching to chunked encoding instead
diff --git a/lib/symfony/http-foundation/Cookie.php b/lib/symfony/http-foundation/Cookie.php
index 83a97087f..98a5ef00a 100644
--- a/lib/symfony/http-foundation/Cookie.php
+++ b/lib/symfony/http-foundation/Cookie.php
@@ -18,6 +18,10 @@ namespace Symfony\Component\HttpFoundation;
*/
class Cookie
{
+ const SAMESITE_NONE = 'none';
+ const SAMESITE_LAX = 'lax';
+ const SAMESITE_STRICT = 'strict';
+
protected $name;
protected $value;
protected $domain;
@@ -25,12 +29,13 @@ class Cookie
protected $path;
protected $secure;
protected $httpOnly;
+
private $raw;
private $sameSite;
- const SAMESITE_NONE = 'none';
- const SAMESITE_LAX = 'lax';
- const SAMESITE_STRICT = 'strict';
+ private static $reservedCharsList = "=,; \t\r\n\v\f";
+ private static $reservedCharsFrom = ['=', ',', ';', ' ', "\t", "\r", "\n", "\v", "\f"];
+ private static $reservedCharsTo = ['%3D', '%2C', '%3B', '%20', '%09', '%0D', '%0A', '%0B', '%0C'];
/**
* Creates cookie from raw header string.
@@ -97,7 +102,7 @@ class Cookie
public function __construct($name, $value = null, $expire = 0, $path = '/', $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null)
{
// from PHP source code
- if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
+ if ($raw && false !== strpbrk($name, self::$reservedCharsList)) {
throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
}
@@ -143,7 +148,13 @@ class Cookie
*/
public function __toString()
{
- $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'=';
+ if ($this->isRaw()) {
+ $str = $this->getName();
+ } else {
+ $str = str_replace(self::$reservedCharsFrom, self::$reservedCharsTo, $this->getName());
+ }
+
+ $str .= '=';
if ('' === (string) $this->getValue()) {
$str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0';
diff --git a/lib/symfony/http-foundation/File/MimeType/ExtensionGuesser.php b/lib/symfony/http-foundation/File/MimeType/ExtensionGuesser.php
index 80f4d47f7..f9393df90 100644
--- a/lib/symfony/http-foundation/File/MimeType/ExtensionGuesser.php
+++ b/lib/symfony/http-foundation/File/MimeType/ExtensionGuesser.php
@@ -90,5 +90,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
return $extension;
}
}
+
+ return null;
}
}
diff --git a/lib/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/lib/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
index 34e015ee5..7045e94df 100644
--- a/lib/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
+++ b/lib/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -31,7 +31,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
*
* @param string $cmd The command to run to get the mime type of a file
*/
- public function __construct($cmd = 'file -b --mime %s 2>/dev/null')
+ public function __construct($cmd = 'file -b --mime -- %s 2>/dev/null')
{
$this->cmd = $cmd;
}
@@ -74,24 +74,24 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
}
if (!self::isSupported()) {
- return;
+ return null;
}
ob_start();
// need to use --mime instead of -i. see #6641
- passthru(sprintf($this->cmd, escapeshellarg($path)), $return);
+ passthru(sprintf($this->cmd, escapeshellarg((0 === strpos($path, '-') ? './' : '').$path)), $return);
if ($return > 0) {
ob_end_clean();
- return;
+ return null;
}
$type = trim(ob_get_clean());
- if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
+ if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\+\.]+)#i', $type, $match)) {
// it's not a type, but an error message
- return;
+ return null;
}
return $match[1];
diff --git a/lib/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php b/lib/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
index bf1ee9f5d..fc4bc4502 100644
--- a/lib/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ b/lib/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -26,7 +26,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
/**
* @param string $magicFile A magic file to use with the finfo instance
*
- * @see http://www.php.net/manual/en/function.finfo-open.php
+ * @see https://php.net/finfo-open
*/
public function __construct($magicFile = null)
{
@@ -57,11 +57,11 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
}
if (!self::isSupported()) {
- return;
+ return null;
}
if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
- return;
+ return null;
}
return $finfo->file($path);
diff --git a/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
index 95d1ee267..e05269fc8 100644
--- a/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ b/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
@@ -129,5 +129,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {
throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
}
+
+ return null;
}
}
diff --git a/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php b/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
index 5ac1acb82..e46e78eef 100644
--- a/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
+++ b/lib/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
@@ -26,7 +26,7 @@ interface MimeTypeGuesserInterface
*
* @param string $path The path to the file
*
- * @return string The mime type or NULL, if none could be guessed
+ * @return string|null The mime type or NULL, if none could be guessed
*
* @throws FileNotFoundException If the file does not exist
* @throws AccessDeniedException If the file could not be read
diff --git a/lib/symfony/http-foundation/File/UploadedFile.php b/lib/symfony/http-foundation/File/UploadedFile.php
index a44c664b4..86153ed49 100644
--- a/lib/symfony/http-foundation/File/UploadedFile.php
+++ b/lib/symfony/http-foundation/File/UploadedFile.php
@@ -214,13 +214,26 @@ class UploadedFile extends File
*/
public static function getMaxFilesize()
{
- $iniMax = strtolower(ini_get('upload_max_filesize'));
+ $sizePostMax = self::parseFilesize(ini_get('post_max_size'));
+ $sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
- if ('' === $iniMax) {
- return PHP_INT_MAX;
+ return min($sizePostMax ?: PHP_INT_MAX, $sizeUploadMax ?: PHP_INT_MAX);
+ }
+
+ /**
+ * Returns the given size from an ini value in bytes.
+ *
+ * @return int The given size in bytes
+ */
+ private static function parseFilesize($size)
+ {
+ if ('' === $size) {
+ return 0;
}
- $max = ltrim($iniMax, '+');
+ $size = strtolower($size);
+
+ $max = ltrim($size, '+');
if (0 === strpos($max, '0x')) {
$max = \intval($max, 16);
} elseif (0 === strpos($max, '0')) {
@@ -229,7 +242,7 @@ class UploadedFile extends File
$max = (int) $max;
}
- switch (substr($iniMax, -1)) {
+ switch (substr($size, -1)) {
case 't': $max *= 1024;
// no break
case 'g': $max *= 1024;
diff --git a/lib/symfony/http-foundation/FileBag.php b/lib/symfony/http-foundation/FileBag.php
index ca849b3d7..024fadf20 100644
--- a/lib/symfony/http-foundation/FileBag.php
+++ b/lib/symfony/http-foundation/FileBag.php
@@ -75,8 +75,8 @@ class FileBag extends ParameterBag
return $file;
}
- $file = $this->fixPhpFilesArray($file);
if (\is_array($file)) {
+ $file = $this->fixPhpFilesArray($file);
$keys = array_keys($file);
sort($keys);
@@ -109,14 +109,12 @@ class FileBag extends ParameterBag
* It's safe to pass an already converted array, in which case this method
* just returns the original array unmodified.
*
+ * @param array $data
+ *
* @return array
*/
protected function fixPhpFilesArray($data)
{
- if (!\is_array($data)) {
- return $data;
- }
-
$keys = array_keys($data);
sort($keys);
diff --git a/lib/symfony/http-foundation/HeaderBag.php b/lib/symfony/http-foundation/HeaderBag.php
index 9798173e6..35bd6ad8f 100644
--- a/lib/symfony/http-foundation/HeaderBag.php
+++ b/lib/symfony/http-foundation/HeaderBag.php
@@ -121,7 +121,15 @@ class HeaderBag implements \IteratorAggregate, \Countable
}
if ($first) {
- return \count($headers[$key]) ? $headers[$key][0] : $default;
+ if (!$headers[$key]) {
+ return $default;
+ }
+
+ if (null === $headers[$key][0]) {
+ return null;
+ }
+
+ return (string) $headers[$key][0];
}
return $headers[$key];
diff --git a/lib/symfony/http-foundation/JsonResponse.php b/lib/symfony/http-foundation/JsonResponse.php
index a9bdac30f..b0e765167 100644
--- a/lib/symfony/http-foundation/JsonResponse.php
+++ b/lib/symfony/http-foundation/JsonResponse.php
@@ -100,7 +100,7 @@ class JsonResponse extends Response
public function setCallback($callback = null)
{
if (null !== $callback) {
- // partially taken from http://www.geekality.net/2011/08/03/valid-javascript-identifier/
+ // partially taken from https://geekality.net/2011/08/03/valid-javascript-identifier/
// partially taken from https://github.com/willdurand/JsonpCallbackValidator
// JsonpCallbackValidator is released under the MIT License. See https://github.com/willdurand/JsonpCallbackValidator/blob/v1.1.0/LICENSE for details.
// (c) William Durand
diff --git a/lib/symfony/http-foundation/ParameterBag.php b/lib/symfony/http-foundation/ParameterBag.php
index f05e4a215..194ba2c6c 100644
--- a/lib/symfony/http-foundation/ParameterBag.php
+++ b/lib/symfony/http-foundation/ParameterBag.php
@@ -191,7 +191,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* @param int $filter FILTER_* constant
* @param mixed $options Filter options
*
- * @see http://php.net/manual/en/function.filter-var.php
+ * @see https://php.net/filter-var
*
* @return mixed
*/
diff --git a/lib/symfony/http-foundation/RedirectResponse.php b/lib/symfony/http-foundation/RedirectResponse.php
index 51fd869ab..4e3cb4f77 100644
--- a/lib/symfony/http-foundation/RedirectResponse.php
+++ b/lib/symfony/http-foundation/RedirectResponse.php
@@ -30,7 +30,7 @@ class RedirectResponse extends Response
*
* @throws \InvalidArgumentException
*
- * @see http://tools.ietf.org/html/rfc2616#section-10.3
+ * @see https://tools.ietf.org/html/rfc2616#section-10.3
*/
public function __construct($url, $status = 302, $headers = [])
{
diff --git a/lib/symfony/http-foundation/Request.php b/lib/symfony/http-foundation/Request.php
index 7185d75e9..3fc7b71e6 100644
--- a/lib/symfony/http-foundation/Request.php
+++ b/lib/symfony/http-foundation/Request.php
@@ -97,49 +97,49 @@ class Request
/**
* Custom parameters.
*
- * @var \Symfony\Component\HttpFoundation\ParameterBag
+ * @var ParameterBag
*/
public $attributes;
/**
* Request body parameters ($_POST).
*
- * @var \Symfony\Component\HttpFoundation\ParameterBag
+ * @var ParameterBag
*/
public $request;
/**
* Query string parameters ($_GET).
*
- * @var \Symfony\Component\HttpFoundation\ParameterBag
+ * @var ParameterBag
*/
public $query;
/**
* Server and execution environment parameters ($_SERVER).
*
- * @var \Symfony\Component\HttpFoundation\ServerBag
+ * @var ServerBag
*/
public $server;
/**
* Uploaded files ($_FILES).
*
- * @var \Symfony\Component\HttpFoundation\FileBag
+ * @var FileBag
*/
public $files;
/**
* Cookies ($_COOKIE).
*
- * @var \Symfony\Component\HttpFoundation\ParameterBag
+ * @var ParameterBag
*/
public $cookies;
/**
* Headers (taken from the $_SERVER).
*
- * @var \Symfony\Component\HttpFoundation\HeaderBag
+ * @var HeaderBag
*/
public $headers;
@@ -199,7 +199,7 @@ class Request
protected $format;
/**
- * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
+ * @var SessionInterface
*/
protected $session;
@@ -528,6 +528,10 @@ class Request
try {
$content = $this->getContent();
} catch (\LogicException $e) {
+ if (\PHP_VERSION_ID >= 70400) {
+ throw $e;
+ }
+
return trigger_error($e, E_USER_ERROR);
}
@@ -915,7 +919,7 @@ class Request
* @return string|null The client IP address
*
* @see getClientIps()
- * @see http://en.wikipedia.org/wiki/X-Forwarded-For
+ * @see https://wikipedia.org/wiki/X-Forwarded-For
*/
public function getClientIp()
{
@@ -1204,7 +1208,7 @@ class Request
// A reference to the same base directory or an empty subdirectory must be prefixed with "./".
// This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
// as the first segment of a relative-path reference, as it would be mistaken for a scheme name
- // (see http://tools.ietf.org/html/rfc3986#section-4.2).
+ // (see https://tools.ietf.org/html/rfc3986#section-4.2).
return !isset($path[0]) || '/' === $path[0]
|| false !== ($colonPos = strpos($path, ':')) && ($colonPos < ($slashPos = strpos($path, '/')) || false === $slashPos)
? "./$path" : $path;
@@ -1449,6 +1453,8 @@ class Request
return $format;
}
}
+
+ return null;
}
/**
@@ -1823,7 +1829,7 @@ class Request
* It works if your JavaScript library sets an X-Requested-With HTTP header.
* It is known to work with common JavaScript frameworks:
*
- * @see http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
+ * @see https://wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
*
* @return bool true if the request is an XMLHttpRequest, false otherwise
*/
@@ -1835,9 +1841,9 @@ class Request
/*
* The following methods are derived from code of the Zend Framework (1.10dev - 2010-01-24)
*
- * Code subject to the new BSD license (http://framework.zend.com/license/new-bsd).
+ * Code subject to the new BSD license (https://framework.zend.com/license).
*
- * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * Copyright (c) 2005-2010 Zend Technologies USA Inc. (https://www.zend.com/)
*/
protected function prepareRequestUri()
diff --git a/lib/symfony/http-foundation/RequestMatcher.php b/lib/symfony/http-foundation/RequestMatcher.php
index cadf70c5b..3f5149579 100644
--- a/lib/symfony/http-foundation/RequestMatcher.php
+++ b/lib/symfony/http-foundation/RequestMatcher.php
@@ -53,7 +53,6 @@ class RequestMatcher implements RequestMatcherInterface
* @param string|null $host
* @param string|string[]|null $methods
* @param string|string[]|null $ips
- * @param array $attributes
* @param string|string[]|null $schemes
*/
public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = [], $schemes = null)
diff --git a/lib/symfony/http-foundation/RequestStack.php b/lib/symfony/http-foundation/RequestStack.php
index 885d78a50..244a77d63 100644
--- a/lib/symfony/http-foundation/RequestStack.php
+++ b/lib/symfony/http-foundation/RequestStack.php
@@ -47,7 +47,7 @@ class RequestStack
public function pop()
{
if (!$this->requests) {
- return;
+ return null;
}
return array_pop($this->requests);
@@ -73,7 +73,7 @@ class RequestStack
public function getMasterRequest()
{
if (!$this->requests) {
- return;
+ return null;
}
return $this->requests[0];
@@ -95,7 +95,7 @@ class RequestStack
$pos = \count($this->requests) - 2;
if (!isset($this->requests[$pos])) {
- return;
+ return null;
}
return $this->requests[$pos];
diff --git a/lib/symfony/http-foundation/Response.php b/lib/symfony/http-foundation/Response.php
index 4ab05066f..26e3a3378 100644
--- a/lib/symfony/http-foundation/Response.php
+++ b/lib/symfony/http-foundation/Response.php
@@ -88,7 +88,7 @@ class Response
const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511; // RFC6585
/**
- * @var \Symfony\Component\HttpFoundation\ResponseHeaderBag
+ * @var ResponseHeaderBag
*/
public $headers;
@@ -121,7 +121,7 @@ class Response
* Status codes translation table.
*
* The list of codes is complete according to the
- * {@link http://www.iana.org/assignments/http-status-codes/ Hypertext Transfer Protocol (HTTP) Status Code Registry}
+ * {@link https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml Hypertext Transfer Protocol (HTTP) Status Code Registry}
* (last updated 2016-03-01).
*
* Unless otherwise noted, the status code is defined in RFC2616.
@@ -342,7 +342,7 @@ class Response
// cookies
foreach ($this->headers->getCookies() as $cookie) {
- header('Set-Cookie: '.$cookie->getName().strstr($cookie, '='), false, $this->statusCode);
+ header('Set-Cookie: '.$cookie, false, $this->statusCode);
}
// status
@@ -407,7 +407,7 @@ class Response
/**
* Gets the current response content.
*
- * @return string Content
+ * @return string|false
*/
public function getContent()
{
@@ -790,6 +790,8 @@ class Response
if (null !== $this->getExpires()) {
return (int) $this->getExpires()->format('U') - (int) $this->getDate()->format('U');
}
+
+ return null;
}
/**
@@ -846,6 +848,8 @@ class Response
if (null !== $maxAge = $this->getMaxAge()) {
return $maxAge - $this->getAge();
}
+
+ return null;
}
/**
@@ -1025,7 +1029,7 @@ class Response
*
* @return $this
*
- * @see http://tools.ietf.org/html/rfc2616#section-10.3.5
+ * @see https://tools.ietf.org/html/rfc2616#section-10.3.5
*
* @final since version 3.3
*/
@@ -1133,7 +1137,7 @@ class Response
*
* @return bool
*
- * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+ * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
*
* @final since version 3.2
*/
diff --git a/lib/symfony/http-foundation/ServerBag.php b/lib/symfony/http-foundation/ServerBag.php
index 90da49fae..4c82b1774 100644
--- a/lib/symfony/http-foundation/ServerBag.php
+++ b/lib/symfony/http-foundation/ServerBag.php
@@ -79,7 +79,7 @@ class ServerBag extends ParameterBag
/*
* XXX: Since there is no PHP_AUTH_BEARER in PHP predefined variables,
* I'll just set $headers['AUTHORIZATION'] here.
- * http://php.net/manual/en/reserved.variables.server.php
+ * https://php.net/reserved.variables.server
*/
$headers['AUTHORIZATION'] = $authorizationHeader;
}
diff --git a/lib/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php b/lib/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
index bbf2e39c8..07885e7fb 100644
--- a/lib/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/lib/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
@@ -97,7 +97,7 @@ class NamespacedAttributeBag extends AttributeBag
* @param string $name Key name
* @param bool $writeContext Write context, default false
*
- * @return array
+ * @return array|null
*/
protected function &resolveAttributePath($name, $writeContext = false)
{
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 1db590b36..a399be5fd 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -15,7 +15,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
* Memcached based session storage handler based on the Memcached class
* provided by the PHP memcached extension.
*
- * @see http://php.net/memcached
+ * @see https://php.net/memcached
*
* @author Drak
*/
@@ -40,9 +40,6 @@ class MemcachedSessionHandler extends AbstractSessionHandler
* * prefix: The prefix to use for the memcached keys in order to avoid collision
* * expiretime: The time to live in seconds.
*
- * @param \Memcached $memcached A \Memcached instance
- * @param array $options An associative array of Memcached options
- *
* @throws \InvalidArgumentException When unsupported options are passed
*/
public function __construct(\Memcached $memcached, array $options = [])
@@ -58,7 +55,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function close()
{
@@ -74,7 +71,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function updateTimestamp($sessionId, $data)
{
@@ -102,7 +99,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function gc($maxlifetime)
{
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
index ddedacffb..1dd724066 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -56,7 +56,7 @@ class MongoDbSessionHandler extends AbstractSessionHandler
* { "expireAfterSeconds": 0 }
* )
*
- * More details on: http://docs.mongodb.org/manual/tutorial/expire-data/
+ * More details on: https://docs.mongodb.org/manual/tutorial/expire-data/
*
* If you use such an index, you can drop `gc_probability` to 0 since
* no garbage-collection is required.
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 04bcbbfe3..8b7615ec1 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -23,7 +23,7 @@ class NativeFileSessionHandler extends NativeSessionHandler
* Default null will leave setting as defined by PHP.
* '/path', 'N;/path', or 'N;octal-mode;/path
*
- * @see https://php.net/manual/session.configuration.php#ini.session.save-path for further details.
+ * @see https://php.net/session.configuration#ini.session.save-path for further details.
*
* @throws \InvalidArgumentException On invalid $savePath
* @throws \RuntimeException When failing to create the save directory
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
index 9be4528ae..5159b1e35 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
/**
* @deprecated since version 3.4, to be removed in 4.0. Use \SessionHandler instead.
- * @see http://php.net/sessionhandler
+ * @see https://php.net/sessionhandler
*/
class NativeSessionHandler extends \SessionHandler
{
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
index 8d193155b..3ba9378ca 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
@@ -67,7 +67,7 @@ class NullSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function gc($maxlifetime)
{
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 9369740eb..f9e5d1e8f 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -32,7 +32,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
* Saving it in a character column could corrupt the data. You can use createTable()
* to initialize a correctly defined table.
*
- * @see http://php.net/sessionhandlerinterface
+ * @see https://php.net/sessionhandlerinterface
*
* @author Fabien Potencier
* @author Michael Williams
@@ -286,7 +286,7 @@ class PdoSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function gc($maxlifetime)
{
@@ -538,7 +538,7 @@ class PdoSessionHandler extends AbstractSessionHandler
* PDO::rollback or PDO::inTransaction for SQLite.
*
* Also MySQLs default isolation, REPEATABLE READ, causes deadlock for different sessions
- * due to http://www.mysqlperformanceblog.com/2013/12/12/one-more-innodb-gap-lock-to-avoid/ .
+ * due to https://percona.com/blog/2013/12/12/one-more-innodb-gap-lock-to-avoid/ .
* So we change it to READ COMMITTED.
*/
private function beginTransaction()
@@ -864,7 +864,7 @@ class PdoSessionHandler extends AbstractSessionHandler
break;
case 'sqlsrv' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
// MERGE is only available since SQL Server 2008 and must be terminated by semicolon
- // It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
+ // It also requires HOLDLOCK according to https://weblogs.sqlteam.com/dang/2009/01/31/upsert-race-condition-with-merge/
$mergeSql = "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = ?) ".
"WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (?, ?, ?, ?) ".
"WHEN MATCHED THEN UPDATE SET $this->dataCol = ?, $this->lifetimeCol = ?, $this->timeCol = ?;";
@@ -877,7 +877,7 @@ class PdoSessionHandler extends AbstractSessionHandler
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->lifetimeCol, EXCLUDED.$this->timeCol)";
break;
default:
- // MERGE is not supported with LOBs: http://www.oracle.com/technetwork/articles/fuecks-lobs-095315.html
+ // MERGE is not supported with LOBs: https://oracle.com/technetwork/articles/fuecks-lobs-095315.html
return null;
}
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
index 83a1f2c06..fab8e9a16 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
@@ -94,7 +94,7 @@ class StrictSessionHandler extends AbstractSessionHandler
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function gc($maxlifetime)
{
diff --git a/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index 809d7002c..4c5873728 100644
--- a/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -54,7 +54,7 @@ class NativeSessionStorage implements SessionStorageInterface
*
* List of options for $options array with their defaults.
*
- * @see http://php.net/session.configuration for options
+ * @see https://php.net/session.configuration for options
* but we omit 'session.' from the beginning of the keys for convenience.
*
* ("auto_start", is not supported as it tells PHP to start a session before
@@ -212,7 +212,7 @@ class NativeSessionStorage implements SessionStorageInterface
$isRegenerated = session_regenerate_id($destroy);
// The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
- // @see https://bugs.php.net/bug.php?id=70013
+ // @see https://bugs.php.net/70013
$this->loadSession();
return $isRegenerated;
@@ -337,7 +337,7 @@ class NativeSessionStorage implements SessionStorageInterface
*
* @param array $options Session ini directives [key => value]
*
- * @see http://php.net/session.configuration
+ * @see https://php.net/session.configuration
*/
public function setOptions(array $options)
{
@@ -378,10 +378,10 @@ class NativeSessionStorage implements SessionStorageInterface
* constructor, for a template see NativeFileSessionHandler or use handlers in
* composer package drak/native-session
*
- * @see http://php.net/session-set-save-handler
- * @see http://php.net/sessionhandlerinterface
- * @see http://php.net/sessionhandler
- * @see http://github.com/drak/NativeSession
+ * @see https://php.net/session-set-save-handler
+ * @see https://php.net/sessionhandlerinterface
+ * @see https://php.net/sessionhandler
+ * @see https://github.com/zikula/NativeSession
*
* @param \SessionHandlerInterface|null $saveHandler
*
@@ -430,7 +430,7 @@ class NativeSessionStorage implements SessionStorageInterface
foreach ($bags as $bag) {
$key = $bag->getStorageKey();
- $session[$key] = isset($session[$key]) ? $session[$key] : [];
+ $session[$key] = isset($session[$key]) && \is_array($session[$key]) ? $session[$key] : [];
$bag->initialize($session[$key]);
}
diff --git a/lib/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php b/lib/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
index 09c92483c..0303729e7 100644
--- a/lib/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/lib/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
@@ -31,7 +31,7 @@ abstract class AbstractProxy
/**
* Gets the session.save_handler name.
*
- * @return string
+ * @return string|null
*/
public function getSaveHandlerName()
{
diff --git a/lib/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php b/lib/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
index b11cc397a..e40712d93 100644
--- a/lib/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/lib/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -76,7 +76,7 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function gc($maxlifetime)
{
diff --git a/lib/symfony/http-foundation/Session/Storage/SessionStorageInterface.php b/lib/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
index 66e8b33dd..eeb396a2f 100644
--- a/lib/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
+++ b/lib/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
@@ -77,7 +77,7 @@ interface SessionStorageInterface
* only delete the session data from persistent storage.
*
* Care: When regenerating the session ID no locking is involved in PHP's
- * session design. See https://bugs.php.net/bug.php?id=61470 for a discussion.
+ * session design. See https://bugs.php.net/61470 for a discussion.
* So you must make sure the regenerated session is saved BEFORE sending the
* headers with the new ID. Symfony's HttpKernel offers a listener for this.
* See Symfony\Component\HttpKernel\EventListener\SaveSessionListener.
diff --git a/lib/symfony/http-foundation/StreamedResponse.php b/lib/symfony/http-foundation/StreamedResponse.php
index 8bc5fc91a..b9148ea87 100644
--- a/lib/symfony/http-foundation/StreamedResponse.php
+++ b/lib/symfony/http-foundation/StreamedResponse.php
@@ -136,8 +136,6 @@ class StreamedResponse extends Response
/**
* {@inheritdoc}
- *
- * @return false
*/
public function getContent()
{
diff --git a/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php b/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
index 853b4bb3d..fcad11def 100644
--- a/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
+++ b/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
@@ -46,11 +46,9 @@ class BinaryFileResponseTest extends ResponseTestCase
$this->assertSame('fööö.html', $response->getFile()->getFilename());
}
- /**
- * @expectedException \LogicException
- */
public function testSetContent()
{
+ $this->expectException('LogicException');
$response = new BinaryFileResponse(__FILE__);
$response->setContent('foo');
}
@@ -109,7 +107,7 @@ class BinaryFileResponseTest extends ResponseTestCase
$this->assertEquals(206, $response->getStatusCode());
$this->assertEquals($responseRange, $response->headers->get('Content-Range'));
- $this->assertSame($length, $response->headers->get('Content-Length'));
+ $this->assertSame((string) $length, $response->headers->get('Content-Length'));
}
/**
@@ -263,7 +261,7 @@ class BinaryFileResponseTest extends ResponseTestCase
$this->expectOutputString('');
$response->sendContent();
- $this->assertContains('README.md', $response->headers->get('X-Sendfile'));
+ $this->assertStringContainsString('README.md', $response->headers->get('X-Sendfile'));
}
public function provideXSendfileFiles()
diff --git a/lib/symfony/http-foundation/Tests/CookieTest.php b/lib/symfony/http-foundation/Tests/CookieTest.php
index aaf2edb38..169f91787 100644
--- a/lib/symfony/http-foundation/Tests/CookieTest.php
+++ b/lib/symfony/http-foundation/Tests/CookieTest.php
@@ -24,10 +24,9 @@ use Symfony\Component\HttpFoundation\Cookie;
*/
class CookieTest extends TestCase
{
- public function invalidNames()
+ public function namesWithSpecialCharacters()
{
return [
- [''],
[',MyName'],
[';MyName'],
[' MyName'],
@@ -40,19 +39,31 @@ class CookieTest extends TestCase
}
/**
- * @dataProvider invalidNames
- * @expectedException \InvalidArgumentException
+ * @dataProvider namesWithSpecialCharacters
*/
- public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidCharacters($name)
+ public function testInstantiationThrowsExceptionIfRawCookieNameContainsSpecialCharacters($name)
{
- new Cookie($name);
+ $this->expectException('InvalidArgumentException');
+ new Cookie($name, null, 0, null, null, null, false, true);
}
/**
- * @expectedException \InvalidArgumentException
+ * @dataProvider namesWithSpecialCharacters
*/
+ public function testInstantiationSucceedNonRawCookieNameContainsSpecialCharacters($name)
+ {
+ $this->assertInstanceOf(Cookie::class, new Cookie($name));
+ }
+
+ public function testInstantiationThrowsExceptionIfCookieNameIsEmpty()
+ {
+ $this->expectException('InvalidArgumentException');
+ new Cookie('');
+ }
+
public function testInvalidExpiration()
{
+ $this->expectException('InvalidArgumentException');
new Cookie('MyCookie', 'foo', 'bar');
}
@@ -121,7 +132,7 @@ class CookieTest extends TestCase
$cookie = new Cookie('foo', 'bar', $value);
$expire = strtotime($value);
- $this->assertEquals($expire, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date', 1);
+ $this->assertEqualsWithDelta($expire, $cookie->getExpiresTime(), 1, '->getExpiresTime() returns the expire date');
}
public function testGetDomain()
diff --git a/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php b/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
index 2afdade67..8a389329e 100644
--- a/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
+++ b/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
@@ -18,11 +18,9 @@ use Symfony\Component\HttpFoundation\Request;
class ExpressionRequestMatcherTest extends TestCase
{
- /**
- * @expectedException \LogicException
- */
public function testWhenNoExpressionIsSet()
{
+ $this->expectException('LogicException');
$expressionRequestMatcher = new ExpressionRequestMatcher();
$expressionRequestMatcher->matches(new Request());
}
diff --git a/lib/symfony/http-foundation/Tests/File/FileTest.php b/lib/symfony/http-foundation/Tests/File/FileTest.php
index caf202992..b463aadf8 100644
--- a/lib/symfony/http-foundation/Tests/File/FileTest.php
+++ b/lib/symfony/http-foundation/Tests/File/FileTest.php
@@ -64,7 +64,7 @@ class FileTest extends TestCase
public function testConstructWhenFileNotExists()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
new File(__DIR__.'/Fixtures/not_here');
}
diff --git a/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php b/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
index bb88807ab..0418726b5 100644
--- a/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
+++ b/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
@@ -20,7 +20,16 @@ use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
*/
class MimeTypeTest extends TestCase
{
- protected $path;
+ public function testGuessWithLeadingDash()
+ {
+ $cwd = getcwd();
+ chdir(__DIR__.'/../Fixtures');
+ try {
+ $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess('-test'));
+ } finally {
+ chdir($cwd);
+ }
+ }
public function testGuessImageWithoutExtension()
{
@@ -29,7 +38,7 @@ class MimeTypeTest extends TestCase
public function testGuessImageWithDirectory()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');
}
@@ -53,7 +62,7 @@ class MimeTypeTest extends TestCase
public function testGuessWithIncorrectPath()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/not_here');
}
@@ -72,7 +81,7 @@ class MimeTypeTest extends TestCase
@chmod($path, 0333);
if ('0333' == substr(sprintf('%o', fileperms($path)), -4)) {
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
MimeTypeGuesser::getInstance()->guess($path);
} else {
$this->markTestSkipped('Can not verify chmod operations, change of file permissions failed');
diff --git a/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php b/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
index 5a37cda35..2ea924bac 100644
--- a/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
+++ b/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
@@ -25,7 +25,7 @@ class UploadedFileTest extends TestCase
public function testConstructWhenFileNotExists()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
new UploadedFile(
__DIR__.'/Fixtures/not_here',
@@ -142,11 +142,9 @@ class UploadedFileTest extends TestCase
$this->assertEquals('gif', $file->getClientOriginalExtension());
}
- /**
- * @expectedException \Symfony\Component\HttpFoundation\File\Exception\FileException
- */
public function testMoveLocalFileIsNotAllowed()
{
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileException');
$file = new UploadedFile(
__DIR__.'/Fixtures/test.gif',
'original.gif',
@@ -155,7 +153,7 @@ class UploadedFileTest extends TestCase
UPLOAD_ERR_OK
);
- $movedFile = $file->move(__DIR__.'/Fixtures/directory');
+ $file->move(__DIR__.'/Fixtures/directory');
}
public function testMoveLocalFileIsAllowedInTestMode()
@@ -283,4 +281,18 @@ class UploadedFileTest extends TestCase
$this->assertFalse($file->isValid());
}
+
+ public function testGetMaxFilesize()
+ {
+ $size = UploadedFile::getMaxFilesize();
+
+ $this->assertIsInt($size);
+ $this->assertGreaterThan(0, $size);
+
+ if (0 === (int) ini_get('post_max_size') && 0 === (int) ini_get('upload_max_filesize')) {
+ $this->assertSame(PHP_INT_MAX, $size);
+ } else {
+ $this->assertLessThan(PHP_INT_MAX, $size);
+ }
+ }
}
diff --git a/lib/symfony/http-foundation/Tests/FileBagTest.php b/lib/symfony/http-foundation/Tests/FileBagTest.php
index 0b6d66042..a3882bc86 100644
--- a/lib/symfony/http-foundation/Tests/FileBagTest.php
+++ b/lib/symfony/http-foundation/Tests/FileBagTest.php
@@ -23,11 +23,9 @@ use Symfony\Component\HttpFoundation\FileBag;
*/
class FileBagTest extends TestCase
{
- /**
- * @expectedException \InvalidArgumentException
- */
public function testFileMustBeAnArrayOrUploadedFile()
{
+ $this->expectException('InvalidArgumentException');
new FileBag(['file' => 'foo']);
}
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
index 14e44a398..17a9efc66 100644
--- a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
@@ -4,7 +4,8 @@ Array
[0] => Content-Type: text/plain; charset=utf-8
[1] => Cache-Control: no-cache, private
[2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
- [3] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
+ [3] => Set-Cookie: %3D%2C%3B%20%09%0D%0A%0B%0C=%3D%2C%3B%20%09%0D%0A%0B%0C; path=/
[4] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
+ [5] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
)
shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
index 05b9af30d..9ffb0dfec 100644
--- a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
@@ -4,9 +4,12 @@ use Symfony\Component\HttpFoundation\Cookie;
$r = require __DIR__.'/common.inc';
-$str = '?*():@&+$/%#[]';
+$str1 = "=,; \t\r\n\v\f";
+$r->headers->setCookie(new Cookie($str1, $str1, 0, '', null, false, false, false, null));
-$r->headers->setCookie(new Cookie($str, $str, 0, '', null, false, false));
+$str2 = '?*():@&+$/%#[]';
+
+$r->headers->setCookie(new Cookie($str2, $str2, 0, '', null, false, false, false, null));
$r->sendHeaders();
-setcookie($str, $str, 0, '/');
+setcookie($str2, $str2, 0, '/');
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
index 3fe157184..3acf86039 100644
--- a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
@@ -5,7 +5,7 @@ use Symfony\Component\HttpFoundation\Cookie;
$r = require __DIR__.'/common.inc';
try {
- $r->headers->setCookie(new Cookie('Hello + world', 'hodor'));
+ $r->headers->setCookie(new Cookie('Hello + world', 'hodor', 0, null, null, null, false, true));
} catch (\InvalidArgumentException $e) {
echo $e->getMessage();
}
diff --git a/lib/symfony/http-foundation/Tests/HeaderBagTest.php b/lib/symfony/http-foundation/Tests/HeaderBagTest.php
index 6c4915f2e..cabe038bd 100644
--- a/lib/symfony/http-foundation/Tests/HeaderBagTest.php
+++ b/lib/symfony/http-foundation/Tests/HeaderBagTest.php
@@ -48,13 +48,18 @@ class HeaderBagTest extends TestCase
$this->assertInstanceOf('DateTime', $headerDate);
}
- /**
- * @expectedException \RuntimeException
- */
+ public function testGetDateNull()
+ {
+ $bag = new HeaderBag(['foo' => null]);
+ $headerDate = $bag->getDate('foo');
+ $this->assertNull($headerDate);
+ }
+
public function testGetDateException()
{
+ $this->expectException('RuntimeException');
$bag = new HeaderBag(['foo' => 'Tue']);
- $headerDate = $bag->getDate('foo');
+ $bag->getDate('foo');
}
public function testGetCacheControlHeader()
@@ -98,6 +103,9 @@ class HeaderBagTest extends TestCase
$bag->set('foo', 'bor', false);
$this->assertEquals('bar', $bag->get('foo'), '->get return first value');
$this->assertEquals(['bar', 'bor'], $bag->get('foo', 'nope', false), '->get return all values as array');
+
+ $bag->set('baz', null);
+ $this->assertNull($bag->get('baz', 'nope'), '->get return null although different default value is given');
}
public function testSetAssociativeArray()
diff --git a/lib/symfony/http-foundation/Tests/IpUtilsTest.php b/lib/symfony/http-foundation/Tests/IpUtilsTest.php
index c7f76b5de..d3b262e04 100644
--- a/lib/symfony/http-foundation/Tests/IpUtilsTest.php
+++ b/lib/symfony/http-foundation/Tests/IpUtilsTest.php
@@ -73,11 +73,11 @@ class IpUtilsTest extends TestCase
}
/**
- * @expectedException \RuntimeException
* @requires extension sockets
*/
public function testAnIpv6WithOptionDisabledIpv6()
{
+ $this->expectException('RuntimeException');
if (\defined('AF_INET6')) {
$this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');
}
diff --git a/lib/symfony/http-foundation/Tests/JsonResponseTest.php b/lib/symfony/http-foundation/Tests/JsonResponseTest.php
index ef0346cbe..9642dc28d 100644
--- a/lib/symfony/http-foundation/Tests/JsonResponseTest.php
+++ b/lib/symfony/http-foundation/Tests/JsonResponseTest.php
@@ -52,8 +52,8 @@ class JsonResponseTest extends TestCase
$this->assertSame('0', $response->getContent());
$response = new JsonResponse(0.1);
- $this->assertEquals('0.1', $response->getContent());
- $this->assertInternalType('string', $response->getContent());
+ $this->assertEquals(0.1, $response->getContent());
+ $this->assertIsString($response->getContent());
$response = new JsonResponse(true);
$this->assertSame('true', $response->getContent());
@@ -141,8 +141,8 @@ class JsonResponseTest extends TestCase
$response = JsonResponse::create(0.1);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
- $this->assertEquals('0.1', $response->getContent());
- $this->assertInternalType('string', $response->getContent());
+ $this->assertEquals(0.1, $response->getContent());
+ $this->assertIsString($response->getContent());
$response = JsonResponse::create(true);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
@@ -216,29 +216,23 @@ class JsonResponseTest extends TestCase
$this->assertSame('{"foo":"bar"}', $response->getContent());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetCallbackInvalidIdentifier()
{
+ $this->expectException('InvalidArgumentException');
$response = new JsonResponse('foo');
$response->setCallback('+invalid');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetContent()
{
+ $this->expectException('InvalidArgumentException');
JsonResponse::create("\xB1\x31");
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage This error is expected
- */
public function testSetContentJsonSerializeError()
{
+ $this->expectException('Exception');
+ $this->expectExceptionMessage('This error is expected');
if (!interface_exists('JsonSerializable', false)) {
$this->markTestSkipped('JsonSerializable is required.');
}
diff --git a/lib/symfony/http-foundation/Tests/RedirectResponseTest.php b/lib/symfony/http-foundation/Tests/RedirectResponseTest.php
index 5f6a8ac08..e1ff3bf2b 100644
--- a/lib/symfony/http-foundation/Tests/RedirectResponseTest.php
+++ b/lib/symfony/http-foundation/Tests/RedirectResponseTest.php
@@ -26,20 +26,16 @@ class RedirectResponseTest extends TestCase
));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRedirectResponseConstructorNullUrl()
{
- $response = new RedirectResponse(null);
+ $this->expectException('InvalidArgumentException');
+ new RedirectResponse(null);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRedirectResponseConstructorWrongStatusCode()
{
- $response = new RedirectResponse('foo.bar', 404);
+ $this->expectException('InvalidArgumentException');
+ new RedirectResponse('foo.bar', 404);
}
public function testGenerateLocationHeader()
@@ -65,11 +61,9 @@ class RedirectResponseTest extends TestCase
$this->assertEquals('baz.beep', $response->getTargetUrl());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetTargetUrlNull()
{
+ $this->expectException('InvalidArgumentException');
$response = new RedirectResponse('foo.bar');
$response->setTargetUrl(null);
}
diff --git a/lib/symfony/http-foundation/Tests/RequestTest.php b/lib/symfony/http-foundation/Tests/RequestTest.php
index 73d12cb3f..bf70a5f83 100644
--- a/lib/symfony/http-foundation/Tests/RequestTest.php
+++ b/lib/symfony/http-foundation/Tests/RequestTest.php
@@ -886,11 +886,9 @@ class RequestTest extends TestCase
$this->assertEquals(80, $port, 'With only PROTO set and value is not recognized, getPort() defaults to 80.');
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetHostWithFakeHttpHostValue()
{
+ $this->expectException('RuntimeException');
$request = new Request();
$request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
$request->getHost();
@@ -1055,11 +1053,11 @@ class RequestTest extends TestCase
}
/**
- * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
* @dataProvider getClientIpsWithConflictingHeadersProvider
*/
public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
{
+ $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
$request = new Request();
$server = [
@@ -1153,7 +1151,7 @@ class RequestTest extends TestCase
{
$req = new Request();
$retval = $req->getContent(true);
- $this->assertInternalType('resource', $retval);
+ $this->assertIsResource($retval);
$this->assertEquals('', fread($retval, 1));
$this->assertTrue(feof($retval));
}
@@ -1163,7 +1161,7 @@ class RequestTest extends TestCase
$req = new Request([], [], [], [], [], [], 'MyContent');
$resource = $req->getContent(true);
- $this->assertInternalType('resource', $resource);
+ $this->assertIsResource($resource);
$this->assertEquals('MyContent', stream_get_contents($resource));
}
@@ -1179,11 +1177,11 @@ class RequestTest extends TestCase
}
/**
- * @expectedException \LogicException
* @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
*/
public function testGetContentCantBeCalledTwiceWithResources($first, $second)
{
+ $this->expectException('LogicException');
if (\PHP_VERSION_ID >= 50600) {
$this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
}
@@ -1551,7 +1549,6 @@ class RequestTest extends TestCase
$request = new Request();
$request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
$this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
- $this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
$request = new Request();
$request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
@@ -1633,14 +1630,14 @@ class RequestTest extends TestCase
$asString = (string) $request;
- $this->assertContains('Accept-Language: zh, en-us; q=0.8, en; q=0.6', $asString);
- $this->assertContains('Cookie: Foo=Bar', $asString);
+ $this->assertStringContainsString('Accept-Language: zh, en-us; q=0.8, en; q=0.6', $asString);
+ $this->assertStringContainsString('Cookie: Foo=Bar', $asString);
$request->cookies->set('Another', 'Cookie');
$asString = (string) $request;
- $this->assertContains('Cookie: Foo=Bar; Another=Cookie', $asString);
+ $this->assertStringContainsString('Cookie: Foo=Bar; Another=Cookie', $asString);
}
public function testIsMethod()
@@ -1968,20 +1965,20 @@ class RequestTest extends TestCase
/**
* @group legacy
- * @expectedException \InvalidArgumentException
*/
public function testSetTrustedProxiesInvalidHeaderName()
{
+ $this->expectException('InvalidArgumentException');
Request::create('http://example.com/');
Request::setTrustedHeaderName('bogus name', 'X_MY_FOR');
}
/**
* @group legacy
- * @expectedException \InvalidArgumentException
*/
public function testGetTrustedProxiesInvalidHeaderName()
{
+ $this->expectException('InvalidArgumentException');
Request::create('http://example.com/');
Request::getTrustedHeaderName('bogus name');
}
@@ -2118,12 +2115,8 @@ class RequestTest extends TestCase
$this->assertSame($expectedPort, $request->getPort());
}
} else {
- if (method_exists($this, 'expectException')) {
- $this->expectException(SuspiciousOperationException::class);
- $this->expectExceptionMessage('Invalid Host');
- } else {
- $this->setExpectedException(SuspiciousOperationException::class, 'Invalid Host');
- }
+ $this->expectException(SuspiciousOperationException::class);
+ $this->expectExceptionMessage('Invalid Host');
$request->getHost();
}
diff --git a/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
index 93aacf24d..d85f6e112 100644
--- a/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
+++ b/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -240,21 +240,17 @@ class ResponseHeaderBagTest extends TestCase
$this->assertEquals([], $bag->getCookies());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetCookiesWithInvalidArgument()
{
+ $this->expectException('InvalidArgumentException');
$bag = new ResponseHeaderBag();
$bag->getCookies('invalid_argument');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testMakeDispositionInvalidDisposition()
{
+ $this->expectException('InvalidArgumentException');
$headers = new ResponseHeaderBag();
$headers->makeDisposition('invalid', 'foo.html');
@@ -298,10 +294,10 @@ class ResponseHeaderBagTest extends TestCase
/**
* @dataProvider provideMakeDispositionFail
- * @expectedException \InvalidArgumentException
*/
public function testMakeDispositionFail($disposition, $filename)
{
+ $this->expectException('InvalidArgumentException');
$headers = new ResponseHeaderBag();
$headers->makeDisposition($disposition, $filename);
diff --git a/lib/symfony/http-foundation/Tests/ResponseTest.php b/lib/symfony/http-foundation/Tests/ResponseTest.php
index 40200ee31..b846cdad3 100644
--- a/lib/symfony/http-foundation/Tests/ResponseTest.php
+++ b/lib/symfony/http-foundation/Tests/ResponseTest.php
@@ -369,6 +369,12 @@ class ResponseTest extends ResponseTestCase
$this->assertNull($response->headers->get('Expires'), '->expire() removes the Expires header when the response is fresh');
}
+ public function testNullExpireHeader()
+ {
+ $response = new Response(null, 200, ['Expires' => null]);
+ $this->assertNull($response->getExpires());
+ }
+
public function testGetTtl()
{
$response = new Response();
@@ -532,7 +538,6 @@ class ResponseTest extends ResponseTestCase
$response->prepare($request);
$this->assertEquals('', $response->getContent());
$this->assertFalse($response->headers->has('Content-Type'));
- $this->assertFalse($response->headers->has('Content-Type'));
$response->setContent('content');
$response->setStatusCode(304);
@@ -582,7 +587,7 @@ class ResponseTest extends ResponseTestCase
$this->fail('->setCache() throws an InvalidArgumentException if an option is not supported');
} catch (\Exception $e) {
$this->assertInstanceOf('InvalidArgumentException', $e, '->setCache() throws an InvalidArgumentException if an option is not supported');
- $this->assertContains('"wrong option"', $e->getMessage());
+ $this->assertStringContainsString('"wrong option"', $e->getMessage());
}
$options = ['etag' => '"whatever"'];
@@ -635,7 +640,7 @@ class ResponseTest extends ResponseTestCase
ob_start();
$response->sendContent();
$string = ob_get_clean();
- $this->assertContains('test response rendering', $string);
+ $this->assertStringContainsString('test response rendering', $string);
}
public function testSetPublic()
@@ -846,11 +851,11 @@ class ResponseTest extends ResponseTestCase
}
/**
- * @expectedException \UnexpectedValueException
* @dataProvider invalidContentProvider
*/
public function testSetContentInvalid($content)
{
+ $this->expectException('UnexpectedValueException');
$response = new Response();
$response->setContent($content);
}
@@ -928,11 +933,11 @@ class ResponseTest extends ResponseTestCase
}
/**
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
*
- * @author Fábio Pacheco
+ * @author Fábio Pacheco
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
*/
public function ianaCodesReasonPhrasesProvider()
{
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 5ce6a9e5a..f0f43d05b 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
@@ -22,7 +23,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandl
class MongoDbSessionHandlerTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
private $mongo;
private $storage;
@@ -62,19 +63,15 @@ class MongoDbSessionHandlerTest extends TestCase
$this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorShouldThrowExceptionForInvalidMongo()
{
+ $this->expectException('InvalidArgumentException');
new MongoDbSessionHandler(new \stdClass(), $this->options);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorShouldThrowExceptionForMissingOptions()
{
+ $this->expectException('InvalidArgumentException');
new MongoDbSessionHandler($this->mongo, []);
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
index dc827d8ab..7de55798a 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -41,9 +41,9 @@ class NativeFileSessionHandlerTest extends TestCase
*/
public function testConstructSavePath($savePath, $expectedSavePath, $path)
{
- $handler = new NativeFileSessionHandler($savePath);
+ new NativeFileSessionHandler($savePath);
$this->assertEquals($expectedSavePath, ini_get('session.save_path'));
- $this->assertTrue(is_dir(realpath($path)));
+ $this->assertDirectoryExists(realpath($path));
rmdir($path);
}
@@ -59,18 +59,16 @@ class NativeFileSessionHandlerTest extends TestCase
];
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructException()
{
- $handler = new NativeFileSessionHandler('something;invalid;with;too-many-args');
+ $this->expectException('InvalidArgumentException');
+ new NativeFileSessionHandler('something;invalid;with;too-many-args');
}
public function testConstructDefault()
{
$path = ini_get('session.save_path');
- $storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
+ new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
$this->assertEquals($path, ini_get('session.save_path'));
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
index 0d246e1aa..f793db144 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -28,7 +28,7 @@ class NullSessionHandlerTest extends TestCase
{
public function testSaveHandlers()
{
- $storage = $this->getStorage();
+ $this->getStorage();
$this->assertEquals('user', ini_get('session.save_handler'));
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index f0914eb43..e710dca92 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -48,22 +48,18 @@ class PdoSessionHandlerTest extends TestCase
return $pdo;
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testWrongPdoErrMode()
{
+ $this->expectException('InvalidArgumentException');
$pdo = $this->getMemorySqlitePdo();
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
- $storage = new PdoSessionHandler($pdo);
+ new PdoSessionHandler($pdo);
}
- /**
- * @expectedException \RuntimeException
- */
public function testInexistentTable()
{
+ $this->expectException('RuntimeException');
$storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
$storage->open('', 'sid');
$storage->read('id');
@@ -71,11 +67,9 @@ class PdoSessionHandlerTest extends TestCase
$storage->close();
}
- /**
- * @expectedException \RuntimeException
- */
public function testCreateTableTwice()
{
+ $this->expectException('RuntimeException');
$storage = new PdoSessionHandler($this->getMemorySqlitePdo());
$storage->createTable();
}
@@ -330,15 +324,15 @@ class PdoSessionHandlerTest extends TestCase
public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPassword = null)
{
$storage = new PdoSessionHandler($url);
+ $reflection = new \ReflectionClass(PdoSessionHandler::class);
- $this->assertAttributeEquals($expectedDsn, 'dsn', $storage);
-
- if (null !== $expectedUser) {
- $this->assertAttributeEquals($expectedUser, 'username', $storage);
- }
-
- if (null !== $expectedPassword) {
- $this->assertAttributeEquals($expectedPassword, 'password', $storage);
+ foreach (['dsn' => $expectedDsn, 'username' => $expectedUser, 'password' => $expectedPassword] as $property => $expectedValue) {
+ if (!isset($expectedValue)) {
+ continue;
+ }
+ $property = $reflection->getProperty($property);
+ $property->setAccessible(true);
+ $this->assertSame($expectedValue, $property->getValue($storage));
}
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
index 2e3024ef1..7e0d303b9 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -121,11 +121,9 @@ class MockArraySessionStorageTest extends TestCase
$this->assertTrue($storage->isStarted());
}
- /**
- * @expectedException \RuntimeException
- */
public function testUnstartedSave()
{
+ $this->expectException('RuntimeException');
$this->storage->save();
}
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
index 9e2692dc0..d6bd1823f 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -41,12 +41,12 @@ class MockFileSessionStorageTest extends TestCase
protected function tearDown()
{
- $this->sessionDir = null;
- $this->storage = null;
- array_map('unlink', glob($this->sessionDir.'/*.session'));
+ array_map('unlink', glob($this->sessionDir.'/*'));
if (is_dir($this->sessionDir)) {
rmdir($this->sessionDir);
}
+ $this->sessionDir = null;
+ $this->storage = null;
}
public function testStart()
@@ -107,11 +107,9 @@ class MockFileSessionStorageTest extends TestCase
$this->assertEquals('bar', $storage2->getBag('attributes')->get('foo'), 'values persist between instances');
}
- /**
- * @expectedException \RuntimeException
- */
public function testSaveWithoutStart()
{
+ $this->expectException('RuntimeException');
$storage1 = $this->getStorage();
$storage1->save();
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 7cc2eb79c..9ce8108da 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -72,20 +72,16 @@ class NativeSessionStorageTest extends TestCase
$this->assertSame($bag, $storage->getBag($bag->getName()));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRegisterBagException()
{
+ $this->expectException('InvalidArgumentException');
$storage = $this->getStorage();
$storage->getBag('non_existing');
}
- /**
- * @expectedException \LogicException
- */
public function testRegisterBagForAStartedSessionThrowsException()
{
+ $this->expectException('LogicException');
$storage = $this->getStorage();
$storage->start();
$storage->registerBag(new AttributeBag());
@@ -98,7 +94,7 @@ class NativeSessionStorageTest extends TestCase
$storage->start();
$id = $storage->getId();
- $this->assertInternalType('string', $id);
+ $this->assertIsString($id);
$this->assertNotSame('', $id);
$storage->save();
@@ -149,7 +145,7 @@ class NativeSessionStorageTest extends TestCase
{
$this->iniSet('session.cache_limiter', 'nocache');
- $storage = new NativeSessionStorage();
+ new NativeSessionStorage();
$this->assertEquals('', ini_get('session.cache_limiter'));
}
@@ -157,7 +153,7 @@ class NativeSessionStorageTest extends TestCase
{
$this->iniSet('session.cache_limiter', 'nocache');
- $storage = new NativeSessionStorage(['cache_limiter' => 'public']);
+ new NativeSessionStorage(['cache_limiter' => 'public']);
$this->assertEquals('public', ini_get('session.cache_limiter'));
}
@@ -201,11 +197,9 @@ class NativeSessionStorageTest extends TestCase
$this->assertSame('200', ini_get('session.cache_expire'));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetSaveHandlerException()
{
+ $this->expectException('InvalidArgumentException');
$storage = $this->getStorage();
$storage->setSaveHandler(new \stdClass());
}
@@ -228,11 +222,9 @@ class NativeSessionStorageTest extends TestCase
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
}
- /**
- * @expectedException \RuntimeException
- */
public function testStarted()
{
+ $this->expectException('RuntimeException');
$storage = $this->getStorage();
$this->assertFalse($storage->getSaveHandler()->isActive());
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
index cbb291f19..ae40f2c29 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -80,10 +80,10 @@ class AbstractProxyTest extends TestCase
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
- * @expectedException \LogicException
*/
public function testNameException()
{
+ $this->expectException('LogicException');
session_start();
$this->proxy->setName('foo');
}
@@ -103,10 +103,10 @@ class AbstractProxyTest extends TestCase
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
- * @expectedException \LogicException
*/
public function testIdException()
{
+ $this->expectException('LogicException');
session_start();
$this->proxy->setId('foo');
}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index b6e0da99d..1457ebd70 100644
--- a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
class SessionHandlerProxyTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_Matcher
+ * @var \PHPUnit\Framework\MockObject\Matcher
*/
private $mock;
@@ -144,7 +144,8 @@ class SessionHandlerProxyTest extends TestCase
{
$mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
$mock->expects($this->once())
- ->method('updateTimestamp');
+ ->method('updateTimestamp')
+ ->willReturn(false);
$proxy = new SessionHandlerProxy($mock);
$proxy->updateTimestamp('id', 'data');
diff --git a/lib/symfony/http-foundation/Tests/StreamedResponseTest.php b/lib/symfony/http-foundation/Tests/StreamedResponseTest.php
index 62dfc9bc9..a084e917d 100644
--- a/lib/symfony/http-foundation/Tests/StreamedResponseTest.php
+++ b/lib/symfony/http-foundation/Tests/StreamedResponseTest.php
@@ -81,20 +81,16 @@ class StreamedResponseTest extends TestCase
$this->assertEquals(1, $called);
}
- /**
- * @expectedException \LogicException
- */
public function testSendContentWithNonCallable()
{
+ $this->expectException('LogicException');
$response = new StreamedResponse(null);
$response->sendContent();
}
- /**
- * @expectedException \LogicException
- */
public function testSetContent()
{
+ $this->expectException('LogicException');
$response = new StreamedResponse(function () { echo 'foo'; });
$response->setContent('foo');
}
diff --git a/lib/symfony/http-kernel/Bundle/Bundle.php b/lib/symfony/http-kernel/Bundle/Bundle.php
index 62b86ca7f..5bbed6bef 100644
--- a/lib/symfony/http-kernel/Bundle/Bundle.php
+++ b/lib/symfony/http-kernel/Bundle/Bundle.php
@@ -19,8 +19,7 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\Finder\Finder;
/**
- * An implementation of BundleInterface that adds a few conventions
- * for DependencyInjection extensions and Console commands.
+ * An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.
*
* @author Fabien Potencier
*/
@@ -88,9 +87,7 @@ abstract class Bundle implements BundleInterface
}
}
- if ($this->extension) {
- return $this->extension;
- }
+ return $this->extension ?: null;
}
/**
@@ -200,9 +197,7 @@ abstract class Bundle implements BundleInterface
*/
protected function createContainerExtension()
{
- if (class_exists($class = $this->getContainerExtensionClass())) {
- return new $class();
- }
+ return class_exists($class = $this->getContainerExtensionClass()) ? new $class() : null;
}
private function parseClassName()
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolverInterface.php b/lib/symfony/http-kernel/Controller/ArgumentResolverInterface.php
index 5c5123096..ba97775a9 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolverInterface.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolverInterface.php
@@ -24,7 +24,6 @@ interface ArgumentResolverInterface
/**
* Returns the arguments to pass to the controller.
*
- * @param Request $request
* @param callable $controller
*
* @return array An array of arguments to pass to the controller
diff --git a/lib/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php b/lib/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php
index fd7b09ecf..6b14ed5be 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php
@@ -24,9 +24,6 @@ interface ArgumentValueResolverInterface
/**
* Whether this resolver can resolve the value for the given ArgumentMetadata.
*
- * @param Request $request
- * @param ArgumentMetadata $argument
- *
* @return bool
*/
public function supports(Request $request, ArgumentMetadata $argument);
@@ -34,9 +31,6 @@ interface ArgumentValueResolverInterface
/**
* Returns the possible value(s).
*
- * @param Request $request
- * @param ArgumentMetadata $argument
- *
* @return \Generator
*/
public function resolve(Request $request, ArgumentMetadata $argument);
diff --git a/lib/symfony/http-kernel/Controller/ControllerResolver.php b/lib/symfony/http-kernel/Controller/ControllerResolver.php
index e657f6143..c981642fe 100644
--- a/lib/symfony/http-kernel/Controller/ControllerResolver.php
+++ b/lib/symfony/http-kernel/Controller/ControllerResolver.php
@@ -85,10 +85,10 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
}
}
- $callable = $this->createController($controller);
-
- if (!\is_callable($callable)) {
- throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($callable)));
+ try {
+ $callable = $this->createController($controller);
+ } catch (\InvalidArgumentException $e) {
+ throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()));
}
return $callable;
@@ -116,7 +116,6 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
}
/**
- * @param Request $request
* @param callable $controller
* @param \ReflectionParameter[] $parameters
*
@@ -166,7 +165,7 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
*
* @return callable A PHP callable
*
- * @throws \InvalidArgumentException
+ * @throws \InvalidArgumentException When the controller cannot be created
*/
protected function createController($controller)
{
@@ -180,7 +179,13 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
}
- return [$this->instantiateController($class), $method];
+ $controller = [$this->instantiateController($class), $method];
+
+ if (!\is_callable($controller)) {
+ throw new \InvalidArgumentException($this->getControllerError($controller));
+ }
+
+ return $controller;
}
/**
diff --git a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
index 32316a8d5..520e83b5f 100644
--- a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
+++ b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
@@ -58,7 +58,7 @@ class ArgumentMetadata
*
* The type is the PHP class in 5.5+ and additionally the basic type in PHP 7.0+.
*
- * @return string
+ * @return string|null
*/
public function getType()
{
diff --git a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
index fa48d0cc1..2548a2a08 100644
--- a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -67,8 +67,6 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
/**
* Returns whether an argument is variadic.
*
- * @param \ReflectionParameter $parameter
- *
* @return bool
*/
private function isVariadic(\ReflectionParameter $parameter)
@@ -79,8 +77,6 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
/**
* Determines whether an argument has a default value.
*
- * @param \ReflectionParameter $parameter
- *
* @return bool
*/
private function hasDefaultValue(\ReflectionParameter $parameter)
@@ -91,8 +87,6 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
/**
* Returns a default value if available.
*
- * @param \ReflectionParameter $parameter
- *
* @return mixed|null
*/
private function getDefaultValue(\ReflectionParameter $parameter)
@@ -103,25 +97,23 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
/**
* Returns an associated type to the given parameter if available.
*
- * @param \ReflectionParameter $parameter
- *
* @return string|null
*/
private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function)
{
if ($this->supportsParameterType) {
if (!$type = $parameter->getType()) {
- return;
+ return null;
}
$name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
if ('array' === $name && !$type->isBuiltin()) {
// Special case for HHVM with variadics
- return;
+ return null;
}
} elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $parameter, $name)) {
$name = $name[1];
} else {
- return;
+ return null;
}
$lcName = strtolower($name);
@@ -129,7 +121,7 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
return $name;
}
if (!$function instanceof \ReflectionMethod) {
- return;
+ return null;
}
if ('self' === $lcName) {
return $function->getDeclaringClass()->name;
@@ -137,5 +129,7 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
if ($parent = $function->getDeclaringClass()->getParentClass()) {
return $parent->name;
}
+
+ return null;
}
}
diff --git a/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php b/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
index 626c1cc69..673bf5c5f 100644
--- a/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
@@ -81,8 +81,8 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
$this->data['symfony_state'] = $this->determineSymfonyState();
$this->data['symfony_minor_version'] = sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION);
- $eom = \DateTime::createFromFormat('m/Y', Kernel::END_OF_MAINTENANCE);
- $eol = \DateTime::createFromFormat('m/Y', Kernel::END_OF_LIFE);
+ $eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
+ $eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
$this->data['symfony_eom'] = $eom->format('F Y');
$this->data['symfony_eol'] = $eol->format('F Y');
}
@@ -119,7 +119,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
/**
* Gets the token.
*
- * @return string The token
+ * @return string|null The token
*/
public function getToken()
{
@@ -314,8 +314,8 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
private function determineSymfonyState()
{
$now = new \DateTime();
- $eom = \DateTime::createFromFormat('m/Y', Kernel::END_OF_MAINTENANCE)->modify('last day of this month');
- $eol = \DateTime::createFromFormat('m/Y', Kernel::END_OF_LIFE)->modify('last day of this month');
+ $eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE)->modify('last day of this month');
+ $eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE)->modify('last day of this month');
if ($now > $eol) {
$versionState = 'eol';
diff --git a/lib/symfony/http-kernel/DataCollector/DataCollector.php b/lib/symfony/http-kernel/DataCollector/DataCollector.php
index 4346e0ec0..94307cf56 100644
--- a/lib/symfony/http-kernel/DataCollector/DataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/DataCollector.php
@@ -28,6 +28,9 @@ use Symfony\Component\VarDumper\Cloner\VarCloner;
*/
abstract class DataCollector implements DataCollectorInterface, \Serializable
{
+ /**
+ * @var array|Data
+ */
protected $data = [];
/**
diff --git a/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php b/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
index c76e7f45b..f9be5bddf 100644
--- a/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
@@ -55,7 +55,7 @@ class ExceptionDataCollector extends DataCollector
/**
* Gets the exception.
*
- * @return \Exception The exception
+ * @return \Exception|FlattenException
*/
public function getException()
{
diff --git a/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php b/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
index a8dda9f67..99a9cf23e 100644
--- a/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
@@ -72,11 +72,6 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
}
}
- /**
- * Gets the logs.
- *
- * @return array An array of logs
- */
public function getLogs()
{
return isset($this->data['logs']) ? $this->data['logs'] : [];
diff --git a/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php b/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
index 671865aa1..246c0c7f6 100644
--- a/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -49,7 +49,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
}
}
- $content = null;
try {
$content = $request->getContent();
} catch (\LogicException $e) {
@@ -59,7 +58,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
$sessionMetadata = [];
$sessionAttributes = [];
- $session = null;
$flashes = [];
if ($request->hasSession()) {
$session = $request->getSession();
diff --git a/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php b/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
index 7ab14b7cb..cb490c2bb 100644
--- a/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
@@ -15,10 +15,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
/**
- * TimeDataCollector.
- *
* @author Fabien Potencier
*/
class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
@@ -77,7 +76,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
/**
* Sets the request events.
*
- * @param array $events The request events
+ * @param StopwatchEvent[] $events The request events
*/
public function setEvents(array $events)
{
@@ -91,7 +90,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
/**
* Gets the request events.
*
- * @return array The request events
+ * @return StopwatchEvent[] The request events
*/
public function getEvents()
{
@@ -133,7 +132,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
/**
* Gets the request time.
*
- * @return int The time
+ * @return float
*/
public function getStartTime()
{
diff --git a/lib/symfony/http-kernel/Debug/FileLinkFormatter.php b/lib/symfony/http-kernel/Debug/FileLinkFormatter.php
index af65f7ec5..e7347d490 100644
--- a/lib/symfony/http-kernel/Debug/FileLinkFormatter.php
+++ b/lib/symfony/http-kernel/Debug/FileLinkFormatter.php
@@ -102,14 +102,16 @@ class FileLinkFormatter implements \Serializable
$request = $this->requestStack->getMasterRequest();
if ($request instanceof Request) {
if ($this->urlFormat instanceof \Closure && !$this->urlFormat = \call_user_func($this->urlFormat)) {
- return;
+ return null;
}
return [
- $request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat,
+ $request->getSchemeAndHttpHost().$this->urlFormat,
$this->baseDir.\DIRECTORY_SEPARATOR, '',
];
}
}
+
+ return null;
}
}
diff --git a/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
index ddf4fa7ce..c265b6010 100644
--- a/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ b/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
@@ -42,6 +42,9 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
break;
case KernelEvents::TERMINATE:
$token = $event->getResponse()->headers->get('X-Debug-Token');
+ if (null === $token) {
+ break;
+ }
// There is a very special case when using built-in AppCache class as kernel wrapper, in the case
// of an ESI request leading to a `stale` response [B] inside a `fresh` cached response [A].
// In this case, `$token` contains the [B] debug token, but the open `stopwatch` section ID
@@ -66,12 +69,18 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
break;
case KernelEvents::RESPONSE:
$token = $event->getResponse()->headers->get('X-Debug-Token');
+ if (null === $token) {
+ break;
+ }
$this->stopwatch->stopSection($token);
break;
case KernelEvents::TERMINATE:
// In the special case described in the `preDispatch` method above, the `$token` section
// does not exist, then closing it throws an exception which must be caught.
$token = $event->getResponse()->headers->get('X-Debug-Token');
+ if (null === $token) {
+ break;
+ }
try {
$this->stopwatch->stopSection($token);
} catch (\LogicException $e) {
diff --git a/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php b/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
index aee5d6f88..0a6bb4f79 100644
--- a/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
+++ b/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
@@ -56,6 +56,7 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
if ($session instanceof Session ? $session->getUsageIndex() !== end($this->sessionUsageStack) : $session->isStarted()) {
$event->getResponse()
+ ->setExpires(new \DateTime())
->setPrivate()
->setMaxAge(0)
->headers->addCacheControlDirective('must-revalidate');
diff --git a/lib/symfony/http-kernel/EventListener/RouterListener.php b/lib/symfony/http-kernel/EventListener/RouterListener.php
index 378327b57..3803105e8 100644
--- a/lib/symfony/http-kernel/EventListener/RouterListener.php
+++ b/lib/symfony/http-kernel/EventListener/RouterListener.php
@@ -89,8 +89,6 @@ class RouterListener implements EventSubscriberInterface
/**
* After a sub-request is done, we need to reset the routing context to the parent request so that the URL generator
* operates on the correct context again.
- *
- * @param FinishRequestEvent $event
*/
public function onKernelFinishRequest(FinishRequestEvent $event)
{
diff --git a/lib/symfony/http-kernel/EventListener/SaveSessionListener.php b/lib/symfony/http-kernel/EventListener/SaveSessionListener.php
index 5901200a7..5f5cd2480 100644
--- a/lib/symfony/http-kernel/EventListener/SaveSessionListener.php
+++ b/lib/symfony/http-kernel/EventListener/SaveSessionListener.php
@@ -29,7 +29,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
* the one above. But by saving the session before long-running things in the terminate event,
* we ensure the session is not blocked longer than needed.
* * When regenerating the session ID no locking is involved in PHPs session design. See
- * https://bugs.php.net/bug.php?id=61470 for a discussion. So in this case, the session must
+ * https://bugs.php.net/61470 for a discussion. So in this case, the session must
* be saved anyway before sending the headers with the new session ID. Otherwise session
* data could get lost again for concurrent requests with the new ID. One result could be
* that you get logged out after just logging in.
diff --git a/lib/symfony/http-kernel/EventListener/SessionListener.php b/lib/symfony/http-kernel/EventListener/SessionListener.php
index 39ebfd922..9e36b7626 100644
--- a/lib/symfony/http-kernel/EventListener/SessionListener.php
+++ b/lib/symfony/http-kernel/EventListener/SessionListener.php
@@ -32,7 +32,7 @@ class SessionListener extends AbstractSessionListener
protected function getSession()
{
if (!$this->container->has('session')) {
- return;
+ return null;
}
return $this->container->get('session');
diff --git a/lib/symfony/http-kernel/EventListener/TestSessionListener.php b/lib/symfony/http-kernel/EventListener/TestSessionListener.php
index 36abb422f..e2c6f5c9e 100644
--- a/lib/symfony/http-kernel/EventListener/TestSessionListener.php
+++ b/lib/symfony/http-kernel/EventListener/TestSessionListener.php
@@ -32,7 +32,7 @@ class TestSessionListener extends AbstractTestSessionListener
protected function getSession()
{
if (!$this->container->has('session')) {
- return;
+ return null;
}
return $this->container->get('session');
diff --git a/lib/symfony/http-kernel/Fragment/FragmentHandler.php b/lib/symfony/http-kernel/Fragment/FragmentHandler.php
index f40da0018..9629cf706 100644
--- a/lib/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/lib/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -108,5 +108,7 @@ class FragmentHandler
}
$response->sendContent();
+
+ return null;
}
}
diff --git a/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
index a0abc0588..f94a5c076 100644
--- a/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@@ -19,6 +19,7 @@ use Symfony\Component\Templating\EngineInterface;
use Twig\Environment;
use Twig\Error\LoaderError;
use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
/**
* Implements the Hinclude rendering strategy.
@@ -137,22 +138,23 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
}
$loader = $this->templating->getLoader();
- if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
- return $loader->exists($template);
- }
- try {
- if (method_exists($loader, 'getSourceContext')) {
- $loader->getSourceContext($template);
- } else {
- $loader->getSource($template);
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext($template);
+ } else {
+ $loader->getSource($template);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
}
- return true;
- } catch (LoaderError $e) {
+ return false;
}
- return false;
+ return $loader->exists($template);
}
/**
diff --git a/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php b/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
index 8918a3057..9b4541793 100644
--- a/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
+++ b/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
@@ -109,6 +109,8 @@ abstract class AbstractSurrogate implements SurrogateInterface
throw $e;
}
}
+
+ return '';
}
/**
diff --git a/lib/symfony/http-kernel/HttpCache/Esi.php b/lib/symfony/http-kernel/HttpCache/Esi.php
index dc62990b4..96e6ca4bf 100644
--- a/lib/symfony/http-kernel/HttpCache/Esi.php
+++ b/lib/symfony/http-kernel/HttpCache/Esi.php
@@ -111,5 +111,7 @@ class Esi extends AbstractSurrogate
// remove ESI/1.0 from the Surrogate-Control header
$this->removeFromControl($response);
+
+ return $response;
}
}
diff --git a/lib/symfony/http-kernel/HttpCache/HttpCache.php b/lib/symfony/http-kernel/HttpCache/HttpCache.php
index daaa928fa..addeca8ba 100644
--- a/lib/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/lib/symfony/http-kernel/HttpCache/HttpCache.php
@@ -432,9 +432,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* All backend requests (cache passes, fetches, cache validations)
* run through this method.
*
- * @param Request $request A Request instance
- * @param bool $catch Whether to catch exceptions or not
- * @param Response $entry A Response instance (the stale entry if present, null otherwise)
+ * @param bool $catch Whether to catch exceptions or not
+ * @param Response|null $entry A Response instance (the stale entry if present, null otherwise)
*
* @return Response A Response instance
*/
@@ -646,8 +645,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
/**
* Calculates the key we use in the "trace" array for a given request.
*
- * @param Request $request
- *
* @return string
*/
private function getTraceKey(Request $request)
@@ -664,8 +661,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* Checks whether the given (cached) response may be served as "stale" when a revalidation
* is currently in progress.
*
- * @param Response $entry
- *
* @return bool true when the stale response may be served, false otherwise
*/
private function mayServeStaleWhileRevalidate(Response $entry)
diff --git a/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
index 25c071c33..3bdf0f519 100644
--- a/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
+++ b/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
@@ -130,7 +130,6 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
$response->headers->set('Cache-Control', implode(', ', array_keys($flags)));
$maxAge = null;
- $sMaxage = null;
if (is_numeric($this->ageDirectives['max-age'])) {
$maxAge = $this->ageDirectives['max-age'] + $this->age;
diff --git a/lib/symfony/http-kernel/HttpCache/Ssi.php b/lib/symfony/http-kernel/HttpCache/Ssi.php
index eaaa230b5..40aac64f2 100644
--- a/lib/symfony/http-kernel/HttpCache/Ssi.php
+++ b/lib/symfony/http-kernel/HttpCache/Ssi.php
@@ -94,5 +94,7 @@ class Ssi extends AbstractSurrogate
// remove SSI/1.0 from the Surrogate-Control header
$this->removeFromControl($response);
+
+ return $response;
}
}
diff --git a/lib/symfony/http-kernel/HttpCache/Store.php b/lib/symfony/http-kernel/HttpCache/Store.php
index ffd4f01ae..c831ba2ac 100644
--- a/lib/symfony/http-kernel/HttpCache/Store.php
+++ b/lib/symfony/http-kernel/HttpCache/Store.php
@@ -134,7 +134,7 @@ class Store implements StoreInterface
$key = $this->getCacheKey($request);
if (!$entries = $this->getMetadata($key)) {
- return;
+ return null;
}
// find a cached entry that matches the request.
@@ -148,7 +148,7 @@ class Store implements StoreInterface
}
if (null === $match) {
- return;
+ return null;
}
$headers = $match[1];
@@ -159,6 +159,7 @@ class Store implements StoreInterface
// TODO the metaStore referenced an entity that doesn't exist in
// the entityStore. We definitely want to return nil but we should
// also purge the entry from the meta-store when this is detected.
+ return null;
}
/**
@@ -180,7 +181,7 @@ class Store implements StoreInterface
if (!$response->headers->has('X-Content-Digest')) {
$digest = $this->generateContentDigest($response);
- if (false === $this->save($digest, $response->getContent())) {
+ if (!$this->save($digest, $response->getContent())) {
throw new \RuntimeException('Unable to store the entity.');
}
@@ -209,7 +210,7 @@ class Store implements StoreInterface
array_unshift($entries, [$storedEnv, $headers]);
- if (false === $this->save($key, serialize($entries))) {
+ if (!$this->save($key, serialize($entries))) {
throw new \RuntimeException('Unable to store the metadata.');
}
@@ -248,7 +249,7 @@ class Store implements StoreInterface
}
}
- if ($modified && false === $this->save($key, serialize($entries))) {
+ if ($modified && !$this->save($key, serialize($entries))) {
throw new \RuntimeException('Unable to store the metadata.');
}
}
@@ -349,13 +350,13 @@ class Store implements StoreInterface
*
* @param string $key The store key
*
- * @return string The data associated with the key
+ * @return string|null The data associated with the key
*/
private function load($key)
{
$path = $this->getPath($key);
- return file_exists($path) ? file_get_contents($path) : false;
+ return file_exists($path) && false !== ($contents = file_get_contents($path)) ? $contents : null;
}
/**
@@ -408,6 +409,8 @@ class Store implements StoreInterface
}
@chmod($path, 0666 & ~umask());
+
+ return true;
}
public function getPath($key)
diff --git a/lib/symfony/http-kernel/HttpKernel.php b/lib/symfony/http-kernel/HttpKernel.php
index 1e19923eb..bca2cd168 100644
--- a/lib/symfony/http-kernel/HttpKernel.php
+++ b/lib/symfony/http-kernel/HttpKernel.php
@@ -202,8 +202,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
* operations such as {@link RequestStack::getParentRequest()} can lead to
* weird results.
*
- * @param Request $request
- * @param int $type
+ * @param int $type
*/
private function finishRequest(Request $request, $type)
{
diff --git a/lib/symfony/http-kernel/Kernel.php b/lib/symfony/http-kernel/Kernel.php
index 90ef0c537..05b11f366 100644
--- a/lib/symfony/http-kernel/Kernel.php
+++ b/lib/symfony/http-kernel/Kernel.php
@@ -67,11 +67,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private $requestStackSize = 0;
private $resetServices = false;
- const VERSION = '3.4.30';
- const VERSION_ID = 30430;
+ const VERSION = '3.4.35';
+ const VERSION_ID = 30435;
const MAJOR_VERSION = 3;
const MINOR_VERSION = 4;
- const RELEASE_VERSION = 30;
+ const RELEASE_VERSION = 35;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '11/2020';
@@ -206,7 +206,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
/**
* Gets a HTTP kernel from the container.
*
- * @return HttpKernel
+ * @return HttpKernelInterface
*/
protected function getHttpKernel()
{
@@ -354,7 +354,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
{
if (null === $this->projectDir) {
$r = new \ReflectionObject($this);
- $dir = $rootDir = \dirname($r->getFileName());
+
+ if (!file_exists($dir = $r->getFileName())) {
+ throw new \LogicException(sprintf('Cannot auto-detect project dir for kernel of class "%s".', $r->name));
+ }
+
+ $dir = $rootDir = \dirname($dir);
while (!file_exists($dir.'/composer.json')) {
if ($dir === \dirname($dir)) {
return $this->projectDir = $rootDir;
@@ -425,7 +430,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
*/
public function getStartTime()
{
- return $this->debug ? $this->startTime : -INF;
+ return $this->debug && null !== $this->startTime ? $this->startTime : -INF;
}
/**
@@ -597,10 +602,9 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
return;
}
- if ($this->debug) {
+ if ($collectDeprecations = $this->debug && !\defined('PHPUNIT_COMPOSER_INSTALL')) {
$collectedLogs = [];
- $previousHandler = \defined('PHPUNIT_COMPOSER_INSTALL');
- $previousHandler = $previousHandler ?: set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
+ $previousHandler = set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
return $previousHandler ? $previousHandler($type, $message, $file, $line) : false;
}
@@ -608,7 +612,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
if (isset($collectedLogs[$message])) {
++$collectedLogs[$message]['count'];
- return;
+ return null;
}
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
@@ -628,6 +632,8 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
'trace' => $backtrace,
'count' => 1,
];
+
+ return null;
});
}
@@ -636,7 +642,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
$container = $this->buildContainer();
$container->compile();
} finally {
- if ($this->debug && true !== $previousHandler) {
+ if ($collectDeprecations) {
restore_error_handler();
file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
@@ -667,7 +673,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
static $legacyContainers = [];
$oldContainerDir = \dirname($oldContainer->getFileName());
$legacyContainers[$oldContainerDir.'.legacy'] = true;
- foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
+ foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy', GLOB_NOSORT) as $legacyContainer) {
if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
(new Filesystem())->remove(substr($legacyContainer, 0, -7));
}
@@ -862,7 +868,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
$fs->dumpFile($dir.$file, $code);
@chmod($dir.$file, 0666 & ~umask());
}
- $legacyFile = \dirname($dir.$file).'.legacy';
+ $legacyFile = \dirname($dir.key($content)).'.legacy';
if (file_exists($legacyFile)) {
@unlink($legacyFile);
}
diff --git a/lib/symfony/http-kernel/KernelInterface.php b/lib/symfony/http-kernel/KernelInterface.php
index d624d1219..2445bbb43 100644
--- a/lib/symfony/http-kernel/KernelInterface.php
+++ b/lib/symfony/http-kernel/KernelInterface.php
@@ -138,7 +138,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
/**
* Gets the request start time (not available if debug is disabled).
*
- * @return int The request start timestamp
+ * @return float The request start timestamp
*/
public function getStartTime();
diff --git a/lib/symfony/http-kernel/Log/Logger.php b/lib/symfony/http-kernel/Log/Logger.php
index e174587d1..50cbcd428 100644
--- a/lib/symfony/http-kernel/Log/Logger.php
+++ b/lib/symfony/http-kernel/Log/Logger.php
@@ -83,7 +83,6 @@ class Logger extends AbstractLogger
/**
* @param string $level
* @param string $message
- * @param array $context
*
* @return string
*/
diff --git a/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php b/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
index 810e2fe6f..8589b96f5 100644
--- a/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
+++ b/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
@@ -118,7 +118,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
public function read($token)
{
if (!$token || !file_exists($file = $this->getFilename($token))) {
- return;
+ return null;
}
return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
@@ -229,7 +229,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
$position = ftell($file);
if (0 === $position) {
- return;
+ return null;
}
while (true) {
diff --git a/lib/symfony/http-kernel/Profiler/Profile.php b/lib/symfony/http-kernel/Profiler/Profile.php
index c4490bc7a..3665545d2 100644
--- a/lib/symfony/http-kernel/Profiler/Profile.php
+++ b/lib/symfony/http-kernel/Profiler/Profile.php
@@ -102,7 +102,7 @@ class Profile
/**
* Returns the IP.
*
- * @return string The IP
+ * @return string|null The IP
*/
public function getIp()
{
@@ -122,7 +122,7 @@ class Profile
/**
* Returns the request method.
*
- * @return string The request method
+ * @return string|null The request method
*/
public function getMethod()
{
@@ -137,13 +137,16 @@ class Profile
/**
* Returns the URL.
*
- * @return string The URL
+ * @return string|null The URL
*/
public function getUrl()
{
return $this->url;
}
+ /**
+ * @param string $url
+ */
public function setUrl($url)
{
$this->url = $url;
@@ -180,7 +183,7 @@ class Profile
}
/**
- * @return int
+ * @return int|null
*/
public function getStatusCode()
{
diff --git a/lib/symfony/http-kernel/Profiler/Profiler.php b/lib/symfony/http-kernel/Profiler/Profiler.php
index edf6cb833..c510afa3e 100644
--- a/lib/symfony/http-kernel/Profiler/Profiler.php
+++ b/lib/symfony/http-kernel/Profiler/Profiler.php
@@ -65,12 +65,12 @@ class Profiler
/**
* Loads the Profile for the given Response.
*
- * @return Profile|false A Profile instance
+ * @return Profile|null A Profile instance
*/
public function loadProfileFromResponse(Response $response)
{
if (!$token = $response->headers->get('X-Debug-Token')) {
- return false;
+ return null;
}
return $this->loadProfile($token);
@@ -81,7 +81,7 @@ class Profiler
*
* @param string $token A token
*
- * @return Profile A Profile instance
+ * @return Profile|null A Profile instance
*/
public function loadProfile($token)
{
@@ -130,7 +130,7 @@ class Profiler
*
* @return array An array of tokens
*
- * @see http://php.net/manual/en/datetime.formats.php for the supported date/time formats
+ * @see https://php.net/datetime.formats for the supported date/time formats
*/
public function find($ip, $url, $limit, $method, $start, $end, $statusCode = null)
{
@@ -145,7 +145,7 @@ class Profiler
public function collect(Request $request, Response $response, \Exception $exception = null)
{
if (false === $this->enabled) {
- return;
+ return null;
}
$profile = new Profile(substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
@@ -248,16 +248,19 @@ class Profiler
return $this->collectors[$name];
}
+ /**
+ * @return int|null
+ */
private function getTimestamp($value)
{
if (null === $value || '' == $value) {
- return;
+ return null;
}
try {
$value = new \DateTime(is_numeric($value) ? '@'.$value : $value);
} catch (\Exception $e) {
- return;
+ return null;
}
return $value->getTimestamp();
diff --git a/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php b/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
index 544fb1fef..04cba51e2 100644
--- a/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
+++ b/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
@@ -39,7 +39,7 @@ interface ProfilerStorageInterface
*
* @param string $token A token
*
- * @return Profile The profile associated with token
+ * @return Profile|null The profile associated with token
*/
public function read($token);
diff --git a/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php b/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
index 3408d7acd..6803579c6 100644
--- a/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
+++ b/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
@@ -50,11 +50,12 @@ class BundleTest extends TestCase
}
/**
- * @expectedException \LogicException
- * @expectedExceptionMessage must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface
+ * @group legacy
*/
public function testGetContainerExtensionWithInvalidClass()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface');
$bundle = new ExtensionNotValidBundle();
$bundle->getContainerExtension();
}
diff --git a/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
index 297ede6a3..2fbce41d1 100644
--- a/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
+++ b/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -37,12 +37,10 @@ class Psr6CacheClearerTest extends TestCase
(new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool');
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Cache pool not found: unknown
- */
public function testClearPoolThrowsExceptionOnUnreferencedPool()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Cache pool not found: unknown');
(new Psr6CacheClearer())->clearPool('unknown');
}
diff --git a/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
index 4d34e7bfc..400e48457 100644
--- a/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
+++ b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -36,11 +36,9 @@ class CacheWarmerTest extends TestCase
$this->assertFileExists(self::$cacheFile);
}
- /**
- * @expectedException \RuntimeException
- */
public function testWriteNonWritableCacheFileThrowsARuntimeException()
{
+ $this->expectException('RuntimeException');
$nonWritableFile = '/this/file/is/very/probably/not/writable';
$warmer = new TestCacheWarmer($nonWritableFile);
$warmer->warmUp(\dirname($nonWritableFile));
diff --git a/lib/symfony/http-kernel/Tests/ClientTest.php b/lib/symfony/http-kernel/Tests/ClientTest.php
index 86a51ce76..b141c16d6 100644
--- a/lib/symfony/http-kernel/Tests/ClientTest.php
+++ b/lib/symfony/http-kernel/Tests/ClientTest.php
@@ -39,8 +39,8 @@ class ClientTest extends TestCase
$this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
$this->assertEquals('www.example.com', $client->getRequest()->getHost(), '->doRequest() uses the request handler to make the request');
- $client->request('GET', 'http://www.example.com/?parameter=http://google.com');
- $this->assertEquals('http://www.example.com/?parameter='.urlencode('http://google.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
+ $client->request('GET', 'http://www.example.com/?parameter=http://example.com');
+ $this->assertEquals('http://www.example.com/?parameter='.urlencode('http://example.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
}
public function testGetScript()
diff --git a/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php b/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
index b20b12ab5..72b38c672 100644
--- a/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
+++ b/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
@@ -30,7 +30,7 @@ class FileLocatorTest extends TestCase
$kernel
->expects($this->never())
->method('locateResource');
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
+ $this->expectException('LogicException');
$locator->locate('/some/path');
}
diff --git a/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
index 8c900fb92..a964aaeb5 100644
--- a/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
@@ -167,10 +167,10 @@ class ArgumentResolverTest extends TestCase
/**
* @requires PHP 5.6
- * @expectedException \InvalidArgumentException
*/
public function testGetVariadicArgumentsWithoutArrayInRequest()
{
+ $this->expectException('InvalidArgumentException');
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', 'foo');
@@ -181,10 +181,10 @@ class ArgumentResolverTest extends TestCase
/**
* @requires PHP 5.6
- * @expectedException \InvalidArgumentException
*/
public function testGetArgumentWithoutArray()
{
+ $this->expectException('InvalidArgumentException');
$factory = new ArgumentMetadataFactory();
$valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
$resolver = new ArgumentResolver($factory, [$valueResolver]);
@@ -199,11 +199,9 @@ class ArgumentResolverTest extends TestCase
$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testIfExceptionIsThrownWhenMissingAnArgument()
{
+ $this->expectException('RuntimeException');
$request = Request::create('/');
$controller = [$this, 'controllerWithFoo'];
@@ -266,11 +264,9 @@ class ArgumentResolverTest extends TestCase
$this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchWithInterface()
{
+ $this->expectException('RuntimeException');
$session = $this->getMockBuilder(SessionInterface::class)->getMock();
$request = Request::create('/');
$request->setSession($session);
@@ -279,11 +275,9 @@ class ArgumentResolverTest extends TestCase
self::$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchWithImplementation()
{
+ $this->expectException('RuntimeException');
$session = new Session(new MockArraySessionStorage());
$request = Request::create('/');
$request->setSession($session);
@@ -292,11 +286,9 @@ class ArgumentResolverTest extends TestCase
self::$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchOnNull()
{
+ $this->expectException('RuntimeException');
$request = Request::create('/');
$controller = [$this, 'controllerWithExtendingSession'];
diff --git a/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
index 098b89f9e..1f8ddb831 100644
--- a/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -112,12 +112,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
$this->assertSame([NonInstantiableController::class, 'action'], $controller);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
- */
public function testNonConstructController()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->at(0))
->method('has')
@@ -179,12 +177,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
$this->assertSame([$service, 'action'], $controller);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
- */
public function testExceptionWhenUsingRemovedControllerService()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->at(0))
->method('has')
@@ -205,12 +201,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
$resolver->getController($request);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?
- */
public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->once())
->method('has')
@@ -237,12 +231,8 @@ class ContainerControllerResolverTest extends ControllerResolverTest
{
// All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
$resolver = $this->createControllerResolver();
- if (method_exists($this, 'expectException')) {
- $this->expectException($exceptionName);
- $this->expectExceptionMessageRegExp($exceptionMessage);
- } else {
- $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
- }
+ $this->expectException($exceptionName);
+ $this->expectExceptionMessageRegExp($exceptionMessage);
$request = Request::create('/');
$request->attributes->set('_controller', $controller);
diff --git a/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
index 6a28eab26..e34427a32 100644
--- a/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
@@ -90,11 +90,9 @@ class ControllerResolverTest extends TestCase
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetControllerOnObjectWithoutInvokeMethod()
{
+ $this->expectException('InvalidArgumentException');
$resolver = $this->createControllerResolver();
$request = Request::create('/');
@@ -118,12 +116,8 @@ class ControllerResolverTest extends TestCase
public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
{
$resolver = $this->createControllerResolver();
- if (method_exists($this, 'expectException')) {
- $this->expectException($exceptionName);
- $this->expectExceptionMessage($exceptionMessage);
- } else {
- $this->setExpectedException($exceptionName, $exceptionMessage);
- }
+ $this->expectException($exceptionName);
+ $this->expectExceptionMessage($exceptionMessage);
$request = Request::create('/');
$request->attributes->set('_controller', $controller);
@@ -234,11 +228,11 @@ class ControllerResolverTest extends TestCase
}
/**
- * @expectedException \RuntimeException
* @group legacy
*/
public function testIfExceptionIsThrownWhenMissingAnArgument()
{
+ $this->expectException('RuntimeException');
$resolver = new ControllerResolver();
$request = Request::create('/');
diff --git a/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
index 05351445e..5ce4b1f76 100644
--- a/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
+++ b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
@@ -32,11 +32,9 @@ class ArgumentMetadataTest extends TestCase
$this->assertSame('default value', $argument->getDefaultValue());
}
- /**
- * @expectedException \LogicException
- */
public function testDefaultValueUnavailable()
{
+ $this->expectException('LogicException');
$argument = new ArgumentMetadata('foo', 'string', false, false, null, false);
$this->assertFalse($argument->isNullable());
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
index ace4628e0..8b7fbe2a1 100644
--- a/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -23,7 +23,7 @@ class LoggerDataCollectorTest extends TestCase
->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
->setMethods(['countErrors', 'getLogs', 'clear'])
->getMock();
- $logger->expects($this->once())->method('countErrors')->willReturn('foo');
+ $logger->expects($this->once())->method('countErrors')->willReturn(123);
$logger->expects($this->exactly(2))->method('getLogs')->willReturn([]);
$c = new LoggerDataCollector($logger, __DIR__.'/');
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
index c434ed1e1..63dd62ce7 100644
--- a/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
+++ b/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -23,8 +23,8 @@ class MemoryDataCollectorTest extends TestCase
$collector = new MemoryDataCollector();
$collector->collect(new Request(), new Response());
- $this->assertInternalType('integer', $collector->getMemory());
- $this->assertInternalType('integer', $collector->getMemoryLimit());
+ $this->assertIsInt($collector->getMemory());
+ $this->assertIsInt($collector->getMemoryLimit());
$this->assertSame('memory', $collector->getName());
}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
index e044e5e1a..9de9eb599 100644
--- a/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
+++ b/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
@@ -44,7 +44,7 @@ class TimeDataCollectorTest extends TestCase
$this->assertEquals(0, $c->getStartTime());
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
- $kernel->expects($this->once())->method('getStartTime')->willReturn(123456);
+ $kernel->expects($this->once())->method('getStartTime')->willReturn(123456.0);
$c = new TimeDataCollector($kernel);
$request = new Request();
diff --git a/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php b/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
index c66732a37..30c5ab5aa 100644
--- a/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -61,15 +61,13 @@ class TraceableEventDispatcherTest extends TestCase
public function testStopwatchStopControllerOnRequestEvent()
{
$stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
- ->setMethods(['isStarted', 'stop', 'stopSection'])
+ ->setMethods(['isStarted', 'stop'])
->getMock();
$stopwatch->expects($this->once())
->method('isStarted')
->willReturn(true);
$stopwatch->expects($this->once())
->method('stop');
- $stopwatch->expects($this->once())
- ->method('stopSection');
$dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch);
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
index 087c66659..1d521368e 100644
--- a/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -25,11 +25,10 @@ class FragmentRendererPassTest extends TestCase
/**
* Tests that content rendering not implementing FragmentRendererInterface
* triggers an exception.
- *
- * @expectedException \InvalidArgumentException
*/
public function testContentRendererWithoutInterface()
{
+ $this->expectException('InvalidArgumentException');
$builder = new ContainerBuilder();
$fragmentHandlerDefinition = $builder->register('fragment.handler');
$builder->register('my_content_renderer', 'Symfony\Component\DependencyInjection\Definition')
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 6d0da5fcf..ef4c8b217 100644
--- a/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -25,12 +25,10 @@ use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentL
class RegisterControllerArgumentLocatorsPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Class "Symfony\Component\HttpKernel\Tests\DependencyInjection\NotFound" used for service "foo" cannot be found.
- */
public function testInvalidClass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Class "Symfony\Component\HttpKernel\Tests\DependencyInjection\NotFound" used for service "foo" cannot be found.');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -42,12 +40,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "action" attribute on tag "controller.service_arguments" {"argument":"bar"} for service "foo".
- */
public function testNoAction()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "action" attribute on tag "controller.service_arguments" {"argument":"bar"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -59,12 +55,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "argument" attribute on tag "controller.service_arguments" {"action":"fooAction"} for service "foo".
- */
public function testNoArgument()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "argument" attribute on tag "controller.service_arguments" {"action":"fooAction"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -76,12 +70,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "id" attribute on tag "controller.service_arguments" {"action":"fooAction","argument":"bar"} for service "foo".
- */
public function testNoService()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "id" attribute on tag "controller.service_arguments" {"action":"fooAction","argument":"bar"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -93,12 +85,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid "action" attribute on tag "controller.service_arguments" for service "foo": no public "barAction()" method found on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".
- */
public function testInvalidMethod()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "action" attribute on tag "controller.service_arguments" for service "foo": no public "barAction()" method found on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -110,12 +100,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid "controller.service_arguments" tag for service "foo": method "fooAction()" has no "baz" argument on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".
- */
public function testInvalidArgument()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "controller.service_arguments" tag for service "foo": method "fooAction()" has no "baz" argument on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -207,12 +195,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$this->assertSame(['foo:fooAction'], array_keys($locator));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClass". Did you forget to add a use statement?
- */
public function testExceptionOnNonExistentTypeHint()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClass". Did you forget to add a use statement?');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -223,12 +209,10 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassDifferentNamespaceController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Acme\NonExistentClass".
- */
public function testExceptionOnNonExistentTypeHintDifferentNamespace()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassDifferentNamespaceController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Acme\NonExistentClass".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -272,7 +256,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
public function testControllersAreMadePublic()
{
$container = new ContainerBuilder();
- $resolver = $container->register('argument_resolver.service')->addArgument([]);
+ $container->register('argument_resolver.service')->addArgument([]);
$container->register('foo', ArgumentWithoutTypeController::class)
->setPublic(false)
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
index 713ab5441..84d735156 100644
--- a/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -26,7 +26,7 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
$resolver = $container->register('argument_resolver.service')->addArgument([]);
$container->register('stdClass', 'stdClass');
- $container->register(parent::class, 'stdClass');
+ $container->register(TestCase::class, 'stdClass');
$container->register('c1', RemoveTestController1::class)->addTag('controller.service_arguments');
$container->register('c2', RemoveTestController2::class)->addTag('controller.service_arguments')
->addMethodCall('setTestCase', [new Reference('c1')]);
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
index 9b23ad003..d3c686932 100644
--- a/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -48,12 +48,10 @@ class ResettableServicePassTest extends TestCase
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Tag kernel.reset requires the "method" attribute to be set.
- */
public function testMissingMethod()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Tag kernel.reset requires the "method" attribute to be set.');
$container = new ContainerBuilder();
$container->register(ResettableService::class)
->addTag('kernel.reset');
diff --git a/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
index 6408b1b21..0fb32eece 100644
--- a/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
+++ b/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
@@ -50,11 +50,9 @@ class FragmentListenerTest extends TestCase
$this->assertEquals($expected, $request->attributes->all());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- */
public function testAccessDeniedWithNonSafeMethods()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
$request = Request::create('http://example.com/_fragment', 'POST');
$listener = new FragmentListener(new UriSigner('foo'));
@@ -63,11 +61,9 @@ class FragmentListenerTest extends TestCase
$listener->onKernelRequest($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- */
public function testAccessDeniedWithWrongSignature()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
$request = Request::create('http://example.com/_fragment', 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
$listener = new FragmentListener(new UriSigner('foo'));
diff --git a/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
index 33f6ab959..dbe033d16 100644
--- a/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
+++ b/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
@@ -84,11 +84,9 @@ class RouterListenerTest extends TestCase
return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInvalidMatcher()
{
+ $this->expectException('InvalidArgumentException');
new RouterListener(new \stdClass(), $this->requestStack);
}
@@ -206,14 +204,12 @@ class RouterListenerTest extends TestCase
$request = Request::create('http://localhost/');
$response = $kernel->handle($request);
$this->assertSame(404, $response->getStatusCode());
- $this->assertContains('Welcome', $response->getContent());
+ $this->assertStringContainsString('Welcome', $response->getContent());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- */
public function testRequestWithBadHost()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://bad host %22/');
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
diff --git a/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
index f0bac6050..e8ab0deed 100644
--- a/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
+++ b/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
@@ -75,6 +75,9 @@ class SessionListenerTest extends TestCase
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
+
+ $this->assertTrue($response->headers->has('Expires'));
+ $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
}
public function testSurrogateMasterRequestIsPublic()
@@ -104,10 +107,15 @@ class SessionListenerTest extends TestCase
$this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
$this->assertSame('30', $response->headers->getCacheControlDirective('max-age'));
+ $this->assertFalse($response->headers->has('Expires'));
+
$listener->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
+
+ $this->assertTrue($response->headers->has('Expires'));
+ $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
}
}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
index fb7a4379b..7d63cb45f 100644
--- a/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
+++ b/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -26,11 +26,9 @@ class ValidateRequestListenerTest extends TestCase
Request::setTrustedProxies([], -1);
}
- /**
- * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
- */
public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
{
+ $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
$dispatcher = new EventDispatcher();
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php b/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
index 88c34b023..8c3571281 100644
--- a/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
+++ b/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
@@ -34,4 +34,9 @@ class KernelForTest extends Kernel
{
return $this->booted;
}
+
+ public function getProjectDir()
+ {
+ return __DIR__;
+ }
}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
index 52d855196..d8ba8aed8 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -77,11 +77,9 @@ class EsiFragmentRendererTest extends TestCase
);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
$request = Request::create('/');
@@ -91,11 +89,9 @@ class EsiFragmentRendererTest extends TestCase
$strategy->render(new ControllerReference('main_controller'), $request);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderAltControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
$request = Request::create('/');
diff --git a/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php b/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
index 06ce785ea..6da4e73e3 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
@@ -36,31 +36,25 @@ class FragmentHandlerTest extends TestCase
;
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRenderWhenRendererDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
$handler = new FragmentHandler($this->requestStack);
$handler->render('/', 'foo');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRenderWithUnknownRenderer()
{
+ $this->expectException('InvalidArgumentException');
$handler = $this->getHandler($this->returnValue(new Response('foo')));
$handler->render('/', 'bar');
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).
- */
public function testDeliverWithUnsuccessfulResponse()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('Error when rendering "http://localhost/" (Status code is 404).');
$handler = $this->getHandler($this->returnValue(new Response('foo', 404)));
$handler->render('/', 'foo');
diff --git a/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
index 6125d95ff..43248f8e9 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -19,11 +19,9 @@ use Symfony\Component\HttpKernel\UriSigner;
class HIncludeFragmentRendererTest extends TestCase
{
- /**
- * @expectedException \LogicException
- */
public function testRenderExceptionWhenControllerAndNoSigner()
{
+ $this->expectException('LogicException');
$strategy = new HIncludeFragmentRenderer();
$strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'));
}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
index b2a2dcaef..0dfe8425f 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -111,11 +111,9 @@ class InlineFragmentRendererTest extends TestCase
Request::setTrustedProxies([], -1);
}
- /**
- * @expectedException \RuntimeException
- */
public function testRenderExceptionNoIgnoreErrors()
{
+ $this->expectException('RuntimeException');
$dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher->expects($this->never())->method('dispatch');
diff --git a/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
index c03e8c4a9..151adb0e9 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -56,11 +56,11 @@ class RoutableFragmentRendererTest extends TestCase
}
/**
- * @expectedException \LogicException
- * @dataProvider getGenerateFragmentUriDataWithNonScalar
+ * @dataProvider getGenerateFragmentUriDataWithNonScalar
*/
public function testGenerateFragmentUriWithNonScalar($controller)
{
+ $this->expectException('LogicException');
$this->callGenerateFragmentUriMethod($controller, Request::create('/'));
}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
index b2181725e..df30e6772 100644
--- a/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
+++ b/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
@@ -56,11 +56,9 @@ class SsiFragmentRendererTest extends TestCase
);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
$request = Request::create('/');
@@ -70,11 +68,9 @@ class SsiFragmentRendererTest extends TestCase
$strategy->render(new ControllerReference('main_controller'), $request);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderAltControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
$request = Request::create('/');
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php b/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
index 1fc8da8e2..2aca5459c 100644
--- a/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
+++ b/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
@@ -88,7 +88,7 @@ class EsiTest extends TestCase
$request = Request::create('/');
$response = new Response();
$response->headers->set('Content-Type', 'text/plain');
- $esi->process($request, $response);
+ $this->assertSame($response, $esi->process($request, $response));
$this->assertFalse($response->headers->has('x-body-eval'));
}
@@ -99,7 +99,7 @@ class EsiTest extends TestCase
$request = Request::create('/');
$response = new Response(' www.example.com Keep this'."\n www.example.com And this");
- $esi->process($request, $response);
+ $this->assertSame($response, $esi->process($request, $response));
$this->assertEquals(' Keep this And this', $response->getContent());
}
@@ -110,7 +110,7 @@ class EsiTest extends TestCase
$request = Request::create('/');
$response = new Response('\s*(.*)\s*#s', '\\1', $code);
diff --git a/lib/symfony/twig-bridge/Extension/DumpExtension.php b/lib/symfony/twig-bridge/Extension/DumpExtension.php
index 88b75368d..2be105623 100644
--- a/lib/symfony/twig-bridge/Extension/DumpExtension.php
+++ b/lib/symfony/twig-bridge/Extension/DumpExtension.php
@@ -55,7 +55,7 @@ class DumpExtension extends AbstractExtension
public function dump(Environment $env, $context)
{
if (!$env->isDebug()) {
- return;
+ return null;
}
if (2 === \func_num_args()) {
diff --git a/lib/symfony/twig-bridge/Extension/RoutingExtension.php b/lib/symfony/twig-bridge/Extension/RoutingExtension.php
index f380d13a5..936c2d998 100644
--- a/lib/symfony/twig-bridge/Extension/RoutingExtension.php
+++ b/lib/symfony/twig-bridge/Extension/RoutingExtension.php
@@ -33,9 +33,7 @@ class RoutingExtension extends AbstractExtension
}
/**
- * Returns a list of functions to add to the existing list.
- *
- * @return array An array of functions
+ * {@inheritdoc}
*/
public function getFunctions()
{
diff --git a/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php b/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
index 612bec14e..8925d5887 100644
--- a/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
+++ b/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
@@ -28,7 +28,6 @@ class SearchAndRenderBlockNode extends FunctionExpression
preg_match('/_([^_]+)$/', $this->getAttribute('name'), $matches);
- $label = null;
$arguments = iterator_to_array($this->getNode('arguments'));
$blockNameSuffix = $matches[1];
diff --git a/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
index 04b68ef6b..be08d0d1d 100644
--- a/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
+++ b/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -107,6 +107,8 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
/**
* {@inheritdoc}
+ *
+ * @return int
*/
public function getPriority()
{
diff --git a/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php b/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
index 2585b4823..1a399ce8b 100644
--- a/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
+++ b/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
@@ -97,6 +97,8 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
/**
* {@inheritdoc}
+ *
+ * @return int
*/
public function getPriority()
{
@@ -104,8 +106,7 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
}
/**
- * @param Node $arguments
- * @param int $index
+ * @param int $index
*
* @return string|null
*/
@@ -116,7 +117,7 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
} elseif ($arguments->hasNode($index)) {
$argument = $arguments->getNode($index);
} else {
- return;
+ return null;
}
return $this->getReadDomainFromNode($argument);
diff --git a/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
index e23e6f8a2..5673cf212 100644
--- a/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
+++ b/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -71,7 +71,6 @@ col-sm-10
{#--#}
{%- endblock checkbox_row %}
diff --git a/lib/symfony/twig-bridge/Tests/AppVariableTest.php b/lib/symfony/twig-bridge/Tests/AppVariableTest.php
index 0502a64ce..eb132e720 100644
--- a/lib/symfony/twig-bridge/Tests/AppVariableTest.php
+++ b/lib/symfony/twig-bridge/Tests/AppVariableTest.php
@@ -114,51 +114,39 @@ class AppVariableTest extends TestCase
$this->assertNull($this->appVariable->getUser());
}
- /**
- * @expectedException \RuntimeException
- */
public function testEnvironmentNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getEnvironment();
}
- /**
- * @expectedException \RuntimeException
- */
public function testDebugNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getDebug();
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetTokenWithTokenStorageNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getToken();
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetUserWithTokenStorageNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getUser();
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetRequestWithRequestStackNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getRequest();
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionWithRequestStackNotSet()
{
+ $this->expectException('RuntimeException');
$this->appVariable->getSession();
}
@@ -192,10 +180,10 @@ class AppVariableTest extends TestCase
$flashMessages = $this->setFlashMessages();
$this->assertEquals($flashMessages, $this->appVariable->getFlashes([]));
- $flashMessages = $this->setFlashMessages();
+ $this->setFlashMessages();
$this->assertEquals([], $this->appVariable->getFlashes('this-does-not-exist'));
- $flashMessages = $this->setFlashMessages();
+ $this->setFlashMessages();
$this->assertEquals(
['this-does-not-exist' => []],
$this->appVariable->getFlashes(['this-does-not-exist'])
diff --git a/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php b/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
index 2f4cc9cd8..7eb96018a 100644
--- a/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
+++ b/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
@@ -26,7 +26,7 @@ class DebugCommandTest extends TestCase
$ret = $tester->execute([], ['decorated' => false]);
$this->assertEquals(0, $ret, 'Returns 0 in case of success');
- $this->assertContains('Functions', trim($tester->getDisplay()));
+ $this->assertStringContainsString('Functions', trim($tester->getDisplay()));
}
public function testLineSeparatorInLoaderPaths()
@@ -59,7 +59,7 @@ Loader Paths
TXT;
$this->assertEquals(0, $ret, 'Returns 0 in case of success');
- $this->assertContains($loaderPaths, trim($tester->getDisplay(true)));
+ $this->assertStringContainsString($loaderPaths, trim($tester->getDisplay(true)));
}
public function testWithGlobals()
@@ -70,7 +70,7 @@ TXT;
$display = $tester->getDisplay();
- $this->assertContains(json_encode($message), $display);
+ $this->assertStringContainsString(json_encode($message), $display);
}
public function testWithGlobalsJson()
diff --git a/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php b/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
index e50a555e7..84154512b 100644
--- a/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
+++ b/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
@@ -31,7 +31,7 @@ class LintCommandTest extends TestCase
$ret = $tester->execute(['filename' => [$filename]], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
$this->assertEquals(0, $ret, 'Returns 0 in case of success');
- $this->assertContains('OK in', trim($tester->getDisplay()));
+ $this->assertStringContainsString('OK in', trim($tester->getDisplay()));
}
public function testLintIncorrectFile()
@@ -45,16 +45,14 @@ class LintCommandTest extends TestCase
$this->assertRegExp('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
}
- /**
- * @expectedException \RuntimeException
- */
public function testLintFileNotReadable()
{
+ $this->expectException('RuntimeException');
$tester = $this->createCommandTester();
$filename = $this->createFile('');
unlink($filename);
- $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
+ $tester->execute(['filename' => [$filename]], ['decorated' => false]);
}
public function testLintFileCompileTimeException()
@@ -71,11 +69,11 @@ class LintCommandTest extends TestCase
/**
* @group legacy
* @expectedDeprecation Passing a command name as the first argument of "Symfony\Bridge\Twig\Command\LintCommand::__construct()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.
- * @expectedException \RuntimeException
- * @expectedExceptionMessage The Twig environment needs to be set.
*/
public function testLegacyLintCommand()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('The Twig environment needs to be set.');
$command = new LintCommand();
$application = new Application();
diff --git a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 5763345af..f04372c54 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -2396,7 +2396,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testUrlWithDefaultProtocol()
{
- $url = 'http://www.google.com?foo1=bar1&foo2=bar2';
+ $url = 'http://www.example.com?foo1=bar1&foo2=bar2';
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => 'http']);
$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2404,7 +2404,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@type="text"]
[@name="name"]
[@class="my&class form-control"]
- [@value="http://www.google.com?foo1=bar1&foo2=bar2"]
+ [@value="http://www.example.com?foo1=bar1&foo2=bar2"]
[@inputmode="url"]
'
);
@@ -2412,7 +2412,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testUrlWithoutDefaultProtocol()
{
- $url = 'http://www.google.com?foo1=bar1&foo2=bar2';
+ $url = 'http://www.example.com?foo1=bar1&foo2=bar2';
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => null]);
$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2420,7 +2420,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@type="url"]
[@name="name"]
[@class="my&class form-control"]
- [@value="http://www.google.com?foo1=bar1&foo2=bar2"]
+ [@value="http://www.example.com?foo1=bar1&foo2=bar2"]
'
);
}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index 02f6ac9b1..b11d1720b 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -33,10 +33,11 @@ class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3Hori
*/
private $renderer;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index 0c2ef171b..0bb5a7b6c 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -29,10 +29,11 @@ class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
*/
private $renderer;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
index 319c0e573..02ab01fc5 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -35,10 +35,11 @@ class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4Hori
private $renderer;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
index ea36552d8..cb2328b51 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -33,10 +33,11 @@ class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest
*/
private $renderer;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
index 214df3c7f..51e587411 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -33,10 +33,11 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
protected static $supportedFeatureSetVersion = 304;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
index f95676736..0676dffd5 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -32,10 +32,11 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
protected static $supportedFeatureSetVersion = 304;
- protected function setUp()
+ /**
+ * @before
+ */
+ public function doSetUp()
{
- parent::setUp();
-
$loader = new StubFilesystemLoader([
__DIR__.'/../../Resources/views/Form',
__DIR__.'/Fixtures/templates/form',
diff --git a/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
index 22084ec1a..c635935f3 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
@@ -22,11 +22,9 @@ use Twig\Loader\ArrayLoader;
class HttpKernelExtensionTest extends TestCase
{
- /**
- * @expectedException \Twig\Error\RuntimeError
- */
public function testFragmentWithError()
{
+ $this->expectException('Twig\Error\RuntimeError');
$renderer = $this->getFragmentHandler($this->throwException(new \Exception('foo')));
$this->renderTemplate($renderer);
@@ -49,12 +47,8 @@ class HttpKernelExtensionTest extends TestCase
;
$renderer = new FragmentHandler($context);
- if (method_exists($this, 'expectException')) {
- $this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage('The "inline" renderer does not exist.');
- } else {
- $this->setExpectedException('InvalidArgumentException', 'The "inline" renderer does not exist.');
- }
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The "inline" renderer does not exist.');
$renderer->render('/foo');
}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
index 1af65e4c1..35f3baa1b 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
@@ -19,11 +19,9 @@ use Twig\Loader\ArrayLoader;
class StopwatchExtensionTest extends TestCase
{
- /**
- * @expectedException \Twig\Error\SyntaxError
- */
public function testFailIfStoppingWrongEvent()
{
+ $this->expectException('Twig\Error\SyntaxError');
$this->testTiming('{% stopwatch "foo" %}{% endstopwatch "bar" %}', []);
}
@@ -36,7 +34,7 @@ class StopwatchExtensionTest extends TestCase
$twig->addExtension(new StopwatchExtension($this->getStopwatch($events)));
try {
- $nodes = $twig->render('template');
+ $twig->render('template');
} catch (RuntimeError $e) {
throw $e->getPrevious();
}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
index ef4bf9e11..206cda678 100644
--- a/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
+++ b/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
@@ -45,31 +45,25 @@ class TranslationExtensionTest extends TestCase
$this->assertEquals($expected, $this->getTemplate($template)->render($variables));
}
- /**
- * @expectedException \Twig\Error\SyntaxError
- * @expectedExceptionMessage Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.
- */
public function testTransUnknownKeyword()
{
- $output = $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
+ $this->expectException('Twig\Error\SyntaxError');
+ $this->expectExceptionMessage('Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.');
+ $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
}
- /**
- * @expectedException \Twig\Error\SyntaxError
- * @expectedExceptionMessage A message inside a trans tag must be a simple text in "index" at line 2.
- */
public function testTransComplexBody()
{
- $output = $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
+ $this->expectException('Twig\Error\SyntaxError');
+ $this->expectExceptionMessage('A message inside a trans tag must be a simple text in "index" at line 2.');
+ $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
}
- /**
- * @expectedException \Twig\Error\SyntaxError
- * @expectedExceptionMessage A message inside a transchoice tag must be a simple text in "index" at line 2.
- */
public function testTransChoiceComplexBody()
{
- $output = $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
+ $this->expectException('Twig\Error\SyntaxError');
+ $this->expectExceptionMessage('A message inside a transchoice tag must be a simple text in "index" at line 2.');
+ $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
}
public function getTransTests()
diff --git a/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php b/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
index 71180156b..ce1980eb1 100644
--- a/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
+++ b/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -34,9 +34,7 @@ class FormThemeTokenParserTest extends TestCase
$stream = $env->tokenize($source);
$parser = new Parser($env);
- if (method_exists($expected, 'setSourceContext')) {
- $expected->setSourceContext($source);
- }
+ $expected->setSourceContext($source);
$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
}
diff --git a/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php b/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
index 5dd5bb79d..82d729836 100644
--- a/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
+++ b/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
@@ -76,11 +76,11 @@ class TwigExtractorTest extends TestCase
}
/**
- * @expectedException \Twig\Error\Error
* @dataProvider resourcesWithSyntaxErrorsProvider
*/
public function testExtractSyntaxError($resources)
{
+ $this->expectException('Twig\Error\Error');
$twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
$twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
@@ -89,13 +89,10 @@ class TwigExtractorTest extends TestCase
try {
$extractor->extract($resources, new MessageCatalogue('en'));
} catch (Error $e) {
- if (method_exists($e, 'getSourceContext')) {
- $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
- $this->assertSame(1, $e->getLine());
- $this->assertSame('Unclosed "block".', $e->getMessage());
- } else {
- $this->expectExceptionMessageRegExp('/Unclosed "block" in ".*extractor(\\/|\\\\)syntax_error\\.twig" at line 1/');
- }
+ $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
+ $this->assertSame(1, $e->getLine());
+ $this->assertSame('Unclosed "block".', $e->getMessage());
+
throw $e;
}
}
diff --git a/lib/symfony/twig-bridge/Tests/TwigEngineTest.php b/lib/symfony/twig-bridge/Tests/TwigEngineTest.php
index ab932eebc..e136d0c76 100644
--- a/lib/symfony/twig-bridge/Tests/TwigEngineTest.php
+++ b/lib/symfony/twig-bridge/Tests/TwigEngineTest.php
@@ -58,11 +58,9 @@ class TwigEngineTest extends TestCase
$this->assertSame('foo', $engine->render(new TemplateReference('index')));
}
- /**
- * @expectedException \Twig\Error\SyntaxError
- */
public function testRenderWithError()
{
+ $this->expectException('Twig\Error\SyntaxError');
$engine = $this->getTwig();
$engine->render(new TemplateReference('error'));
diff --git a/lib/symfony/twig-bridge/TokenParser/TransChoiceTokenParser.php b/lib/symfony/twig-bridge/TokenParser/TransChoiceTokenParser.php
index 7b673856f..b1c8a39b3 100644
--- a/lib/symfony/twig-bridge/TokenParser/TransChoiceTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/TransChoiceTokenParser.php
@@ -15,7 +15,6 @@ use Symfony\Bridge\Twig\Node\TransNode;
use Twig\Error\SyntaxError;
use Twig\Node\Expression\AbstractExpression;
use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Node;
use Twig\Node\TextNode;
use Twig\Token;
@@ -27,11 +26,7 @@ use Twig\Token;
class TransChoiceTokenParser extends TransTokenParser
{
/**
- * Parses a token and returns a node.
- *
- * @return Node
- *
- * @throws SyntaxError
+ * {@inheritdoc}
*/
public function parse(Token $token)
{
@@ -82,9 +77,7 @@ class TransChoiceTokenParser extends TransTokenParser
}
/**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
+ * {@inheritdoc}
*/
public function getTag()
{
diff --git a/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php b/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
index ee546e05f..72fbda77b 100644
--- a/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
@@ -12,7 +12,6 @@
namespace Symfony\Bridge\Twig\TokenParser;
use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
-use Twig\Node\Node;
use Twig\Token;
use Twig\TokenParser\AbstractTokenParser;
@@ -24,9 +23,7 @@ use Twig\TokenParser\AbstractTokenParser;
class TransDefaultDomainTokenParser extends AbstractTokenParser
{
/**
- * Parses a token and returns a node.
- *
- * @return Node
+ * {@inheritdoc}
*/
public function parse(Token $token)
{
@@ -38,9 +35,7 @@ class TransDefaultDomainTokenParser extends AbstractTokenParser
}
/**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
+ * {@inheritdoc}
*/
public function getTag()
{
diff --git a/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php b/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
index ca2dae161..5f1e19acb 100644
--- a/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
@@ -15,7 +15,6 @@ use Symfony\Bridge\Twig\Node\TransNode;
use Twig\Error\SyntaxError;
use Twig\Node\Expression\AbstractExpression;
use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Node;
use Twig\Node\TextNode;
use Twig\Token;
use Twig\TokenParser\AbstractTokenParser;
@@ -28,11 +27,7 @@ use Twig\TokenParser\AbstractTokenParser;
class TransTokenParser extends AbstractTokenParser
{
/**
- * Parses a token and returns a node.
- *
- * @return Node
- *
- * @throws SyntaxError
+ * {@inheritdoc}
*/
public function parse(Token $token)
{
@@ -83,9 +78,7 @@ class TransTokenParser extends AbstractTokenParser
}
/**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
+ * {@inheritdoc}
*/
public function getTag()
{
diff --git a/lib/symfony/twig-bridge/Translation/TwigExtractor.php b/lib/symfony/twig-bridge/Translation/TwigExtractor.php
index a921582db..b7c787226 100644
--- a/lib/symfony/twig-bridge/Translation/TwigExtractor.php
+++ b/lib/symfony/twig-bridge/Translation/TwigExtractor.php
@@ -61,11 +61,7 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
if ($file instanceof \SplFileInfo) {
$path = $file->getRealPath() ?: $file->getPathname();
$name = $file instanceof SplFileInfo ? $file->getRelativePathname() : $path;
- if (method_exists($e, 'setSourceContext')) {
- $e->setSourceContext(new Source('', $name, $path));
- } else {
- $e->setTemplateName($name);
- }
+ $e->setSourceContext(new Source('', $name, $path));
}
throw $e;
@@ -106,9 +102,7 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
}
/**
- * @param string|array $directory
- *
- * @return array
+ * {@inheritdoc}
*/
protected function extractFromDirectory($directory)
{
diff --git a/lib/symfony/twig-bridge/TwigEngine.php b/lib/symfony/twig-bridge/TwigEngine.php
index 4789f3f4d..cfbb5d8f4 100644
--- a/lib/symfony/twig-bridge/TwigEngine.php
+++ b/lib/symfony/twig-bridge/TwigEngine.php
@@ -19,6 +19,7 @@ use Twig\Environment;
use Twig\Error\Error;
use Twig\Error\LoaderError;
use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
use Twig\Template;
/**
@@ -74,19 +75,24 @@ class TwigEngine implements EngineInterface, StreamingEngineInterface
$loader = $this->environment->getLoader();
- if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
- return $loader->exists((string) $name);
- }
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ // cast possible TemplateReferenceInterface to string because the
+ // EngineInterface supports them but LoaderInterface does not
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext((string) $name);
+ } else {
+ $loader->getSource((string) $name);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
+ }
- try {
- // cast possible TemplateReferenceInterface to string because the
- // EngineInterface supports them but LoaderInterface does not
- $loader->getSourceContext((string) $name)->getCode();
- } catch (LoaderError $e) {
return false;
}
- return true;
+ return $loader->exists((string) $name);
}
/**
diff --git a/lib/symfony/twig-bridge/UndefinedCallableHandler.php b/lib/symfony/twig-bridge/UndefinedCallableHandler.php
index 9c2d18b4a..43cac82bc 100644
--- a/lib/symfony/twig-bridge/UndefinedCallableHandler.php
+++ b/lib/symfony/twig-bridge/UndefinedCallableHandler.php
@@ -71,6 +71,8 @@ class UndefinedCallableHandler
}
self::onUndefined($name, 'filter', self::$filterComponents[$name]);
+
+ return true;
}
public static function onUndefinedFunction($name)
@@ -80,6 +82,8 @@ class UndefinedCallableHandler
}
self::onUndefined($name, 'function', self::$functionComponents[$name]);
+
+ return true;
}
private static function onUndefined($name, $type, $component)
diff --git a/lib/symfony/twig-bridge/composer.json b/lib/symfony/twig-bridge/composer.json
index 071b25b18..f4fb1c98a 100644
--- a/lib/symfony/twig-bridge/composer.json
+++ b/lib/symfony/twig-bridge/composer.json
@@ -17,13 +17,14 @@
],
"require": {
"php": "^5.5.9|>=7.0.8",
- "twig/twig": "^1.40|^2.9"
+ "twig/twig": "^1.41|^2.10"
},
"require-dev": {
+ "fig/link-util": "^1.0",
"symfony/asset": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
- "symfony/form": "^3.4.23|^4.2.4",
+ "symfony/form": "^3.4.31|^4.3.4",
"symfony/http-foundation": "^3.3.11|~4.0",
"symfony/http-kernel": "~3.2|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +42,7 @@
"symfony/workflow": "~3.3|~4.0"
},
"conflict": {
- "symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
+ "symfony/form": "<3.4.31|>=4.0,<4.3.4",
"symfony/console": "<3.4"
},
"suggest": {
diff --git a/lib/symfony/twig-bundle/CacheWarmer/TemplateCacheWarmer.php b/lib/symfony/twig-bundle/CacheWarmer/TemplateCacheWarmer.php
index 874bed33e..23abdbf99 100644
--- a/lib/symfony/twig-bundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/lib/symfony/twig-bundle/CacheWarmer/TemplateCacheWarmer.php
@@ -32,7 +32,6 @@ class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInte
* TemplateCacheWarmer constructor.
*
* @param ContainerInterface $container
- * @param \Traversable $iterator
*/
public function __construct($container, \Traversable $iterator)
{
diff --git a/lib/symfony/twig-bundle/ContainerAwareRuntimeLoader.php b/lib/symfony/twig-bundle/ContainerAwareRuntimeLoader.php
index 5ba6df599..7595f5674 100644
--- a/lib/symfony/twig-bundle/ContainerAwareRuntimeLoader.php
+++ b/lib/symfony/twig-bundle/ContainerAwareRuntimeLoader.php
@@ -49,5 +49,7 @@ class ContainerAwareRuntimeLoader implements RuntimeLoaderInterface
if (null !== $this->logger) {
$this->logger->warning(sprintf('Class "%s" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.', $class));
}
+
+ return null;
}
}
diff --git a/lib/symfony/twig-bundle/Controller/ExceptionController.php b/lib/symfony/twig-bundle/Controller/ExceptionController.php
index ff47c3d2b..22753af96 100644
--- a/lib/symfony/twig-bundle/Controller/ExceptionController.php
+++ b/lib/symfony/twig-bundle/Controller/ExceptionController.php
@@ -18,6 +18,7 @@ use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
use Twig\Environment;
use Twig\Error\LoaderError;
use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
/**
* ExceptionController renders error or exception pages for a given
@@ -32,8 +33,7 @@ class ExceptionController
protected $debug;
/**
- * @param Environment $twig
- * @param bool $debug Show error (false) or exception (true) pages by default
+ * @param bool $debug Show error (false) or exception (true) pages by default
*/
public function __construct(Environment $twig, $debug)
{
@@ -88,10 +88,9 @@ class ExceptionController
}
/**
- * @param Request $request
- * @param string $format
- * @param int $code An HTTP response status code
- * @param bool $showException
+ * @param string $format
+ * @param int $code An HTTP response status code
+ * @param bool $showException
*
* @return string
*/
@@ -122,23 +121,28 @@ class ExceptionController
return sprintf('@Twig/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
}
- // to be removed when the minimum required version of Twig is >= 3.0
+ // to be removed when the minimum required version of Twig is >= 2.0
protected function templateExists($template)
{
$template = (string) $template;
$loader = $this->twig->getLoader();
- if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
- return $loader->exists($template);
+
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext($template);
+ } else {
+ $loader->getSource($template);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
+ }
+
+ return false;
}
- try {
- $loader->getSourceContext($template)->getCode();
-
- return true;
- } catch (LoaderError $e) {
- }
-
- return false;
+ return $loader->exists($template);
}
}
diff --git a/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php b/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
index 58e136a63..52ba0503e 100644
--- a/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
+++ b/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
@@ -150,18 +150,20 @@ class TwigExtension extends Extension
}
}
- unset(
- $config['form'],
- $config['globals'],
- $config['extensions']
- );
-
if (isset($config['autoescape_service']) && isset($config['autoescape_service_method'])) {
$config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method']];
}
- unset($config['autoescape_service'], $config['autoescape_service_method']);
- $container->getDefinition('twig')->replaceArgument(1, $config);
+ $container->getDefinition('twig')->replaceArgument(1, array_intersect_key($config, [
+ 'debug' => true,
+ 'charset' => true,
+ 'base_template_class' => true,
+ 'strict_variables' => true,
+ 'autoescape' => true,
+ 'cache' => true,
+ 'auto_reload' => true,
+ 'optimizations' => true,
+ ]));
$container->registerForAutoconfiguration(\Twig_ExtensionInterface::class)->addTag('twig.extension');
$container->registerForAutoconfiguration(\Twig_LoaderInterface::class)->addTag('twig.loader');
@@ -255,9 +257,7 @@ class TwigExtension extends Extension
}
/**
- * Returns the base path for the XSD files.
- *
- * @return string The XSD base path
+ * {@inheritdoc}
*/
public function getXsdValidationBasePath()
{
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
index 3b65273d6..a112b64b5 100644
--- a/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
@@ -87,11 +87,9 @@ class TwigLoaderPassTest extends TestCase
$this->assertEquals('test_loader_1', (string) $calls[1][1][0]);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
- */
public function testMapperPassWithZeroTaggedLoaders()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
$this->pass->process($this->builder);
}
}
diff --git a/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php b/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
index dddfff76e..3d509c44e 100644
--- a/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
+++ b/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -27,7 +27,7 @@ class NoTemplatingEntryTest extends TestCase
$container = $kernel->getContainer();
$content = $container->get('twig')->render('index.html.twig');
- $this->assertContains('{ a: b }', $content);
+ $this->assertStringContainsString('{ a: b }', $content);
}
protected function setUp()
diff --git a/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php b/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
index 906a0bc10..7fa8dd2b4 100644
--- a/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
+++ b/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
@@ -51,11 +51,9 @@ class FilesystemLoaderTest extends TestCase
$this->assertTrue($loader->exists($template));
}
- /**
- * @expectedException \Twig\Error\LoaderError
- */
public function testTwigErrorIfLocatorThrowsInvalid()
{
+ $this->expectException('Twig\Error\LoaderError');
$parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$parser
->expects($this->once())
@@ -75,11 +73,9 @@ class FilesystemLoaderTest extends TestCase
$loader->getCacheKey('name.format.engine');
}
- /**
- * @expectedException \Twig\Error\LoaderError
- */
public function testTwigErrorIfLocatorReturnsFalse()
{
+ $this->expectException('Twig\Error\LoaderError');
$parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$parser
->expects($this->once())
@@ -99,12 +95,10 @@ class FilesystemLoaderTest extends TestCase
$loader->getCacheKey('name.format.engine');
}
- /**
- * @expectedException \Twig\Error\LoaderError
- * @expectedExceptionMessageRegExp /Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/
- */
public function testTwigErrorIfTemplateDoesNotExist()
{
+ $this->expectException('Twig\Error\LoaderError');
+ $this->expectExceptionMessageRegExp('/Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/');
$parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
diff --git a/lib/symfony/twig-bundle/TwigEngine.php b/lib/symfony/twig-bundle/TwigEngine.php
index 39115199e..f2dc6b556 100644
--- a/lib/symfony/twig-bundle/TwigEngine.php
+++ b/lib/symfony/twig-bundle/TwigEngine.php
@@ -13,7 +13,6 @@ namespace Symfony\Bundle\TwigBundle;
use Symfony\Bridge\Twig\TwigEngine as BaseEngine;
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
use Symfony\Component\Config\FileLocatorInterface;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Templating\TemplateNameParserInterface;
@@ -36,28 +35,6 @@ class TwigEngine extends BaseEngine implements EngineInterface
$this->locator = $locator;
}
- /**
- * {@inheritdoc}
- */
- public function render($name, array $parameters = [])
- {
- try {
- return parent::render($name, $parameters);
- } catch (Error $e) {
- if ($name instanceof TemplateReference && !method_exists($e, 'setSourceContext')) {
- try {
- // try to get the real name of the template where the error occurred
- $name = $e->getTemplateName();
- $path = (string) $this->locator->locate($this->parser->parse($name));
- $e->setTemplateName($path);
- } catch (\Exception $e2) {
- }
- }
-
- throw $e;
- }
- }
-
/**
* {@inheritdoc}
*
diff --git a/lib/symfony/twig-bundle/composer.json b/lib/symfony/twig-bundle/composer.json
index 4cc08e1b3..f48e3bc07 100644
--- a/lib/symfony/twig-bundle/composer.json
+++ b/lib/symfony/twig-bundle/composer.json
@@ -23,7 +23,7 @@
"symfony/http-foundation": "~2.8|~3.0|~4.0",
"symfony/http-kernel": "^3.3|~4.0",
"symfony/polyfill-ctype": "~1.8",
- "twig/twig": "~1.40|~2.9"
+ "twig/twig": "~1.41|~2.10"
},
"require-dev": {
"symfony/asset": "~2.8|~3.0|~4.0",
@@ -37,7 +37,7 @@
"symfony/yaml": "~2.8|~3.0|~4.0",
"symfony/framework-bundle": "^3.3.11|~4.0",
"symfony/web-link": "~3.3|~4.0",
- "doctrine/annotations": "~1.0",
+ "doctrine/annotations": "~1.7",
"doctrine/cache": "~1.0"
},
"conflict": {
diff --git a/lib/symfony/var-dumper/Caster/DateCaster.php b/lib/symfony/var-dumper/Caster/DateCaster.php
index 40289a930..f3258b19a 100644
--- a/lib/symfony/var-dumper/Caster/DateCaster.php
+++ b/lib/symfony/var-dumper/Caster/DateCaster.php
@@ -85,12 +85,12 @@ class DateCaster
public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, $isNested, $filter)
{
- if (\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) { // see https://bugs.php.net/bug.php?id=71635
+ if (\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) { // see https://bugs.php.net/71635
return $a;
}
$dates = [];
- if (\PHP_VERSION_ID >= 70107) { // see https://bugs.php.net/bug.php?id=74639
+ if (\PHP_VERSION_ID >= 70107) { // see https://bugs.php.net/74639
foreach (clone $p as $i => $d) {
if (3 === $i) {
$now = new \DateTimeImmutable();
diff --git a/lib/symfony/var-dumper/Caster/SplCaster.php b/lib/symfony/var-dumper/Caster/SplCaster.php
index a223adb7f..283c5613d 100644
--- a/lib/symfony/var-dumper/Caster/SplCaster.php
+++ b/lib/symfony/var-dumper/Caster/SplCaster.php
@@ -90,6 +90,12 @@ class SplCaster
$prefix = Caster::PREFIX_VIRTUAL;
+ if (false === $c->getPathname()) {
+ $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
+
+ return $a;
+ }
+
foreach ($map as $key => $accessor) {
try {
$a[$prefix.$key] = $c->$accessor();
diff --git a/lib/symfony/var-dumper/Cloner/AbstractCloner.php b/lib/symfony/var-dumper/Cloner/AbstractCloner.php
index de09f1803..10d78b244 100644
--- a/lib/symfony/var-dumper/Cloner/AbstractCloner.php
+++ b/lib/symfony/var-dumper/Cloner/AbstractCloner.php
@@ -82,6 +82,8 @@ abstract class AbstractCloner implements ClonerInterface
'Symfony\Component\Debug\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'],
'PHPUnit_Framework_MockObject_MockObject' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
+ 'PHPUnit\Framework\MockObject\MockObject' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
+ 'PHPUnit\Framework\MockObject\Stub' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
'Prophecy\Prophecy\ProphecySubjectInterface' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
'Mockery\MockInterface' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
diff --git a/lib/symfony/var-dumper/Cloner/Data.php b/lib/symfony/var-dumper/Cloner/Data.php
index bb5ee94d8..d14c5aa00 100644
--- a/lib/symfony/var-dumper/Cloner/Data.php
+++ b/lib/symfony/var-dumper/Cloner/Data.php
@@ -34,7 +34,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
}
/**
- * @return string The type of the value
+ * @return string|null The type of the value
*/
public function getType()
{
@@ -58,10 +58,12 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
if (Stub::TYPE_RESOURCE === $item->type) {
return $item->class.' resource';
}
+
+ return null;
}
/**
- * @param bool $recursive Whether values should be resolved recursively or not
+ * @param array|bool $recursive Whether values should be resolved recursively or not
*
* @return string|int|float|bool|array|Data[]|null A native representation of the original value
*/
@@ -127,6 +129,8 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
return $item instanceof Stub || [] === $item ? $data : $item;
}
+
+ return null;
}
public function __isset($key)
@@ -182,7 +186,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
*
* @param int $maxDepth The max dumped depth level
*
- * @return self A clone of $this
+ * @return static
*/
public function withMaxDepth($maxDepth)
{
@@ -197,7 +201,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
*
* @param int $maxItemsPerDepth The max number of items dumped per depth level
*
- * @return self A clone of $this
+ * @return static
*/
public function withMaxItemsPerDepth($maxItemsPerDepth)
{
@@ -212,7 +216,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
*
* @param bool $useRefHandles False to hide global ref. handles
*
- * @return self A clone of $this
+ * @return static
*/
public function withRefHandles($useRefHandles)
{
@@ -227,7 +231,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
*
* @param string|int $key The key to seek to
*
- * @return self|null A clone of $this or null if the key is not set
+ * @return static|null Null if the key is not set
*/
public function seek($key)
{
@@ -237,7 +241,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
$item = $item->value;
}
if (!($item = $this->getStub($item)) instanceof Stub || !$item->position) {
- return;
+ return null;
}
$keys = [$key];
@@ -252,7 +256,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
case Stub::TYPE_RESOURCE:
break;
default:
- return;
+ return null;
}
$data = null;
diff --git a/lib/symfony/var-dumper/Cloner/DumperInterface.php b/lib/symfony/var-dumper/Cloner/DumperInterface.php
index cb498ff70..912bb5213 100644
--- a/lib/symfony/var-dumper/Cloner/DumperInterface.php
+++ b/lib/symfony/var-dumper/Cloner/DumperInterface.php
@@ -40,21 +40,21 @@ interface DumperInterface
/**
* Dumps while entering an hash.
*
- * @param Cursor $cursor The Cursor position in the dump
- * @param int $type A Cursor::HASH_* const for the type of hash
- * @param string $class The object class, resource type or array count
- * @param bool $hasChild When the dump of the hash has child item
+ * @param Cursor $cursor The Cursor position in the dump
+ * @param int $type A Cursor::HASH_* const for the type of hash
+ * @param string|int $class The object class, resource type or array count
+ * @param bool $hasChild When the dump of the hash has child item
*/
public function enterHash(Cursor $cursor, $type, $class, $hasChild);
/**
* Dumps while leaving an hash.
*
- * @param Cursor $cursor The Cursor position in the dump
- * @param int $type A Cursor::HASH_* const for the type of hash
- * @param string $class The object class, resource type or array count
- * @param bool $hasChild When the dump of the hash has child item
- * @param int $cut The number of items the hash has been cut by
+ * @param Cursor $cursor The Cursor position in the dump
+ * @param int $type A Cursor::HASH_* const for the type of hash
+ * @param string|int $class The object class, resource type or array count
+ * @param bool $hasChild When the dump of the hash has child item
+ * @param int $cut The number of items the hash has been cut by
*/
public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut);
}
diff --git a/lib/symfony/var-dumper/Dumper/AbstractDumper.php b/lib/symfony/var-dumper/Dumper/AbstractDumper.php
index 30cd1a1b1..87195bb6a 100644
--- a/lib/symfony/var-dumper/Dumper/AbstractDumper.php
+++ b/lib/symfony/var-dumper/Dumper/AbstractDumper.php
@@ -35,7 +35,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
protected $indentPad = ' ';
protected $flags;
- private $charset;
+ private $charset = '';
/**
* @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput
@@ -154,6 +154,8 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
setlocale(LC_NUMERIC, $locale);
}
}
+
+ return null;
}
/**
@@ -185,13 +187,13 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
/**
* Converts a non-UTF-8 string to UTF-8.
*
- * @param string $s The non-UTF-8 string to convert
+ * @param string|null $s The non-UTF-8 string to convert
*
- * @return string The string converted to UTF-8
+ * @return string|null The string converted to UTF-8
*/
protected function utf8Encode($s)
{
- if (preg_match('//u', $s)) {
+ if (null === $s || preg_match('//u', $s)) {
return $s;
}
diff --git a/lib/symfony/var-dumper/Dumper/CliDumper.php b/lib/symfony/var-dumper/Dumper/CliDumper.php
index 2bd347d96..946df7825 100644
--- a/lib/symfony/var-dumper/Dumper/CliDumper.php
+++ b/lib/symfony/var-dumper/Dumper/CliDumper.php
@@ -28,7 +28,7 @@ class CliDumper extends AbstractDumper
protected $maxStringWidth = 0;
protected $styles = [
// See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
- 'default' => '38;5;208',
+ 'default' => '0;38;5;208',
'num' => '1;38;5;38',
'const' => '1;38;5;208',
'str' => '1;38;5;113',
diff --git a/lib/symfony/var-dumper/Test/VarDumperTestTrait.php b/lib/symfony/var-dumper/Test/VarDumperTestTrait.php
index aae113b6c..84c36f49c 100644
--- a/lib/symfony/var-dumper/Test/VarDumperTestTrait.php
+++ b/lib/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -41,6 +41,9 @@ trait VarDumperTestTrait
$this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);
}
+ /**
+ * @return string|null
+ */
protected function getDump($data, $key = null, $filter = 0)
{
$flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;
@@ -52,7 +55,7 @@ trait VarDumperTestTrait
$dumper->setColors(false);
$data = $cloner->cloneVar($data, $filter)->withRefHandles(false);
if (null !== $key && null === $data = $data->seek($key)) {
- return;
+ return null;
}
return rtrim($dumper->dump($data, true));
diff --git a/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
index ea83e7716..738180f5b 100644
--- a/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
+++ b/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
@@ -52,7 +52,6 @@ Exception {
› }
}
%s%eTests%eCaster%eExceptionCasterTest.php:40 { …}
- Symfony\Component\VarDumper\Tests\Caster\ExceptionCasterTest->testDefaultSettings() {}
%A
EODUMP;
@@ -71,8 +70,7 @@ EODUMP;
› return new \Exception(''.$msg);
› }
}
- %s%eTests%eCaster%eExceptionCasterTest.php:65 { …}
- Symfony\Component\VarDumper\Tests\Caster\ExceptionCasterTest->testSeek() {}
+ %s%eTests%eCaster%eExceptionCasterTest.php:64 { …}
%A
EODUMP;
@@ -96,8 +94,7 @@ Exception {
› return new \Exception(''.$msg);
› }
}
- %s%eTests%eCaster%eExceptionCasterTest.php:84 { …}
- Symfony\Component\VarDumper\Tests\Caster\ExceptionCasterTest->testNoArgs() {}
+ %s%eTests%eCaster%eExceptionCasterTest.php:82 { …}
%A
EODUMP;
diff --git a/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
index 984b340c6..67033df09 100644
--- a/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
+++ b/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -50,12 +50,12 @@ SplFileInfo {
%A}
EOTXT
],
- ['https://google.com/about', <<<'EOTXT'
+ ['https://example.com/about', <<<'EOTXT'
SplFileInfo {
-%Apath: "https://google.com"
+%Apath: "https://example.com"
filename: "about"
basename: "about"
- pathname: "https://google.com/about"
+ pathname: "https://example.com/about"
extension: ""
realPath: false
%A}
@@ -202,6 +202,18 @@ Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
0 => 234
]
}
+EOTXT;
+ $this->assertDumpEquals($expected, $var);
+ }
+
+ public function testBadSplFileInfo()
+ {
+ $var = new BadSplFileInfo();
+
+ $expected = <<- '.implode("\n", $lines).'
{{- form_widget(form) -}}
- {{- form_errors(form) -}}
{#--#}
- Locale
+ Default locale
@@ -73,7 +73,7 @@
@@ -185,11 +185,14 @@
{% endblock %}
-{% macro render_table(messages) %}
+{% macro render_table(messages, is_fallback) %}
{{ collector.locale|default('-') }}
- Locale
+ Default locale
{{ collector.fallbackLocales|join(', ')|default('-') }}
@@ -152,7 +152,7 @@
{% else %}
{% block fallback_messages %}
- {{ helper.render_table(messages_fallback) }}
+ {{ helper.render_table(messages_fallback, true) }}
{% endblock %}
{% endif %}
| Locale | + {% if is_fallback %} +Fallback locale | + {% endif %}Domain | Times used | Message ID | @@ -200,6 +203,9 @@ {% for message in messages %}
|---|---|---|---|---|
| {{ message.locale }} | + {% if is_fallback %} +{{ message.fallbackLocale|default('-') }} | + {% endif %}{{ message.domain }} | {{ message.count }} |
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
index f13edfcfe..9da75d055 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -15,7 +15,7 @@
Sfjs.load(
'sfwdt{{ token }}',
- '{{ path("_wdt", { "token": token }) }}',
+ '{{ path("_wdt", { "token": token })|escape('js') }}',
function(xhr, el) {
/* Evaluate embedded scripts inside the toolbar */
diff --git a/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php b/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
index a1e23041f..c55c67e53 100644
--- a/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
+++ b/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
@@ -98,9 +98,7 @@ class ProfilerControllerTest extends TestCase
->expects($this->exactly(2))
->method('loadProfile')
->willReturnCallback(function ($token) {
- if ('found' == $token) {
- return new Profile($token);
- }
+ return 'found' == $token ? new Profile($token) : null;
})
;
diff --git a/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php b/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
index c6bc1cdba..ab4a42fc0 100644
--- a/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
+++ b/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
@@ -15,6 +15,8 @@ use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
use Symfony\Component\HttpKernel\Profiler\Profile;
use Twig\Environment;
+use Twig\Loader\LoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
/**
* Test for TemplateManager class.
@@ -53,11 +55,9 @@ class TemplateManagerTest extends TestCase
$this->templateManager = new TemplateManager($profiler, $twigEnvironment, $templates);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
- */
public function testGetNameOfInvalidTemplate()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\NotFoundHttpException');
$this->templateManager->getName(new Profile('token'), 'notexistingpanel');
}
@@ -126,11 +126,16 @@ class TemplateManagerTest extends TestCase
->method('loadTemplate')
->willReturn('loadedTemplate');
- if (interface_exists('Twig\Loader\SourceContextLoaderInterface')) {
- $loader = $this->getMockBuilder('Twig\Loader\SourceContextLoaderInterface')->getMock();
+ if (Environment::MAJOR_VERSION > 1) {
+ $loader = $this->createMock(LoaderInterface::class);
+ $loader
+ ->expects($this->any())
+ ->method('exists')
+ ->willReturn(true);
} else {
- $loader = $this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock();
+ $loader = $this->createMock(SourceContextLoaderInterface::class);
}
+
$this->twigEnvironment->expects($this->any())->method('getLoader')->willReturn($loader);
return $this->twigEnvironment;
diff --git a/lib/symfony/yaml/Command/LintCommand.php b/lib/symfony/yaml/Command/LintCommand.php
index cc19a5658..f6732ecf8 100644
--- a/lib/symfony/yaml/Command/LintCommand.php
+++ b/lib/symfony/yaml/Command/LintCommand.php
@@ -196,10 +196,13 @@ EOF
}
}
+ /**
+ * @return string|null
+ */
private function getStdin()
{
if (0 !== ftell(STDIN)) {
- return;
+ return null;
}
$inputs = '';
diff --git a/lib/symfony/yaml/Dumper.php b/lib/symfony/yaml/Dumper.php
index 0012df4a3..a496dcc88 100644
--- a/lib/symfony/yaml/Dumper.php
+++ b/lib/symfony/yaml/Dumper.php
@@ -115,7 +115,7 @@ class Dumper
if ($value instanceof TaggedValue) {
$output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
- if ($inline - 1 <= 0) {
+ if ($inline - 1 <= 0 || null === $value->getValue() || is_scalar($value->getValue())) {
$output .= ' '.$this->dump($value->getValue(), $inline - 1, 0, $flags)."\n";
} else {
$output .= "\n";
diff --git a/lib/symfony/yaml/Inline.php b/lib/symfony/yaml/Inline.php
index 5d71a1f30..7d3218a35 100644
--- a/lib/symfony/yaml/Inline.php
+++ b/lib/symfony/yaml/Inline.php
@@ -126,15 +126,15 @@ class Inline
$result = self::parseScalar($value, $flags, null, $i, null === $tag, $references);
}
- if (null !== $tag) {
- return new TaggedValue($tag, $result);
- }
-
// some comments are allowed at the end
if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
}
+ if (null !== $tag) {
+ return new TaggedValue($tag, $result);
+ }
+
return $result;
} finally {
if (isset($mbEncoding)) {
@@ -644,7 +644,7 @@ class Inline
case 'null' === $scalarLower:
case '' === $scalar:
case '~' === $scalar:
- return;
+ return null;
case 'true' === $scalarLower:
return true;
case 'false' === $scalarLower:
@@ -672,7 +672,7 @@ class Inline
throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
- return;
+ return null;
case 0 === strpos($scalar, '!!php/object:'):
if (self::$objectSupport) {
@trigger_error(self::getDeprecationMessage('The !!php/object: tag to indicate dumped PHP objects is deprecated since Symfony 3.1 and will be removed in 4.0. Use the !php/object (without the colon) tag instead.'), E_USER_DEPRECATED);
@@ -684,7 +684,7 @@ class Inline
throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
- return;
+ return null;
case 0 === strpos($scalar, '!php/object'):
if (self::$objectSupport) {
return unserialize(self::parseScalar(substr($scalar, 12)));
@@ -694,7 +694,7 @@ class Inline
throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
- return;
+ return null;
case 0 === strpos($scalar, '!php/const:'):
if (self::$constantSupport) {
@trigger_error(self::getDeprecationMessage('The !php/const: tag to indicate dumped PHP constants is deprecated since Symfony 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.'), E_USER_DEPRECATED);
@@ -709,7 +709,7 @@ class Inline
throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
- return;
+ return null;
case 0 === strpos($scalar, '!php/const'):
if (self::$constantSupport) {
$i = 0;
@@ -723,7 +723,7 @@ class Inline
throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
- return;
+ return null;
case 0 === strpos($scalar, '!!float '):
return (float) substr($scalar, 8);
case 0 === strpos($scalar, '!!binary '):
@@ -795,7 +795,7 @@ class Inline
private static function parseTag($value, &$i, $flags)
{
if ('!' !== $value[$i]) {
- return;
+ return null;
}
$tagLength = strcspn($value, " \t\n", $i + 1);
@@ -807,7 +807,7 @@ class Inline
// Is followed by a scalar
if ((!isset($value[$nextOffset]) || !\in_array($value[$nextOffset], ['[', '{'], true)) && 'tagged' !== $tag) {
// Manage non-whitelisted scalars in {@link self::evaluateScalar()}
- return;
+ return null;
}
// Built-in tags
diff --git a/lib/symfony/yaml/Parser.php b/lib/symfony/yaml/Parser.php
index cc094085c..7d6112e3b 100644
--- a/lib/symfony/yaml/Parser.php
+++ b/lib/symfony/yaml/Parser.php
@@ -436,6 +436,9 @@ class Parser
$value = '';
foreach ($this->lines as $line) {
+ if ('' !== ltrim($line) && '#' === ltrim($line)[0]) {
+ continue;
+ }
// If the indentation is not consistent at offset 0, it is to be considered as a ParseError
if (0 === $this->offset && !$deprecatedUsage && isset($line[0]) && ' ' === $line[0]) {
throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
@@ -561,7 +564,7 @@ class Parser
$oldLineIndentation = $this->getCurrentLineIndentation();
if (!$this->moveToNextLine()) {
- return;
+ return '';
}
if (null === $indentation) {
@@ -604,7 +607,7 @@ class Parser
} else {
$this->moveToPreviousLine();
- return;
+ return '';
}
if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
@@ -612,7 +615,7 @@ class Parser
// and therefore no nested list or mapping
$this->moveToPreviousLine();
- return;
+ return '';
}
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
@@ -712,7 +715,7 @@ class Parser
if (self::preg_match('/^(?:'.self::TAG_PATTERN.' +)?'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
$modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
- $data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+ $data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs((int) $modifiers));
if ('' !== $matches['tag']) {
if ('!!binary' === $matches['tag']) {
@@ -1099,14 +1102,17 @@ class Parser
return $value;
}
+ /**
+ * @return string|null
+ */
private function getLineTag($value, $flags, $nextLineCheck = true)
{
if ('' === $value || '!' !== $value[0] || 1 !== self::preg_match('/^'.self::TAG_PATTERN.' *( +#.*)?$/', $value, $matches)) {
- return;
+ return null;
}
if ($nextLineCheck && !$this->isNextLineIndented()) {
- return;
+ return null;
}
$tag = substr($matches['tag'], 1);
diff --git a/lib/symfony/yaml/Tests/Command/LintCommandTest.php b/lib/symfony/yaml/Tests/Command/LintCommandTest.php
index 2bf0286b6..349897859 100644
--- a/lib/symfony/yaml/Tests/Command/LintCommandTest.php
+++ b/lib/symfony/yaml/Tests/Command/LintCommandTest.php
@@ -48,7 +48,7 @@ bar';
$ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
$this->assertEquals(1, $ret, 'Returns 1 in case of error');
- $this->assertContains('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
+ $this->assertStringContainsString('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
}
public function testConstantAsKey()
@@ -78,16 +78,14 @@ YAML;
$this->assertSame(1, $ret, 'lint:yaml exits with code 1 in case of error');
}
- /**
- * @expectedException \RuntimeException
- */
public function testLintFileNotReadable()
{
+ $this->expectException('RuntimeException');
$tester = $this->createCommandTester();
$filename = $this->createFile('');
unlink($filename);
- $ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
+ $tester->execute(['filename' => $filename], ['decorated' => false]);
}
/**
diff --git a/lib/symfony/yaml/Tests/DumperTest.php b/lib/symfony/yaml/Tests/DumperTest.php
index 1a9cac6f7..1a1ef25a5 100644
--- a/lib/symfony/yaml/Tests/DumperTest.php
+++ b/lib/symfony/yaml/Tests/DumperTest.php
@@ -231,20 +231,18 @@ EOF;
$this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\DumpException
- */
public function testObjectSupportDisabledWithExceptions()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
$this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
}
/**
* @group legacy
- * @expectedException \Symfony\Component\Yaml\Exception\DumpException
*/
public function testObjectSupportDisabledWithExceptionsPassingTrue()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
$this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, true);
}
@@ -527,6 +525,34 @@ YAML;
$this->assertSame($expected, $yaml);
}
+ public function testDumpingNotInlinedScalarTaggedValue()
+ {
+ $data = [
+ 'user1' => new TaggedValue('user', 'jane'),
+ 'user2' => new TaggedValue('user', 'john'),
+ ];
+ $expected = <<
+
+
More Information
----------------
diff --git a/lib/twig/twig/composer.json b/lib/twig/twig/composer.json
index 2f104658c..9807aa771 100644
--- a/lib/twig/twig/composer.json
+++ b/lib/twig/twig/composer.json
@@ -24,12 +24,12 @@
}
],
"require": {
- "php": ">=5.4.0",
+ "php": ">=5.5.0",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0",
- "symfony/debug": "^2.7",
+ "symfony/phpunit-bridge": "^4.4@dev|^5.0",
+ "symfony/debug": "^3.4|^4.2",
"psr/container": "^1.0"
},
"autoload": {
@@ -40,6 +40,11 @@
"Twig\\" : "src/"
}
},
+ "autoload-dev": {
+ "psr-4" : {
+ "Twig\\Tests\\" : "tests"
+ }
+ },
"extra": {
"branch-alias": {
"dev-master": "1.42-dev"
diff --git a/lib/twig/twig/ext/twig/php_twig.h b/lib/twig/twig/ext/twig/php_twig.h
index 0fdc539a9..6cc47b689 100644
--- a/lib/twig/twig/ext/twig/php_twig.h
+++ b/lib/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H
#define PHP_TWIG_H
-#define PHP_TWIG_VERSION "1.42.2"
+#define PHP_TWIG_VERSION "1.42.4"
#include "php.h"
diff --git a/lib/twig/twig/phpunit.xml.dist b/lib/twig/twig/phpunit.xml.dist
deleted file mode 100644
index c35257f5d..000000000
--- a/lib/twig/twig/phpunit.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- |