cleanup after merge branch, 4.next => 5.x

merge commit :
https://github.com/cakephp/cakephp/commit/487522b91

tests/TestCase/Core/FunctionsTest.php

@@ -19,6 +19,7 @@ namespace Cake\Test\TestCase\Core;
 use Cake\Core\Configure;
 use Cake\Http\Response;
 use Cake\TestSuite\TestCase;
+use Exception;
 use stdClass;
 
 /**
@@ -99,16 +100,16 @@ class FunctionsTest extends TestCase
         $message = 'Test deprecation warnings trigger only once';
         try {
             $this->withErrorReporting(E_ALL, function () use ($message): void {
-                deprecationWarning($message);
+                deprecationWarning('5.0.0', $message);
             });
             $this->fail();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->assertStringContainsString($message, $e->getMessage());
             $this->assertStringContainsString('TestCase.php', $e->getMessage());
         }
 
         $this->withErrorReporting(E_ALL, function () use ($message): void {
-            deprecationWarning($message);
+            deprecationWarning('5.0.0', $message);
         });
     }
 

tests/TestCase/TestSuite/TestCaseTest.php

@@ -27,6 +27,7 @@ use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Router;
 use Cake\Test\Fixture\FixturizedTestCase;
 use Cake\TestSuite\TestCase;
+use Exception;
 use PHPUnit\Framework\AssertionFailedError;
 use TestApp\Model\Table\SecondaryPostsTable;
 
@@ -168,7 +169,7 @@ class TestCaseTest extends TestCase
             });
 
             $this->fail();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->assertStringContainsString('A random message', $e->getMessage());
         }
     }
@@ -183,7 +184,7 @@ class TestCaseTest extends TestCase
             });
 
             $this->fail();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->assertStringStartsWith('Should have at least one deprecation warning', $e->getMessage());
         }
     }
@@ -198,7 +199,7 @@ class TestCaseTest extends TestCase
          * to have same deprecation message and same line for all cases
          */
         $fun = function () {
-            deprecationWarning('Test same deprecation message', 0);
+            deprecationWarning('5.0.0', 'Test same deprecation message', 0);
         };
         $this->deprecated(function () use ($fun) {
             $fun();

tests/TestCase/View/ViewBuilderTest.php

@@ -160,13 +160,7 @@ class ViewBuilderTest extends TestCase
 
         $builder = new ViewBuilder();
         $this->assertSame([], $builder->{$get}(), 'Default value should be empty list');
-        $this->deprecated(function () use ($set, $value, $builder) {
-            // only deprecated wrapper should remove in cake 5, assert should kept
-            if ($set !== 'setHelpers') {
-                trigger_error('Only setHelpers has deprecation warning in cake +4.x', E_USER_DEPRECATED);
-            }
-            $this->assertSame($builder, $builder->{$set}($value), 'Setter returns this');
-        });
+        $this->assertSame($builder, $builder->{$set}($value), 'Setter returns this');
         $this->assertSame($value, $builder->{$get}(), 'Getter gets value.');
     }
 
@@ -180,20 +174,14 @@ class ViewBuilderTest extends TestCase
         $get = 'get' . ucfirst($property);
         $set = 'set' . ucfirst($property);
 
-        $this->deprecated(function () use ($get, $set, $value) {
-            // only deprecated wrapper and setHelpers testing should remove in cake 5, other asserts should kept
-            if ($set !== 'setHelpers') {
-                trigger_error('Only setHelpers has deprecation warning in cake 4.x', E_USER_DEPRECATED);
-            }
-            $builder = new ViewBuilder();
-            $builder->{$set}($value);
+        $builder = new ViewBuilder();
+        $builder->{$set}($value);
 
-            $builder->{$set}(['merged' => 'Merged'], true);
-            $this->assertSame(['merged' => 'Merged'] + $value, $builder->{$get}(), 'Should merge');
+        $builder->{$set}(['merged' => 'Merged'], true);
+        $this->assertSame(['merged' => 'Merged'] + $value, $builder->{$get}(), 'Should merge');
 
-            $builder->{$set}($value, false);
-            $this->assertSame($value, $builder->{$get}(), 'Should replace');
-        });
+        $builder->{$set}($value, false);
+        $this->assertSame($value, $builder->{$get}(), 'Should replace');
     }
 
     /**