Update dependencies (#134)

Author: rustamwin

composer.json

@@ -22,7 +22,10 @@
     "require": {
         "php": "^8.0",
         "cebe/markdown": "^1.2@dev",
+        "cycle/database": "^2.0",
+        "cycle/entity-behavior": "^1.0",
         "cycle/orm": "^2.0",
+        "doctrine/collections": "^1.6",
         "httpsoft/http-message": "^1.0.5",
         "myclabs/php-enum": "^1.7",
         "psr/container": "^2.0",
@@ -45,7 +48,7 @@
         "yiisoft/factory": "^1.0",
         "yiisoft/files": "^2.0",
         "yiisoft/http": "^1.2",
-        "yiisoft/injector": "^1.0",
+        "yiisoft/injector": "^1.1",
         "yiisoft/log": "^2.0",
         "yiisoft/log-target-file": "^2.0",
         "yiisoft/request-body-parser": "^1.1",
@@ -72,7 +75,7 @@
         "codeception/lib-innerbrowser": "^3.0",
         "codeception/module-asserts": "^3.0",
         "codeception/module-cli": "^2.0",
-        "codeception/module-db": "^2.0",
+        "codeception/module-db": "^3.0",
         "codeception/module-phpbrowser": "^3.0",
         "codeception/module-rest": "^3.0",
         "phpunit/phpunit": "^9.5",

config/common/cycle.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use Cycle\Database\DatabaseManager;
+use Cycle\ORM\Collection\DoctrineCollectionFactory;
+use Cycle\ORM\Factory;
+use Cycle\ORM\FactoryInterface;
+
+/** @var array $params */
+
+return [
+    // Replace Factory definition to redefine default collection type
+    // Todo: remove with https://github.com/yiisoft/yii-cycle/issues/111
+    FactoryInterface::class => static function (DatabaseManager $dbManager, Spiral\Core\FactoryInterface $factory) {
+        return new Factory(
+            $dbManager,
+            null,
+            $factory,
+            new DoctrineCollectionFactory()
+        );
+    },
+];

config/params.php

@@ -9,6 +9,8 @@
 use Yiisoft\Yii\Cycle\Command\Schema;
 use Yiisoft\Yii\Cycle\Command\Migration;
 use Yiisoft\Yii\Cycle\Schema\Conveyor\AttributedSchemaConveyor;
+use Yiisoft\Yii\Cycle\Schema\Provider\FromConveyorSchemaProvider;
+use Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider;
 use Yiisoft\Yii\Cycle\Schema\SchemaProviderInterface;
 use Yiisoft\Yii\Middleware\SubFolder;
 
@@ -79,8 +81,8 @@
                 'sqlite' => new \Cycle\Database\Config\SQLiteDriverConfig(
                     connection: new \Cycle\Database\Config\SQLite\FileConnectionConfig(
                         database: $_ENV['YII_ENV'] === 'production'
-                            ? '@data/db/database.db'
-                            : 'sqlite:@tests/_data/database.db'
+                            ? dirname(__DIR__) . '/data/db/database.db'
+                            : dirname(__DIR__) . '/tests/_data/database.db'
                     )
                 ),
             ],
@@ -117,12 +119,12 @@
             // \Yiisoft\Yii\Cycle\Schema\Provider\SimpleCacheSchemaProvider::class => ['key' => 'cycle-orm-cache-key'],
 
             // Store generated Schema in the file
-            \Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider::class => [
-                'mode' => \Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider::MODE_WRITE_ONLY,
-                'file' => 'runtime/schema.php',
+            PhpFileSchemaProvider::class => [
+                'mode' => PhpFileSchemaProvider::MODE_WRITE_ONLY,
+                'file' => '@runtime/schema.php',
             ],
 
-            \Yiisoft\Yii\Cycle\Schema\Provider\FromConveyorSchemaProvider::class => [
+            FromConveyorSchemaProvider::class => [
                 'generators' => [
                     Cycle\Schema\Generator\SyncTables::class, // sync table changes to database
                 ],

src/User/User.php

@@ -6,42 +6,30 @@
 
 use Cycle\Annotated\Annotation\Column;
 use Cycle\Annotated\Annotation\Entity;
-use Cycle\Annotated\Annotation\Table;
 use Cycle\Annotated\Annotation\Table\Index;
+use Cycle\ORM\Entity\Behavior\CreatedAt;
+use Cycle\ORM\Entity\Behavior\UpdatedAt;
 use DateTimeImmutable;
 use Yiisoft\Auth\IdentityInterface;
 use Yiisoft\Security\PasswordHasher;
 use Yiisoft\Security\Random;
 
-/**
- * @Entity(repository="App\User\UserRepository", mapper="Yiisoft\Yii\Cycle\Mapper\TimestampedMapper")
- * @Table(
- *     indexes={
- *         @Index(columns={"login"}, unique=true),
- *         @Index(columns={"token"}, unique=true)
- *     }
- * )
- */
+#[Entity(repository: UserRepository::class)]
+#[Index(columns: ['login', 'token'], unique: true)]
+#[CreatedAt(field: 'created_at', column: 'created_at')]
+#[UpdatedAt(field: 'updated_at', column: 'updated_at')]
 class User implements IdentityInterface
 {
-    /**
-     * @Column(type="primary")
-     */
+    #[Column(type: 'primary')]
     private ?int $id = null;
 
-    /**
-     * @Column(type="string(128)")
-     */
+    #[Column(type: 'string(128)')]
     private string $token;
 
-    /**
-     * @Column(type="string(48)")
-     */
+    #[Column(type: 'string(48)')]
     private string $login;
 
-    /**
-     * @Column(type="string")
-     */
+    #[Column(type: 'string')]
     private string $passwordHash;
 
     /**