Merge pull request #90 from nguyenanhung/v4.x

V4.x
nguyenanhung · Apr 30, 2024 · 33866c6 · 33866c6
2 parents 37912b7 + a1f4193
commit 33866c6
Show file tree

Hide file tree

Showing 12 changed files with 2,796 additions and 2,727 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04' ]
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
@@ -28,4 +28,4 @@ jobs:
       - name: Install dependencies
         run: composer install --no-dev --ignore-platform-reqs --no-progress --prefer-dist --optimize-autoloader
       #-   name: Test PHP Package Database
-      #    run: php ./sample/test/test.php
+      #    run: php ./sample/test/test.php
diff --git a/composer.json b/composer.json
@@ -1,50 +1,50 @@
 {
-	"name": "nguyenanhung/database",
-	"type": "library",
-	"description": "Database Wrapper - Base Model",
-	"keywords": [
-		"database",
-		"sql",
-		"mysql",
-		"mysqli",
-		"pdo",
-		"active record",
-		"query buillder"
-	],
-	"homepage": "https://github.com/nguyenanhung/database",
-	"license": "GPL-3.0",
-	"authors": [
-		{
-			"name": "Nguyen An Hung",
-			"email": "[email protected]",
-			"homepage": "https://nguyenanhung.com",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": "^8.0 || ^7.0",
-		"ext-json": "*",
-		"ext-pdo": "*",
-		"ext-mysqli": "*",
-		"nguyenanhung/my-debug": "^4.0 || ^3.0",
-		"nguyenanhung/pdo": "^3.0",
-		"nguyenanhung/mysqli": "^3.0",
-		"nguyenanhung/database-helper": "^2.0",
-		"illuminate/events": "^11.0 || ^10.0 || ^9.0 || ^8.61",
-		"illuminate/database": "^11.0 || ^10.0 || ^9.0 || ^8.61"
-	},
-	"require-dev": {
-		"kint-php/kint": ">=3.0"
-	},
-	"autoload": {
-		"psr-4": {
-			"nguyenanhung\\MyDatabase\\": "src/"
-		}
-	},
-	"suggest": {
-		"ext-json": "Needed to support JSON",
-		"ext-pdo": "Needed to support PDO",
-		"ext-mysqli": "Needed to support MySQLi",
-		"sentry/sdk": "Need support for Logging with Sentry"
-	}
+    "name": "nguyenanhung/database",
+    "type": "library",
+    "description": "Database Wrapper - Base Model",
+    "keywords": [
+        "database",
+        "sql",
+        "mysql",
+        "mysqli",
+        "pdo",
+        "active record",
+        "query buillder"
+    ],
+    "homepage": "https://github.com/nguyenanhung/database",
+    "license": "GPL-3.0",
+    "authors": [
+        {
+            "name": "Nguyen An Hung",
+            "email": "[email protected]",
+            "homepage": "https://nguyenanhung.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": "^8.0 || ^7.0",
+        "ext-json": "*",
+        "ext-pdo": "*",
+        "ext-mysqli": "*",
+        "nguyenanhung/my-debug": "^4.0 || ^3.0",
+        "nguyenanhung/pdo": "^3.0",
+        "nguyenanhung/mysqli": "^3.0",
+        "nguyenanhung/database-helper": "^2.0",
+        "illuminate/events": "^11.0 || ^10.0 || ^9.0 || ^8.61",
+        "illuminate/database": "^11.0 || ^10.0 || ^9.0 || ^8.61"
+    },
+    "require-dev": {
+        "kint-php/kint": ">=3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "nguyenanhung\\MyDatabase\\": "src/"
+        }
+    },
+    "suggest": {
+        "ext-json": "Needed to support JSON",
+        "ext-pdo": "Needed to support PDO",
+        "ext-mysqli": "Needed to support MySQLi",
+        "sentry/sdk": "Need support for Logging with Sentry"
+    }
 }
diff --git a/sample/config/example_backup_database.php b/sample/config/example_backup_database.php
@@ -8,22 +8,22 @@
  * Time: 00:23
  */
 return [
-	'development' => [
-		'type' => 'mysql',
-		'host' => '127.0.0.1',
-		'port' => '3306',
-		'user' => 'root',
-		'pass' => '',
-		'database' => 'my_database_development',
-		'singleTransaction' => false
-	],
-	'production' => [
-		'type' => 'mysql',
-		'host' => '127.0.0.1',
-		'port' => '3306',
-		'user' => 'root',
-		'pass' => '',
-		'database' => 'my_database_production',
-		'singleTransaction' => false
-	],
+    'development' => [
+        'type' => 'mysql',
+        'host' => '127.0.0.1',
+        'port' => '3306',
+        'user' => 'root',
+        'pass' => '',
+        'database' => 'my_database_development',
+        'singleTransaction' => false
+    ],
+    'production' => [
+        'type' => 'mysql',
+        'host' => '127.0.0.1',
+        'port' => '3306',
+        'user' => 'root',
+        'pass' => '',
+        'database' => 'my_database_production',
+        'singleTransaction' => false
+    ],
 ];
diff --git a/sample/config/example_backup_storage.php b/sample/config/example_backup_storage.php
@@ -8,60 +8,60 @@
  * Time: 00:23
  */
 return [
-	'local' => [
-		'type' => 'Local',
-		'root' => testBackupPath()
-	],
-	's3' => [
-		'type' => 'AwsS3',
-		'key' => '',
-		'secret' => '',
-		'region' => 'us-east-1',
-		'version' => 'latest',
-		'bucket' => '',
-		'root' => '',
-	],
-	'gcs' => [
-		'type' => 'Gcs',
-		'key' => '',
-		'secret' => '',
-		'version' => 'latest',
-		'bucket' => '',
-		'root' => '',
-	],
-	'rackspace' => [
-		'type' => 'Rackspace',
-		'username' => '',
-		'password' => '',
-		'container' => '',
-	],
-	'dropbox' => [
-		'type' => 'Dropbox',
-		'token' => '',
-		'key' => '',
-		'secret' => '',
-		'app' => '',
-		'root' => '',
-	],
-	'ftp' => [
-		'type' => 'Ftp',
-		'host' => '',
-		'username' => '',
-		'password' => '',
-		'root' => '',
-		'port' => 21,
-		'passive' => true,
-		'ssl' => true,
-		'timeout' => 30,
-	],
-	'sftp' => [
-		'type' => 'Sftp',
-		'host' => '',
-		'username' => '',
-		'password' => '',
-		'root' => '',
-		'port' => 21,
-		'timeout' => 10,
-		'privateKey' => '',
-	],
+    'local' => [
+        'type' => 'Local',
+        'root' => testBackupPath()
+    ],
+    's3' => [
+        'type' => 'AwsS3',
+        'key' => '',
+        'secret' => '',
+        'region' => 'us-east-1',
+        'version' => 'latest',
+        'bucket' => '',
+        'root' => '',
+    ],
+    'gcs' => [
+        'type' => 'Gcs',
+        'key' => '',
+        'secret' => '',
+        'version' => 'latest',
+        'bucket' => '',
+        'root' => '',
+    ],
+    'rackspace' => [
+        'type' => 'Rackspace',
+        'username' => '',
+        'password' => '',
+        'container' => '',
+    ],
+    'dropbox' => [
+        'type' => 'Dropbox',
+        'token' => '',
+        'key' => '',
+        'secret' => '',
+        'app' => '',
+        'root' => '',
+    ],
+    'ftp' => [
+        'type' => 'Ftp',
+        'host' => '',
+        'username' => '',
+        'password' => '',
+        'root' => '',
+        'port' => 21,
+        'passive' => true,
+        'ssl' => true,
+        'timeout' => 30,
+    ],
+    'sftp' => [
+        'type' => 'Sftp',
+        'host' => '',
+        'username' => '',
+        'password' => '',
+        'root' => '',
+        'port' => 21,
+        'timeout' => 10,
+        'privateKey' => '',
+    ],
 ];
diff --git a/sample/config/example_db.php b/sample/config/example_db.php
@@ -8,12 +8,12 @@
  * Time: 00:23
  */
 return [
-	'driver' => 'mysql',
-	'host' => 'localhost',
-	'database' => 'database',
-	'username' => 'root',
-	'password' => 'password',
-	'charset' => 'utf8',
-	'collation' => 'utf8_unicode_ci',
-	'prefix' => '',
+    'driver' => 'mysql',
+    'host' => 'localhost',
+    'database' => 'database',
+    'username' => 'root',
+    'password' => 'password',
+    'charset' => 'utf8',
+    'collation' => 'utf8_unicode_ci',
+    'prefix' => '',
 ];
diff --git a/sample/config/example_db_codeigniter.php b/sample/config/example_db_codeigniter.php
@@ -8,23 +8,23 @@
  * Time: 00:23
  */
 return [
-	'dsn' => '',
-	'hostname' => 'localhost',
-	'username' => 'root',
-	'password' => 'my_password',
-	'database' => 'my_database',
-	'dbdriver' => 'mysqli',
-	'dbprefix' => '',
-	'pconnect' => false,
-	'db_debug' => true,
-	'cache_on' => false,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => false,
-	'compress' => false,
-	'stricton' => false,
-	'failover' => array(),
-	'save_queries' => true
+    'dsn' => '',
+    'hostname' => 'localhost',
+    'username' => 'root',
+    'password' => 'my_password',
+    'database' => 'my_database',
+    'dbdriver' => 'mysqli',
+    'dbprefix' => '',
+    'pconnect' => false,
+    'db_debug' => true,
+    'cache_on' => false,
+    'cachedir' => '',
+    'char_set' => 'utf8',
+    'dbcollat' => 'utf8_general_ci',
+    'swap_pre' => '',
+    'encrypt' => false,
+    'compress' => false,
+    'stricton' => false,
+    'failover' => array(),
+    'save_queries' => true
 ];
diff --git a/sample/config/example_db_mysqli.php b/sample/config/example_db_mysqli.php
@@ -8,11 +8,11 @@
  * Time: 00:23
  */
 return [
-	'host' => 'host',
-	'port' => 3306,
-	'username' => 'username',
-	'password' => 'password',
-	'db' => 'databaseName',
-	'prefix' => 'my_',
-	'charset' => 'utf8'
+    'host' => 'host',
+    'port' => 3306,
+    'username' => 'username',
+    'password' => 'password',
+    'db' => 'databaseName',
+    'prefix' => 'my_',
+    'charset' => 'utf8'
 ];
diff --git a/sample/test/test.php b/sample/test/test.php
@@ -15,14 +15,14 @@
 use nguyenanhung\MyDatabase\Model\BaseModel;
 
 $database = [
-	'driver' => 'mysql',
-	'host' => 'localhost',
-	'database' => 'test_database',
-	'username' => 'root',
-	'password' => '',
-	'charset' => 'utf8',
-	'collation' => 'utf8_unicode_ci',
-	'prefix' => '',
+    'driver' => 'mysql',
+    'host' => 'localhost',
+    'database' => 'test_database',
+    'username' => 'root',
+    'password' => '',
+    'charset' => 'utf8',
+    'collation' => 'utf8_unicode_ci',
+    'prefix' => '',
 ];
 
 $model = new BaseModel();