Issue-203: PHP 8.1 deprecations

Closes #203

Author: tomglvng

src/Pagination/ResourceCursor.php

@@ -11,20 +11,12 @@
  */
 class ResourceCursor implements ResourceCursorInterface
 {
-    /** @var PageInterface */
-    protected $currentPage;
-
-    /** @var PageInterface */
-    protected $firstPage;
-
+    protected PageInterface $currentPage;
+    protected PageInterface $firstPage;
     /** @var null|int */
     protected $pageSize;
-
-    /** @var int */
-    protected $currentIndex = 0;
-
-    /** @var int */
-    protected $totalIndex = 0;
+    protected int $currentIndex = 0;
+    protected int $totalIndex = 0;
 
     public function __construct(?int $pageSize, PageInterface $firstPage)
     {
@@ -35,6 +27,7 @@ public function __construct(?int $pageSize, PageInterface $firstPage)
 
     /**
      * {@inheritdoc}
+     * @return mixed
      */
     public function current()
     {
@@ -44,7 +37,7 @@ public function current()
     /**
      * {@inheritdoc}
      */
-    public function next()
+    public function next(): void
     {
         $this->currentIndex++;
         $this->totalIndex++;
@@ -68,15 +61,15 @@ public function key()
     /**
      * {@inheritdoc}
      */
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->currentPage->getItems()[$this->currentIndex]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->totalIndex = 0;
         $this->currentIndex = 0;

src/Routing/UriGenerator.php

@@ -40,7 +40,7 @@ public function generate($path, array $uriParameters = [], array $queryParameter
         }
 
         if (!empty($queryParameters)) {
-            $uri .= '?' . http_build_query($queryParameters, null, '&', PHP_QUERY_RFC3986);
+            $uri .= '?' . http_build_query($queryParameters, "", '&', PHP_QUERY_RFC3986);
         }
 
         return $uri;