Merge branch '5.x'

orchestral · Feb 25, 2020 · f64aa69 · f64aa69
2 parents 799532b + a5c71dc
commit f64aa69
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 152 deletions.
diff --git a/.php_cs b/.php_cs
@@ -15,7 +15,6 @@ return PhpCsFixer\Config::create()
                 'no_extra_consecutive_blank_lines' => false,
                 'no_unneeded_control_parentheses' => false,
                 'not_operator_with_successor_space' => true,
-                'no_superfluous_phpdoc_tags' => false,
                 'ordered_imports' => ['sortAlgorithm' => 'alpha'],
                 'phpdoc_align' => false,
                 'phpdoc_no_empty_return' => false,

diff --git a/src/Bootstrap/LoadCurrentTheme.php b/src/Bootstrap/LoadCurrentTheme.php
@@ -9,10 +9,6 @@ class LoadCurrentTheme
 {
     /**
      * Bootstrap the given application.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     *
-     * @return void
      */
     public function bootstrap(Application $app): void
     {
@@ -24,11 +20,6 @@ public function bootstrap(Application $app): void
 
     /**
      * Set current theme for request.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     * @param  \Orchestra\Contracts\Theme\Theme  $theme
-     *
-     * @return void
      */
     protected function setCurrentTheme(Application $app, Theme $theme): void
     {
@@ -51,11 +42,6 @@ protected function setCurrentTheme(Application $app, Theme $theme): void
 
     /**
      * Boot theme resolver.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     * @param  \Orchestra\Contracts\Theme\Theme  $theme
-     *
-     * @return void
      */
     protected function setThemeResolver(Application $app, Theme $theme): void
     {

diff --git a/src/CommandServiceProvider.php b/src/CommandServiceProvider.php
@@ -23,8 +23,6 @@ class CommandServiceProvider extends ServiceProvider
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function registerActivateCommand(): void
     {
@@ -35,8 +33,6 @@ public function registerActivateCommand(): void
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function registerDetectCommand(): void
     {
@@ -47,8 +43,6 @@ public function registerDetectCommand(): void
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function registerOptimizeCommand(): void
     {

diff --git a/src/Console/ActivateCommand.php b/src/Console/ActivateCommand.php
@@ -39,10 +39,7 @@ class ActivateCommand extends Command
     /**
      * Execute the console command.
      *
-     * @param  \Orchestra\View\Theme\Finder  $finder
-     *
      * @return void
-     *
      * @return int
      */
     public function handle(Finder $finder)
@@ -68,13 +65,10 @@ public function handle(Finder $finder)
     /**
      * Validate provided theme.
      *
-     * @param  string  $group
      * @param  string|int  $id
      * @param  object|null  $theme
      *
      * @throws \InvalidArgumentException
-     *
-     * @return bool
      */
     protected function validateProvidedTheme(string $group, $id, $theme): bool
     {
@@ -91,11 +85,6 @@ protected function validateProvidedTheme(string $group, $id, $theme): bool
 
     /**
      * Get all available theme by type.
-     *
-     * @param  \Orchestra\View\Theme\Finder  $finder
-     * @param  string  $type
-     *
-     * @return \Illuminate\Support\Collection
      */
     protected function getAvailableTheme(Finder $finder, string $type): Collection
     {

diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -11,9 +11,6 @@ abstract class Command extends BaseCommand
     /**
      * Execute the console command.
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
-     *
      * @return mixed
      */
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -27,8 +24,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     /**
      * Finish the console command.
-     *
-     * @return void
      */
     protected function finish(): void
     {

diff --git a/src/Console/DetectCommand.php b/src/Console/DetectCommand.php
@@ -24,8 +24,6 @@ class DetectCommand extends Command
     /**
      * Execute the console command.
      *
-     * @param  \Orchestra\View\Theme\Finder  $finder
-     *
      * @return int
      */
     public function handle(Finder $finder)
@@ -52,12 +50,6 @@ public function handle(Finder $finder)
 
     /**
      * Get theme status.
-     *
-     * @param  string  $type
-     * @param  \Orchestra\View\Theme\Manifest  $theme
-     * @param  bool  $active
-     *
-     * @return string
      */
     protected function getThemeStatus(string $type, Manifest $theme, bool $active = false): string
     {

diff --git a/src/Console/OptimizeCommand.php b/src/Console/OptimizeCommand.php
@@ -38,8 +38,6 @@ public function handle()
 
     /**
      * Compile all view files.
-     *
-     * @return void
      */
     protected function compileViews(): void
     {
@@ -50,10 +48,6 @@ protected function compileViews(): void
 
     /**
      * Compile all views files in path.
-     *
-     * @param  string  $path
-     *
-     * @return void
      */
     protected function compileViewsInPath(string $path): void
     {
@@ -72,9 +66,6 @@ protected function compileViewsInPath(string $path): void
      * Compile single view file.
      *
      * @param  mixed  $engine
-     * @param  string  $file
-     *
-     * @return void
      */
     protected function compileSingleViewFile($engine, string $file): void
     {

diff --git a/src/Decorator.php b/src/Decorator.php
@@ -15,11 +15,6 @@ class Decorator
 
     /**
      * Registers a custom macro.
-     *
-     * @param  string  $name
-     * @param  \Closure  $macro
-     *
-     * @return void
      */
     public function macro(string $name, callable $macro): void
     {
@@ -29,7 +24,6 @@ public function macro(string $name, callable $macro): void
     /**
      * Render the macro.
      *
-     * @param  string  $name
      * @param  mixed  $parameters
      *
      * @throws \BadMethodCallException
@@ -48,9 +42,6 @@ public function render(string $name, ...$parameters)
     /**
      * Dynamically handle calls to custom macros.
      *
-     * @param  string  $method
-     * @param  array   $parameters
-     *
      * @return mixed
      */
     public function __call(string $method, array $parameters)

diff --git a/src/Theme/Finder.php b/src/Theme/Finder.php
@@ -24,8 +24,6 @@ class Finder implements FinderContract
 
     /**
      * Construct a new finder.
-     *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
      */
     public function __construct(Filesystem $files, string $publicPath)
     {
@@ -37,8 +35,6 @@ public function __construct(Filesystem $files, string $publicPath)
      * Detect available themes.
      *
      * @throws \RuntimeException
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function detect(): Collection
     {
@@ -53,10 +49,6 @@ public function detect(): Collection
 
     /**
      * Get folder name from full path.
-     *
-     * @param  string   $path
-     *
-     * @return string
      */
     protected function parseThemeNameFromPath(string $path): string
     {

diff --git a/src/Theme/Manifest.php b/src/Theme/Manifest.php
@@ -40,9 +40,6 @@ class Manifest
     /**
      * Load the theme.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
-     * @param  string  $path
-     *
      * @throws \RuntimeException
      */
     public function __construct(Filesystem $files, string $path)
@@ -55,9 +52,7 @@ public function __construct(Filesystem $files, string $path)
 
             if (\is_null($jsonable)) {
                 // json_decode couldn't parse, throw an exception.
-                throw new RuntimeException(
-                    "Theme [{$path}]: cannot decode theme.json file"
-                );
+                throw new RuntimeException("Theme [{$path}]: cannot decode theme.json file");
             }
 
             $this->items = new Fluent($this->generateManifestConfig($jsonable));
@@ -70,7 +65,6 @@ public function __construct(Filesystem $files, string $path)
     /**
      * Get single attribute.
      *
-     * @param  string  $key
      * @param  mixed|null  $default
      *
      * @return mixed
@@ -82,8 +76,6 @@ public function get(string $key, $default = null)
 
     /**
      * Get collection.
-     *
-     * @return \Illuminate\Support\Fluent
      */
     public function items(): Fluent
     {
@@ -95,24 +87,17 @@ public function items(): Fluent
      * would allow other part of the application to use this configuration
      * to migrate, load service provider as well as preload some
      * configuration.
-     *
-     * @param  array  $config
-     *
-     * @return array
      */
     protected function generateManifestConfig(array $config): array
     {
-        return Collection::make($this->manifestOptions)->mapWithKeys(static function ($default, $key) use ($config) {
-            return [$key => ($config[$key] ?? $default)];
-        })->all();
+        return Collection::make($this->manifestOptions)
+            ->mapWithKeys(static function ($default, $key) use ($config) {
+                return [$key => ($config[$key] ?? $default)];
+            })->all();
     }
 
     /**
      * Get theme name from path.
-     *
-     * @param  string  $path
-     *
-     * @return string
      */
     protected function parseThemeNameFromPath(string $path): string
     {
@@ -125,8 +110,6 @@ protected function parseThemeNameFromPath(string $path): string
     /**
      * Magic method to get items by key.
      *
-     * @param  string  $key
-     *
      * @return mixed
      */
     public function __get(string $key)
@@ -136,10 +119,6 @@ public function __get(string $key)
 
     /**
      * Magic Method to check isset by key.
-     *
-     * @param  string  $key
-     *
-     * @return bool
      */
     public function __isset(string $key): bool
     {