Use ::class notation instead of strings

Koopzington · Koopzington · commit 1118933b0fe3 · 2017-03-14T23:25:02.000+01:00
diff --git a/test/BarcodeTest.php b/test/BarcodeTest.php
@@ -13,6 +13,7 @@
 use Zend\Validator\Barcode;
 use Zend\Validator\Exception\InvalidArgumentException;
 use Zend\Validator\Barcode\AdapterInterface;
+use Zend\Validator\Barcode\Ean13;
 
 /**
  * \Zend\Barcode
@@ -149,7 +150,7 @@ public function testInvalidAdapter()
     public function testArrayConstructAdapter()
     {
         $barcode = new Barcode(['adapter' => 'Ean13', 'options' => 'unknown', 'useChecksum' => false]);
-        $this->assertInstanceOf('Zend\Validator\Barcode\Ean13', $barcode->getAdapter());
+        $this->assertInstanceOf(Ean13::class, $barcode->getAdapter());
         $this->assertFalse($barcode->useChecksum());
     }
 
diff --git a/test/CallbackTest.php b/test/CallbackTest.php
@@ -33,7 +33,7 @@ public function testBasic()
     public function testStaticCallback()
     {
         $valid = new Callback(
-            ['\ZendTest\Validator\CallbackTest', 'staticCallback']
+            [CallbackTest::class, 'staticCallback']
         );
         $this->assertTrue($valid->isValid('test'));
     }
diff --git a/test/CreditCardTest.php b/test/CreditCardTest.php
@@ -145,7 +145,7 @@ public function testServiceClass($input, $expected)
     {
         $validator = new CreditCard();
         $this->assertEquals(null, $validator->getService());
-        $validator->setService(['ZendTest\Validator\CreditCardTest', 'staticCallback']);
+        $validator->setService([CreditCardTest::class, 'staticCallback']);
         $this->assertEquals($expected, $validator->isValid($input));
     }
 
@@ -170,7 +170,7 @@ public function testConstructionWithOptions($input, $expected)
         $validator = new CreditCard(
             [
                 'type' => CreditCard::VISA,
-                'service' => ['ZendTest\Validator\CreditCardTest', 'staticCallback']
+                'service' => [CreditCardTest::class, 'staticCallback']
             ]
         );
 
@@ -265,7 +265,7 @@ public function testInvalidServiceClass()
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid callback given');
-        $validator->setService(['ZendTest\Validator\CreditCardTest', 'nocallback']);
+        $validator->setService([CreditCardTest::class, 'nocallback']);
     }
 
     /**
@@ -290,12 +290,12 @@ public function testConfigObject()
     public function testOptionalConstructorParameterByConfigObject()
     {
         $config = new Config\Config(
-            ['type' => 'Visa', 'service' => ['ZendTest\Validator\CreditCardTest', 'staticCallback']]
+            ['type' => 'Visa', 'service' => [CreditCardTest::class, 'staticCallback']]
         );
 
         $validator = new CreditCard($config);
         $this->assertEquals(['Visa'], $validator->getType());
-        $this->assertEquals(['ZendTest\Validator\CreditCardTest', 'staticCallback'], $validator->getService());
+        $this->assertEquals([CreditCardTest::class, 'staticCallback'], $validator->getService());
     }
 
     /**
@@ -305,9 +305,9 @@ public function testOptionalConstructorParameterByConfigObject()
      */
     public function testOptionalConstructorParameter()
     {
-        $validator = new CreditCard('Visa', ['ZendTest\Validator\CreditCardTest', 'staticCallback']);
+        $validator = new CreditCard('Visa', [CreditCardTest::class, 'staticCallback']);
         $this->assertEquals(['Visa'], $validator->getType());
-        $this->assertEquals(['ZendTest\Validator\CreditCardTest', 'staticCallback'], $validator->getService());
+        $this->assertEquals([CreditCardTest::class, 'staticCallback'], $validator->getService());
     }
 
     /**
diff --git a/test/CsrfTest.php b/test/CsrfTest.php
@@ -13,6 +13,7 @@
 use Zend\Session\Config\StandardConfig;
 use Zend\Session\Container;
 use Zend\Validator\Csrf;
+use Zend\Session\Storage\ArrayStorage;
 
 /**
  * Zend\Csrf
@@ -32,7 +33,7 @@ public function setUp()
         // Setup session handling
         $_SESSION = [];
         $sessionConfig = new StandardConfig([
-            'storage' => 'Zend\Session\Storage\ArrayStorage',
+            'storage' => ArrayStorage::class,
         ]);
         $sessionManager       = new TestAsset\SessionManager($sessionConfig);
         $this->sessionManager = $sessionManager;
@@ -65,7 +66,7 @@ public function testSaltIsMutable()
     public function testSessionContainerIsLazyLoadedIfNotSet()
     {
         $container = $this->validator->getSession();
-        $this->assertInstanceOf('Zend\Session\Container', $container);
+        $this->assertInstanceOf(Container::class, $container);
     }
 
     public function testSessionContainerIsMutable()
diff --git a/test/Db/RecordExistsTest.php b/test/Db/RecordExistsTest.php
@@ -21,6 +21,8 @@
 use Zend\Db\Adapter\Driver\ResultInterface;
 use Zend\Db\Adapter\Driver\StatementInterface;
 use Zend\Db\Adapter\Driver\DriverInterface;
+use Zend\Db\Sql\Select;
+use Zend\Db\Sql\TableIdentifier;
 
 /**
  * @group      Zend_Validator
@@ -255,7 +257,7 @@ public function testSelectAcknowledgesTableAndSchema()
             'schema' => 'my'
         ], 'field1', null, $this->getMockHasResult());
         $table = $validator->getSelect()->getRawState('table');
-        $this->assertInstanceOf('Zend\Db\Sql\TableIdentifier', $table);
+        $this->assertInstanceOf(TableIdentifier::class, $table);
         $this->assertEquals(['users', 'my'], $table->getTableAndSchema());
     }
 
@@ -287,7 +289,7 @@ public function testGetSelect()
             $this->getMockHasResult()
         );
         $select = $validator->getSelect();
-        $this->assertInstanceOf('Zend\Db\Sql\Select', $select);
+        $this->assertInstanceOf(Select::class, $select);
         $this->assertEquals(
             'SELECT "my"."users"."field1" AS "field1" FROM "my"."users" WHERE "field1" = \'\' AND "foo" != \'bar\'',
             $select->getSqlString(new TrustingSql92Platform())
@@ -319,7 +321,7 @@ public function testGetSelectWithSameValidatorTwice()
             $this->getMockHasResult()
         );
         $select = $validator->getSelect();
-        $this->assertInstanceOf('Zend\Db\Sql\Select', $select);
+        $this->assertInstanceOf(Select::class, $select);
         $this->assertEquals(
             'SELECT "my"."users"."field1" AS "field1" FROM "my"."users" WHERE "field1" = \'\' AND "foo" != \'bar\'',
             $select->getSqlString(new TrustingSql92Platform())
@@ -334,7 +336,7 @@ public function testGetSelectWithSameValidatorTwice()
             'value' => 'fieldvalueexclude',
         ]);
         $select = $validator->getSelect();
-        $this->assertInstanceOf('Zend\Db\Sql\Select', $select);
+        $this->assertInstanceOf(Select::class, $select);
         $this->assertEquals(
             'SELECT "otherschema"."othertable"."fieldother" AS "fieldother" FROM "otherschema"."othertable" '
             . 'WHERE "fieldother" = \'\' AND "fieldexclude" != \'fieldvalueexclude\'',
diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -674,7 +674,7 @@ public function testEmailAddressesWithTrailingDotInHostPartAreRejected()
     public function testNotSetHostnameValidator()
     {
         $hostname = $this->validator->getHostnameValidator();
-        $this->assertInstanceOf('Zend\Validator\Hostname', $hostname);
+        $this->assertInstanceOf(Hostname::class, $hostname);
     }
 
     /**
diff --git a/test/ExplodeTest.php b/test/ExplodeTest.php
@@ -15,6 +15,7 @@
 use Zend\Validator\Callback;
 use Zend\Validator\Exception\RuntimeException;
 use Zend\Validator\ValidatorInterface;
+use Zend\Validator\InArray;
 
 /**
  * @group      Zend_Validator
@@ -123,7 +124,7 @@ public function testSetValidatorAsArray()
 
         /** @var $inArrayValidator \Zend\Validator\InArray */
         $inArrayValidator = $validator->getValidator();
-        $this->assertInstanceOf('Zend\Validator\InArray', $inArrayValidator);
+        $this->assertInstanceOf(InArray::class, $inArrayValidator);
         $this->assertSame(
             ['a', 'b', 'c'],
             $inArrayValidator->getHaystack()
diff --git a/test/NotEmptyTest.php b/test/NotEmptyTest.php
@@ -894,7 +894,7 @@ public function testStringObjects()
     {
         $valid = new NotEmpty(NotEmpty::STRING);
 
-        $object = $this->getMockBuilder('\stdClass')
+        $object = $this->getMockBuilder(stdClass::class)
             ->setMethods(['__toString'])
             ->getMock();
 
@@ -907,7 +907,7 @@ public function testStringObjects()
         $valid = new NotEmpty(NotEmpty::OBJECT_STRING);
         $this->assertTrue($valid->isValid($object));
 
-        $object = $this->getMockBuilder('\stdClass')
+        $object = $this->getMockBuilder(stdClass::class)
             ->setMethods(['__toString'])
             ->getMock();
         $object->expects($this->atLeastOnce())
diff --git a/test/StaticValidatorTest.php b/test/StaticValidatorTest.php
@@ -15,6 +15,7 @@
 use Zend\Validator\Between;
 use Zend\Validator\StaticValidator;
 use Zend\Validator\ValidatorPluginManager;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * @group      Zend_Validator
@@ -112,19 +113,19 @@ public function testSetGetDefaultTranslator()
     public function testLazyLoadsValidatorPluginManagerByDefault()
     {
         $plugins = StaticValidator::getPluginManager();
-        $this->assertInstanceOf('Zend\Validator\ValidatorPluginManager', $plugins);
+        $this->assertInstanceOf(ValidatorPluginManager::class, $plugins);
     }
 
     public function testCanSetCustomPluginManager()
     {
-        $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());
+        $plugins = new ValidatorPluginManager($this->getMockBuilder(ServiceManager::class)->getMock());
         StaticValidator::setPluginManager($plugins);
         $this->assertSame($plugins, StaticValidator::getPluginManager());
     }
 
     public function testPassingNullWhenSettingPluginManagerResetsPluginManager()
     {
-        $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());
+        $plugins = new ValidatorPluginManager($this->getMockBuilder(ServiceManager::class)->getMock());
         StaticValidator::setPluginManager($plugins);
         $this->assertSame($plugins, StaticValidator::getPluginManager());
         StaticValidator::setPluginManager(null);
diff --git a/test/TestAsset/SessionManager.php b/test/TestAsset/SessionManager.php
@@ -11,13 +11,14 @@
 
 use Zend\Session\AbstractManager;
 use Zend\EventManager\EventManagerInterface;
+use Zend\Session\Storage\ArrayStorage;
 
 class SessionManager extends AbstractManager
 {
     public $started = false;
 
     protected $configDefaultClass  = 'Zend\Session\Configuration\StandardConfiguration';
-    protected $storageDefaultClass = 'Zend\Session\Storage\ArrayStorage';
+    protected $storageDefaultClass = ArrayStorage::class;
 
     public function start()
     {
diff --git a/test/UriTest.php b/test/UriTest.php
@@ -13,6 +13,7 @@
 use Zend\Validator;
 use Zend\Uri\Exception\InvalidArgumentException;
 use Zend\Uri\Uri;
+use Zend\Uri\Http;
 
 /**
  * @group      Zend_Validator
@@ -38,7 +39,7 @@ public function testHasDefaultSettingsAndLazyLoadsUriHandler()
     {
         $validator = $this->validator;
         $uriHandler = $validator->getUriHandler();
-        $this->assertInstanceOf('Zend\Uri\Uri', $uriHandler);
+        $this->assertInstanceOf(Uri::class, $uriHandler);
         $this->assertTrue($validator->getAllowRelative());
         $this->assertTrue($validator->getAllowAbsolute());
     }
@@ -139,14 +140,14 @@ public function testEqualsMessageTemplates()
 
     public function testUriHandlerCanBeSpecifiedAsString()
     {
-        $this->validator->setUriHandler('Zend\Uri\Http');
-        $this->assertInstanceOf('Zend\Uri\Http', $this->validator->getUriHandler());
+        $this->validator->setUriHandler(Http::class);
+        $this->assertInstanceOf(Http::class, $this->validator->getUriHandler());
     }
 
     public function testUriHandlerStringInvalidClassThrowsException()
     {
         $this->expectException(Validator\Exception\InvalidArgumentException::class);
-        $this->validator->setUriHandler('stdClass');
+        $this->validator->setUriHandler(\stdClass::class);
     }
 
     public function testUriHandlerInvalidTypeThrowsException()
diff --git a/test/ValidatorChainTest.php b/test/ValidatorChainTest.php
@@ -17,6 +17,7 @@
 use Zend\Validator\ValidatorChain;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\Validator\ValidatorInterface;
+use Zend\Validator\GreaterThan;
 
 /**
  * @group      Zend_Validator
@@ -314,7 +315,7 @@ public function testCanSerializeValidatorChain()
         $serialized = serialize($this->validator);
 
         $unserialized = unserialize($serialized);
-        $this->assertInstanceOf('Zend\Validator\ValidatorChain', $unserialized);
+        $this->assertInstanceOf(ValidatorChain::class, $unserialized);
         $this->assertEquals(2, count($unserialized));
         $this->assertFalse($unserialized->isValid(''));
     }
@@ -344,7 +345,7 @@ public function testAttachByNameAllowsSpecifyingBreakChainOnFailureFlagViaOption
         $this->assertInternalType('array', $spec);
         $this->assertArrayHasKey('instance', $spec);
         $validator = $spec['instance'];
-        $this->assertInstanceOf('Zend\Validator\GreaterThan', $validator);
+        $this->assertInstanceOf(GreaterThan::class, $validator);
         $this->assertArrayHasKey('breakChainOnFailure', $spec);
         $this->assertTrue($spec['breakChainOnFailure']);
     }
diff --git a/test/bootstrap.php b/test/bootstrap.php
@@ -10,7 +10,7 @@
  */
 error_reporting(E_ALL | E_STRICT);
 
-if (class_exists('PHPUnit_Runner_Version', true)) {
+if (class_exists(\PHPUnit_Runner_Version::class, true)) {
     $phpUnitVersion = PHPUnit_Runner_Version::id();
     if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '4.0.0', '<')) {
         echo 'This version of PHPUnit (' . PHPUnit_Runner_Version::id() . ') is not supported'

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use Zend\Validator\Barcode;`
`14`	`14`	`use Zend\Validator\Exception\InvalidArgumentException;`
`15`	`15`	`use Zend\Validator\Barcode\AdapterInterface;`
	`16`	`+use Zend\Validator\Barcode\Ean13;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* \Zend\Barcode`
`@@ -149,7 +150,7 @@ public function testInvalidAdapter()`
`149`	`150`	`public function testArrayConstructAdapter()`
`150`	`151`	`{`
`151`	`152`	`$barcode = new Barcode(['adapter' => 'Ean13', 'options' => 'unknown', 'useChecksum' => false]);`
`152`		`- $this->assertInstanceOf('Zend\Validator\Barcode\Ean13', $barcode->getAdapter());`
	`153`	`+ $this->assertInstanceOf(Ean13::class, $barcode->getAdapter());`
`153`	`154`	`$this->assertFalse($barcode->useChecksum());`
`154`	`155`	`}`
`155`	`156`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testBasic()`
`33`	`33`	`public function testStaticCallback()`
`34`	`34`	`{`
`35`	`35`	`$valid = new Callback(`
`36`		`- ['\ZendTest\Validator\CallbackTest', 'staticCallback']`
	`36`	`+ [CallbackTest::class, 'staticCallback']`
`37`	`37`	`);`
`38`	`38`	`$this->assertTrue($valid->isValid('test'));`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function testServiceClass($input, $expected)`
`145`	`145`	`{`
`146`	`146`	`$validator = new CreditCard();`
`147`	`147`	`$this->assertEquals(null, $validator->getService());`
`148`		`- $validator->setService(['ZendTest\Validator\CreditCardTest', 'staticCallback']);`
	`148`	`+ $validator->setService([CreditCardTest::class, 'staticCallback']);`
`149`	`149`	`$this->assertEquals($expected, $validator->isValid($input));`
`150`	`150`	`}`
`151`	`151`
`@@ -170,7 +170,7 @@ public function testConstructionWithOptions($input, $expected)`
`170`	`170`	`$validator = new CreditCard(`
`171`	`171`	`[`
`172`	`172`	`'type' => CreditCard::VISA,`
`173`		`- 'service' => ['ZendTest\Validator\CreditCardTest', 'staticCallback']`
	`173`	`+ 'service' => [CreditCardTest::class, 'staticCallback']`
`174`	`174`	`]`
`175`	`175`	`);`
`176`	`176`
`@@ -265,7 +265,7 @@ public function testInvalidServiceClass()`
`265`	`265`
`266`	`266`	`$this->expectException(InvalidArgumentException::class);`
`267`	`267`	`$this->expectExceptionMessage('Invalid callback given');`
`268`		`- $validator->setService(['ZendTest\Validator\CreditCardTest', 'nocallback']);`
	`268`	`+ $validator->setService([CreditCardTest::class, 'nocallback']);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`/**`
`@@ -290,12 +290,12 @@ public function testConfigObject()`
`290`	`290`	`public function testOptionalConstructorParameterByConfigObject()`
`291`	`291`	`{`
`292`	`292`	`$config = new Config\Config(`
`293`		`- ['type' => 'Visa', 'service' => ['ZendTest\Validator\CreditCardTest', 'staticCallback']]`
	`293`	`+ ['type' => 'Visa', 'service' => [CreditCardTest::class, 'staticCallback']]`
`294`	`294`	`);`
`295`	`295`
`296`	`296`	`$validator = new CreditCard($config);`
`297`	`297`	`$this->assertEquals(['Visa'], $validator->getType());`
`298`		`- $this->assertEquals(['ZendTest\Validator\CreditCardTest', 'staticCallback'], $validator->getService());`
	`298`	`+ $this->assertEquals([CreditCardTest::class, 'staticCallback'], $validator->getService());`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`/**`
`@@ -305,9 +305,9 @@ public function testOptionalConstructorParameterByConfigObject()`
`305`	`305`	`*/`
`306`	`306`	`public function testOptionalConstructorParameter()`
`307`	`307`	`{`
`308`		`- $validator = new CreditCard('Visa', ['ZendTest\Validator\CreditCardTest', 'staticCallback']);`
	`308`	`+ $validator = new CreditCard('Visa', [CreditCardTest::class, 'staticCallback']);`
`309`	`309`	`$this->assertEquals(['Visa'], $validator->getType());`
`310`		`- $this->assertEquals(['ZendTest\Validator\CreditCardTest', 'staticCallback'], $validator->getService());`
	`310`	`+ $this->assertEquals([CreditCardTest::class, 'staticCallback'], $validator->getService());`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ public function testEmailAddressesWithTrailingDotInHostPartAreRejected()`
`674`	`674`	`public function testNotSetHostnameValidator()`
`675`	`675`	`{`
`676`	`676`	`$hostname = $this->validator->getHostnameValidator();`
`677`		`- $this->assertInstanceOf('Zend\Validator\Hostname', $hostname);`
	`677`	`+ $this->assertInstanceOf(Hostname::class, $hostname);`
`678`	`678`	`}`
`679`	`679`
`680`	`680`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Zend\Validator\Between;`
`16`	`16`	`use Zend\Validator\StaticValidator;`
`17`	`17`	`use Zend\Validator\ValidatorPluginManager;`
	`18`	`+use Zend\ServiceManager\ServiceManager;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* @group Zend_Validator`
`@@ -112,19 +113,19 @@ public function testSetGetDefaultTranslator()`
`112`	`113`	`public function testLazyLoadsValidatorPluginManagerByDefault()`
`113`	`114`	`{`
`114`	`115`	`$plugins = StaticValidator::getPluginManager();`
`115`		`- $this->assertInstanceOf('Zend\Validator\ValidatorPluginManager', $plugins);`
	`116`	`+ $this->assertInstanceOf(ValidatorPluginManager::class, $plugins);`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`public function testCanSetCustomPluginManager()`
`119`	`120`	`{`
`120`		`- $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());`
	`121`	`+ $plugins = new ValidatorPluginManager($this->getMockBuilder(ServiceManager::class)->getMock());`
`121`	`122`	`StaticValidator::setPluginManager($plugins);`
`122`	`123`	`$this->assertSame($plugins, StaticValidator::getPluginManager());`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`public function testPassingNullWhenSettingPluginManagerResetsPluginManager()`
`126`	`127`	`{`
`127`		`- $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());`
	`128`	`+ $plugins = new ValidatorPluginManager($this->getMockBuilder(ServiceManager::class)->getMock());`
`128`	`129`	`StaticValidator::setPluginManager($plugins);`
`129`	`130`	`$this->assertSame($plugins, StaticValidator::getPluginManager());`
`130`	`131`	`StaticValidator::setPluginManager(null);`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,14 @@`
`11`	`11`
`12`	`12`	`use Zend\Session\AbstractManager;`
`13`	`13`	`use Zend\EventManager\EventManagerInterface;`
	`14`	`+use Zend\Session\Storage\ArrayStorage;`
`14`	`15`
`15`	`16`	`class SessionManager extends AbstractManager`
`16`	`17`	`{`
`17`	`18`	`public $started = false;`
`18`	`19`
`19`	`20`	`protected $configDefaultClass = 'Zend\Session\Configuration\StandardConfiguration';`
`20`		`- protected $storageDefaultClass = 'Zend\Session\Storage\ArrayStorage';`
	`21`	`+ protected $storageDefaultClass = ArrayStorage::class;`
`21`	`22`
`22`	`23`	`public function start()`
`23`	`24`	`{`