Skip to content

Commit

Permalink
[5.4] Move a property into its designated trait and improve docs (#17538
Browse files Browse the repository at this point in the history
)

* Move forElsecounter into its desinated trait

* Improve view compiler docs uniformity
  • Loading branch information
Ingramz authored and taylorotwell committed Jan 25, 2017
1 parent e68c3d8 commit 1c32b19
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
7 changes: 0 additions & 7 deletions src/Illuminate/View/Compilers/BladeCompiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ class BladeCompiler extends Compiler implements CompilerInterface
*/
protected $verbatimBlocks = [];

/**
* Counter to keep track of nested forelse statements.
*
* @var int
*/
protected $forElseCounter = 0;

/**
* Compile the view at the given path.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected function compileElsecan($expression)
}

/**
* Compile the else-can statements into valid PHP.
* Compile the else-cannot statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/View/Compilers/Concerns/CompilesComponents.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected function compileComponent($expression)
}

/**
* Compile the end component statements into valid PHP.
* Compile the end-component statements into valid PHP.
*
* @param string $expression
* @return string
Expand All @@ -38,7 +38,7 @@ protected function compileSlot($expression)
}

/**
* Compile the end slot statements into valid PHP.
* Compile the end-slot statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
trait CompilesConditionals
{
/**
* Compile the has section statements into valid PHP.
* Compile the has-section statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down Expand Up @@ -71,7 +71,7 @@ protected function compileEndif($expression)
}

/**
* Compile the end unless statements into valid PHP.
* Compile the end-unless statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ protected function compileInclude($expression)
}

/**
* Compile the include statements into valid PHP.
* Compile the include-if statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
13 changes: 10 additions & 3 deletions src/Illuminate/View/Compilers/Concerns/CompilesLoops.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@
trait CompilesLoops
{
/**
* Compile the forelse statements into valid PHP.
* Counter to keep track of nested forelse statements.
*
* @var int
*/
protected $forElseCounter = 0;

/**
* Compile the for-else statements into valid PHP.
*
* @param string $expression
* @return string
Expand All @@ -28,7 +35,7 @@ protected function compileForelse($expression)
}

/**
* Compile the forelse statements into valid PHP.
* Compile the for-else-empty statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down Expand Up @@ -63,7 +70,7 @@ protected function compileFor($expression)
}

/**
* Compile the foreach statements into valid PHP.
* Compile the for-each statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/Compilers/Concerns/CompilesRawPhp.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected function compilePhp($expression)
}

/**
* Compile end-php statement into valid PHP.
* Compile end-php statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/Compilers/Concerns/CompilesStacks.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected function compilePush($expression)
}

/**
* Compile the endpush statements into valid PHP.
* Compile the end-push statements into valid PHP.
*
* @param string $expression
* @return string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected function compileLang($expression)
}

/**
* Compile the endlang statements into valid PHP.
* Compile the end-lang statements into valid PHP.
*
* @return string
*/
Expand Down

0 comments on commit 1c32b19

Please sign in to comment.