Update to require PHP 8.0

.gitignore

@@ -16,4 +16,5 @@ phpunit.xml
 *.sublime-project
 
 # test artifacts
-tests/fixtures/test_copy.db
+tests/fixtures/test_copy.db
+.phpunit.result.cache

composer.json

@@ -4,8 +4,8 @@
     "license": "BSD-3-Clause",
     "description": "PHP Library for implementing the Data Mapper pattern",
     "require": {
-        "php": "^7.3",
-        "dealnews/repository": "^2.0"
+        "php": "^8.0",
+        "dealnews/repository": "^3.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-    <testsuites>
-        <testsuite name="default">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>functional</group>
-        </exclude>
-    </groups>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="DN_INI_FILE" value="./tests/fixtures/test.ini"/>
-    </php>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>functional</group>
+    </exclude>
+  </groups>
+  <php>
+    <env name="DN_INI_FILE" value="./tests/fixtures/test.ini"/>
+  </php>
+</phpunit>

src/AbstractMapper.php

@@ -34,9 +34,9 @@ abstract class AbstractMapper implements Mapper {
      * Returns the name of the primary key property for
      * the object being mapped
      *
-     * @return int|string
+     * @return string
      */
-    public function getPrimaryKey() {
+    public function getPrimaryKey(): string {
         return static::PRIMARY_KEY;
     }
 
@@ -45,7 +45,7 @@ public function getPrimaryKey() {
      *
      * @return string
      */
-    public static function getMappedClass() {
+    public static function getMappedClass(): string {
         return static::MAPPED_CLASS;
     }
 
@@ -57,7 +57,7 @@ public static function getMappedClass() {
      *
      * @suppress PhanTypeExpectedObjectOrClassName
      */
-    protected function setData(array $data) {
+    protected function setData(array $data): object {
         $class  = $this::MAPPED_CLASS;
         $object = new $class();
         foreach ($this::MAPPING as $property => $mapping) {
@@ -76,7 +76,7 @@ protected function setData(array $data) {
      *
      * @return array
      */
-    protected function getData($object) {
+    protected function getData($object): array {
         $data = [];
         foreach ($this::MAPPING as $property => $mapping) {
             $data[$property] = $this->getValue($object, $property, $mapping);

src/Repository.php

@@ -19,13 +19,13 @@ class Repository extends \DealNews\Repository\Repository {
      * Keeps the list of mappers
      * @var array
      */
-    protected $mappers = [];
+    protected array $mappers = [];
 
     /**
      * Keeps the list of classes
      * @var array
      */
-    protected $classes = [];
+    protected array $classes = [];
 
     /**
      * Creates the repository
@@ -44,7 +44,7 @@ public function __construct(array $mappers = []) {
      *
      * @param string         $name   Mapped Object name
      */
-    public function new(string $name) {
+    public function new(string $name): object {
         if (!isset($this->classes[$name])) {
             throw new \LogicException("There is no class registered for `$name`", 1);
         }
@@ -61,7 +61,7 @@ public function new(string $name) {
      *
      * @return boolean
      */
-    public function delete(string $name, $id) {
+    public function delete(string $name, $id): bool {
         if (!isset($this->classes[$name])) {
             throw new \LogicException("There is no class registered for `$name`", 2);
         }