Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,30 @@ protected function compilePushIf($expression)
return "<?php if({$parts[0]}): \$__env->startPush({$parts[1]}); ?>";
}

/**
* Compile the else-if push statements into valid PHP.
*
* @param string $expression
* @return string
*/
protected function compileElsePushIf($expression)
{
$parts = explode(',', $this->stripParentheses($expression), 2);

return "<?php \$__env->stopPush(); elseif({$parts[0]}): \$__env->startPush({$parts[1]}); ?>";
}

/**
* Compile the else push statements into valid PHP.
*
* @param string $expression
* @return string
*/
protected function compileElsePush($expression)
{
return "<?php \$__env->stopPush(); else: \$__env->startPush{$expression}; ?>";
}

/**
* Compile the end-push statements into valid PHP.
*
Expand Down
20 changes: 20 additions & 0 deletions tests/View/Blade/BladePushTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,26 @@ public function testPushIfIsCompiled()
@endPushIf';
$expected = '<?php if(true): $__env->startPush( \'foo\'); ?>
test
<?php $__env->stopPush(); endif; ?>';

$this->assertEquals($expected, $this->compiler->compileString($string));
}

public function testPushIfElseIsCompiled()
{
$string = '@pushIf(true, \'stack\')
if
@elsePushIf(false, \'stack\')
elseif
@elsePush(\'stack\')
else
@endPushIf';
$expected = '<?php if(true): $__env->startPush( \'stack\'); ?>
if
<?php $__env->stopPush(); elseif(false): $__env->startPush( \'stack\'); ?>
elseif
<?php $__env->stopPush(); else: $__env->startPush(\'stack\'); ?>
else
<?php $__env->stopPush(); endif; ?>';

$this->assertEquals($expected, $this->compiler->compileString($string));
Expand Down