@@ -133,7 +133,7 @@ |
||
| 133 | 133 | |
| 134 | 134 | foreach($path as $step) |
| 135 | 135 | { |
| 136 | - $loc = &$loc[$step]; |
|
| 136 | + $loc = &$loc[$step]; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | return $loc = $val; |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | |
| 132 | 132 | array_pop($path); |
| 133 | 133 | |
| 134 | - foreach($path as $step) |
|
| 134 | + foreach ($path as $step) |
|
| 135 | 135 | { |
| 136 | 136 | $loc = &$loc[$step]; |
| 137 | 137 | } |
@@ -28,8 +28,7 @@ |
||
| 28 | 28 | { |
| 29 | 29 | if (str_contains($subset, '.')) { |
| 30 | 30 | $this->addCascadeSubset($subset, $closure); |
| 31 | - } |
|
| 32 | - else { |
|
| 31 | + } else { |
|
| 33 | 32 | $this->addSimpleSubset($subset, $closure); |
| 34 | 33 | } |
| 35 | 34 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | 40 | * [render description] |
| 41 | - * @return json |
|
| 41 | + * @return string |
|
| 42 | 42 | */ |
| 43 | 43 | public function render() |
| 44 | 44 | { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | /** |
| 107 | 107 | * [callFunc description] |
| 108 | 108 | * @param \Closure $closure |
| 109 | - * @param \EnergieProduction\Subsets\* $class |
|
| 109 | + * @param Subsets\Subset $class |
|
| 110 | 110 | */ |
| 111 | 111 | protected function callFunc(Closure $closure, $class) |
| 112 | 112 | { |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | use Illuminate\Support\Collection; |
| 6 | 6 | use Illuminate\Support\ServiceProvider; |
| 7 | 7 | |
| 8 | -class ChartServiceProvider extends ServiceProvider{ |
|
| 8 | +class ChartServiceProvider extends ServiceProvider { |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Indicates if loading of the provider is deferred. |
@@ -7,27 +7,27 @@ |
||
| 7 | 7 | |
| 8 | 8 | class ChartServiceProvider extends ServiceProvider{ |
| 9 | 9 | |
| 10 | - /** |
|
| 11 | - * Indicates if loading of the provider is deferred. |
|
| 12 | - * |
|
| 13 | - * @var bool |
|
| 14 | - */ |
|
| 15 | - protected $defer = false; |
|
| 16 | - |
|
| 17 | - public function boot() |
|
| 18 | - { |
|
| 19 | - // |
|
| 20 | - } |
|
| 21 | - |
|
| 22 | - public function register() |
|
| 23 | - { |
|
| 24 | - $this->app->bind('chart', function($app) { |
|
| 25 | - |
|
| 26 | - $collection = new Collection; |
|
| 27 | - |
|
| 28 | - return new Chart($collection); |
|
| 29 | - }); |
|
| 30 | - } |
|
| 10 | + /** |
|
| 11 | + * Indicates if loading of the provider is deferred. |
|
| 12 | + * |
|
| 13 | + * @var bool |
|
| 14 | + */ |
|
| 15 | + protected $defer = false; |
|
| 16 | + |
|
| 17 | + public function boot() |
|
| 18 | + { |
|
| 19 | + // |
|
| 20 | + } |
|
| 21 | + |
|
| 22 | + public function register() |
|
| 23 | + { |
|
| 24 | + $this->app->bind('chart', function($app) { |
|
| 25 | + |
|
| 26 | + $collection = new Collection; |
|
| 27 | + |
|
| 28 | + return new Chart($collection); |
|
| 29 | + }); |
|
| 30 | + } |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -13,9 +13,9 @@ discard block |
||
| 13 | 13 | protected $criteriaList; |
| 14 | 14 | public $cascade = null; |
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * [__construct description] |
|
| 18 | - */ |
|
| 16 | + /** |
|
| 17 | + * [__construct description] |
|
| 18 | + */ |
|
| 19 | 19 | public function __construct() |
| 20 | 20 | { |
| 21 | 21 | $this->criteriaList = collect(); |
@@ -51,10 +51,10 @@ discard block |
||
| 51 | 51 | return $render->handle($this->resolveKey(), $formatedSubset); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * [setCascade description] |
|
| 56 | - * @param string $cascade |
|
| 57 | - */ |
|
| 54 | + /** |
|
| 55 | + * [setCascade description] |
|
| 56 | + * @param string $cascade |
|
| 57 | + */ |
|
| 58 | 58 | public function setCascade($cascade) |
| 59 | 59 | { |
| 60 | 60 | $this->cascade = $cascade; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | class Render implements rendered { |
| 6 | 6 | |
| 7 | - public function handle($key, $content) |
|
| 8 | - { |
|
| 9 | - return [$key => $content]; |
|
| 10 | - } |
|
| 7 | + public function handle($key, $content) |
|
| 8 | + { |
|
| 9 | + return [$key => $content]; |
|
| 10 | + } |
|
| 11 | 11 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface Rendered { |
| 6 | 6 | |
| 7 | - public function handle($key, $content); |
|
| 7 | + public function handle($key, $content); |
|
| 8 | 8 | |
| 9 | 9 | } |
| 10 | 10 | \ No newline at end of file |
@@ -10,13 +10,13 @@ |
||
| 10 | 10 | * [__construct description] |
| 11 | 11 | * @param \EnergieProduction\Chart\Rendered\Rendered $render |
| 12 | 12 | */ |
| 13 | - public function __construct(Rendered $render) |
|
| 14 | - { |
|
| 15 | - $this->render = $render; |
|
| 16 | - } |
|
| 13 | + public function __construct(Rendered $render) |
|
| 14 | + { |
|
| 15 | + $this->render = $render; |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | - public function handle($key, $content) |
|
| 19 | - { |
|
| 20 | - return $this->render->handle($key, $content); |
|
| 21 | - } |
|
| 18 | + public function handle($key, $content) |
|
| 19 | + { |
|
| 20 | + return $this->render->handle($key, $content); |
|
| 21 | + } |
|
| 22 | 22 | } |
@@ -4,34 +4,34 @@ |
||
| 4 | 4 | |
| 5 | 5 | class Subset implements Rendered { |
| 6 | 6 | |
| 7 | - protected $render; |
|
| 8 | - protected $cascade = null; |
|
| 7 | + protected $render; |
|
| 8 | + protected $cascade = null; |
|
| 9 | 9 | |
| 10 | - /** |
|
| 11 | - * [__construct description] |
|
| 12 | - * @param \EnergieProduction\Chart\Rendered\Rendered $render |
|
| 13 | - */ |
|
| 14 | - public function __construct(Rendered $render) |
|
| 15 | - { |
|
| 16 | - $this->render = $render; |
|
| 17 | - } |
|
| 10 | + /** |
|
| 11 | + * [__construct description] |
|
| 12 | + * @param \EnergieProduction\Chart\Rendered\Rendered $render |
|
| 13 | + */ |
|
| 14 | + public function __construct(Rendered $render) |
|
| 15 | + { |
|
| 16 | + $this->render = $render; |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * [setCascade description] |
|
| 21 | - * @param string |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function setCascade($cascade = null) |
|
| 25 | - { |
|
| 26 | - $this->cascade = $cascade; |
|
| 27 | - } |
|
| 19 | + /** |
|
| 20 | + * [setCascade description] |
|
| 21 | + * @param string |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function setCascade($cascade = null) |
|
| 25 | + { |
|
| 26 | + $this->cascade = $cascade; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - public function handle($key, $content) |
|
| 30 | - { |
|
| 31 | - if ($key == 'series' && (! $this->cascade || starts_with($this->cascade, 'series.'))) { |
|
| 32 | - $content = [$content]; |
|
| 33 | - } |
|
| 29 | + public function handle($key, $content) |
|
| 30 | + { |
|
| 31 | + if ($key == 'series' && (! $this->cascade || starts_with($this->cascade, 'series.'))) { |
|
| 32 | + $content = [$content]; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - return $this->render->handle($key, $content); |
|
| 36 | - } |
|
| 35 | + return $this->render->handle($key, $content); |
|
| 36 | + } |
|
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | public function handle($key, $content) |
| 30 | 30 | { |
| 31 | - if ($key == 'series' && (! $this->cascade || starts_with($this->cascade, 'series.'))) { |
|
| 31 | + if ($key == 'series' && (!$this->cascade || starts_with($this->cascade, 'series.'))) { |
|
| 32 | 32 | $content = [$content]; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -10,13 +10,13 @@ |
||
| 10 | 10 | * [__construct description] |
| 11 | 11 | * @param \EnergieProduction\Chart\Rendered\Rendered $render |
| 12 | 12 | */ |
| 13 | - public function __construct(Rendered $render) |
|
| 14 | - { |
|
| 15 | - $this->render = $render; |
|
| 16 | - } |
|
| 13 | + public function __construct(Rendered $render) |
|
| 14 | + { |
|
| 15 | + $this->render = $render; |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | - public function handle($key, $content) |
|
| 19 | - { |
|
| 20 | - return $this->render->handle($key, "#!!" . $content . "!!#"); |
|
| 21 | - } |
|
| 18 | + public function handle($key, $content) |
|
| 19 | + { |
|
| 20 | + return $this->render->handle($key, "#!!" . $content . "!!#"); |
|
| 21 | + } |
|
| 22 | 22 | } |
@@ -8,33 +8,33 @@ |
||
| 8 | 8 | |
| 9 | 9 | abstract class Builder implements Criteria { |
| 10 | 10 | |
| 11 | - use Traits\BuilderService; |
|
| 12 | - |
|
| 13 | - protected $content; |
|
| 14 | - |
|
| 15 | - /** |
|
| 16 | - * [__construct description] |
|
| 17 | - * @param mixed $content |
|
| 18 | - */ |
|
| 19 | - public function __construct($content) |
|
| 20 | - { |
|
| 21 | - $this->content = $content; |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - /** |
|
| 25 | - * [render description] |
|
| 26 | - * @return array |
|
| 27 | - */ |
|
| 28 | - public function render() |
|
| 29 | - { |
|
| 30 | - $render = new Rendered\Render(); |
|
| 31 | - $render = new Rendered\Criteria($render); |
|
| 32 | - |
|
| 33 | - if ($this->content instanceof Expression) { |
|
| 34 | - $this->content = $this->content->render(); |
|
| 35 | - $render = new Rendered\Expression($render); |
|
| 36 | - } |
|
| 37 | - |
|
| 38 | - return $render->handle($this->resolveKey(), $this->content); |
|
| 39 | - } |
|
| 11 | + use Traits\BuilderService; |
|
| 12 | + |
|
| 13 | + protected $content; |
|
| 14 | + |
|
| 15 | + /** |
|
| 16 | + * [__construct description] |
|
| 17 | + * @param mixed $content |
|
| 18 | + */ |
|
| 19 | + public function __construct($content) |
|
| 20 | + { |
|
| 21 | + $this->content = $content; |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + /** |
|
| 25 | + * [render description] |
|
| 26 | + * @return array |
|
| 27 | + */ |
|
| 28 | + public function render() |
|
| 29 | + { |
|
| 30 | + $render = new Rendered\Render(); |
|
| 31 | + $render = new Rendered\Criteria($render); |
|
| 32 | + |
|
| 33 | + if ($this->content instanceof Expression) { |
|
| 34 | + $this->content = $this->content->render(); |
|
| 35 | + $render = new Rendered\Expression($render); |
|
| 36 | + } |
|
| 37 | + |
|
| 38 | + return $render->handle($this->resolveKey(), $this->content); |
|
| 39 | + } |
|
| 40 | 40 | } |