added phpstan to build and applied level 1 fixes

Author: TheTechsTech

.travis.yml

@@ -30,7 +30,8 @@ after_success:
 
 # Commands you want to run that will verify your build.
 script: 
-  - phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpstan analyse lib tests --level=1
 
 # allow_failures: Allow this build to fail under the specified environments.
 # fast_finish: If your build fails do not continue trying to build, just stop.

appveyor.yml

@@ -111,5 +111,6 @@ on_success:
 ## Run the actual test
 test_script:
     - cd c:\projects\php-project-workspace
-    - vendor/bin/phpunit --coverage-clover=coverage.xml
+    - vendor\bin\phpunit --coverage-clover=coverage.xml
+    - vendor\bin\phpstan analyse lib tests --level=1
 

composer.json

@@ -37,7 +37,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": ">5.7.0"
+        "phpunit/phpunit": ">5.7.0",
+        "phpstan/phpstan": "^0.11.5"
     },
     "autoload-dev": {
         "psr-4": {

lib/Config.php

@@ -18,7 +18,7 @@
 * @method void setCharset($args);
 * @method void setOptions($args);
 * @method void setIsFile($args);
-* @method void setToMysql($args);
+* @method void setToMssql($args);
 * @method void setPath($args);
 *
 * @method string getDriver();
@@ -31,7 +31,7 @@
 * @method string getCharset();
 * @method string getOptions();
 * @method bool getIsFile();
-* @method bool getToMysql();
+* @method bool getToMssql();
 * @method string getPath();
 */
 class Config extends ConfigAbstract implements ConfigInterface

lib/Database/ez_mysqli.php

@@ -23,14 +23,12 @@ class ez_mysqli extends ezsqlModel implements DatabaseInterface
             5 => 'Unexpected error while trying to select database'
         );
 
-    protected $preparedValues = array();
-
     private static $isSecure = false;
     private static $secure = null;
 
     /**
     * Database connection handle 
-    * @var connection instance
+    * @var resource
     */
     private $dbh;
 
@@ -42,7 +40,7 @@ class ez_mysqli extends ezsqlModel implements DatabaseInterface
 
     /**
      * Database configuration setting 
-     * @var Configuration instance
+     * @var ConfigInterface
      */
     private $database;
 
@@ -222,9 +220,9 @@ public function sysDate() {
 
     /**
      * Helper fetches rows from a prepared result set 
-     * @param mysqli_stmt $stmt 
+     * @param \mysqli_stmt $stmt 
      * @param string $query
-     * @return bool|mysqli_result
+     * @return bool|\mysqli_result
      */
     private function fetch_prepared_result(&$stmt, $query) 
     {   
@@ -291,7 +289,7 @@ private function fetch_prepared_result(&$stmt, $query)
      * {@link mysqli_stmt}.
      * @param string $query
      * @param array $param
-     * @return bool|mysqli_result
+     * @return bool|\mysqli_result
      */
     public function query_prepared(string $query, array $param = null)
     {

lib/Database/ez_pdo.php

@@ -21,15 +21,13 @@ class ez_pdo extends ezsqlModel implements DatabaseInterface
             2 => 'File based databases require $dsn to create a connection'
         );
 
-    protected $preparedValues = array();
-
     private static $isSecure = false;
     private static $secure = null;
     private static $_options = [];
 
     /**
     * Database connection handle 
-    * @var connection instance
+    * @var resource
     */
     private $dbh;
 
@@ -41,7 +39,7 @@ class ez_pdo extends ezsqlModel implements DatabaseInterface
 
     /**
     * Database configuration setting 
-    * @var Configuration instance
+    * @var ConfigInterface
     */
 
     private $database;
@@ -168,7 +166,6 @@ public function connect(
             $this->register_error($e->getMessage());
             $this->show_errors ? \trigger_error($e->getMessage() . '- $dsn: ' . $dsn, \E_USER_WARNING) : null;
         }
-        $this->isConnected = $this->_connected;
 
         return $this->_connected;
     } // connect
@@ -274,7 +271,7 @@ public function catch_error()
     * @param string $query
     * @param array $param
     * @param boolean $isSelect - return \PDOStatement, if SELECT SQL statement, otherwise int
-    * @return bool|int|PDOStatement 
+    * @return bool|int|\PDOStatement 
     */
     public function query_prepared(string $query, array $param = null, $isSelect = false)
     { 

lib/Database/ez_pgsql.php

@@ -22,14 +22,12 @@ class ez_pgsql extends ezsqlModel implements DatabaseInterface
         5 => 'Unexpected error while trying to select database',
     );
 
-    protected $preparedValues = array();
-
     private static $isSecure = false;
     private static $secure = null;
 
     /**
     * Database connection handle 
-    * @var connection instance
+    * @var resource
     */
     private $dbh;
 
@@ -41,7 +39,7 @@ class ez_pgsql extends ezsqlModel implements DatabaseInterface
 
     /**
      * Database configuration setting
-     * @var Configuration instance
+     * @var ConfigInterface
      */
     private $database;
 
@@ -85,7 +83,7 @@ public function settings()
      */
     public function quick_connect($user = '', $password = '', $name = '', $host = 'localhost', $port = '5432')
     {
-        if (!$this->connect($user, $password, $name, $host, $port, true));
+        if (!$this->connect($user, $password, $name, $host, $port));
         return $this->_connected;
     } // quick_connect
 

lib/Database/ez_sqlite3.php

@@ -16,13 +16,12 @@ class ez_sqlite3 extends ezsqlModel implements DatabaseInterface
     private $ezsql_sqlite3_str = array
         (
         1 => 'Require $path and $name to open an SQLite database',
+        2 => 'Failed to make connection to database',
     );
 
-    protected $preparedValues = array();
-
     /**
     * Database connection handle 
-    * @var connection instance
+    * @var resource
     */
     private $dbh;
 
@@ -34,7 +33,7 @@ class ez_sqlite3 extends ezsqlModel implements DatabaseInterface
 
     /**
      * Database configuration setting
-     * @var Configuration instance
+     * @var ConfigInterface
      */
     private $database;
 
@@ -86,8 +85,8 @@ public function connect($path = '', $name = '')
             $this->show_errors ? \trigger_error($this->ezsql_sqlite3_str[1], \E_USER_WARNING) : null;
             // Try to establish the server database handle
         } elseif (!$this->dbh = @new \SQLite3($path . $name)) {
-            $this->register_error($php_errormsg);
-            $this->show_errors ? \trigger_error($php_errormsg, \E_USER_WARNING) : null;
+            $this->register_error($this->ezsql_sqlite3_str[2]);
+            $this->show_errors ? \trigger_error($this->ezsql_sqlite3_str[2], \E_USER_WARNING) : null;
         } else {
             $return_val = true;
             $this->conn_queries = 0;
@@ -200,7 +199,7 @@ public function query(string $query, bool $use_prepare = false)
         $this->flush();
 
         // Log how the function was called
-        $this->func_call = "\$db->query(\"$query\")";
+        $this->log_query("\$db->query(\"$query\")");
 
         // Keep track of the last query for debug..
         $this->last_query = $query;
@@ -245,7 +244,7 @@ public function query(string $query, bool $use_prepare = false)
             $i = 0;
             $this->col_info = array();
             while ($i < @$this->result->numColumns()) {
-                $this->col_info[$i] = new \StdClass;
+                $this->col_info[$i] = new \stdClass;
                 $this->col_info[$i]->name = $this->result->columnName($i);
                 $this->col_info[$i]->type = null;
                 $this->col_info[$i]->max_length = null;

lib/Database/ez_sqlsrv.php

@@ -32,13 +32,11 @@ class ez_sqlsrv extends ezsqlModel implements DatabaseInterface
         -11 => 'uniqueidentifier', -3 => 'varbinary', 12 => 'varchar', -152 => 'xml',
     );
 
-    protected $preparedValues = array();
-
     private static $isSecure = false;
 
     /**
     * Database connection handle 
-    * @var connection instance
+    * @var resource
     */
     private $dbh;
 
@@ -50,7 +48,7 @@ class ez_sqlsrv extends ezsqlModel implements DatabaseInterface
 
     /**
      * Database configuration setting
-     * @var Configuration instance
+     * @var ConfigInterface
      */
     private $database;
 
@@ -258,6 +256,7 @@ public function query(string $query, bool $use_prepare = false)
             // Take note of column info
             $i = 0;
             foreach (@\sqlsrv_field_metadata($this->result) as $field) {
+                $col = [];
                 foreach ($field as $name => $value) {
                     $name = \strtolower($name);
                     if ($name == "size") {
@@ -267,7 +266,7 @@ public function query(string $query, bool $use_prepare = false)
                     }
 
                     //DEFINED FOR E_STRICT
-                    $col = new \StdClass();
+                    $col = new \stdClass();
                     $col->{$name} = $value;
                 }
 

lib/DatabaseInterface.php

@@ -66,7 +66,7 @@ public function sysDate();
      * 
      * @param string $query
      * @param array $param
-     * @return bool|result
+     * @return bool|mixed
      */
     public function query_prepared(string $query, array $param = null);