Merge pull request #47 from nguyenanhung/v3.2.0-develop

Update Coding PHP Style
nguyenanhung · Apr 5, 2024 · 3ad56cf · 3ad56cf
2 parents edc3b79 + c456168
commit 3ad56cf
Show file tree

Hide file tree

Showing 45 changed files with 3,001 additions and 2,599 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,28 +2,28 @@
 name: Testing CodeIgniter3 Framework develop by HungNG
 on: [ push, pull_request ]
 jobs:
-    build:
-        strategy:
-            matrix:
-                operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-latest', 'macos-11', 'macos-12' ]
-                php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
-        runs-on: ${{ matrix.operating-system }}
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v3
-            -   name: Setup PHP, with composer and extensions
-                uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
-                with:
-                    php-version: ${{ matrix.php-versions }}
-                    extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
-            -   name: Get composer cache directory
-                id: composer-cache
-                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-            -   name: Cache dependencies
-                uses: actions/cache@v3
-                with:
-                    path: ${{ steps.composer-cache.outputs.dir }}
-                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-                    restore-keys: ${{ runner.os }}-composer-
-            -   name: Install dependencies
-                run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
+  build:
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04' ]
+        php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+    runs-on: ${{ matrix.operating-system }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install dependencies
+        run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
diff --git a/config/constants.php b/config/constants.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('BASEPATH') or exit('No direct script access allowed');
 /**
  * Project codeigniter-framework
@@ -16,7 +17,19 @@
 defined('POWERED_HUNGNG_EMAIL') or define('POWERED_HUNGNG_EMAIL', 'dev@nguyenanhung.com');
 defined('POWERED_HUNGNG_NAME') or define('POWERED_HUNGNG_NAME', 'Nguyen An Hung');
 defined('POWERED_HUNGNG_SHORT_NAME') or define('POWERED_HUNGNG_SHORT_NAME', 'Hung Nguyen');
-defined('CODEIGNITER_HUNGNG_VENDOR_PACKAGES') or define('CODEIGNITER_HUNGNG_VENDOR_PACKAGES', 'https://packagist.org/packages/nguyenanhung/codeigniter-framework');
-defined('CODEIGNITER_HUNGNG_VENDOR_SOURCE') or define('CODEIGNITER_HUNGNG_VENDOR_SOURCE', 'https://github.com/nguyenanhung/codeigniter-framework');
-defined('CI3_FRAMEWORK_ISSUES') or define('CI3_FRAMEWORK_ISSUES', 'https://github.com/nguyenanhung/codeigniter-framework/issues');
-defined('CI3_FRAMEWORK_PULL_REQUESTS') or define('CI3_FRAMEWORK_PULL_REQUESTS', 'https://github.com/nguyenanhung/codeigniter-framework/pulls');
+defined('CODEIGNITER_HUNGNG_VENDOR_PACKAGES') or define(
+	'CODEIGNITER_HUNGNG_VENDOR_PACKAGES',
+	'https://packagist.org/packages/nguyenanhung/codeigniter-framework'
+);
+defined('CODEIGNITER_HUNGNG_VENDOR_SOURCE') or define(
+	'CODEIGNITER_HUNGNG_VENDOR_SOURCE',
+	'https://github.com/nguyenanhung/codeigniter-framework'
+);
+defined('CI3_FRAMEWORK_ISSUES') or define(
+	'CI3_FRAMEWORK_ISSUES',
+	'https://github.com/nguyenanhung/codeigniter-framework/issues'
+);
+defined('CI3_FRAMEWORK_PULL_REQUESTS') or define(
+	'CI3_FRAMEWORK_PULL_REQUESTS',
+	'https://github.com/nguyenanhung/codeigniter-framework/pulls'
+);
diff --git a/config/doctypes.php b/config/doctypes.php
@@ -1,5 +1,6 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+
+defined('BASEPATH') or exit('No direct script access allowed');
 
 $_doctypes = array(
 	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',