From 63b7387cc4d41b7c8014f311b9b95e89ec8fd605 Mon Sep 17 00:00:00 2001
From: Jamiel Sharief <20553479+jamielsharief@users.noreply.github.com>
Date: Sat, 13 Mar 2021 08:21:45 +0100
Subject: [PATCH] Moved Job DatabaseEngine Queue Model to its own file

---
 CHANGELOG.md                       |  6 ++++++
 src/Job/Engine/BaseEngine.php      |  6 +++---
 src/Job/Engine/DatabaseEngine.php  | 16 ++++------------
 src/Job/Engine/RedisConnection.php |  6 +++---
 src/Job/Engine/RedisEngine.php     |  6 +++---
 src/Job/Model/Queue.php            | 27 +++++++++++++++++++++++++++
 src/Job/Queue.php                  |  4 ----
 7 files changed, 46 insertions(+), 25 deletions(-)
 create mode 100644 src/Job/Model/Queue.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af7703da..89a2b09e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.21.2] - 2021-03-13
+
+### Changed
+
+- Move Job DatabaseEngine Queue Model to its own file
+
 ## [3.21.1] - 2021-03-06
 
 ### Fixed
diff --git a/src/Job/Engine/BaseEngine.php b/src/Job/Engine/BaseEngine.php
index 9d2eeee6..b0b260f9 100644
--- a/src/Job/Engine/BaseEngine.php
+++ b/src/Job/Engine/BaseEngine.php
@@ -7,9 +7,9 @@
  * The above copyright notice and this permission notice shall be included in all copies or substantial
  * portions of the Software.
  *
- * @copyright     Copyright (c) Jamiel Sharief
- * @link         https://www.originphp.com
- * @license       https://opensource.org/licenses/mit-license.php MIT License
+ * @copyright   Copyright (c) Jamiel Sharief
+ * @link        https://www.originphp.com
+ * @license     https://opensource.org/licenses/mit-license.php MIT License
  */
 declare(strict_types = 1);
 namespace Origin\Job\Engine;
diff --git a/src/Job/Engine/DatabaseEngine.php b/src/Job/Engine/DatabaseEngine.php
index 2c31f1df..58acc435 100644
--- a/src/Job/Engine/DatabaseEngine.php
+++ b/src/Job/Engine/DatabaseEngine.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * OriginPHP Framework
  * Copyright 2018 - 2021 Jamiel Sharief.
@@ -8,24 +7,17 @@
  * The above copyright notice and this permission notice shall be included in all copies or substantial
  * portions of the Software.
  *
- * @copyright     Copyright (c) Jamiel Sharief
- * @link         https://www.originphp.com
- * @license       https://opensource.org/licenses/mit-license.php MIT License
+ * @copyright   Copyright (c) Jamiel Sharief
+ * @link        https://www.originphp.com
+ * @license     https://opensource.org/licenses/mit-license.php MIT License
  */
 
-declare(strict_types=1);
-
 namespace Origin\Job\Engine;
 
 use Origin\Job\Job;
 use Origin\Model\Model;
 use Origin\Model\Entity;
-use Origin\Model\Concern\Timestampable;
-
-class Queue extends Model
-{
-    use Timestampable;
-}
+use Origin\Job\Model\Queue;
 
 class DatabaseEngine extends BaseEngine
 {
diff --git a/src/Job/Engine/RedisConnection.php b/src/Job/Engine/RedisConnection.php
index a96e08c4..965147cd 100644
--- a/src/Job/Engine/RedisConnection.php
+++ b/src/Job/Engine/RedisConnection.php
@@ -7,9 +7,9 @@
  * The above copyright notice and this permission notice shall be included in all copies or substantial
  * portions of the Software.
  *
- * @copyright     Copyright (c) Jamiel Sharief
- * @link         https://www.originphp.com
- * @license       https://opensource.org/licenses/mit-license.php MIT License
+ * @copyright   Copyright (c) Jamiel Sharief
+ * @link        https://www.originphp.com
+ * @license     https://opensource.org/licenses/mit-license.php MIT License
  */
 declare(strict_types = 1);
 namespace Origin\Job\Engine;
diff --git a/src/Job/Engine/RedisEngine.php b/src/Job/Engine/RedisEngine.php
index d5b48c64..ef08c7cb 100644
--- a/src/Job/Engine/RedisEngine.php
+++ b/src/Job/Engine/RedisEngine.php
@@ -7,9 +7,9 @@
  * The above copyright notice and this permission notice shall be included in all copies or substantial
  * portions of the Software.
  *
- * @copyright     Copyright (c) Jamiel Sharief
- * @link         https://www.originphp.com
- * @license       https://opensource.org/licenses/mit-license.php MIT License
+ * @copyright   Copyright (c) Jamiel Sharief
+ * @link        https://www.originphp.com
+ * @license     https://opensource.org/licenses/mit-license.php MIT License
  */
 declare(strict_types = 1);
 namespace Origin\Job\Engine;
diff --git a/src/Job/Model/Queue.php b/src/Job/Model/Queue.php
new file mode 100644
index 00000000..39ecd1f6
--- /dev/null
+++ b/src/Job/Model/Queue.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * OriginPHP Framework
+ * Copyright 2018 - 2021 Jamiel Sharief.
+ *
+ * Licensed under The MIT License
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * @copyright   Copyright (c) Jamiel Sharief
+ * @link        https://www.originphp.com
+ * @license     https://opensource.org/licenses/mit-license.php MIT License
+ */
+declare(strict_types=1);
+
+namespace Origin\Job\Model;
+
+use Origin\Model\Model;
+use Origin\Model\Concern\Timestampable;
+
+/**
+ * Internal model which is used by the Database engine, do not call directly.
+ */
+class Queue extends Model
+{
+    use Timestampable;
+}
diff --git a/src/Job/Queue.php b/src/Job/Queue.php
index 0ff5965d..6e192c4a 100644
--- a/src/Job/Queue.php
+++ b/src/Job/Queue.php
@@ -11,10 +11,6 @@
  * @link        https://www.originphp.com
  * @license     https://opensource.org/licenses/mit-license.php MIT License
  */
-
-/**
- * OriginPHP Queue System
- */
 declare(strict_types = 1);
 namespace Origin\Job;