Releasing 1.0.3

Author: technicalguru

composer.json

@@ -19,18 +19,22 @@
 		"technicalguru/utils" : "~1",
 		"phpmailer/phpmailer" : "^6.1",
 		"symfony/polyfill-mbstring" : "^1.20",
-		"technicalguru/database" : "~1",
+		"technicalguru/database" : "^1.1",
 		"phpunit/phpunit": "^9.4"
 	},
 	"autoload" : {
 		"psr-4" : {
-			"TgEmail\\" : "src/TgEmail/",
-			"" : ""
+			"TgEmail\\" : "src/TgEmail/"
 		},
 		"psr-0" : {
 			"TgEmail" : "src/TgEmail"
 		}
 	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.0-dev"
+		}
+	},
 	"require-dev" : {
 	}
 }

src/TgEmail/EmailsDAO.php

@@ -13,37 +13,37 @@ class EmailsDAO extends DAO {
 
     /**
      */
-    public function __construct($database, $tableName = '#__mail_queue', $modelClass = 'TgEmail\\Email', $idColumn = 'uid') {
-        parent::__construct($database, $tableName, $modelClass, $idColumn);
-        $this->checkTable();
+    public function __construct($database, $tableName = '#__mail_queue', $modelClass = 'TgEmail\\Email', $idColumn = 'uid', $checkTable = FALSE) {
+        parent::__construct($database, $tableName, $modelClass, $idColumn, $checkTable);
     }
-    
-    public function checkTable() {
-        $res = $this->database->query('SELECT * FROM '.$this->tableName);
-        if ($res === FALSE) {
-            // Create it (try)
-            $sql =
-                'CREATE TABLE `'.$this->tableName.'` ( '.
-                    '`'.$this->idColumn.'`  INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT \'ID of queue element\', '.
-                    '`sender`          VARCHAR(200) NOT NULL COMMENT \'sender address\', '.
-                    '`reply_to`        VARCHAR(200) NULL COMMENT \'Reply-To address\', '.
-                    '`recipients`      TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'email recipients\', '.
-                    '`subject`         VARCHAR(200) NOT NULL COMMENT \'email subject\', '.
-                    '`body`            TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'email bodies\', '.
-                    '`attachments`     TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'attachment data\', '.
-                    '`queued_time`     DATETIME     NOT NULL COMMENT \'Time the email was queued\', '.
-                    '`status`          VARCHAR(20)  NOT NULL COMMENT \'email subject\', '.
-                    '`sent_time`       DATETIME     NULL COMMENT \'Time the email was sent successfully\', '.
-                    '`failed_attempts` INT(10)      UNSIGNED NOT NULL DEFAULT 0 COMMENT \'Number of failed sending attempts\', '.
-                    'PRIMARY KEY (`'.$this->idColumn.'`) '.
-                ') ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT = \'Email Queue\'';
-            
-            $res = $this->database->query($sql);
-            if ($res === FALSE) {
-                throw new EmailException('Cannot create table '.$this->tableName.': '.$this->database->error());
-            }
-        }
-        
+
+	/**
+	 * Implements the method from base class.
+	 * @return boolean TRUE when table could be created. An exception is thrown when the method fails.
+	 */
+    public function createTable() {
+		// Create it (try)
+		$sql =
+			'CREATE TABLE `'.$this->tableName.'` ( '.
+				'`'.$this->idColumn.'`  INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT \'ID of queue element\', '.
+				'`sender`          VARCHAR(200) NOT NULL COMMENT \'sender address\', '.
+				'`reply_to`        VARCHAR(200) NULL COMMENT \'Reply-To address\', '.
+				'`recipients`      TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'email recipients\', '.
+				'`subject`         VARCHAR(200) NOT NULL COMMENT \'email subject\', '.
+				'`body`            TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'email bodies\', '.
+				'`attachments`     TEXT         COLLATE utf8mb4_bin NOT NULL COMMENT \'attachment data\', '.
+				'`queued_time`     DATETIME     NOT NULL COMMENT \'Time the email was queued\', '.
+				'`status`          VARCHAR(20)  NOT NULL COMMENT \'email subject\', '.
+				'`sent_time`       DATETIME     NULL COMMENT \'Time the email was sent successfully\', '.
+				'`failed_attempts` INT(10)      UNSIGNED NOT NULL DEFAULT 0 COMMENT \'Number of failed sending attempts\', '.
+				'PRIMARY KEY (`'.$this->idColumn.'`) '.
+			') ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT = \'Email Queue\'';
+		
+		$res = $this->database->query($sql);
+		if ($res === FALSE) {
+			throw new EmailException('Cannot create table '.$this->tableName.': '.$this->database->error());
+		}
+        return TRUE;
     }
 
     public function housekeeping($maxSentDays = 90, $maxFailedDays = 180) {

test.sh

@@ -1,3 +1,6 @@
-
-vendor/phpunit/phpunit/phpunit tests/
+# Test script
+composer update
+RC=./vendor/phpunit/phpunit/phpunit tests
+rm -rf vendor composer.lock
+exit $RC