Merge branch 'require-php84'

Author: jamieburchell

.github/workflows/test-phpunit.yml

@@ -15,98 +15,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.4', '8.3', '8.2', '8.1', '8.0', '7.4']
+        php: [ '8.5', '8.4' ]
         DB: [ 'pdo/mysql', 'pdo/pgsql', 'pdo/sqlite', 'mysqli', 'pgsql', 'sqlite' ]
         compiler: [ default ]
         include:
-          - php: '8.4'
-            DB: 'pdo/mysql'
-            compiler: jit
-          - php: '8.4'
-            DB: 'pdo/pgsql'
-            compiler: jit
-          - php: '8.4'
-            DB: 'pdo/sqlite'
-            compiler: jit
-          - php: '8.4'
-            DB: 'mysqli'
-            compiler: jit
-          - php: '8.4'
-            DB: 'pgsql'
-            compiler: jit
-          - php: '8.4'
-            DB: 'sqlite'
-            compiler: jit
-          - php: '8.3'
-            DB: 'pdo/mysql'
-            compiler: jit
-          - php: '8.3'
-            DB: 'pdo/pgsql'
-            compiler: jit
-          - php: '8.3'
-            DB: 'pdo/sqlite'
-            compiler: jit
-          - php: '8.3'
-            DB: 'mysqli'
-            compiler: jit
-          - php: '8.3'
-            DB: 'pgsql'
-            compiler: jit
-          - php: '8.3'
-            DB: 'sqlite'
-            compiler: jit
-          - php: '8.2'
-            DB: 'pdo/mysql'
-            compiler: jit
-          - php: '8.2'
-            DB: 'pdo/pgsql'
-            compiler: jit
-          - php: '8.2'
-            DB: 'pdo/sqlite'
-            compiler: jit
-          - php: '8.2'
-            DB: 'mysqli'
-            compiler: jit
-          - php: '8.2'
-            DB: 'pgsql'
-            compiler: jit
-          - php: '8.2'
-            DB: 'sqlite'
-            compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'pdo/mysql'
             compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'pdo/pgsql'
             compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'pdo/sqlite'
             compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'mysqli'
             compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'pgsql'
             compiler: jit
-          - php: '8.1'
+          - php: '8.5'
             DB: 'sqlite'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'pdo/mysql'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'pdo/pgsql'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'pdo/sqlite'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'mysqli'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'pgsql'
             compiler: jit
-          - php: '8.0'
+          - php: '8.4'
             DB: 'sqlite'
             compiler: jit
 

composer.json

@@ -11,7 +11,7 @@
 		"source": "https://github.com/bcit-ci/CodeIgniter"
 	},
 	"require": {
-		"php": ">=7.4"
+		"php": ">=8.4"
 	},
 	"scripts": {
 		"test:coverage": [

tests/codeigniter/core/Log_test.php

@@ -4,17 +4,11 @@ class Log_test extends CI_TestCase {
 	public function test_configuration()
 	{
 		$path       = new ReflectionProperty('CI_Log', '_log_path');
-		$path->setAccessible(TRUE);
 		$threshold  = new ReflectionProperty('CI_Log', '_threshold');
-		$threshold->setAccessible(TRUE);
 		$date_fmt   = new ReflectionProperty('CI_Log', '_date_fmt');
-		$date_fmt->setAccessible(TRUE);
 		$file_ext   = new ReflectionProperty('CI_Log', '_file_ext');
-		$file_ext->setAccessible(TRUE);
 		$file_perms = new ReflectionProperty('CI_Log', '_file_permissions');
-		$file_perms->setAccessible(TRUE);
 		$enabled    = new ReflectionProperty('CI_Log', '_enabled');
-		$enabled->setAccessible(TRUE);
 
 		$this->ci_set_config('log_path', '/root/');
 		$this->ci_set_config('log_threshold', 'z');
@@ -54,7 +48,6 @@ public function test_format_line()
 		$instance = new CI_Log();
 
 		$format_line = new ReflectionMethod($instance, '_format_line');
-		$format_line->setAccessible(TRUE);
 		$this->assertEquals(
 			$format_line->invoke($instance, 'LEVEL', 'Timestamp', 'Message'),
 			"LEVEL - Timestamp --> Message".PHP_EOL

tests/codeigniter/helpers/text_helper_test.php

@@ -64,11 +64,6 @@ public function test_entities_to_ascii()
 
 	public function test_convert_accented_characters()
 	{
-		if (substr(PHP_VERSION, 0, 3) === '7.4')
-		{
-			return $this->markTestSkipped('For some reason all PHP 7.4 instances on GitHub Actions trigger a parse error when foreign_chars.php is loaded');
-		}
-
 		$this->ci_vfs_clone('application/config/foreign_chars.php');
 		$this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
 		$this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
@@ -101,11 +96,7 @@ public function test_censored_words()
 
 	public function test_highlight_code()
 	{
-		if (PHP_VERSION_ID >= 80300) {
-			$expect = "<pre><code style=\"color: #000000\"><span style=\"color: #0000BB\">&lt;?php var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">); </span><span style=\"color: #0000BB\">?&gt; ?&gt;</span></code></pre>";
-		} else {
-			$expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
-		}
+		$expect = "<pre><code style=\"color: #000000\"><span style=\"color: #0000BB\">&lt;?php var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">); </span><span style=\"color: #0000BB\">?&gt; ?&gt;</span></code></pre>";
 
 		$this->assertEquals($expect, highlight_code('<?php var_dump($this); ?>'));
 	}

tests/codeigniter/libraries/Upload_test.php

@@ -27,7 +27,6 @@ public function test___construct_initialize()
 
 		$reflection = new ReflectionClass($upload);
 		$reflection = $reflection->getProperty('_file_name_override');
-		$reflection->setAccessible(TRUE);
 		$this->assertEquals('foo', $reflection->getValue($upload));
 
 		$this->assertTrue($upload->file_ext_tolower);

tests/codeigniter/libraries/Xmlrpc_test.php

@@ -15,7 +15,6 @@ public function set_up()
 		$this->input = new Mock_Core_Input($security, $utf8);
 
 		$this->input_lib_raw_stream = new ReflectionProperty($this->input, '_raw_input_stream');
-		$this->input_lib_raw_stream->setAccessible(TRUE);
 
 		$this->ci_instance_var('input', $this->input);
 		$this->ci_instance_var('security', $security);