Fix issues with field, hasfield, isfield post ID parsing

Switching to is_numeric to identify ID values from strings, since the blade template is always parsed as a string and is_string wasn't catching IDs. Fixes Log1x#44 Fixes Log1x#63
EHLOVader · Nov 3, 2021 · 374c00b · 374c00b
1 parent d4461df
commit 374c00b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Directives/ACF.php b/src/Directives/ACF.php
@@ -61,11 +61,11 @@
         if (Str::contains($expression, ',')) {
             $expression = Util::parse($expression);
 
-            if (! empty($expression->get(2)) && ! is_string($expression->get(2))) {
+            if (! empty($expression->get(2)) && is_numeric($expression->get(2))) {
                 return "<?= get_field({$expression->get(0)}, {$expression->get(2)})[{$expression->get(1)}]; ?>";
             }
 
-            if (! is_string($expression->get(1))) {
+            if (is_numeric($expression->get(1))) {
                 return "<?= get_field({$expression->get(0)}, {$expression->get(1)}); ?>";
             }
 
@@ -79,11 +79,11 @@
         if (Str::contains($expression, ',')) {
             $expression = Util::parse($expression);
 
-            if (! empty($expression->get(2)) && ! is_string($expression->get(2))) {
+            if (! empty($expression->get(2)) && is_numeric($expression->get(2))) {
                 return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)})[{$expression->get(1)}]) : ?>";
             }
 
-            if (! is_string($expression->get(1))) {
+            if (is_numeric($expression->get(1))) {
                 return "<?php if (get_field({$expression->get(0)}, {$expression->get(1)})) : ?>";
             }
 
@@ -97,15 +97,15 @@
         if (Str::contains($expression, ',')) {
             $expression = Util::parse($expression);
 
-            if (! empty($expression->get(3)) && ! is_string($expression->get(2))) {
+            if (! empty($expression->get(3)) && is_numeric($expression->get(2))) {
                 return "<?php if (get_field({$expression->get(0)}, {$expression->get(3)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
             }
 
-            if (! empty($expression->get(2)) && ! is_string($expression->get(2))) {
+            if (! empty($expression->get(2)) && is_numeric($expression->get(2))) {
                 return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)}) === {$expression->get(1)}) : ?>"; // phpcs:ignore
             }
 
-            if (! empty($expression->get(2)) && is_string($expression->get(2))) {
+            if (! empty($expression->get(2)) && ! is_numeric($expression->get(2))) {
                 return "<?php if (get_field({$expression->get(0)})[{$expression->get(2)}] === {$expression->get(1)}) : ?>"; // phpcs:ignore
             }