Merge branch 'master' of github.com:swoft-cloud/swoft

Author: stelin

app/Http/Controller/DbModelController.php

@@ -3,6 +3,7 @@
 
 namespace App\Http\Controller;
 
+use App\Model\Entity\Count;
 use App\Model\Entity\User;
 use Exception;
 use Swoft\Http\Message\Response;
@@ -51,6 +52,10 @@ public function save(): array
 
         $user->save();
 
+        $count = Count::new();
+        $count->setUserId($user->getId());
+        $count->save();
+
         return $user->toArray();
     }
 

app/Listener/ModelSavedListener.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Listener;
+
+use App\Model\Entity\User;
+use Swoft\Db\DbEvent;
+use Swoft\Db\Eloquent\Model;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+
+/**
+ * Class RanListener
+ *
+ * @since 2.0
+ *
+ * @Listener(DbEvent::MODEL_SAVED)
+ */
+class ModelSavedListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     */
+    public function handle(EventInterface $event): void
+    {
+        /* @var Model $modelStatic */
+        $modelStatic = $event->getTarget();
+
+        if ($modelStatic instanceof User) {
+            // to do something....
+        }
+
+        // ....
+    }
+}

app/Listener/RanListener.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Listener;
+
+use Swoft\Db\Connection\Connection;
+use Swoft\Db\DbEvent;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+
+/**
+ * Class RanListener
+ *
+ * @since 2.0
+ *
+ * @Listener(DbEvent::SQL_RAN)
+ */
+class RanListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     */
+    public function handle(EventInterface $event): void
+    {
+
+        /* @var Connection $connection */
+        $connection = $event->getTarget();
+
+        $querySql    = $event->getParam(0);
+        $bindings = $event->getParam(1);
+    }
+}

app/Listener/UserSavingListener.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Listener;
+
+use App\Model\Entity\User;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+
+/**
+ * Class UserSavingListener
+ *
+ * @since 2.0
+ *
+ * @Listener("swoft.model.user.saving")
+ */
+class UserSavingListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     */
+    public function handle(EventInterface $event): void
+    {
+        /* @var User $user */
+        $user = $event->getTarget();
+
+        if ($user->getAge() > 100) {
+            // stopping saving
+            $event->stopPropagation(true);
+
+            $user->setAdd(100);
+        }
+    }
+}

app/Migration/AddMsg20190630164222.php renamed to app/Migration/AddMsg.php

@@ -12,14 +12,14 @@
  *
  * @since 2.0
  *
- * @Migration()
+ * @Migration(20190630164222)
  */
-class AddMsg20190630164222 extends BaseMigration
+class AddMsg extends BaseMigration
 {
     /**
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         $sql = <<<sql
 CREATE TABLE `users` (
@@ -37,12 +37,8 @@ public function up()
     /**
      * @return void
      */
-    public function down()
+    public function down(): void
     {
-        $truncate = <<<sql
-truncate `users`;
-sql;
-        $this->execute($truncate);
 
         $dropSql = <<<sql
 drop table if exists `users`;

app/Migration/AddUser20190627225524.php renamed to app/Migration/AddUser.php

@@ -10,16 +10,16 @@
 use Swoft\Db\Schema;
 use Swoft\Db\Schema\Blueprint;
 use Swoft\Devtool\Annotation\Mapping\Migration;
-use Swoft\Devtool\Migration\MigrationInterface;
+use Swoft\Devtool\Migration\Contract\MigrationInterface;
 
 /**
  * Class AddUser20190627225524
  *
  * @since 2.0
  *
- * @Migration()
+ * @Migration(20190627225524)
  */
-class AddUser20190627225524 implements MigrationInterface
+class AddUser implements MigrationInterface
 {
     /**
      * @return void
@@ -28,7 +28,7 @@ class AddUser20190627225524 implements MigrationInterface
      * @throws ContainerException
      * @throws DbException
      */
-    public function up()
+    public function up(): void
     {
         Schema::createIfNotExists('users', function (Blueprint $blueprint) {
             $blueprint->increments('id');
@@ -49,10 +49,10 @@ public function up()
      * @throws ContainerException
      * @throws DbException
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
 
-        Schema::getSchemaBuilder('db.pool')->dropIfExists('user');
+        Schema::getSchemaBuilder('db.pool')->dropIfExists('users');
     }
 }

app/Migration/Message20190627225525.php renamed to app/Migration/Message.php

@@ -16,9 +16,9 @@
  *
  * @since 2.0
  *
- * @Migration("db2.pool")
+ * @Migration(time=20190627225525, pool="db3.pool")
  */
-class Message20190627225525 extends BaseMigration
+class Message extends BaseMigration
 {
     /**
      * @return void
@@ -27,7 +27,7 @@ class Message20190627225525 extends BaseMigration
      * @throws ContainerException
      * @throws DbException
      */
-    public function up()
+    public function up(): void
     {
         $this->schema->createIfNotExists('messages', function (Blueprint $blueprint) {
             $blueprint->increments('id');
@@ -43,7 +43,7 @@ public function up()
      * @throws ContainerException
      * @throws DbException
      */
-    public function down()
+    public function down(): void
     {
         $this->schema->dropIfExists('messages');
     }

app/Model/Entity/Count.php

@@ -10,7 +10,7 @@
 
 
 /**
- * 
+ *
  * Class Count
  *
  * @since 2.0
@@ -19,41 +19,53 @@
  */
 class Count extends Model
 {
+    protected const UPDATED_AT = 'update_time';
+    protected const CREATED_AT = 'create_time';
+
     /**
-     * 
+     *
      * @Id()
      * @Column()
      * @var int|null
      */
     private $id;
 
     /**
-     * 
+     *
      *
      * @Column(name="user_id", prop="userId")
      * @var int|null
      */
     private $userId;
 
     /**
-     * 
+     *
      *
      * @Column(name="create_time", prop="createTime")
      * @var int|null
      */
     private $createTime;
 
     /**
-     * 
+     *
      *
      * @Column()
      * @var string|null
      */
     private $attributes;
 
+    /**
+     *
+     *
+     * @Column(name="update_time", prop="updateTime")
+     * @var string|null
+     */
+    private $updateTime;
+
 
     /**
      * @param int|null $id
+     *
      * @return void
      */
     public function setId(?int $id): void
@@ -63,6 +75,7 @@ public function setId(?int $id): void
 
     /**
      * @param int|null $userId
+     *
      * @return void
      */
     public function setUserId(?int $userId): void
@@ -72,6 +85,7 @@ public function setUserId(?int $userId): void
 
     /**
      * @param int|null $createTime
+     *
      * @return void
      */
     public function setCreateTime(?int $createTime): void
@@ -81,13 +95,24 @@ public function setCreateTime(?int $createTime): void
 
     /**
      * @param string|null $attributes
+     *
      * @return void
      */
     public function setAttributes(?string $attributes): void
     {
         $this->attributes = $attributes;
     }
 
+    /**
+     * @param string|null $updateTime
+     *
+     * @return void
+     */
+    public function setUpdateTime(?string $updateTime): void
+    {
+        $this->updateTime = $updateTime;
+    }
+
     /**
      * @return int|null
      */
@@ -120,4 +145,12 @@ public function getAttributes(): ?string
         return $this->attributes;
     }
 
+    /**
+     * @return string|null
+     */
+    public function getUpdateTime(): ?string
+    {
+        return $this->updateTime;
+    }
+
 }