Merge branch 'master' into select-count

cycle · Dec 7, 2021 · e3099fd · e3099fd
2 parents b7ea9a9 + 4018f8a
commit e3099fd
Show file tree

Hide file tree

Showing 19 changed files with 591 additions and 27 deletions.
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
@@ -51,7 +51,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -70,7 +70,7 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
           key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}

diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
@@ -54,7 +54,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -73,7 +73,7 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
           key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Restore Composer Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -23,10 +23,11 @@ jobs:
       - name: Check CS
         run: vendor/bin/spiral-cs check src tests
   test:
-    needs: lint
+    needs: sqlite
     name: Test PHP ${{ matrix.php-versions }} with Code Coverage
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         php-versions: ['7.2', '7.3', '7.4', '8.0']
     steps:
@@ -48,7 +49,7 @@ jobs:
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Restore Composer Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -66,10 +67,10 @@ jobs:
           file: ./coverage.xml
 
   sqlite:
-    needs: lint
     name: SQLite PHP ${{ matrix.php-versions }}
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         php-versions: ['7.2', '7.3', '7.4', '8.0']
     steps:
@@ -86,7 +87,7 @@ jobs:
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Restore Composer Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

diff --git a/src/ORM.php b/src/ORM.php
@@ -180,14 +180,12 @@ public function make(string $role, array $data = [], int $node = Node::NEW)
     }
 
     /**
-     * @inheritdoc
+     * @deprecated since Cycle ORM v1.8, this method will be removed in future releases.
+     * Use method {@see with} instead.
      */
     public function withFactory(FactoryInterface $factory): ORMInterface
     {
-        $orm = clone $this;
-        $orm->factory = $factory;
-
-        return $orm;
+        return $this->with(null, $factory);
     }
 
     /**
@@ -199,14 +197,12 @@ public function getFactory(): FactoryInterface
     }
 
     /**
-     * @inheritdoc
+     * @deprecated since Cycle ORM v1.8, this method will be removed in future releases.
+     * Use method {@see with} instead.
      */
     public function withSchema(SchemaInterface $schema): ORMInterface
     {
-        $orm = clone $this;
-        $orm->schema = $schema;
-
-        return $orm;
+        return $this->with($schema);
     }
 
     /**
@@ -222,12 +218,30 @@ public function getSchema(): SchemaInterface
     }
 
     /**
-     * @inheritdoc
+     * @deprecated since Cycle ORM v1.8, this method will be removed in future releases.
+     * Use method {@see with} instead.
      */
     public function withHeap(HeapInterface $heap): ORMInterface
     {
+        return $this->with(null, null, $heap);
+    }
+
+    public function with(
+        ?SchemaInterface $schema = null,
+        ?FactoryInterface $factory = null,
+        ?HeapInterface $heap = null
+    ): ORMInterface {
         $orm = clone $this;
-        $orm->heap = $heap;
+
+        if ($schema !== null) {
+            $orm->schema = $schema;
+        }
+        if ($factory !== null) {
+            $orm->factory = $factory;
+        }
+        if ($heap !== null) {
+            $orm->heap = $heap;
+        }
 
         return $orm;
     }

diff --git a/src/Schema.php b/src/Schema.php
@@ -141,6 +141,11 @@ protected function normalize(array $schema): array
                 $aliases[$item[self::ENTITY]] = $role;
             }
 
+            // Single Table Inheritance marker
+            if (isset($item[self::CHILDREN]) && !isset($item[self::COLUMNS]['_type'])) {
+                $item[self::COLUMNS]['_type'] = '_type';
+            }
+
             unset($item[self::ROLE]);
             $result[$role] = $item;
         }

diff --git a/src/Select/ScopeInterface.php b/src/Select/ScopeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:ignoreFile
+
 declare(strict_types=1);
 
 namespace Cycle\ORM\Select;
@@ -14,3 +16,5 @@ interface ScopeInterface
      */
     public function apply(QueryBuilder $query);
 }
+
+interface_exists(ConstrainInterface::class);
diff --git a/tests/ORM/Driver/MySQL/TableInheritanceWithoutTypeColumnTest.php b/tests/ORM/Driver/MySQL/TableInheritanceWithoutTypeColumnTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\MySQL;
+
+class TableInheritanceWithoutTypeColumnTest extends \Cycle\ORM\Tests\TableInheritanceWithoutTypeColumnTest
+{
+    public const DRIVER = 'mysql';
+}
diff --git a/tests/ORM/Driver/MySQL/TransactionTest.php b/tests/ORM/Driver/MySQL/TransactionTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\MySQL;
+
+class TransactionTest extends \Cycle\ORM\Tests\TransactionTest
+{
+    public const DRIVER = 'mysql';
+}
diff --git a/tests/ORM/Driver/Postgres/TableInheritanceWithoutTypeColumnTest.php b/tests/ORM/Driver/Postgres/TableInheritanceWithoutTypeColumnTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\Postgres;
+
+class TableInheritanceWithoutTypeColumnTest extends \Cycle\ORM\Tests\TableInheritanceWithoutTypeColumnTest
+{
+    public const DRIVER = 'postgres';
+}
diff --git a/tests/ORM/Driver/Postgres/TransactionTest.php b/tests/ORM/Driver/Postgres/TransactionTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\Postgres;
+
+class TransactionTest extends \Cycle\ORM\Tests\TransactionTest
+{
+    public const DRIVER = 'postgres';
+}
diff --git a/tests/ORM/Driver/SQLServer/TableInheritanceWithoutTypeColumnTest.php b/tests/ORM/Driver/SQLServer/TableInheritanceWithoutTypeColumnTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\SQLServer;
+
+class TableInheritanceWithoutTypeColumnTest extends \Cycle\ORM\Tests\TableInheritanceWithoutTypeColumnTest
+{
+    public const DRIVER = 'sqlserver';
+}
diff --git a/tests/ORM/Driver/SQLServer/TransactionTest.php b/tests/ORM/Driver/SQLServer/TransactionTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\SQLServer;
+
+class TransactionTest extends \Cycle\ORM\Tests\TransactionTest
+{
+    public const DRIVER = 'sqlserver';
+}
diff --git a/tests/ORM/Driver/SQLite/TableInheritanceWithoutTypeColumnTest.php b/tests/ORM/Driver/SQLite/TableInheritanceWithoutTypeColumnTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\SQLite;
+
+class TableInheritanceWithoutTypeColumnTest extends \Cycle\ORM\Tests\TableInheritanceWithoutTypeColumnTest
+{
+    public const DRIVER = 'sqlite';
+}
diff --git a/tests/ORM/Driver/SQLite/TransactionTest.php b/tests/ORM/Driver/SQLite/TransactionTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Driver\SQLite;
+
+class TransactionTest extends \Cycle\ORM\Tests\TransactionTest
+{
+    public const DRIVER = 'sqlite';
+}
diff --git a/tests/ORM/Fixtures/TransactionTestMapper.php b/tests/ORM/Fixtures/TransactionTestMapper.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Tests\Fixtures;
+
+use Cycle\ORM\Command\CommandInterface;
+use Cycle\ORM\Heap\Node;
+use Cycle\ORM\Heap\State;
+use Cycle\ORM\Mapper\Mapper;
+
+class TransactionTestMapper extends Mapper
+{
+    public function queueDelete($entity, Node $node, State $state): CommandInterface
+    {
+        if ($entity->id == '3') {
+            return new class () implements CommandInterface {
+                public function isReady(): bool
+                {
+                    return true;
+                }
+
+                public function isExecuted(): bool
+                {
+                    return false;
+                }
+
+                public function execute()
+                {
+                    throw new \Exception('Something went wrong');
+                }
+
+                public function complete()
+                {
+                }
+
+                public function rollBack()
+                {
+                }
+            };
+        }
+
+        return parent::queueDelete($entity, $node, $state);
+    }
+}
diff --git a/tests/ORM/ORMTest.php b/tests/ORM/ORMTest.php
@@ -11,6 +11,8 @@
 
 namespace Cycle\ORM\Tests;
 
+use Cycle\ORM\Factory;
+use Cycle\ORM\Heap\Heap;
 use Cycle\ORM\Mapper\Mapper;
 use Cycle\ORM\Schema;
 use Cycle\ORM\Tests\Fixtures\User;
@@ -70,6 +72,30 @@ public function testORMClone(): void
         $this->assertNotSame($orm, $this->orm);
     }
 
+    public function testORMCloneWithSchema(): void
+    {
+        $orm = $this->orm->with(new Schema([]));
+
+        $this->assertNotSame($orm, $this->orm);
+        $this->assertNotSame($orm->getSchema(), $this->orm->getSchema());
+    }
+
+    public function testORMCloneWithFactory(): void
+    {
+        $orm = $this->orm->with(null, new Factory($this->dbal));
+
+        $this->assertNotSame($orm, $this->orm);
+        $this->assertNotSame($orm->getFactory(), $this->orm->getFactory());
+    }
+
+    public function testORMCloneWithHeap(): void
+    {
+        $orm = $this->orm->with(null, null, new Heap());
+
+        $this->assertNotSame($orm, $this->orm);
+        $this->assertNotSame($orm->getHeap(), $this->orm->getHeap());
+    }
+
     public function testORMGetByRole(): void
     {
         $this->assertNull($this->orm->get('user', ['id' => 1], false));