Nette db update (#30)

* transaction

* version

* nette db update, cleanup

* composer

* construct

* deprecated functions

* remove vs delete

.github/workflows/coding-standard.yml

@@ -46,4 +46,4 @@ jobs:
       run: vendor/bin/phpstan analyse --level 5 src
 
     - name: Run Coding Standard
-      run: vendor/modul-is/coding-standard/ecs check src --preset php81
+      run: vendor/modul-is/coding-standard/ecs check src --preset php82

quickstart.md

@@ -228,14 +228,14 @@ To delete a single row, use `delete()` with an entity.
 $this->AnimalRepository->delete($animalEntity);
 ```
 
-To delete multiple rows, use `removeCollection()` with an array or a collection.
+To delete multiple rows, use `deleteCollection()` with an array or a collection.
 ```
 $entityArray = [$zooEntity1, $zooEntity2];
 
-$this->ZooRepository->removeCollection($entityArray);
+$this->ZooRepository->deleteCollection($entityArray);
 ```
 
 Alternatively we can delete a row only using its ID.
 ```
-$this->ZooRepository->removeByID(1);
-```
+$this->ZooRepository->deleteByID(1);
+```

src/ModulIS/EntityCollection.php

@@ -12,27 +12,23 @@ class EntityCollection implements \Iterator, \Countable
 
 	public const DESC = 'DESC';
 
-	protected Selection $selection;
-
 	protected string|\Closure $entity;
 
-	protected string|null $refTable;
-
-	protected string|null $refColumn;
-
 	protected ?array $data;
 
 	private int|null $count;
 
 	private array $keys;
 
 
-	public function __construct(Selection $selection, $entity, $refTable = null, $refColumn = null)
+	public function __construct
+	(
+		protected Selection $selection,
+		$entity,
+		protected ?string $refTable = null,
+		protected ?string $refColumn = null
+	)
 	{
-		$this->selection = $selection;
-		$this->refTable = $refTable;
-		$this->refColumn = $refColumn;
-
 		try
 		{
 			\Nette\Utils\Callback::check($entity);

src/ModulIS/Exception/InvalidArgumentException.php

@@ -4,7 +4,6 @@
 
 namespace ModulIS\Exception;
 
-
 class InvalidArgumentException extends \InvalidArgumentException
 {
 }

src/ModulIS/Exception/InvalidPropertyDefinitionException.php

@@ -4,7 +4,6 @@
 
 namespace ModulIS\Exception;
 
-
 class InvalidPropertyDefinitionException extends InvalidStateException
 {
 }

src/ModulIS/Exception/InvalidStateException.php

@@ -4,7 +4,6 @@
 
 namespace ModulIS\Exception;
 
-
 class InvalidStateException extends \RuntimeException
 {
 }

src/ModulIS/Exception/MemberAccessException.php

@@ -4,7 +4,6 @@
 
 namespace ModulIS\Exception;
 
-
 class MemberAccessException extends \LogicException
 {
 }

src/ModulIS/Exception/NotSupportedException.php

@@ -4,7 +4,6 @@
 
 namespace ModulIS\Exception;
 
-
 class NotSupportedException extends \LogicException
 {
 }

src/ModulIS/Record.php

@@ -7,19 +7,18 @@
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\GroupedSelection;
 
-
 class Record
 {
-	private ?ActiveRow $row;
-
 	private array $values = [];
 
 	private array $modified = [];
 
 
-	final public function __construct(?ActiveRow $row = null)
+	final public function __construct
+	(
+		private ?ActiveRow $row = null
+	)
 	{
-		$this->row = $row;
 	}
 
 

src/ModulIS/Reflection/EntityProperty.php

@@ -111,15 +111,12 @@ public function isOfExtraType(): bool
 
 	private static function getConvertedType(string $type): string
 	{
-		switch($type)
+		return match($type)
 		{
-			case 'array':
-				return 'string';
-			case 'bool':
-				return 'int';
-			default:
-				return $type;
-		}
+			'array' => 'string',
+			'bool' => 'int',
+			default => $type
+		};
 	}
 
 

src/ModulIS/Repository.php

@@ -12,20 +12,16 @@
 
 abstract class Repository
 {
-	protected Explorer $database;
-
 	protected string $table;
 
 	protected string $entity;
 
-	private Transaction $transaction;
-
 
-	public function __construct(Explorer $database)
+	public function __construct
+	(
+		protected Explorer $database
+	)
 	{
-		$this->database = $database;
-		$this->transaction = new Transaction($database->getConnection());
-
 		$ref = new \ReflectionClass($this);
 
 		if(!$this->table)
@@ -153,7 +149,7 @@ public function persist(Entity $entity): bool
 			}
 
 			$inserted = $this->getTable()
-					->insert($record->getModified());
+				->insert($record->getModified());
 
 			if(!$inserted instanceof IRow)
 			{
@@ -172,21 +168,7 @@ public function delete(Entity $entity): bool
 		$this->checkEntity($entity);
 		$record = $entity->toRecord();
 
-		if($record->hasRow())
-		{
-			return $this->transaction(fn() => $record->getRow()->delete() > 0);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * @deprecated
-	 */
-	public function remove(Entity $entity): bool
-	{
-		return $this->delete($entity);
+		return $record->hasRow() ? $record->getRow()->delete() > 0 : true;
 	}
 
 
@@ -210,7 +192,7 @@ final protected function checkEntity(Entity $entity): void
 
 	final protected function transaction(\Closure $callback): mixed
 	{
-		return $this->transaction->transaction($callback);
+		return $this->database->getConnection()->transaction($callback);
 	}
 
 
@@ -230,9 +212,9 @@ private function isCollectionEmpty(array|EntityCollection|ArrayHash $collection)
 
 
 	/**
-	 * Remove collection by transaction
+	 * Delete collection by transaction
 	 */
-	public function removeCollection(array|EntityCollection|ArrayHash $collection): mixed
+	public function deleteCollection(array|EntityCollection|ArrayHash $collection): mixed
 	{
 		if($this->isCollectionEmpty($collection))
 		{
@@ -250,10 +232,28 @@ public function removeCollection(array|EntityCollection|ArrayHash $collection):
 
 
 	/**
-	 * Remove single instance from database by ID
+	 * Delete single instance from database by ID
 	 */
-	public function removeByID(int|string $id): bool
+	public function deleteByID(int|string $id): bool
 	{
 		return (bool) $this->getTable()->wherePrimary($id)->delete();
 	}
+
+
+	/**
+	 * @deprecated
+	 */
+	public function removeCollection(array|EntityCollection|ArrayHash $collection): mixed
+	{
+		return $this->deleteCollection($collection);
+	}
+
+
+	/**
+	 * @deprecated
+	 */
+	public function removeByID(int|string $id): bool
+	{
+		return $this->deleteByID($id);
+	}
 }

tests/cases/OrmTest/CollectionCaseTest.phpt

@@ -40,7 +40,7 @@ class CollectionCaseTest extends TestCase
 
 		Assert::same(2, $collection->count());
 
-		$animalRepository->removeCollection($collection);
+		$animalRepository->deleteCollection($collection);
 
 		$deleted = $animalRepository->findBy([]);
 

tests/cases/OrmTest/RepositoryCaseTest.phpt

@@ -91,7 +91,7 @@ class RepositoryCaseTest extends TestCase
 		/**
 		 * TEST: Remove entity by ID
 		 */
-		$deletedByIdEntity = $repository->removeByID(1);
+		$deletedByIdEntity = $repository->deleteByID(1);
 
 		Assert::true($deletedByIdEntity);