Skip to content

Commit

Permalink
Merge pull request #5530 from codeigniter4/develop
Browse files Browse the repository at this point in the history
4.1.6 Ready code
  • Loading branch information
MGatner authored Jan 4, 2022
2 parents 8c7f701 + ec98d58 commit 6b2816c
Show file tree
Hide file tree
Showing 367 changed files with 7,659 additions and 4,645 deletions.
21 changes: 20 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ body:
whether still open or closed, related to your report**.
If there is, your report will be closed promptly.
And if you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases) of CodeIgniter, please update.
For example, if you get the error "*Undefined property: Config\\Exceptions::$sensitiveDataInTrace*",
you can search the GitHub repository with the keyword "[$sensitiveDataInTrace](https://github.com/codeigniter4/CodeIgniter4/search?q=%24sensitiveDataInTrace&type=issues)".
---
Expand All @@ -35,6 +36,23 @@ body:
id: codeigniter-version
attributes:
label: CodeIgniter4 Version
description: |
e.g. 4.1.5
If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please
check to see if the problem occurs with the latest version.
validations:
required: true

- type: dropdown
id: codeigniter-installation
attributes:
label: CodeIgniter4 Installation Method
multiple: false
options:
- Composer (using `codeigniter4/appstarter`)
- Composer (as dependency to an existing project)
- Manual (zip or tar.gz)
- Git
validations:
required: true

Expand Down Expand Up @@ -69,6 +87,7 @@ body:
id: database
attributes:
label: Database
description: e.g. MySQL 5.6, MariaDB 10.2, PostgreSQL 9.6
validations:
required: false

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: CodeIgniter Forum
url: https://forum.codeigniter.com
url: https://forum.codeigniter.com/forum-30.html
about: Please ask your support questions in the forums. Thanks!

- name: CodeIgniter Slack channel
Expand Down
23 changes: 23 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
changelog:
exclude:
authors:
- dependabot
categories:
- title: Breaking Changes
labels:
- 'breaking change'
- title: Fixed Bugs
labels:
- bug
- title: New Features
labels:
- 'new feature'
- title: Enhancements
labels:
- enhancement
- title: Refactoring
labels:
- refactor
- title: Others (Only for checking. Remove this category)
labels:
- "*"
2 changes: 2 additions & 0 deletions .github/scripts/deploy-framework
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ done

# Copy repo-specific files
cp -Rf ${SOURCE}/admin/framework/. ./
# Copy tests files
cp -Rf ${SOURCE}/admin/starter/tests/. ./tests/

# Commit the changes
git add .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
with:
github-token: ${{secrets.ACCESS_TOKEN}}
script: |
const release = await github.repos.getLatestRelease({
const release = await github.rest.repos.getLatestRelease({
owner: context.repo.owner,
repo: context.repo.repo
})
github.repos.createRelease({
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: 'framework',
tag_name: release.data.tag_name,
Expand Down Expand Up @@ -85,11 +85,11 @@ jobs:
with:
github-token: ${{secrets.ACCESS_TOKEN}}
script: |
const release = await github.repos.getLatestRelease({
const release = await github.rest.repos.getLatestRelease({
owner: context.repo.owner,
repo: context.repo.repo
})
github.repos.createRelease({
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: 'appstarter',
tag_name: release.data.tag_name,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0']
php-versions: ['8.0', '8.1']
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
38 changes: 18 additions & 20 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ on:
push:
branches:
- develop
- '4.*'
paths:
- 'app/**'
- 'public/**'
- 'system/**'
- 'tests/**'
- composer.json
- spark
- phpunit.xml.dist
Expand All @@ -18,35 +13,32 @@ on:
pull_request:
branches:
- develop
- '4.*'
paths:
- 'app/**'
- 'public/**'
- 'system/**'
- 'tests/**'
- composer.json
- spark
- phpunit.xml.dist
- '**.php'
- .github/workflows/test-phpunit.yml

jobs:

tests:
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
runs-on: ubuntu-20.04
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}

strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4', '8.0']
php-versions: ['7.3', '7.4', '8.0', '8.1']
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
mysql-versions: ['5.7']
include:
- php-versions: '7.4'
db-platforms: MySQLi
mysql-versions: '8.0'
# @todo remove once 8.1 is stable enough
- php-versions: '8.1'
composer-flag: '--ignore-platform-req=php'

services:
mysql:
Expand All @@ -57,6 +49,7 @@ jobs:
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

postgres:
image: postgres
env:
Expand All @@ -66,6 +59,7 @@ jobs:
ports:
- 5432:5432
options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3

mssql:
image: mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04
env:
Expand All @@ -75,11 +69,13 @@ jobs:
ports:
- 1433:1433
options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3

redis:
image: redis
ports:
- 6379:6379
options: --health-cmd "redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3

memcached:
image: memcached:1.6-alpine
ports:
Expand All @@ -105,6 +101,7 @@ jobs:

- name: Install latest ImageMagick
run: |
sudo apt-get update
sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
sudo apt-get install -y imagemagick
sudo apt-get install --fix-broken
Expand All @@ -122,13 +119,13 @@ jobs:

- name: Install dependencies
run: |
composer update --ansi --no-interaction
composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
composer update --ansi --no-interaction ${{ matrix.composer-flag }}
composer remove --ansi --dev --unused -W ${{ matrix.composer-flag }} -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
env:
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

- name: Profile slow tests in PHP 7.4 MySQLi for now
if: matrix.php-versions == '7.4' && matrix.db-platforms == 'MySQLi'
- name: Profile slow tests in PHP 8.0
if: matrix.php-versions == '8.0'
run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV

- name: Test with PHPUnit
Expand All @@ -137,10 +134,10 @@ jobs:
DB: ${{ matrix.db-platforms }}
TERM: xterm-256color

- if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '7.4'
name: Run Coveralls
- name: Run Coveralls
if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '8.0'
run: |
composer global require --ansi php-coveralls/php-coveralls:^2.4
composer global require --ansi php-coveralls/php-coveralls:^2.4 symfony/console:^5
php-coveralls --coverage_clover=build/logs/clover.xml -v
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -151,6 +148,7 @@ jobs:
if: github.repository_owner == 'codeigniter4'
needs: [tests]
runs-on: ubuntu-20.04

steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
Expand Down
Loading

0 comments on commit 6b2816c

Please sign in to comment.