Merge branch '5.x'

orchestral · Feb 25, 2020 · de7d0f1 · de7d0f1
2 parents d1e781e + 5b0fd84
commit de7d0f1
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 109 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/Asset.php b/src/Asset.php
@@ -36,9 +36,6 @@ class Asset implements Htmlable
 
     /**
      * Create a new asset container instance.
-     *
-     * @param  string  $name
-     * @param  \Orchestra\Asset\Dispatcher  $dispatcher
      */
     public function __construct(string $name, Dispatcher $dispatcher)
     {
@@ -73,8 +70,6 @@ final public function removeVersioning(): self
     /**
      * Set the asset container path prefix.
      *
-     * @param  string|null  $path
-     *
      * @return $this
      */
     public function prefix(?string $path = null)
@@ -103,7 +98,6 @@ public function prefix(?string $path = null)
      * </code>
      *
      * @param  string|array  $name
-     * @param  string  $source
      * @param  string|array  $dependencies
      * @param  string|array  $attributes
      * @param  string|array  $replaces
@@ -126,7 +120,6 @@ public function add(
      * Add a CSS file to the registered assets.
      *
      * @param  string|array  $name
-     * @param  string  $source
      * @param  string|array  $dependencies
      * @param  string|array  $attributes
      * @param  string|array  $replaces
@@ -153,7 +146,6 @@ public function style(
      * Add a JavaScript file to the registered assets.
      *
      * @param  string|array  $name
-     * @param  string  $source
      * @param  string|array  $dependencies
      * @param  string|array  $attributes
      * @param  string|array  $replaces
@@ -175,14 +167,10 @@ public function script(
     /**
      * Add an asset to the array of registered assets.
      *
-     * @param  string  $type
      * @param  string|array  $name
-     * @param  string  $source
      * @param  string|array  $dependencies
      * @param  string|array  $attributes
      * @param  string|array  $replaces
-     *
-     * @return void
      */
     protected function register(
         string $type,
@@ -211,8 +199,6 @@ protected function register(
 
     /**
      * Get the links to all of the registered CSS assets.
-     *
-     * @return string
      */
     public function styles(): string
     {
@@ -221,8 +207,6 @@ public function styles(): string
 
     /**
      * Get the links to all of the registered JavaScript assets.
-     *
-     * @return string
      */
     public function scripts(): string
     {
@@ -231,8 +215,6 @@ public function scripts(): string
 
     /**
      * Get the links to all the registered CSS and JavaScript assets.
-     *
-     * @return string
      */
     public function show(): string
     {
@@ -241,8 +223,6 @@ public function show(): string
 
     /**
      * Get content as a string of HTML.
-     *
-     * @return string
      */
     public function toHtml(): string
     {
@@ -251,10 +231,6 @@ public function toHtml(): string
 
     /**
      * Get all of the registered assets for a given type / group.
-     *
-     * @param  string  $group
-     *
-     * @return string
      */
     protected function group(string $group): string
     {

diff --git a/src/AssetServiceProvider.php b/src/AssetServiceProvider.php
@@ -24,8 +24,6 @@ public function register()
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     protected function registerAsset(): void
     {
@@ -36,8 +34,6 @@ protected function registerAsset(): void
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     protected function registerDispatcher(): void
     {
@@ -53,8 +49,6 @@ protected function registerDispatcher(): void
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     protected function registerResolver(): void
     {

diff --git a/src/DependencyResolver.php b/src/DependencyResolver.php
@@ -8,10 +8,6 @@ class DependencyResolver
 {
     /**
      * Sort and retrieve assets based on their dependencies.
-     *
-     * @param  array  $assets
-     *
-     * @return array
      */
     public function arrange(array $assets): array
     {
@@ -30,14 +26,6 @@ public function arrange(array $assets): array
 
     /**
      * Evaluate an asset and its dependencies.
-     *
-     * @param  string  $asset
-     * @param  array  $value
-     * @param  array  $original
-     * @param  array  $sorted
-     * @param  array  $assets
-     *
-     * @return void
      */
     protected function evaluateAsset(
         string $asset,
@@ -61,13 +49,6 @@ protected function evaluateAsset(
 
     /**
      * Evaluate an asset with dependencies.
-     *
-     * @param  string  $asset
-     * @param  array   $original
-     * @param  array   $sorted
-     * @param  array   $assets
-     *
-     * @return void
      */
     protected function evaluateAssetWithDependencies(
         string $asset,
@@ -100,14 +81,7 @@ protected function evaluateAssetWithDependencies(
      * dependency doesn't exist, no error or warning will be given. For the
      * other cases, an exception is thrown.
      *
-     * @param  string  $asset
-     * @param  string  $dependency
-     * @param  array   $original
-     * @param  array   $assets
-     *
      * @throws \RuntimeException
-     *
-     * @return bool
      */
     protected function dependencyIsValid(
         string $asset,
@@ -133,10 +107,6 @@ protected function dependencyIsValid(
 
     /**
      * Replace asset dependencies.
-     *
-     * @param  array  $assets
-     *
-     * @return void
      */
     protected function replaceAssetDependencies(array &$assets): void
     {
@@ -155,12 +125,6 @@ protected function replaceAssetDependencies(array &$assets): void
 
     /**
      * Resolve asset dependencies after replacement.
-     *
-     * @param  array   $assets
-     * @param  string  $asset
-     * @param  array   $replaces
-     *
-     * @return void
      */
     protected function resolveDependenciesForAsset(
         array &$assets,

diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -45,11 +45,6 @@ class Dispatcher
 
     /**
      * Create a new asset dispatcher instance.
-     *
-     * @param \Illuminate\Filesystem\Filesystem  $files
-     * @param \Collective\Html\HtmlBuilder  $html
-     * @param \Orchestra\Asset\DependencyResolver  $resolver
-     * @param string  $path
      */
     public function __construct(
         Filesystem $files,
@@ -65,8 +60,6 @@ public function __construct(
 
     /**
      * Enable asset versioning.
-     *
-     * @return void
      */
     public function addVersioning(): void
     {
@@ -75,8 +68,6 @@ public function addVersioning(): void
 
     /**
      * Disable asset versioning.
-     *
-     * @return void
      */
     public function removeVersioning(): void
     {
@@ -85,12 +76,6 @@ public function removeVersioning(): void
 
     /**
      * Dispatch assets by group.
-     *
-     * @param  string  $group
-     * @param  array  $assets
-     * @param  string|null  $prefix
-     *
-     * @return string
      */
     public function run(string $group, array $assets = [], ?string $prefix = null): string
     {
@@ -111,11 +96,6 @@ public function run(string $group, array $assets = [], ?string $prefix = null):
 
     /**
      * Get the HTML link to a registered asset.
-     *
-     * @param  string  $group
-     * @param  array|null  $asset
-     *
-     * @return string
      */
     public function asset(string $group, ?array $asset = null): string
     {
@@ -132,10 +112,6 @@ public function asset(string $group, ?array $asset = null): string
 
     /**
      * Determine if path is local.
-     *
-     * @param  string  $path
-     *
-     * @return bool
      */
     protected function isLocalPath(string $path): bool
     {
@@ -148,10 +124,6 @@ protected function isLocalPath(string $path): bool
 
     /**
      * Get asset source URL.
-     *
-     * @param  string  $source
-     *
-     * @return string
      */
     protected function getAssetSourceUrl(string $source): string
     {
@@ -167,11 +139,6 @@ protected function getAssetSourceUrl(string $source): string
 
     /**
      * Get asset source URL with Modified time.
-     *
-     * @param  string  $source
-     * @param  string  $file
-     *
-     * @return string
      */
     protected function getAssetSourceUrlWithModifiedTime(string $source, string $file): string
     {

diff --git a/src/Factory.php b/src/Factory.php
@@ -24,8 +24,6 @@ class Factory
 
     /**
      * Construct a new environment.
-     *
-     * @param  \Orchestra\Asset\Dispatcher  $dispatcher
      */
     public function __construct(Dispatcher $dispatcher)
     {
@@ -42,10 +40,6 @@ public function __construct(Dispatcher $dispatcher)
      *     // Get a named asset container
      *     $container = Orchestra\Asset::container('footer');
      * </code>
-     *
-     * @param  string  $container
-     *
-     * @return \Orchestra\Asset\Asset
      */
     public function container(string $container = 'default'): Asset
     {
@@ -67,9 +61,6 @@ public function container(string $container = 'default'): Asset
      *     Orchestra\Asset::add('jquery', 'js/jquery.js');
      * </code>
      *
-     * @param  string  $method
-     * @param  array   $parameters
-     *
      * @return mixed
      */
     public function __call(string $method, array $parameters)