Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ body:
description: Which PHP versions did you run your code?
multiple: true
options:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
- '8.5'
validations:
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-apidocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
tools: phive
coverage: none

Expand Down
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.1'
php-version: '8.2'
coverage: none

- name: Setup Python
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 @@ -170,7 +170,7 @@ jobs:
- name: Setup global environment variables
run: |
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}" >> $GITHUB_ENV
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}${{ inputs.mysql-version || '' }}" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-autoreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
name: Automatic Code Review
uses: ./.github/workflows/reusable-serviceless-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
job-name: PHP 8.1
php-version: '8.1'
job-name: PHP 8.2
php-version: '8.2'
job-id: auto-review-tests
group-name: AutoReview

Expand All @@ -47,7 +47,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'

- name: Install dependencies
run: composer update
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.1'
- '8.2'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deptrac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
tools: composer
extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3

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 @@ -57,7 +57,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: intl
coverage: none

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 @@ -56,7 +56,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand Down Expand Up @@ -86,7 +85,6 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand All @@ -100,7 +98,7 @@ jobs:
mysql-version:
- '8.0'
include:
- php-version: '8.1'
- php-version: '8.2'
db-platform: MySQLi
mysql-version: '5.7'
- php-version: '8.5'
Expand Down Expand Up @@ -129,7 +127,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand Down Expand Up @@ -158,7 +155,6 @@ jobs:
strategy:
matrix:
php-version:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.1'
- '8.2'

steps:
- name: Checkout base branch for PR
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 @@ -46,7 +46,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.1'
- '8.2'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,17 @@ Made with [contrib.rocks](https://contrib.rocks).

## Server Requirements

PHP version 8.1 or higher is required, with the following extensions installed:
PHP version 8.2 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)

> [!WARNING]
> - The end of life date for PHP 7.4 was November 28, 2022.
> - The end of life date for PHP 8.0 was November 26, 2023.
> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately.
> - The end of life date for PHP 8.1 will be December 31, 2025.
> - The end of life date for PHP 8.1 was December 31, 2025.
> - If you are still using below PHP 8.2, you should upgrade immediately.
> - The end of life date for PHP 8.2 will be December 31, 2026.

Additionally, make sure that the following extensions are enabled in your PHP:

Expand Down
7 changes: 4 additions & 3 deletions admin/framework/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,17 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/

## Server Requirements

PHP version 8.1 or higher is required, with the following extensions installed:
PHP version 8.2 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)

> [!WARNING]
> - The end of life date for PHP 7.4 was November 28, 2022.
> - The end of life date for PHP 8.0 was November 26, 2023.
> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately.
> - The end of life date for PHP 8.1 will be December 31, 2025.
> - The end of life date for PHP 8.1 was December 31, 2025.
> - If you are still using below PHP 8.2, you should upgrade immediately.
> - The end of life date for PHP 8.2 will be December 31, 2026.

Additionally, make sure that the following extensions are enabled in your 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.1",
"php": "^8.2",
"ext-intl": "*",
"ext-mbstring": "*",
"laminas/laminas-escaper": "^2.17",
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.1', '8.3']
php-versions: ['8.2', '8.4']

runs-on: ubuntu-latest

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

## Server Requirements

PHP version 8.1 or higher is required, with the following extensions installed:
PHP version 8.2 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)

> [!WARNING]
> - The end of life date for PHP 7.4 was November 28, 2022.
> - The end of life date for PHP 8.0 was November 26, 2023.
> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately.
> - The end of life date for PHP 8.1 will be December 31, 2025.
> - The end of life date for PHP 8.1 was December 31, 2025.
> - If you are still using below PHP 8.2, you should upgrade immediately.
> - The end of life date for PHP 8.2 will be December 31, 2026.

Additionally, make sure that the following extensions are enabled in your PHP:

Expand Down
4 changes: 2 additions & 2 deletions admin/starter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"slack": "https://codeigniterchat.slack.com"
},
"require": {
"php": "^8.1",
"codeigniter4/framework": "^4.0"
"php": "^8.2",
"codeigniter4/framework": "^4.7"
},
"require-dev": {
"fakerphp/faker": "^1.9",
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.1",
"php": "^8.2",
"ext-intl": "*",
"ext-mbstring": "*",
"laminas/laminas-escaper": "^2.17",
Expand Down
2 changes: 1 addition & 1 deletion contributing/pull_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ See [Contribution CSS](./css.md).

### Compatibility

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

### Backwards Compatibility

Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ includes:
- utils/phpstan-baseline/loader.neon

parameters:
phpVersion: 80100
phpVersion: 80200
tmpDir: build/phpstan
level: 6
bootstrapFiles:
Expand Down
2 changes: 1 addition & 1 deletion public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*---------------------------------------------------------------
*/

$minPhpVersion = '8.1'; // If you update this, don't forget to update `spark`.
$minPhpVersion = '8.2'; // 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 rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;

return RectorConfig::configure()
->withPhpSets(php81: true)
->withPhpSets(php82: true)
->withPreparedSets(deadCode: true, instanceOf: true, strictBooleans: true, phpunitCodeQuality: true)
->withComposerBased(phpunit: true)
->withParallel(120, 8, 10)
Expand Down
2 changes: 1 addition & 1 deletion spark
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if (str_starts_with(PHP_SAPI, 'cgi')) {
*---------------------------------------------------------------
*/

$minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`.
$minPhpVersion = '8.2'; // 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
4 changes: 2 additions & 2 deletions system/Cache/FactoriesCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
use CodeIgniter\Cache\FactoriesCache\FileVarExportHandler;
use CodeIgniter\Config\Factories;

final class FactoriesCache
final readonly class FactoriesCache
{
private readonly CacheInterface|FileVarExportHandler $cache;
private CacheInterface|FileVarExportHandler $cache;

public function __construct(CacheInterface|FileVarExportHandler|null $cache = null)
{
Expand Down
4 changes: 2 additions & 2 deletions system/Commands/Utilities/Routes/AutoRouteCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
*
* @see \CodeIgniter\Commands\Utilities\Routes\AutoRouteCollectorTest
*/
final class AutoRouteCollector
final readonly class AutoRouteCollector
{
/**
* @param string $namespace namespace to search
*/
public function __construct(private readonly string $namespace, private readonly string $defaultController, private readonly string $defaultMethod)
public function __construct(private string $namespace, private string $defaultController, private string $defaultMethod)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* @see \CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollectorTest
*/
final class AutoRouteCollector
final readonly class AutoRouteCollector
{
/**
* @param string $namespace namespace to search
Expand All @@ -31,12 +31,12 @@ final class AutoRouteCollector
* @param string $prefix URI prefix for Module Routing
*/
public function __construct(
private readonly string $namespace,
private readonly string $defaultController,
private readonly string $defaultMethod,
private readonly array $httpMethods,
private readonly array $protectedControllers,
private readonly string $prefix = '',
private string $namespace,
private string $defaultController,
private string $defaultMethod,
private array $httpMethods,
private array $protectedControllers,
private string $prefix = '',
) {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
*
* @see \CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\ControllerMethodReaderTest
*/
final class ControllerMethodReader
final readonly class ControllerMethodReader
{
private readonly bool $translateURIDashes;
private readonly bool $translateUriToCamelCase;
private bool $translateURIDashes;
private bool $translateUriToCamelCase;

/**
* @param string $namespace the default namespace
* @param list<string> $httpMethods
*/
public function __construct(
private readonly string $namespace,
private readonly array $httpMethods,
private string $namespace,
private array $httpMethods,
) {
$config = config(Routing::class);
$this->translateURIDashes = $config->translateURIDashes;
Expand Down
6 changes: 3 additions & 3 deletions system/Commands/Utilities/Routes/ControllerFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
*
* @see \CodeIgniter\Commands\Utilities\Routes\ControllerFinderTest
*/
final class ControllerFinder
final readonly class ControllerFinder
{
private readonly FileLocatorInterface $locator;
private FileLocatorInterface $locator;

/**
* @param string $namespace namespace to search
*/
public function __construct(
private readonly string $namespace,
private string $namespace,
) {
$this->locator = service('locator');
}
Expand Down
Loading
Loading