Skip to content

Commit

Permalink
Merge pull request #8042 from kenjis/drop-php-8.0-CI45
Browse files Browse the repository at this point in the history
Drop PHP 8.0 support
  • Loading branch information
kenjis authored Oct 20, 2023
2 parents 091abaf + 188c967 commit 26bc784
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-userguide-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
coverage: none

# Build the latest User Guide
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
# Service containers cannot be extracted to caller workflows yet
services:
mysql:
image: mysql:${{ inputs.mysql-version || '8.0' }}
image: mysql:${{ inputs.mysql-version || '8.1' }}
env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.0'
- '8.1'
- '8.2'

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-phpcpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
tools: phpcpd
extensions: dom, mbstring

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
Expand Down Expand Up @@ -84,7 +83,6 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
Expand All @@ -97,7 +95,7 @@ jobs:
mysql-version:
- '5.7'
include:
- php-version: '8.0'
- php-version: '8.1'
db-platform: MySQLi
mysql-version: '8.0'
- php-version: '8.3'
Expand Down Expand Up @@ -125,7 +123,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
Expand Down Expand Up @@ -153,7 +150,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.0', '8.2']
php-versions: ['8.1', '8.3']
paths:
- app
- system
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Made with [contrib.rocks](https://contrib.rocks).

## Server Requirements

PHP version 8.0 or higher is required, with the following extensions installed:
PHP version 8.1 or higher is required, with the following extensions installed:

- [intl](http://php.net/manual/en/intl.requirements.php)
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
Expand Down
2 changes: 1 addition & 1 deletion admin/framework/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/

## Server Requirements

PHP version 8.0 or higher is required, with the following extensions installed:
PHP version 8.1 or higher is required, with the following extensions installed:

- [intl](http://php.net/manual/en/intl.requirements.php)
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
Expand Down
2 changes: 1 addition & 1 deletion admin/framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"slack": "https://codeigniterchat.slack.com"
},
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
Expand Down
2 changes: 1 addition & 1 deletion admin/starter/.github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0', '8.2']
php-versions: ['8.1', '8.3']

runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion admin/starter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Problems with it can be raised on our forum, or as issues in the main repository

## Server Requirements

PHP version 8.0 or higher is required, with the following extensions installed:
PHP version 8.1 or higher is required, with the following extensions installed:

- [intl](http://php.net/manual/en/intl.requirements.php)
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
Expand Down
2 changes: 1 addition & 1 deletion admin/starter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"slack": "https://codeigniterchat.slack.com"
},
"require": {
"php": "^8.0",
"php": "^8.1",
"codeigniter4/framework": "^4.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"slack": "https://codeigniterchat.slack.com"
},
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
Expand Down
2 changes: 1 addition & 1 deletion contributing/pull_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ See [Contribution CSS](./css.md).

### Compatibility

CodeIgniter4 requires [PHP 8.0](https://php.net/releases/8_0_0.php).
CodeIgniter4 requires [PHP 8.1](https://php.net/releases/8_1_0.php).

### Backwards Compatibility

Expand Down
2 changes: 1 addition & 1 deletion public/index.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

// Check PHP version.
$minPhpVersion = '8.0'; // If you update this, don't forget to update `spark`.
$minPhpVersion = '8.1'; // If you update this, don't forget to update `spark`.
if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
$message = sprintf(
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
Expand Down
2 changes: 1 addition & 1 deletion spark
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (strpos(PHP_SAPI, 'cgi') === 0) {
}

// Check PHP version.
$minPhpVersion = '8.0'; // If you update this, don't forget to update `public/index.php`.
$minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`.
if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
$message = sprintf(
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
Expand Down
2 changes: 1 addition & 1 deletion system/Cookie/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ public function toHeaderString(): string
/**
* {@inheritDoc}
*/
public function __toString()
public function __toString(): string
{
$cookieHeader = [];

Expand Down
2 changes: 1 addition & 1 deletion system/View/Cells/Cell.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ final protected function view(?string $view, array $data = []): string
/**
* Provides capability to render on string casting.
*/
public function __toString()
public function __toString(): string
{
return $this->render();
}
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/changelogs/v4.5.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Release Date: Unreleased
Highlights
**********

- Update minimal PHP requirement to 8.0.
- Update minimal PHP requirement to 8.1.
- TBD

BREAKING
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/installation/installing_composer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ edit **composer.json** manually.
If you try the ``4.6`` branch, change the version to ``4.6.x-dev``::

"require": {
"php": "^8.0",
"php": "^8.1",
"codeigniter4/codeigniter4": "4.6.x-dev"
},

Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/installation/upgrade_4xx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Downloads
Namespaces
==========

- CI4 is built for PHP 8.0+, and everything in the framework is namespaced,
- CI4 is built for PHP 8.1+, and everything in the framework is namespaced,
except for the helper and lang files.

Application Structure
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/intro/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Server Requirements
PHP and Required Extensions
***************************

`PHP <https://www.php.net/>`_ version 8.0 or newer is required, with the following PHP extensions are enabled:
`PHP <https://www.php.net/>`_ version 8.1 or newer is required, with the following PHP extensions are enabled:

- `intl <https://www.php.net/manual/en/intl.requirements.php>`_
- `mbstring <https://www.php.net/manual/en/mbstring.requirements.php>`_
Expand Down

0 comments on commit 26bc784

Please sign in to comment.