Merge remote-tracking branch 'upstream/develop' into develop

Author: pocketarc

.github/workflows/test-phpunit.yml

@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   tests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     env:
       PHP_INI_VALUES: assert.exception=1, zend.assertions=1

system/helpers/captcha_helper.php

@@ -297,12 +297,12 @@ function create_captcha($data)
 		{
 			$theta += $thetac;
 			$rad = $radius * ($i / $points);
-			$x = ($rad * cos($theta)) + $x_axis;
-			$y = ($rad * sin($theta)) + $y_axis;
+			$x = round(($rad * cos($theta)) + $x_axis);
+			$y = round(($rad * sin($theta)) + $y_axis);
 			$theta += $thetac;
 			$rad1 = $radius * (($i + 1) / $points);
-			$x1 = ($rad1 * cos($theta)) + $x_axis;
-			$y1 = ($rad1 * sin($theta)) + $y_axis;
+			$x1 = round(($rad1 * cos($theta)) + $x_axis);
+			$y1 = round(($rad1 * sin($theta)) + $y_axis);
 			imageline($im, $x, $y, $x1, $y1, $colors['grid']);
 			$theta -= $thetac;
 		}

tests/codeigniter/libraries/Encryption_test.php

@@ -5,6 +5,11 @@ class Encryption_test extends CI_TestCase {
 	public function set_up()
 	{
 		$this->encryption = new Mock_Libraries_Encryption();
+
+		if (version_compare(PHP_VERSION, '7.1', '<'))
+		{
+			$this->markTestSkipped('Ubuntu-latest OpenSSL is not working correct in some older PHP versions.');
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -207,8 +212,8 @@ public function test_initialize_encrypt_decrypt()
 
 		$this->assertEquals($message, $this->encryption->decrypt($this->encryption->encrypt($message)));
 
-		// Try DES in ECB mode, just for the sake of changing stuff
-		$this->encryption->initialize(array('cipher' => 'des', 'mode' => 'ecb', 'key' => substr($key, 0, 8)));
+		// Try DES3 in OFB mode, just for the sake of changing stuff
+		$this->encryption->initialize(array('cipher' => 'tripledes', 'mode' => 'ofb', 'key' => substr($key, 0, 8)));
 		$this->assertEquals($message, $this->encryption->decrypt($this->encryption->encrypt($message)));
 	}