use ClassName::class syntax

Author: JanTvrdik

src/Bridges/DatabaseDI/DatabaseExtension.php

@@ -69,11 +69,11 @@ private function setupDatabase($config, $name)
 		}
 
 		$connection = $container->addDefinition($this->prefix("$name.connection"))
-			->setClass('Nette\Database\Connection', [$config['dsn'], $config['user'], $config['password'], $config['options']])
+			->setClass(Nette\Database\Connection::class, [$config['dsn'], $config['user'], $config['password'], $config['options']])
 			->setAutowired($config['autowired']);
 
 		$structure = $container->addDefinition($this->prefix("$name.structure"))
-			->setClass('Nette\Database\Structure')
+			->setClass(Nette\Database\Structure::class)
 			->setArguments([$connection])
 			->setAutowired($config['autowired']);
 
@@ -104,7 +104,7 @@ private function setupDatabase($config, $name)
 		}
 
 		$container->addDefinition($this->prefix("$name.context"))
-			->setClass('Nette\Database\Context', [$connection, $structure, $conventions])
+			->setClass(Nette\Database\Context::class, [$connection, $structure, $conventions])
 			->setAutowired($config['autowired']);
 
 		if ($config['debugger']) {

tests/Database.DI/DatabaseExtension.basic.phpt

@@ -35,15 +35,15 @@ test(function () {
 	$container->initialize();
 
 	$connection = $container->getService('database.default');
-	Assert::type('Nette\Database\Connection', $connection);
+	Assert::type(Nette\Database\Connection::class, $connection);
 	Assert::same('sqlite::memory:', $connection->getDsn());
 
 	$context = $container->getService('database.default.context');
-	Assert::type('Nette\Database\Context', $context);
+	Assert::type(Nette\Database\Context::class, $context);
 	Assert::same($connection, $context->getConnection());
 
-	Assert::type('Nette\Database\Structure', $context->getStructure());
-	Assert::type('Nette\Database\Conventions\DiscoveredConventions', $context->getConventions());
+	Assert::type(Nette\Database\Structure::class, $context->getStructure());
+	Assert::type(Nette\Database\Conventions\DiscoveredConventions::class, $context->getConventions());
 
 	// aliases
 	Assert::same($connection, $container->getService('nette.database.default'));

tests/Database.DI/DatabaseExtension.multiple.phpt

@@ -44,19 +44,19 @@ test(function () {
 	$container->initialize();
 
 	$connection = $container->getService('database.first');
-	Assert::type('Nette\Database\Connection', $connection);
-	Assert::same($connection, $container->getByType('Nette\Database\Connection'));
+	Assert::type(Nette\Database\Connection::class, $connection);
+	Assert::same($connection, $container->getByType(Nette\Database\Connection::class));
 	Assert::same('sqlite::memory:', $connection->getDsn());
 
 	$context = $container->getService('database.first.context');
-	Assert::type('Nette\Database\Context', $context);
-	Assert::same($context, $container->getByType('Nette\Database\Context'));
+	Assert::type(Nette\Database\Context::class, $context);
+	Assert::same($context, $container->getByType(Nette\Database\Context::class));
 	Assert::same($connection, $context->getConnection());
 
-	Assert::type('Nette\Database\Structure', $context->getStructure());
-	Assert::same($context->getStructure(), $container->getByType('Nette\Database\IStructure'));
-	Assert::type('Nette\Database\Conventions\DiscoveredConventions', $context->getConventions());
-	Assert::same($context->getConventions(), $container->getByType('Nette\Database\IConventions'));
+	Assert::type(Nette\Database\Structure::class, $context->getStructure());
+	Assert::same($context->getStructure(), $container->getByType(Nette\Database\IStructure::class));
+	Assert::type(Nette\Database\Conventions\DiscoveredConventions::class, $context->getConventions());
+	Assert::same($context->getConventions(), $container->getByType(Nette\Database\IConventions::class));
 
 	// aliases
 	Assert::same($connection, $container->getService('nette.database.first'));

tests/Database/Connection.exceptions.mysql.phpt

@@ -12,7 +12,7 @@ require __DIR__ . '/connect.inc.php'; // create $options
 
 $e = Assert::exception(function () use ($options) {
 	$connection = new Nette\Database\Connection($options['dsn'], 'unknown', 'unknown');
-}, 'Nette\Database\ConnectionException', '%a% Access denied for user %a%');
+}, Nette\Database\ConnectionException::class, '%a% Access denied for user %a%');
 
 Assert::same(1045, $e->getDriverCode());
 Assert::contains($e->getSqlState(), ['HY000', '28000']);
@@ -21,6 +21,6 @@ Assert::same($e->getCode(), $e->getSqlState());
 
 $e = Assert::exception(function () use ($connection) {
 	$connection->rollback();
-}, 'Nette\Database\DriverException', 'There is no active transaction', 0);
+}, Nette\Database\DriverException::class, 'There is no active transaction', 0);
 
 Assert::same(NULL, $e->getDriverCode());

tests/Database/Connection.exceptions.phpt

@@ -11,7 +11,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $e = Assert::exception(function () {
 	$connection = new Nette\Database\Connection('unknown');
-}, 'Nette\Database\ConnectionException', 'invalid data source name', 0);
+}, Nette\Database\ConnectionException::class, 'invalid data source name', 0);
 
 Assert::same(NULL, $e->getDriverCode());
 Assert::same(NULL, $e->getSqlState());

tests/Database/Connection.exceptions.postgre.phpt

@@ -12,14 +12,14 @@ require __DIR__ . '/connect.inc.php'; // create $options
 
 $e = Assert::exception(function () use ($options) {
 	$connection = new Nette\Database\Connection($options['dsn'], 'unknown', 'unknown');
-}, 'Nette\Database\ConnectionException', NULL, '08006');
+}, Nette\Database\ConnectionException::class, NULL, '08006');
 
 Assert::same(7, $e->getDriverCode());
 Assert::same($e->getCode(), $e->getSqlState());
 
 
 $e = Assert::exception(function () use ($connection) {
 	$connection->rollback();
-}, 'Nette\Database\DriverException', 'There is no active transaction', 0);
+}, Nette\Database\DriverException::class, 'There is no active transaction', 0);
 
 Assert::same(NULL, $e->getDriverCode());

tests/Database/Connection.exceptions.sqlite.phpt

@@ -12,14 +12,14 @@ require __DIR__ . '/connect.inc.php'; // create $options
 
 $e = Assert::exception(function () use ($options) {
 	$connection = new Nette\Database\Connection('sqlite:.');
-}, 'Nette\Database\ConnectionException', 'SQLSTATE[HY000] [14] unable to open database file', 'HY000');
+}, Nette\Database\ConnectionException::class, 'SQLSTATE[HY000] [14] unable to open database file', 'HY000');
 
 Assert::same(14, $e->getDriverCode());
 Assert::same($e->getCode(), $e->getSqlState());
 
 
 $e = Assert::exception(function () use ($connection) {
 	$connection->rollback();
-}, 'Nette\Database\DriverException', 'There is no active transaction', 0);
+}, Nette\Database\DriverException::class, 'There is no active transaction', 0);
 
 Assert::same(NULL, $e->getDriverCode());

tests/Database/Connection.fetch.phpt

@@ -14,7 +14,7 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 
 test(function () use ($connection) { // fetch
 	$row = $connection->fetch('SELECT name, id FROM author WHERE id = ?', 11);
-	Assert::type('Nette\Database\Row', $row);
+	Assert::type(Nette\Database\Row::class, $row);
 	Assert::equal(Nette\Database\Row::from([
 		'name' => 'Jakub Vrana',
 		'id' => 11,

tests/Database/Connection.lazy.phpt

@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 test(function () { // non lazy
 	Assert::exception(function () {
 		$connection = new Nette\Database\Connection('dsn', 'user', 'password');
-	}, 'Nette\Database\DriverException', 'invalid data source name');
+	}, Nette\Database\DriverException::class, 'invalid data source name');
 });
 
 
@@ -24,15 +24,15 @@ test(function () { // lazy
 	$context = new Nette\Database\Context($connection, new Structure($connection, new DevNullStorage()));
 	Assert::exception(function () use ($context) {
 		$context->query('SELECT ?', 10);
-	}, 'Nette\Database\DriverException', 'invalid data source name');
+	}, Nette\Database\DriverException::class, 'invalid data source name');
 });
 
 
 test(function () {
 	$connection = new Nette\Database\Connection('dsn', 'user', 'password', ['lazy' => TRUE]);
 	Assert::exception(function () use ($connection) {
 		$connection->quote('x');
-	}, 'Nette\Database\DriverException', 'invalid data source name');
+	}, Nette\Database\DriverException::class, 'invalid data source name');
 });
 
 

tests/Database/Connection.query.phpt

@@ -14,7 +14,7 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 
 test(function () use ($connection) {
 	$res = $connection->query('SELECT id FROM author WHERE id = ?', 11);
-	Assert::type('Nette\Database\ResultSet', $res);
+	Assert::type(Nette\Database\ResultSet::class, $res);
 	Assert::same('SELECT id FROM author WHERE id = 11', $res->getQueryString());
 });