Move ConsoleIntegrationTestTrait to console package

cakephp · May 31, 2022 · 1d93bc2 · 1d93bc2
1 parent 394d5ed
commit 1d93bc2
Show file tree

Hide file tree

Showing 53 changed files with 1,335 additions and 1,246 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -426,17 +426,17 @@ parameters:
 			path: src/Routing/RouteBuilder.php
 
 		-
-			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_err \\(Cake\\\\TestSuite\\\\Stub\\\\ConsoleOutput\\) does not accept null\\.$#"
+			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_err \\(Cake\\\\Console\\\\TestSuite\\\\StubConsoleOutput\\) does not accept null\\.$#"
 			count: 1
 			path: src/TestSuite/ConsoleIntegrationTestCase.php
 
 		-
-			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_in \\(Cake\\\\Console\\\\ConsoleInput\\) does not accept null\\.$#"
+			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_in \\(Cake\\\\Console\\\\TestSuite\\\\StubConsoleInput\\) does not accept null\\.$#"
 			count: 1
 			path: src/TestSuite/ConsoleIntegrationTestCase.php
 
 		-
-			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_out \\(Cake\\\\TestSuite\\\\Stub\\\\ConsoleOutput\\) does not accept null\\.$#"
+			message: "#^Property Cake\\\\TestSuite\\\\ConsoleIntegrationTestCase\\:\\:\\$_out \\(Cake\\\\Console\\\\TestSuite\\\\StubConsoleOutput\\) does not accept null\\.$#"
 			count: 1
 			path: src/TestSuite/ConsoleIntegrationTestCase.php
 

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -128,6 +128,15 @@
       <code>\Cake\Console\Shell</code>
     </DeprecatedClass>
   </file>
+  <file src="src/Console/TestSuite/LegacyShellDispatcher.php">
+    <DeprecatedClass occurrences="5">
+      <code>$instance</code>
+      <code>Shell</code>
+      <code>ShellDispatcher</code>
+      <code>\Cake\Console\Shell</code>
+      <code>parent::__construct($args, $bootstrap)</code>
+    </DeprecatedClass>
+  </file>
   <file src="src/Controller/Component/RequestHandlerComponent.php">
     <DeprecatedMethod occurrences="2">
       <code>prefers</code>
@@ -163,6 +172,12 @@
       <code>$request</code>
     </ArgumentTypeCoercion>
   </file>
+  <file src="src/Core/TestSuite/ContainerStubTrait.php">
+    <DeprecatedClass occurrences="2">
+      <code>$this</code>
+      <code>$this</code>
+    </DeprecatedClass>
+  </file>
   <file src="src/Database/Connection.php">
     <DeprecatedMethod occurrences="1">
       <code>supportsDynamicConstraints</code>
@@ -408,12 +423,6 @@
       <code>new AssertionFailedError($message)</code>
     </InternalMethod>
   </file>
-  <file src="src/TestSuite/ContainerStubTrait.php">
-    <DeprecatedClass occurrences="2">
-      <code>$this</code>
-      <code>$this</code>
-    </DeprecatedClass>
-  </file>
   <file src="src/TestSuite/Fixture/FixtureInjector.php">
     <DeprecatedInterface occurrences="1">
       <code>FixtureInjector</code>
@@ -431,15 +440,6 @@
       <code>$this-&gt;_response</code>
     </ArgumentTypeCoercion>
   </file>
-  <file src="src/TestSuite/LegacyShellDispatcher.php">
-    <DeprecatedClass occurrences="5">
-      <code>$instance</code>
-      <code>Shell</code>
-      <code>ShellDispatcher</code>
-      <code>\Cake\Console\Shell</code>
-      <code>parent::__construct($args, $bootstrap)</code>
-    </DeprecatedClass>
-  </file>
   <file src="src/TestSuite/TestCase.php">
     <DeprecatedProperty occurrences="7">
       <code>$this-&gt;autoFixtures</code>