Merge pull request #28 from sitegeist/flow9

Flow9

Author: mficzel

Classes/Application/OpenApiController.php

@@ -5,36 +5,16 @@
 namespace Sitegeist\SchemeOnYou\Application;
 
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\ActionResponse;
-use Neos\Flow\Mvc\Controller\Arguments;
-use Neos\Flow\Mvc\Controller\ControllerContext;
-use Neos\Flow\Mvc\Controller\ControllerInterface;
-use Neos\Flow\Mvc\Routing\UriBuilder;
+use Neos\Flow\Mvc\Controller\ActionController;
+use Psr\Http\Message\ResponseInterface;
 use Sitegeist\SchemeOnYou\Domain\Metadata\Response;
 use Sitegeist\SchemeOnYou\Domain\Schema\SchemaNormalizer;
 
-abstract class OpenApiController implements ControllerInterface
+abstract class OpenApiController extends ActionController
 {
-    protected ActionRequest $request;
-
-    protected ActionResponse $response;
-
-    protected ControllerContext $controllerContext;
-
-    final public function processRequest(ActionRequest $request, ActionResponse $response): void
+    final public function processRequest(ActionRequest $request): ResponseInterface
     {
         $this->request = $request;
-        $this->request->setDispatched(true);
-        $this->response = $response;
-        $this->response->setContentType('application/json');
-        $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($this->request);
-        $this->controllerContext = new ControllerContext(
-            $this->request,
-            $this->response,
-            new Arguments([]),
-            $uriBuilder
-        );
 
         $actionName = $request->getControllerActionName() . 'Action';
         if (!method_exists($this, $actionName)) {
@@ -49,8 +29,13 @@ final public function processRequest(ActionRequest $request, ActionResponse $res
         $result = $this->$actionName(...$parameters);
 
         $responseMetadata = Response::fromReflectionClass(new \ReflectionClass($result));
-        $this->response->setStatusCode($responseMetadata->statusCode);
 
-        $this->response->setContent(json_encode(SchemaNormalizer::normalizeValue($result), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT));
+        return new \GuzzleHttp\Psr7\Response(
+            $responseMetadata->statusCode,
+            [
+                'Content-Type' => 'application/json',
+            ],
+            \json_encode(SchemaNormalizer::normalizeValue($result), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT)
+        );
     }
 }

Classes/Controller/OpenApiDocumentController.php

@@ -6,20 +6,18 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
-use Neos\Flow\Mvc\View\JsonView;
 use Sitegeist\SchemeOnYou\Domain\OpenApiDocumentRepository;
 
 class OpenApiDocumentController extends ActionController
 {
-    protected $defaultViewObjectName = JsonView::class;
-
     #[Flow\Inject]
     protected OpenApiDocumentRepository $documentRepository;
 
     public function renderAction(string $name): string
     {
         $schema = $this->documentRepository->findDocumentByName($name);
         $this->response->setContentType('application\json');
+
         return \json_encode(
             $schema,
             JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE

Classes/Domain/OpenApiDocument.php

@@ -40,8 +40,8 @@ public function __construct(
      */
     public static function createFromConfiguration(
         array $configuration,
-        OpenApiPathCollection $paths = null,
-        OpenApiComponents $components = null,
+        ?OpenApiPathCollection $paths = null,
+        ?OpenApiComponents $components = null,
     ): self {
         return new self(
             $configuration['openapi'],

Classes/Domain/OpenApiDocumentFactory.php

@@ -6,6 +6,7 @@
 
 use Neos\Flow\Mvc\Routing\Dto\ResolveContext;
 use Neos\Flow\Mvc\Routing\Dto\RouteParameters;
+use Neos\Flow\Mvc\Routing\RoutesProviderInterface;
 use Neos\Flow\ObjectManagement\ObjectManager;
 use Neos\Flow\ObjectManagement\Proxy\ProxyInterface;
 use Neos\Flow\Reflection\ClassReflection;
@@ -26,13 +27,12 @@
 use Sitegeist\SchemeOnYou\Domain\Path\PathDefinition;
 use Sitegeist\SchemeOnYou\Domain\Schema\IsSupportedInSchema;
 use Sitegeist\SchemeOnYou\Domain\Schema\OpenApiSchemaCollection;
-use Neos\Flow\Mvc\Routing\Router;
 
 class OpenApiDocumentFactory
 {
     public function __construct(
         private readonly ReflectionService $reflectionService,
-        private readonly Router $router,
+        private readonly RoutesProviderInterface $routesProvider,
         private readonly ObjectManager $objectManager,
         private readonly UriFactoryInterface $uriFactory,
     ) {
@@ -135,7 +135,7 @@ private function createPathsFromPathAndMethodReflection(ClassReflection $classRe
         if (!$controllerObjectName) {
             throw new \DomainException('Class ' . $className . ' is unknown to the object manager and thus cannot be processed');
         }
-        $controllerPackageKey = $this->objectManager->getPackageKeyByObjectName($controllerObjectName);
+        $controllerPackageKey = $this->objectManager->getPackageKeyByObjectName($controllerObjectName) ?: '';
         $controllerPackageNamespace = str_replace('.', '\\', $controllerPackageKey);
         if (!str_ends_with($className, 'Controller')) {
             throw new \DomainException('Only for controller classes');
@@ -214,7 +214,7 @@ private function createPathsFromPathAndMethodReflection(ClassReflection $classRe
             }
         }
 
-        foreach ($this->router->getRoutes() as $route) {
+        foreach ($this->routesProvider->getRoutes() as $route) {
             if ($route->resolves($resolveContext)) {
                 $path = str_replace(
                     ['{@package}', '{@subpackage}', '{@controller}', '{@action}'],

Classes/Domain/Schema/OpenApiSchema.php

@@ -86,7 +86,6 @@ public static function fromReflectionParameter(\ReflectionParameter $reflection)
                         'bool' => 'boolean',
                         'string' => 'string',
                         'float' => 'number',
-                        default => throw new \DomainException('Unsupported type ' . $typeName)
                     },
                     format: match ($typeName) {
                         'string' => StringProperty::tryfromReflectionParameter($reflection)?->format ?: null,

Configuration/Settings.yaml

@@ -22,5 +22,3 @@ Sitegeist:
     # the separate dictionaries that may be rendered
     # example: {name: string, classNames: [string]}
     documents: []
-
-

Tests/Unit/Domain/OpenApiDocumentFactoryTest.php

@@ -8,6 +8,7 @@
 use Neos\Flow\Mvc\Routing\Dto\ResolveContext;
 use Neos\Flow\Mvc\Routing\Route;
 use Neos\Flow\Mvc\Routing\Router;
+use Neos\Flow\Mvc\Routing\RoutesProviderInterface;
 use Neos\Flow\ObjectManagement\ObjectManager;
 use Neos\Flow\Persistence\Doctrine\PersistenceManager;
 use Neos\Flow\Reflection\ReflectionService;
@@ -76,10 +77,10 @@ public function setUp(): void
             ->method('convertObjectsToIdentityArrays')
             ->willReturnCallback(fn (array $input): array => $input);
 
-        $mockRouter = $this->getMockBuilder(Router::class)
+        $mockRoutesProvider = $this->getMockBuilder(RoutesProviderInterface::class)
             ->onlyMethods(['getRoutes'])
             ->getMock();
-        $mockRouter->expects($this->any())
+        $mockRoutesProvider->expects($this->any())
             ->method('getRoutes')
             ->willReturn([
                 $this->createMockRoute(
@@ -132,7 +133,7 @@ public function setUp(): void
 
         $this->subject = new OpenApiDocumentFactory(
             $mockReflectionService,
-            $mockRouter,
+            $mockRoutesProvider,
             $mockObjectManager,
             new UriFactory()
         );

composer.json

@@ -5,7 +5,7 @@
     "license": "LGPL-3.0",
     "require": {
         "php": "^8.2",
-        "neos/flow": "^8.0"
+        "neos/flow": "^9.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",