fix invalid param, remove unused parameter

Signed-off-by: sasezaki <[email protected]>
laminas · Jun 14, 2020 · 6eaf13d · 6eaf13d
1 parent 12d8f9f
commit 6eaf13d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 31 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,28 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$name\\)\\: Unexpected token \"\\$name\", expected type at offset 133$#"
-			count: 1
-			path: src/AbstractFactoryInterface.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$requestedName\\)\\: Unexpected token \"\\$requestedName\", expected type at offset 153$#"
-			count: 1
-			path: src/AbstractFactoryInterface.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$name\\)\\: Unexpected token \"\\$name\", expected type at offset 111$#"
-			count: 1
-			path: src/AbstractFactoryInterface.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$requestedName\\)\\: Unexpected token \"\\$requestedName\", expected type at offset 131$#"
-			count: 1
-			path: src/AbstractFactoryInterface.php
-
-		-
-			message: "#^Closure invoked with 4 parameters, 0 required\\.$#"
-			count: 1
-			path: src/ServiceManager.php
-
-
diff --git a/src/AbstractFactoryInterface.php b/src/AbstractFactoryInterface.php
@@ -41,8 +41,8 @@ interface AbstractFactoryInterface extends Factory\AbstractFactoryInterface
      * Determine if we can create a service with name
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @param $name
-     * @param $requestedName
+     * @param string $name
+     * @param string $requestedName
      * @return bool
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName);
@@ -51,8 +51,8 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      * Create service with name
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @param $name
-     * @param $requestedName
+     * @param string $name
+     * @param string $requestedName
      * @return mixed
      */
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName);

diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -646,7 +646,7 @@ private function createDelegatorFromName($name, array $options = null)
             };
         }
 
-        return $creationCallback($this->creationContext, $name, $creationCallback, $options);
+        return $creationCallback();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                 };
             }
-            return $creationCallback($this->creationContext, $name, $creationCallback, $options);
+            return $creationCallback();
         }
         /**
@@ Expand Down @@