Minor CS and SA fixes

Signed-off-by: George Steel <[email protected]>
laminas · Jun 28, 2024 · 5bd9f56 · 5bd9f56
1 parent cd906d5
commit 5bd9f56
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 106 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -274,13 +274,11 @@
     </UnusedClass>
   </file>
   <file src="src/Explode.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$this->getPluginManager()->build($name, $options)]]></code>
-    </LessSpecificReturnStatement>
     <MixedInferredReturnType>
       <code><![CDATA[ValidatorInterface]]></code>
     </MixedInferredReturnType>
     <MixedReturnStatement>
+      <code><![CDATA[$this->getPluginManager()->build($name, $options)]]></code>
       <code><![CDATA[$this->getPluginManager()->build($name, $options)]]></code>
       <code><![CDATA[$this->getPluginManager()->get($validator)]]></code>
       <code><![CDATA[$this->getPluginManager()->get($validator)]]></code>
@@ -1277,54 +1275,39 @@
   </file>
   <file src="src/ValidatorPluginManager.php">
     <DeprecatedMethod>
-      <code><![CDATA[getServiceLocator]]></code>
-      <code><![CDATA[getServiceLocator]]></code>
+      <code><![CDATA[addInitializer]]></code>
+      <code><![CDATA[addInitializer]]></code>
     </DeprecatedMethod>
     <MethodSignatureMismatch>
       <code><![CDATA[ValidatorPluginManager]]></code>
     </MethodSignatureMismatch>
-    <MissingParamType>
-      <code><![CDATA[$configOrContainerInstance]]></code>
-    </MissingParamType>
-    <MixedArgument>
-      <code><![CDATA[$configOrContainerInstance]]></code>
-      <code><![CDATA[$container->get('MvcTranslator')]]></code>
-    </MixedArgument>
-    <PossiblyUnusedMethod>
-      <code><![CDATA[validatePlugin]]></code>
-    </PossiblyUnusedMethod>
-    <PossiblyUnusedProperty>
-      <code><![CDATA[$shareByDefault]]></code>
-    </PossiblyUnusedProperty>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$container->getServiceLocator()]]></code>
-    </RedundantConditionGivenDocblockType>
+    <NonInvariantDocblockPropertyType>
+      <code><![CDATA[$instanceOf]]></code>
+    </NonInvariantDocblockPropertyType>
+    <UnusedParam>
+      <code><![CDATA[$container]]></code>
+    </UnusedParam>
   </file>
   <file src="src/ValidatorPluginManagerAwareInterface.php">
     <MissingReturnType>
       <code><![CDATA[setValidatorPluginManager]]></code>
     </MissingReturnType>
   </file>
   <file src="src/ValidatorPluginManagerFactory.php">
-    <DeprecatedClass>
-      <code><![CDATA[new Config($config['validators'])]]></code>
-    </DeprecatedClass>
-    <DeprecatedInterface>
-      <code><![CDATA[ValidatorPluginManagerFactory]]></code>
-    </DeprecatedInterface>
     <MixedArgument>
       <code><![CDATA[$config['validators']]]></code>
     </MixedArgument>
-    <ParamNameMismatch>
-      <code><![CDATA[$container]]></code>
-    </ParamNameMismatch>
   </file>
   <file src="src/ValidatorProviderInterface.php">
     <UnusedClass>
       <code><![CDATA[ValidatorProviderInterface]]></code>
     </UnusedClass>
   </file>
   <file src="test/AbstractValidatorTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setService]]></code>
+      <code><![CDATA[setService]]></code>
+    </DeprecatedMethod>
     <InvalidArgument>
       <code><![CDATA[$options]]></code>
     </InvalidArgument>
@@ -1408,6 +1391,9 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/EmailAddressTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setService]]></code>
+    </DeprecatedMethod>
     <InvalidArgument>
       <code><![CDATA[Hostname::ALLOW_ALL]]></code>
       <code><![CDATA[Hostname::ALLOW_ALL]]></code>
@@ -1724,6 +1710,9 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/HostnameTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setService]]></code>
+    </DeprecatedMethod>
     <InvalidArgument>
       <code><![CDATA[$option]]></code>
       <code><![CDATA[$option]]></code>
@@ -1930,6 +1919,9 @@
     </PossiblyInvalidCast>
   </file>
   <file src="test/StaticValidatorTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setService]]></code>
+    </DeprecatedMethod>
     <NullArgument>
       <code><![CDATA[null]]></code>
     </NullArgument>
@@ -1997,4 +1989,9 @@
       <code><![CDATA[$errnum]]></code>
     </UnusedParam>
   </file>
+  <file src="test/ValidatorPluginManagerTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setService]]></code>
+    </DeprecatedMethod>
+  </file>
 </files>
diff --git a/src/ValidatorPluginManagerFactory.php b/src/ValidatorPluginManagerFactory.php
@@ -16,14 +16,6 @@
  */
 final class ValidatorPluginManagerFactory
 {
-    /**
-     * {@inheritDoc}
-     *
-     * @param string $name
-     * @param ServiceManagerConfiguration|null $options
-     * @return ValidatorPluginManager
-     * @psalm-suppress MoreSpecificImplementedParamType
-     */
     public function __invoke(ContainerInterface $container): ValidatorPluginManager
     {
         // If this is in a laminas-mvc application, the ServiceListener will inject

diff --git a/test/StaticAnalysis/PluginManager.php b/test/StaticAnalysis/PluginManager.php
@@ -4,6 +4,7 @@
 
 namespace LaminasTest\Validator\StaticAnalysis;
 
+use Laminas\ServiceManager\ServiceManager;
 use Laminas\Validator\Uuid;
 use Laminas\Validator\ValidatorInterface;
 use Laminas\Validator\ValidatorPluginManager;
@@ -13,13 +14,13 @@ final class PluginManager
 {
     public function validateAssertsPluginType(mixed $input): ValidatorInterface
     {
-        (new ValidatorPluginManager())->validate($input);
+        (new ValidatorPluginManager(new ServiceManager()))->validate($input);
 
         return $input;
     }
 
     public function getWithClassStringReturnsCorrectInstanceType(): ValidatorInterface
     {
-        return (new ValidatorPluginManager())->get(Uuid::class);
+        return (new ValidatorPluginManager(new ServiceManager()))->get(Uuid::class);
     }
 }