Merge pull request #759 from cakephp/deprecations

ADmad · web-flow · commit d5ac2beff562 · 2026-01-13T11:10:06.000+05:30
Fix deprecation errors
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "cakephp/cakephp": "^5.1.0",
         "cakephp/cakephp-codesniffer": "^5.0",
         "firebase/php-jwt": "^6.2",
-        "phpunit/phpunit": "^10.5.32 || ^11.3.3 || ^12.0.9"
+        "phpunit/phpunit": "^10.5.58 || ^11.5.3 || ^12.4"
     },
     "suggest": {
         "ext-ldap": "Make sure this php extension is installed and enabled on your system if you want to use the built-in LDAP adapter for \"LdapIdentifier\".",
diff --git a/tests/TestCase/AuthenticationServiceTest.php b/tests/TestCase/AuthenticationServiceTest.php
@@ -34,12 +34,14 @@
 use Cake\I18n\DateTime;
 use Cake\Routing\Router;
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Runner\Version;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use stdClass;
 
+#[AllowMockObjectsWithoutExpectations]
 class AuthenticationServiceTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Authenticator/AbstractAuthenticatorTest.php b/tests/TestCase/Authenticator/AbstractAuthenticatorTest.php
@@ -21,7 +21,9 @@
 use Authentication\Authenticator\ResultInterface;
 use Authentication\Identifier\IdentifierInterface;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
+#[AllowMockObjectsWithoutExpectations]
 class AbstractAuthenticatorTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Authenticator/AuthenticatorCollectionTest.php b/tests/TestCase/Authenticator/AuthenticatorCollectionTest.php
@@ -21,7 +21,9 @@
 use Authentication\Authenticator\FormAuthenticator;
 use Authentication\Identifier\IdentifierCollection;
 use Cake\TestSuite\TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
+#[AllowMockObjectsWithoutExpectations]
 class AuthenticatorCollectionTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Authenticator/EnvironmentAuthenticatorTest.php b/tests/TestCase/Authenticator/EnvironmentAuthenticatorTest.php
@@ -22,8 +22,10 @@
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use RuntimeException;
 
+#[AllowMockObjectsWithoutExpectations]
 class EnvironmentAuthenticatorTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Authenticator/FormAuthenticatorTest.php b/tests/TestCase/Authenticator/FormAuthenticatorTest.php
@@ -22,8 +22,10 @@
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use RuntimeException;
 
+#[AllowMockObjectsWithoutExpectations]
 class FormAuthenticatorTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Controller/Component/AuthenticationComponentTest.php b/tests/TestCase/Controller/Component/AuthenticationComponentTest.php
@@ -34,12 +34,14 @@
 use Cake\ORM\Entity;
 use Cake\Routing\Router;
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use TestApp\Authentication\InvalidAuthenticationService;
 use UnexpectedValueException;
 
 /**
  * Authentication component test.
  */
+#[AllowMockObjectsWithoutExpectations]
 class AuthenticationComponentTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Identifier/IdentifierCollectionTest.php b/tests/TestCase/Identifier/IdentifierCollectionTest.php
@@ -20,7 +20,9 @@
 use Authentication\Identifier\IdentifierInterface;
 use Authentication\Identifier\PasswordIdentifier;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
+#[AllowMockObjectsWithoutExpectations]
 class IdentifierCollectionTest extends TestCase
 {
     public function testConstruct()
diff --git a/tests/TestCase/Identifier/LdapIdentifierTest.php b/tests/TestCase/Identifier/LdapIdentifierTest.php
@@ -22,8 +22,10 @@
 use Authentication\Identifier\LdapIdentifier;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
 use ErrorException;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use stdClass;
 
+#[AllowMockObjectsWithoutExpectations]
 class LdapIdentifierTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Identifier/PasswordIdentifierTest.php b/tests/TestCase/Identifier/PasswordIdentifierTest.php
@@ -23,7 +23,9 @@
 use Authentication\PasswordHasher\LegacyPasswordHasher;
 use Authentication\PasswordHasher\PasswordHasherInterface;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
+#[AllowMockObjectsWithoutExpectations]
 class PasswordIdentifierTest extends TestCase
 {
     /**
diff --git a/tests/TestCase/Identifier/Resolver/ResolverAwareTraitTest.php b/tests/TestCase/Identifier/Resolver/ResolverAwareTraitTest.php
@@ -19,8 +19,10 @@
 use Authentication\Identifier\Resolver\ResolverAwareTrait;
 use Authentication\Identifier\Resolver\ResolverInterface;
 use Cake\TestSuite\TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use TestApp\Identifier\Resolver\TestResolver;
 
+#[AllowMockObjectsWithoutExpectations]
 class ResolverAwareTraitTest extends TestCase
 {
     public function testBuildResolverFromClassName()
diff --git a/tests/TestCase/Middleware/AuthenticationMiddlewareTest.php b/tests/TestCase/Middleware/AuthenticationMiddlewareTest.php
@@ -29,9 +29,11 @@
 use Cake\Http\Response;
 use Cake\Http\ServerRequestFactory;
 use Firebase\JWT\JWT;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use TestApp\Application;
 use TestApp\Http\TestRequestHandler;
 
+#[AllowMockObjectsWithoutExpectations]
 class AuthenticationMiddlewareTest extends TestCase
 {
     use ContainerStubTrait;
diff --git a/tests/TestCase/PasswordHasher/PasswordHasherTraitTest.php b/tests/TestCase/PasswordHasher/PasswordHasherTraitTest.php
@@ -19,10 +19,12 @@
 use Authentication\PasswordHasher\PasswordHasherInterface;
 use Authentication\PasswordHasher\PasswordHasherTrait;
 use Cake\TestSuite\TestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
 /**
  * Test case for PasswordHasherTrait
  */
+#[AllowMockObjectsWithoutExpectations]
 class PasswordHasherTraitTest extends TestCase
 {
     /**
diff --git a/tests/test_app/Plugin/TestPlugin/src/TestPluginPlugin.php b/tests/test_app/Plugin/TestPlugin/src/TestPluginPlugin.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link https://cakephp.org CakePHP(tm) Project
+ * @license https://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace TestPlugin;
+
+use Cake\Core\BasePlugin;
+
+class TestPluginPlugin extends BasePlugin
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@`
`21`	`21`	`use Authentication\Authenticator\ResultInterface;`
`22`	`22`	`use Authentication\Identifier\IdentifierInterface;`
`23`	`23`	`use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;`
	`24`	`+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;`
`24`	`25`
	`26`	`+#[AllowMockObjectsWithoutExpectations]`
`25`	`27`	`class AbstractAuthenticatorTest extends TestCase`
`26`	`28`	`{`
`27`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`use Authentication\Identifier\IdentifierInterface;`
`21`	`21`	`use Authentication\Identifier\PasswordIdentifier;`
`22`	`22`	`use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;`
	`23`	`+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;`
`23`	`24`
	`25`	`+#[AllowMockObjectsWithoutExpectations]`
`24`	`26`	`class IdentifierCollectionTest extends TestCase`
`25`	`27`	`{`
`26`	`28`	`public function testConstruct()`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@`
`23`	`23`	`use Authentication\PasswordHasher\LegacyPasswordHasher;`
`24`	`24`	`use Authentication\PasswordHasher\PasswordHasherInterface;`
`25`	`25`	`use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;`
	`26`	`+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;`
`26`	`27`
	`28`	`+#[AllowMockObjectsWithoutExpectations]`
`27`	`29`	`class PasswordIdentifierTest extends TestCase`
`28`	`30`	`{`
`29`	`31`	`/**`