diff --git a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
index 89ac999f20..1c9c82bc12 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
@@ -25,5 +25,7 @@ class DbalSessionHandlerTest extends TestCase
{
$connection = $this->getMockBuilder('Doctrine\DBAL\Connection')->disableOriginalConstructor()->getMock();
$handler = new DbalSessionHandler($connection);
+
+ $this->assertInstanceOf('Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler', $handler);
}
}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index 34058749bc..9967299744 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -89,7 +89,10 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
;
$this->renderer->setTheme($view, array('page_dynamic_extends.html.twig'));
- $this->renderer->searchAndRenderBlock($view, 'row');
+ $this->assertMatchesXpath(
+ $this->renderer->searchAndRenderBlock($view, 'row'),
+ '/div/label[text()="child"]'
+ );
}
public function isSelectedChoiceProvider()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
index cf7b627a49..686c655aac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
@@ -30,11 +30,10 @@ class StopwatchHelperTest extends TestCase
public function testProdEnvironment()
{
$helper = new StopwatchHelper(null);
+ $helper->start('foo');
- try {
- $helper->start('foo');
- } catch (\BadMethodCallException $e) {
- $this->fail('Assumed stopwatch is not called when not provided');
- }
+ // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
+ // can be executed without throwing any exceptions
+ $this->addToAssertionCount(1);
}
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php
index c49010bfdc..1f6f51dd33 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php
@@ -19,21 +19,9 @@ class TemplateTest extends TestCase
/**
* @dataProvider getTemplateToPathProvider
*/
- public function testGetPathForTemplatesInABundle($template, $path)
+ public function testGetPathForTemplate($template, $path)
{
- if ($template->get('bundle')) {
- $this->assertEquals($template->getPath(), $path);
- }
- }
-
- /**
- * @dataProvider getTemplateToPathProvider
- */
- public function testGetPathForTemplatesOutOfABundle($template, $path)
- {
- if (!$template->get('bundle')) {
- $this->assertEquals($template->getPath(), $path);
- }
+ $this->assertSame($template->getPath(), $path);
}
public function getTemplateToPathProvider()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 38a086395f..4149191fc5 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -60,7 +60,7 @@
}
#tree-menu .empty {
border: 0;
- mmargin: 0;
+ margin: 0;
padding: 0;
}
#tree-details-container {
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 25efc256dc..25fefc1b4f 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -699,8 +699,12 @@ class ApplicationTest extends TestCase
$input = new ArgvInput(array('cli.php', '-v', 'foo:bar'));
$application->run($input, $output);
+ $this->addToAssertionCount(1);
+
$input = new ArgvInput(array('cli.php', '--verbose', 'foo:bar'));
$application->run($input, $output);
+
+ $this->addToAssertionCount(1);
}
public function testRunReturnsIntegerExitCode()
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
index 2a4b189f84..89b8efffb6 100644
--- a/src/Symfony/Component/Console/Tests/Helper/TableTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -34,7 +34,7 @@ class TableTest extends TestCase
}
/**
- * @dataProvider testRenderProvider
+ * @dataProvider renderProvider
*/
public function testRender($headers, $rows, $style, $expected, $decorated = false)
{
@@ -50,7 +50,7 @@ class TableTest extends TestCase
}
/**
- * @dataProvider testRenderProvider
+ * @dataProvider renderProvider
*/
public function testRenderAddRows($headers, $rows, $style, $expected, $decorated = false)
{
@@ -66,7 +66,7 @@ class TableTest extends TestCase
}
/**
- * @dataProvider testRenderProvider
+ * @dataProvider renderProvider
*/
public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected, $decorated = false)
{
@@ -83,7 +83,7 @@ class TableTest extends TestCase
$this->assertEquals($expected, $this->getOutputContent($output));
}
- public function testRenderProvider()
+ public function renderProvider()
{
$books = array(
array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index c4520e872d..cd9bcbba10 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -385,7 +385,7 @@ class YamlFileLoader extends FileLoader
}
if (!file_exists($file)) {
- throw new InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
+ throw new InvalidArgumentException(sprintf('The file "%s" does not exist.', $file));
}
if (null === $this->yamlParser) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
index d894f7ab6f..220348f4fe 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -114,6 +114,8 @@ class CheckCircularReferencesPassTest extends TestCase
$container->register('b')->addMethodCall('setA', array(new Reference('a')));
$this->process($container);
+
+ $this->addToAssertionCount(1);
}
protected function process(ContainerBuilder $container)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
index c5f236668c..585bb35766 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -48,6 +48,8 @@ class CheckDefinitionValidityPassTest extends TestCase
$container->register('d', 'class')->setSynthetic(true);
$this->process($container);
+
+ $this->addToAssertionCount(1);
}
public function testValidTags()
@@ -59,6 +61,8 @@ class CheckDefinitionValidityPassTest extends TestCase
$container->register('d', 'class')->addTag('foo', array('bar' => 1.1));
$this->process($container);
+
+ $this->addToAssertionCount(1);
}
/**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
index c5f4ec7f95..65a782a4a8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -28,6 +28,10 @@ class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
->addArgument(new Reference('b'))
;
$container->register('b', '\stdClass');
+
+ $this->process($container);
+
+ $this->addToAssertionCount(1);
}
/**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php
index 5d5204ba5c..231520cd70 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php
@@ -38,6 +38,8 @@ class CheckReferenceValidityPassTest extends TestCase
$container->register('b');
$this->process($container);
+
+ $this->addToAssertionCount(1);
}
protected function process(ContainerBuilder $container)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index b56911e0af..c63d5ec183 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -351,6 +351,8 @@ class PhpDumperTest extends TestCase
$dumper = new PhpDumper($container);
$dumper->dump();
+
+ $this->addToAssertionCount(1);
}
public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServices()
@@ -388,6 +390,8 @@ class PhpDumperTest extends TestCase
$dumper->setProxyDumper(new DummyProxyDumper());
$dumper->dump();
+
+ $this->addToAssertionCount(1);
}
public function testDumpContainerBuilderWithFrozenConstructorIncludingPrivateServices()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 924f2d99dd..39c85b3e5d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -141,6 +141,8 @@ class XmlDumperTest extends TestCase
$container->compile();
$dumper = new XmlDumper($container);
$dumper->dump();
+
+ $this->addToAssertionCount(1);
}
public function provideCompiledContainerData()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 1cd561a99e..4c5518e5ec 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -33,40 +33,33 @@ class YamlFileLoaderTest extends TestCase
require_once self::$fixturesPath.'/includes/ProjectExtension.php';
}
- public function testLoadFile()
+ /**
+ * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+ * @expectedExceptionMessageRegExp /The file ".+" does not exist./
+ */
+ public function testLoadUnExistFile()
{
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
$r = new \ReflectionObject($loader);
$m = $r->getMethod('loadFile');
$m->setAccessible(true);
- try {
- $m->invoke($loader, 'foo.yml');
- $this->fail('->load() throws an InvalidArgumentException if the loaded file does not exist');
- } catch (\Exception $e) {
- $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file does not exist');
- $this->assertEquals('The service file "foo.yml" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file does not exist');
- }
+ $m->invoke($loader, 'foo.yml');
+ }
- try {
- $m->invoke($loader, 'parameters.ini');
- $this->fail('->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
- } catch (\Exception $e) {
- $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
- $this->assertEquals('The service file "parameters.ini" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
- }
+ /**
+ * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+ * @expectedExceptionMessageRegExp /The file ".+" does not contain valid YAML./
+ */
+ public function testLoadInvalidYamlFile()
+ {
+ $path = self::$fixturesPath.'/ini';
+ $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator($path));
+ $r = new \ReflectionObject($loader);
+ $m = $r->getMethod('loadFile');
+ $m->setAccessible(true);
- $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
-
- foreach (array('nonvalid1', 'nonvalid2') as $fixture) {
- try {
- $m->invoke($loader, $fixture.'.yml');
- $this->fail('->load() throws an InvalidArgumentException if the loaded file does not validate');
- } catch (\Exception $e) {
- $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file does not validate');
- $this->assertStringMatchesFormat('The service file "nonvalid%d.yml" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file does not validate');
- }
- }
+ $m->invoke($loader, $path.'/parameters.ini');
}
/**
@@ -90,6 +83,8 @@ class YamlFileLoaderTest extends TestCase
array('bad_service'),
array('bad_calls'),
array('bad_format'),
+ array('nonvalid1'),
+ array('nonvalid2'),
);
}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index 8af193a1cb..49a2f39507 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -174,14 +174,20 @@ class TraceableEventDispatcherTest extends TestCase
{
$dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
$loop = 1;
+ $dispatchedEvents = 0;
$dispatcher->addListener('foo', $listener1 = function () use ($dispatcher, &$loop) {
++$loop;
if (2 == $loop) {
$dispatcher->dispatch('foo');
}
});
+ $dispatcher->addListener('foo', function () use (&$dispatchedEvents) {
+ ++$dispatchedEvents;
+ });
$dispatcher->dispatch('foo');
+
+ $this->assertSame(2, $dispatchedEvents);
}
public function testDispatchReusedEventNested()
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 5c9a7b39b8..1fe98e6d2d 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -442,14 +442,22 @@ class FilesystemTest extends FilesystemTestCase
$this->assertFilePermissions(400, $file);
}
- public function testChmodWrongMod()
+ public function testChmodWithWrongModLeavesPreviousPermissionsUntouched()
{
$this->markAsSkippedIfChmodIsMissing();
+ if (defined('HHVM_VERSION')) {
+ $this->markTestSkipped('chmod() changes permissions even when passing invalid modes on HHVM');
+ }
+
$dir = $this->workspace.DIRECTORY_SEPARATOR.'file';
touch($dir);
+ $permissions = fileperms($dir);
+
$this->filesystem->chmod($dir, 'Wrongmode');
+
+ $this->assertSame($permissions, fileperms($dir));
}
public function testChmodRecursive()
@@ -536,7 +544,10 @@ class FilesystemTest extends FilesystemTestCase
$dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
mkdir($dir);
- $this->filesystem->chown($dir, $this->getFileOwner($dir));
+ $owner = $this->getFileOwner($dir);
+ $this->filesystem->chown($dir, $owner);
+
+ $this->assertSame($owner, $this->getFileOwner($dir));
}
public function testChownRecursive()
@@ -548,7 +559,10 @@ class FilesystemTest extends FilesystemTestCase
$file = $dir.DIRECTORY_SEPARATOR.'file';
touch($file);
- $this->filesystem->chown($dir, $this->getFileOwner($dir), true);
+ $owner = $this->getFileOwner($dir);
+ $this->filesystem->chown($dir, $owner, true);
+
+ $this->assertSame($owner, $this->getFileOwner($file));
}
public function testChownSymlink()
@@ -562,7 +576,10 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->symlink($file, $link);
- $this->filesystem->chown($link, $this->getFileOwner($link));
+ $owner = $this->getFileOwner($link);
+ $this->filesystem->chown($link, $owner);
+
+ $this->assertSame($owner, $this->getFileOwner($link));
}
public function testChownLink()
@@ -633,7 +650,10 @@ class FilesystemTest extends FilesystemTestCase
$dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
mkdir($dir);
- $this->filesystem->chgrp($dir, $this->getFileGroup($dir));
+ $group = $this->getFileGroup($dir);
+ $this->filesystem->chgrp($dir, $group);
+
+ $this->assertSame($group, $this->getFileGroup($dir));
}
public function testChgrpRecursive()
@@ -645,7 +665,10 @@ class FilesystemTest extends FilesystemTestCase
$file = $dir.DIRECTORY_SEPARATOR.'file';
touch($file);
- $this->filesystem->chgrp($dir, $this->getFileGroup($dir), true);
+ $group = $this->getFileGroup($dir);
+ $this->filesystem->chgrp($dir, $group, true);
+
+ $this->assertSame($group, $this->getFileGroup($file));
}
public function testChgrpSymlink()
@@ -659,7 +682,10 @@ class FilesystemTest extends FilesystemTestCase
$this->filesystem->symlink($file, $link);
- $this->filesystem->chgrp($link, $this->getFileGroup($link));
+ $group = $this->getFileGroup($link);
+ $this->filesystem->chgrp($link, $group);
+
+ $this->assertSame($group, $this->getFileGroup($link));
}
public function testChgrpLink()
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 810a0f7fae..55d1d74620 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -83,6 +83,8 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
// strip away and
substr($dom->saveHTML(), 6, -8)
));
+ } else {
+ $this->addToAssertionCount(1);
}
}
diff --git a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
index 052821c39d..ba19a6215a 100644
--- a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
@@ -25,6 +25,8 @@ class TranslationFilesTest extends TestCase
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
+
+ $this->addToAssertionCount(1);
}
public function provideTranslationFiles()
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index f5574614b8..c4d961e68f 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -325,10 +325,13 @@ class Store implements StoreInterface
*/
public function purge($url)
{
- $http = preg_replace('#^https#', 'http', $url);
- $https = preg_replace('#^http#', 'https', $url);
+ $http = preg_replace('#^https:#', 'http:', $url);
+ $https = preg_replace('#^http:#', 'https:', $url);
- return $this->doPurge($http) || $this->doPurge($https);
+ $purgedHttp = $this->doPurge($http);
+ $purgedHttps = $this->doPurge($https);
+
+ return $purgedHttp || $purgedHttps;
}
/**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index 4864cfb748..4a665adadc 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -25,6 +25,18 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
class InlineFragmentRendererTest extends TestCase
{
+ private $originalTrustedHeaderName;
+
+ protected function setUp()
+ {
+ $this->originalTrustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP);
+ }
+
+ protected function tearDown()
+ {
+ Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, $this->originalTrustedHeaderName);
+ }
+
public function testRender()
{
$strategy = new InlineFragmentRenderer($this->getKernel($this->returnValue(new Response('foo'))));
@@ -50,7 +62,7 @@ class InlineFragmentRendererTest extends TestCase
$strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($subRequest));
- $strategy->render(new ControllerReference('main_controller', array('object' => $object), array()), Request::create('/'));
+ $this->assertSame('foo', $strategy->render(new ControllerReference('main_controller', array('object' => $object), array()), Request::create('/'))->getContent());
}
/**
@@ -97,14 +109,10 @@ class InlineFragmentRendererTest extends TestCase
public function testRenderWithTrustedHeaderDisabled()
{
- $trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP);
-
Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, '');
$strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest(Request::create('/')));
- $strategy->render('/', Request::create('/'));
-
- Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, $trustedHeaderName);
+ $this->assertSame('foo', $strategy->render('/', Request::create('/'))->getContent());
}
/**
@@ -152,22 +160,6 @@ class InlineFragmentRendererTest extends TestCase
return $kernel;
}
- /**
- * Creates a Kernel expecting a request equals to $request
- * Allows delta in comparison in case REQUEST_TIME changed by 1 second.
- */
- private function getKernelExpectingRequest(Request $request)
- {
- $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
- $kernel
- ->expects($this->any())
- ->method('handle')
- ->with($this->equalTo($request, 1))
- ;
-
- return $kernel;
- }
-
public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
{
$controllerResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
@@ -240,6 +232,22 @@ class InlineFragmentRendererTest extends TestCase
$request = Request::create('/', 'GET', array(), array(), array(), array('HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*'));
$strategy->render('/', $request);
}
+
+ /**
+ * Creates a Kernel expecting a request equals to $request
+ * Allows delta in comparison in case REQUEST_TIME changed by 1 second.
+ */
+ private function getKernelExpectingRequest(Request $request, $strict = false)
+ {
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+ $kernel
+ ->expects($this->once())
+ ->method('handle')
+ ->with($this->equalTo($request, 1))
+ ->willReturn(new Response('foo'));
+
+ return $kernel;
+ }
}
class Bar
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
index 8b9e52b03e..cef019167a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
@@ -236,6 +236,33 @@ class StoreTest extends TestCase
$this->assertFalse($this->store->isLocked($req));
}
+ public function testPurgeHttps()
+ {
+ $request = Request::create('https://example.com/foo');
+ $this->store->write($request, new Response('foo'));
+
+ $this->assertNotEmpty($this->getStoreMetadata($request));
+
+ $this->assertTrue($this->store->purge('https://example.com/foo'));
+ $this->assertEmpty($this->getStoreMetadata($request));
+ }
+
+ public function testPurgeHttpAndHttps()
+ {
+ $requestHttp = Request::create('https://example.com/foo');
+ $this->store->write($requestHttp, new Response('foo'));
+
+ $requestHttps = Request::create('http://example.com/foo');
+ $this->store->write($requestHttps, new Response('foo'));
+
+ $this->assertNotEmpty($this->getStoreMetadata($requestHttp));
+ $this->assertNotEmpty($this->getStoreMetadata($requestHttps));
+
+ $this->assertTrue($this->store->purge('http://example.com/foo'));
+ $this->assertEmpty($this->getStoreMetadata($requestHttp));
+ $this->assertEmpty($this->getStoreMetadata($requestHttps));
+ }
+
protected function storeSimpleEntry($path = null, $headers = array())
{
if (null === $path) {
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index da223bd205..d09dece33c 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -1102,7 +1102,7 @@ class OptionsResolverTest extends TestCase
$this->resolver->resolve();
}
- public function testCatchedExceptionFromNormalizerDoesNotCrashOptionResolver()
+ public function testCaughtExceptionFromNormalizerDoesNotCrashOptionResolver()
{
$throw = true;
@@ -1116,7 +1116,7 @@ class OptionsResolverTest extends TestCase
}
});
- $this->resolver->setNormalizer('thrower', function (Options $options) use (&$throw) {
+ $this->resolver->setNormalizer('thrower', function () use (&$throw) {
if ($throw) {
$throw = false;
throw new \UnexpectedValueException('throwing');
@@ -1125,10 +1125,10 @@ class OptionsResolverTest extends TestCase
return true;
});
- $this->resolver->resolve();
+ $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
}
- public function testCatchedExceptionFromLazyDoesNotCrashOptionResolver()
+ public function testCaughtExceptionFromLazyDoesNotCrashOptionResolver()
{
$throw = true;
@@ -1149,7 +1149,7 @@ class OptionsResolverTest extends TestCase
return true;
});
- $this->resolver->resolve();
+ $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
}
public function testInvokeEachNormalizerOnlyOnce()
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
index 5e3a06a4b4..6c5c6b22a2 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
@@ -87,7 +87,9 @@ class PropertyPathTest extends TestCase
public function testZeroIsValidPropertyPath()
{
- new PropertyPath('0');
+ $propertyPath = new PropertyPath('0');
+
+ $this->assertSame('0', (string) $propertyPath);
}
public function testGetParentWithDot()
diff --git a/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
index 6588c32fdf..96a1307ed0 100644
--- a/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
@@ -25,6 +25,8 @@ class TranslationFilesTest extends TestCase
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
+
+ $this->addToAssertionCount(1);
}
public function provideTranslationFiles()
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index c22105b97e..a462b5818b 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -319,6 +319,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
$this->logger->debug('Did not send remember-me cookie.', array('parameter' => $this->options['remember_me_parameter']));
}
- return $parameter === 'true' || $parameter === 'on' || $parameter === '1' || $parameter === 'yes';
+ return $parameter === 'true' || $parameter === 'on' || $parameter === '1' || $parameter === 'yes' || $parameter === true;
}
}
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
index c480435b02..886743c1d3 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -251,6 +251,7 @@ class AbstractRememberMeServicesTest extends TestCase
array('1'),
array('on'),
array('yes'),
+ array(true),
);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 4e83f3464f..751afe2bd3 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -17,7 +17,6 @@ use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
use Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy;
use Symfony\Component\Serializer\Encoder\XmlEncoder;
use Symfony\Component\Serializer\Serializer;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -435,23 +434,12 @@ XML;
$this->encoder->decode('', 'xml');
}
+ /**
+ * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+ */
public function testPreventsComplexExternalEntities()
{
- $oldCwd = getcwd();
- chdir(__DIR__);
-
- try {
- $this->encoder->decode(']>&test;', 'xml');
- chdir($oldCwd);
-
- $this->fail('No exception was thrown.');
- } catch (\Exception $e) {
- chdir($oldCwd);
-
- if (!$e instanceof UnexpectedValueException) {
- $this->fail('Expected UnexpectedValueException');
- }
- }
+ $this->encoder->decode(']>&test;', 'xml');
}
public function testDecodeEmptyXml()
diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
index 8e499fd6ed..8a6723ea9c 100644
--- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
+++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
@@ -65,7 +65,6 @@ class PluralizationRulesTest extends TestCase
array('2', array('nl', 'fr', 'en', 'de', 'de_GE', 'hy', 'hy_AM')),
array('3', array('be', 'bs', 'cs', 'hr')),
array('4', array('cy', 'mt', 'sl')),
- array('5', array()),
array('6', array('ar')),
);
}
@@ -86,7 +85,6 @@ class PluralizationRulesTest extends TestCase
array('3', array('cbs')),
array('4', array('gd', 'kw')),
array('5', array('ga')),
- array('6', array()),
);
}
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 25db5752c0..2394fdb432 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -156,6 +156,7 @@ class TranslatorTest extends TestCase
$translator = new Translator($locale, new MessageSelector());
$translator->setFallbackLocales(array('fr', $locale));
// no assertion. this method just asserts that no exception is thrown
+ $this->addToAssertionCount(1);
}
public function testTransWithFallbackLocale()
@@ -187,6 +188,7 @@ class TranslatorTest extends TestCase
$translator = new Translator('fr', new MessageSelector());
$translator->addResource('array', array('foo' => 'foofoo'), $locale);
// no assertion. this method just asserts that no exception is thrown
+ $this->addToAssertionCount(1);
}
public function testAddResourceAfterTrans()
@@ -390,6 +392,7 @@ class TranslatorTest extends TestCase
$translator->transChoice('foo', 1, array(), '', $locale);
// no assertion. this method just asserts that no exception is thrown
+ $this->addToAssertionCount(1);
}
public function getTransFileTests()
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintTest.php b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
index 1b12196644..a05741490f 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -115,7 +115,9 @@ class ConstraintTest extends TestCase
public function testRequiredOptionsPassed()
{
- new ConstraintC(array('option1' => 'default'));
+ $constraint = new ConstraintC(array('option1' => 'default'));
+
+ $this->assertSame('default', $constraint->option1);
}
public function testGroupsAreConvertedToArray()
@@ -140,7 +142,9 @@ class ConstraintTest extends TestCase
public function testCanCreateConstraintWithNoDefaultOptionAndEmptyArray()
{
- new ConstraintB(array());
+ $constraint = new ConstraintB(array());
+
+ $this->assertSame(array(Constraint::PROPERTY_CONSTRAINT, Constraint::CLASS_CONSTRAINT), $constraint->getTargets());
}
public function testGetTargetsCanBeString()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
index 200c69071f..cb1b5c7b01 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
@@ -211,7 +211,9 @@ class CallbackValidatorTest extends ConstraintValidatorTestCase
// Should succeed. Needed when defining constraints as annotations.
public function testNoConstructorArguments()
{
- new Callback();
+ $constraint = new Callback();
+
+ $this->assertSame(array(Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT), $constraint->getTargets());
}
public function testAnnotationInvocationSingleValued()
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index 8ca3c9fbcb..9a23e8cf35 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -245,19 +245,23 @@ class ClassMetadataTest extends TestCase
public function testGroupSequencesWorkIfContainingDefaultGroup()
{
$this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup()));
+
+ $this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $this->metadata->getGroupSequence());
}
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
+ */
public function testGroupSequencesFailIfNotContainingDefaultGroup()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
-
$this->metadata->setGroupSequence(array('Foo', 'Bar'));
}
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
+ */
public function testGroupSequencesFailIfContainingDefault()
{
- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
-
$this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));
}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index 1ebce65cc2..b5d1a9dc84 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -167,7 +167,11 @@ class LazyLoadingMetadataFactoryTest extends TestCase
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
$metadata->addConstraint(new Callback(function () {}));
+ $this->assertCount(3, $metadata->getConstraints());
+
$metadata = $factory->getMetadataFor(self::CLASS_NAME);
+
+ $this->assertCount(6, $metadata->getConstraints());
}
public function testGroupsFromParent()
diff --git a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
index d333513527..96311cfeff 100644
--- a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
@@ -25,6 +25,8 @@ class TranslationFilesTest extends TestCase
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
+
+ $this->addToAssertionCount(1);
}
public function provideTranslationFiles()