Merge pull request #63 from TobiasGraml11/loosen_guzzle_requirement

vienthuong · web-flow · commit 76ebfcfb83ce · 2022-12-19T18:55:41.000+07:00
Loosen Guzzle requirement
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.4 || ^8.0 || ^8.1",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^7.5",
+        "guzzlehttp/guzzle": "^7.0",
         "psr/http-client": "^1.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Hydrate/EntityHydrator.php b/src/Hydrate/EntityHydrator.php
@@ -121,7 +121,7 @@ private function hydrateEntity(string $entityName, array $entityRaw, array $data
         $relationships = $entityRaw['relationships'] ?? [];
 
         // reserve cache before relationships hydration. This prevents circular references to fail
-        if($this->useCache && isset($cacheKey)) {
+        if($this->useCache) {
             $this->cache[$cacheKey] = $entity;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private function hydrateEntity(string $entityName, array $entityRaw, array $data`
`121`	`121`	`$relationships = $entityRaw['relationships'] ?? [];`
`122`	`122`
`123`	`123`	`// reserve cache before relationships hydration. This prevents circular references to fail`
`124`		`- if($this->useCache && isset($cacheKey)) {`
	`124`	`+ if($this->useCache) {`
`125`	`125`	`$this->cache[$cacheKey] = $entity;`
`126`	`126`	`}`
`127`	`127`