Merge pull request #3 from Flowpack/flow6and7

TASK: Adjust dependencies to support newer neos versions
Flowpack · Dec 10, 2021 · ecc19bd · ecc19bd
2 parents fbf1db3 + 4bfdae5
commit ecc19bd
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/Classes/HalResource.php b/Classes/HalResource.php
@@ -12,8 +12,10 @@
  */
 
 use Neos\Flow\Http\Client\Browser;
-use Neos\Flow\Http\Request;
-use Neos\Flow\Http\Uri;
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Psr7\ServerRequest;
 
 /**
  * HalResource
@@ -46,7 +48,7 @@ class HalResource implements \ArrayAccess
     protected $browser;
 
     /**
-     * @var Uri
+     * @var UriInterface
      */
     protected $baseUri;
 
@@ -55,12 +57,12 @@ class HalResource implements \ArrayAccess
      * instances of HalResource.
      *
      * @param Browser $browser
-     * @param Uri $baseUri
+     * @param UriInterface $baseUri
      * @param array $properties
      * @param array $links
      * @param array $embedded
      */
-    public function __construct(Browser $browser, Uri $baseUri, array $properties, array $links = [], array $embedded = [])
+    public function __construct(Browser $browser, UriInterface $baseUri, array $properties, array $links = [], array $embedded = [])
     {
         $this->browser = $browser;
         $this->baseUri = $baseUri;
@@ -84,12 +86,12 @@ public function __construct(Browser $browser, Uri $baseUri, array $properties, a
     /**
      * Create and return the HalResource found at the given $uri.
      *
-     * @param string|Uri $uri URI to fetch the resource data from
+     * @param string|UriInterface $uri URI to fetch the resource data from
      * @param Browser $browser The browser to use for fetching the resource data
-     * @param Uri $baseUri Base uri to use, if omitted it is built from the $uri
+     * @param UriInterface $baseUri Base uri to use, if omitted it is built from the $uri
      * @return HalResource
      */
-    static public function createFromUri($uri, Browser $browser, Uri $baseUri = null)
+    static public function createFromUri($uri, Browser $browser, UriInterface $baseUri = null)
     {
         if (is_string($uri)) {
             $requestUri = new Uri($uri);
@@ -103,35 +105,33 @@ static public function createFromUri($uri, Browser $browser, Uri $baseUri = null
             } else {
                 $baseUri = clone $uri;
             }
-            $baseUri->setPath(null);
-            $baseUri->setFragment(null);
-            $baseUri->setQuery(null);
+            $baseUri = $baseUri->withPath('')->withQuery('')->withFragment('');
         }
 
-        return self::createFromRequest(Request::create($requestUri), $browser, $baseUri);
+        return self::createFromRequest(new ServerRequest('get', $requestUri), $browser, $baseUri);
     }
 
     /**
      * Create and return a HalResource with the data the request returns.
      *
-     * @param Request $request The request to use for fetching the resource data
+     * @param ServerRequestInterface $request The request to use for fetching the resource data
      * @param Browser $browser The browser to use for fetching the resource data
-     * @param Uri $baseUri Base uri to use
+     * @param UriInterface $baseUri Base uri to use
      * @return HalResource
      */
-    static public function createFromRequest($request, Browser $browser, Uri $baseUri)
+    static public function createFromRequest(ServerRequestInterface $request, Browser $browser, UriInterface $baseUri)
     {
         $response = $browser->sendRequest($request);
 
-        if (substr($response->getHeader('Content-Type'), 0, 20) !== 'application/hal+json') {
-            throw new \RuntimeException('Invalid content type received: ' . $response->getHeader('Content-Type'), 1410345012);
+        if (substr($response->getHeaderLine('Content-Type'), 0, 20) !== 'application/hal+json') {
+            throw new \RuntimeException('Invalid content type received: ' . $response->getHeaderLine('Content-Type'), 1410345012);
         }
 
         if ($response->getStatusCode() !== 200) {
-            throw new \RuntimeException('Response with unexpected status code returned for ' . $request->getUri() . ': ' . $response->getStatus(), 1418142491);
+            throw new \RuntimeException('Response with unexpected status code returned for ' . $request->getUri() . ': ' . $response->getStatusCode(), 1418142491);
         }
 
-        $data = json_decode($response->getContent(), true);
+        $data = json_decode($response->getBody()->getContents(), true);
 
         if ($data === null) {
             $message = 'Invalid JSON format returned from ' . $request->getUri() . ', JSON error code: ' . json_last_error();
@@ -305,9 +305,10 @@ public function getLinkValue($name, array $variables = [])
         $uri = new Uri($this->getLink($name)->getHref($variables));
 
         if ($uri->getHost() === null || $uri->getHost() === '') {
-            $uri->setScheme($this->baseUri->getScheme());
-            $uri->setHost($this->baseUri->getHost());
-            $uri->setPath($this->baseUri->getPath() . $uri->getPath());
+            $uri = $uri
+                ->withScheme($this->baseUri->getScheme())
+                ->withHost($this->baseUri->getHost())
+                ->withPath($this->baseUri->getPath() . $uri->getPath());
         }
 
         return self::createFromUri($uri, $this->browser);

diff --git a/Classes/HalResourceCollection.php b/Classes/HalResourceCollection.php
@@ -12,7 +12,7 @@
  */
 
 use Neos\Flow\Http\Client\Browser;
-use Neos\Flow\Http\Uri;
+use Psr\Http\Message\UriInterface;
 
 /**
  * HalResourceCollection
@@ -30,16 +30,16 @@ class HalResourceCollection implements \Iterator, \Countable, \ArrayAccess
     protected $browser;
 
     /**
-     * @var Uri
+     * @var UriInterface
      */
     protected $baseUri;
 
     /**
      * @param Browser $browser
-     * @param Uri $baseUri
+     * @param UriInterface $baseUri
      * @param array $collection
      */
-    public function __construct(Browser $browser, Uri $baseUri, array $collection = [])
+    public function __construct(Browser $browser, UriInterface $baseUri, array $collection = [])
     {
         $this->baseUri = $baseUri;
 

diff --git a/composer.json b/composer.json
@@ -4,8 +4,9 @@
     "description": "HAL client support package for Neos Flow",
     "license": "LGPL-3.0+",
     "require": {
-        "php": "~7.0",
-        "neos/flow": " ~4.0 || ~5.0"
+        "php": "~7.0 || ~8.0",
+        "neos/flow": "~6.0 || ~7.0 || dev-master",
+        "guzzlehttp/psr7": "^1.7, !=1.8.0"
     },
     "autoload": {
         "psr-4": {
@@ -89,4 +90,4 @@
             "Neos.Neos.Ui-20190319094900"
         ]
     }
-}
+}