From e77c409ab516676e3241a9404a089224e8e50d2a Mon Sep 17 00:00:00 2001
From: Paul Mitchum <paul@mile23.com>
Date: Fri, 13 Dec 2024 13:56:16 -0600
Subject: [PATCH] Reduce dependency on getdkan/contracts (#23)

---
 composer.json                     |  4 ++--
 rector.php                        |  7 ++-----
 src/HydratableInterface.php       | 28 ++++++++++++++++++++++++++++
 src/Job/AbstractPersistentJob.php |  7 +++++--
 src/Result.php                    |  2 --
 test/Mock/Complex.php             |  2 +-
 6 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 src/HydratableInterface.php

diff --git a/composer.json b/composer.json
index 360c216..438b129 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,11 @@
     "require": {
         "php": ">7.3 <8.4",
         "ext-json": "*",
-        "getdkan/contracts": "^1.1.3"
+        "getdkan/contracts": "^1.2"
     },
     "require-dev": {
         "phpunit/phpunit": ">8.5.14 <10.0.0",
-        "rector/rector": "@stable",
+        "rector/rector": "^1@stable",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/phpunit-bridge": "^7.0"
     },
diff --git a/rector.php b/rector.php
index 54fd922..b79cf54 100644
--- a/rector.php
+++ b/rector.php
@@ -3,16 +3,16 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
-use Rector\Set\ValueObject\SetList;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
 use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
+use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/src',
         __DIR__ . '/test',
+        __DIR__ . '/rector.php',
     ]);
 
     $rectorConfig->sets([
@@ -24,9 +24,6 @@
     ]);
 
     $rectorConfig->skip([
-        // Don't throw errors on JSON parse problems. Yet.
-        // @todo Throw errors and deal with them appropriately.
-        JsonThrowOnErrorRector::class,
         // We like our tags. Please don't remove them.
         RemoveUselessParamTagRector::class,
         RemoveUselessReturnTagRector::class,
diff --git a/src/HydratableInterface.php b/src/HydratableInterface.php
new file mode 100644
index 0000000..64d0858
--- /dev/null
+++ b/src/HydratableInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Procrastinator;
+
+/**
+ * Interface to hydrate JSON into PHP variables.
+ *
+ * This interface is similar to \JsonSerializable in that we can 'hydrate' JSON
+ * into PHP structures.
+ *
+ * @see \Procrastinator\HydratableTrait
+ * @see \JsonSerializable
+ */
+interface HydratableInterface extends \JsonSerializable
+{
+    /**
+     * Hydrate some JSON into a PHP object or array or other variable.
+     *
+     * @param string $json
+     *   The JSON to process.
+     * @param $instance
+     *   (Optional) Create a new instance without invoking the constructor.
+     *
+     * @return mixed
+     *   The hydrated data structure.
+     */
+    public static function hydrate(string $json, $instance = null);
+}
diff --git a/src/Job/AbstractPersistentJob.php b/src/Job/AbstractPersistentJob.php
index 2d50b55..933793b 100644
--- a/src/Job/AbstractPersistentJob.php
+++ b/src/Job/AbstractPersistentJob.php
@@ -2,9 +2,9 @@
 
 namespace Procrastinator\Job;
 
-use Contracts\StorerInterface;
 use Contracts\RetrieverInterface;
-use Contracts\HydratableInterface;
+use Contracts\StorerInterface;
+use Procrastinator\HydratableInterface;
 use Procrastinator\HydratableTrait;
 use Procrastinator\Result;
 
@@ -25,6 +25,9 @@ public function run(): Result
 
     public static function get(string $identifier, $storage, array $config = null)
     {
+        // @todo We need to somehow change these references to StorerInterface
+        //   and RetrieverInterface, in order to decouple from
+        //   getdkan/contracts.
         if ($storage instanceof StorerInterface && $storage instanceof RetrieverInterface) {
             $new = new static($identifier, $storage, $config);
 
diff --git a/src/Result.php b/src/Result.php
index 565fde6..c83c7ef 100644
--- a/src/Result.php
+++ b/src/Result.php
@@ -2,8 +2,6 @@
 
 namespace Procrastinator;
 
-use Contracts\HydratableInterface;
-
 class Result implements HydratableInterface
 {
     use HydratableTrait;
diff --git a/test/Mock/Complex.php b/test/Mock/Complex.php
index 7f2a4bf..7e755df 100644
--- a/test/Mock/Complex.php
+++ b/test/Mock/Complex.php
@@ -2,7 +2,7 @@
 
 namespace ProcrastinatorTest\Mock;
 
-use Contracts\HydratableInterface;
+use Procrastinator\HydratableInterface;
 use Procrastinator\HydratableTrait;
 use Procrastinator\JsonSerializeTrait;