Remove unecessary code to highlight issues with PHPStan-and-Psalm.

loophp · Dec 2, 2021 · 6f68b92 · 6f68b92
1 parent 5773b8f
commit 6f68b92
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 420 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -13,8 +13,6 @@ branches:
               contexts:
                   - "Static Analysis (ubuntu-latest, 7.4)"
                   - "Static Analysis (ubuntu-latest, 8.0)"
-                  - "Code Style (ubuntu-latest, 7.4)"
-                  - "Code Style (ubuntu-latest, 8.0)"
 
           restrictions: null
           required_linear_history: true

diff --git a/phpstan-doctrine-bug.neon b/phpstan-doctrine-bug.neon
@@ -4,9 +4,3 @@ parameters:
 			message: "#^Method loophp\\\\RepositoryMonadicHelper\\\\Doctrine\\\\MonadicStandardRepository\\:\\:getClassName\\(\\) should return class\\-string\\<R\\> but returns string\\.$#"
 			count: 1
 			path: src/Doctrine/MonadicStandardRepository.php
-
-		-
-			message: "#^Method loophp\\\\RepositoryMonadicHelper\\\\MonadicStandardRepositoryFactory\\:\\:getEntityClass\\(\\) should return class\\-string\\<R\\> but returns string\\.$#"
-			count: 1
-			path: src/MonadicStandardRepositoryFactory.php
-
diff --git a/src/Doctrine/MonadicServiceEntityRepository.php b/src/Doctrine/MonadicServiceEntityRepository.php
diff --git a/src/Doctrine/MonadicServiceEntityRepositoryInterface.php b/src/Doctrine/MonadicServiceEntityRepositoryInterface.php
diff --git a/src/Doctrine/MonadicStandardRepository.php b/src/Doctrine/MonadicStandardRepository.php
@@ -11,8 +11,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectRepository;
-use loophp\RepositoryMonadicHelper\Service\MonadicServiceRepositoryHelper;
-use loophp\RepositoryMonadicHelper\Service\MonadicServiceRepositoryHelperInterface;
+use loophp\RepositoryMonadicHelper\Exception\MonadicRepositoryException;
 use Marcosh\LamPHPda\Either;
 
 /**
@@ -23,11 +22,6 @@
  */
 final class MonadicStandardRepository implements MonadicStandardRepositoryInterface
 {
-    /**
-     * @var MonadicServiceRepositoryHelperInterface<L, R>
-     */
-    private MonadicServiceRepositoryHelperInterface $monadicServiceRepositoryHelper;
-
     /**
      * @var ObjectRepository<R>
      */
@@ -41,26 +35,29 @@ public function __construct(
         string $entityClass
     ) {
         $this->objectRepository = $entityManager->getRepository($entityClass);
-        $this->monadicServiceRepositoryHelper = new MonadicServiceRepositoryHelper();
     }
 
     public function find($id): Either
     {
-        return $this
-            ->monadicServiceRepositoryHelper
-            ->eitherFind(
-                $this->objectRepository,
-                $id
-            );
+        return (null === $entity = $this->objectRepository->find($id))
+            ? Either::left(
+                MonadicRepositoryException::entityNotFoundWithSuchId(
+                    $this->objectRepository->getClassName(),
+                    (string) $id
+                )
+            )
+            : Either::right($entity);
     }
 
     public function findAll(): Either
     {
-        return $this
-            ->monadicServiceRepositoryHelper
-            ->eitherFindAll(
-                $this->objectRepository,
-            );
+        return ([] === $entities = $this->objectRepository->findAll())
+            ? Either::left(
+                MonadicRepositoryException::entityNotFound(
+                    $this->objectRepository->getClassName()
+                )
+            )
+            : Either::right($entities);
     }
 
     public function findBy(
@@ -69,26 +66,27 @@ public function findBy(
         ?int $limit = null,
         ?int $offset = null
     ): Either {
-        return $this
-            ->monadicServiceRepositoryHelper
-            ->eitherFindBy(
-                $this->objectRepository,
-                $criteria,
-                $orderBy,
-                $limit,
-                $offset
-            );
+        return ([] === $entities = $this->objectRepository->findBy($criteria, $orderBy, $limit, $offset))
+            ? Either::left(
+                MonadicRepositoryException::entityNotFoundWithSuchCriteria(
+                    $this->objectRepository->getClassName(),
+                    $criteria
+                )
+            )
+            : Either::right($entities);
     }
 
     public function findOneBy(
         array $criteria
     ): Either {
-        return $this
-            ->monadicServiceRepositoryHelper
-            ->eitherFindOneBy(
-                $this->objectRepository,
-                $criteria
-            );
+        return (null === $entity = $this->objectRepository->findOneBy($criteria))
+            ? Either::left(
+                MonadicRepositoryException::entityNotFoundWithSuchCriteria(
+                    $this->objectRepository->getClassName(),
+                    $criteria
+                )
+            )
+            : Either::right($entity);
     }
 
     public function getClassName(): string

diff --git a/src/MonadicServiceEntityRepositoryTrait.php b/src/MonadicServiceEntityRepositoryTrait.php
diff --git a/src/MonadicStandardRepositoryFactory.php b/src/MonadicStandardRepositoryFactory.php
diff --git a/src/MonadicStandardRepositoryFactoryInterface.php b/src/MonadicStandardRepositoryFactoryInterface.php