minor #20228 PHP CS Fixer: use php_unit_dedicate_assert (keradus)

fabpot · fabpot · commit bee50d4ba7c8 · 2016-10-16T13:31:14.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- PHP CS Fixer: use php_unit_dedicate_assert | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | see CIs | Fixed tickets | n/a | License | MIT | Doc PR | n/a appendix for #19121 Commits ------- b0df3a7 PHP CS Fixer: use php_unit_dedicate_assert
diff --git a/.php_cs b/.php_cs
@@ -6,6 +6,7 @@ return Symfony\CS\Config\Config::create()
     ->fixers(array(
         'long_array_syntax',
         'php_unit_construct',
+        'php_unit_dedicate_assert',
     ))
     ->finder(
         Symfony\CS\Finder\DefaultFinder::create()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php
@@ -30,7 +30,7 @@ public function testProfilerIsDisabled($insulate)
         $client->enableProfiler();
         $crawler = $client->request('GET', '/profiler');
         $profile = $client->getProfile();
-        $this->assertTrue(is_object($profile));
+        $this->assertInternalType('object', $profile);
 
         $client->request('GET', '/profiler');
         $this->assertFalse($client->getProfile());
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
@@ -28,7 +28,7 @@ public function testCacheIsProperlyWarmedWhenTemplatingIsAvailable()
         $warmer->enableOptionalWarmers();
         $warmer->warmUp($kernel->getCacheDir());
 
-        $this->assertTrue(file_exists($kernel->getCacheDir().'/twig'));
+        $this->assertFileExists($kernel->getCacheDir().'/twig');
     }
 
     public function testCacheIsNotWarmedWhenTemplatingIsDisabled()
@@ -40,7 +40,7 @@ public function testCacheIsNotWarmedWhenTemplatingIsDisabled()
         $warmer->enableOptionalWarmers();
         $warmer->warmUp($kernel->getCacheDir());
 
-        $this->assertFalse(file_exists($kernel->getCacheDir().'/twig'));
+        $this->assertFileNotExists($kernel->getCacheDir().'/twig');
     }
 
     protected function setUp()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
@@ -58,7 +58,7 @@ public function testValidationGroupsCanBeSetToCallback()
             'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
         ));
 
-        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
+        $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToClosure()
@@ -67,7 +67,7 @@ public function testValidationGroupsCanBeSetToClosure()
             'validation_groups' => function (FormInterface $form) { },
         ));
 
-        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
+        $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
     }
 
     abstract protected function createForm(array $options = array());
diff --git a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
@@ -275,7 +275,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutExpectedClosureParams(
         });
 
         $resolved = $this->options->resolve();
-        $this->assertTrue(is_callable($resolved['foo']));
+        $this->assertInternalType('callable', $resolved['foo']);
     }
 
     public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()
@@ -287,7 +287,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()
         });
 
         $resolved = $this->options->resolve();
-        $this->assertTrue(is_callable($resolved['foo']));
+        $this->assertInternalType('callable', $resolved['foo']);
     }
 
     public function testRemoveOptionAndNormalizer()
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
@@ -30,7 +30,7 @@ public function testDumpBackupsFileIfExisting()
         $dumper = new ConcreteFileDumper();
         $dumper->dump($catalogue, array('path' => $tempDir));
 
-        $this->assertTrue(file_exists($backupFile));
+        $this->assertFileExists($backupFile);
 
         @unlink($file);
         @unlink($backupFile);
@@ -49,7 +49,7 @@ public function testDumpCreatesNestedDirectoriesAndFile()
         $dumper->setRelativePathTemplate('test/translations/%domain%.%locale%.%extension%');
         $dumper->dump($catalogue, array('path' => $tempDir));
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         @unlink($file);
         @rmdir($translationsDir);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function testCacheIsProperlyWarmedWhenTemplatingIsAvailable()`
`28`	`28`	`$warmer->enableOptionalWarmers();`
`29`	`29`	`$warmer->warmUp($kernel->getCacheDir());`
`30`	`30`
`31`		`- $this->assertTrue(file_exists($kernel->getCacheDir().'/twig'));`
	`31`	`+ $this->assertFileExists($kernel->getCacheDir().'/twig');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testCacheIsNotWarmedWhenTemplatingIsDisabled()`
`@@ -40,7 +40,7 @@ public function testCacheIsNotWarmedWhenTemplatingIsDisabled()`
`40`	`40`	`$warmer->enableOptionalWarmers();`
`41`	`41`	`$warmer->warmUp($kernel->getCacheDir());`
`42`	`42`
`43`		`- $this->assertFalse(file_exists($kernel->getCacheDir().'/twig'));`
	`43`	`+ $this->assertFileNotExists($kernel->getCacheDir().'/twig');`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`protected function setUp()`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testValidationGroupsCanBeSetToCallback()`
`58`	`58`	`'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),`
`59`	`59`	`));`
`60`	`60`
`61`		`- $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));`
	`61`	`+ $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function testValidationGroupsCanBeSetToClosure()`
`@@ -67,7 +67,7 @@ public function testValidationGroupsCanBeSetToClosure()`
`67`	`67`	`'validation_groups' => function (FormInterface $form) { },`
`68`	`68`	`));`
`69`	`69`
`70`		`- $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));`
	`70`	`+ $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`abstract protected function createForm(array $options = array());`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutExpectedClosureParams(`
`275`	`275`	`});`
`276`	`276`
`277`	`277`	`$resolved = $this->options->resolve();`
`278`		`- $this->assertTrue(is_callable($resolved['foo']));`
	`278`	`+ $this->assertInternalType('callable', $resolved['foo']);`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()`
`@@ -287,7 +287,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()`
`287`	`287`	`});`
`288`	`288`
`289`	`289`	`$resolved = $this->options->resolve();`
`290`		`- $this->assertTrue(is_callable($resolved['foo']));`
	`290`	`+ $this->assertInternalType('callable', $resolved['foo']);`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`public function testRemoveOptionAndNormalizer()`