Merge pull request #689 from cakephp/trim-config

Trim down Config and Manager classes to remove unused behavior
cakephp · Feb 13, 2024 · aa1399c · aa1399c
2 parents 79e686b + 6068756
commit aa1399c
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 964 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,7 @@
          colors="true"
          cacheDirectory=".phpunit.cache"
          bootstrap="tests/bootstrap.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 >
     <testsuites>
         <testsuite name="migrations">
@@ -34,7 +34,6 @@
     <php>
         <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
         <ini name="memory_limit" value="-1"/>
-        <ini name="apc.enable_cli" value="1"/>
 
         <!-- SQLite
         <env name="DB" value="sqlite"/>

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/Command/StatusCommand.php b/src/Command/StatusCommand.php
@@ -136,6 +136,7 @@ protected function getConfig(Arguments $args): Config
             'pass' => $connectionConfig['password'],
             'host' => $connectionConfig['host'],
             'name' => $connectionConfig['database'],
+            'migration_table' => $table,
         ];
 
         $configData = [
@@ -146,10 +147,8 @@ protected function getConfig(Arguments $args): Config
                 'file' => $templatePath . 'Phinx/create.php.template',
             ],
             'migration_base_class' => 'Migrations\AbstractMigration',
-            'environments' => [
-                'default_migration_table' => $table,
-                'default' => $adapterConfig,
-            ],
+            'connection' => ConnectionManager::get($connectionName),
+            'environment' => $adapterConfig,
             // TODO do we want to support the DI container in migrations?
         ];
 
@@ -180,7 +179,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
     {
         /** @var string|null $format */
         $format = $args->getOption('format');
-        $migrations = $this->getManager($args)->printStatus('default', $format);
+        $migrations = $this->getManager($args)->printStatus($format);
 
         switch ($format) {
             case 'json':