Next (doctrine 3, multiple connections)

.editorconfig

@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json, *.yaml, *.yml, *.md}]
+[*.{json,yaml,yml,md}]
 indent_style = space
-indent_size = 2
+indent_size = 2

.github/workflows/codesniffer.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
   push:
-    branches: ["*"]
+    branches: [ "*" ]
 
   schedule:
     - cron: "0 8 * * 1"

.github/workflows/coverage.yml

@@ -4,14 +4,14 @@ on:
   pull_request:
 
   push:
-    branches: ["*"]
+    branches: [ "*" ]
 
   schedule:
     - cron: "0 8 * * 1"
 
 jobs:
   coverage:
-    name: "Phpunit"
+    name: "Nette Tester"
     uses: contributte/.github/.github/workflows/phpunit-coverage.yml@v1
     with:
       make: "init coverage"

.github/workflows/phpstan.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
   push:
-    branches: ["*"]
+    branches: [ "*" ]
 
   schedule:
     - cron: "0 8 * * 1"

.github/workflows/tests.yml

@@ -11,23 +11,15 @@ on:
 
 jobs:
   test82:
-    name: "Phpunit"
+    name: "Nette Tester"
     uses: contributte/.github/.github/workflows/phpunit.yml@v1
     with:
       php: "8.2"
       make: "init tests"
 
   test81:
-    name: "Phpunit"
+    name: "Nette Tester"
     uses: contributte/.github/.github/workflows/phpunit.yml@v1
     with:
       php: "8.1"
       make: "init tests"
-
-  testlower:
-    name: "Phpunit"
-    uses: contributte/.github/.github/workflows/phpunit.yml@v1
-    with:
-      php: "8.1"
-      make: "init tests"
-      composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"

.gitignore

@@ -2,12 +2,11 @@
 .idea
 
 # Composer
-/vendor/*
-
-# Apache
-!.htaccess
+/vendor
 
 # Nette
-/var/m
-# Nette config
+/var/
 /config/local.neon
+
+# Docker
+/.data

Makefile

@@ -42,13 +42,11 @@ phpstan:
 
 .PHONY: tests
 tests:
-	vendor/bin/phpunit -c phpunit.xml --stderr --testsuite Contributte.Unit
-	vendor/bin/phpunit -c phpunit.xml --stderr --testsuite Contributte.E2E
+	vendor/bin/tester -s -p php --colors 1 -C tests
 
 .PHONY: coverage
 coverage:
-	vendor/bin/phpunit -c phpunit.xml --coverage-text --colors=never
-	vendor/bin/phpunit -c phpunit.xml --coverage-html var/tmp/tests/coverage --colors
+	vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage ./coverage.xml --coverage-src ./app tests
 
 .PHONY: dev
 dev:
@@ -58,6 +56,13 @@ dev:
 build:
 	echo "OK"
 
+############################################################
+# DOCKER ###################################################
+############################################################
+.PHONY: docker-up
+docker-up:
+	docker compose up
+
 ############################################################
 # DEPLOYMENT ###############################################
 ############################################################

app/Domain/Database/User.php

@@ -3,18 +3,16 @@
 namespace App\Domain\Database;
 
 use App\Model\Database\Entity\AbstractEntity;
-use App\Model\Database\Entity\TId;
-use Contributte\Utils\DateTime;
+use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity(repositoryClass="App\Domain\Database\UserRepository")
+ * @ORM\Table(name="`user`")
  */
 class User extends AbstractEntity
 {
 
-	use TId;
-
 	/** @ORM\Column(type="string") */
 	private string $username;
 
@@ -24,6 +22,12 @@ class User extends AbstractEntity
 	/** @ORM\Column(type="datetime", nullable=true) */
 	private ?DateTime $updatedAt = null;
 
+	public function __construct(string $username)
+	{
+		$this->username = $username;
+		$this->createdAt = new DateTime();
+	}
+
 	public function getUsername(): string
 	{
 		return $this->username;

app/Domain/Database/UserRepository.php

@@ -2,7 +2,7 @@
 
 namespace App\Domain\Database;
 
-use App\Model\Database\Repository\AbstractRepository;
+use Nettrine\Extra\Repository\AbstractRepository;
 
 /**
  * @extends AbstractRepository<User>

app/Model/Database/Entity/AbstractEntity.php

@@ -2,7 +2,26 @@
 
 namespace App\Model\Database\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+
 abstract class AbstractEntity
 {
 
+	/**
+	 * @ORM\Column(type="integer", nullable=FALSE)
+	 * @ORM\Id
+	 * @ORM\GeneratedValue
+	 */
+	protected int $id;
+
+	public function getId(): int
+	{
+		return $this->id;
+	}
+
+	public function __clone()
+	{
+		unset($this->id);
+	}
+
 }

app/Model/Database/EntityManagerDecorator.php

@@ -2,24 +2,9 @@
 
 namespace App\Model\Database;
 
-use App\Model\Database\Entity\AbstractEntity;
-use App\Model\Database\Repository\AbstractRepository;
-use Nettrine\ORM\EntityManagerDecorator as NettrineEntityManagerDecorator;
+use Doctrine\ORM\Decorator\EntityManagerDecorator as DoctrineEntityManagerDecorator;
 
-final class EntityManagerDecorator extends NettrineEntityManagerDecorator
+final class EntityManagerDecorator extends DoctrineEntityManagerDecorator
 {
 
-	use TRepositories;
-
-	/**
-	 * @template T of AbstractEntity
-	 * @param class-string<T> $entityName
-	 * @return AbstractRepository<T>
-	 * @internal
-	 */
-	public function getRepository($entityName): AbstractRepository
-	{
-		return $this->wrapped->getRepository($entityName);
-	}
-
 }