供应商需求20230516

app/Http/Services/SkuService.php

@@ -106,10 +106,14 @@ class SkuService
                 $goodsTag = $redis->hget('goods_tag', $item['goods_id']);
                 $goodsTag = $goodsTag ? json_decode($goodsTag, true) : '';
                 $item['sku_tags'] = $goodsTag ? array_get($goodsTag, 'customer_tag') : '';
-                $item['source_name'] = '';
-                if (!empty($item['source'])) {
-                    $item['source_name'] = array_get(config('field.SkuSource'), $item['source'], '');
-                }
+                //去db找出相关数据,有些数据只能去db找....
+                $dbInfo = getSpuSkuDb($item['goods_id']);
+                $connection = DB::connection($dbInfo["db"]);
+                $table = $dbInfo['table'];
+                $selectFields = ['goods_id', 'create_time', 'eccn', 'source', 'encoded'];
+                $skuDBData = $connection->table($table)->select($selectFields)->where('goods_id', $item['goods_id'])->first();
+                $skuDBData = $skuDBData ? $skuDBData : [];
+                $item['source_name'] = array_get(config('field.SkuSource'), $skuDBData['source'], '');
                 return $item;
             }, $list);
             $list = $this->transformInvalidSkuTag($list);
@@ -280,14 +284,14 @@ class SkuService
     //获取第一次上传sku时间和最后一次上传sku时间
     public static function getUploadTimeBySupplierCodes($supplierCodes = [], $type = 'first')
     {
-        $supplierCodesTemp = array_map(function ($value){
+        $supplierCodesTemp = array_map(function ($value) {
             return "'" . $value . "'";
         }, $supplierCodes);
         $supplierCodeInSql = implode(',', $supplierCodesTemp);
         if ($type == 'last') {
-            $rawSql = 'SELECT supplier_code,create_time FROM (SELECT supplier_code,max(create_time) AS create_time FROM lie_sku_upload_log GROUP BY supplier_code) AS temp WHERE supplier_code IN ('.$supplierCodeInSql.')';
+            $rawSql = 'SELECT supplier_code,create_time FROM (SELECT supplier_code,max(create_time) AS create_time FROM lie_sku_upload_log GROUP BY supplier_code) AS temp WHERE supplier_code IN (' . $supplierCodeInSql . ')';
         } else {
-            $rawSql = 'SELECT supplier_code,create_time FROM (SELECT supplier_code,min(create_time) AS create_time FROM lie_sku_upload_log GROUP BY supplier_code) AS temp WHERE supplier_code IN ('.$supplierCodeInSql.')';
+            $rawSql = 'SELECT supplier_code,create_time FROM (SELECT supplier_code,min(create_time) AS create_time FROM lie_sku_upload_log GROUP BY supplier_code) AS temp WHERE supplier_code IN (' . $supplierCodeInSql . ')';
         }
         $data = DB::connection('spu')
             ->select($rawSql);

app/Http/Services/SupplierService.php

@@ -447,11 +447,25 @@ class SupplierService
     {
         $yunxinChannelUserName = (new AdminUserService())->getAdminUserNameByCodeId($yunxinChannelUid);
         $logService = new LogService();
+        $redis = new RedisModel();
         foreach ($supplierIds as $supplierId) {
             $preYunxinChannelUid = SupplierChannelModel::where('supplier_id', $supplierId)->value('yunxin_channel_uid');
             SupplierChannelModel::where('supplier_id', $supplierId)->update([
                 'yunxin_channel_uid' => $yunxinChannelUid
             ]);
+            $supplier = SupplierChannelModel::where('supplier_id', $supplierId)->first()->toArray();
+            //还要丢队列给批量修改sku的内部编码
+            $redisKey = 'lie_supplier_change_yunxin_user_' . $supplierId;
+            if ($redis->get($redisKey)) {
+                $data = [
+                    'canal' => $supplier['supplier_code'],
+                    "encoded" => $yunxinChannelUid,
+                ];
+                //改成队列
+                (new SkuService())->batchUpdateEncodedQueue($data);
+                $redis->set($redisKey, 1);
+                $redis->expire($redisKey, 60 * 60 * 3);
+            }
             $preYunxinChannelUserName = (new AdminUserService())->getAdminUserNameByCodeId($preYunxinChannelUid);
             $content = "将SKU采购员由 [${preYunxinChannelUserName}] 改为 [${yunxinChannelUserName}]";
             $logService->AddIgnoreAuditCheckLog($supplierId, LogModel::UPDATE_OPERATE, '分配渠道开发员', $content);

app/Http/Validators/SupplierAttachmentValidator.php

@@ -30,9 +30,9 @@ class SupplierAttachmentValidator
         $supplierGroup = SupplierChannelModel::where('supplier_id', $attachment['supplier_id'])
             ->value('supplier_group');
 
-        //供应商为混合分销的时候,代理证的有效期必填
+        //供应商为混合分销商的时候,代理证的有效期必填
         if ($supplierGroup == SupplierChannelModel::SUPPLIER_GROUP_MIX && !$attachment['validity_period']) {
-            return '供应商为混合分销的时候,代理证的必须为自定义且必填';
+            return '供应商为混合分销商的时候,代理证的必须为自定义且必填';
         }
 
         if ($validator->fails()) {

app/Http/Validators/SupplierValidator.php

@@ -150,7 +150,7 @@ class SupplierValidator
         if (empty($validateData['supplier_type'])) {
             return '请选择供应商类型';
         }
-        if ($validateData['supplier_type'] == 2 && in_array($validateData['supplier_name'],
+        if ($validateData['supplier_type'] == SupplierChannelModel::SUPPLIER_TYPE_TEMPORARY && in_array($validateData['supplier_name'],
                 config('field.SkipChangeSupplierTypeNames'))) {
             $errorMessageList[] = '该供应商是代购供应商,不能修改为临时供应商';
         }
@@ -162,10 +162,10 @@ class SupplierValidator
             $attachmentFields = array_unique(array_get($validateData, 'field_name', []));
             $attachmentPeriods = array_unique(array_get($validateData, 'validity_period', []));
 
-            //这里的校验是当供应商性质为7(混合分销)的时候,代理证的有效期不能为空
+            //这里的校验是当供应商性质为7(混合分销商)的时候,代理证的有效期不能为空
             foreach ($attachmentFields as $key => $attachmentField) {
                 if ($attachmentField == 'proxy_certificate' && empty($attachmentPeriods[$key])) {
-                    $errorMessageList[] = '供应商性质为混合分销时,附件中代理证的有效期为必填,请检查对应代理证的附件有效期';
+                    $errorMessageList[] = '供应商性质为混合分销商时,附件中代理证的有效期为必填,请检查对应代理证的附件有效期';
                 }
             }
 
@@ -205,10 +205,10 @@ class SupplierValidator
 
             if ($validateData['supplier_group'] == SupplierChannelModel::SUPPLIER_GROUP_MIX) {
                 if (!in_array('proxy_certificate', $attachmentFields)) {
-                    $errorMessageList[] = '供应商性质为混合分销,代理证必须上传';
+                    $errorMessageList[] = '供应商性质为混合分销商,代理证必须上传';
                 }
-                if (!in_array('quality_assurance_agreement', $attachmentFields)) {
-                    $errorMessageList[] = '供应商性质为混合分销,品质保证协议必须上传';
+                if (!in_array('quality_assurance_agreement', $attachmentFields) && $validateData['supplier_type'] == SupplierChannelModel::SUPPLIER_TYPE_OFFICIAL) {
+                    $errorMessageList[] = '供应商性质为混合分销商并且供应商类型为正式时,品质保证协议必须上传';
                 }
                 //还有代理证的有效期为必填
                 if (!in_array('proxy_certificate', $attachmentFields)) {

app/Http/function.php

@@ -278,3 +278,26 @@ function exportCsv($data, $filename, $column)
     }
     exit();
 }
+
+/*
+ * 解析SPU和SKU的ID
+ * @$id  sku 或者 spu id
+ * @return  array   db 数据库，table 表名
+ */
+function getSpuSkuDb($id)
+{
+    $data['db'] = 'sku_0';
+    $data['table'] = 'lie_sku_0';
+    $type = substr($id, 0, 1);
+    $dbcode = substr($id, -2, 1);
+    $tablecode = substr($id, -1);
+    if ($type == 1) {
+        $data['db'] = 'sku_' . $dbcode;
+        $data['table'] = 'sku_' . $tablecode;
+    }
+    if ($type == 2) {
+        $data['db'] = 'spu';
+        $data['table'] = 'spu_' . $tablecode;
+    }
+    return $data;
+}
\ No newline at end of file

app/Model/SupplierChannelModel.php

@@ -36,7 +36,7 @@ class SupplierChannelModel extends Model
     //供应商类型
     const SUPPLIER_GROUP_ORIGINAL = 1; //原厂
     const SUPPLIER_GROUP_PROXY = 4; //代理
-    const SUPPLIER_GROUP_MIX = 7; //混合分销
+    const SUPPLIER_GROUP_MIX = 7; //混合分销商
 
     //供应商地区
     const REGION_CN = 2; //国内

config/database.php

@@ -224,6 +224,126 @@ return [
             'strict' => false,
         ],
 
+        'sku_0' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_0',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_1' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_1',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_2' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_2',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_3' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_3',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_4' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_4',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_5' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_5',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_6' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_6',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_7' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_7',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_8' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_8',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
+        'sku_9' => [
+            'driver' => 'mysql',
+            'host' => env('DB_SPU_HOST', ''),
+            'database' => 'liexin_sku_9',
+            'username' => env('DB_SPU_USERNAME', ''),
+            'password' => env('DB_SPU_PASSWORD', ''),
+            'port' => env('DB_SPU_PORT', 3306),
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => 'lie_',
+            'strict' => false,
+        ],
         'rabbitmq' => [
             'driver' => 'rabbitmq',
             'host' => env('RABBITMQ_HOST', '127.0.0.1'),

config/fixed.php

@@ -21,7 +21,7 @@ return [
         2 => '现货商',
         4 => '原厂',
         1 => '代理商',
-        7 => '混合分销',
+        7 => '混合分销商',
         5 => '分销平台',
         3 => '方案商',
         6 => '代工厂',

resources/views/script/SkuListScript.blade.php

@@ -105,7 +105,7 @@
                 }
             },
             {
-                field: ' source_name', title: '接入方式', align: 'center', width: 150
+                field: 'source_name', title: '接入方式', align: 'center', width: 150
             },
             {field: 'audit_user', title: '审核人', align: 'center', width: 100},
             {field: 'update_time', title: '更新时间', align: 'center', width: 150},

resources/views/script/supplier/SupplierBaseScript.blade.php

@@ -163,7 +163,7 @@
             }
         });
 
-        //监听供应商性质选择,如果为混合分销,那么要展示混合分销品牌设置
+        //监听供应商性质选择,如果为混合分销商,那么要展示混合分销商品牌设置
         form.on('select(supplier_group)', function (data) {
             if (data.value === '7') {
                 $('#agency_brands_div').show();

resources/views/script/supplier/SupplierFileScript.blade.php

@@ -84,7 +84,7 @@
                     fileTemplateObj.find('#validity_period').removeClass('layui-input validity_period layui-disabled');
                     fileTemplateObj.find('#validity_period').prop('disabled', false);
                     form.render();
-                    //如果是混合分销,同时还是代理证类型,那么有效期要默认自定义
+                    //如果是混合分销商,同时还是代理证类型,那么有效期要默认自定义
                     let supplierGroup = $('#supplier_group').val();
                     if (supplierGroup === '7' && fileType === 'proxy_certificate') {
                         let selector = $('#' + fileType + '_file_div').find('select').last();

resources/views/web/AddSupplier.blade.php

@@ -216,7 +216,7 @@
                            id="main_brands">
                 </div>
             </div>
-            {{--选择“混合分销”时，在主营品牌下面新增一栏“代理品牌”；代理品牌取值同主营品牌一样--}}
+            {{--选择“混合分销商”时，在主营品牌下面新增一栏“代理品牌”；代理品牌取值同主营品牌一样--}}
             <div class="layui-form-item" id="agency_brands_div" style="display: none">
                 <label class="layui-form-label">
                     <span class="require">*</span>

resources/views/web/supplier/SupplierBase.blade.php

@@ -223,7 +223,7 @@
                        id="main_brands">
             </div>
         </div>
-        {{--选择“混合分销”时，在主营品牌下面新增一栏“代理品牌”；代理品牌取值同主营品牌一样--}}
+        {{--选择“混合分销商”时，在主营品牌下面新增一栏“代理品牌”；代理品牌取值同主营品牌一样--}}
         <div class="layui-form-item" id="agency_brands_div"
              style="
              @if(!empty($supplier)&&$supplier['supplier_group']!=\App\Model\SupplierChannelModel::SUPPLIER_GROUP_MIX)

vendor/_laravel_idea/_ide_helper_facades.php

-<?php //0ffa8c24ce37a4b1f5466f89c2093b47
+<?php //b10684f47eea45eb812151b3d106c7c5
 /** @noinspection all */
 
 namespace Illuminate\Support\Facades {
@@ -7,13 +7,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::basePath
      * @method static string basePath()
      * @see \Illuminate\Container\Container::when
-     * @method static \Illuminate\Container\ContextualBindingBuilder when($concrete)
+     * @method static \Illuminate\Container\ContextualBindingBuilder|\Illuminate\Contracts\Container\ContextualBindingBuilder when(string $concrete)
      * @see \Illuminate\Foundation\Application::path
      * @method static string path()
      * @see \Illuminate\Container\Container::bind
-     * @method static void bind($abstract, $concrete = null, $shared = false)
+     * @method static void bind(array|string $abstract, \Closure|null|string $concrete = null, bool $shared = false)
      * @see \Illuminate\Container\Container::tagged
-     * @method static array tagged($tag)
+     * @method static array tagged(string $tag)
      * @see \Illuminate\Foundation\Application::setDeferredServices
      * @method static void setDeferredServices(array $services)
      * @see \Illuminate\Foundation\Application::hasMonologConfigurator
@@ -25,19 +25,19 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::handle
      * @method static \Symfony\Component\HttpFoundation\Response handle(\Symfony\Component\HttpFoundation\Request $request, $type = self::MASTER_REQUEST, $catch = true)
      * @see \Illuminate\Container\Container::bindIf
-     * @method static void bindIf($abstract, $concrete = null, $shared = false)
+     * @method static void bindIf(string $abstract, \Closure|null|string $concrete = null, bool $shared = false)
      * @see \Illuminate\Foundation\Application::version
      * @method static string version()
      * @see \Illuminate\Container\Container::rebinding
-     * @method static mixed|void rebinding($abstract, \Closure $callback)
+     * @method static mixed rebinding(string $abstract, \Closure $callback)
      * @see \Illuminate\Container\Container::extend
-     * @method static void extend($abstract, \Closure $closure)
+     * @method static void extend(string $abstract, \Closure $closure)
      * @see \Illuminate\Foundation\Application::useStoragePath
      * @method static \Illuminate\Foundation\Application useStoragePath($path)
      * @see \Illuminate\Foundation\Application::hasBeenBootstrapped
      * @method static bool|mixed hasBeenBootstrapped()
      * @see \Illuminate\Container\Container::offsetUnset
-     * @method static void offsetUnset($key)
+     * @method static void offsetUnset(string $key)
      * @see \Illuminate\Foundation\Application::loadEnvironmentFrom
      * @method static \Illuminate\Foundation\Application loadEnvironmentFrom($file)
      * @see \Illuminate\Container\Container::setInstance
@@ -61,7 +61,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::getCachedServicesPath
      * @method static string getCachedServicesPath()
      * @see \Illuminate\Container\Container::isAlias
-     * @method static bool isAlias($name)
+     * @method static bool isAlias(string $name)
      * @see \Illuminate\Foundation\Application::registerConfiguredProviders
      * @method static void registerConfiguredProviders()
      * @see \Illuminate\Foundation\Application::isLocale
@@ -71,11 +71,11 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::getNamespace
      * @method static int|mixed|null|string getNamespace()
      * @see \Illuminate\Container\Container::resolved
-     * @method static bool resolved($abstract)
+     * @method static bool resolved(string $abstract)
      * @see \Illuminate\Foundation\Application::getProvider
      * @method static mixed getProvider($provider)
      * @see \Illuminate\Container\Container::refresh
-     * @method static mixed|null refresh($abstract, $target, $method)
+     * @method static mixed refresh(string $abstract, $target, string $method)
      * @see \Illuminate\Foundation\Application::registerCoreContainerAliases
      * @method static void registerCoreContainerAliases()
      * @see \Illuminate\Foundation\Application::useDatabasePath
@@ -87,7 +87,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::shouldSkipMiddleware
      * @method static bool shouldSkipMiddleware()
      * @see \Illuminate\Container\Container::call
-     * @method static mixed call($callback, array $parameters = [], $defaultMethod = null)
+     * @method static mixed call(callable|string $callback, array $parameters = [], null|string $defaultMethod = null)
      * @see \Illuminate\Foundation\Application::getLocale
      * @method static void getLocale()
      * @see \Illuminate\Foundation\Application::terminating
@@ -103,7 +103,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::addDeferredServices
      * @method static void addDeferredServices(array $services)
      * @see \Illuminate\Container\Container::instance
-     * @method static void instance($abstract, $instance)
+     * @method static void instance(string $abstract, $instance)
      * @see \Illuminate\Foundation\Application::configureMonologUsing
      * @method static \Illuminate\Foundation\Application configureMonologUsing(callable $callback)
      * @see \Illuminate\Foundation\Application::databasePath
@@ -121,11 +121,11 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::routesAreCached
      * @method static void routesAreCached()
      * @see \Illuminate\Container\Container::tag
-     * @method static void tag($abstracts, $tags)
+     * @method static void tag(array|string $abstracts, array|array[] $tags)
      * @see \Illuminate\Foundation\Application::publicPath
      * @method static string publicPath()
      * @see \Illuminate\Container\Container::addContextualBinding
-     * @method static void addContextualBinding($concrete, $abstract, $implementation)
+     * @method static void addContextualBinding(string $concrete, string $abstract, \Closure|string $implementation)
      * @see \Illuminate\Foundation\Application::isDownForMaintenance
      * @method static bool isDownForMaintenance()
      * @see \Illuminate\Foundation\Application::loadDeferredProviders
@@ -133,7 +133,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::abort
      * @method static void abort($code, $message = '', array $headers = [])
      * @see \Illuminate\Container\Container::afterResolving
-     * @method static void afterResolving($abstract, \Closure $callback = null)
+     * @method static void afterResolving(string $abstract, \Closure $callback = null)
      * @see \Illuminate\Foundation\Application::afterBootstrapping
      * @method static void afterBootstrapping($bootstrapper, \Closure $callback)
      * @see \Illuminate\Foundation\Application::configurationIsCached
@@ -141,17 +141,17 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::runningInConsole
      * @method static bool runningInConsole()
      * @see \Illuminate\Container\Container::offsetGet
-     * @method static mixed offsetGet($key)
+     * @method static mixed offsetGet(string $key)
      * @see \Illuminate\Foundation\Application::langPath
      * @method static string langPath()
      * @see \Illuminate\Container\Container::offsetSet
-     * @method static void offsetSet($key, $value)
+     * @method static void offsetSet(string $key, $value)
      * @see \Illuminate\Foundation\Application::flush
      * @method static void flush()
      * @see \Illuminate\Container\Container::alias
-     * @method static void alias($abstract, $alias)
+     * @method static void alias(string $abstract, string $alias)
      * @see \Illuminate\Container\Container::offsetExists
-     * @method static bool offsetExists($key)
+     * @method static bool offsetExists(string $key)
      * @see \Illuminate\Foundation\Application::afterLoadingEnvironment
      * @method static null afterLoadingEnvironment(\Closure $callback)
      * @see \Illuminate\Foundation\Application::boot
@@ -163,13 +163,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::bootstrapWith
      * @method static void bootstrapWith(array $bootstrappers)
      * @see \Illuminate\Container\Container::singleton
-     * @method static void singleton($abstract, $concrete = null)
+     * @method static void singleton(array|string $abstract, \Closure|null|string $concrete = null)
      * @see \Illuminate\Container\Container::forgetInstance
-     * @method static void forgetInstance($abstract)
+     * @method static void forgetInstance(string $abstract)
      * @see \Illuminate\Container\Container::isShared
-     * @method static bool isShared($abstract)
+     * @method static bool isShared(string $abstract)
      * @see \Illuminate\Container\Container::resolving
-     * @method static void resolving($abstract, \Closure $callback = null)
+     * @method static void resolving(string $abstract, \Closure $callback = null)
      * @see \Illuminate\Foundation\Application::bound
      * @method static bool bound($abstract)
      * @see \Illuminate\Foundation\Application::isBooted
@@ -177,7 +177,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::getCachedRoutesPath
      * @method static string getCachedRoutesPath()
      * @see \Illuminate\Container\Container::getBindings
-     * @method static array|mixed getBindings()
+     * @method static array getBindings()
      * @see \Illuminate\Foundation\Application::useEnvironmentPath
      * @method static \Illuminate\Foundation\Application useEnvironmentPath($path)
      * @see \Illuminate\Foundation\Application::setBasePath
@@ -187,7 +187,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::isDeferredService
      * @method static bool isDeferredService($service)
      * @see \Illuminate\Container\Container::build
-     * @method static mixed|object build($concrete, array $parameters = [])
+     * @method static mixed build(string $concrete, array $parameters = [])
      * @see \Illuminate\Foundation\Application::getCachedConfigPath
      * @method static string getCachedConfigPath()
      * @see \Illuminate\Foundation\Application::configPath
@@ -251,69 +251,69 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Contracts\Auth\Guard::validate
      * @method static void validate(array $credentials = [])
      * @see \Illuminate\Contracts\Auth\StatefulGuard::onceUsingId
-     * @method static void onceUsingId($id)
+     * @method static bool onceUsingId($id)
      * @see \Illuminate\Contracts\Auth\StatefulGuard::login
-     * @method static void login(\Illuminate\Contracts\Auth\Authenticatable $user, $remember = false)
+     * @method static void login(\Illuminate\Contracts\Auth\Authenticatable $user, bool $remember = false)
      * @see \Illuminate\Contracts\Auth\StatefulGuard::attempt
-     * @method static void attempt(array $credentials = [], $remember = false, $login = true)
+     * @method static bool attempt(array $credentials = [], bool $remember = false, bool $login = true)
      * @see \Illuminate\Contracts\Auth\StatefulGuard::viaRemember
-     * @method static void viaRemember()
+     * @method static bool viaRemember()
      * @see \Illuminate\Contracts\Auth\StatefulGuard::logout
      * @method static void logout()
      * @see \Illuminate\Contracts\Auth\StatefulGuard::once
-     * @method static void once(array $credentials = [])
+     * @method static bool once(array $credentials = [])
      * @see \Illuminate\Contracts\Auth\StatefulGuard::loginUsingId
-     * @method static void loginUsingId($id, $remember = false)
+     * @method static \Illuminate\Contracts\Auth\Authenticatable loginUsingId($id, bool $remember = false)
      */
     class Auth {}
     
     /**
      * @see \Illuminate\View\Compilers\BladeCompiler::getCustomDirectives
-     * @method static array|mixed getCustomDirectives()
+     * @method static array getCustomDirectives()
      * @see \Illuminate\View\Compilers\BladeCompiler::setEchoFormat
-     * @method static void setEchoFormat($format)
+     * @method static void setEchoFormat(string $format)
      * @see \Illuminate\View\Compilers\BladeCompiler::compile
-     * @method static void compile($path = null)
+     * @method static void compile(string $path = null)
      * @see \Illuminate\View\Compilers\Compiler::isExpired
-     * @method static bool isExpired($path)
+     * @method static bool isExpired(string $path)
      * @see \Illuminate\View\Compilers\BladeCompiler::extend
      * @method static void extend(callable $compiler)
      * @see \Illuminate\View\Compilers\BladeCompiler::getContentTags
-     * @method static array getContentTags()
+     * @method static array|string getContentTags()
      * @see \Illuminate\View\Compilers\BladeCompiler::setEscapedContentTags
-     * @method static void setEscapedContentTags($openTag, $closeTag)
+     * @method static void setEscapedContentTags(string $openTag, string $closeTag)
      * @see \Illuminate\View\Compilers\Compiler::getCompiledPath
-     * @method static string getCompiledPath($path)
+     * @method static string getCompiledPath(string $path)
      * @see \Illuminate\View\Compilers\BladeCompiler::setRawTags
-     * @method static void setRawTags($openTag, $closeTag)
+     * @method static void setRawTags(string $openTag, string $closeTag)
      * @see \Illuminate\View\Compilers\BladeCompiler::getRawTags
-     * @method static mixed|string[] getRawTags()
+     * @method static array|string[] getRawTags()
      * @see \Illuminate\View\Compilers\BladeCompiler::compileEchoDefaults
-     * @method static null|string|string[] compileEchoDefaults($value)
+     * @method static string compileEchoDefaults(string $value)
      * @see \Illuminate\View\Compilers\BladeCompiler::setPath
-     * @method static void setPath($path)
+     * @method static void setPath(string $path)
      * @see \Illuminate\View\Compilers\BladeCompiler::setContentTags
-     * @method static void setContentTags($openTag, $closeTag, $escaped = false)
+     * @method static void setContentTags(string $openTag, string $closeTag, bool $escaped = false)
      * @see \Illuminate\View\Compilers\BladeCompiler::getPath
      * @method static string getPath()
      * @see \Illuminate\View\Compilers\BladeCompiler::compileString
-     * @method static null|string|string[] compileString($value)
+     * @method static string compileString(string $value)
      * @see \Illuminate\View\Compilers\BladeCompiler::directive
-     * @method static void directive($name, callable $handler)
+     * @method static void directive(string $name, callable $handler)
      * @see \Illuminate\View\Compilers\BladeCompiler::getEscapedContentTags
-     * @method static array getEscapedContentTags()
+     * @method static array|string getEscapedContentTags()
      * @see \Illuminate\View\Compilers\BladeCompiler::getExtensions
-     * @method static array|mixed getExtensions()
+     * @method static array getExtensions()
      */
     class Blade {}
     
     /**
      * @see \Illuminate\Contracts\Bus\Dispatcher::dispatch
-     * @method static void dispatch($command)
+     * @method static mixed dispatch($command)
      * @see \Illuminate\Contracts\Bus\Dispatcher::dispatchNow
-     * @method static void dispatchNow($command)
+     * @method static mixed dispatchNow($command)
      * @see \Illuminate\Contracts\Bus\Dispatcher::pipeThrough
-     * @method static void pipeThrough(array $pipes)
+     * @method static \Illuminate\Contracts\Bus\Dispatcher pipeThrough(array $pipes)
      */
     class Bus {}
     
@@ -407,21 +407,21 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Cookie\CookieJar::forget
-     * @method static \Symfony\Component\HttpFoundation\Cookie forget(string $name, string $path = null, string $domain = null)
+     * @method static \Symfony\Component\HttpFoundation\Cookie forget($name, $path = null, $domain = null)
      * @see \Illuminate\Cookie\CookieJar::hasQueued
-     * @method static bool hasQueued(string $key)
+     * @method static bool hasQueued($key)
      * @see \Illuminate\Cookie\CookieJar::unqueue
-     * @method static void unqueue(string $name)
+     * @method static void unqueue($name)
      * @see \Illuminate\Cookie\CookieJar::queued
-     * @method static \Symfony\Component\HttpFoundation\Cookie queued(string $key, $default = null)
+     * @method static array|\ArrayAccess|mixed queued($key, $default = null)
      * @see \Illuminate\Cookie\CookieJar::setDefaultPathAndDomain
-     * @method static \Illuminate\Cookie\CookieJar setDefaultPathAndDomain(string $path, string $domain, bool $secure = false)
+     * @method static \Illuminate\Cookie\CookieJar setDefaultPathAndDomain($path, $domain, $secure = false)
      * @see \Illuminate\Cookie\CookieJar::forever
-     * @method static \Symfony\Component\HttpFoundation\Cookie forever(string $name, string $value, string $path = null, string $domain = null, bool $secure = false, bool $httpOnly = true)
+     * @method static \Symfony\Component\HttpFoundation\Cookie forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true)
      * @see \Illuminate\Cookie\CookieJar::make
-     * @method static \Symfony\Component\HttpFoundation\Cookie make(string $name, string $value, int $minutes = 0, string $path = null, string $domain = null, bool $secure = false, bool $httpOnly = true)
+     * @method static \Symfony\Component\HttpFoundation\Cookie make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true)
      * @see \Illuminate\Cookie\CookieJar::getQueuedCookies
-     * @method static array getQueuedCookies()
+     * @method static array|mixed getQueuedCookies()
      * @see \Illuminate\Cookie\CookieJar::queue
      * @method static void queue()
      */
@@ -687,33 +687,33 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Contracts\Auth\Access\Gate::allows
-     * @method static bool allows(string $ability, array|mixed $arguments = [])
+     * @method static void allows($ability, $arguments = [])
      * @see \Illuminate\Contracts\Auth\Access\Gate::before
-     * @method static \Illuminate\Contracts\Auth\Access\Gate before(callable $callback)
+     * @method static void before(callable $callback)
      * @see \Illuminate\Contracts\Auth\Access\Gate::forUser
-     * @method static \Illuminate\Contracts\Auth\Access\Gate forUser(\Illuminate\Contracts\Auth\Authenticatable|mixed $user)
+     * @method static void forUser($user)
      * @see \Illuminate\Contracts\Auth\Access\Gate::define
-     * @method static \Illuminate\Contracts\Auth\Access\Gate define(string $ability, callable|string $callback)
+     * @method static void define($ability, $callback)
      * @see \Illuminate\Contracts\Auth\Access\Gate::has
-     * @method static bool has(string $ability)
+     * @method static void has($ability)
      * @see \Illuminate\Contracts\Auth\Access\Gate::check
-     * @method static bool check(string $ability, array|mixed $arguments = [])
+     * @method static void check($ability, $arguments = [])
      * @see \Illuminate\Contracts\Auth\Access\Gate::denies
-     * @method static bool denies(string $ability, array|mixed $arguments = [])
+     * @method static void denies($ability, $arguments = [])
      * @see \Illuminate\Contracts\Auth\Access\Gate::policy
-     * @method static \Illuminate\Contracts\Auth\Access\Gate policy(string $class, string $policy)
+     * @method static void policy($class, $policy)
      */
     class Gate {}
     
     /**
      * @see \Illuminate\Hashing\BcryptHasher::setRounds
-     * @method static \Illuminate\Hashing\BcryptHasher setRounds(int $rounds)
+     * @method static \Illuminate\Hashing\BcryptHasher setRounds($rounds)
      * @see \Illuminate\Hashing\BcryptHasher::needsRehash
-     * @method static bool needsRehash(string $hashedValue, array $options = [])
+     * @method static bool needsRehash($hashedValue, array $options = [])
      * @see \Illuminate\Hashing\BcryptHasher::check
-     * @method static bool check(string $value, string $hashedValue, array $options = [])
+     * @method static bool check($value, $hashedValue, array $options = [])
      * @see \Illuminate\Hashing\BcryptHasher::make
-     * @method static string make(string $value, array $options = [])
+     * @method static null|string make($value, array $options = [])
      */
     class Hash {}
     
@@ -751,13 +751,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::isXmlHttpRequest
      * @method static bool isXmlHttpRequest()
      * @see \Illuminate\Http\Request::cookie
-     * @method static void cookie($key = null, $default = null)
+     * @method static array|string cookie(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::method
      * @method static string method()
      * @see \Illuminate\Http\Request::old
-     * @method static void old($key = null, $default = null)
+     * @method static array|string old(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::ip
-     * @method static mixed|null|string ip()
+     * @method static string ip()
      * @see \Symfony\Component\HttpFoundation\Request::getContent
      * @method static false|resource|string getContent($asResource = false)
      * @see \Symfony\Component\HttpFoundation\Request::getBaseUrl
@@ -767,33 +767,33 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getUriForPath
      * @method static string getUriForPath($path)
      * @see \Illuminate\Http\Request::ips
-     * @method static array|null[] ips()
+     * @method static array ips()
      * @see \Illuminate\Http\Request::getRouteResolver
      * @method static \Closure getRouteResolver()
      * @see \Illuminate\Http\Request::input
-     * @method static mixed input($key = null, $default = null)
+     * @method static array|string input(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::enableHttpMethodParameterOverride
      * @method static void enableHttpMethodParameterOverride()
      * @see \Illuminate\Http\Request::route
-     * @method static mixed route($param = null)
+     * @method static \Illuminate\Routing\Route|object|string route(null|string $param = null)
      * @see \Symfony\Component\HttpFoundation\Request::getPathInfo
      * @method static array|mixed|null|string getPathInfo()
      * @see \Illuminate\Http\Request::offsetUnset
-     * @method static null offsetUnset($offset)
+     * @method static void offsetUnset(string $offset)
      * @see \Illuminate\Http\Request::flashOnly
-     * @method static null flashOnly($keys)
+     * @method static null|void flashOnly(array|mixed $keys)
      * @see \Illuminate\Http\Request::except
-     * @method static array except($keys)
+     * @method static array except(array|mixed $keys)
      * @see \Illuminate\Http\Request::decodedPath
      * @method static string decodedPath()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestFormat
      * @method static mixed|null getRequestFormat($default = 'html')
      * @see \Illuminate\Http\Request::flash
-     * @method static void flash($filter = null, $keys = [])
+     * @method static void flash(string $filter = null, array $keys = [])
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedHeaderName
      * @method static void setTrustedHeaderName($key, $value)
      * @see \Illuminate\Http\Request::server
-     * @method static void server($key = null, $default = null)
+     * @method static array|string server(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::setLocale
      * @method static void setLocale($locale)
      * @see \Illuminate\Http\Request::setUserResolver
@@ -817,7 +817,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::segments
      * @method static array segments()
      * @see \Illuminate\Http\Request::file
-     * @method static mixed file($key = null, $default = null)
+     * @method static array|\Illuminate\Http\UploadedFile|null file(string $key = null, $default = null)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
      * @method static bool hasMacro($name)
      * @see \Symfony\Component\HttpFoundation\Request::getContentType
@@ -825,11 +825,11 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::get
      * @method static mixed|null get($key, $default = null)
      * @see \Illuminate\Http\Request::matchesType
-     * @method static bool matchesType($actual, $type)
+     * @method static bool matchesType(string $actual, string $type)
      * @see \Illuminate\Http\Request::acceptsJson
      * @method static bool acceptsJson()
      * @see \Illuminate\Http\Request::prefers
-     * @method static mixed|void prefers($contentTypes)
+     * @method static null|string prefers(array|string $contentTypes)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedProxies
      * @method static array getTrustedProxies()
      * @see \Symfony\Component\HttpFoundation\Request::getDefaultLocale
@@ -839,7 +839,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getSession
      * @method static \Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
      * @see \Illuminate\Http\Request::hasHeader
-     * @method static bool hasHeader($key)
+     * @method static bool hasHeader(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getUserInfo
      * @method static array|mixed|null|string getUserInfo()
      * @see \Illuminate\Http\Request::url
@@ -853,13 +853,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getLocale
      * @method static mixed|string getLocale()
      * @see \Illuminate\Http\Request::exists
-     * @method static bool exists($key)
+     * @method static bool exists(array|string $key)
      * @see \Symfony\Component\HttpFoundation\Request::initialize
      * @method static void initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
      * @see \Illuminate\Http\Request::instance
      * @method static \Illuminate\Http\Request instance()
      * @see \Illuminate\Http\Request::hasFile
-     * @method static bool hasFile($key)
+     * @method static bool hasFile(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getRelativeUriForPath
      * @method static mixed|string getRelativeUriForPath($path)
      * @see \Illuminate\Http\Request::pjax
@@ -873,25 +873,25 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::secure
      * @method static bool secure()
      * @see \Illuminate\Http\Request::createFromBase
-     * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request createFromBase(\Symfony\Component\HttpFoundation\Request $request)
+     * @method static \Illuminate\Http\Request createFromBase(\Symfony\Component\HttpFoundation\Request $request)
      * @see \Symfony\Component\HttpFoundation\Request::getRealMethod
      * @method static string getRealMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getPreferredLanguage
      * @method static mixed|null getPreferredLanguage(array $locales = null)
      * @see \Illuminate\Http\Request::bearerToken
-     * @method static string|void bearerToken()
+     * @method static null|string bearerToken()
      * @see \Symfony\Component\HttpFoundation\Request::getClientIps
      * @method static array|null[] getClientIps()
      * @see \Illuminate\Http\Request::segment
-     * @method static mixed segment($index, $default = null)
+     * @method static null|string segment(int $index, null|string $default = null)
      * @see \Illuminate\Http\Request::only
-     * @method static array only($keys)
+     * @method static array only(array|mixed $keys)
      * @see \Symfony\Component\HttpFoundation\Request::setFactory
      * @method static void setFactory($callable)
      * @see \Symfony\Component\HttpFoundation\Request::create
      * @method static \Symfony\Component\HttpFoundation\Request create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
      * @see \Illuminate\Http\Request::has
-     * @method static bool has($key)
+     * @method static bool has(array|string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getHttpHost
      * @method static string getHttpHost()
      * @see \Symfony\Component\HttpFoundation\Request::setFormat
@@ -903,43 +903,43 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::setSession
      * @method static void setSession(\Symfony\Component\HttpFoundation\Session\SessionInterface $session)
      * @see \Illuminate\Http\Request::accepts
-     * @method static bool accepts($contentTypes)
+     * @method static bool accepts(array|string $contentTypes)
      * @see \Illuminate\Http\Request::query
-     * @method static void query($key = null, $default = null)
+     * @method static array|string query(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::format
-     * @method static int|mixed|string format($default = 'html')
+     * @method static string format(string $default = 'html')
      * @see \Illuminate\Http\Request::capture
-     * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request capture()
+     * @method static \Illuminate\Http\Request capture()
      * @see \Illuminate\Http\Request::duplicate
      * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
      * @see \Symfony\Component\HttpFoundation\Request::getClientIp
      * @method static mixed|null getClientIp()
      * @see \Illuminate\Http\Request::hasCookie
-     * @method static bool hasCookie($key)
+     * @method static bool hasCookie(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getUser
      * @method static array|mixed|null|string getUser()
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHosts
      * @method static array getTrustedHosts()
      * @see \Illuminate\Http\Request::header
-     * @method static void header($key = null, $default = null)
+     * @method static array|string header(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::getBasePath
      * @method static string getBasePath()
      * @see \Illuminate\Http\Request::offsetGet
-     * @method static mixed offsetGet($offset)
+     * @method static mixed offsetGet(string $offset)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHeaderName
      * @method static string getTrustedHeaderName($key)
      * @see \Illuminate\Http\Request::session
-     * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface session()
+     * @method static \Illuminate\Session\Store session()
      * @see \Symfony\Component\HttpFoundation\Request::isNoCache
      * @method static bool isNoCache()
      * @see \Illuminate\Http\Request::offsetSet
-     * @method static null offsetSet($offset, $value)
+     * @method static void offsetSet(string $offset, $value)
      * @see \Symfony\Component\HttpFoundation\Request::getMethod
      * @method static string getMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getMimeType
      * @method static mixed|null getMimeType($format)
      * @see \Illuminate\Http\Request::flashExcept
-     * @method static null flashExcept($keys)
+     * @method static null|void flashExcept(array|mixed $keys)
      * @see \Illuminate\Http\Request::flush
      * @method static void flush()
      * @see \Symfony\Component\HttpFoundation\Request::normalizeQueryString
@@ -947,9 +947,9 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::root
      * @method static string root()
      * @see \Illuminate\Http\Request::json
-     * @method static mixed|\Symfony\Component\HttpFoundation\ParameterBag json($key = null, $default = null)
+     * @method static mixed|string|\Symfony\Component\HttpFoundation\ParameterBag json(string $key = null, $default = null)
      * @see \Illuminate\Http\Request::offsetExists
-     * @method static bool offsetExists($offset)
+     * @method static bool offsetExists(string $offset)
      * @see \Symfony\Component\HttpFoundation\Request::getUri
      * @method static string getUri()
      * @see \Symfony\Component\HttpFoundation\Request::getFormat
@@ -963,7 +963,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::fullUrlWithQuery
      * @method static string fullUrlWithQuery(array $query)
      * @see \Illuminate\Http\Request::intersect
-     * @method static array intersect($keys)
+     * @method static array intersect(array|mixed $keys)
      * @see \Symfony\Component\HttpFoundation\Request::getScheme
      * @method static string getScheme()
      * @see \Illuminate\Http\Request::fullUrlIs
@@ -975,9 +975,9 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::toArray
      * @method static array toArray()
      * @see \Illuminate\Http\Request::allFiles
-     * @method static array|array[]|\array[][]|\array[][][]|\Illuminate\Http\UploadedFile[]|\Illuminate\Http\UploadedFile[][]|\Illuminate\Http\UploadedFile[][][]|null[]|\null[][]|\null[][][] allFiles()
+     * @method static array allFiles()
      * @see \Illuminate\Http\Request::user
-     * @method static mixed user($guard = null)
+     * @method static mixed user(null|string $guard = null)
      * @see \Symfony\Component\HttpFoundation\Request::getLanguages
      * @method static array getLanguages()
      */
@@ -1241,13 +1241,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::isXmlHttpRequest
      * @method static bool isXmlHttpRequest()
      * @see \Illuminate\Http\Request::cookie
-     * @method static void cookie($key = null, $default = null)
+     * @method static array|string cookie(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::method
      * @method static string method()
      * @see \Illuminate\Http\Request::old
-     * @method static void old($key = null, $default = null)
+     * @method static array|string old(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::ip
-     * @method static mixed|null|string ip()
+     * @method static string ip()
      * @see \Symfony\Component\HttpFoundation\Request::getContent
      * @method static false|resource|string getContent($asResource = false)
      * @see \Symfony\Component\HttpFoundation\Request::getBaseUrl
@@ -1257,33 +1257,33 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getUriForPath
      * @method static string getUriForPath($path)
      * @see \Illuminate\Http\Request::ips
-     * @method static array|null[] ips()
+     * @method static array ips()
      * @see \Illuminate\Http\Request::getRouteResolver
      * @method static \Closure getRouteResolver()
      * @see \Illuminate\Http\Request::input
-     * @method static mixed input($key = null, $default = null)
+     * @method static array|string input(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::enableHttpMethodParameterOverride
      * @method static void enableHttpMethodParameterOverride()
      * @see \Illuminate\Http\Request::route
-     * @method static mixed route($param = null)
+     * @method static \Illuminate\Routing\Route|object|string route(null|string $param = null)
      * @see \Symfony\Component\HttpFoundation\Request::getPathInfo
      * @method static array|mixed|null|string getPathInfo()
      * @see \Illuminate\Http\Request::offsetUnset
-     * @method static null offsetUnset($offset)
+     * @method static void offsetUnset(string $offset)
      * @see \Illuminate\Http\Request::flashOnly
-     * @method static null flashOnly($keys)
+     * @method static null|void flashOnly(array|mixed $keys)
      * @see \Illuminate\Http\Request::except
-     * @method static array except($keys)
+     * @method static array except(array|mixed $keys)
      * @see \Illuminate\Http\Request::decodedPath
      * @method static string decodedPath()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestFormat
      * @method static mixed|null getRequestFormat($default = 'html')
      * @see \Illuminate\Http\Request::flash
-     * @method static void flash($filter = null, $keys = [])
+     * @method static void flash(string $filter = null, array $keys = [])
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedHeaderName
      * @method static void setTrustedHeaderName($key, $value)
      * @see \Illuminate\Http\Request::server
-     * @method static void server($key = null, $default = null)
+     * @method static array|string server(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::setLocale
      * @method static void setLocale($locale)
      * @see \Illuminate\Http\Request::setUserResolver
@@ -1307,7 +1307,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::segments
      * @method static array segments()
      * @see \Illuminate\Http\Request::file
-     * @method static mixed file($key = null, $default = null)
+     * @method static array|\Illuminate\Http\UploadedFile|null file(string $key = null, $default = null)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
      * @method static bool hasMacro($name)
      * @see \Symfony\Component\HttpFoundation\Request::getContentType
@@ -1315,11 +1315,11 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::get
      * @method static mixed|null get($key, $default = null)
      * @see \Illuminate\Http\Request::matchesType
-     * @method static bool matchesType($actual, $type)
+     * @method static bool matchesType(string $actual, string $type)
      * @see \Illuminate\Http\Request::acceptsJson
      * @method static bool acceptsJson()
      * @see \Illuminate\Http\Request::prefers
-     * @method static mixed|void prefers($contentTypes)
+     * @method static null|string prefers(array|string $contentTypes)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedProxies
      * @method static array getTrustedProxies()
      * @see \Symfony\Component\HttpFoundation\Request::getDefaultLocale
@@ -1329,7 +1329,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getSession
      * @method static \Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
      * @see \Illuminate\Http\Request::hasHeader
-     * @method static bool hasHeader($key)
+     * @method static bool hasHeader(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getUserInfo
      * @method static array|mixed|null|string getUserInfo()
      * @see \Illuminate\Http\Request::url
@@ -1343,13 +1343,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getLocale
      * @method static mixed|string getLocale()
      * @see \Illuminate\Http\Request::exists
-     * @method static bool exists($key)
+     * @method static bool exists(array|string $key)
      * @see \Symfony\Component\HttpFoundation\Request::initialize
      * @method static void initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
      * @see \Illuminate\Http\Request::instance
      * @method static \Illuminate\Http\Request instance()
      * @see \Illuminate\Http\Request::hasFile
-     * @method static bool hasFile($key)
+     * @method static bool hasFile(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getRelativeUriForPath
      * @method static mixed|string getRelativeUriForPath($path)
      * @see \Illuminate\Http\Request::pjax
@@ -1363,25 +1363,25 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::secure
      * @method static bool secure()
      * @see \Illuminate\Http\Request::createFromBase
-     * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request createFromBase(\Symfony\Component\HttpFoundation\Request $request)
+     * @method static \Illuminate\Http\Request createFromBase(\Symfony\Component\HttpFoundation\Request $request)
      * @see \Symfony\Component\HttpFoundation\Request::getRealMethod
      * @method static string getRealMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getPreferredLanguage
      * @method static mixed|null getPreferredLanguage(array $locales = null)
      * @see \Illuminate\Http\Request::bearerToken
-     * @method static string|void bearerToken()
+     * @method static null|string bearerToken()
      * @see \Symfony\Component\HttpFoundation\Request::getClientIps
      * @method static array|null[] getClientIps()
      * @see \Illuminate\Http\Request::segment
-     * @method static mixed segment($index, $default = null)
+     * @method static null|string segment(int $index, null|string $default = null)
      * @see \Illuminate\Http\Request::only
-     * @method static array only($keys)
+     * @method static array only(array|mixed $keys)
      * @see \Symfony\Component\HttpFoundation\Request::setFactory
      * @method static void setFactory($callable)
      * @see \Symfony\Component\HttpFoundation\Request::create
      * @method static \Symfony\Component\HttpFoundation\Request create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
      * @see \Illuminate\Http\Request::has
-     * @method static bool has($key)
+     * @method static bool has(array|string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getHttpHost
      * @method static string getHttpHost()
      * @see \Symfony\Component\HttpFoundation\Request::setFormat
@@ -1393,43 +1393,43 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::setSession
      * @method static void setSession(\Symfony\Component\HttpFoundation\Session\SessionInterface $session)
      * @see \Illuminate\Http\Request::accepts
-     * @method static bool accepts($contentTypes)
+     * @method static bool accepts(array|string $contentTypes)
      * @see \Illuminate\Http\Request::query
-     * @method static void query($key = null, $default = null)
+     * @method static array|string query(string $key = null, array|null|string $default = null)
      * @see \Illuminate\Http\Request::format
-     * @method static int|mixed|string format($default = 'html')
+     * @method static string format(string $default = 'html')
      * @see \Illuminate\Http\Request::capture
-     * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request capture()
+     * @method static \Illuminate\Http\Request capture()
      * @see \Illuminate\Http\Request::duplicate
      * @method static \Illuminate\Http\Request|\Symfony\Component\HttpFoundation\Request duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
      * @see \Symfony\Component\HttpFoundation\Request::getClientIp
      * @method static mixed|null getClientIp()
      * @see \Illuminate\Http\Request::hasCookie
-     * @method static bool hasCookie($key)
+     * @method static bool hasCookie(string $key)
      * @see \Symfony\Component\HttpFoundation\Request::getUser
      * @method static array|mixed|null|string getUser()
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHosts
      * @method static array getTrustedHosts()
      * @see \Illuminate\Http\Request::header
-     * @method static void header($key = null, $default = null)
+     * @method static array|string header(string $key = null, array|null|string $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::getBasePath
      * @method static string getBasePath()
      * @see \Illuminate\Http\Request::offsetGet
-     * @method static mixed offsetGet($offset)
+     * @method static mixed offsetGet(string $offset)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHeaderName
      * @method static string getTrustedHeaderName($key)
      * @see \Illuminate\Http\Request::session
-     * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface session()
+     * @method static \Illuminate\Session\Store session()
      * @see \Symfony\Component\HttpFoundation\Request::isNoCache
      * @method static bool isNoCache()
      * @see \Illuminate\Http\Request::offsetSet
-     * @method static null offsetSet($offset, $value)
+     * @method static void offsetSet(string $offset, $value)
      * @see \Symfony\Component\HttpFoundation\Request::getMethod
      * @method static string getMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getMimeType
      * @method static mixed|null getMimeType($format)
      * @see \Illuminate\Http\Request::flashExcept
-     * @method static null flashExcept($keys)
+     * @method static null|void flashExcept(array|mixed $keys)
      * @see \Illuminate\Http\Request::flush
      * @method static void flush()
      * @see \Symfony\Component\HttpFoundation\Request::normalizeQueryString
@@ -1437,9 +1437,9 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::root
      * @method static string root()
      * @see \Illuminate\Http\Request::json
-     * @method static mixed|\Symfony\Component\HttpFoundation\ParameterBag json($key = null, $default = null)
+     * @method static mixed|string|\Symfony\Component\HttpFoundation\ParameterBag json(string $key = null, $default = null)
      * @see \Illuminate\Http\Request::offsetExists
-     * @method static bool offsetExists($offset)
+     * @method static bool offsetExists(string $offset)
      * @see \Symfony\Component\HttpFoundation\Request::getUri
      * @method static string getUri()
      * @see \Symfony\Component\HttpFoundation\Request::getFormat
@@ -1453,7 +1453,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::fullUrlWithQuery
      * @method static string fullUrlWithQuery(array $query)
      * @see \Illuminate\Http\Request::intersect
-     * @method static array intersect($keys)
+     * @method static array intersect(array|mixed $keys)
      * @see \Symfony\Component\HttpFoundation\Request::getScheme
      * @method static string getScheme()
      * @see \Illuminate\Http\Request::fullUrlIs
@@ -1465,9 +1465,9 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::toArray
      * @method static array toArray()
      * @see \Illuminate\Http\Request::allFiles
-     * @method static array|array[]|\array[][]|\Illuminate\Http\UploadedFile[]|\Illuminate\Http\UploadedFile[][]|null[]|\null[][] allFiles()
+     * @method static array allFiles()
      * @see \Illuminate\Http\Request::user
-     * @method static mixed user($guard = null)
+     * @method static mixed user(null|string $guard = null)
      * @see \Symfony\Component\HttpFoundation\Request::getLanguages
      * @method static array getLanguages()
      */
@@ -1475,27 +1475,27 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Contracts\Routing\ResponseFactory::download
-     * @method static \Symfony\Component\HttpFoundation\BinaryFileResponse download(\SplFileInfo|string $file, string $name = null, array $headers = [], null|string $disposition = 'attachment')
+     * @method static void download($file, $name = null, array $headers = [], $disposition = 'attachment')
      * @see \Illuminate\Contracts\Routing\ResponseFactory::view
-     * @method static \Illuminate\Http\Response view(string $view, array $data = [], int $status = 200, array $headers = [])
+     * @method static void view($view, $data = [], $status = 200, array $headers = [])
      * @see \Illuminate\Contracts\Routing\ResponseFactory::jsonp
-     * @method static \Illuminate\Http\JsonResponse jsonp(string $callback, array|string $data = [], int $status = 200, array $headers = [], int $options = 0)
+     * @method static void jsonp($callback, $data = [], $status = 200, array $headers = [], $options = 0)
      * @see \Illuminate\Contracts\Routing\ResponseFactory::stream
-     * @method static \Symfony\Component\HttpFoundation\StreamedResponse stream(\Closure $callback, int $status = 200, array $headers = [])
+     * @method static void stream($callback, $status = 200, array $headers = [])
      * @see \Illuminate\Contracts\Routing\ResponseFactory::redirectTo
-     * @method static \Illuminate\Http\RedirectResponse redirectTo(string $path, int $status = 302, array $headers = [], bool|null $secure = null)
+     * @method static void redirectTo($path, $status = 302, $headers = [], $secure = null)
      * @see \Illuminate\Contracts\Routing\ResponseFactory::json
-     * @method static \Illuminate\Http\JsonResponse json(array|string $data = [], int $status = 200, array $headers = [], int $options = 0)
+     * @method static void json($data = [], $status = 200, array $headers = [], $options = 0)
      * @see \Illuminate\Contracts\Routing\ResponseFactory::redirectToRoute
-     * @method static \Illuminate\Http\RedirectResponse redirectToRoute(string $route, array $parameters = [], int $status = 302, array $headers = [])
+     * @method static void redirectToRoute($route, $parameters = [], $status = 302, $headers = [])
      * @see \Illuminate\Contracts\Routing\ResponseFactory::make
-     * @method static \Illuminate\Http\Response make(string $content = '', int $status = 200, array $headers = [])
+     * @method static void make($content = '', $status = 200, array $headers = [])
      * @see \Illuminate\Contracts\Routing\ResponseFactory::redirectGuest
-     * @method static \Illuminate\Http\RedirectResponse redirectGuest(string $path, int $status = 302, array $headers = [], bool|null $secure = null)
+     * @method static void redirectGuest($path, $status = 302, $headers = [], $secure = null)
      * @see \Illuminate\Contracts\Routing\ResponseFactory::redirectToAction
-     * @method static \Illuminate\Http\RedirectResponse redirectToAction(string $action, array $parameters = [], int $status = 302, array $headers = [])
+     * @method static void redirectToAction($action, $parameters = [], $status = 302, $headers = [])
      * @see \Illuminate\Contracts\Routing\ResponseFactory::redirectToIntended
-     * @method static \Illuminate\Http\RedirectResponse redirectToIntended(string $default = '/', int $status = 302, array $headers = [], bool|null $secure = null)
+     * @method static void redirectToIntended($default = '/', $status = 302, $headers = [], $secure = null)
      */
     class Response {}