Merge branch 'master' into v3

TheTechsTech · TheTechsTech · commit cb0f4d4303d5 · 2018-09-04T17:14:20.000-04:00
diff --git a/composer.json b/composer.json
@@ -1,31 +1,43 @@
 {
     "name": "jv2222/ezsql",
     "description": "PHP class to make interacting with a database ridiculously easy.",
-    "license": "LGPL",
+    "keywords": ["mysqli","postgres","msserver","pdo","database","abstraction","dba"],
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Justin Vincent",
             "email": "webmaster@justinvincent.com"
+        },
+        {
+            "name": "Stefanie Janine Stoelting",
+            "email": "mail@stefanie-stoelting.de"
+        },
+        {
+            "name": "l. stubbs",
+            "email": "lstubbs@technoexpress.net"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/ezSQL/ezSQL/issues"
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/ezSQL/ezSQL"
         }
     ],
     "require": {
-        "php": ">5.6"
+        "php": ">5.6",
+        "jv2222/ezsql": "dev-v3"
     },
     "autoload": {
-        "classmap": [
-            "lib/ez_sql_mysqli.php",
-            "lib/ez_sql_pdo.php",
-            "lib/ez_sql_postgresql.php",
-            "lib/ez_sql_recordset.php",
-            "lib/ez_sql_sqlite3.php",
-            "lib/ez_sql_sqlsrv.php",
-            "shared/ez_sql_core.php",
-            "shared/ezFunctions.php",
-            "shared/ezQuery.php"
-        ]
+        "files": ["ez_sql_loader.php"]
     },
     "require-dev": {
         "phpunit/phpunit": ">5.7.0"
+    },
+    "scripts": {
+        "test": "phpunit --bootstrap vendor/autoload.php tests"
     }
 }
 
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,8 +7,7 @@
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
         processIsolation="false"
-        stopOnFailure="false"
-        syntaxCheck="false" >
+        stopOnFailure="false" >
         
     <testsuites>
         <testsuite name="ezSQL Test Suite">
diff --git a/tests/mysqli/ezSQL_mysqliTest.php b/tests/mysqli/ezSQL_mysqliTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/mysqli/ezSQL_recordsetTest.php b/tests/mysqli/ezSQL_recordsetTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/pdo/ezSQL_pdo_mysqlTest.php b/tests/pdo/ezSQL_pdo_mysqlTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/pdo/ezSQL_pdo_pgsqlTest.php b/tests/pdo/ezSQL_pdo_pgsqlTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/pdo/ezSQL_pdo_sqliteTest.php b/tests/pdo/ezSQL_pdo_sqliteTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/pdo/ezSQL_pdo_sqlsrvTest.php b/tests/pdo/ezSQL_pdo_sqlsrvTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/postgresql/ezSQL_postgresqlTest.php b/tests/postgresql/ezSQL_postgresqlTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/shared/ezFunctionsTest.php b/tests/shared/ezFunctionsTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/shared/ezQueryTest.php b/tests/shared/ezQueryTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/shared/ezSQLcoreTest.php b/tests/shared/ezSQLcoreTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/sqlite/ezSQL_sqlite3Test.php b/tests/sqlite/ezSQL_sqlite3Test.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;
diff --git a/tests/sqlsrv/ezSQL_sqlsrvTest.php b/tests/sqlsrv/ezSQL_sqlsrvTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once('ez_sql_loader.php');
 
 require 'vendor/autoload.php';
 use PHPUnit\Framework\TestCase;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php`
`2`		`-require_once('ez_sql_loader.php');`
`3`	`2`
`4`	`3`	`require 'vendor/autoload.php';`
`5`	`4`	`use PHPUnit\Framework\TestCase;`