fixes #4

awssat · Sep 14, 2019 · da9d125 · da9d125
1 parent aacb890
commit da9d125
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Analyze.php b/src/Analyze.php
@@ -190,13 +190,13 @@ protected function detectWarnings()
 
         if (version_compare($laravelVersion, '5.7', '>=')) {
             if (
-                preg_match('/@?{{(\s*((?!}}).?)*\s*)or\s*.+?\s*}}(\r?\n)?/s', $this->code) ||
-                preg_match('/@?{{{(\s*((?!}}}).?)*\s*)or\s*.+?\s*}}}(\r?\n)?/s', $this->code) ||
-                preg_match('/@?{\!\!(\s*((?!\!\!}).?)*\s*)or\s*.+?\s*\!\!}(\r?\n)?/s', $this->code) 
+                preg_match('/@?{{(((?!}})(?<!--).?)*\s+)or\s+.+?\s*}}(\r?\n)?/s', $this->code) ||
+                preg_match('/@?{{{(\s*((?!}}}).?)*\s+)or\s+.+?\s*}}}(\r?\n)?/s', $this->code) ||
+                preg_match('/@?{\!\!(\s*((?!\!\!}).?)*\s+)or\s+.+?\s*\!\!}(\r?\n)?/s', $this->code) 
                 ) {
                 $this->warnings->push(['or_operator', 'The "or" operator has been removed in favor of ?? as in {{ $var ?? "" }}']);
-            }
-        }
+            }   
+        }       
 
         if (version_compare($laravelVersion, '5.8.13', '>=')) {
             if (preg_match('/\@if\s*\(\s*\$errors->has\s*\(/s', $this->code)) {