[5.3] Fix foreach blade compiler #15485

ElfSundae · 2016-09-17T20:16:31Z

New line in @foreach and @forelse should be allowed:

@foreach([
    'foo'
] as $var)

@endforeach

And this feature is also supported before 5.3

I removed amiss i regex modifier and added s modifier.

ElfSundae · 2016-09-17T21:17:09Z

To fix tests, I bring i back.

themsaid · 2016-09-18T07:17:02Z

Yeah i is indeed necessary as some people write as in lowercase and others in uppercase, thus why we use it.

Can you please write a test to make sure your change solves the issue and that it won't get broken after any later changes?

GrahamCampbell · 2016-09-18T09:04:23Z

Can you please write a test to make sure your change solves the issue and that it won't get broken after any later changes?

Yes, please write a test or two.

ElfSundae · 2016-09-18T10:33:18Z

added

themsaid · 2016-09-18T12:30:21Z

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -624,7 +624,7 @@ protected function compileForelse($expression)
    {
        $empty = '$__empty_'.++$this->forelseCounter;

-        preg_match('/\( *(.*) +as *([^\)]*)/', $expression, $matches);
+        preg_match('/\( *(.*) +as *([^\)]*)/s', $expression, $matches);


Can you please add the i here as well?

ElfSundae added 2 commits September 18, 2016 04:05

Fix compileForeach regex

3c80e52

@foreach support uppercased AS

68520cc

Add multi-line @foreach test

a11f82f

Add multi-line @forelse test

2d640d2

themsaid reviewed Sep 18, 2016

View reviewed changes

@forelse compiler can handle uppercased 'AS'

c4a4b33

taylorotwell merged commit c3e446e into laravel:5.3 Sep 18, 2016

ElfSundae deleted the fix-blade-compiler branch September 19, 2016 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[5.3] Fix foreach blade compiler #15485

[5.3] Fix foreach blade compiler #15485

ElfSundae commented Sep 17, 2016

ElfSundae commented Sep 17, 2016

themsaid commented Sep 18, 2016 •

edited

Loading

GrahamCampbell commented Sep 18, 2016 •

edited by themsaid

Loading

ElfSundae commented Sep 18, 2016

themsaid Sep 18, 2016

ElfSundae Sep 18, 2016

[5.3] Fix foreach blade compiler #15485

[5.3] Fix foreach blade compiler #15485

Conversation

ElfSundae commented Sep 17, 2016

ElfSundae commented Sep 17, 2016

themsaid commented Sep 18, 2016 • edited Loading

GrahamCampbell commented Sep 18, 2016 • edited by themsaid Loading

ElfSundae commented Sep 18, 2016

themsaid Sep 18, 2016

Choose a reason for hiding this comment

ElfSundae Sep 18, 2016

Choose a reason for hiding this comment

themsaid commented Sep 18, 2016 •

edited

Loading

GrahamCampbell commented Sep 18, 2016 •

edited by themsaid

Loading