Issue #41: Added support for

Signed-off-by: alexmerlin <alex.merlin.1985@gmail.com>

Author: alexmerlin

.laminas-ci.json

@@ -0,0 +1,6 @@
+{
+  "ignore_php_platform_requirements": {
+    "8.4": true
+  },
+  "backwardCompatibilityCheck": true
+}

README.md

@@ -4,7 +4,7 @@ This is DotKernel's controller package that can be use like middleware inside Do
 It provides base classes for action based controllers similar to Laminas controller component. It is more lightweight though, but supports controller plugins and event listeners
 
 ![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-controller)
-![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-controller/3.4.3)
+![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-controller/3.6.0)
 
 [![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-controller)](https://github.com/dotkernel/dot-controller/issues)
 [![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-controller)](https://github.com/dotkernel/dot-controller/network)
@@ -14,14 +14,12 @@ It provides base classes for action based controllers similar to Laminas control
 [![Build Static](https://github.com/dotkernel/dot-controller/actions/workflows/static-analysis.yml/badge.svg?branch=3.0)](https://github.com/dotkernel/dot-controller/actions/workflows/static-analysis.yml)
 [![codecov](https://codecov.io/gh/dotkernel/dot-controller/graph/badge.svg?token=VUBG5LM4CK)](https://codecov.io/gh/dotkernel/dot-controller)
 
-[![SymfonyInsight](https://insight.symfony.com/projects/c4aac671-40d7-4590-b1fa-b3e46a1e3f43/big.svg)](https://insight.symfony.com/projects/c4aac671-40d7-4590-b1fa-b3e46a1e3f43)
-
 ## Installation
 
 Install `dot-controller` by executing the following Composer command:
 
-```bash
-$ composer require dotkernel/dot-controller
+```shell
+composer require dotkernel/dot-controller
 ```
 
 ## Usage

composer.json

@@ -18,18 +18,18 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-        "psr/http-message": "^1.0 || ^2.0",
-        "laminas/laminas-servicemanager": "^3.11.2",
-        "dotkernel/dot-event": "^3.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "dotkernel/dot-event": "^4.0.0",
+        "laminas/laminas-servicemanager": "^4.0",
+        "mezzio/mezzio-helpers": "^5.8.0",
         "mezzio/mezzio-template": "^2.4.0",
-        "mezzio/mezzio-helpers": "^5.8.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
+        "laminas/laminas-coding-standard": "^3.0",
+        "laminas/laminas-diactoros": "^3.0",
         "phpunit/phpunit": "^10.2",
-        "vimeo/psalm": "^5.13",
-        "laminas/laminas-coding-standard": "^2.5",
-        "laminas/laminas-diactoros": "^3.0"
+        "vimeo/psalm": "^5.13"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,8 @@
     "scripts": {
         "check": [
             "@cs-check",
-            "@test"
+            "@test",
+            "@static-analysis"
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",

docs/book/index.md

@@ -0,0 +1 @@
+../../README.md

docs/book/index.md

@@ -10,6 +10,7 @@
 use Dot\Controller\Plugin\PluginManager;
 use Dot\Controller\Plugin\PluginManagerAwareInterface;
 use Laminas\EventManager\EventManagerAwareInterface;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -86,10 +87,12 @@ public function __call(string $method, array $params): mixed
 
     /**
      * Get plugin instance
+     *
+     * @throws ContainerExceptionInterface
      */
-    public function plugin(string $name, array $options = []): PluginInterface|callable
+    public function plugin(string $name, array $options = []): PluginInterface|callable|null
     {
-        return $this->getPluginManager()->get($name, $options);
+        return $this->getPluginManager()?->build($name, $options);
     }
 
     public function getPluginManager(): ?PluginManager

src/AbstractController.php

@@ -5,13 +5,29 @@
 namespace Dot\Controller\Plugin;
 
 use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\InvalidServiceException;
+
+use function gettype;
+use function is_object;
+use function sprintf;
 
 /**
  * @template InstanceType
  * @extends AbstractPluginManager<InstanceType>
  */
 class PluginManager extends AbstractPluginManager
 {
-    /** @var string $instanceOf */
-    protected $instanceOf = PluginInterface::class;
+    protected string $instanceOf = PluginInterface::class;
+
+    public function validate(mixed $instance): void
+    {
+        if (! $instance instanceof $this->instanceOf) {
+            throw new InvalidServiceException(sprintf(
+                '%s can only create instances of %s; %s is invalid',
+                static::class,
+                $this->instanceOf,
+                is_object($instance) ? $instance::class : gettype($instance)
+            ));
+        }
+    }
 }

src/Plugin/PluginManager.php

@@ -83,7 +83,7 @@ public function testDebug(): void
     public function testCallPlugin(): void
     {
         $this->pluginManager->expects($this->once())
-            ->method('get')
+            ->method('build')
             ->with('somePlugin')
             ->willReturn($this->plugin);
 
@@ -111,7 +111,7 @@ public function testCallCallablePlugin(): void
         };
 
         $this->pluginManager->expects($this->once())
-            ->method('get')
+            ->method('build')
             ->with('callablePlugin')
             ->willReturn($mockCallablePlugin);