Merge branch 'master' into dev-mapper

fykosak · Jul 31, 2023 · a2b95b8 · a2b95b8
2 parents 01964fe + 6db16a6
commit a2b95b8
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 29 deletions.
diff --git a/.github/workflows/php-psr.yml b/.github/workflows/php-psr.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1']
+        php: [ '8.1']
     steps:
       - uses: actions/checkout@v2
         name: Checkout

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1']
+        php: [ '8.1']
         database: [ 'mysql' ]
     steps:
       # MariaDB container has to be started in advance to initialize itself before using it.

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "type": "library",
   "license": "GPL-3.0-or-later",
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.1",
     "nette/di": "^3.0",
     "nette/database": "^3.1",
     "ext-pdo": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Exceptions/CannotAccessModelException.php b/src/Exceptions/CannotAccessModelException.php
@@ -9,7 +9,6 @@
 
 class CannotAccessModelException extends RuntimeException
 {
-
     public function __construct(string $modelClassName, object $model, int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct(

diff --git a/src/Extension.php b/src/Extension.php
@@ -10,7 +10,6 @@
 
 class Extension extends CompilerExtension
 {
-
     /**
      * @throws NotImplementedException
      */

diff --git a/src/Model.php b/src/Model.php
@@ -35,11 +35,14 @@ public function &__get(string $key)
         $docs = ModelRelationsParser::parseModelDoc($selfReflection);
         if (!is_null($value) && isset($docs[$key])) {
             $item = $docs[$key];
-            if ($value instanceof ActiveRow && $item['type']->isClass()) {
-                /** @var \ReflectionClass<object> $returnType */
-                $returnType = $item['reflection'];
-                if ($returnType->isSubclassOf(self::class)) {
-                    $value = $returnType->newInstance($value->toArray(), $value->getTable());
+            if ($item['type']->isClass()) {
+                $returnType =  $item['reflection'];
+                if ($value instanceof ActiveRow) {
+                    if ($returnType->isSubclassOf(self::class)) {
+                        $value = $returnType->newInstance($value->toArray(), $value->getTable());
+                    }
+                } elseif ($returnType->isSubclassOf(\BackedEnum::class)) {
+                    $value = $returnType->getMethod('tryFrom')->invoke($returnType, $value);
                 }
             }
         }

diff --git a/src/Service.php b/src/Service.php
@@ -29,10 +29,9 @@ final public function __construct(string $tableName, Explorer $explorer, Mapper
     }
 
     /**
-     * @param string|int|null $key
      * @phpstan-return M|null
      */
-    public function findByPrimary($key): ?Model
+    public function findByPrimary(int|string|null $key): ?Model
     {
         return isset($key) ? $this->getTable()->get($key) : null;
     }
@@ -119,7 +118,11 @@ protected function filterData(array $data): array
         foreach ($this->getColumnMetadata() as $column) {
             $name = $column['name'];
             if (array_key_exists($name, $data)) {
-                $result[$name] = $data[$name];
+                if ($data[$name] instanceof \BackedEnum) {
+                    $result[$name] = $data[$name]->value;
+                } else {
+                    $result[$name] = $data[$name];
+                }
             }
         }
         return $result;

diff --git a/tests/ORM/EventModel.php b/tests/ORM/EventModel.php
@@ -6,6 +6,9 @@
 
 use Fykosak\NetteORM\Model;
 
+/**
+ *
+ */
 class EventModel extends Model
 {
 }
diff --git a/tests/ORM/ParticipantModel.php b/tests/ORM/ParticipantModel.php
@@ -7,7 +7,8 @@
 use Fykosak\NetteORM\Model;
 
 /**
- * @property-read EventModel $event
+ * @property-read EventModel event
+ * @property-read ParticipantStatus status
  */
 class ParticipantModel extends Model
 {

diff --git a/tests/ORM/ParticipantStatus.php b/tests/ORM/ParticipantStatus.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fykosak\NetteORM\Tests\ORM;
+
+enum ParticipantStatus: string
+{
+    case Applied = 'applied';
+    case Cancelled = 'cancelled';
+}
diff --git a/tests/Tests/ModelTest.phpt b/tests/Tests/ModelTest.phpt
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fykosak\NetteORM\Tests\Tests;
+
+use Fykosak\NetteORM\Tests\ORM\ParticipantModel;
+use Fykosak\NetteORM\Tests\ORM\ParticipantService;
+use Fykosak\NetteORM\Tests\ORM\ParticipantStatus;
+use Tester\Assert;
+
+require_once __DIR__ . '/TestCase.php';
+
+class ModelTest extends TestCase
+{
+    public function testCreateFromEnum(): void
+    {
+        /** @var ParticipantService $serviceParticipant */
+        $serviceParticipant = $this->container->getByType(ParticipantService::class);
+        $countBefore = $serviceParticipant->getTable()->count('*');
+
+        $newEvent = $serviceParticipant->storeModel(
+            ['event_id' => 1, 'name' => 'Igor', 'status' => ParticipantStatus::Cancelled]
+        );
+        $countAfter = $serviceParticipant->getTable()->count('*');
+
+        Assert::same($countBefore + 1, $countAfter);
+        Assert::type(ParticipantModel::class, $newEvent);
+        Assert::same(ParticipantStatus::Cancelled, $newEvent->status);
+    }
+}
+
+$testCase = new ModelTest();
+$testCase->run();
diff --git a/tests/Tests/ReferencedAccessTest.phpt b/tests/Tests/ReferencedAccessTest.phpt
@@ -6,16 +6,15 @@ namespace Fykosak\NetteORM\Tests\Tests;
 
 use Fykosak\NetteORM\Exceptions\CannotAccessModelException;
 use Fykosak\NetteORM\Tests\ORM\EventModel;
-use Fykosak\NetteORM\Tests\ORM\ParticipantModel;
 use Fykosak\NetteORM\Tests\ORM\EventService;
+use Fykosak\NetteORM\Tests\ORM\ParticipantModel;
 use Fykosak\NetteORM\Tests\ORM\ParticipantService;
 use Tester\Assert;
 
 require_once __DIR__ . '/TestCase.php';
 
 class ReferencedAccessTest extends TestCase
 {
-
     public function testSuccess(): void
     {
         /** @var ParticipantService $serviceParticipant */

diff --git a/tests/resource/schema.sql b/tests/resource/schema.sql
@@ -1,17 +1,21 @@
 CREATE DATABASE IF NOT EXISTS `nette_orm_test`;
 
 USE `nette_orm_test`;
-CREATE TABLE IF NOT EXISTS `event`
+DROP TABLE IF EXISTS `participant`;
+DROP TABLE IF EXISTS `event`;
+
+CREATE TABLE `event`
 (
     `event_id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
     `begin`    DATETIME                       NOT NULL,
     `end`      DATETIME                       NOT NULL
 ) ENGINE = InnoDB;
 
-CREATE TABLE IF NOT EXISTS `participant`
+CREATE TABLE `participant`
 (
     `participant_id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
     `event_id`       INT                            NOT NULL,
+    `status`         ENUM ('applied','cancelled')   NOT NULL DEFAULT 'applied',
     `name`           VARCHAR(64),
     CONSTRAINT `fk_participant_event`
         FOREIGN KEY (`event_id`)