PHP 8.1+ compat and various dependency updates

Author: opengeek

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout
@@ -63,7 +63,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout
@@ -114,7 +114,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout

README.md

@@ -2,13 +2,13 @@
 
 [![Build Status](https://github.com/modxcms/xpdo/workflows/CI/badge.svg?branch=3.x)](https://github.com/modxcms/xpdo/workflows/CI/badge.svg?branch=3.x)
 
-xPDO is an ultra-light object-relational bridge library for PHP 5.6+. It is a standalone library and can be used with any framework or DI container.
+xPDO is an ultra-light object-relational bridge library for PHP. It is a standalone library and can be used with any framework or DI container.
 
 ## Installation
 
 xPDO can be installed in your project via composer:
 
-    composer require xpdo/xpdo ^3.0
+    composer require xpdo/xpdo
 
 
 ## Usage

composer.json

@@ -15,15 +15,15 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.2.5",
         "ext-PDO": "*",
         "ext-json": "*",
         "ext-simplexml": "*",
-        "symfony/console": "~2.8|~3.4",
-        "psr/container": "^1.0"
+        "symfony/console": "^5.4",
+        "psr/container": "^2.0.1"
     },
     "require-dev": {
-        "yoast/phpunit-polyfills": "^0.2.0"
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "suggest": {
         "ext-redis": "Allows caching using Redis"

src/xPDO/Console/Command/Command.php

@@ -28,7 +28,7 @@ protected function loadConfig(OutputInterface $output, $config = null)
                 if (is_readable($location)) {
                     $config = $location;
                     break;
-                };
+                }
             }
         }
         if (!empty($config) && is_readable($config)) {

src/xPDO/xPDOContainer.php

@@ -11,6 +11,8 @@
 namespace xPDO;
 
 
+use ArrayAccess;
+use Exception;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -22,7 +24,7 @@
  *
  * @package xPDO
  */
-class xPDOContainer implements ContainerInterface, \ArrayAccess
+class xPDOContainer implements ContainerInterface, ArrayAccess
 {
     private $entries = array();
 
@@ -32,7 +34,7 @@ class xPDOContainer implements ContainerInterface, \ArrayAccess
      * @param string $id The identifier for the entry.
      * @param mixed  $entry The entry to add.
      */
-    public function add($id, $entry)
+    public function add(string $id, $entry)
     {
         $this->offsetSet($id, $entry);
     }
@@ -47,12 +49,12 @@ public function add($id, $entry)
      *
      * @return mixed Entry.
      */
-    public function get($id)
+    public function get(string $id)
     {
         if ($this->has($id)) {
             try {
                 return $this->offsetGet($id);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
         }
@@ -65,29 +67,29 @@ public function get($id)
      *
      * @param string $id Identifier of the entry to look for.
      *
-     * @return boolean
+     * @return bool
      */
-    public function has($id)
+    public function has(string $id): bool
     {
         return $this->offsetExists($id);
     }
 
     /**
-     * Whether a offset exists
+     * Whether an offset exists
      *
      * @link  http://php.net/manual/en/arrayaccess.offsetexists.php
      *
      * @param mixed $offset <p>
      *                      An offset to check for.
      *                      </p>
      *
-     * @return boolean true on success or false on failure.
+     * @return bool true on success or false on failure.
      * </p>
      * <p>
-     * The return value will be casted to boolean if non-boolean was returned.
+     * The return value will be cast to boolean if non-boolean was returned.
      * @since 5.0.0
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return array_key_exists($offset, $this->entries);
     }
@@ -124,7 +126,7 @@ public function offsetGet($offset)
      * @return void
      * @since 5.0.0
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->entries[$offset] = $value;
     }
@@ -141,7 +143,7 @@ public function offsetSet($offset, $value)
      * @return void
      * @since 5.0.0
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->entries[$offset]);
     }

src/xPDO/xPDOException.php

@@ -10,12 +10,14 @@
 
 namespace xPDO;
 
+use Exception;
+
 /**
  * Represents an xPDO-related Exception.
  *
  * @package xPDO
  */
-class xPDOException extends \Exception
+class xPDOException extends Exception
 {
 
 }

src/xPDO/xPDOIterator.php

@@ -11,6 +11,11 @@
 namespace xPDO;
 
 
+use Iterator;
+use PDO;
+use PDOStatement;
+use xPDO\Om\xPDOQuery;
+
 /**
  * An iterable representation of an xPDOObject result set.
  *
@@ -20,28 +25,30 @@
  *
  * @package xpdo
  */
-class xPDOIterator implements \Iterator {
+class xPDOIterator implements Iterator
+{
     private $xpdo = null;
     private $index = 0;
     private $current = null;
-    /** @var null|\PDOStatement */
+    /** @var null|PDOStatement */
     private $stmt = null;
     private $class = null;
-    private $alias = null;
-    /** @var null|int|string|array|\xPDO\Om\xPDOQuery */
+    private $alias;
+    /** @var null|int|string|array|xPDOQuery */
     private $criteria = null;
     private $criteriaType = 'xPDOQuery';
     private $cacheFlag = false;
 
     /**
      * Construct a new xPDOIterator instance (do not call directly).
      *
-     * @see xPDO::getIterator()
      * @param xPDO &$xpdo A reference to a valid xPDO instance.
      * @param array $options An array of options for the iterator.
      * @return xPDOIterator An xPDOIterator instance.
+     * @see xPDO::getIterator()
      */
-    function __construct(& $xpdo, array $options= array()) {
+    public function __construct(xPDO &$xpdo, array $options = [])
+    {
         $this->xpdo =& $xpdo;
         if (isset($options['class'])) {
             $this->class = $this->xpdo->loadClass($options['class']);
@@ -67,9 +74,12 @@ function __construct(& $xpdo, array $options= array()) {
                 $this->alias = $this->criteria->getAlias();
             }
         }
+
+        return $this;
     }
 
-    public function rewind() {
+    public function rewind()
+    {
         $this->index = 0;
         if (!empty($this->stmt)) {
             $this->stmt->closeCursor();
@@ -86,15 +96,18 @@ public function rewind() {
         }
     }
 
-    public function current() {
+    public function current()
+    {
         return $this->current;
     }
 
-    public function key() {
+    public function key()
+    {
         return $this->index;
     }
 
-    public function next() {
+    public function next()
+    {
         $this->fetch();
         if (!$this->valid()) {
             $this->index = null;
@@ -104,7 +117,8 @@ public function next() {
         return $this->current();
     }
 
-    public function valid() {
+    public function valid(): bool
+    {
         return ($this->current !== null);
     }
 
@@ -114,10 +128,15 @@ public function valid() {
      * Calls the _loadInstance() method for the specified class, so it properly
      * inherits behavior from xPDOObject derivatives.
      */
-    protected function fetch() {
-        $row = $this->stmt->fetch(\PDO::FETCH_ASSOC);
+    protected function fetch()
+    {
+        $row = $this->stmt->fetch(PDO::FETCH_ASSOC);
         if (is_array($row) && !empty($row)) {
-            $instance = $this->xpdo->call($this->class, '_loadInstance', array(& $this->xpdo, $this->class, $this->alias, $row));
+            $instance = $this->xpdo->call(
+                $this->class,
+                '_loadInstance',
+                [& $this->xpdo, $this->class, $this->alias, $row]
+            );
             if ($instance === null) {
                 $this->fetch();
             } else {

src/xPDO/xPDOMap.php

@@ -11,7 +11,9 @@
 namespace xPDO;
 
 
-class xPDOMap implements \ArrayAccess
+use ArrayAccess;
+
+class xPDOMap implements ArrayAccess
 {
     /**
      * @var array An object/relational map by class.
@@ -24,11 +26,11 @@ class xPDOMap implements \ArrayAccess
 
     public function __construct(xPDO &$xpdo)
     {
-        $this->map = array();
+        $this->map = [];
         $this->xpdo =& $xpdo;
     }
 
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         if (!isset($this->map[$offset])) {
             $this->_checkClass($offset);