Fix static analysis and formatting

cakephp · Feb 13, 2024 · a98164b · a98164b
1 parent 14e4dbc
commit a98164b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 36 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -50,22 +50,6 @@
       <code>ConfigurationTrait</code>
     </DeprecatedTrait>
   </file>
-  <file src="src/Config/Config.php">
-    <DeprecatedMethod>
-      <code>getEnvironments</code>
-      <code>getEnvironments</code>
-      <code>hasEnvironment</code>
-      <code>hasEnvironment</code>
-      <code>searchNamespace</code>
-      <code>searchNamespace</code>
-    </DeprecatedMethod>
-    <LessSpecificImplementedReturnType>
-      <code>array</code>
-      <code>array</code>
-      <code>array</code>
-      <code>array</code>
-    </LessSpecificImplementedReturnType>
-  </file>
   <file src="src/Config/ConfigInterface.php">
     <MissingTemplateParam>
       <code>ArrayAccess</code>
@@ -143,12 +127,6 @@
     <ArgumentTypeCoercion>
       <code>array_merge($versions, array_keys($migrations))</code>
     </ArgumentTypeCoercion>
-    <DeprecatedMethod>
-      <code>getDataDomain</code>
-      <code>getMigrationNamespaceByPath</code>
-      <code>getSeedNamespaceByPath</code>
-      <code>hasEnvironment</code>
-    </DeprecatedMethod>
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->container)]]></code>
     </RedundantPropertyInitializationCheck>

diff --git a/src/Migration/Manager.php b/src/Migration/Manager.php
@@ -164,7 +164,6 @@ protected function printMissingVersion(array $version, int $maxNameLength): void
     /**
      * Migrate to the version of the database on a given date.
      *
-     * @param string $environment Environment
      * @param \DateTime $dateTime Date to migrate to
      * @param bool $fake flag that if true, we just record running the migration, but not actually do the
      *                               migration
@@ -312,7 +311,7 @@ protected function getMigrationClassName(string $path): string
      */
     public function getVersionsToMark(InputInterface $input): array
     {
-        $migrations = $this->getMigrations('default');
+        $migrations = $this->getMigrations();
         $versions = array_keys($migrations);
 
         $versionArg = $input->getArgument('version');
@@ -1116,7 +1115,6 @@ public function toggleBreakpoint(?int $version): void
     /**
      * Updates the breakpoint for a specific version.
      *
-     * @param string $environment The required environment
      * @param int|null $version The version of the target migration
      * @param int $mark The state of the breakpoint as defined by self::BREAKPOINT_xxxx constants.
      * @return void

diff --git a/tests/TestCase/Migration/ManagerTest.php b/tests/TestCase/Migration/ManagerTest.php
@@ -2158,7 +2158,7 @@ public static function rollbackLastDataProvider(): array
             ];
     }
 
-    public function testExecuteSeedWorksAsExpected():void
+    public function testExecuteSeedWorksAsExpected(): void
     {
         // stub environment
         $envStub = $this->getMockBuilder(Environment::class)
@@ -2173,7 +2173,7 @@ public function testExecuteSeedWorksAsExpected():void
         $this->assertStringContainsString('UserSeeder', $output);
     }
 
-    public function testExecuteASingleSeedWorksAsExpected():void
+    public function testExecuteASingleSeedWorksAsExpected(): void
     {
         // stub environment
         $envStub = $this->getMockBuilder(Environment::class)
@@ -2186,7 +2186,7 @@ public function testExecuteASingleSeedWorksAsExpected():void
         $this->assertStringContainsString('UserSeeder', $output);
     }
 
-    public function testExecuteANonExistentSeedWorksAsExpected():void
+    public function testExecuteANonExistentSeedWorksAsExpected(): void
     {
         // stub environment
         $envStub = $this->getMockBuilder(Environment::class)
@@ -2200,15 +2200,15 @@ public function testExecuteANonExistentSeedWorksAsExpected():void
         $this->manager->seed('NonExistentSeeder');
     }
 
-    public function testOrderSeeds():void
+    public function testOrderSeeds(): void
     {
         $seeds = array_values($this->manager->getSeeds());
         $this->assertInstanceOf('UserSeeder', $seeds[0]);
         $this->assertInstanceOf('GSeeder', $seeds[1]);
         $this->assertInstanceOf('PostSeeder', $seeds[2]);
     }
 
-    public function testSeedWillNotBeExecuted():void
+    public function testSeedWillNotBeExecuted(): void
     {
         // stub environment
         $envStub = $this->getMockBuilder(Environment::class)
@@ -2221,7 +2221,7 @@ public function testSeedWillNotBeExecuted():void
         $this->assertStringContainsString('skipped', $output);
     }
 
-    public function testGettingInputObject():void
+    public function testGettingInputObject(): void
     {
         $migrations = $this->manager->getMigrations();
         $seeds = $this->manager->getSeeds();
@@ -2236,7 +2236,7 @@ public function testGettingInputObject():void
         }
     }
 
-    public function testGettingOutputObject():void
+    public function testGettingOutputObject(): void
     {
         $migrations = $this->manager->getMigrations();
         $seeds = $this->manager->getSeeds();
@@ -2251,7 +2251,7 @@ public function testGettingOutputObject():void
         }
     }
 
-    public function testReversibleMigrationsWorkAsExpected():void
+    public function testReversibleMigrationsWorkAsExpected(): void
     {
         $adapter = $this->prepareEnvironment([
             'migrations' => ROOT . '/config/Reversiblemigrations',
@@ -2294,7 +2294,7 @@ public function testReversibleMigrationsWorkAsExpected():void
         $this->assertFalse($adapter->hasTable('users'));
     }
 
-    public function testReversibleMigrationWithIndexConflict():void
+    public function testReversibleMigrationWithIndexConflict(): void
     {
         if ($this->getDriverType() !== 'mysql') {
             $this->markTestSkipped('Test requires mysql connection');
@@ -2334,7 +2334,7 @@ public function testReversibleMigrationWithIndexConflict():void
         $this->assertFalse($adapter->hasIndex('my_table', ['entity_id']));
     }
 
-    public function testReversibleMigrationWithFKConflictOnTableDrop():void
+    public function testReversibleMigrationWithFKConflictOnTableDrop(): void
     {
         if ($this->getDriverType() !== 'mysql') {
             $this->markTestSkipped('Test requires mysql');
@@ -2548,7 +2548,7 @@ public function testBreakpointsTogglingOperateAsExpected(): void
         }
     }
 
-    public function testBreakpointWithInvalidVersion():void
+    public function testBreakpointWithInvalidVersion(): void
     {
         if ($this->getDriverType() !== 'mysql') {
             $this->markTestSkipped('test requires mysql');