Merge pull request #3 from spaceonfire/split-laminas-hydrator-bridge

Split laminas hydrator bridge

Author: tntrex

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   composer:

CHANGELOG.md

@@ -22,6 +22,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Nothing
 -->
 
+## [1.2.0] - 2020-10-06
+### Deprecated
+- Class `spaceonfire\DataSource\Bridge\CycleOrm\Mapper\Hydrator\StdClassHydrator` moved to
+  `spaceonfire/laminas-hydrator-bridge` library. Class alias provided for backwards compatibility,
+  but will be removed in next major release.
+
 ## [1.1.0] - 2020-09-27
 ### Deprecated
 - Namespace `spaceonfire\DataSource\Adapters` renamed to `spaceonfire\DataSource\Bridge`.

composer.json

@@ -24,6 +24,7 @@
     "jawira/case-converter": "^3.4",
     "spaceonfire/collection": "^2.0",
     "spaceonfire/criteria": "^1.1",
+    "spaceonfire/laminas-hydrator-bridge": "^1.0",
     "webmozart/assert": "^1.6"
   },
   "require-dev": {
@@ -64,7 +65,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.1-dev"
+      "dev-master": "1.2-dev"
     }
   },
   "config": {

phpstan.neon.dist

@@ -19,4 +19,6 @@ parameters:
 		- '/^Unable to resolve the template type ExpectedType in call to method static method Webmozart\\Assert\\Assert::isInstanceOf\(\)$/'
 		-
 			message: '/^If condition is always false\.$/'
-			path: src/Adapters/*
+			paths:
+				- src/Adapters/*
+				- src/Bridge/CycleOrm/Mapper/Hydrator/StdClassHydrator.php

phpunit.xml.dist

@@ -19,6 +19,7 @@
 			<directory suffix=".php">src/</directory>
 			<exclude>
 				<directory>src/Adapters/</directory>
+				<file>src/Bridge/CycleOrm/Mapper/Hydrator/StdClassHydrator.php</file>
 			</exclude>
 		</whitelist>
 	</filter>

src/Bridge/CycleOrm/Mapper/Hydrator/StdClassHydrator.php

@@ -4,53 +4,16 @@
 
 namespace spaceonfire\DataSource\Bridge\CycleOrm\Mapper\Hydrator;
 
-use Laminas\Hydrator\AbstractHydrator;
+use function class_alias;
 
-class StdClassHydrator extends AbstractHydrator
-{
-    /**
-     * @inheritDoc
-     */
-    public function extract(object $object): array
-    {
-        $data = get_object_vars($object);
-        $filter = $this->getFilter();
-
-        /**
-         * @var string $name
-         * @var mixed $value
-         */
-        foreach ($data as $name => $value) {
-            // Filter keys, removing any we don't want
-            if (!$filter->filter($name)) {
-                unset($data[$name]);
-                continue;
-            }
-
-            // Replace name if extracted differ
-            $extracted = $this->extractName($name, $object);
-
-            if ($extracted !== $name) {
-                unset($data[$name]);
-                $name = $extracted;
-            }
-
-            $data[$name] = $this->extractValue($name, $value, $object);
-        }
-
-        return $data;
-    }
+class_alias(\spaceonfire\LaminasHydratorBridge\StdClassHydrator::class, __NAMESPACE__ . '\StdClassHydrator');
 
+if (false) {
     /**
-     * @inheritDoc
+     * @deprecated Will be dropped in next major release.
+     * Use \spaceonfire\LaminasHydratorBridge\StdClassHydrator instead.
      */
-    public function hydrate(array $data, object $object)
+    class StdClassHydrator extends \spaceonfire\LaminasHydratorBridge\StdClassHydrator
     {
-        foreach ($data as $name => $value) {
-            $property = $this->hydrateName($name, $data);
-            $object->$property = $this->hydrateValue($property, $value, $data);
-        }
-
-        return $object;
     }
 }

src/Bridge/CycleOrm/Mapper/StdClassCycleMapper.php

@@ -5,7 +5,7 @@
 namespace spaceonfire\DataSource\Bridge\CycleOrm\Mapper;
 
 use Cycle\ORM\ORMInterface;
-use spaceonfire\DataSource\Bridge\CycleOrm\Mapper\Hydrator\StdClassHydrator;
+use spaceonfire\LaminasHydratorBridge\StdClassHydrator;
 use stdClass;
 
 class StdClassCycleMapper extends BasicCycleMapper