Merge pull request #2 from thedevdojo/fixing/BladeRender

Adding fixes to blade render

Author: tnylea

src/Tails.php

@@ -88,6 +88,21 @@ private function replaceBladeHTMLWithBladeDirectives($string){
         $string = str_replace('<ifGuest>', '@guest', $string);
         $string = str_replace('</ifGuest>', '@endguest', $string);
 
+        // trim any curly brace from {{ array.item }} to {{ $array->item }}
+        $bladeCurlyBraceMatches = [];
+        preg_match_all('/{{(.*?)}}/', $string, $bladeCurlyBraceMatches);
+        foreach($bladeCurlyBraceMatches[1] as $index => $curlyBrace){
+            $trimmedContent = trim($curlyBrace);
+            // dd($trimmedContent[0]);
+            if(isset($trimmedContent[0])){
+                // if it's a string we don't replace it
+                if($trimmedContent[0] != "'" && $trimmedContent[0] != '"'){
+                    $outputVariable = str_replace('.', '->', $trimmedContent);
+                    $string = str_replace($bladeCurlyBraceMatches[0][$index], '{{ $' . $outputVariable . '}}', $string);
+                }
+            }
+        }
+
         return $string;
     }
 

src/TailsServiceProvider.php

@@ -58,8 +58,7 @@ public function boot()
             $response = Tails::getResponse($projectURL);
             $data = Tails::getDataFromResponse($key, $response);
 
-            $data = str_replace('"', '\"', $data);
-            return '<?php echo \Blade::render("' . $data . '"); ?>';
+            return \Blade::render($data);
         });
 
     }