Update to new QA standards

WyriHaximus · WyriHaximus · commit 1fbb57642fb9 · 2019-09-11T17:27:45.000+02:00
diff --git a/.php_cs b/.php_cs
@@ -17,5 +17,8 @@ return (function (): Config
                 ->append($paths)
         )
         ->setUsingCache(false)
-        ;
+        ->setRules([
+            'native_function_invocation' => false,
+        ])
+    ;
 })();
diff --git a/infection.json.dist b/infection.json.dist
@@ -58,6 +58,11 @@
                  "WyriHaximus\\React\\SimpleORM\\Repository::buildTree",
                  "WyriHaximus\\React\\SimpleORM\\Repository::buildJoins"
              ]
+         },
+         "Continue_": {
+             "ignore": [
+                 "WyriHaximus\\React\\SimpleORM\\Repository::buildJoins"
+             ]
          }
      }
 }
diff --git a/src/Annotation/Clause.php b/src/Annotation/Clause.php
@@ -29,12 +29,15 @@ final class Clause
     /** @var string|null */
     private $foreign_function;
 
-    public function __construct(array $table)
+    /**
+     * @param array[] $clause
+     */
+    public function __construct(array $clause)
     {
         /** @psalm-suppress RawObjectIteration */
         foreach ($this as $name => $value) {
-            if (isset($table[$name])) {
-                $this->$name = $table[$name];
+            if (array_key_exists($name, $clause)) {
+                $this->$name = $clause[$name];
             }
         }
     }
diff --git a/src/Annotation/InnerJoin.php b/src/Annotation/InnerJoin.php
@@ -23,12 +23,15 @@ final class InnerJoin implements JoinInterface
     /** @var bool */
     private $lazy = self::IS_NOT_LAZY;
 
-    public function __construct(array $table)
+    /**
+     * @param array[] $innerJoin
+     */
+    public function __construct(array $innerJoin)
     {
         /** @psalm-suppress RawObjectIteration */
         foreach ($this as $name => $value) {
-            if (isset($table[$name])) {
-                $this->$name = $table[$name];
+            if (array_key_exists($name, $innerJoin)) {
+                $this->$name = $innerJoin[$name];
             }
         }
     }
diff --git a/src/Annotation/LeftJoin.php b/src/Annotation/LeftJoin.php
@@ -23,12 +23,15 @@ final class LeftJoin implements JoinInterface
     /** @var bool */
     private $lazy = self::IS_NOT_LAZY;
 
-    public function __construct(array $table)
+    /**
+     * @param array[] $leftJoin
+     */
+    public function __construct(array $leftJoin)
     {
         /** @psalm-suppress RawObjectIteration */
         foreach ($this as $name => $value) {
-            if (isset($table[$name])) {
-                $this->$name = $table[$name];
+            if (array_key_exists($name, $leftJoin)) {
+                $this->$name = $leftJoin[$name];
             }
         }
     }
diff --git a/src/Annotation/Table.php b/src/Annotation/Table.php
@@ -13,6 +13,9 @@ final class Table
     /** @var string */
     private $table;
 
+    /**
+     * @param string[] $table
+     */
     public function __construct(array $table)
     {
         $this->table = \current($table);
diff --git a/src/Client.php b/src/Client.php
@@ -28,7 +28,7 @@ public function __construct(PgClient $client, ?Reader $annotationReader = null)
 
     public function getRepository(string $entity): RepositoryInterface
     {
-        if (!isset($this->repositories[$entity])) {
+        if (!array_key_exists($entity, $this->repositories)) {
             $this->repositories[$entity] = new Repository($this->entityInspector->getEntity($entity), $this);
         }
 
diff --git a/src/Entity/Join.php b/src/Entity/Join.php
@@ -22,6 +22,13 @@ final class Join
     /** @var Clause[] */
     private $clause;
 
+    /**
+     * @param InspectedEntityInterface $entity
+     * @param string $type
+     * @param string $property
+     * @param bool $lazy
+     * @param array<int, Clause> $clause
+     */
     public function __construct(InspectedEntityInterface $entity, string $type, string $property, bool $lazy, Clause ...$clause)
     {
         $this->entity = $entity;
diff --git a/src/EntityInspector.php b/src/EntityInspector.php
@@ -27,7 +27,7 @@ public function __construct(Reader $annotationReader)
 
     public function getEntity(string $entity): InspectedEntityInterface
     {
-        if (!isset($this->entities[$entity])) {
+        if (!array_key_exists($entity, $this->entities)) {
             /** @psalm-suppress ArgumentTypeCoercion */
             $class = new ReflectionClass($entity);
             $tableAnnotation = $this->annotationReader->getClassAnnotation($class, Table::class);
@@ -48,11 +48,17 @@ public function getEntity(string $entity): InspectedEntityInterface
         return $this->entities[$entity];
     }
 
+    /**
+     * @param ReflectionClass $class
+     * @param Join[] $joins
+     *
+     * @return iterable
+     */
     private function getFields(ReflectionClass $class, array $joins): iterable
     {
         /** @var ReflectionProperty $property */
         foreach ($class->getProperties() as $property) {
-            if (isset($joins[$property->getName()])) {
+            if (array_key_exists($property->getName(), $joins)) {
                 continue;
             }
 
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -11,10 +11,16 @@ final class Hydrator
     /** @var string[] */
     private $hydrators = [];
 
+    /**
+     * @param InspectedEntityInterface $inspectedEntity
+     * @param mixed[] $data
+     *
+     * @return EntityInterface
+     */
     public function hydrate(InspectedEntityInterface $inspectedEntity, array $data): EntityInterface
     {
         $class = $inspectedEntity->getClass();
-        if (!isset($this->hydrators[$class])) {
+        if (!array_key_exists($class, $this->hydrators)) {
             /**
              * @psalm-suppress MissingClosureReturnType
              * @psalm-suppress InvalidPropertyAssignmentValue
@@ -28,7 +34,7 @@ public function hydrate(InspectedEntityInterface $inspectedEntity, array $data):
         }
 
         foreach ($data as $key => $value) {
-            if (isset($inspectedEntity->getFields()[$key])) {
+            if (array_key_exists($key, $inspectedEntity->getFields())) {
                 $data[$key] = $this->castValueToCorrectType($inspectedEntity->getFields()[$key], $value);
             }
         }
@@ -49,6 +55,12 @@ public function hydrate(InspectedEntityInterface $inspectedEntity, array $data):
         return $this->hydrators[$class]->hydrate($data, new $class());
     }
 
+    /**
+     * @param InspectedEntityInterface $inspectedEntity
+     * @param EntityInterface $entity
+     *
+     * @return mixed[]
+     */
     public function extract(InspectedEntityInterface $inspectedEntity, EntityInterface $entity): array
     {
         $class = $inspectedEntity->getClass();
diff --git a/src/InspectedEntity.php b/src/InspectedEntity.php
@@ -19,6 +19,13 @@ final class InspectedEntity implements InspectedEntityInterface
     /** @var Join[] */
     private $joins = [];
 
+    /**
+     * InspectedEntity constructor.
+     * @param string $class
+     * @param string $table
+     * @param Field[] $fields
+     * @param Join[] $joins
+     */
     public function __construct(string $class, string $table, array $fields, array $joins)
     {
         $this->class = $class;
diff --git a/src/Repository.php b/src/Repository.php
@@ -10,6 +10,7 @@
 use Rx\Observable;
 use Rx\Scheduler\ImmediateScheduler;
 use WyriHaximus\React\SimpleORM\Annotation\JoinInterface;
+use function Safe\substr;
 
 final class Repository implements RepositoryInterface
 {
@@ -114,6 +115,12 @@ public function update(EntityInterface $entity): PromiseInterface
         });
     }
 
+    /**
+     * @param mixed[] $where
+     * @param mixed[] $order
+     *
+     * @return QueryBuilder
+     */
     private function buildSelectQuery(array $where = [], array $order = []): QueryBuilder
     {
         $query = $this->getBaseQuery();
@@ -175,7 +182,7 @@ private function buildJoins(QueryBuilder $query, InspectedEntityInterface $entit
             }
 
             $tableKey = \spl_object_hash($join->getEntity()) . '___' . $join->getProperty();
-            if (!isset($this->tableAliases[$tableKey])) {
+            if (!array_key_exists($tableKey, $this->tableAliases)) {
                 $this->tableAliases[$tableKey] = 't' . $i++;
             }
 
@@ -234,6 +241,11 @@ private function fetchAndHydrate(QueryBuilder $query): Observable
         });
     }
 
+    /**
+     * @param mixed[] $row
+     *
+     * @return mixed[]
+     */
     private function inflate(array $row): array
     {
         $tables = [];
@@ -246,6 +258,13 @@ private function inflate(array $row): array
         return $tables;
     }
 
+    /**
+     * @param mixed[] $row
+     * @param InspectedEntityInterface $entity
+     * @param string $tableKeySuffix
+     *
+     * @return mixed[]
+     */
     private function buildTree(array $row, InspectedEntityInterface $entity, string $tableKeySuffix = 'root'): array
     {
         $tableKey = \spl_object_hash($entity) . '___' . $tableKeySuffix;
@@ -291,8 +310,7 @@ private function buildTree(array $row, InspectedEntityInterface $entity, string
                     $this->client
                         ->getRepository($join->getEntity()
                             ->getClass())
-                        ->fetch($where)
-                        ->take(1)
+                        ->fetch($where, [], self::SINGLE)
                         ->toPromise()
                         ->then($resolve, $reject);
                 });
@@ -328,9 +346,14 @@ private function translateFieldName(string $name): string
             return 't0.' . $name;
         }
 
-        return \substr($name, 0, $pos + 1) . 't0.' . \substr($name, $pos + 1);
+        return substr($name, 0, $pos + 1) . 't0.' . substr($name, $pos + 1);
     }
 
+    /**
+     * @param mixed[] $fields
+     *
+     * @return mixed[]
+     */
     private function prepareFields(array $fields): array
     {
         foreach ($fields as $key => $value) {
diff --git a/src/RepositoryInterface.php b/src/RepositoryInterface.php
@@ -11,10 +11,30 @@ interface RepositoryInterface
 
     public function count(): PromiseInterface;
 
+    /**
+     * @param int $page
+     * @param mixed[] $where
+     * @param mixed[] $order
+     * @param int $perPage
+     *
+     * @return Observable
+     */
     public function page(int $page, array $where = [], array $order = [], int $perPage = self::DEFAULT_PER_PAGE): Observable;
 
+    /**
+     * @param mixed[] $where
+     * @param mixed[] $order
+     * @param int $limit
+     *
+     * @return Observable
+     */
     public function fetch(array $where = [], array $order = [], int $limit = 0): Observable;
 
+    /**
+     * @param mixed[] $fields
+     *
+     * @return PromiseInterface
+     */
     public function create(array $fields): PromiseInterface;
 
     public function update(EntityInterface $entity): PromiseInterface;
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -11,6 +11,7 @@
 use WyriHaximus\React\Tests\SimpleORM\Stub\BlogPostStub;
 use WyriHaximus\React\Tests\SimpleORM\Stub\CommentStub;
 use WyriHaximus\React\Tests\SimpleORM\Stub\UserStub;
+use function Safe\sleep;
 
 /**
  * @internal
@@ -337,7 +338,7 @@ public function createUser(): void
      */
     public function increaseViews(): void
     {
-        \sleep(3);
+        sleep(3);
 
         $repository = $this->client->getRepository(BlogPostStub::class);
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,11 @@`
`58`	`58`	`"WyriHaximus\\React\\SimpleORM\\Repository::buildTree",`
`59`	`59`	`"WyriHaximus\\React\\SimpleORM\\Repository::buildJoins"`
`60`	`60`	`]`
	`61`	`+ },`
	`62`	`+ "Continue_": {`
	`63`	`+ "ignore": [`
	`64`	`+ "WyriHaximus\\React\\SimpleORM\\Repository::buildJoins"`
	`65`	`+ ]`
`61`	`66`	`}`
`62`	`67`	`}`
`63`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,15 @@ final class Clause`
`29`	`29`	`/** @var string\|null */`
`30`	`30`	`private $foreign_function;`
`31`	`31`
`32`		`- public function __construct(array $table)`
	`32`	`+ /**`
	`33`	`+ * @param array[] $clause`
	`34`	`+ */`
	`35`	`+ public function __construct(array $clause)`
`33`	`36`	`{`
`34`	`37`	`/** @psalm-suppress RawObjectIteration */`
`35`	`38`	`foreach ($this as $name => $value) {`
`36`		`- if (isset($table[$name])) {`
`37`		`- $this->$name = $table[$name];`
	`39`	`+ if (array_key_exists($name, $clause)) {`
	`40`	`+ $this->$name = $clause[$name];`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,15 @@ final class InnerJoin implements JoinInterface`
`23`	`23`	`/** @var bool */`
`24`	`24`	`private $lazy = self::IS_NOT_LAZY;`
`25`	`25`
`26`		`- public function __construct(array $table)`
	`26`	`+ /**`
	`27`	`+ * @param array[] $innerJoin`
	`28`	`+ */`
	`29`	`+ public function __construct(array $innerJoin)`
`27`	`30`	`{`
`28`	`31`	`/** @psalm-suppress RawObjectIteration */`
`29`	`32`	`foreach ($this as $name => $value) {`
`30`		`- if (isset($table[$name])) {`
`31`		`- $this->$name = $table[$name];`
	`33`	`+ if (array_key_exists($name, $innerJoin)) {`
	`34`	`+ $this->$name = $innerJoin[$name];`
`32`	`35`	`}`
`33`	`36`	`}`
`34`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,15 @@ final class LeftJoin implements JoinInterface`
`23`	`23`	`/** @var bool */`
`24`	`24`	`private $lazy = self::IS_NOT_LAZY;`
`25`	`25`
`26`		`- public function __construct(array $table)`
	`26`	`+ /**`
	`27`	`+ * @param array[] $leftJoin`
	`28`	`+ */`
	`29`	`+ public function __construct(array $leftJoin)`
`27`	`30`	`{`
`28`	`31`	`/** @psalm-suppress RawObjectIteration */`
`29`	`32`	`foreach ($this as $name => $value) {`
`30`		`- if (isset($table[$name])) {`
`31`		`- $this->$name = $table[$name];`
	`33`	`+ if (array_key_exists($name, $leftJoin)) {`
	`34`	`+ $this->$name = $leftJoin[$name];`
`32`	`35`	`}`
`33`	`36`	`}`
`34`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ final class Table`
`13`	`13`	`/** @var string */`
`14`	`14`	`private $table;`
`15`	`15`
	`16`	`+ /**`
	`17`	`+ * @param string[] $table`
	`18`	`+ */`
`16`	`19`	`public function __construct(array $table)`
`17`	`20`	`{`
`18`	`21`	`$this->table = \current($table);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(PgClient $client, ?Reader $annotationReader = null)`
`28`	`28`
`29`	`29`	`public function getRepository(string $entity): RepositoryInterface`
`30`	`30`	`{`
`31`		`- if (!isset($this->repositories[$entity])) {`
	`31`	`+ if (!array_key_exists($entity, $this->repositories)) {`
`32`	`32`	`$this->repositories[$entity] = new Repository($this->entityInspector->getEntity($entity), $this);`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(Reader $annotationReader)`
`27`	`27`
`28`	`28`	`public function getEntity(string $entity): InspectedEntityInterface`
`29`	`29`	`{`
`30`		`- if (!isset($this->entities[$entity])) {`
	`30`	`+ if (!array_key_exists($entity, $this->entities)) {`
`31`	`31`	`/** @psalm-suppress ArgumentTypeCoercion */`
`32`	`32`	`$class = new ReflectionClass($entity);`
`33`	`33`	`$tableAnnotation = $this->annotationReader->getClassAnnotation($class, Table::class);`
`@@ -48,11 +48,17 @@ public function getEntity(string $entity): InspectedEntityInterface`
`48`	`48`	`return $this->entities[$entity];`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ /**`
	`52`	`+ * @param ReflectionClass $class`
	`53`	`+ * @param Join[] $joins`
	`54`	`+ *`
	`55`	`+ * @return iterable`
	`56`	`+ */`
`51`	`57`	`private function getFields(ReflectionClass $class, array $joins): iterable`
`52`	`58`	`{`
`53`	`59`	`/** @var ReflectionProperty $property */`
`54`	`60`	`foreach ($class->getProperties() as $property) {`
`55`		`- if (isset($joins[$property->getName()])) {`
	`61`	`+ if (array_key_exists($property->getName(), $joins)) {`
`56`	`62`	`continue;`
`57`	`63`	`}`
`58`	`64`