@@ -4,9 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Imanghafoori\Widgets\Utils\Normalizers\CacheNormalizer; |
| 6 | 6 | use Imanghafoori\Widgets\Utils\Normalizers\ContextAsNormalizer; |
| 7 | -use Imanghafoori\Widgets\Utils\Normalizers\TemplateNormalizer; |
|
| 8 | -use Imanghafoori\Widgets\Utils\Normalizers\PresenterNormalizer; |
|
| 9 | 7 | use Imanghafoori\Widgets\Utils\Normalizers\ControllerNormalizer; |
| 8 | +use Imanghafoori\Widgets\Utils\Normalizers\PresenterNormalizer; |
|
| 9 | +use Imanghafoori\Widgets\Utils\Normalizers\TemplateNormalizer; |
|
| 10 | 10 | |
| 11 | 11 | class Normalizer |
| 12 | 12 | { |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | $contextAs = 'data'; |
| 61 | 61 | if (property_exists($widget, 'contextAs')) { |
| 62 | 62 | // removes the $ sign. |
| 63 | - $contextAs = str_replace('$', '', (string) $widget->contextAs); |
|
| 63 | + $contextAs = str_replace('$', '', (string)$widget->contextAs); |
|
| 64 | 64 | } |
| 65 | 65 | $widget->contextAs = $contextAs; |
| 66 | 66 | } |
@@ -22,11 +22,11 @@ discard block |
||
| 22 | 22 | public function boot() |
| 23 | 23 | { |
| 24 | 24 | $this->publishes([ |
| 25 | - __DIR__.'/config/config.php' => config_path('widgetize.php'), |
|
| 25 | + __DIR__ . '/config/config.php' => config_path('widgetize.php'), |
|
| 26 | 26 | ]); |
| 27 | 27 | |
| 28 | 28 | $this->_defineDirectives(); |
| 29 | - $this->loadViewsFrom($this->app->basePath().'/app/Widgets/', 'Widgets'); |
|
| 29 | + $this->loadViewsFrom($this->app->basePath() . '/app/Widgets/', 'Widgets'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | $omitParenthesis = version_compare($this->app->version(), '5.3', '<'); |
| 38 | 38 | |
| 39 | - Blade::directive('widget', function ($expression) use ($omitParenthesis) { |
|
| 39 | + Blade::directive('widget', function($expression) use ($omitParenthesis) { |
|
| 40 | 40 | $expression = $omitParenthesis ? $expression : "($expression)"; |
| 41 | 41 | |
| 42 | 42 | return "<?php echo app(\\Imanghafoori\\Widgets\\Utils\\WidgetRenderer::class)->renderWidget{$expression}; ?>"; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function register() |
| 52 | 52 | { |
| 53 | - $this->mergeConfigFrom(__DIR__.'/config/config.php', 'widgetize'); |
|
| 53 | + $this->mergeConfigFrom(__DIR__ . '/config/config.php', 'widgetize'); |
|
| 54 | 54 | $this->commands('command.imanghafoori.widget'); |
| 55 | 55 | $this->_registerSingletons(); |
| 56 | 56 | $this->_registerMacros(); |
@@ -61,11 +61,11 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | private function _registerSingletons() |
| 63 | 63 | { |
| 64 | - $this->app->singleton('command.imanghafoori.widget', function ($app) { |
|
| 64 | + $this->app->singleton('command.imanghafoori.widget', function($app) { |
|
| 65 | 65 | return $app['Imanghafoori\Widgets\WidgetGenerator']; |
| 66 | 66 | }); |
| 67 | 67 | |
| 68 | - $this->app->singleton(Normalizer::class, function () { |
|
| 68 | + $this->app->singleton(Normalizer::class, function() { |
|
| 69 | 69 | $cacheNormalizer = new CacheNormalizer(); |
| 70 | 70 | $tplNormalizer = new TemplateNormalizer(); |
| 71 | 71 | $presenterNormalizer = new PresenterNormalizer(); |
@@ -75,55 +75,55 @@ discard block |
||
| 75 | 75 | return new Utils\Normalizer($tplNormalizer, $cacheNormalizer, $presenterNormalizer, $ctrlNormalizer, $contextAsNormalizer); |
| 76 | 76 | }); |
| 77 | 77 | |
| 78 | - $this->app->singleton(Utils\HtmlMinifier::class, function () { |
|
| 78 | + $this->app->singleton(Utils\HtmlMinifier::class, function() { |
|
| 79 | 79 | return new Utils\HtmlMinifier(); |
| 80 | 80 | }); |
| 81 | 81 | |
| 82 | - $this->app->singleton(Utils\DebugInfo::class, function () { |
|
| 82 | + $this->app->singleton(Utils\DebugInfo::class, function() { |
|
| 83 | 83 | return new Utils\DebugInfo(); |
| 84 | 84 | }); |
| 85 | 85 | |
| 86 | - $this->app->singleton(Utils\Policies::class, function () { |
|
| 86 | + $this->app->singleton(Utils\Policies::class, function() { |
|
| 87 | 87 | return new Utils\Policies(); |
| 88 | 88 | }); |
| 89 | 89 | |
| 90 | - $this->app->singleton(Utils\Cache::class, function () { |
|
| 90 | + $this->app->singleton(Utils\Cache::class, function() { |
|
| 91 | 91 | return new Utils\Cache(); |
| 92 | 92 | }); |
| 93 | 93 | |
| 94 | - $this->app->singleton(Utils\CacheTag::class, function () { |
|
| 94 | + $this->app->singleton(Utils\CacheTag::class, function() { |
|
| 95 | 95 | return new Utils\CacheTag(); |
| 96 | 96 | }); |
| 97 | 97 | |
| 98 | - $this->app->singleton(Utils\WidgetRenderer::class, function () { |
|
| 98 | + $this->app->singleton(Utils\WidgetRenderer::class, function() { |
|
| 99 | 99 | return new Utils\WidgetRenderer(); |
| 100 | 100 | }); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | private function _registerMacros() |
| 104 | 104 | { |
| 105 | - Route::macro('view', function ($url, $view, $name = null) { |
|
| 105 | + Route::macro('view', function($url, $view, $name = null) { |
|
| 106 | 106 | return Route::get($url, [ |
| 107 | 107 | 'as' => $name, |
| 108 | - 'uses' => function () use ($view) { |
|
| 108 | + 'uses' => function() use ($view) { |
|
| 109 | 109 | return view($view); |
| 110 | 110 | }, |
| 111 | 111 | ]); |
| 112 | 112 | }); |
| 113 | 113 | |
| 114 | - Route::macro('widget', function ($url, $widget, $name = null) { |
|
| 114 | + Route::macro('widget', function($url, $widget, $name = null) { |
|
| 115 | 115 | return Route::get($url, [ |
| 116 | 116 | 'as' => $name, |
| 117 | - 'uses' => function (...$args) use ($widget) { |
|
| 117 | + 'uses' => function(...$args) use ($widget) { |
|
| 118 | 118 | return render_widget($widget, $args); |
| 119 | 119 | }, |
| 120 | 120 | ]); |
| 121 | 121 | }); |
| 122 | 122 | |
| 123 | - Route::macro('jsonWidget', function ($url, $widget, $name = null) { |
|
| 123 | + Route::macro('jsonWidget', function($url, $widget, $name = null) { |
|
| 124 | 124 | return Route::get($url, [ |
| 125 | 125 | 'as' => $name, |
| 126 | - 'uses' => function (...$args) use ($widget) { |
|
| 126 | + 'uses' => function(...$args) use ($widget) { |
|
| 127 | 127 | return json_widget($widget, $args); |
| 128 | 128 | }, |
| 129 | 129 | ]); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | - * @param $widget object |
|
| 46 | + * @param string $widget object |
|
| 47 | 47 | * @return \Illuminate\Foundation\Application|mixed |
| 48 | 48 | */ |
| 49 | 49 | private function makeWidgetObj($widget) |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | return app($widget); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $widget = app()->getNamespace().'Widgets\\'.$widget; |
|
| 55 | + $widget = app()->getNamespace() . 'Widgets\\' . $widget; |
|
| 56 | 56 | |
| 57 | 57 | return app($widget); |
| 58 | 58 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | private function generateHtml($widget, ...$args) |
| 69 | 69 | { |
| 70 | 70 | // Everything inside this function is executed only when the cache is not available. |
| 71 | - $expensivePhpCode = function () use ($widget, $args) { |
|
| 71 | + $expensivePhpCode = function() use ($widget, $args) { |
|
| 72 | 72 | $this->makeDataForView($widget, $args); |
| 73 | 73 | |
| 74 | 74 | // render the template with the resulting data. |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | 113 | * Creates the widget class. |
| 114 | - * @return bool |
|
| 114 | + * @return false|null |
|
| 115 | 115 | */ |
| 116 | 116 | private function makeWidgetClass() |
| 117 | 117 | { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | $this->makeWidgetClass(); |
| 38 | 38 | |
| 39 | - if (! $this->option('plain')) { |
|
| 39 | + if (!$this->option('plain')) { |
|
| 40 | 40 | $this->createView(); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | $path = $this->getViewPath(); |
| 52 | 52 | |
| 53 | 53 | if ($this->files->exists($path)) { |
| 54 | - $this->error($this->qualifyClass($this->getNameInput()).'View.blade.php - Already exists! (@_@)'); |
|
| 54 | + $this->error($this->qualifyClass($this->getNameInput()) . 'View.blade.php - Already exists! (@_@)'); |
|
| 55 | 55 | |
| 56 | 56 | return; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $this->files->put($path, $this->getViewStub()); |
| 60 | 60 | |
| 61 | - $this->info(' - '.$this->qualifyClass($this->getNameInput()).'View.blade.php - was created. (^_^)'); |
|
| 61 | + $this->info(' - ' . $this->qualifyClass($this->getNameInput()) . 'View.blade.php - was created. (^_^)'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $stubName = $this->option('plain') ? 'widget_plain' : 'widget'; |
| 72 | 72 | |
| 73 | - return __DIR__."/../stubs/$stubName.stub"; |
|
| 73 | + return __DIR__ . "/../stubs/$stubName.stub"; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | protected function getDefaultNamespace($rootNamespace) |
| 84 | 84 | { |
| 85 | - return $rootNamespace.'\\Widgets'; |
|
| 85 | + return $rootNamespace . '\\Widgets'; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | // to create the class and overwrite the user's code. So, we will bail out so the |
| 124 | 124 | // code is untouched. Otherwise, we will continue generating this class' files. |
| 125 | 125 | if ($this->alreadyExists($this->getNameInput())) { |
| 126 | - $this->error($this->qualifyClass($this->getNameInput()).'.php - Already exists (@_@)'); |
|
| 126 | + $this->error($this->qualifyClass($this->getNameInput()) . '.php - Already exists (@_@)'); |
|
| 127 | 127 | |
| 128 | 128 | return false; |
| 129 | 129 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | $this->files->put($path, $this->buildClass($name)); |
| 137 | 137 | |
| 138 | - $this->info(' - '.$name.'.php - was created. (^_^)'); |
|
| 138 | + $this->info(' - ' . $name . '.php - was created. (^_^)'); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |