deprecated interfaces IRow & IRowContainer

Author: dg

src/Database/IRow.php

@@ -10,9 +10,7 @@
 namespace Nette\Database;
 
 
-/**
- * Row interface.
- */
+/** @deprecated use Row */
 interface IRow extends \Traversable, \ArrayAccess
 {
 }

src/Database/IRowContainer.php

@@ -10,38 +10,7 @@
 namespace Nette\Database;
 
 
-/**
- * Container of database result fetched into IRow.
- */
+/** @deprecated use ResultSet */
 interface IRowContainer extends \Traversable
 {
-	/**
-	 * Fetches single row object.
-	 */
-	function fetch(): ?IRow;
-
-	/**
-	 * Fetches single field.
-	 * @return mixed
-	 */
-	function fetchField();
-
-	/**
-	 * Fetches all rows as associative array.
-	 * @param  string|int  $key  column name used for an array key or null for numeric index
-	 * @param  string|int  $value  column name used for an array value or null for the whole row
-	 */
-	function fetchPairs($key = null, $value = null): array;
-
-	/**
-	 * Fetches all rows.
-	 * @return IRow[]
-	 */
-	function fetchAll(): array;
-
-	/**
-	 * Fetches all rows and returns associative tree.
-	 * @param  string  $path  associative descriptor
-	 */
-	function fetchAssoc(string $path): array;
 }

src/Database/ResultSet.php

@@ -226,6 +226,9 @@ public function valid(): bool
 	/********************* interface IRowContainer ****************d*g**/
 
 
+	/**
+	 * Fetches single row object.
+	 */
 	public function fetch(): ?IRow
 	{
 		$data = $this->pdoStatement ? $this->pdoStatement->fetch() : null;
@@ -251,7 +254,8 @@ public function fetch(): ?IRow
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches single field.
+	 * @return mixed
 	 */
 	public function fetchField($column = 0)
 	{
@@ -274,7 +278,9 @@ public function fetchFields(): ?array
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows as associative array.
+	 * @param  string|int  $key  column name used for an array key or null for numeric index
+	 * @param  string|int  $value  column name used for an array value or null for the whole row
 	 */
 	public function fetchPairs($key = null, $value = null): array
 	{
@@ -283,7 +289,8 @@ public function fetchPairs($key = null, $value = null): array
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows.
+	 * @return Row[]
 	 */
 	public function fetchAll(): array
 	{
@@ -295,7 +302,8 @@ public function fetchAll(): array
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows and returns associative tree.
+	 * @param  string  $path  associative descriptor
 	 */
 	public function fetchAssoc(string $path): array
 	{

src/Database/Table/IRow.php

@@ -12,33 +12,7 @@
 use Nette\Database;
 
 
-/**
- * Row interface.
- */
+/** @deprecated use ActiveRow */
 interface IRow extends Database\IRow
 {
-	function setTable(Selection $name);
-
-	function getTable(): Selection;
-
-	/**
-	 * Returns primary key value.
-	 * @return mixed
-	 */
-	function getPrimary(bool $throw = true);
-
-	/**
-	 * Returns row signature (composition of primary keys)
-	 */
-	function getSignature(bool $throw = true): string;
-
-	/**
-	 * Returns referencing rows.
-	 */
-	function related(string $key, string $throughColumn = null): GroupedSelection;
-
-	/**
-	 * Returns referenced row.
-	 */
-	function ref(string $key, string $throughColumn = null): ?self;
 }

src/Database/Table/IRowContainer.php

@@ -12,12 +12,7 @@
 use Nette\Database;
 
 
-/**
- * Container of database result fetched into IRow objects.
- *
- * @method     IRow|null  fetch() Fetches single row object.
- * @method     IRow[]     fetchAll() Fetches all rows.
- */
+/** @deprecated use Selection */
 interface IRowContainer extends Database\IRowContainer
 {
 }

src/Database/Table/Selection.php

@@ -200,7 +200,7 @@ public function get($key): ?ActiveRow
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches single row object.
 	 * @return ActiveRow|null if there is no such row
 	 */
 	public function fetch(): ?Nette\Database\IRow
@@ -233,7 +233,9 @@ public function fetchField(string $column = null)
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows as associative array.
+	 * @param  string|int  $key  column name used for an array key or null for numeric index
+	 * @param  string|int  $value  column name used for an array value or null for the whole row
 	 */
 	public function fetchPairs($key = null, $value = null): array
 	{
@@ -242,7 +244,8 @@ public function fetchPairs($key = null, $value = null): array
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows.
+	 * @return ActiveRow[]
 	 */
 	public function fetchAll(): array
 	{
@@ -251,7 +254,8 @@ public function fetchAll(): array
 
 
 	/**
-	 * @inheritDoc
+	 * Fetches all rows and returns associative tree.
+	 * @param  string  $path  associative descriptor
 	 */
 	public function fetchAssoc(string $path): array
 	{