Merge pull request #111 from doctrine/cleanup/move-to-correct-phpunit…

…-assertions Cleanup: move to correct phpunit assertions
doctrine · Dec 30, 2016 · c26cb71 · c26cb71
2 parents 0d9fb6d + 38bff01
commit c26cb71
Show file tree

Hide file tree

Showing 24 changed files with 496 additions and 476 deletions.
diff --git a/lib/Doctrine/Common/Annotations/DocParser.php b/lib/Doctrine/Common/Annotations/DocParser.php
@@ -105,7 +105,7 @@ final class DocParser
     /**
      * An array of default namespaces if operating in simple mode.
      *
-     * @var array
+     * @var string[]
      */
     private $namespaces = array();
 
@@ -286,7 +286,7 @@ public function setIgnoreNotImportedAnnotations($bool)
     /**
      * Sets the default namespaces.
      *
-     * @param array $namespace
+     * @param string $namespace
      *
      * @return void
      *

diff --git a/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
diff --git a/tests/Doctrine/Tests/Common/Annotations/Annotation/TargetTest.php b/tests/Doctrine/Tests/Common/Annotations/Annotation/TargetTest.php
@@ -33,15 +33,15 @@ class TargetTest extends \PHPUnit_Framework_TestCase
      */
     public function testValidMixedTargets()
     {
-        $target = new Target(array("value" => array("ALL")));
-        $this->assertEquals(Target::TARGET_ALL, $target->targets);
+        $target = new Target(array('value' => array('ALL')));
+        self::assertEquals(Target::TARGET_ALL, $target->targets);
 
-        $target = new Target(array("value" => array("METHOD", "METHOD")));
-        $this->assertEquals(Target::TARGET_METHOD, $target->targets);
-        $this->assertNotEquals(Target::TARGET_PROPERTY, $target->targets);
+        $target = new Target(array('value' => array('METHOD', 'METHOD')));
+        self::assertEquals(Target::TARGET_METHOD, $target->targets);
+        self::assertNotEquals(Target::TARGET_PROPERTY, $target->targets);
 
-        $target = new Target(array("value" => array("PROPERTY", "METHOD")));
-        $this->assertEquals(Target::TARGET_METHOD | Target::TARGET_PROPERTY, $target->targets);
+        $target = new Target(array('value' => array('PROPERTY', 'METHOD')));
+        self::assertEquals(Target::TARGET_METHOD | Target::TARGET_PROPERTY, $target->targets);
     }
 }
 
diff --git a/tests/Doctrine/Tests/Common/Annotations/AnnotationReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/AnnotationReaderTest.php
@@ -22,34 +22,34 @@ protected function getReader(DocParser $parser = null)
     public function testMethodAnnotationFromTrait()
     {
         $reader = $this->getReader();
-        $ref = new \ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassUsesTrait');
+        $ref = new \ReflectionClass(Fixtures\ClassUsesTrait::class);
 
         $annotations = $reader->getMethodAnnotations($ref->getMethod('someMethod'));
-        $this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Bar\Autoload', $annotations[0]);
+        self::assertInstanceOf(Bar\Autoload::class, $annotations[0]);
 
         $annotations = $reader->getMethodAnnotations($ref->getMethod('traitMethod'));
-        $this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Fixtures\Annotation\Autoload', $annotations[0]);
+        self::assertInstanceOf(Fixtures\Annotation\Autoload::class, $annotations[0]);
     }
 
     public function testMethodAnnotationFromOverwrittenTrait()
     {
         $reader = $this->getReader();
-        $ref = new \ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassOverwritesTrait');
+        $ref = new \ReflectionClass(Fixtures\ClassOverwritesTrait::class);
 
         $annotations = $reader->getMethodAnnotations($ref->getMethod('traitMethod'));
-        $this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Bar2\Autoload', $annotations[0]);
+        self::assertInstanceOf(Bar2\Autoload::class, $annotations[0]);
     }
 
     public function testPropertyAnnotationFromTrait()
     {
         $reader = $this->getReader();
-        $ref = new \ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassUsesTrait');
+        $ref = new \ReflectionClass(Fixtures\ClassUsesTrait::class);
 
         $annotations = $reader->getPropertyAnnotations($ref->getProperty('aProperty'));
-        $this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Bar\Autoload', $annotations[0]);
+        self::assertInstanceOf(Bar\Autoload::class, $annotations[0]);
 
         $annotations = $reader->getPropertyAnnotations($ref->getProperty('traitProperty'));
-        $this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Fixtures\Annotation\Autoload', $annotations[0]);
+        self::assertInstanceOf(Fixtures\Annotation\Autoload::class, $annotations[0]);
     }
 
     public function testOmitNotRegisteredAnnotation()
@@ -58,10 +58,10 @@ public function testOmitNotRegisteredAnnotation()
         $parser->setIgnoreNotImportedAnnotations(true);
 
         $reader = $this->getReader($parser);
-        $ref = new \ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassWithNotRegisteredAnnotationUsed');
+        $ref = new \ReflectionClass(Fixtures\ClassWithNotRegisteredAnnotationUsed::class);
 
         $annotations = $reader->getMethodAnnotations($ref->getMethod('methodWithNotRegisteredAnnotation'));
-        $this->assertEquals(array(), $annotations);
+        self::assertEquals(array(), $annotations);
     }
 
     /**

diff --git a/tests/Doctrine/Tests/Common/Annotations/AnnotationRegistryTest.php b/tests/Doctrine/Tests/Common/Annotations/AnnotationRegistryTest.php
@@ -6,7 +6,7 @@
 
 class AnnotationRegistryTest extends \PHPUnit_Framework_TestCase
 {
-    protected $class = 'Doctrine\Common\Annotations\AnnotationRegistry';
+    protected $class = AnnotationRegistry::class;
 
     /**
      * @runInSeparateProcess
@@ -18,13 +18,13 @@ public function testReset()
         $this->setStaticField($this->class, 'autoloadNamespaces', $data);
         $this->setStaticField($this->class, 'loaders', $data);
 
-        $this->assertEquals($data, $this->getStaticField($this->class, 'autoloadNamespaces'));
-        $this->assertEquals($data, $this->getStaticField($this->class, 'loaders'));
+        self::assertEquals($data, $this->getStaticField($this->class, 'autoloadNamespaces'));
+        self::assertEquals($data, $this->getStaticField($this->class, 'loaders'));
 
         AnnotationRegistry::reset();
 
-        $this->assertEmpty($this->getStaticField($this->class, 'autoloadNamespaces'));
-        $this->assertEmpty($this->getStaticField($this->class, 'loaders'));
+        self::assertEmpty($this->getStaticField($this->class, 'autoloadNamespaces'));
+        self::assertEmpty($this->getStaticField($this->class, 'loaders'));
     }
 
     /**
@@ -35,7 +35,7 @@ public function testRegisterAutoloadNamespaces()
         $this->setStaticField($this->class, 'autoloadNamespaces', array('foo' => 'bar'));
 
         AnnotationRegistry::registerAutoloadNamespaces(array('test' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar', 'test' => 'bar'), $this->getStaticField($this->class, 'autoloadNamespaces'));
+        self::assertEquals(array('foo' => 'bar', 'test' => 'bar'), $this->getStaticField($this->class, 'autoloadNamespaces'));
     }
 
     /**

diff --git a/tests/Doctrine/Tests/Common/Annotations/CachedReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/CachedReaderTest.php
@@ -6,6 +6,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\Cache;
 
 class CachedReaderTest extends AbstractReaderTest
 {
@@ -16,7 +17,7 @@ public function testIgnoresStaleCache()
         $cache = time() - 10;
         touch(__DIR__.'/Fixtures/Controller.php', $cache + 10);
 
-        $this->doTestCacheStale('Doctrine\Tests\Common\Annotations\Fixtures\Controller', $cache);
+        $this->doTestCacheStale(Fixtures\Controller::class, $cache);
     }
 
     /**
@@ -28,7 +29,7 @@ public function testIgnoresStaleCacheWithParentClass()
         touch(__DIR__.'/Fixtures/ControllerWithParentClass.php', $cache - 10);
         touch(__DIR__.'/Fixtures/AbstractController.php', $cache + 10);
 
-        $this->doTestCacheStale('Doctrine\Tests\Common\Annotations\Fixtures\ControllerWithParentClass', $cache);
+        $this->doTestCacheStale(Fixtures\ControllerWithParentClass::class, $cache);
     }
 
     /**
@@ -40,7 +41,7 @@ public function testIgnoresStaleCacheWithTraits()
         touch(__DIR__.'/Fixtures/ControllerWithTrait.php', $cache - 10);
         touch(__DIR__.'/Fixtures/Traits/SecretRouteTrait.php', $cache + 10);
 
-        $this->doTestCacheStale('Doctrine\Tests\Common\Annotations\Fixtures\ControllerWithTrait', $cache);
+        $this->doTestCacheStale(Fixtures\ControllerWithTrait::class, $cache);
     }
 
     /**
@@ -54,7 +55,7 @@ public function testIgnoresStaleCacheWithTraitsThatUseOtherTraits()
         touch(__DIR__ . '/Fixtures/Traits/EmptyTrait.php', $cache + 10);
 
         $this->doTestCacheStale(
-            'Doctrine\Tests\Common\Annotations\Fixtures\ClassThatUsesTraitThatUsesAnotherTrait',
+            Fixtures\ClassThatUsesTraitThatUsesAnotherTrait::class,
             $cache
         );
     }
@@ -70,7 +71,7 @@ public function testIgnoresStaleCacheWithInterfacesThatExtendOtherInterfaces()
         touch(__DIR__ . '/Fixtures/EmptyInterface.php', $cache + 10);
 
         $this->doTestCacheStale(
-            'Doctrine\Tests\Common\Annotations\Fixtures\InterfaceThatExtendsAnInterface',
+            Fixtures\InterfaceThatExtendsAnInterface::class,
             $cache
         );
     }
@@ -79,7 +80,8 @@ protected function doTestCacheStale($className, $lastCacheModification)
     {
         $cacheKey = $className;
 
-        $cache = $this->createMock('Doctrine\Common\Cache\Cache');
+        /* @var $cache Cache|\PHPUnit_Framework_MockObject_MockObject */
+        $cache = $this->createMock(Cache::class);
         $cache
             ->expects($this->at(0))
             ->method('fetch')
@@ -107,7 +109,7 @@ protected function doTestCacheStale($className, $lastCacheModification)
         $route = new Route();
         $route->pattern = '/someprefix';
 
-        $this->assertEquals(array($route), $reader->getClassAnnotations(new \ReflectionClass($className)));
+        self::assertEquals(array($route), $reader->getClassAnnotations(new \ReflectionClass($className)));
     }
 
     protected function getReader()

diff --git a/tests/Doctrine/Tests/Common/Annotations/DocLexerTest.php b/tests/Doctrine/Tests/Common/Annotations/DocLexerTest.php
@@ -10,25 +10,25 @@ public function testMarkerAnnotation()
     {
         $lexer = new DocLexer;
 
-        $lexer->setInput("@Name");
-        $this->assertNull($lexer->token);
-        $this->assertNull($lexer->lookahead);
+        $lexer->setInput('@Name');
+        self::assertNull($lexer->token);
+        self::assertNull($lexer->lookahead);
 
-        $this->assertTrue($lexer->moveNext());
-        $this->assertNull($lexer->token);
-        $this->assertEquals('@', $lexer->lookahead['value']);
+        self::assertTrue($lexer->moveNext());
+        self::assertNull($lexer->token);
+        self::assertEquals('@', $lexer->lookahead['value']);
 
-        $this->assertTrue($lexer->moveNext());
-        $this->assertEquals('@', $lexer->token['value']);
-        $this->assertEquals('Name', $lexer->lookahead['value']);
+        self::assertTrue($lexer->moveNext());
+        self::assertEquals('@', $lexer->token['value']);
+        self::assertEquals('Name', $lexer->lookahead['value']);
 
-        $this->assertFalse($lexer->moveNext());
+        self::assertFalse($lexer->moveNext());
     }
 
     public function testScannerTokenizesDocBlockWhitConstants()
     {
         $lexer      = new DocLexer();
-        $docblock   = '@AnnotationWithConstants(PHP_EOL, ClassWithConstants::SOME_VALUE, ClassWithConstants::CONSTANT_, ClassWithConstants::CONST_ANT3, \Doctrine\Tests\Common\Annotations\Fixtures\IntefaceWithConstants::SOME_VALUE)';
+        $docblock   = '@AnnotationWithConstants(PHP_EOL, ClassWithConstants::SOME_VALUE, ClassWithConstants::CONSTANT_, ClassWithConstants::CONST_ANT3, \Doctrine\Tests\Common\Annotations\Fixtures\InterfaceWithConstants::SOME_VALUE)';
 
         $tokens = array (
             array(
@@ -87,13 +87,13 @@ public function testScannerTokenizesDocBlockWhitConstants()
                 'type'      => DocLexer::T_COMMA,
             ),
             array(
-                'value'     => '\\Doctrine\\Tests\\Common\\Annotations\\Fixtures\\IntefaceWithConstants::SOME_VALUE',
+                'value'     => '\\Doctrine\\Tests\\Common\\Annotations\\Fixtures\\InterfaceWithConstants::SOME_VALUE',
                 'position'  => 129,
                 'type'      => DocLexer::T_IDENTIFIER,
             ),
             array(
                 'value'     => ')',
-                'position'  => 206,
+                'position'  => 207,
                 'type'      => DocLexer::T_CLOSE_PARENTHESIS,
             )
 
@@ -104,12 +104,12 @@ public function testScannerTokenizesDocBlockWhitConstants()
         foreach ($tokens as $expected) {
             $lexer->moveNext();
             $lookahead = $lexer->lookahead;
-            $this->assertEquals($expected['value'],     $lookahead['value']);
-            $this->assertEquals($expected['type'],      $lookahead['type']);
-            $this->assertEquals($expected['position'],  $lookahead['position']);
+            self::assertEquals($expected['value'],     $lookahead['value']);
+            self::assertEquals($expected['type'],      $lookahead['type']);
+            self::assertEquals($expected['position'],  $lookahead['position']);
         }
 
-        $this->assertFalse($lexer->moveNext());
+        self::assertFalse($lexer->moveNext());
     }
 
 
@@ -146,12 +146,12 @@ public function testScannerTokenizesDocBlockWhitInvalidIdentifier()
         foreach ($tokens as $expected) {
             $lexer->moveNext();
             $lookahead = $lexer->lookahead;
-            $this->assertEquals($expected['value'],     $lookahead['value']);
-            $this->assertEquals($expected['type'],      $lookahead['type']);
-            $this->assertEquals($expected['position'],  $lookahead['position']);
+            self::assertEquals($expected['value'],     $lookahead['value']);
+            self::assertEquals($expected['type'],      $lookahead['type']);
+            self::assertEquals($expected['position'],  $lookahead['position']);
         }
 
-        $this->assertFalse($lexer->moveNext());
+        self::assertFalse($lexer->moveNext());
     }
 
     /**
@@ -163,7 +163,7 @@ public function testWithinDoubleQuotesVeryVeryLongStringWillNotOverflowPregSplit
 
         $lexer->setInput('"' . str_repeat('.', 20240) . '"');
 
-        $this->assertInternalType('array', $lexer->glimpse());
+        self::assertInternalType('array', $lexer->glimpse());
     }
 
     /**
@@ -207,11 +207,11 @@ public function testRecognizesDoubleQuotesEscapeSequence()
         foreach ($tokens as $expected) {
             $lexer->moveNext();
             $lookahead = $lexer->lookahead;
-            $this->assertEquals($expected['value'],    $lookahead['value']);
-            $this->assertEquals($expected['type'],     $lookahead['type']);
-            $this->assertEquals($expected['position'], $lookahead['position']);
+            self::assertEquals($expected['value'],    $lookahead['value']);
+            self::assertEquals($expected['type'],     $lookahead['type']);
+            self::assertEquals($expected['position'], $lookahead['position']);
         }
 
-        $this->assertFalse($lexer->moveNext());
+        self::assertFalse($lexer->moveNext());
     }
 }