@@ -130,7 +130,7 @@ |
||
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | 132 | * Get Compiled Attributes. |
| 133 | - * @return \Webwizo\Shortcodes\Shortcode |
|
| 133 | + * @return Shortcode |
|
| 134 | 134 | */ |
| 135 | 135 | protected function compileShortcode($matches) |
| 136 | 136 | { |
@@ -65,8 +65,9 @@ |
||
| 65 | 65 | public function compile($value) |
| 66 | 66 | { |
| 67 | 67 | // Only continue is laravel-shortcodes have been registered |
| 68 | - if (!$this->enabled || !$this->hasShortcodes()) |
|
| 69 | - return $value; |
|
| 68 | + if (!$this->enabled || !$this->hasShortcodes()) { |
|
| 69 | + return $value; |
|
| 70 | + } |
|
| 70 | 71 | // Set empty result |
| 71 | 72 | $result = ''; |
| 72 | 73 | // Here we will loop through all of the tokens returned by the Zend lexer and |
@@ -352,7 +352,7 @@ |
||
| 352 | 352 | . '\\[\\/\\2\\]' // Closing shortcode tag |
| 353 | 353 | . ')?' |
| 354 | 354 | . ')' |
| 355 | - . '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]] |
|
| 355 | + . '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]] |
|
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | /** |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | /** |
| 93 | 93 | * Get the services provided by the provider. |
| 94 | 94 | * |
| 95 | - * @return array |
|
| 95 | + * @return string[] |
|
| 96 | 96 | */ |
| 97 | 97 | public function provides() |
| 98 | 98 | { |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $state = $this->app['config']->get('laravel-shortcodes::enabled', false); |
| 26 | 26 | |
| 27 | 27 | // enable when needed |
| 28 | - if($state) |
|
| 28 | + if ($state) |
|
| 29 | 29 | $this->app['shortcode.compiler']->enable(); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -25,8 +25,9 @@ |
||
| 25 | 25 | $state = $this->app['config']->get('laravel-shortcodes::enabled', false); |
| 26 | 26 | |
| 27 | 27 | // enable when needed |
| 28 | - if($state) |
|
| 29 | - $this->app['shortcode.compiler']->enable(); |
|
| 28 | + if($state) { |
|
| 29 | + $this->app['shortcode.compiler']->enable(); |
|
| 30 | + } |
|
| 30 | 31 | } |
| 31 | 32 | |
| 32 | 33 | /** |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | * Create a new view instance. |
| 21 | 21 | * |
| 22 | 22 | * @param \Illuminate\View\Factory|Factory $factory |
| 23 | - * @param \Illuminate\View\Compilers\EngineInterface|EngineInterface $engine |
|
| 23 | + * @param EngineInterface $engine |
|
| 24 | 24 | * @param string $view |
| 25 | 25 | * @param string $path |
| 26 | 26 | * @param array $data |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php namespace Webwizo\ShortCodes\View; |
| 2 | 2 | |
| 3 | 3 | use ArrayAccess; |
| 4 | -use Closure; |
|
| 5 | -use Illuminate\Support\MessageBag; |
|
| 6 | 4 | use Illuminate\Contracts\Support\Renderable; |
| 7 | 5 | use Illuminate\View\View as IlluminateView; |
| 8 | 6 | use Illuminate\View\Engines\EngineInterface; |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | |
| 73 | 73 | $contents = $this->getContents(); |
| 74 | 74 | |
| 75 | - if($this->shortcode->isStrip()) |
|
| 75 | + if ($this->shortcode->isStrip()) |
|
| 76 | 76 | { |
| 77 | 77 | // strip content without shortcodes |
| 78 | 78 | $contents = $this->shortcode->strip($contents); |
@@ -76,8 +76,7 @@ |
||
| 76 | 76 | { |
| 77 | 77 | // strip content without shortcodes |
| 78 | 78 | $contents = $this->shortcode->strip($contents); |
| 79 | - } |
|
| 80 | - else |
|
| 79 | + } else |
|
| 81 | 80 | { |
| 82 | 81 | // compile the shortcodes |
| 83 | 82 | $contents = $this->shortcode->compile($contents); |
@@ -42,11 +42,11 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $value = $this->{$attribute}; |
| 44 | 44 | |
| 45 | - if(!is_null($value)) |
|
| 45 | + if (!is_null($value)) |
|
| 46 | 46 | { |
| 47 | 47 | return $attribute . '="' . $value . '"'; |
| 48 | 48 | } |
| 49 | - elseif(!is_null($fallback)) |
|
| 49 | + elseif (!is_null($fallback)) |
|
| 50 | 50 | { |
| 51 | 51 | return $attribute . '="' . $fallback . '"'; |
| 52 | 52 | } |
@@ -45,8 +45,7 @@ |
||
| 45 | 45 | if(!is_null($value)) |
| 46 | 46 | { |
| 47 | 47 | return $attribute . '="' . $value . '"'; |
| 48 | - } |
|
| 49 | - elseif(!is_null($fallback)) |
|
| 48 | + } elseif(!is_null($fallback)) |
|
| 50 | 49 | { |
| 51 | 50 | return $attribute . '="' . $fallback . '"'; |
| 52 | 51 | } |
@@ -40,7 +40,9 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | public function make($view, $data = array(), $mergeData = array()) |
| 42 | 42 | { |
| 43 | - if (isset($this->aliases[$view])) $view = $this->aliases[$view]; |
|
| 43 | + if (isset($this->aliases[$view])) { |
|
| 44 | + $view = $this->aliases[$view]; |
|
| 45 | + } |
|
| 44 | 46 | |
| 45 | 47 | $path = $this->finder->find($view); |
| 46 | 48 | |