Phpunit12

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php-version: ['8.3', '8.4', '8.5']
         db: ['sqlite', 'mysql']
     steps:
       - uses: niden/actions-memcached@v7

composer.json

@@ -25,7 +25,7 @@
 	},
 	"require-dev": {
 		"rector/rector": "^0.12.5",
-		"phpunit/phpunit": "^10.0"
+		"phpunit/phpunit": "^12.0"
 	},
 	"config": {
 		"vendor-dir": "vendors/",

lib/Cake/Core/Configure.php

@@ -103,6 +103,7 @@ public static function bootstrap($boot = true) {
 				);
 			}
 			restore_error_handler();
+			restore_exception_handler();
 
 			static::_setErrorHandlers(
 				static::$_values['Error'],

lib/Cake/I18n/I18n.php

@@ -293,13 +293,22 @@ public static function translate($singular, $plural = null, $domain = null, $cat
 	}
 
 /**
- * Clears the domains internal data array. Useful for testing i18n.
+ * Resets the internal translation state. Useful for testing i18n.
+ *
+ * Besides emptying the loaded domains, it drops the resolved language and
+ * recreates the L10n instance so a stale default language captured at
+ * construction time cannot leak between consecutive translations.
  *
  * @return void
  */
 	public static function clear() {
 		$self = I18n::getInstance();
 		$self->_domains = array();
+		$self->_lang = null;
+		$self->_noLocale = false;
+		$self->domain = null;
+		$self->category = 'LC_MESSAGES';
+		$self->l10n = new L10n();
 	}
 
 /**

lib/Cake/Network/CakeRequest.php

@@ -433,7 +433,7 @@ public function clientIp($safe = true) {
 		} else {
 			$ipaddr = env('REMOTE_ADDR');
 		}
-		return trim($ipaddr);
+		return trim((string)$ipaddr);
 	}
 
 /**

lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php

@@ -31,7 +31,7 @@ class ApcEngineTest extends CakeTestCase {
  * @var string
  */
 	protected $_apcExtension = 'apc';
-	private ?bool $_cacheDisable;
+	private ?bool $_cacheDisable = null;
 
 /**
  * setUp method

lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php

@@ -49,7 +49,7 @@ public function setMemcache($memcache) {
  */
 class MemcacheEngineTest extends CakeTestCase {
 
-	private ?bool $_cacheDisable;
+	private ?bool $_cacheDisable = null;
 /**
  * setUp method
  *

lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php

@@ -26,7 +26,7 @@
  */
 class RedisEngineTest extends CakeTestCase {
 
-	private ?bool $_cacheDisable;
+	private ?bool $_cacheDisable = null;
 /**
  * setUp method
  *

lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php

@@ -25,7 +25,7 @@
  */
 class WincacheEngineTest extends CakeTestCase {
 
-	private ?bool $_cacheDisable;
+	private ?bool $_cacheDisable = null;
 /**
  * setUp method
  *

lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php

@@ -25,7 +25,7 @@
  */
 class XcacheEngineTest extends CakeTestCase {
 
-	private ?bool $_cacheDisable;
+	private ?bool $_cacheDisable = null;
 /**
  * setUp method
  *

lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php

@@ -172,8 +172,9 @@ public function testGetNameValidIndex() {
  */
 	public function testGetNameInvalidIndex() {
 		$this->Task->interactive = true;
+		$invalidIndex = count($this->Task->listAll('test')) + 1;
 		$this->Task->expects($this->any())->method('in')
-			->will($this->onConsecutiveCalls(50, 'q'));
+			->will($this->onConsecutiveCalls($invalidIndex, 'q'));
 
 		$this->Task->expects($this->once())->method('err');
 		$this->Task->expects($this->once())->method('_stop');
@@ -548,9 +549,9 @@ public static function nameVariations() {
 /**
  * test that both plural and singular forms work for controller baking.
  *
- * @dataProvider nameVariations
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('nameVariations')]
 	public function testExecuteWithControllerNameVariations($name) {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';

lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php

@@ -170,7 +170,8 @@ public function testGetNameValidOption() {
  * @return void
  */
 	public function testGetNameWithOutOfBoundsOption() {
-		$this->Task->expects($this->any())->method('in')->will($this->onConsecutiveCalls(99, 1));
+		$invalidIndex = count($this->Task->listAll('test')) + 1;
+		$this->Task->expects($this->any())->method('in')->will($this->onConsecutiveCalls($invalidIndex, 1));
 		$this->Task->expects($this->once())->method('err');
 
 		$this->Task->getName('test');
@@ -1002,9 +1003,9 @@ public static function nameVariations() {
 /**
  * test that execute passes with different inflections of the same name.
  *
- * @dataProvider nameVariations
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('nameVariations')]
 	public function testExecuteWithNamedModelVariations($name) {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';

lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php

@@ -646,9 +646,9 @@ public static function caseFileNameProvider() {
 /**
  * Test filename generation for each type + plugins
  *
- * @dataProvider caseFileNameProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('caseFileNameProvider')]
 	public function testTestCaseFileName($type, $class, $expected) {
 		$this->Task->path = DS . 'my' . DS . 'path' . DS . 'tests' . DS;
 
@@ -747,9 +747,9 @@ public static function mapTypeProvider() {
 /**
  * Test that mapType returns the correct package names.
  *
- * @dataProvider mapTypeProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('mapTypeProvider')]
 	public function testMapType($original, $plugin, $expected) {
 		$this->assertEquals($expected, $this->Task->mapType($original, $plugin));
 	}

lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php

@@ -515,9 +515,9 @@ public static function nameVariations() {
 /**
  * test that both plural and singular forms can be used for baking views.
  *
- * @dataProvider nameVariations
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('nameVariations')]
 	public function testExecuteWithControllerVariations($name) {
 		$this->Task->args = array($name);
 

lib/Cake/Test/Case/Console/ShellTest.php

@@ -877,8 +877,8 @@ public function testShellNaming()
 	/**
 	 * Test reading params
 	 *
-	 * @dataProvider paramReadingDataProvider
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('paramReadingDataProvider')]
 	public function testParamReading($toRead, $expected)
 	{
 		$this->Shell->params = [

lib/Cake/Test/Case/Controller/ControllerTest.php

@@ -748,9 +748,9 @@ public static function statusCodeProvider() {
 /**
  * testRedirect method
  *
- * @dataProvider statusCodeProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('statusCodeProvider')]
 	public function testRedirectByCode($code, $msg) {
 		$Controller = new Controller(null);
 		$Controller->response = $this->getMock('CakeResponse', array('header', 'statusCode'));
@@ -769,9 +769,9 @@ public function testRedirectByCode($code, $msg) {
 /**
  * test redirecting by message
  *
- * @dataProvider statusCodeProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('statusCodeProvider')]
 	public function testRedirectByMessage($code, $msg) {
 		$Controller = new Controller(null);
 		$Controller->response = $this->getMock('CakeResponse', array('header', 'statusCode'));
@@ -1019,7 +1019,6 @@ public function testReferer() {
 		$this->assertEquals('/posts/index', $result);
 
 		$Controller = new Controller($request);
-		$request->setReturnValue('referer', '/', array(true));
 		$result = $Controller->referer(array('controller' => 'posts', 'action' => 'index'), true);
 		$this->assertEquals('/posts/index', $result);
 
@@ -1214,9 +1213,9 @@ public static function dangerousPostConditionsProvider() {
 /**
 	 * test postConditions raising an exception on unsafe keys.
 	 *
-	 * @dataProvider dangerousPostConditionsProvider
 	 * @return void
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dangerousPostConditionsProvider')]
 	public function testPostConditionsDangerous($data) {
 		$this->expectException(\RuntimeException::class);
 		$request = new CakeRequest('controller_posts/index');

lib/Cake/Test/Case/Core/AppTest.php

@@ -842,9 +842,9 @@ public function testPluginLibClasses() {
 /**
  * Test that increaseMemoryLimit increases the maximum amount of memory actually
  *
- * @dataProvider memoryVariationProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('memoryVariationProvider')]
 	public function testIncreaseMemoryLimit($memoryLimit, $additionalKb, $expected) {
 		$this->skipIf(!function_exists('ini_set'));
 

lib/Cake/Test/Case/Core/ConfigureTest.php

@@ -83,6 +83,11 @@ public function testBootstrap() {
 
 		$this->assertEquals($expected['foo'], $result['foo']);
 		$this->assertFalse($result['base']);
+
+		// Configure::bootstrap() installs CakePHP's error/exception handlers;
+		// restore them so the test leaves the handler stack as it found it.
+		restore_error_handler();
+		restore_exception_handler();
 	}
 
 /**

lib/Cake/Test/Case/Error/ErrorHandlerTest.php

@@ -110,7 +110,6 @@ public function testHandleErrorDebugOn() {
 		$this->assertMatchesRegularExpression('/<pre class="cake-error">/', $result);
 		$this->assertMatchesRegularExpression('/<b>(Notice|Warning)<\/b>/', $result);
 		$this->assertMatchesRegularExpression('/variable\:?\s+\$?wrong/', $result);
-		restore_error_handler();
 	}
 
 /**
@@ -128,9 +127,9 @@ public static function errorProvider() {
 /**
  * test error mappings
  *
- * @dataProvider errorProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('errorProvider')]
 	public function testErrorMapping($error, $expected) {
 		set_error_handler('ErrorHandler::handleError');
 		$this->_restoreError = true;
@@ -142,7 +141,6 @@ public function testErrorMapping($error, $expected) {
 
 		$result = ob_get_clean();
 		$this->assertMatchesRegularExpression('/<b>' . $expected . '<\/b>/', $result);
-		restore_error_handler();
 	}
 
 /**
@@ -165,7 +163,6 @@ public function testErrorSuppressed() {
 		}else{
 			$this->assertTrue(empty($result));
 		}
-		restore_error_handler();
 	}
 
 /**
@@ -196,7 +193,6 @@ public function testHandleErrorDebugOff() {
 		if (file_exists(LOGS . 'debug.log')) {
 			unlink(LOGS . 'debug.log');
 		}
-		restore_error_handler();
 	}
 
 	public function testHandleErrorDebugOffPHP8() {
@@ -222,7 +218,6 @@ public function testHandleErrorDebugOffPHP8() {
 		if (file_exists(LOGS . 'error.log')) {
 			unlink(LOGS . 'error.log');
 		}
-		restore_error_handler();
 	}
 
 /**
@@ -254,7 +249,6 @@ public function testHandleErrorLoggingTrace() {
 		if (file_exists(LOGS . 'debug.log')) {
 			unlink(LOGS . 'debug.log');
 		}
-		restore_error_handler();
 	}
 
 	public function testHandleErrorLoggingTracePHP8() {
@@ -282,7 +276,6 @@ public function testHandleErrorLoggingTracePHP8() {
 		if (file_exists(LOGS . 'error.log')) {
 			unlink(LOGS . 'error.log');
 		}
-		restore_error_handler();
 	}
 
 /**

lib/Cake/Test/Case/Error/ExceptionRendererTest.php

@@ -671,9 +671,9 @@ public static function errorProvider() {
 /**
  * Test the various CakeException sub classes
  *
- * @dataProvider errorProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('errorProvider')]
 	public function testCakeExceptionHandling($exception, $patterns, $code) {
 		$ExceptionRenderer = new ExceptionRenderer($exception);
 		$ExceptionRenderer->controller->response = $this->getMock('CakeResponse', array('statusCode', '_sendHeader'));

lib/Cake/Test/Case/I18n/I18nTest.php

@@ -43,6 +43,12 @@ public function setUp(): void {
 		Configure::write('Session', array('defaults' => 'php'));
 		CakeSession::destroy();
 
+		// Each test selects its own language; start from a clean slate so a
+		// language left over from a previous test cannot become the stale
+		// default captured by the L10n instance.
+		Configure::delete('Config.language');
+		I18n::clear();
+
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
 			'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS),
@@ -59,6 +65,8 @@ public function setUp(): void {
 	public function tearDown(): void {
 		parent::tearDown();
 
+		Configure::delete('Config.language');
+		I18n::clear();
 		Cache::delete('object_map', '_cake_core_');
 		CakeSession::destroy();
 		App::build();

lib/Cake/Test/Case/I18n/L10nTest.php

@@ -123,8 +123,14 @@ public function testGetAutoLanguage() {
 /**
  * testGet method with deprecated constant DEFAULT_LANGUAGE
  *
+ * Runs in a separate process: it defines the DEFAULT_LANGUAGE constant,
+ * which cannot be undefined and would otherwise become a permanent stale
+ * default for every L10n instance created afterwards in the same process.
+ *
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+	#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)]
 	public function testGetWithDeprecatedConstant() {
 		$this->skipIf(defined('DEFAULT_LANGUAGE'), 'Cannot re-define already defined constant.');
 

lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php

@@ -48,9 +48,9 @@ public function testOpenLog() {
 /**
  * Tests that single lines are written to syslog
  *
- * @dataProvider typesProvider
  * @return void
  */
+	#[\PHPUnit\Framework\Attributes\DataProvider('typesProvider')]
 	public function testWriteOneLine($type, $expected) {
 		$log = $this->getMock('SyslogLog', array('_open', '_write'));
 		$log->expects($this->once())->method('_write')->with($expected, $type . ': Foo');

lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php

@@ -1139,6 +1139,7 @@ public function testFieldsRestoreAfterBind() {
 		$this->loadFixtures('Translate', 'TranslatedItem');
 
 		$TestModel = new TranslatedItem();
+		$TestModel->locale = 'eng';
 
 		$translations = array('title' => 'Title');
 		$TestModel->bindTranslation($translations);