chore: fix php 8.1 warnings and tests (#2131)

Author: bshaffer

.github/workflows/tests.yml

@@ -11,17 +11,15 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0" ]
+                php: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1" ]
                 composer-flags: [""]
                 include:
                   - php: "5.6"
                     composer-flags: "--prefer-lowest "
                   - php: "8.0"
                     composer-flags: "--prefer-lowest "
                   - php: "8.1"
-                    composer-flags: "--ignore-platform-reqs "
-                  - php: "8.1"
-                    composer-flags: "--ignore-platform-reqs --prefer-lowest "
+                    composer-flags: "--prefer-lowest "
         name: PHP ${{ matrix.php }} ${{ matrix.composer-flags }}Unit Test
         steps:
             - uses: actions/checkout@v2
@@ -45,7 +43,6 @@ jobs:
               name: Update phpunit/phpunit dependency
               run: composer update phpunit/phpunit phpspec/prophecy-phpunit --with-dependencies --ignore-platform-reqs
             - name: Run Script
-              continue-on-error: ${{ matrix.php == '8.1' }}
               run: vendor/bin/phpunit
 
     style:

src/Collection.php

@@ -11,7 +11,7 @@ class Collection extends Model implements \Iterator, \Countable
 {
   protected $collection_key = 'items';
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     if (isset($this->{$this->collection_key})
@@ -20,7 +20,7 @@ public function rewind()
     }
   }
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function current()
   {
     $this->coerceType($this->key());
@@ -29,7 +29,7 @@ public function current()
     }
   }
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function key()
   {
     if (isset($this->{$this->collection_key})
@@ -38,20 +38,20 @@ public function key()
     }
   }
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function next()
   {
     return next($this->{$this->collection_key});
   }
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     $key = $this->key();
     return $key !== null && $key !== false;
   }
 
-  #[ReturnTypeWillChange]
+  #[\ReturnTypeWillChange]
   public function count()
   {
     if (!isset($this->{$this->collection_key})) {
@@ -60,7 +60,6 @@ public function count()
     return count($this->{$this->collection_key});
   }
 
-  #[ReturnTypeWillChange]
   public function offsetExists($offset)
   {
     if (!is_numeric($offset)) {
@@ -69,7 +68,6 @@ public function offsetExists($offset)
     return isset($this->{$this->collection_key}[$offset]);
   }
 
-  #[ReturnTypeWillChange]
   public function offsetGet($offset)
   {
     if (!is_numeric($offset)) {
@@ -79,7 +77,6 @@ public function offsetGet($offset)
     return $this->{$this->collection_key}[$offset];
   }
 
-  #[ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     if (!is_numeric($offset)) {
@@ -88,7 +85,6 @@ public function offsetSet($offset, $value)
     $this->{$this->collection_key}[$offset] = $value;
   }
 
-  #[ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     if (!is_numeric($offset)) {

src/Model.php

@@ -253,18 +253,21 @@ public function assertIsArray($obj, $method)
     }
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetExists($offset)
   {
     return isset($this->$offset) || isset($this->modelData[$offset]);
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetGet($offset)
   {
     return isset($this->$offset) ?
         $this->$offset :
         $this->__get($offset);
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     if (property_exists($this, $offset)) {
@@ -275,6 +278,7 @@ public function offsetSet($offset, $value)
     }
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     unset($this->modelData[$offset]);