Merge pull request #2 from NielBuys/tasks/PR6264

Fixes the compatibility of XML-RPC library with PHP 8 - Orig PR6264

Author: NielBuys

.github/workflows/test-phpunit.yml

@@ -12,10 +12,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.3', '8.2', '8.1', '8.0', '7.4']
+        php: ['8.4', '8.3', '8.2', '8.1', '8.0', '7.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
@@ -141,6 +159,6 @@ jobs:
 
       - name: PHPUnit Test
         run: |
-          php -d error_reporting=E_ALL -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/${{ matrix.DB }}.phpunit.xml
+          php -d error_reporting=E_ALL -d zend.enable_gc=0 -d date.timezone=UTC vendor/bin/phpunit --coverage-text --configuration tests/travis/${{ matrix.DB }}.phpunit.xml
         env:
           XDEBUG_MODE: coverage

build-release.sh

@@ -47,7 +47,7 @@ fi
 
 echo "Running tests ..."
 
-php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/sqlite.phpunit.xml
+php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 vendor/bin/phpunit --coverage-text --configuration tests/travis/sqlite.phpunit.xml
 
 if [ $? -ne 0 ]
 then

composer.json

@@ -20,7 +20,7 @@
 	"scripts": {
 		"test:coverage": [
 			"@putenv XDEBUG_MODE=coverage",
-			"phpunit --color=always --coverage-text --configuration tests/travis/sqlite.phpunit.xml"
+			"phpunit --color=always --coverage-text --configuration tests/phpunit.xml"
 		],
 		"post-install-cmd": [
 			"sed -i s/name{0}/name[0]/ vendor/mikey179/vfsstream/src/main/php/org/bovigo/vfs/vfsStream.php"
@@ -31,6 +31,6 @@
 	},
 	"require-dev": {
 		"mikey179/vfsstream": "1.6.*",
-		"phpunit/phpunit": "4.* || 5.* || 9.*"
+		"phpunit/phpunit": "9.* || 10.* || 11.*"
 	}
 }

system/core/CodeIgniter.php

@@ -250,7 +250,7 @@
 		define('MB_ENABLED', TRUE);
 		// mbstring.internal_encoding is deprecated starting with PHP 5.6
 		// and it's usage triggers E_DEPRECATED messages.
-		@ini_set('mbstring.internal_encoding', $charset);
+	//	@ini_set('mbstring.internal_encoding', $charset);
 		// This is required for mb_convert_encoding() to strip invalid characters.
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
 		mb_substitute_character('none');
@@ -267,18 +267,13 @@
 		define('ICONV_ENABLED', TRUE);
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
 		// and it's usage triggers E_DEPRECATED messages.
-		@ini_set('iconv.internal_encoding', $charset);
+		// @ini_set('iconv.internal_encoding', $charset);
 	}
 	else
 	{
 		define('ICONV_ENABLED', FALSE);
 	}
 
-	if (is_php('5.6'))
-	{
-		ini_set('php.internal_encoding', $charset);
-	}
-
 /*
  * ------------------------------------------------------
  *  Load compatibility features