Merge pull request #19 from netlogix/feature/flow-8

feat: Require Flow 8.3

Author: stephanschuler

.github/workflows/functionaltests.yml

@@ -10,12 +10,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.4 ]
-        flow-version: [ 5.3 ]
+        php-version: [ 8.1, 8.2 ]
+        flow-version: [ 8.3 ]
         mysql-version: [5.7]
 
-        exclude: []
-
     env:
       APP_ENV: true
       FLOW_CONTEXT: Testing/Functional

.github/workflows/unittests.yml

@@ -10,10 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.4 ]
-        flow-version: [ 5.3 ]
-
-        exclude: []
+        php-version: [ 8.1, 8.2 ]
+        flow-version: [ 8.3 ]
 
     env:
       FLOW_CONTEXT: Testing/Unit

Classes/Domain/Model/ResourceProxy.php

@@ -10,8 +10,8 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\Uri;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Http\Uri;
 use Netlogix\JsonApiOrg\Consumer\Service\ConsumerBackendInterface;
 
 class ResourceProxy implements \ArrayAccess

Classes/Domain/Model/ResourceProxyIterator.php

@@ -5,8 +5,8 @@
 
 use Neos\Cache\Frontend\VariableFrontend;
 use Neos\Flow\Cache\CacheManager;
-use Neos\Flow\Http\Uri;
 use Neos\Flow\Utility\Now;
+use Psr\Http\Message\UriInterface;
 
 class ResourceProxyIterator implements \IteratorAggregate, \Countable
 {
@@ -45,7 +45,7 @@ protected function __construct(string $uri = '')
         $this->uri = $uri;
     }
 
-    public static function fromUri(Uri $uri): self
+    public static function fromUri(UriInterface $uri): self
     {
         return new static((string)$uri);
     }

Classes/Domain/Model/Type.php

@@ -11,8 +11,8 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Http\Uri;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Psr\Http\Message\UriInterface;
 
 class Type
 {
@@ -57,7 +57,7 @@ class Type
     protected $properties = [];
 
     /**
-     * @var Uri
+     * @var UriInterface
      */
     protected $uri;
 
@@ -76,14 +76,14 @@ class Type
      * @param string $typeName
      * @param string $resourceClassName
      * @param array $properties
-     * @param Uri $uri
+     * @param UriInterface $uri
      * @param array $defaultIncludes
      */
     public function __construct(
         $typeName,
         $resourceClassName = ResourceProxy::class,
         array $properties = [],
-        Uri $uri = null,
+        UriInterface $uri = null,
         array $defaultIncludes = []
     ) {
         $this->typeName = (string)$typeName;
@@ -95,19 +95,12 @@ public function __construct(
         $this->defaultIncludes = $defaultIncludes;
     }
 
-    /**
-     * @return Uri
-     */
-    public function getUri()
+    public function getUri(): UriInterface
     {
         return $this->uri;
     }
 
-    /**
-     * @param Uri $uri
-     * @return void
-     */
-    public function setUri(Uri $uri)
+    public function setUri(UriInterface $uri): void
     {
         $this->uri = $uri;
     }

Classes/Guzzle/Middleware/EndpointCacheMiddleware.php

@@ -31,7 +31,7 @@ public function __invoke(callable $handler)
                 return $handler($request, $options);
             }
 
-            $requestPath = $request->getUri()->getPath() ?? '';
+            $requestPath = $request->getUri()->getPath() ?: '';
             if (!self::str_ends_with(rtrim($requestPath, '/'), '/.well-known/endpoint-discovery')) {
                 return $handler($request, $options);
             }

Classes/Service/ConsumerBackend.php

@@ -11,17 +11,18 @@
  */
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Uri;
 use Neos\Cache\Exception\InvalidDataException;
 use Neos\Cache\Frontend\StringFrontend;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Http\Helper\UriHelper;
-use Neos\Flow\Http\Uri;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Arguments\PageInterface;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Arguments\SortInterface;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\ResourceProxy;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\ResourceProxyIterator;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Type;
 use Netlogix\JsonApiOrg\Consumer\Guzzle\ClientProvider;
+use Psr\Http\Message\UriInterface;
 
 /**
  * @Flow\Scope("singleton")
@@ -83,11 +84,11 @@ public function getType($typeName)
     }
 
     /**
-     * @param Uri $endpointDiscovery
+     * @param UriInterface $endpointDiscovery
      * @throws InvalidDataException
      * @throws \Neos\Cache\Exception
      */
-    public function registerEndpointsByEndpointDiscovery(Uri $endpointDiscovery)
+    public function registerEndpointsByEndpointDiscovery(UriInterface $endpointDiscovery)
     {
         $result = $this->requestJson($endpointDiscovery);
         foreach ($result['links'] as $link) {
@@ -180,12 +181,12 @@ public function getQueryUriForFindByTypeAndFilter(
     }
 
     /**
-     * @param Uri $queryUri
+     * @param UriInterface $queryUri
      * @return ResourceProxyIterator
      * @throws InvalidDataException
      * @throws \Neos\Cache\Exception
      */
-    public function fetchFromUri(Uri $queryUri)
+    public function fetchFromUri(UriInterface $queryUri)
     {
         $resourceProxy = ResourceProxyIterator::fromUri($queryUri);
         $resourceProxy = $resourceProxy->loadFromCache();

Classes/Service/ConsumerBackendInterface.php

@@ -10,12 +10,12 @@
  * source code.
  */
 
-use Neos\Flow\Http\Uri;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Arguments\PageInterface;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Arguments\SortInterface;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\ResourceProxy;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\ResourceProxyIterator;
 use Netlogix\JsonApiOrg\Consumer\Domain\Model\Type;
+use Psr\Http\Message\UriInterface;
 
 interface ConsumerBackendInterface
 {
@@ -31,9 +31,9 @@ public function addType(Type $type);
     public function getType($typeName);
 
     /**
-     * @param Uri $endpointDiscovery
+     * @param UriInterface $endpointDiscovery
      */
-    public function registerEndpointsByEndpointDiscovery(Uri $endpointDiscovery);
+    public function registerEndpointsByEndpointDiscovery(UriInterface $endpointDiscovery);
 
     /**
      * @param string $type
@@ -46,10 +46,10 @@ public function registerEndpointsByEndpointDiscovery(Uri $endpointDiscovery);
     public function findByTypeAndFilter($type, $filter = [], $include = [], PageInterface $page = null, SortInterface $sort = null);
 
     /**
-     * @param Uri $queryUri
+     * @param UriInterface $queryUri
      * @return ResourceProxyIterator
      */
-    public function fetchFromUri(Uri $queryUri);
+    public function fetchFromUri(UriInterface $queryUri);
 
     /**
      * @param mixed $type

Tests/Common/Guzzle/NoResponseQueued.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netlogix\JsonApiOrg\Consumer\Tests\Common\Guzzle;
+
+class NoResponseQueued extends \RuntimeException
+{
+}

Tests/Common/Guzzle/TestingClientProvider.php

@@ -57,7 +57,7 @@ public function createClient(): Client
             }
 
             if (strpos($uri, 'resource://') === 0
-                || strpos($uri, 'data://') === 0) {
+                || strpos($uri, 'data:') === 0) {
                 $uri = (string) $requestUri
                     ->withQuery('')
                     ->withFragment('');
@@ -72,7 +72,7 @@ public function createClient(): Client
                 );
             }
 
-            throw new \RuntimeException(sprintf('No Response queued for URI "%s"', $uri), 1624304664);
+            throw new NoResponseQueued(sprintf('No Response queued for URI "%s"', $uri), 1624304664);
         };
 
         $handlerStack = HandlerStack::create($requestHandler);