renamed IConventions -> Conventions

nette · Nov 25, 2020 · f06c30e · f06c30e
1 parent 5975a28
commit f06c30e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 17 deletions.
diff --git a/src/Database/IConventions.php → src/Database/Conventions.php b/src/Database/IConventions.php → src/Database/Conventions.php
@@ -12,7 +12,7 @@
 use Nette\Database\Conventions\AmbiguousReferenceKeyException;
 
 
-interface IConventions
+interface Conventions
 {
 	/**
 	 * Returns primary key for table.
@@ -40,3 +40,6 @@ function getHasManyReference(string $table, string $key): ?array;
 	 */
 	function getBelongsToReference(string $table, string $key): ?array;
 }
+
+
+interface_exists(IConventions::class);
diff --git a/src/Database/Conventions/DiscoveredConventions.php b/src/Database/Conventions/DiscoveredConventions.php
@@ -9,14 +9,14 @@
 
 namespace Nette\Database\Conventions;
 
-use Nette\Database\IConventions;
+use Nette\Database\Conventions;
 use Nette\Database\IStructure;
 
 
 /**
  * Conventions based on database structure.
  */
-class DiscoveredConventions implements IConventions
+class DiscoveredConventions implements Conventions
 {
 	/** @var IStructure */
 	protected $structure;

diff --git a/src/Database/Conventions/StaticConventions.php b/src/Database/Conventions/StaticConventions.php
@@ -10,13 +10,13 @@
 namespace Nette\Database\Conventions;
 
 use Nette;
-use Nette\Database\IConventions;
+use Nette\Database\Conventions;
 
 
 /**
  * Conventions based on static definition.
  */
-class StaticConventions implements IConventions
+class StaticConventions implements Conventions
 {
 	use Nette\SmartObject;
 

diff --git a/src/Database/Explorer.php b/src/Database/Explorer.php
@@ -26,7 +26,7 @@ class Explorer
 	/** @var IStructure */
 	private $structure;
 
-	/** @var IConventions */
+	/** @var Conventions */
 	private $conventions;
 
 	/** @var Nette\Caching\IStorage */
@@ -35,8 +35,8 @@ class Explorer
 
 	public function __construct(
 		Connection $connection,
-		IStructure $structure,
-		IConventions $conventions = null,
+		Structure $structure,
+		Conventions $conventions = null,
 		Nette\Caching\IStorage $cacheStorage = null
 	) {
 		$this->connection = $connection;
@@ -112,7 +112,7 @@ public function getStructure(): IStructure
 	}
 
 
-	public function getConventions(): IConventions
+	public function getConventions(): Conventions
 	{
 		return $this->conventions;
 	}

diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
@@ -10,8 +10,8 @@
 namespace Nette\Database\Table;
 
 use Nette;
+use Nette\Database\Conventions;
 use Nette\Database\Explorer;
-use Nette\Database\IConventions;
 
 
 /**
@@ -38,7 +38,7 @@ class GroupedSelection extends Selection
 	 */
 	public function __construct(
 		Explorer $explorer,
-		IConventions $conventions,
+		Conventions $conventions,
 		string $tableName,
 		string $column,
 		Selection $refTable,

diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -10,8 +10,8 @@
 namespace Nette\Database\Table;
 
 use Nette;
+use Nette\Database\Conventions;
 use Nette\Database\Explorer;
-use Nette\Database\IConventions;
 
 
 /**
@@ -25,7 +25,7 @@ class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 	/** @var Explorer */
 	protected $explorer;
 
-	/** @var IConventions */
+	/** @var Conventions */
 	protected $conventions;
 
 	/** @var Nette\Caching\Cache */
@@ -85,7 +85,7 @@ class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 	 */
 	public function __construct(
 		Explorer $explorer,
-		IConventions $conventions,
+		Conventions $conventions,
 		string $tableName,
 		Nette\Caching\IStorage $cacheStorage = null
 	) {

diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -10,9 +10,9 @@
 namespace Nette\Database\Table;
 
 use Nette;
+use Nette\Database\Conventions;
 use Nette\Database\Driver;
 use Nette\Database\Explorer;
-use Nette\Database\IConventions;
 use Nette\Database\IStructure;
 use Nette\Database\SqlLiteral;
 
@@ -28,7 +28,7 @@ class SqlBuilder
 	/** @var string */
 	protected $tableName;
 
-	/** @var IConventions */
+	/** @var Conventions */
 	protected $conventions;
 
 	/** @var string delimited table name */

diff --git a/src/compatibility-intf.php b/src/compatibility-intf.php
@@ -14,6 +14,11 @@
 	interface ISupplementalDriver
 	{
 	}
+	/** @deprecated use Nette\Database\Conventions */
+	interface IConventions
+	{
+	}
 } elseif (!interface_exists(ISupplementalDriver::class)) {
 	class_alias(Driver::class, ISupplementalDriver::class);
+	class_alias(Conventions::class, IConventions::class);
 }
diff --git a/tests/Database.DI/DatabaseExtension.multiple.phpt b/tests/Database.DI/DatabaseExtension.multiple.phpt
@@ -58,7 +58,7 @@ test('', function () {
 	Assert::type(Nette\Database\Structure::class, $explorer->getStructure());
 	Assert::same($explorer->getStructure(), $container->getByType(Nette\Database\IStructure::class));
 	Assert::type(Nette\Database\Conventions\DiscoveredConventions::class, $explorer->getConventions());
-	Assert::same($explorer->getConventions(), $container->getByType(Nette\Database\IConventions::class));
+	Assert::same($explorer->getConventions(), $container->getByType(Nette\Database\Conventions::class));
 
 	// aliases
 	Assert::same($connection, $container->getService('nette.database.first'));