Merge branch 'iconnection'

.phpstan.neon

@@ -8,3 +8,6 @@ parameters:
 		- '#Accessing property \$\w+ on possibly null value of type Nextras\\Orm\\Entity\\Reflection\\PropertyRelationshipMetadata\|null#'
 		# https://github.com/phpstan/phpstan/issues/587
 		- '#Constructor of class Nextras\\Orm\\Bridges\\NetteDI\\DIRepositoryFinder has an unused parameter \$modelClass\.#'
+		# we need a local mute
+		- '#Calling method \w+\(\) on possibly null value of type Nextras\\Dbal\\Result\\Result\|null\.#'
+		- '#Calling method \w+\(\) on possibly null value of type Nextras\\Dbal\\Result\\Row\|null\.#'

src/Mapper/Dbal/DbalCollection.php

@@ -9,7 +9,7 @@
 namespace Nextras\Orm\Mapper\Dbal;
 
 use Iterator;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Nextras\Orm\Collection\EntityIterator;
 use Nextras\Orm\Collection\Helpers\FetchPairsHelper;
@@ -37,7 +37,7 @@ class DbalCollection implements ICollection
 	/** @var DbalMapper */
 	protected $mapper;
 
-	/** @var Connection */
+	/** @var IConnection */
 	protected $connection;
 
 	/** @var QueryBuilder */
@@ -56,7 +56,7 @@ class DbalCollection implements ICollection
 	protected $entityFetchEventTriggered = false;
 
 
-	public function __construct(DbalMapper $mapper, Connection $connection, QueryBuilder $queryBuilder)
+	public function __construct(DbalMapper $mapper, IConnection $connection, QueryBuilder $queryBuilder)
 	{
 		$this->mapper = $mapper;
 		$this->connection = $connection;

src/Mapper/Dbal/DbalMapper.php

@@ -9,7 +9,7 @@
 namespace Nextras\Orm\Mapper\Dbal;
 
 use Nette\Caching\Cache;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\Platforms\IPlatform;
 use Nextras\Dbal\Platforms\PostgreSqlPlatform;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
@@ -31,7 +31,7 @@
 
 class DbalMapper extends BaseMapper
 {
-	/** @var Connection */
+	/** @var IConnection */
 	protected $connection;
 
 	/** @var Cache */
@@ -44,7 +44,7 @@ class DbalMapper extends BaseMapper
 	private $mapperCoordinator;
 
 
-	public function __construct(Connection $connection, DbalMapperCoordinator $mapperCoordinator, Cache $cache)
+	public function __construct(IConnection $connection, DbalMapperCoordinator $mapperCoordinator, Cache $cache)
 	{
 		$key = md5(json_encode($connection->getConfig()));
 		$this->connection = $connection;

src/Mapper/Dbal/DbalMapperCoordinator.php

@@ -8,19 +8,19 @@
 
 namespace Nextras\Orm\Mapper\Dbal;
 
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 
 
 class DbalMapperCoordinator
 {
-	/** @var Connection */
+	/** @var IConnection */
 	private $connection;
 
 	/** @var bool */
 	private $transactionActive = false;
 
 
-	public function __construct(Connection $connection)
+	public function __construct(IConnection $connection)
 	{
 		$this->connection = $connection;
 	}

src/Mapper/Dbal/RelationshipMapperManyHasMany.php

@@ -9,7 +9,7 @@
 namespace Nextras\Orm\Mapper\Dbal;
 
 use Iterator;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Nextras\Orm\Collection\ICollection;
 use Nextras\Orm\Collection\MultiEntityIterator;
@@ -22,7 +22,7 @@
 
 class RelationshipMapperManyHasMany implements IRelationshipMapperManyHasMany
 {
-	/** @var Connection */
+	/** @var IConnection */
 	protected $connection;
 
 	/** @var PropertyMetadata */
@@ -50,7 +50,7 @@ class RelationshipMapperManyHasMany implements IRelationshipMapperManyHasMany
 	private $mapperCoordinator;
 
 
-	public function __construct(Connection $connection, DbalMapper $mapperOne, DbalMapper $mapperTwo, DbalMapperCoordinator $mapperCoordinator, PropertyMetadata $metadata)
+	public function __construct(IConnection $connection, DbalMapper $mapperOne, DbalMapper $mapperTwo, DbalMapperCoordinator $mapperCoordinator, PropertyMetadata $metadata)
 	{
 		assert($metadata->relationship !== null);
 		$this->connection = $connection;

src/Mapper/Dbal/RelationshipMapperManyHasOne.php

@@ -10,7 +10,7 @@
 
 use ArrayIterator;
 use Iterator;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Nextras\Orm\Collection\ICollection;
 use Nextras\Orm\Collection\MultiEntityIterator;
@@ -23,7 +23,7 @@
 
 class RelationshipMapperManyHasOne implements IRelationshipMapper
 {
-	/** @var Connection */
+	/** @var IConnection */
 	protected $connection;
 
 	/** @var PropertyMetadata */
@@ -36,7 +36,7 @@ class RelationshipMapperManyHasOne implements IRelationshipMapper
 	private $targetMapper;
 
 
-	public function __construct(Connection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
+	public function __construct(IConnection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
 	{
 		$this->connection = $connection;
 		$this->metadata = $metadata;

src/Mapper/Dbal/RelationshipMapperOneHasMany.php

@@ -9,7 +9,7 @@
 namespace Nextras\Orm\Mapper\Dbal;
 
 use Iterator;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Nextras\Orm\Collection\ICollection;
 use Nextras\Orm\Collection\MultiEntityIterator;
@@ -21,7 +21,7 @@
 
 class RelationshipMapperOneHasMany implements IRelationshipMapper
 {
-	/** @var Connection */
+	/** @var IConnection */
 	protected $connection;
 
 	/** @var PropertyMetadata */
@@ -40,7 +40,7 @@ class RelationshipMapperOneHasMany implements IRelationshipMapper
 	protected $cacheCounts;
 
 
-	public function __construct(Connection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
+	public function __construct(IConnection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
 	{
 		assert($metadata->relationship !== null);
 		$this->connection = $connection;

src/Mapper/Dbal/StorageReflection/StorageReflection.php

@@ -10,7 +10,7 @@
 
 use Nette\Caching\Cache;
 use Nette\SmartObject;
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\Platforms\CachedPlatform;
 use Nextras\Dbal\Platforms\IPlatform;
 use Nextras\Orm;
@@ -50,7 +50,7 @@ abstract class StorageReflection implements IStorageReflection
 	protected $platform;
 
 
-	public function __construct(Connection $connection, $storageName, array $entityPrimaryKey, Cache $cache)
+	public function __construct(IConnection $connection, $storageName, array $entityPrimaryKey, Cache $cache)
 	{
 		$this->platform = new CachedPlatform($connection->getPlatform(), $cache->derive('db_reflection'));
 		$this->storageName = $storageName;

tests/cases/integration/Entity/entity.insert.phpt

@@ -7,7 +7,7 @@
 
 namespace NextrasTests\Orm\Integration\Entity;
 
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Orm\Mapper\Dbal\DbalMapper;
 use NextrasTests\Orm\Author;
 use NextrasTests\Orm\DataTestCase;
@@ -20,7 +20,6 @@ $dic = require_once __DIR__ . '/../../../bootstrap.php';
 
 class NewEntityTest extends DataTestCase
 {
-
 	public function testInsert()
 	{
 		$author = new Author();
@@ -42,7 +41,7 @@ class NewEntityTest extends DataTestCase
 	public function testInsertWithPrimaryKey()
 	{
 		if ($this->section === Helper::SECTION_MSSQL) {
-			$connection = $this->container->getByType(Connection::class);
+			$connection = $this->container->getByType(IConnection::class);
 			$connection->query('SET IDENTITY_INSERT authors ON;');
 		}
 
@@ -68,7 +67,7 @@ class NewEntityTest extends DataTestCase
 	public function testDuplicatePrimaryKey()
 	{
 		if ($this->section === Helper::SECTION_MSSQL) {
-			$connection = $this->container->getByType(Connection::class);
+			$connection = $this->container->getByType(IConnection::class);
 			$connection->query('SET IDENTITY_INSERT authors ON;');
 		}
 
@@ -104,7 +103,6 @@ class NewEntityTest extends DataTestCase
 		Assert::false($author2->isModified());
 		Assert::same(445, $author2->getPersistedId());
 	}
-
 }
 
 

tests/cases/integration/Model/model.refreshAll.phpt

@@ -7,7 +7,7 @@
 
 namespace NextrasTests\Orm\Integration\Model;
 
-use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Orm\InvalidStateException;
 use NextrasTests\Orm\DataTestCase;
 use NextrasTests\Orm\Helper;
@@ -39,8 +39,8 @@ class ModelRefreshAllTest extends DataTestCase
 		Assert::same('Book 1', $book1->title);
 		$book2 = $this->orm->books->getById(2);
 		Assert::same('Book 2', $book2->title);
-		$this->container->getByType(Connection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['title' => 'foo'], 1);
-		$this->container->getByType(Connection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['title' => 'bar'], 2);
+		$this->container->getByType(IConnection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['title' => 'foo'], 1);
+		$this->container->getByType(IConnection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['title' => 'bar'], 2);
 
 		Assert::same('Book 1', $book1->title);
 		Assert::same('Book 2', $book2->title);
@@ -59,7 +59,7 @@ class ModelRefreshAllTest extends DataTestCase
 		$book2 = $this->orm->books->getById(2);
 		Assert::count(2, iterator_to_array($book2->tags));
 
-		$this->container->getByType(Connection::class)->query('DELETE FROM %table WHERE book_id = %i AND tag_id = %i', 'books_x_tags', 2, 3);
+		$this->container->getByType(IConnection::class)->query('DELETE FROM %table WHERE book_id = %i AND tag_id = %i', 'books_x_tags', 2, 3);
 
 		Assert::count(2, iterator_to_array($book2->tags));
 		$this->orm->refreshAll();
@@ -73,7 +73,7 @@ class ModelRefreshAllTest extends DataTestCase
 		$tag3 = $this->orm->tags->getById(3);
 
 		Assert::count(2, iterator_to_array($tag3->books));
-		$this->container->getByType(Connection::class)->query('DELETE FROM %table WHERE book_id = %i AND tag_id = %i', 'books_x_tags', 2, 3);
+		$this->container->getByType(IConnection::class)->query('DELETE FROM %table WHERE book_id = %i AND tag_id = %i', 'books_x_tags', 2, 3);
 
 		Assert::count(2, iterator_to_array($tag3->books));
 		$this->orm->refreshAll();
@@ -91,7 +91,7 @@ class ModelRefreshAllTest extends DataTestCase
 		Assert::count(2, $publisher1->books);
 		Assert::count(1, $publisher2->books);
 
-		$this->container->getByType(Connection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['publisher_id' => 2], 1);
+		$this->container->getByType(IConnection::class)->query('UPDATE %table SET %set WHERE id = %i', 'books', ['publisher_id' => 2], 1);
 
 		Assert::same($publisher1, $book1->publisher);
 		Assert::count(2, $publisher1->books);
@@ -110,12 +110,11 @@ class ModelRefreshAllTest extends DataTestCase
 
 	public function testOHORelations()
 	{
+		$connection = $this->container->getByType(IConnection::class);
 		if ($this->section === Helper::SECTION_MSSQL) {
-			$connection = $this->container->getByType(Connection::class);
 			$connection->query('SET IDENTITY_INSERT eans ON;');
 		}
 
-		$connection = $this->container->getByType(Connection::class);
 		$connection->query('INSERT INTO %table %values', 'eans', ['id' => 1, 'code' => '111']);
 		$connection->query('UPDATE %table SET %set WHERE id = %i', 'books', ['ean_id' => 1], 1);
 
@@ -148,7 +147,7 @@ class ModelRefreshAllTest extends DataTestCase
 	{
 		$book1 = $this->orm->books->getById(1);
 		Assert::same(1, $book1->getPersistedId());
-		$this->container->getByType(Connection::class)->query('DELETE FROM %table WHERE id = %i', 'books', 1);
+		$this->container->getByType(IConnection::class)->query('DELETE FROM %table WHERE id = %i', 'books', 1);
 		Assert::same(1, $book1->getPersistedId());
 
 		$this->orm->refreshAll();

tests/cases/integration/Relationships/entity.relationships.phpt

@@ -7,8 +7,8 @@
 
 namespace NextrasTests\Orm\Integration\Relationships;
 
-use Mockery;
 use Nextras\Dbal\Connection;
+use Nextras\Dbal\IConnection;
 use Nextras\Orm\Relationships\ManyHasMany;
 use NextrasTests\Orm\Author;
 use NextrasTests\Orm\Book;
@@ -94,7 +94,7 @@ class EntityRelationshipsTest extends DataTestCase
 		}
 
 		$queries = [];
-		$connection = $this->container->getByType(Connection::class);
+		$connection = $this->container->getByType(IConnection::class);
 		$connection->onQuery[] = function ($_, $query) use (& $queries) {
 			$queries[$query] = isset($queries[$query]) ? $queries[$query] : 1;
 		};