Fix psalm and phpstan errors.

cakephp · Feb 3, 2024 · 8f59682 · 8f59682
1 parent f413a86
commit 8f59682
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 13 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -10,6 +10,27 @@
       <code>setInput</code>
     </PossiblyNullReference>
   </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>
+    </MissingTemplateParam>
+  </file>
   <file src="src/Db/Adapter/AbstractAdapter.php">
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->output)]]></code>
@@ -82,6 +103,12 @@
     <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/Config/Config.php b/src/Config/Config.php
@@ -55,10 +55,6 @@ public function __construct(array $configArray, ?string $configFilePath = null)
     {
         $this->configFilePath = $configFilePath;
         $this->values = $this->replaceTokens($configArray);
-
-        if (isset($this->values['feature_flags'])) {
-            FeatureFlags::setFlagsFromConfig($this->values['feature_flags']);
-        }
     }
 
     /**
@@ -87,7 +83,7 @@ public static function fromYaml(string $configFilePath): ConfigInterface
             ));
         }
 
-        return new static($configArray, $configFilePath);
+        return new Config($configArray, $configFilePath);
     }
 
     /**
@@ -114,7 +110,7 @@ public static function fromJson(string $configFilePath): ConfigInterface
             ));
         }
 
-        return new static($configArray, $configFilePath);
+        return new Config($configArray, $configFilePath);
     }
 
     /**
@@ -141,7 +137,7 @@ public static function fromPhp(string $configFilePath): ConfigInterface
             ));
         }
 
-        return new static($configArray, $configFilePath);
+        return new Config($configArray, $configFilePath);
     }
 
     /**
@@ -323,7 +319,7 @@ public function getSeedBaseClassName(bool $dropNamespace = true): string
     {
         $className = !isset($this->values['seed_base_class']) ? 'Phinx\Seed\AbstractSeed' : $this->values['seed_base_class'];
 
-        return $dropNamespace ? substr(strrchr($className, '\\'), 1) : $className;
+        return $dropNamespace ? substr((string)strrchr($className, '\\'), 1) : $className;
     }
 
     /**
@@ -425,8 +421,8 @@ public function getBootstrapFile(): string|false
     /**
      * Replace tokens in the specified array.
      *
-     * @param array $arr Array to replace
-     * @return array
+     * @param array<string, mixed> $arr Array to replace
+     * @return array<string, mixed>
      */
     protected function replaceTokens(array $arr): array
     {
@@ -435,7 +431,7 @@ protected function replaceTokens(array $arr): array
         // environment variables either end up in $_SERVER (most likely) or $_ENV,
         // so we search through both
 
-        /** @var array<string, string> $tokens */
+        /** @var array<string, string|null> $tokens */
         $tokens = [];
         foreach (array_merge($_ENV, $_SERVER) as $varname => $varvalue) {
             if (strpos($varname, 'PHINX_') === 0) {
@@ -455,11 +451,12 @@ protected function replaceTokens(array $arr): array
      * Recurse an array for the specified tokens and replace them.
      *
      * @param array $arr Array to recurse
-     * @param string|null[] $tokens Array of tokens to search for
-     * @return array
+     * @param array<string, string|null> $tokens Array of tokens to search for
+     * @return array<string, mixed>
      */
     protected function recurseArrayForTokens(array $arr, array $tokens): array
     {
+        /** @var array<string, mixed> $out */
         $out = [];
         foreach ($arr as $name => $value) {
             if (is_array($value)) {

diff --git a/src/Config/ConfigInterface.php b/src/Config/ConfigInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Phinx configuration interface.
+ *
+ * @template-implemements ArrayAccess<string>
  */
 interface ConfigInterface extends ArrayAccess
 {