Modernized deprecated PHPUnit assertion calls
This commit is contained in:
parent
995d784a0d
commit
ab417f7040
@ -98,7 +98,7 @@
|
||||
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
|
||||
"predis/predis": "~1.0",
|
||||
"egulias/email-validator": "~1.2,>=1.2.8|~2.0",
|
||||
"symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0",
|
||||
"symfony/phpunit-bridge": "^5.2",
|
||||
"symfony/security-acl": "~2.8|~3.0",
|
||||
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
|
||||
},
|
||||
|
@ -42,7 +42,7 @@ class LintCommandTest extends TestCase
|
||||
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
|
||||
|
||||
$this->assertEquals(1, $ret, 'Returns 1 in case of error');
|
||||
$this->assertRegExp('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
|
||||
$this->assertMatchesRegularExpression('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
|
||||
}
|
||||
|
||||
public function testLintFileNotReadable()
|
||||
@ -63,7 +63,7 @@ class LintCommandTest extends TestCase
|
||||
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
|
||||
|
||||
$this->assertEquals(1, $ret, 'Returns 1 in case of error');
|
||||
$this->assertRegExp('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
|
||||
$this->assertMatchesRegularExpression('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -87,6 +87,6 @@ class CacheClearCommandTest extends TestCase
|
||||
}
|
||||
$containerRef = new \ReflectionClass(require $containerFile);
|
||||
$containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());
|
||||
$this->assertRegExp(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
|
||||
$this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
|
||||
}
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ class RouterDebugCommandTest extends TestCase
|
||||
|
||||
$tester->execute([]);
|
||||
|
||||
$this->assertRegExp('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -28,7 +28,7 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester(['foo' => 'foo']);
|
||||
$tester->execute(['locale' => 'en', 'bundle' => 'foo']);
|
||||
|
||||
$this->assertRegExp('/missing/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugUnusedMessages()
|
||||
@ -36,7 +36,7 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester([], ['foo' => 'foo']);
|
||||
$tester->execute(['locale' => 'en', 'bundle' => 'foo']);
|
||||
|
||||
$this->assertRegExp('/unused/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugFallbackMessages()
|
||||
@ -44,7 +44,7 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester([], ['foo' => 'foo']);
|
||||
$tester->execute(['locale' => 'fr', 'bundle' => 'foo']);
|
||||
|
||||
$this->assertRegExp('/fallback/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/fallback/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testNoDefinedMessages()
|
||||
@ -52,7 +52,7 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester();
|
||||
$tester->execute(['locale' => 'fr', 'bundle' => 'test']);
|
||||
|
||||
$this->assertRegExp('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugDefaultDirectory()
|
||||
@ -60,8 +60,8 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
|
||||
$tester->execute(['locale' => 'en']);
|
||||
|
||||
$this->assertRegExp('/missing/', $tester->getDisplay());
|
||||
$this->assertRegExp('/unused/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugDefaultRootDirectory()
|
||||
@ -75,8 +75,8 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
|
||||
$tester->execute(['locale' => 'en']);
|
||||
|
||||
$this->assertRegExp('/missing/', $tester->getDisplay());
|
||||
$this->assertRegExp('/unused/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugCustomDirectory()
|
||||
@ -90,8 +90,8 @@ class TranslationDebugCommandTest extends TestCase
|
||||
$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar'], $kernel);
|
||||
$tester->execute(['locale' => 'en', 'bundle' => $this->translationDir]);
|
||||
|
||||
$this->assertRegExp('/missing/', $tester->getDisplay());
|
||||
$this->assertRegExp('/unused/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDebugInvalidDirectory()
|
||||
|
@ -27,8 +27,8 @@ class TranslationUpdateCommandTest extends TestCase
|
||||
{
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
|
||||
$this->assertRegExp('/foo/', $tester->getDisplay());
|
||||
$this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDumpMessagesAndCleanInRootDirectory()
|
||||
@ -40,32 +40,32 @@ class TranslationUpdateCommandTest extends TestCase
|
||||
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);
|
||||
$this->assertRegExp('/foo/', $tester->getDisplay());
|
||||
$this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDumpTwoMessagesAndClean()
|
||||
{
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'bar' => 'bar']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
|
||||
$this->assertRegExp('/foo/', $tester->getDisplay());
|
||||
$this->assertRegExp('/bar/', $tester->getDisplay());
|
||||
$this->assertRegExp('/2 messages were successfully extracted/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/2 messages were successfully extracted/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testDumpMessagesForSpecificDomain()
|
||||
{
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain']);
|
||||
$this->assertRegExp('/bar/', $tester->getDisplay());
|
||||
$this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testWriteMessages()
|
||||
{
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);
|
||||
$this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testWriteMessagesInRootDirectory()
|
||||
@ -77,14 +77,14 @@ class TranslationUpdateCommandTest extends TestCase
|
||||
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);
|
||||
$this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
}
|
||||
|
||||
public function testWriteMessagesForSpecificDomain()
|
||||
{
|
||||
$tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
|
||||
$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain']);
|
||||
$this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
$this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
|
||||
}
|
||||
|
||||
protected function setUp()
|
||||
|
@ -20,7 +20,7 @@ class IconTest extends TestCase
|
||||
*/
|
||||
public function testIconFileContents($iconFilePath)
|
||||
{
|
||||
$this->assertRegExp('~<svg xmlns="http://www.w3.org/2000/svg" width="\d+" height="\d+" viewBox="0 0 \d+ \d+">.*</svg>~s', file_get_contents($iconFilePath), sprintf('The SVG metadata of the %s icon is different than expected (use the same as the other icons).', $iconFilePath));
|
||||
$this->assertMatchesRegularExpression('~<svg xmlns="http://www.w3.org/2000/svg" width="\d+" height="\d+" viewBox="0 0 \d+ \d+">.*</svg>~s', file_get_contents($iconFilePath), sprintf('The SVG metadata of the %s icon is different than expected (use the same as the other icons).', $iconFilePath));
|
||||
}
|
||||
|
||||
public function provideIconFilePaths()
|
||||
|
@ -81,7 +81,7 @@ class XmlUtilsTest extends TestCase
|
||||
XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']);
|
||||
$this->fail();
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
$this->assertRegExp('/The XML file ".+" is not valid\./', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/The XML file ".+" is not valid\./', $e->getMessage());
|
||||
}
|
||||
|
||||
$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']));
|
||||
|
@ -501,9 +501,9 @@ class ApplicationTest extends TestCase
|
||||
$this->fail('->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertRegExp('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertRegExp('/foo1:bar/', $e->getMessage());
|
||||
$this->assertRegExp('/foo:bar/', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertMatchesRegularExpression('/foo1:bar/', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/foo:bar/', $e->getMessage());
|
||||
}
|
||||
|
||||
// Namespace + plural
|
||||
@ -512,8 +512,8 @@ class ApplicationTest extends TestCase
|
||||
$this->fail('->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertRegExp('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertRegExp('/foo1/', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertMatchesRegularExpression('/foo1/', $e->getMessage());
|
||||
}
|
||||
|
||||
$application->add(new \Foo3Command());
|
||||
@ -525,8 +525,8 @@ class ApplicationTest extends TestCase
|
||||
$this->fail('->find() should throw an Symfony\Component\Console\Exception\CommandNotFoundException if a command is ambiguous because of a subnamespace, with alternatives');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e);
|
||||
$this->assertRegExp('/foo3:bar/', $e->getMessage());
|
||||
$this->assertRegExp('/foo3:bar:toh/', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/foo3:bar/', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/foo3:bar:toh/', $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@ -555,10 +555,10 @@ class ApplicationTest extends TestCase
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist');
|
||||
$this->assertSame(['afoobar1', 'foo:bar1'], $e->getAlternatives());
|
||||
$this->assertRegExp(sprintf('/Command "%s" is not defined./', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertRegExp('/afoobar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "afoobar1"');
|
||||
$this->assertRegExp('/foo:bar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "foo:bar1"');
|
||||
$this->assertNotRegExp('/foo:bar(?!1)/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without "foo:bar" alternative');
|
||||
$this->assertMatchesRegularExpression(sprintf('/Command "%s" is not defined./', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
|
||||
$this->assertMatchesRegularExpression('/afoobar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "afoobar1"');
|
||||
$this->assertMatchesRegularExpression('/foo:bar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "foo:bar1"');
|
||||
$this->assertDoesNotMatchRegularExpression('/foo:bar(?!1)/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without "foo:bar" alternative');
|
||||
}
|
||||
}
|
||||
|
||||
@ -605,10 +605,10 @@ class ApplicationTest extends TestCase
|
||||
$this->assertContains('foo', $e->getAlternatives());
|
||||
$this->assertContains('foo1', $e->getAlternatives());
|
||||
$this->assertContains('foo3', $e->getAlternatives());
|
||||
$this->assertRegExp('/There are no commands defined in the "foo2" namespace./', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative');
|
||||
$this->assertRegExp('/foo/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo"');
|
||||
$this->assertRegExp('/foo1/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo1"');
|
||||
$this->assertRegExp('/foo3/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo3"');
|
||||
$this->assertMatchesRegularExpression('/There are no commands defined in the "foo2" namespace./', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative');
|
||||
$this->assertMatchesRegularExpression('/foo/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo"');
|
||||
$this->assertMatchesRegularExpression('/foo1/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo1"');
|
||||
$this->assertMatchesRegularExpression('/foo3/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo3"');
|
||||
}
|
||||
}
|
||||
|
||||
@ -639,7 +639,7 @@ class ApplicationTest extends TestCase
|
||||
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command is not defined');
|
||||
$this->assertSame($expectedAlternatives, $e->getAlternatives());
|
||||
|
||||
$this->assertRegExp('/Command "foo" is not defined\..*Did you mean one of these\?.*/Ums', $e->getMessage());
|
||||
$this->assertMatchesRegularExpression('/Command "foo" is not defined\..*Did you mean one of these\?.*/Ums', $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@ -721,9 +721,9 @@ class ApplicationTest extends TestCase
|
||||
$this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
|
||||
|
||||
$tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
|
||||
$this->assertRegExp('/\[Exception\]\s*First exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is default and verbosity is verbose');
|
||||
$this->assertRegExp('/\[Exception\]\s*Second exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is 0 and verbosity is verbose');
|
||||
$this->assertRegExp('/\[Exception \(404\)\]\s*Third exception/', $tester->getDisplay(), '->renderException() renders a pretty exception with code exception when code exception is 404 and verbosity is verbose');
|
||||
$this->assertMatchesRegularExpression('/\[Exception\]\s*First exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is default and verbosity is verbose');
|
||||
$this->assertMatchesRegularExpression('/\[Exception\]\s*Second exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is 0 and verbosity is verbose');
|
||||
$this->assertMatchesRegularExpression('/\[Exception \(404\)\]\s*Third exception/', $tester->getDisplay(), '->renderException() renders a pretty exception with code exception when code exception is 404 and verbosity is verbose');
|
||||
|
||||
$tester->run(['command' => 'foo3:bar'], ['decorated' => true]);
|
||||
$this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getDisplay(true), '->renderException() renders a pretty exceptions with previous exceptions');
|
||||
|
@ -23,7 +23,7 @@ class ListCommandTest extends TestCase
|
||||
$commandTester = new CommandTester($command = $application->get('list'));
|
||||
$commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
|
||||
|
||||
$this->assertRegExp('/help\s{2,}Displays help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
|
||||
$this->assertMatchesRegularExpression('/help\s{2,}Displays help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
|
||||
}
|
||||
|
||||
public function testExecuteListsCommandsWithXmlOption()
|
||||
@ -31,7 +31,7 @@ class ListCommandTest extends TestCase
|
||||
$application = new Application();
|
||||
$commandTester = new CommandTester($command = $application->get('list'));
|
||||
$commandTester->execute(['command' => $command->getName(), '--format' => 'xml']);
|
||||
$this->assertRegExp('/<command id="list" name="list" hidden="0">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
|
||||
$this->assertMatchesRegularExpression('/<command id="list" name="list" hidden="0">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
|
||||
}
|
||||
|
||||
public function testExecuteListsCommandsWithRawOption()
|
||||
|
@ -128,10 +128,10 @@ class DebugClassLoaderTest extends TestCase
|
||||
// if an exception is thrown, the test passed
|
||||
$this->assertStringStartsWith(__FILE__, $exception->getFile());
|
||||
if (\PHP_VERSION_ID < 70000) {
|
||||
$this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
|
||||
$this->assertMatchesRegularExpression('/^Runtime Notice: Declaration/', $exception->getMessage());
|
||||
$this->assertEquals(E_STRICT, $exception->getSeverity());
|
||||
} else {
|
||||
$this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
|
||||
$this->assertMatchesRegularExpression('/^Warning: Declaration/', $exception->getMessage());
|
||||
$this->assertEquals(E_WARNING, $exception->getSeverity());
|
||||
}
|
||||
} finally {
|
||||
|
@ -103,10 +103,10 @@ class ErrorHandlerTest extends TestCase
|
||||
// if an exception is thrown, the test passed
|
||||
if (\PHP_VERSION_ID < 80000) {
|
||||
$this->assertEquals(E_NOTICE, $exception->getSeverity());
|
||||
$this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
|
||||
$this->assertMatchesRegularExpression('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
|
||||
} else {
|
||||
$this->assertEquals(E_WARNING, $exception->getSeverity());
|
||||
$this->assertRegExp('/^Warning: Undefined variable \$(foo|bar)/', $exception->getMessage());
|
||||
$this->assertMatchesRegularExpression('/^Warning: Undefined variable \$(foo|bar)/', $exception->getMessage());
|
||||
}
|
||||
$this->assertEquals(__FILE__, $exception->getFile());
|
||||
|
||||
|
@ -65,7 +65,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
|
||||
}
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
|
||||
$this->assertRegExp($translatedMessage, $exception->getMessage());
|
||||
$this->assertMatchesRegularExpression($translatedMessage, $exception->getMessage());
|
||||
$this->assertSame($error['type'], $exception->getSeverity());
|
||||
$this->assertSame($error['file'], $exception->getFile());
|
||||
$this->assertSame($error['line'], $exception->getLine());
|
||||
|
@ -185,7 +185,7 @@ class FileLoaderTest extends TestCase
|
||||
|
||||
$this->assertTrue($container->has(MissingParent::class));
|
||||
|
||||
$this->assertRegExp(
|
||||
$this->assertMatchesRegularExpression(
|
||||
'{Class "?Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Fixtures\\\\Prototype\\\\BadClasses\\\\MissingClass"? not found}',
|
||||
$container->getDefinition(MissingParent::class)->getErrors()[0]
|
||||
);
|
||||
|
@ -68,7 +68,7 @@ class XmlFileLoaderTest extends TestCase
|
||||
$this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'parameters.ini'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
$this->assertMatchesRegularExpression(sprintf('#^Unable to parse file ".+%s": .+.$#', 'parameters.ini'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
|
||||
$e = $e->getPrevious();
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
@ -82,7 +82,7 @@ class XmlFileLoaderTest extends TestCase
|
||||
$this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
|
||||
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'nonvalid.xml'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
$this->assertMatchesRegularExpression(sprintf('#^Unable to parse file ".+%s": .+.$#', 'nonvalid.xml'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
|
||||
|
||||
$e = $e->getPrevious();
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
|
||||
@ -434,7 +434,7 @@ class XmlFileLoaderTest extends TestCase
|
||||
$this->fail('->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services3.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
$this->assertMatchesRegularExpression(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services3.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
|
||||
$e = $e->getPrevious();
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
@ -474,7 +474,7 @@ class XmlFileLoaderTest extends TestCase
|
||||
$this->fail('->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services7.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
$this->assertMatchesRegularExpression(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services7.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
|
||||
$e = $e->getPrevious();
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
|
||||
@ -525,7 +525,7 @@ class XmlFileLoaderTest extends TestCase
|
||||
$this->fail('->load() throws an InvalidArgumentException if the configuration contains a document type');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration contains a document type');
|
||||
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'withdoctype.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration contains a document type');
|
||||
$this->assertMatchesRegularExpression(sprintf('#^Unable to parse file ".+%s": .+.$#', 'withdoctype.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration contains a document type');
|
||||
|
||||
$e = $e->getPrevious();
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration contains a document type');
|
||||
|
@ -566,7 +566,7 @@ class YamlFileLoaderTest extends TestCase
|
||||
$this->assertCount(1, $args);
|
||||
$this->assertInstanceOf(Reference::class, $args[0]);
|
||||
$this->assertTrue($container->has((string) $args[0]));
|
||||
$this->assertRegExp('/^\d+_Bar~[._A-Za-z0-9]{7}$/', (string) $args[0]);
|
||||
$this->assertMatchesRegularExpression('/^\d+_Bar~[._A-Za-z0-9]{7}$/', (string) $args[0]);
|
||||
|
||||
$anonymous = $container->getDefinition((string) $args[0]);
|
||||
$this->assertEquals('Bar', $anonymous->getClass());
|
||||
@ -578,7 +578,7 @@ class YamlFileLoaderTest extends TestCase
|
||||
$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]);
|
||||
$this->assertMatchesRegularExpression('/^\d+_Quz~[._A-Za-z0-9]{7}$/', (string) $factory[0]);
|
||||
$this->assertEquals('constructFoo', $factory[1]);
|
||||
|
||||
$anonymous = $container->getDefinition((string) $factory[0]);
|
||||
|
@ -282,7 +282,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->remove($basePath);
|
||||
|
||||
$this->assertFileNotExists($basePath);
|
||||
$this->assertFileDoesNotExist($basePath);
|
||||
}
|
||||
|
||||
public function testRemoveCleansArrayOfFilesAndDirectories()
|
||||
@ -298,8 +298,8 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->remove($files);
|
||||
|
||||
$this->assertFileNotExists($basePath.'dir');
|
||||
$this->assertFileNotExists($basePath.'file');
|
||||
$this->assertFileDoesNotExist($basePath.'dir');
|
||||
$this->assertFileDoesNotExist($basePath.'file');
|
||||
}
|
||||
|
||||
public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
|
||||
@ -315,8 +315,8 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->remove($files);
|
||||
|
||||
$this->assertFileNotExists($basePath.'dir');
|
||||
$this->assertFileNotExists($basePath.'file');
|
||||
$this->assertFileDoesNotExist($basePath.'dir');
|
||||
$this->assertFileDoesNotExist($basePath.'file');
|
||||
}
|
||||
|
||||
public function testRemoveIgnoresNonExistingFiles()
|
||||
@ -331,7 +331,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->remove($files);
|
||||
|
||||
$this->assertFileNotExists($basePath.'dir');
|
||||
$this->assertFileDoesNotExist($basePath.'dir');
|
||||
}
|
||||
|
||||
public function testRemoveCleansInvalidLinks()
|
||||
@ -355,7 +355,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->remove($basePath);
|
||||
|
||||
$this->assertFileNotExists($basePath);
|
||||
$this->assertFileDoesNotExist($basePath);
|
||||
}
|
||||
|
||||
public function testFilesExists()
|
||||
@ -753,7 +753,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->rename($file, $newPath);
|
||||
|
||||
$this->assertFileNotExists($file);
|
||||
$this->assertFileDoesNotExist($file);
|
||||
$this->assertFileExists($newPath);
|
||||
}
|
||||
|
||||
@ -779,7 +779,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->filesystem->rename($file, $newPath, true);
|
||||
|
||||
$this->assertFileNotExists($file);
|
||||
$this->assertFileDoesNotExist($file);
|
||||
$this->assertFileExists($newPath);
|
||||
}
|
||||
|
||||
@ -1321,7 +1321,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
|
||||
$this->assertDirectoryExists($targetPath);
|
||||
$this->assertFileExists($targetPath.'source');
|
||||
$this->assertFileNotExists($targetPath.'target');
|
||||
$this->assertFileDoesNotExist($targetPath.'target');
|
||||
}
|
||||
|
||||
public function testMirrorFromSubdirectoryInToParentDirectory()
|
||||
@ -1416,7 +1416,7 @@ class FilesystemTest extends FilesystemTestCase
|
||||
$this->assertStringStartsWith($scheme, $filename);
|
||||
|
||||
// The php://temp stream deletes the file after close
|
||||
$this->assertFileNotExists($filename);
|
||||
$this->assertFileDoesNotExist($filename);
|
||||
}
|
||||
|
||||
public function testTempnamWithPharSchemeFails()
|
||||
|
@ -309,7 +309,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
$response->prepare($request);
|
||||
$response->sendContent();
|
||||
|
||||
$this->assertFileNotExists($path);
|
||||
$this->assertFileDoesNotExist($path);
|
||||
}
|
||||
|
||||
public function testAcceptRangeOnUnsafeMethods()
|
||||
|
@ -83,7 +83,7 @@ class FileTest extends TestCase
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
|
||||
|
||||
$this->assertFileExists($targetPath);
|
||||
$this->assertFileNotExists($path);
|
||||
$this->assertFileDoesNotExist($path);
|
||||
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
|
||||
|
||||
@unlink($targetPath);
|
||||
@ -102,7 +102,7 @@ class FileTest extends TestCase
|
||||
$movedFile = $file->move($targetDir, 'test.newname.gif');
|
||||
|
||||
$this->assertFileExists($targetPath);
|
||||
$this->assertFileNotExists($path);
|
||||
$this->assertFileDoesNotExist($path);
|
||||
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
|
||||
|
||||
@unlink($targetPath);
|
||||
@ -137,7 +137,7 @@ class FileTest extends TestCase
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
|
||||
|
||||
$this->assertFileExists($targetPath);
|
||||
$this->assertFileNotExists($path);
|
||||
$this->assertFileDoesNotExist($path);
|
||||
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
|
||||
|
||||
@unlink($targetPath);
|
||||
@ -157,7 +157,7 @@ class FileTest extends TestCase
|
||||
$movedFile = $file->move($targetDir);
|
||||
|
||||
$this->assertFileExists($targetPath);
|
||||
$this->assertFileNotExists($sourcePath);
|
||||
$this->assertFileDoesNotExist($sourcePath);
|
||||
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
|
||||
|
||||
@unlink($sourcePath);
|
||||
|
@ -177,7 +177,7 @@ class UploadedFileTest extends TestCase
|
||||
$movedFile = $file->move(__DIR__.'/Fixtures/directory');
|
||||
|
||||
$this->assertFileExists($targetPath);
|
||||
$this->assertFileNotExists($path);
|
||||
$this->assertFileDoesNotExist($path);
|
||||
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
|
||||
|
||||
@unlink($targetPath);
|
||||
|
@ -20,7 +20,7 @@ class RedirectResponseTest extends TestCase
|
||||
{
|
||||
$response = new RedirectResponse('foo.bar');
|
||||
|
||||
$this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
|
||||
$this->assertMatchesRegularExpression('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
|
||||
}
|
||||
|
||||
public function testRedirectResponseConstructorNullUrl()
|
||||
|
@ -362,6 +362,6 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
private function assertSetCookieHeader($expected, ResponseHeaderBag $actual)
|
||||
{
|
||||
$this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
|
||||
$this->assertMatchesRegularExpression('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
|
||||
}
|
||||
}
|
||||
|
@ -31,8 +31,8 @@ class ConfigDataCollectorTest extends TestCase
|
||||
$this->assertTrue($c->isDebug());
|
||||
$this->assertSame('config', $c->getName());
|
||||
$this->assertSame('testkernel', $c->getAppName());
|
||||
$this->assertRegExp('~^'.preg_quote($c->getPhpVersion(), '~').'~', PHP_VERSION);
|
||||
$this->assertRegExp('~'.preg_quote((string) $c->getPhpVersionExtra(), '~').'$~', PHP_VERSION);
|
||||
$this->assertMatchesRegularExpression('~^'.preg_quote($c->getPhpVersion(), '~').'~', PHP_VERSION);
|
||||
$this->assertMatchesRegularExpression('~'.preg_quote((string) $c->getPhpVersionExtra(), '~').'$~', PHP_VERSION);
|
||||
$this->assertSame(PHP_INT_SIZE * 8, $c->getPhpArchitecture());
|
||||
$this->assertSame(class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a', $c->getPhpIntlLocale());
|
||||
$this->assertSame(date_default_timezone_get(), $c->getPhpTimezone());
|
||||
|
@ -654,7 +654,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('miss');
|
||||
$this->assertTraceContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
$this->cacheConfig['default_ttl'] = 10;
|
||||
$this->request('GET', '/');
|
||||
@ -663,7 +663,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('fresh');
|
||||
$this->assertTraceNotContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
|
||||
}
|
||||
|
||||
public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpired()
|
||||
@ -676,7 +676,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('miss');
|
||||
$this->assertTraceContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
$this->request('GET', '/');
|
||||
$this->assertHttpKernelIsNotCalled();
|
||||
@ -684,7 +684,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('fresh');
|
||||
$this->assertTraceNotContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
// expires the cache
|
||||
$values = $this->getMetaStorageValues();
|
||||
@ -704,7 +704,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('invalid');
|
||||
$this->assertTraceContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
$this->setNextResponse();
|
||||
|
||||
@ -714,7 +714,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('fresh');
|
||||
$this->assertTraceNotContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
}
|
||||
|
||||
public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpiredWithStatus304()
|
||||
@ -727,7 +727,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('miss');
|
||||
$this->assertTraceContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
$this->request('GET', '/');
|
||||
$this->assertHttpKernelIsNotCalled();
|
||||
@ -755,7 +755,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('store');
|
||||
$this->assertTraceNotContains('miss');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
|
||||
$this->request('GET', '/');
|
||||
$this->assertHttpKernelIsNotCalled();
|
||||
@ -763,7 +763,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertTraceContains('fresh');
|
||||
$this->assertTraceNotContains('store');
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
$this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertMatchesRegularExpression('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
|
||||
}
|
||||
|
||||
public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirective()
|
||||
@ -776,7 +776,7 @@ class HttpCacheTest extends HttpCacheTestCase
|
||||
$this->assertEquals(200, $this->response->getStatusCode());
|
||||
$this->assertTraceContains('miss');
|
||||
$this->assertTraceNotContains('store');
|
||||
$this->assertNotRegExp('/s-maxage/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertDoesNotMatchRegularExpression('/s-maxage/', $this->response->headers->get('Cache-Control'));
|
||||
$this->assertEquals('Hello World', $this->response->getContent());
|
||||
}
|
||||
|
||||
|
@ -91,7 +91,7 @@ class HttpCacheTestCase extends TestCase
|
||||
$traces = $this->cache->getTraces();
|
||||
$traces = current($traces);
|
||||
|
||||
$this->assertRegExp('/'.$trace.'/', implode(', ', $traces));
|
||||
$this->assertMatchesRegularExpression('/'.$trace.'/', implode(', ', $traces));
|
||||
}
|
||||
|
||||
public function assertTraceNotContains($trace)
|
||||
@ -99,7 +99,7 @@ class HttpCacheTestCase extends TestCase
|
||||
$traces = $this->cache->getTraces();
|
||||
$traces = current($traces);
|
||||
|
||||
$this->assertNotRegExp('/'.$trace.'/', implode(', ', $traces));
|
||||
$this->assertDoesNotMatchRegularExpression('/'.$trace.'/', implode(', ', $traces));
|
||||
}
|
||||
|
||||
public function assertExceptionsAreCaught()
|
||||
|
@ -78,7 +78,7 @@ class KernelTest extends TestCase
|
||||
$containerDir = __DIR__.'/Fixtures/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
|
||||
$this->assertTrue(unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta'));
|
||||
$this->assertFileExists($containerDir);
|
||||
$this->assertFileNotExists($containerDir.'.legacy');
|
||||
$this->assertFileDoesNotExist($containerDir.'.legacy');
|
||||
|
||||
$kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
|
||||
$kernel->boot();
|
||||
@ -86,8 +86,8 @@ class KernelTest extends TestCase
|
||||
$this->assertFileExists($containerDir);
|
||||
$this->assertFileExists($containerDir.'.legacy');
|
||||
|
||||
$this->assertFileNotExists($legacyContainerDir);
|
||||
$this->assertFileNotExists($legacyContainerDir.'.legacy');
|
||||
$this->assertFileDoesNotExist($legacyContainerDir);
|
||||
$this->assertFileDoesNotExist($legacyContainerDir.'.legacy');
|
||||
}
|
||||
|
||||
public function testBootInitializesBundlesAndContainer()
|
||||
|
@ -54,7 +54,7 @@ class GitRepositoryTest extends TestCase
|
||||
$this->assertDirectoryExists($this->targetDir.'/.git');
|
||||
$this->assertSame($this->targetDir, $git->getPath());
|
||||
$this->assertSame(self::REPO_URL, $git->getUrl());
|
||||
$this->assertRegExp('#^[0-9a-z]{40}$#', $git->getLastCommitHash());
|
||||
$this->assertMatchesRegularExpression('#^[0-9a-z]{40}$#', $git->getLastCommitHash());
|
||||
$this->assertNotEmpty($git->getLastAuthor());
|
||||
$this->assertInstanceOf('DateTime', $git->getLastAuthoredDate());
|
||||
$this->assertStringMatchesFormat('v%s', $git->getLastTag());
|
||||
|
@ -31,7 +31,7 @@ class DigestAuthenticationEntryPointTest extends TestCase
|
||||
$response = $entryPoint->start($request, $authenticationException);
|
||||
|
||||
$this->assertEquals(401, $response->getStatusCode());
|
||||
$this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
|
||||
$this->assertMatchesRegularExpression('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
|
||||
}
|
||||
|
||||
public function testStartWithNoException()
|
||||
@ -42,7 +42,7 @@ class DigestAuthenticationEntryPointTest extends TestCase
|
||||
$response = $entryPoint->start($request);
|
||||
|
||||
$this->assertEquals(401, $response->getStatusCode());
|
||||
$this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
|
||||
$this->assertMatchesRegularExpression('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
|
||||
}
|
||||
|
||||
public function testStartWithNonceExpiredException()
|
||||
@ -55,6 +55,6 @@ class DigestAuthenticationEntryPointTest extends TestCase
|
||||
$response = $entryPoint->start($request, $nonceExpiredException);
|
||||
|
||||
$this->assertEquals(401, $response->getStatusCode());
|
||||
$this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}", stale="true"$/', $response->headers->get('WWW-Authenticate'));
|
||||
$this->assertMatchesRegularExpression('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}", stale="true"$/', $response->headers->get('WWW-Authenticate'));
|
||||
}
|
||||
}
|
||||
|
@ -34,7 +34,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->assertRegExp('/^\/\/ OK in /', trim($tester->getDisplay()));
|
||||
$this->assertMatchesRegularExpression('/^\/\/ OK in /', trim($tester->getDisplay()));
|
||||
}
|
||||
|
||||
public function testLintIncorrectFile()
|
||||
|
Reference in New Issue
Block a user