Remove superflous parameter from __invoke methods

cocur · Sep 16, 2024 · bf3a7c0 · bf3a7c0
1 parent f3995af
commit bf3a7c0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/Bridge/Laminas/SlugifyService.php b/src/Bridge/Laminas/SlugifyService.php
@@ -17,14 +17,12 @@ class SlugifyService
 {
     /**
      * @param ContainerInterface $container
-     * @param $requestedName
-     * @param array|null $options
      *
      * @return Slugify
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Slugify
+    public function __invoke(ContainerInterface $container): Slugify
     {
         $config = $container->get('Config');
 

diff --git a/src/Bridge/Laminas/SlugifyViewHelperFactory.php b/src/Bridge/Laminas/SlugifyViewHelperFactory.php
@@ -17,14 +17,12 @@ class SlugifyViewHelperFactory
 
     /**
      * @param ContainerInterface $container
-     * @param $requestedName
-     * @param array|null $options
      *
      * @return SlugifyViewHelper
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): SlugifyViewHelper
+    public function __invoke(ContainerInterface $container): SlugifyViewHelper
     {
         $slugify = $container->get('Cocur\Slugify\Slugify');
 

diff --git a/tests/Bridge/Laminas/SlugifyServiceTest.php b/tests/Bridge/Laminas/SlugifyServiceTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
     public function testInvokeWithoutCustomConfig()
     {
         $sm = $this->createServiceManagerMock();
-        $slugify = call_user_func($this->slugifyService, $sm, 'slugify');
+        $slugify = call_user_func($this->slugifyService, $sm);
         $this->assertInstanceOf('Cocur\Slugify\Slugify', $slugify);
 
         // Make sure reg exp is default one
@@ -51,7 +51,7 @@ public function testInvokeWithCustomConfig()
                 'options' => ['regexp' => '/([^a-z0-9.]|-)+/']
             ]
         ]);
-        $slugify = call_user_func($this->slugifyService, $sm, 'slugify');
+        $slugify = call_user_func($this->slugifyService, $sm);
         $this->assertInstanceOf('Cocur\Slugify\Slugify', $slugify);
 
         // Make sure regexp is the one provided and dots are kept
@@ -60,7 +60,12 @@ public function testInvokeWithCustomConfig()
         $this->assertSame($expected, $slugify->slugify($actual));
     }
 
-    protected function createServiceManagerMock(array $config = [])
+    /**
+     * @param array $config
+     *
+     * @return ServiceManager
+     */
+    protected function createServiceManagerMock(array $config = []): ServiceManager
     {
         $sm = new ServiceManager($config);
         $sm->setService('Config', $config);

diff --git a/tests/Bridge/Laminas/SlugifyViewHelperFactoryTest.php b/tests/Bridge/Laminas/SlugifyViewHelperFactoryTest.php
@@ -4,7 +4,6 @@
 use Cocur\Slugify\Bridge\Laminas\SlugifyViewHelperFactory;
 use Cocur\Slugify\Slugify;
 use Laminas\ServiceManager\ServiceManager;
-use Laminas\View\HelperPluginManager;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
 /**
@@ -33,7 +32,7 @@ public function testCreateService()
         $sm = new ServiceManager();
         $sm->setService('Cocur\Slugify\Slugify', new Slugify());
 
-        $viewHelper = call_user_func($this->factory, $sm, 'slugify');
+        $viewHelper = call_user_func($this->factory, $sm);
         $this->assertInstanceOf('Cocur\Slugify\Bridge\Laminas\SlugifyViewHelper', $viewHelper);
     }
 }