Skip to content

Commit 3ad56cf

Browse files
authored
Merge pull request #47 from nguyenanhung/v3.2.0-develop
Update Coding PHP Style
2 parents edc3b79 + c456168 commit 3ad56cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3001
-2599
lines changed

.github/workflows/php.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
name: Testing CodeIgniter3 Framework develop by HungNG
33
on: [ push, pull_request ]
44
jobs:
5-
build:
6-
strategy:
7-
matrix:
8-
operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-latest', 'macos-11', 'macos-12' ]
9-
php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
10-
runs-on: ${{ matrix.operating-system }}
11-
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v3
14-
- name: Setup PHP, with composer and extensions
15-
uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
16-
with:
17-
php-version: ${{ matrix.php-versions }}
18-
extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
19-
- name: Get composer cache directory
20-
id: composer-cache
21-
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
22-
- name: Cache dependencies
23-
uses: actions/cache@v3
24-
with:
25-
path: ${{ steps.composer-cache.outputs.dir }}
26-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
27-
restore-keys: ${{ runner.os }}-composer-
28-
- name: Install dependencies
29-
run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
5+
build:
6+
strategy:
7+
matrix:
8+
operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04' ]
9+
php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
10+
runs-on: ${{ matrix.operating-system }}
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
- name: Setup PHP, with composer and extensions
15+
uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
16+
with:
17+
php-version: ${{ matrix.php-versions }}
18+
extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
19+
- name: Get composer cache directory
20+
id: composer-cache
21+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
22+
- name: Cache dependencies
23+
uses: actions/cache@v3
24+
with:
25+
path: ${{ steps.composer-cache.outputs.dir }}
26+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
27+
restore-keys: ${{ runner.os }}-composer-
28+
- name: Install dependencies
29+
run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader

config/constants.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
defined('BASEPATH') or exit('No direct script access allowed');
34
/**
45
* Project codeigniter-framework
@@ -16,7 +17,19 @@
1617
defined('POWERED_HUNGNG_EMAIL') or define('POWERED_HUNGNG_EMAIL', 'dev@nguyenanhung.com');
1718
defined('POWERED_HUNGNG_NAME') or define('POWERED_HUNGNG_NAME', 'Nguyen An Hung');
1819
defined('POWERED_HUNGNG_SHORT_NAME') or define('POWERED_HUNGNG_SHORT_NAME', 'Hung Nguyen');
19-
defined('CODEIGNITER_HUNGNG_VENDOR_PACKAGES') or define('CODEIGNITER_HUNGNG_VENDOR_PACKAGES', 'https://packagist.org/packages/nguyenanhung/codeigniter-framework');
20-
defined('CODEIGNITER_HUNGNG_VENDOR_SOURCE') or define('CODEIGNITER_HUNGNG_VENDOR_SOURCE', 'https://github.com/nguyenanhung/codeigniter-framework');
21-
defined('CI3_FRAMEWORK_ISSUES') or define('CI3_FRAMEWORK_ISSUES', 'https://github.com/nguyenanhung/codeigniter-framework/issues');
22-
defined('CI3_FRAMEWORK_PULL_REQUESTS') or define('CI3_FRAMEWORK_PULL_REQUESTS', 'https://github.com/nguyenanhung/codeigniter-framework/pulls');
20+
defined('CODEIGNITER_HUNGNG_VENDOR_PACKAGES') or define(
21+
'CODEIGNITER_HUNGNG_VENDOR_PACKAGES',
22+
'https://packagist.org/packages/nguyenanhung/codeigniter-framework'
23+
);
24+
defined('CODEIGNITER_HUNGNG_VENDOR_SOURCE') or define(
25+
'CODEIGNITER_HUNGNG_VENDOR_SOURCE',
26+
'https://github.com/nguyenanhung/codeigniter-framework'
27+
);
28+
defined('CI3_FRAMEWORK_ISSUES') or define(
29+
'CI3_FRAMEWORK_ISSUES',
30+
'https://github.com/nguyenanhung/codeigniter-framework/issues'
31+
);
32+
defined('CI3_FRAMEWORK_PULL_REQUESTS') or define(
33+
'CI3_FRAMEWORK_PULL_REQUESTS',
34+
'https://github.com/nguyenanhung/codeigniter-framework/pulls'
35+
);

config/doctypes.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
defined('BASEPATH') OR exit('No direct script access allowed');
2+
3+
defined('BASEPATH') or exit('No direct script access allowed');
34

45
$_doctypes = array(
56
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

0 commit comments

Comments
 (0)