Fix deprecated warnings for 8.1

For real this time!

Author: opengeek

src/xPDO/Validation/xPDOValidator.php

@@ -65,7 +65,11 @@ public function validate(array $parameters = array()) {
                                 }
                                 break;
                             case 'preg_match':
-                                $result= (boolean) preg_match($rule['rule'], $this->object->_fields[$column]);
+                                if (is_null($this->object->_fields[$column])) {
+                                    $result = false;
+                                } else {
+                                    $result = (boolean)preg_match($rule['rule'], $this->object->_fields[$column]);
+                                }
                                 if (!$result) $this->addMessage($column, $ruleName, isset($rule['parameters']['message']) ? $rule['parameters']['message'] : $ruleName . ' failed');
                                 if ($this->object->xpdo->getDebug() === true)
                                     $this->object->xpdo->log(xPDO::LOG_LEVEL_DEBUG, "preg_match validation against {$rule['rule']} resulted in " . print_r($result, 1));

src/xPDO/xPDOContainer.php

@@ -74,75 +74,22 @@ public function has(string $id): bool
         return $this->offsetExists($id);
     }
 
-    /**
-     * Whether an offset exists
-     *
-     * @link  http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     * </p>
-     * <p>
-     * The return value will be cast to boolean if non-boolean was returned.
-     * @since 5.0.0
-     */
     public function offsetExists($offset): bool
     {
         return array_key_exists($offset, $this->entries);
     }
 
-    /**
-     * Offset to retrieve
-     *
-     * @link  http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types.
-     * @since 5.0.0
-     */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->entries[$offset];
     }
 
-    /**
-     * Offset to set
-     *
-     * @link  http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @return void
-     * @since 5.0.0
-     */
     public function offsetSet($offset, $value): void
     {
         $this->entries[$offset] = $value;
     }
 
-    /**
-     * Offset to unset
-     *
-     * @link  http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @return void
-     * @since 5.0.0
-     */
     public function offsetUnset($offset): void
     {
         unset($this->entries[$offset]);

src/xPDO/xPDOIterator.php

@@ -78,7 +78,7 @@ public function __construct(xPDO &$xpdo, array $options = [])
         return $this;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->index = 0;
         if (!empty($this->stmt)) {
@@ -96,25 +96,27 @@ public function rewind()
         }
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->index;
     }
 
-    public function next()
+    #[TentativeType]
+    public function next(): void
     {
         $this->fetch();
         if (!$this->valid()) {
             $this->index = null;
         } else {
             $this->index++;
         }
-        return $this->current();
     }
 
     public function valid(): bool

src/xPDO/xPDOMap.php

@@ -38,6 +38,7 @@ public function offsetExists($offset): bool
         return isset($this->map[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (!isset($this->map[$offset])) {
@@ -46,12 +47,12 @@ public function offsetGet($offset)
         return $this->map[$offset];
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->map[$offset] = $value;
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->map[$offset]);
     }