Update @content_tag_for Blade directives to be able to use all data available from the current view.

Tortue Torche · Tortue Torche · commit 092f059bac47 · 2015-10-06T16:17:19.000+02:00
<?php $myLocaleVariable = 'cool'; ?> @div_for($project) @if (isset($myLocaleVariable)) My text @endif @end_div_for() And fix the support of Collections/arrays who implement the IteratorAggregate interface: <?php $users = App\User::all(); ?> @div_for($users) as ($user) {{ $userIndex }} {{ $user->name }} @end_div_for
diff --git a/src/Efficiently/JqueryLaravel/BladeExtensions.php b/src/Efficiently/JqueryLaravel/BladeExtensions.php
@@ -104,11 +104,11 @@ public function registerContentTags()
                     $replacement = <<<EOT
 <?php
     \${$recordName}Record = $record;
-    if (! is_a(\${$recordName}Record, "\Illuminate\Support\Collection")) {
+    if (! is_a(\${$recordName}Record, "\IteratorAggregate")) {
         \${$recordName}Record = new \Illuminate\Support\Collection([\${$recordName}Record]);
     }
     \${$recordIndex} = -1;// -1 because we increment index at the beginnning of the loop
-    \${$recordName}Record->each(function(\${$recordName}) use(\$__env, &\${$recordIndex}){
+    foreach (\${$recordName}Record as \${$recordName}) {
         \${$recordIndex}++;
         \$options = (array) $options;
         \$options['class'] = implode(" ",
@@ -132,7 +132,7 @@ public function registerContentTags()
                     $replacement = <<<EOT
 <?php
         echo '</'.$tagName.'>';$3
-    });
+    }
 ?>
 EOT;
                     $view = preg_replace($pattern, $replacement, $view, 1);
diff --git a/tests/JqlBladeExtensionsTest.php b/tests/JqlBladeExtensionsTest.php
@@ -82,11 +82,11 @@ public function testContentTagFor()
         $expect = <<<EOT
 <?php
     \$projectRecord = \$project;
-    if (! is_a(\$projectRecord, "\Illuminate\Support\Collection")) {
+    if (! is_a(\$projectRecord, "\IteratorAggregate")) {
         \$projectRecord = new \Illuminate\Support\Collection([\$projectRecord]);
     }
     \$projectIndex = -1;// -1 because we increment index at the beginnning of the loop
-    \$projectRecord->each(function(\$project) use(\$__env, &\$projectIndex){
+    foreach (\$projectRecord as \$project) {
         \$projectIndex++;
         \$options = (array) [];
         \$options['class'] = implode(" ",
@@ -98,7 +98,7 @@ public function testContentTagFor()
 <?php
         echo '</'.'div'.'>';
 
-    });
+    }
 ?>
 EOT;
         $view = Blade::compileString($contentTagFor);
@@ -121,11 +121,11 @@ public function testContentTagForWithOptions()
         $expect = <<<EOT
 <?php
     \$projectRecord = \$project;
-    if (! is_a(\$projectRecord, "\Illuminate\Support\Collection")) {
+    if (! is_a(\$projectRecord, "\IteratorAggregate")) {
         \$projectRecord = new \Illuminate\Support\Collection([\$projectRecord]);
     }
     \$projectIndex = -1;// -1 because we increment index at the beginnning of the loop
-    \$projectRecord->each(function(\$project) use(\$__env, &\$projectIndex){
+    foreach (\$projectRecord as \$project) {
         \$projectIndex++;
         \$options = (array) ['remote' => 'true'];
         \$options['class'] = implode(" ",
@@ -137,7 +137,7 @@ public function testContentTagForWithOptions()
 <?php
         echo '</'.'div'.'>';
 
-    });
+    }
 ?>
 EOT;
         $view = Blade::compileString($contentTagFor);
