Refactoring

putyourlightson · Feb 26, 2024 · 98d9779 · 98d9779
1 parent 171b5ec
commit 98d9779
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/services/HintsService.php b/src/services/HintsService.php
@@ -115,18 +115,17 @@ public function clear(int $id): void
      */
     public function checkElementQuery(ElementQuery $elementQuery): void
     {
-        if ($elementQuery->eagerLoadHandle === null) {
+        if ($elementQuery->wasEagerLoaded() || $elementQuery->eagerLoadHandle === null) {
             return;
         }
 
-        $fieldHandle = last(explode(':', $elementQuery->eagerLoadHandle));
-
-        if ($fieldHandle === null) {
-            return;
+        /** @see ElementQuery::wasEagerLoaded() */
+        $planHandle = $elementQuery->eagerLoadHandle;
+        if (str_contains($planHandle, ':')) {
+            $planHandle = explode(':', $planHandle, 2)[1];
         }
 
-        $fieldId = Craft::$app->getFields()->getFieldByHandle($fieldHandle)->id ?? null;
-
+        $fieldId = Craft::$app->getFields()->getFieldByHandle($planHandle)->id ?? null;
         if ($fieldId === null) {
             return;
         }

diff --git a/tests/pest/Feature/HintsTest.php b/tests/pest/Feature/HintsTest.php
@@ -24,7 +24,7 @@
 });
 
 test('Hint is not recorded for a related element query that is lazy-loaded in a template that exist in the vendor folder path', function() {
-    saveHint(Craft::getAlias('@vendor/templates/test'));
+    saveHint(template: Craft::getAlias('@vendor/templates/test'));
 
     expect(HintRecord::find()->count())
         ->toEqual(0);

diff --git a/tests/pest/Pest.php b/tests/pest/Pest.php
@@ -1,5 +1,6 @@
 <?php
 
+use craft\elements\db\ElementQuery;
 use craft\elements\Entry;
 use markhuot\craftpest\test\TestCase;
 use putyourlightson\blitzhints\BlitzHints;
@@ -48,10 +49,10 @@
 |
 */
 
-function saveHint(?string $template = null): void
+function saveHint(?ElementQuery $elementQuery = null, ?string $template = null): void
 {
+    $elementQuery = $elementQuery ?? Entry::find()->section('single')->one()->relatedTo;
     $template = $template ?? 'templates/test';
-    $elementQuery = Entry::find()->section('single')->one()->relatedTo;
 
     $fieldId = Craft::$app->getFields()->getFieldByHandle('relatedTo')->id;
     $hint = new HintModel([