8000 minor #25908 Improve assertions (carusogabriel) · symfony/symfony@b99ca76 · GitHub
[go: up one dir, main page]
Skip to content

Commit b99ca76

Browse files
fabpotfabpot
committed
minor #25908 Improve assertions (carusogabriel)
This PR was merged into the 2.8 branch. Discussion ---------- Improve assertions | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Following #25420 in `2.8` branch. Commits ------- 4683f6d Improve assertions
2 parents 6f2a31b + 4683f6d commit b99ca76

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ public function testCsrfAliases()
8484
$processor = new Processor();
8585
$configuration = new MainConfiguration(array(), array());
8686
$processedConfig = $processor->processConfiguration($configuration, array($config));
87-
$this->assertTrue(isset($processedConfig['firewalls']['stub']['logout']['csrf_token_generator']));
87+
$this->assertArrayHasKey('csrf_token_generator', $processedConfig['firewalls']['stub']['logout']);
8888
$this->assertEquals('a_token_generator', $processedConfig['firewalls']['stub']['logout']['csrf_token_generator']);
89-
$this->assertTrue(isset($processedConfig['firewalls']['stub']['logout']['csrf_token_id']));
89+
$this->assertArrayHasKey('csrf_token_id', $processedConfig['firewalls']['stub']['logout']);
9090
$this->assertEquals('a_token_id', $processedConfig['firewalls']['stub']['logout']['csrf_token_id']);
9191
}
9292

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,23 +280,23 @@ public function testDeepDefinitionsResolving()
280280
$this->process($container);
281281

282282
$configurator = $container->getDefinition('sibling')->getConfigurator();
283-
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($configurator));
283+
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $configurator);
284284
$this->assertSame('parentClass', $configurator->getClass());
285285

286286
$factory = $container->getDefinition('sibling')->getFactory();
287-
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($factory[0]));
287+
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $factory[0]);
288288
$this->assertSame('parentClass', $factory[0]->getClass());
289289

290290
$argument = $container->getDefinition('sibling')->getArgument(0);
291-
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($argument));
291+
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $argument);
292292
$this->assertSame('parentClass', $argument->getClass());
293293

294294
$properties = $container->getDefinition('sibling')->getProperties();
295-
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($properties['prop']));
295+
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $properties['prop']);
296296
$this->assertSame('parentClass', $properties['prop']->getClass());
297297

298298
$methodCalls = $container->getDefinition('sibling')->getMethodCalls();
299-
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($methodCalls[0][1][0]));
299+
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $methodCalls[0][1][0]);
300300
$this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
301301
}
302302

0 commit comments

Comments
 (0)
0