Merge branch 'develop'

janpecha · janpecha · commit 4a0d14e427ed · 2019-05-14T15:05:54.000+02:00
diff --git a/src/LeanMapper/Reflection/PropertyFactory.php b/src/LeanMapper/Reflection/PropertyFactory.php
@@ -112,7 +112,7 @@ public static function createFromAnnotation($annotationType, $annotation, Entity
 
             foreach ($flagMatches as $match) {
                 if ($match[1] === 'belongsToOne' || $match[1] === 'belongsToMany') {
-                    $isWritable = FALSE;
+                    $isWritable = false;
                     break;
                 }
             }
diff --git a/src/LeanMapper/Reflection/PropertyMethods.php b/src/LeanMapper/Reflection/PropertyMethods.php
@@ -24,14 +24,14 @@ class PropertyMethods
     /** @var string */
     private $getter;
 
-    /** @var string|NULL */
+    /** @var string|null */
     private $setter;
 
 
 
     /**
      * @param  string
-     * @param  string|NULL
+     * @param  string|null
      */
     public function __construct($getter, $setter)
     {
@@ -76,7 +76,7 @@ public static function createFromDefinition($propertyName, $isWritable, $definit
     {
         $ucName = ucfirst($propertyName);
         $getter = 'get' . $ucName;
-        $setter = NULL;
+        $setter = null;
         if ($isWritable) {
             $setter = 'set' . $ucName;
         }
diff --git a/src/LeanMapper/Repository.php b/src/LeanMapper/Repository.php
@@ -353,7 +353,7 @@ protected function createEntities(array $rows, $entityClass = null, $table = nul
         }
         $entities = [];
         $collection = Result::createInstance($rows, $table, $this->connection, $this->mapper);
-        $primaryKey = $this->mapper->getPrimaryKey($this->getTable());
+        $primaryKey = $this->mapper->getPrimaryKey($table);
         if ($entityClass !== null) {
             foreach ($rows as $dibiRow) {
                 $entity = $this->entityFactory->createEntity(
@@ -366,7 +366,7 @@ protected function createEntities(array $rows, $entityClass = null, $table = nul
         } else {
             foreach ($rows as $dibiRow) {
                 $row = $collection->getRow($dibiRow->$primaryKey);
-                $entityClass = $this->mapper->getEntityClass($this->getTable(), $row);
+                $entityClass = $this->mapper->getEntityClass($table, $row);
                 $entity = $this->entityFactory->createEntity($entityClass, $row);
                 $entity->makeAlive($this->entityFactory);
                 $entities[$dibiRow->$primaryKey] = $entity;
diff --git a/tests/LeanMapper/DI.extension.phpt b/tests/LeanMapper/DI.extension.phpt
@@ -49,7 +49,7 @@ $mapper = $container->getService('LeanMapper.mapper');
 /// debug mode + FileLogger
 $configurator = new Configurator;
 $configurator->setTempDirectory(TEMP_DIR);
-$configurator->setDebugMode(TRUE);
+$configurator->setDebugMode(true);
 $configurator->addParameters([
     'container' => ['class' => 'SystemContainer_' . Random::generate()],
 ]);
diff --git a/tests/LeanMapper/Entity.enum.3.phpt b/tests/LeanMapper/Entity.enum.3.phpt
@@ -31,14 +31,14 @@ $author = new Author;
 $author->state = Author::STATE_ACTIVE;
 Assert::equal(Author::STATE_ACTIVE, $author->state);
 
-$author->state = NULL;
-Assert::equal(NULL, $author->state);
+$author->state = null;
+Assert::equal(null, $author->state);
 
 $author->finalState = Author::STATE_DELETED;
 Assert::equal(Author::STATE_DELETED, $author->finalState);
 
 Assert::exception(function () use ($author) {
 
-    $author->finalState = NULL;
+    $author->finalState = null;
 
 }, 'LeanMapper\Exception\InvalidValueException', "Property 'finalState' in entity Author cannot be null.");
diff --git a/tests/LeanMapper/Entity.passThru.implicit.datetime.phpt b/tests/LeanMapper/Entity.passThru.implicit.datetime.phpt
@@ -15,7 +15,7 @@ class Book extends LeanMapper\Entity
 {
     protected function decodeRowValue($value, Property $property)
     {
-        if (is_a($property->getType(), 'DateTime', TRUE)) {
+        if (is_a($property->getType(), 'DateTime', true)) {
             if ($value instanceof DateTime) {
                 return clone $value;
             }
@@ -28,7 +28,7 @@ class Book extends LeanMapper\Entity
 
     protected function encodeRowValue($value, Property $property)
     {
-        if (is_a($property->getType(), 'DateTime', TRUE)) {
+        if (is_a($property->getType(), 'DateTime', true)) {
             if ($value instanceof DateTime) {
                 return $value->format('Y-m-d');
             }
diff --git a/tests/LeanMapper/Entity.passThru.implicit.json.phpt b/tests/LeanMapper/Entity.passThru.implicit.json.phpt
@@ -36,7 +36,7 @@ class Book extends LeanMapper\Entity
     protected function convertJson($value)
     {
         if (is_string($value)) {
-            return (array) json_decode($value, TRUE);
+            return (array) json_decode($value, true);
         }
 
         return json_encode((array) $value);
diff --git a/tests/LeanMapper/Entity.passThru.implicit.phpt b/tests/LeanMapper/Entity.passThru.implicit.phpt
@@ -25,22 +25,22 @@ class Book extends LeanMapper\Entity
             return $this->convertJson($value);
         }
 
-        if (is_a($type, 'DateTime', TRUE)) {
+        if (is_a($type, 'DateTime', true)) {
             if ($value instanceof DateTime) {
                 return clone $value;
             }
             return new DateTime($value);
         }
 
-        if (is_a($type, 'Uuid', TRUE)) {
+        if (is_a($type, 'Uuid', true)) {
             return ($value instanceof Uuid) ? $value : new Uuid($value);
         }
 
-        if (is_a($type, 'Time', TRUE)) {
+        if (is_a($type, 'Time', true)) {
             return ($value instanceof Time) ? $value->getTime() : new Time($value);
         }
 
-        if (!$property->isBasicType() && is_a($type, 'Integer', TRUE)) { // is_a() accepts 'integer' as class name
+        if (!$property->isBasicType() && is_a($type, 'Integer', true)) { // is_a() accepts 'integer' as class name
             return $this->convertToInteger($value);
         }
 
@@ -56,22 +56,22 @@ class Book extends LeanMapper\Entity
             return $this->convertJson($value);
         }
 
-        if (is_a($type, 'DateTime', TRUE)) {
+        if (is_a($type, 'DateTime', true)) {
             if ($value instanceof DateTime) {
                 return $value->format('Y-m-d');
             }
             return $value;
         }
 
-        if (is_a($type, 'Uuid', TRUE)) {
+        if (is_a($type, 'Uuid', true)) {
             return ($value instanceof Uuid) ? $value : new Uuid($value);
         }
 
-        if (is_a($type, 'Time', TRUE)) {
+        if (is_a($type, 'Time', true)) {
             return ($value instanceof Time) ? $value->getTime() : new Time($value);
         }
 
-        if (!$property->isBasicType() && is_a($type, 'Integer', TRUE)) { // is_a() accepts 'integer' as class name
+        if (!$property->isBasicType() && is_a($type, 'Integer', true)) { // is_a() accepts 'integer' as class name
             return $this->convertToInteger($value);
         }
 
diff --git a/tests/LeanMapper/Entity.passThru.type-change.2.phpt b/tests/LeanMapper/Entity.passThru.type-change.2.phpt
@@ -15,13 +15,13 @@ class Foo extends LeanMapper\Entity
 {
     protected function jsonEncodeData($data)
     {
-        return !empty($data) ? json_encode($data) : NULL;
+        return !empty($data) ? json_encode($data) : null;
     }
 
 
     protected function jsonDecodeData($data)
     {
-        return !empty($data) ? json_decode($data, TRUE) : [];
+        return !empty($data) ? json_decode($data, true) : [];
     }
 }
 
diff --git a/tests/LeanMapper/Property.custom-factory.phpt b/tests/LeanMapper/Property.custom-factory.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . '/../bootstrap.php';
 
 class CustomReflectionProvider extends LeanMapper\DefaultEntityReflectionProvider
 {
-    /** @var PropertyFilters|NULL */
+    /** @var PropertyFilters|null */
     public static $customFilters;
 
 
@@ -50,7 +50,7 @@ class CustomReflectionProvider extends LeanMapper\DefaultEntityReflectionProvide
         $customFlags
     )
     {
-        if ($propertyFilters !== NULL) {
+        if ($propertyFilters !== null) {
             $propertyFilters = self::$customFilters;
         }
         return new Property(
diff --git a/tests/LeanMapper/Repository.entityType.2.phpt b/tests/LeanMapper/Repository.entityType.2.phpt
@@ -0,0 +1,127 @@
+<?php
+
+use LeanMapper\Repository;
+use Tester\Assert;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+//////////
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property string|null $web
+ */
+class Author extends LeanMapper\Entity
+{
+}
+
+/**
+ * @property int $id
+ * @property string $name
+ */
+class Book extends LeanMapper\Entity
+{
+}
+
+class LibraryRepository extends Repository
+{
+
+    public function findAuthor($id)
+    {
+        return $this->find('author', $id);
+    }
+
+
+    public function findBook($id)
+    {
+        return $this->find('book', $id);
+    }
+
+
+    public function findAuthors()
+    {
+        return $this->findAll('author');
+    }
+
+
+    public function findBooks()
+    {
+        return $this->findAll('book');
+    }
+
+
+    private function find($table, $id)
+    {
+        $row = $this->connection->select('*')->from($table)->where('id = %i', $id)->fetch();
+
+        if ($row === false) {
+            throw new \Exception('Entity was not found.');
+        }
+
+        return $this->createEntity($row, null, $table);
+    }
+
+
+    private function findAll($table)
+    {
+        return $this->createEntities(
+            $this->connection->select('*')->from($table)->orderBy('id')->fetchAll(),
+            null,
+            $table
+        );
+    }
+
+}
+
+//////////
+
+$repository = new LibraryRepository($connection, $mapper, $entityFactory);
+
+$authors = $repository->findAuthors();
+$names = [];
+
+foreach ($authors as $author) {
+    Assert::type('Author', $author);
+    $names[] = $author->name;
+}
+
+Assert::same([
+    'Andrew Hunt',
+    'Donald Knuth',
+    'Martin Fowler',
+    'Kent Beck',
+    'Thomas H. Cormen',
+], $names);
+
+//////////
+
+$books = $repository->findBooks();
+$names = [];
+
+foreach ($books as $book) {
+    Assert::type('Book', $book);
+    $names[] = $book->name;
+}
+
+Assert::same([
+    'The Pragmatic Programmer',
+    'The Art of Computer Programming',
+    'Refactoring: Improving the Design of Existing Code',
+    'Introduction to Algorithms',
+    'UML Distilled',
+], $names);
+
+//////////
+
+$author = $repository->findAuthor(3);
+Assert::type('Author', $author);
+Assert::same(3, $author->id);
+Assert::same('Martin Fowler', $author->name);
+
+//////////
+
+$book = $repository->findBook(2);
+Assert::type('Book', $book);
+Assert::same(2, $book->id);
+Assert::same('The Art of Computer Programming', $book->name);
diff --git a/tests/LeanMapper/Repository.entityType.3.phpt b/tests/LeanMapper/Repository.entityType.3.phpt
diff --git a/tests/LeanMapper/Result.isModified.custom.phpt b/tests/LeanMapper/Result.isModified.custom.phpt
diff --git a/tests/libs/DummyDrivers.php b/tests/libs/DummyDrivers.php
diff --git a/tools/code-checker.php b/tools/code-checker.php

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public static function createFromAnnotation($annotationType, $annotation, Entity`
`112`	`112`
`113`	`113`	`foreach ($flagMatches as $match) {`
`114`	`114`	`if ($match[1] === 'belongsToOne' \|\| $match[1] === 'belongsToMany') {`
`115`		`- $isWritable = FALSE;`
	`115`	`+ $isWritable = false;`
`116`	`116`	`break;`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Book extends LeanMapper\Entity`
`15`	`15`	`{`
`16`	`16`	`protected function decodeRowValue($value, Property $property)`
`17`	`17`	`{`
`18`		`- if (is_a($property->getType(), 'DateTime', TRUE)) {`
	`18`	`+ if (is_a($property->getType(), 'DateTime', true)) {`
`19`	`19`	`if ($value instanceof DateTime) {`
`20`	`20`	`return clone $value;`
`21`	`21`	`}`
`@@ -28,7 +28,7 @@ class Book extends LeanMapper\Entity`
`28`	`28`
`29`	`29`	`protected function encodeRowValue($value, Property $property)`
`30`	`30`	`{`
`31`		`- if (is_a($property->getType(), 'DateTime', TRUE)) {`
	`31`	`+ if (is_a($property->getType(), 'DateTime', true)) {`
`32`	`32`	`if ($value instanceof DateTime) {`
`33`	`33`	`return $value->format('Y-m-d');`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class Book extends LeanMapper\Entity`
`36`	`36`	`protected function convertJson($value)`
`37`	`37`	`{`
`38`	`38`	`if (is_string($value)) {`
`39`		`- return (array) json_decode($value, TRUE);`
	`39`	`+ return (array) json_decode($value, true);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`return json_encode((array) $value);`
Original file line number	Diff line number	Diff line change
`@@ -25,22 +25,22 @@ class Book extends LeanMapper\Entity`
`25`	`25`	`return $this->convertJson($value);`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (is_a($type, 'DateTime', TRUE)) {`
	`28`	`+ if (is_a($type, 'DateTime', true)) {`
`29`	`29`	`if ($value instanceof DateTime) {`
`30`	`30`	`return clone $value;`
`31`	`31`	`}`
`32`	`32`	`return new DateTime($value);`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (is_a($type, 'Uuid', TRUE)) {`
	`35`	`+ if (is_a($type, 'Uuid', true)) {`
`36`	`36`	`return ($value instanceof Uuid) ? $value : new Uuid($value);`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (is_a($type, 'Time', TRUE)) {`
	`39`	`+ if (is_a($type, 'Time', true)) {`
`40`	`40`	`return ($value instanceof Time) ? $value->getTime() : new Time($value);`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (!$property->isBasicType() && is_a($type, 'Integer', TRUE)) { // is_a() accepts 'integer' as class name`
	`43`	`+ if (!$property->isBasicType() && is_a($type, 'Integer', true)) { // is_a() accepts 'integer' as class name`
`44`	`44`	`return $this->convertToInteger($value);`
`45`	`45`	`}`
`46`	`46`
`@@ -56,22 +56,22 @@ class Book extends LeanMapper\Entity`
`56`	`56`	`return $this->convertJson($value);`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (is_a($type, 'DateTime', TRUE)) {`
	`59`	`+ if (is_a($type, 'DateTime', true)) {`
`60`	`60`	`if ($value instanceof DateTime) {`
`61`	`61`	`return $value->format('Y-m-d');`
`62`	`62`	`}`
`63`	`63`	`return $value;`
`64`	`64`	`}`
`65`	`65`
`66`		`- if (is_a($type, 'Uuid', TRUE)) {`
	`66`	`+ if (is_a($type, 'Uuid', true)) {`
`67`	`67`	`return ($value instanceof Uuid) ? $value : new Uuid($value);`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (is_a($type, 'Time', TRUE)) {`
	`70`	`+ if (is_a($type, 'Time', true)) {`
`71`	`71`	`return ($value instanceof Time) ? $value->getTime() : new Time($value);`
`72`	`72`	`}`
`73`	`73`
`74`		`- if (!$property->isBasicType() && is_a($type, 'Integer', TRUE)) { // is_a() accepts 'integer' as class name`
	`74`	`+ if (!$property->isBasicType() && is_a($type, 'Integer', true)) { // is_a() accepts 'integer' as class name`
`75`	`75`	`return $this->convertToInteger($value);`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ class Foo extends LeanMapper\Entity`
`15`	`15`	`{`
`16`	`16`	`protected function jsonEncodeData($data)`
`17`	`17`	`{`
`18`		`- return !empty($data) ? json_encode($data) : NULL;`
	`18`	`+ return !empty($data) ? json_encode($data) : null;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`
`22`	`22`	`protected function jsonDecodeData($data)`
`23`	`23`	`{`
`24`		`- return !empty($data) ? json_decode($data, TRUE) : [];`
	`24`	`+ return !empty($data) ? json_decode($data, true) : [];`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ require_once __DIR__ . '/../bootstrap.php';`
`13`	`13`
`14`	`14`	`class CustomReflectionProvider extends LeanMapper\DefaultEntityReflectionProvider`
`15`	`15`	`{`
`16`		`- /** @var PropertyFilters\|NULL */`
	`16`	`+ /** @var PropertyFilters\|null */`
`17`	`17`	`public static $customFilters;`
`18`	`18`
`19`	`19`
`@@ -50,7 +50,7 @@ class CustomReflectionProvider extends LeanMapper\DefaultEntityReflectionProvide`
`50`	`50`	`$customFlags`
`51`	`51`	`)`
`52`	`52`	`{`
`53`		`- if ($propertyFilters !== NULL) {`
	`53`	`+ if ($propertyFilters !== null) {`
`54`	`54`	`$propertyFilters = self::$customFilters;`
`55`	`55`	`}`
`56`	`56`	`return new Property(`