Merge branch 'master' into newmaster

Author: TheTechsTech

.gitignore

@@ -13,3 +13,4 @@ build/logs/clover.xml
 *.csr
 *.key
 test.php
+build

composer.json

@@ -27,8 +27,7 @@
         "files": ["ez_sql_loader.php"]
     },
     "require-dev": {
-        "phpunit/phpunit": ">5.7.0",
-        "php-coveralls/php-coveralls": "^2.1"
+        "phpunit/phpunit": ">5.7.0"
     },
     "scripts": {
         "test": "phpunit --bootstrap vendor/autoload.php tests"

lib/ez_sql_pdo.php

@@ -104,7 +104,11 @@ public static function securePDO(
     {
         if (\array_key_exists(\strtolower($vendor), \VENDOR) 
             && (! \file_exists($path.$cert) || ! \file_exists($path.$key)))
-            ezQuery::createCertificate();
+            $path = ezQuery::createCertificate();
+        elseif ($path == '.'.\_DS) {
+            $ssl_path = \getcwd();
+            $path = \preg_replace('/\\\/', \_DS, $ssl_path). \_DS;
+        }
 
         if (($vendor == 'pgsql') || ($vendor == 'postgresql')) {
             self::$secure = "sslmode=require;sslcert=".$path.$cert.";sslkey=".$path.$key.";sslrootcert=".$path.$ca.";";
@@ -114,7 +118,9 @@ public static function securePDO(
                 \PDO::MYSQL_ATTR_SSL_KEY => $path.$key,
                 \PDO::MYSQL_ATTR_SSL_CERT => $path.$cert,
                 \PDO::MYSQL_ATTR_SSL_CA => $path.$ca,
-                \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
+                \PDO::MYSQL_ATTR_SSL_CAPATH => $path,
+                \PDO::MYSQL_ATTR_SSL_CIPHER => 'DHE-RSA-AES256-SHA',
+                \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false
             );
         } elseif (($vendor == 'sqlserver') || ($vendor == 'mssql') || ($vendor == 'sqlsrv')) {
             self::$secure = ";Encrypt=true;TrustServerCertificate=true";

shared/ezFunctions.php

@@ -29,6 +29,10 @@
 use ezsql\ezQuery;
 use ezsql\ezQueryInterface;
 
+    // Error messages
+    const MISSING_CONFIGURATION ='<b>Fatal Error:</b> Missing configuration details to connect to database';
+    const CONFIGURATION_REQUIRES = '<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used';
+
 	// ezQuery prepare placeholder/positional tag
 		const _TAG = '__ez__';
     // Use to set get_result output as json 
@@ -164,6 +168,7 @@
         const REFERENCES = 'REFERENCES';
 
         const AUTO = '__autoNumbers__';
+        const SEQUENCE = '__autoNumbers__';
         const AUTO_INCREMENT = 'AUTO_INCREMENT';
         const AUTOINCREMENT = 'AUTOINCREMENT';
         const IDENTITY = 'IDENTITY';

shared/ezQuery.php

@@ -53,6 +53,7 @@ public static function clean($string)
      *      "emailAddress" => ''
      *  ];
      * 
+     * @return string certificate path
      */
     public static function createCertificate(
         string $privatekeyFile = 'certificate.key', 
@@ -63,7 +64,7 @@ public static function createCertificate(
         array $details = ["commonName" => "localhost"]
     ) 
     {
-        if (empty($ssl_path) || ! \is_dir($ssl_path)) {
+        if (empty($ssl_path)) {
             $ssl_path = \getcwd();
             $ssl_path = \preg_replace('/\\\/', \_DS, $ssl_path). \_DS;
         } else
@@ -88,6 +89,8 @@ public static function createCertificate(
 
         // Create a signing request file 
         \openssl_csr_export_to_file($csr, $ssl_path.$signingFile);
+
+        return $ssl_path;
     }
 
     /**

shared/ezSchema.php

@@ -187,6 +187,10 @@ public static function vendor()
      * Creates an database column, 
      * - column, datatype, value/options with the given arguments.
      * 
+     * // datatype are global CONSTANTS and can be written out like:
+     *      - VARCHAR, 32, notNULL, PRIMARY, AUTO, ....
+     * // AUTO constant will replaced with the proper auto sequence for the SQL driver
+     * 
      * @param string $column|CONSTRAINT, - column name/CONSTRAINT usage for PRIMARY|FOREIGN KEY
      * @param string $type|$constraintName, - data type for column/primary|foreign constraint name
      * @param mixed $size|...$primaryForeignKeys, 
@@ -213,7 +217,7 @@ public static function column(string $column = null, string $type = null, ...$ar
         } elseif (($column == \ADD) || ($column == \DROP) || ($column == \CHANGER)) {
             if ($column != \DROP) {
                 // check for modify placeholder and replace with vendors
-                $column = \str_replace(\CHANGE, self::CHANGES[$vendor], $column);
+                $column = \str_replace(\CHANGER, self::CHANGES[$vendor], $column);
                 $column = $column.' '.$type;
                 $type2 = \array_shift($args);
                 $data = self::datatype($type2, ...$args);