完成相关接口

app/Http/Controllers/Api/ExternalApiController.php

@@ -5,17 +5,24 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Filter\SupplierFilter;
 use App\Http\Services\AdminUserService;
+use App\Http\Services\SupplierApplyService;
 use App\Http\Services\SupplierService;
 use App\Model\SupplierChannelModel;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
 
 //提供外部系统的接口
 class ExternalApiController extends Controller
 {
+
+    public function __construct()
+    {
+    }
+
     public function searchSupplier(Request $request)
     {
-        $map = $request->only(['keyword','channel_uid']);
+        $map = $request->only(['keyword', 'channel_uid']);
         $map['supplier_name'] = $map['keyword'];
         if (empty($map['supplier_name'])) {
             $this->externalResponse(-1, '搜索的供应商名称不能为空');
@@ -23,4 +30,53 @@ class ExternalApiController extends Controller
         $suppliers = SupplierService::searchSupplier($map);
         $this->externalResponse(0, 'ok', $suppliers['data'], $suppliers['total']);
     }
+
+    public function checkSupplierApply(Request $request)
+    {
+        $supplierName = $request->get('supplier_name');
+        $result = (new SupplierApplyService())->checkCanApplySupplier($supplierName);
+        if ($result !== true) {
+            $this->externalResponse(-1, $result);
+        }
+        $this->externalResponse(0, '可以申请供应商');
+    }
+
+    //申请供应商
+    public function applySupplier(Request $request)
+    {
+        $data = $request->only([
+            'supplier_name',
+            'main_product',
+            'contact_name',
+            'email',
+            'mobile',
+        ]);
+        $rules = [
+            "supplier_name" => "required|max:300",
+            "main_product" => "required|max:100",
+            "contact_name" => "required|max:10",
+            "email" => "required|email",
+            'mobile' => 'required',
+        ];
+        $attributes = [
+            'supplier_name' => '公司名称',
+            'main_product' => '主营产品',
+            'contact_name' => '联系人',
+            'email' => '邮箱',
+            'mobile' => '注册手机号',
+        ];
+        $validator = Validator::make($data, $rules, [], $attributes);
+        if ($validator->fails()) {
+            $this->externalResponse(-1, $validator->errors()->first());
+        }
+        $canApplySupplier = (new SupplierApplyService())->checkCanApplySupplier($data['supplier_name']);
+        if ($canApplySupplier !== true) {
+            $this->externalResponse(-1, $canApplySupplier);
+        }
+        $result = (new SupplierApplyService())->applySupplier($data);
+        if (!$result) {
+            $this->externalResponse(-1, '申请供应商失败');
+        }
+        $this->externalResponse(0, '申请供应商成功');
+    }
 }

app/Http/Middleware/CheckLogin.php

@@ -31,16 +31,21 @@ class CheckLogin
             }
 
             $hasSyncRoute = strpos($request->path(), 'sync/');
-
             if ($hasSyncRoute === 0) {
                 return $next($request);
             }
 
+            //跳过特定的路由
+            $hasExternalRoute = strpos($request->path(), 'external/');
+            if ($hasExternalRoute !== false) {
+                return $next($request);
+            }
+
             if (!$userId || !$skey || (string)((int)$userId) != $userId || !preg_match('/^[a-zA-Z0-9]+$/', $skey)) {
                 if ($isApi) {
                     return ["errcode" => 101, "errmsg" => "没有登录"];
                 }
-                return redirect($login['login'] . '?redirect=' . urlencode($request->fullUrl().'?from=login'));
+                return redirect($login['login'] . '?redirect=' . urlencode($request->fullUrl() . '?from=login'));
             }
 
             $cookie = 'oa_user_id=' . $userId . '; oa_skey=' . $skey;

app/Http/Services/SupplierApplyService.php

+<?php
+
+
+namespace App\Http\Services;
+
+//后台用户相关信息服务
+use App\Model\SupplierApplyModel;
+use App\Model\SupplierBlacklistModel;
+use App\Model\SupplierChannelModel;
+use Illuminate\Support\Facades\DB;
+
+class SupplierApplyService
+{
+
+    //判断是否能申请供应商
+    public function checkCanApplySupplier($supplierName)
+    {
+        //先去判断是否已经有申请,并且是通过或者待审核的,如果是的话,直接返回已申请
+        $supplierName = trim($supplierName);
+        $supplier = SupplierChannelModel::where('supplier_name', $supplierName)->first();
+        $supplier = !empty($supplier) ? $supplier->toArray() : [];
+        if ($supplier) {
+            $existSupplierApply = SupplierApplyModel::where('supplier_id', $supplier['supplier_id'])
+                ->whereIn('status', [SupplierApplyModel::STATUS_NEED_AUDIT, SupplierApplyModel::STATUS_PASS])->exists();
+            if ($existSupplierApply) {
+                return '贵司已申请云芯入驻，无需重复申请';
+            }
+            //再去判断是否有上传sku
+            $uploadedSku = $supplier['uploaded_sku'];
+            if ($uploadedSku != SupplierChannelModel::HAS_UPLOADED_SKU) {
+                return '贵司暂未与猎芯进行商品接入合作，请先联系猎芯对应采购经理或渠道经理进行商品合作';
+            }
+        }else{
+            //供应商不存在
+            return '贵司暂未入驻猎芯网，请先申请供应商入驻';
+        }
+        return true;
+    }
+
+    //申请供应商(通过供应商名称,申请已经存在的供应商)
+    public function applySupplier($data)
+    {
+        $supplierId = SupplierChannelModel::where('supplier_name', $data['supplier_name'])->value('supplier_id');
+        $data['create_time'] = time();
+        $data['supplier_id'] = $supplierId;
+        return SupplierApplyModel::insert($data);
+    }
+
+    //审核供应商申请
+    public function auditSupplierApply($applyId,$status,$auditReason)
+    {
+        return SupplierApplyModel::where('id',$applyId)->update([
+            'status' => $status,
+            'audit_reason' => $auditReason,
+            'update_time' => time(),
+            'audit_time' => time(),
+            'audit_name'=> request()->user->name,
+            'audit_uid' => request()->user->userId,
+        ]);
+    }
+}
\ No newline at end of file

app/Http/routes.php

@@ -53,6 +53,8 @@ Route::group(['middleware' => ['web'], 'namespace' => 'Api'], function () {
 //提供给其它系统使用的接口,不需要验证那种
 Route::group(['middleware' => ['external'], 'namespace' => 'Api'], function () {
     Route::get('/api/external/searchSupplier', 'ExternalApiController@searchSupplier');
+    Route::match(['get', 'post'], '/api/external/checkSupplierApply', 'ExternalApiController@checkSupplierApply');
+    Route::match(['get', 'post'], '/api/external/applySupplier', 'ExternalApiController@applySupplier');
 });
 
 //同步相关的接口
@@ -63,5 +65,4 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
 });
 
 Route::match(['get', 'post'], '/test', function () {
-//    (new \App\Http\Services\DataService())->exportSupplier();
 });

app/Model/SupplierApplyModel.php

+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupplierApplyModel extends Model
+{
+    protected $connection='web';
+    protected $table='supplier_apply';
+    protected $primaryKey = 'id';
+    public $timestamps = false;
+
+    const STATUS_PASS = 2;
+    const STATUS_NEED_AUDIT = 1;
+    const STATUS_REJECT = -1;
+
+    public function supplierChannel()
+    {
+        return $this->hasOne(SupplierChannelModel::class, 'supplier_id', 'supplier_id');
+    }
+}

app/Model/SupplierChannelModel.php

@@ -41,6 +41,9 @@ class SupplierChannelModel extends Model
     //供应商地区
     const REGION_CN = 2; //国内
 
+    //有上传过SKU
+    const HAS_UPLOADED_SKU = 1;
+
 
     //黑名单信息
     public function blacklist()

resources/lang/en/validation.php

@@ -35,7 +35,7 @@ return [
     'digits'               => 'The :attribute must be :digits digits.',
     'digits_between'       => 'The :attribute must be between :min and :max digits.',
     'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
+    'email'                => '邮箱地址不合法',
     'exists'               => 'The selected :attribute is invalid.',
     'filled'               => 'The :attribute field is required.',
     'image'                => 'The :attribute must be an image.',
@@ -45,23 +45,23 @@ return [
     'ip'                   => 'The :attribute must be a valid IP address.',
     'json'                 => 'The :attribute must be a valid JSON string.',
     'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
+        'numeric' => ':attribute 不能超过最大值 :max',
         'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
+        'string'  => ':attribute 不能超过 :max 个字符',
         'array'   => 'The :attribute may not have more than :max items.',
     ],
     'mimes'                => 'The :attribute must be a file of type: :values.',
     'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
+        'numeric' => ':attribute 最小为 :min',
         'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
+        'string'  => ':attribute 必须最少 :min 个字符',
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
     'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
+    'required'             => ':attribute 不能为空',
     'required_if'          => 'The :attribute field is required when :other is :value.',
     'required_unless'      => 'The :attribute field is required unless :other is in :values.',
     'required_with'        => 'The :attribute field is required when :values is present.',

vendor/_laravel_idea/_ide_helper_facades.php

-<?php //4765c824d409c78b48a06662d7183108
+<?php //7be1156b1f4885b5eb3e077bd4300933
 /** @noinspection all */
 
 namespace Illuminate\Support\Facades {
@@ -21,7 +21,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::getDeferredServices
      * @method static array getDeferredServices()
      * @see \Illuminate\Foundation\Application::registerDeferredProvider
-     * @method static void registerDeferredProvider($provider, $service = null)
+     * @method static void registerDeferredProvider(string $provider, string $service = null)
      * @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
@@ -33,13 +33,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Container\Container::extend
      * @method static void extend($abstract, \Closure $closure)
      * @see \Illuminate\Foundation\Application::useStoragePath
-     * @method static \Illuminate\Foundation\Application useStoragePath($path)
+     * @method static \Illuminate\Foundation\Application useStoragePath(string $path)
      * @see \Illuminate\Foundation\Application::hasBeenBootstrapped
      * @method static bool hasBeenBootstrapped()
      * @see \Illuminate\Container\Container::offsetUnset
      * @method static void offsetUnset($key)
      * @see \Illuminate\Foundation\Application::loadEnvironmentFrom
-     * @method static \Illuminate\Foundation\Application loadEnvironmentFrom($file)
+     * @method static \Illuminate\Foundation\Application loadEnvironmentFrom(string $file)
      * @see \Illuminate\Container\Container::setInstance
      * @method static void setInstance(\Illuminate\Contracts\Container\Container $container)
      * @see \Illuminate\Foundation\Application::terminate
@@ -51,11 +51,11 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::runningUnitTests
      * @method static bool runningUnitTests()
      * @see \Illuminate\Foundation\Application::setLocale
-     * @method static void setLocale($locale)
+     * @method static void setLocale(string $locale)
      * @see \Illuminate\Foundation\Application::bootstrapPath
      * @method static string bootstrapPath()
      * @see \Illuminate\Foundation\Application::detectEnvironment
-     * @method static mixed|string detectEnvironment(\Closure $callback)
+     * @method static string detectEnvironment(\Closure $callback)
      * @see \Illuminate\Foundation\Application::isLocal
      * @method static bool isLocal()
      * @see \Illuminate\Foundation\Application::getCachedServicesPath
@@ -65,21 +65,21 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::registerConfiguredProviders
      * @method static void registerConfiguredProviders()
      * @see \Illuminate\Foundation\Application::isLocale
-     * @method static bool isLocale($locale)
+     * @method static bool isLocale(string $locale)
      * @see \Illuminate\Container\Container::share
      * @method static \Closure share(\Closure $closure)
      * @see \Illuminate\Foundation\Application::getNamespace
-     * @method static int|null|string getNamespace()
+     * @method static null|string getNamespace()
      * @see \Illuminate\Container\Container::resolved
      * @method static bool resolved($abstract)
      * @see \Illuminate\Foundation\Application::getProvider
-     * @method static mixed getProvider($provider)
+     * @method static \Illuminate\Support\ServiceProvider|null getProvider(\Illuminate\Support\ServiceProvider|string $provider)
      * @see \Illuminate\Container\Container::refresh
      * @method static mixed|object|void refresh($abstract, $target, $method)
      * @see \Illuminate\Foundation\Application::registerCoreContainerAliases
      * @method static void registerCoreContainerAliases()
      * @see \Illuminate\Foundation\Application::useDatabasePath
-     * @method static \Illuminate\Foundation\Application useDatabasePath($path)
+     * @method static \Illuminate\Foundation\Application useDatabasePath(string $path)
      * @see \Illuminate\Foundation\Application::environmentFilePath
      * @method static string environmentFilePath()
      * @see \Illuminate\Foundation\Application::booting
@@ -89,15 +89,15 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Container\Container::call
      * @method static mixed call($callback, array $parameters = [], $defaultMethod = null)
      * @see \Illuminate\Foundation\Application::getLocale
-     * @method static void getLocale()
+     * @method static string getLocale()
      * @see \Illuminate\Foundation\Application::terminating
      * @method static \Illuminate\Foundation\Application terminating(\Closure $callback)
      * @see \Illuminate\Foundation\Application::beforeBootstrapping
-     * @method static void beforeBootstrapping($bootstrapper, \Closure $callback)
+     * @method static void beforeBootstrapping(string $bootstrapper, \Closure $callback)
      * @see \Illuminate\Container\Container::wrap
      * @method static \Closure wrap(\Closure $callback, array $parameters = [])
      * @see \Illuminate\Foundation\Application::register
-     * @method static \Illuminate\Support\ServiceProvider|mixed|string register($provider, $options = [], $force = false)
+     * @method static \Illuminate\Support\ServiceProvider|null|string register(\Illuminate\Support\ServiceProvider|string $provider, array $options = [], bool $force = false)
      * @see \Illuminate\Foundation\Application::environmentPath
      * @method static string environmentPath()
      * @see \Illuminate\Foundation\Application::addDeferredServices
@@ -113,13 +113,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::storagePath
      * @method static string storagePath()
      * @see \Illuminate\Foundation\Application::resolveProviderClass
-     * @method static mixed resolveProviderClass($provider)
+     * @method static \Illuminate\Support\ServiceProvider resolveProviderClass(string $provider)
      * @see \Illuminate\Foundation\Application::loadDeferredProvider
-     * @method static void loadDeferredProvider($service)
+     * @method static void loadDeferredProvider(string $service)
      * @see \Illuminate\Foundation\Application::booted
      * @method static void booted($callback)
      * @see \Illuminate\Foundation\Application::routesAreCached
-     * @method static void routesAreCached()
+     * @method static bool routesAreCached()
      * @see \Illuminate\Container\Container::tag
      * @method static void tag($abstracts, $tags)
      * @see \Illuminate\Foundation\Application::publicPath
@@ -131,11 +131,11 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::loadDeferredProviders
      * @method static void loadDeferredProviders()
      * @see \Illuminate\Foundation\Application::abort
-     * @method static void abort($code, $message = '', array $headers = [])
+     * @method static void abort(int $code, string $message = '', array $headers = [])
      * @see \Illuminate\Container\Container::afterResolving
      * @method static void afterResolving($abstract, \Closure $callback = null)
      * @see \Illuminate\Foundation\Application::afterBootstrapping
-     * @method static void afterBootstrapping($bootstrapper, \Closure $callback)
+     * @method static void afterBootstrapping(string $bootstrapper, \Closure $callback)
      * @see \Illuminate\Foundation\Application::configurationIsCached
      * @method static bool configurationIsCached()
      * @see \Illuminate\Foundation\Application::runningInConsole
@@ -157,7 +157,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Foundation\Application::boot
      * @method static void boot()
      * @see \Illuminate\Foundation\Application::make
-     * @method static mixed|object make($abstract, array $parameters = [])
+     * @method static mixed make(string $abstract, array $parameters = [])
      * @see \Illuminate\Foundation\Application::getMonologConfigurator
      * @method static callable|null getMonologConfigurator()
      * @see \Illuminate\Foundation\Application::bootstrapWith
@@ -171,7 +171,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Container\Container::resolving
      * @method static void resolving($abstract, \Closure $callback = null)
      * @see \Illuminate\Foundation\Application::bound
-     * @method static bool bound($abstract)
+     * @method static bool bound(string $abstract)
      * @see \Illuminate\Foundation\Application::isBooted
      * @method static bool isBooted()
      * @see \Illuminate\Foundation\Application::getCachedRoutesPath
@@ -179,13 +179,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Container\Container::getBindings
      * @method static array getBindings()
      * @see \Illuminate\Foundation\Application::useEnvironmentPath
-     * @method static \Illuminate\Foundation\Application useEnvironmentPath($path)
+     * @method static \Illuminate\Foundation\Application useEnvironmentPath(string $path)
      * @see \Illuminate\Foundation\Application::setBasePath
-     * @method static \Illuminate\Foundation\Application setBasePath($basePath)
+     * @method static \Illuminate\Foundation\Application setBasePath(string $basePath)
      * @see \Illuminate\Foundation\Application::environment
      * @method static bool|string environment()
      * @see \Illuminate\Foundation\Application::isDeferredService
-     * @method static bool isDeferredService($service)
+     * @method static bool isDeferredService(string $service)
      * @see \Illuminate\Container\Container::build
      * @method static mixed|object build($concrete, array $parameters = [])
      * @see \Illuminate\Foundation\Application::getCachedConfigPath
@@ -241,15 +241,15 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Contracts\Auth\Guard::setUser
      * @method static void setUser(\Illuminate\Contracts\Auth\Authenticatable $user)
      * @see \Illuminate\Contracts\Auth\Guard::guest
-     * @method static void guest()
+     * @method static bool guest()
      * @see \Illuminate\Contracts\Auth\Guard::id
-     * @method static void id()
+     * @method static int|null id()
      * @see \Illuminate\Contracts\Auth\Guard::check
-     * @method static void check()
+     * @method static bool check()
      * @see \Illuminate\Contracts\Auth\Guard::user
-     * @method static void user()
+     * @method static \Illuminate\Contracts\Auth\Authenticatable|null user()
      * @see \Illuminate\Contracts\Auth\Guard::validate
-     * @method static void validate(array $credentials = [])
+     * @method static bool validate(array $credentials = [])
      * @see \Illuminate\Contracts\Auth\StatefulGuard::onceUsingId
      * @method static void onceUsingId($id)
      * @see \Illuminate\Contracts\Auth\StatefulGuard::login
@@ -271,37 +271,37 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\View\Compilers\BladeCompiler::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)
      * @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)
      * @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 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 getExtensions()
      */
@@ -309,11 +309,11 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @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 {}
     
@@ -343,7 +343,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Cache\Repository::remember
      * @method static array|mixed remember(string $key, \DateTime|int $minutes, \Closure $callback)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Illuminate\Cache\Repository::get
      * @method static array|mixed get(string $key, $default = null)
      * @see \Illuminate\Cache\Repository::putMany
@@ -357,7 +357,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Cache\Repository::getStore
      * @method static \Illuminate\Contracts\Cache\Store getStore()
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Illuminate\Cache\Repository::getDefaultCacheTime
      * @method static int getDefaultCacheTime()
      * @see \Illuminate\Cache\Repository::many
@@ -375,7 +375,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Cache\Repository::sear
      * @method static array|mixed sear(string $key, \Closure $callback)
      * @see \Illuminate\Support\Traits\Macroable::macroCall
-     * @method static mixed macroCall(string $method, array $parameters)
+     * @method static mixed macroCall($method, $parameters)
      * @see \Illuminate\Cache\Repository::forever
      * @method static void forever(string $key, $value)
      */
@@ -429,11 +429,11 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Encryption\Encrypter::encrypt
-     * @method static string encrypt($value)
+     * @method static string encrypt(string $value)
      * @see \Illuminate\Encryption\Encrypter::decrypt
-     * @method static mixed|string decrypt($payload)
+     * @method static string decrypt(string $payload)
      * @see \Illuminate\Encryption\Encrypter::supported
-     * @method static bool supported($key, $cipher)
+     * @method static bool supported(string $key, string $cipher)
      */
     class Crypt {}
     
@@ -617,71 +617,71 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Filesystem\Filesystem::extension
-     * @method static string extension(string $path)
+     * @method static string|string[] extension($path)
      * @see \Illuminate\Filesystem\Filesystem::isWritable
-     * @method static bool isWritable(string $path)
+     * @method static bool isWritable($path)
      * @see \Illuminate\Filesystem\Filesystem::prepend
-     * @method static int prepend(string $path, string $data)
+     * @method static false|int prepend($path, $data)
      * @see \Illuminate\Filesystem\Filesystem::glob
-     * @method static array glob(string $pattern, int $flags = 0)
+     * @method static array|false glob($pattern, $flags = 0)
      * @see \Illuminate\Filesystem\Filesystem::type
-     * @method static string type(string $path)
+     * @method static false|string type($path)
      * @see \Illuminate\Filesystem\Filesystem::dirname
-     * @method static string dirname(string $path)
+     * @method static string|string[] dirname($path)
      * @see \Illuminate\Filesystem\Filesystem::delete
-     * @method static bool delete(array|string $paths)
+     * @method static bool delete($paths)
      * @see \Illuminate\Filesystem\Filesystem::put
-     * @method static int put(string $path, string $contents, bool $lock = false)
+     * @method static false|int put($path, $contents, $lock = false)
      * @see \Illuminate\Filesystem\Filesystem::requireOnce
-     * @method static mixed requireOnce(string $file)
+     * @method static void requireOnce($file)
      * @see \Illuminate\Filesystem\Filesystem::copyDirectory
-     * @method static bool copyDirectory(string $directory, string $destination, int $options = null)
+     * @method static bool copyDirectory($directory, $destination, $options = null)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Illuminate\Filesystem\Filesystem::get
-     * @method static string get(string $path, bool $lock = false)
+     * @method static false|string get($path, $lock = false)
      * @see \Illuminate\Filesystem\Filesystem::isFile
-     * @method static bool isFile(string $file)
+     * @method static bool isFile($file)
      * @see \Illuminate\Filesystem\Filesystem::directories
-     * @method static array directories(string $directory)
+     * @method static array directories($directory)
      * @see \Illuminate\Filesystem\Filesystem::copy
-     * @method static bool copy(string $path, string $target)
+     * @method static bool copy($path, $target)
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Illuminate\Filesystem\Filesystem::move
-     * @method static bool move(string $path, string $target)
+     * @method static bool move($path, $target)
      * @see \Illuminate\Filesystem\Filesystem::isDirectory
-     * @method static bool isDirectory(string $directory)
+     * @method static bool isDirectory($directory)
      * @see \Illuminate\Filesystem\Filesystem::moveDirectory
-     * @method static bool moveDirectory(string $from, string $to, bool $overwrite = false)
+     * @method static bool moveDirectory($from, $to, $overwrite = false)
      * @see \Illuminate\Filesystem\Filesystem::sharedGet
-     * @method static string sharedGet(string $path)
+     * @method static false|string sharedGet($path)
      * @see \Illuminate\Filesystem\Filesystem::getRequire
-     * @method static mixed getRequire(string $path)
+     * @method static mixed getRequire($path)
      * @see \Illuminate\Filesystem\Filesystem::deleteDirectory
-     * @method static bool deleteDirectory(string $directory, bool $preserve = false)
+     * @method static bool deleteDirectory($directory, $preserve = false)
      * @see \Illuminate\Filesystem\Filesystem::basename
-     * @method static string basename(string $path)
+     * @method static string|string[] basename($path)
      * @see \Illuminate\Filesystem\Filesystem::size
-     * @method static int size(string $path)
+     * @method static false|int size($path)
      * @see \Illuminate\Filesystem\Filesystem::lastModified
-     * @method static int lastModified(string $path)
+     * @method static false|int lastModified($path)
      * @see \Illuminate\Filesystem\Filesystem::makeDirectory
-     * @method static bool makeDirectory(string $path, int $mode = 0755, bool $recursive = false, bool $force = false)
+     * @method static bool makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
      * @see \Illuminate\Filesystem\Filesystem::name
-     * @method static string name(string $path)
+     * @method static string|string[] name($path)
      * @see \Illuminate\Filesystem\Filesystem::files
-     * @method static array files(string $directory)
+     * @method static array|false files($directory)
      * @see \Illuminate\Filesystem\Filesystem::exists
-     * @method static bool exists(string $path)
+     * @method static bool exists($path)
      * @see \Illuminate\Filesystem\Filesystem::mimeType
-     * @method static false|string mimeType(string $path)
+     * @method static mixed mimeType($path)
      * @see \Illuminate\Filesystem\Filesystem::allFiles
-     * @method static array allFiles(string $directory, bool $hidden = false)
+     * @method static array allFiles($directory, $hidden = false)
      * @see \Illuminate\Filesystem\Filesystem::cleanDirectory
-     * @method static bool cleanDirectory(string $directory)
+     * @method static bool cleanDirectory($directory)
      * @see \Illuminate\Filesystem\Filesystem::append
-     * @method static int append(string $path, string $data)
+     * @method static false|int append($path, $data)
      */
     class File {}
     
@@ -721,7 +721,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::hasPreviousSession
      * @method static bool hasPreviousSession()
      * @see \Symfony\Component\HttpFoundation\Request::isMethod
-     * @method static bool isMethod(string $method)
+     * @method static bool isMethod($method)
      * @see \Illuminate\Http\Request::fullUrl
      * @method static string fullUrl()
      * @see \Illuminate\Http\Request::getUserResolver
@@ -759,13 +759,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::ip
      * @method static mixed|string ip()
      * @see \Symfony\Component\HttpFoundation\Request::getContent
-     * @method static resource|string getContent(bool $asResource = false)
+     * @method static false|resource|string getContent($asResource = false)
      * @see \Symfony\Component\HttpFoundation\Request::getBaseUrl
-     * @method static false|string getBaseUrl()
+     * @method static false|mixed|string getBaseUrl()
      * @see \Illuminate\Http\Request::is
      * @method static bool is()
      * @see \Symfony\Component\HttpFoundation\Request::getUriForPath
-     * @method static string getUriForPath(string $path)
+     * @method static string getUriForPath($path)
      * @see \Illuminate\Http\Request::ips
      * @method static array ips()
      * @see \Illuminate\Http\Request::getRouteResolver
@@ -777,7 +777,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::route
      * @method static mixed route($param = null)
      * @see \Symfony\Component\HttpFoundation\Request::getPathInfo
-     * @method static string getPathInfo()
+     * @method static array|mixed|null|string getPathInfo()
      * @see \Illuminate\Http\Request::offsetUnset
      * @method static void offsetUnset($offset)
      * @see \Illuminate\Http\Request::flashOnly
@@ -787,25 +787,25 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::decodedPath
      * @method static string decodedPath()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestFormat
-     * @method static string getRequestFormat(string $default = 'html')
+     * @method static mixed|null getRequestFormat($default = 'html')
      * @see \Illuminate\Http\Request::flash
      * @method static void flash($filter = null, $keys = [])
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedHeaderName
-     * @method static void setTrustedHeaderName(string $key, string $value)
+     * @method static void setTrustedHeaderName($key, $value)
      * @see \Illuminate\Http\Request::server
      * @method static void server($key = null, $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::setLocale
-     * @method static void setLocale(string $locale)
+     * @method static void setLocale($locale)
      * @see \Illuminate\Http\Request::setUserResolver
      * @method static \Illuminate\Http\Request setUserResolver(\Closure $callback)
      * @see \Symfony\Component\HttpFoundation\Request::setDefaultLocale
-     * @method static void setDefaultLocale(string $locale)
+     * @method static void setDefaultLocale($locale)
      * @see \Symfony\Component\HttpFoundation\Request::getPort
-     * @method static int|string getPort()
+     * @method static array|int|mixed|null|string getPort()
      * @see \Illuminate\Http\Request::setRouteResolver
      * @method static \Illuminate\Http\Request setRouteResolver(\Closure $callback)
      * @see \Symfony\Component\HttpFoundation\Request::setRequestFormat
-     * @method static void setRequestFormat(string $format)
+     * @method static void setRequestFormat($format)
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies
      * @method static void setTrustedProxies(array $proxies)
      * @see \Illuminate\Http\Request::wantsJson
@@ -813,17 +813,17 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getHttpMethodParameterOverride
      * @method static bool getHttpMethodParameterOverride()
      * @see \Symfony\Component\HttpFoundation\Request::getETags
-     * @method static array getETags()
+     * @method static array|false|string[] getETags()
      * @see \Illuminate\Http\Request::segments
      * @method static array segments()
      * @see \Illuminate\Http\Request::file
      * @method static mixed file($key = null, $default = null)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Symfony\Component\HttpFoundation\Request::getContentType
-     * @method static null|string getContentType()
+     * @method static int|string|void getContentType()
      * @see \Symfony\Component\HttpFoundation\Request::get
-     * @method static mixed get(string $key, $default = null)
+     * @method static mixed|null get($key, $default = null)
      * @see \Illuminate\Http\Request::matchesType
      * @method static bool matchesType($actual, $type)
      * @see \Illuminate\Http\Request::acceptsJson
@@ -831,37 +831,37 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::prefers
      * @method static mixed|void prefers($contentTypes)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedProxies
-     * @method static array|string[] getTrustedProxies()
+     * @method static array getTrustedProxies()
      * @see \Symfony\Component\HttpFoundation\Request::getDefaultLocale
      * @method static string getDefaultLocale()
      * @see \Symfony\Component\HttpFoundation\Request::getCharsets
      * @method static array getCharsets()
      * @see \Symfony\Component\HttpFoundation\Request::getSession
-     * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
+     * @method static \Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
      * @see \Illuminate\Http\Request::hasHeader
      * @method static bool hasHeader($key)
      * @see \Symfony\Component\HttpFoundation\Request::getUserInfo
-     * @method static null|string getUserInfo()
+     * @method static array|mixed|null|string getUserInfo()
      * @see \Illuminate\Http\Request::url
      * @method static string url()
      * @see \Symfony\Component\HttpFoundation\Request::setMethod
-     * @method static void setMethod(string $method)
+     * @method static void setMethod($method)
      * @see \Symfony\Component\HttpFoundation\Request::getHost
      * @method static string getHost()
      * @see \Symfony\Component\HttpFoundation\Request::getPassword
-     * @method static null|string getPassword()
+     * @method static array|mixed|null|string getPassword()
      * @see \Symfony\Component\HttpFoundation\Request::getLocale
      * @method static string getLocale()
      * @see \Illuminate\Http\Request::exists
      * @method static bool exists($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(), resource|string $content = null)
+     * @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)
      * @see \Symfony\Component\HttpFoundation\Request::getRelativeUriForPath
-     * @method static string getRelativeUriForPath(string $path)
+     * @method static mixed|string getRelativeUriForPath($path)
      * @see \Illuminate\Http\Request::pjax
      * @method static bool pjax()
      * @see \Symfony\Component\HttpFoundation\Request::createFromGlobals
@@ -877,7 +877,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getRealMethod
      * @method static string getRealMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getPreferredLanguage
-     * @method static null|string getPreferredLanguage(array $locales = null)
+     * @method static mixed|null getPreferredLanguage(array $locales = null)
      * @see \Illuminate\Http\Request::bearerToken
      * @method static string|void bearerToken()
      * @see \Symfony\Component\HttpFoundation\Request::getClientIps
@@ -887,15 +887,15 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::only
      * @method static array only($keys)
      * @see \Symfony\Component\HttpFoundation\Request::setFactory
-     * @method static void setFactory(callable|null $callable)
+     * @method static void setFactory($callable)
      * @see \Symfony\Component\HttpFoundation\Request::create
-     * @method static \Symfony\Component\HttpFoundation\Request create(string $uri, string $method = 'GET', array $parameters = array(), array $cookies = array(), array $files = array(), array $server = array(), string $content = null)
+     * @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)
      * @see \Symfony\Component\HttpFoundation\Request::getHttpHost
      * @method static string getHttpHost()
      * @see \Symfony\Component\HttpFoundation\Request::setFormat
-     * @method static void setFormat(string $format, array|string $mimeTypes)
+     * @method static void setFormat($format, $mimeTypes)
      * @see \Illuminate\Http\Request::all
      * @method static array all()
      * @see \Illuminate\Http\Request::isJson
@@ -913,13 +913,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::duplicate
      * @method static \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 string getClientIp()
+     * @method static mixed getClientIp()
      * @see \Illuminate\Http\Request::hasCookie
      * @method static bool hasCookie($key)
      * @see \Symfony\Component\HttpFoundation\Request::getUser
-     * @method static null|string getUser()
+     * @method static array|mixed|null|string getUser()
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHosts
-     * @method static array|string[] getTrustedHosts()
+     * @method static array getTrustedHosts()
      * @see \Illuminate\Http\Request::header
      * @method static void header($key = null, $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::getBasePath
@@ -927,7 +927,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::offsetGet
      * @method static mixed offsetGet($offset)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHeaderName
-     * @method static string getTrustedHeaderName(string $key)
+     * @method static string getTrustedHeaderName($key)
      * @see \Illuminate\Http\Request::session
      * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface session()
      * @see \Symfony\Component\HttpFoundation\Request::isNoCache
@@ -937,13 +937,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getMethod
      * @method static string getMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getMimeType
-     * @method static null|string getMimeType(string $format)
+     * @method static mixed|null getMimeType($format)
      * @see \Illuminate\Http\Request::flashExcept
      * @method static void flashExcept($keys)
      * @see \Illuminate\Http\Request::flush
      * @method static void flush()
      * @see \Symfony\Component\HttpFoundation\Request::normalizeQueryString
-     * @method static string normalizeQueryString(string $qs)
+     * @method static string normalizeQueryString($qs)
      * @see \Illuminate\Http\Request::root
      * @method static string root()
      * @see \Illuminate\Http\Request::json
@@ -953,11 +953,11 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getUri
      * @method static string getUri()
      * @see \Symfony\Component\HttpFoundation\Request::getFormat
-     * @method static null|string getFormat(string $mimeType)
+     * @method static int|string|void getFormat($mimeType)
      * @see \Symfony\Component\HttpFoundation\Request::getScriptName
-     * @method static string getScriptName()
+     * @method static mixed|null getScriptName()
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Symfony\Component\HttpFoundation\Request::isSecure
      * @method static bool isSecure()
      * @see \Illuminate\Http\Request::fullUrlWithQuery
@@ -971,7 +971,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getAcceptableContentTypes
      * @method static array getAcceptableContentTypes()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestUri
-     * @method static string getRequestUri()
+     * @method static array|false|mixed|null|string getRequestUri()
      * @see \Illuminate\Http\Request::toArray
      * @method static array toArray()
      * @see \Illuminate\Http\Request::allFiles
@@ -1003,7 +1003,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Translation\Translator::has
      * @method static bool has(string $key, null|string $locale = null, bool $fallback = true)
      * @see \Illuminate\Support\NamespacedItemResolver::setParsedKey
-     * @method static void setParsedKey($key, $parsed)
+     * @method static void setParsedKey(string $key, array $parsed)
      * @see \Illuminate\Translation\Translator::addNamespace
      * @method static void addNamespace(string $namespace, string $hint)
      * @see \Illuminate\Translation\Translator::getFallback
@@ -1025,41 +1025,41 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Log\Writer::useSyslog
-     * @method static \Monolog\Logger useSyslog($name = 'laravel', $level = 'debug')
+     * @method static \Psr\Log\LoggerInterface useSyslog(string $name = 'laravel', string $level = 'debug')
      * @see \Illuminate\Log\Writer::debug
-     * @method static void debug($message, array $context = [])
+     * @method static void debug(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::critical
-     * @method static void critical($message, array $context = [])
+     * @method static void critical(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::log
-     * @method static void log($level, $message, array $context = [])
+     * @method static void log(string $level, string $message, array $context = [])
      * @see \Illuminate\Log\Writer::useDailyFiles
-     * @method static void useDailyFiles($path, $days = 0, $level = 'debug')
+     * @method static void useDailyFiles(string $path, int $days = 0, string $level = 'debug')
      * @see \Illuminate\Log\Writer::emergency
-     * @method static void emergency($message, array $context = [])
+     * @method static void emergency(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::getMonolog
      * @method static \Monolog\Logger getMonolog()
      * @see \Illuminate\Log\Writer::error
-     * @method static void error($message, array $context = [])
+     * @method static void error(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::setEventDispatcher
      * @method static void setEventDispatcher(\Illuminate\Contracts\Events\Dispatcher $dispatcher)
      * @see \Illuminate\Log\Writer::useFiles
-     * @method static void useFiles($path, $level = 'debug')
+     * @method static void useFiles(string $path, string $level = 'debug')
      * @see \Illuminate\Log\Writer::listen
      * @method static void listen(\Closure $callback)
      * @see \Illuminate\Log\Writer::alert
-     * @method static void alert($message, array $context = [])
+     * @method static void alert(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::getEventDispatcher
      * @method static \Illuminate\Contracts\Events\Dispatcher getEventDispatcher()
      * @see \Illuminate\Log\Writer::warning
-     * @method static void warning($message, array $context = [])
+     * @method static void warning(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::useErrorLog
-     * @method static void useErrorLog($level = 'debug', $messageType = ErrorLogHandler::OPERATING_SYSTEM)
+     * @method static void useErrorLog(string $level = 'debug', int $messageType = ErrorLogHandler::OPERATING_SYSTEM)
      * @see \Illuminate\Log\Writer::write
-     * @method static void write($level, $message, array $context = [])
+     * @method static void write(string $level, string $message, array $context = [])
      * @see \Illuminate\Log\Writer::info
-     * @method static void info($message, array $context = [])
+     * @method static void info(string $message, array $context = [])
      * @see \Illuminate\Log\Writer::notice
-     * @method static void notice($message, array $context = [])
+     * @method static void notice(string $message, array $context = [])
      */
     class Log {}
     
@@ -1211,7 +1211,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::hasPreviousSession
      * @method static bool hasPreviousSession()
      * @see \Symfony\Component\HttpFoundation\Request::isMethod
-     * @method static bool isMethod(string $method)
+     * @method static bool isMethod($method)
      * @see \Illuminate\Http\Request::fullUrl
      * @method static string fullUrl()
      * @see \Illuminate\Http\Request::getUserResolver
@@ -1249,13 +1249,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::ip
      * @method static mixed|string ip()
      * @see \Symfony\Component\HttpFoundation\Request::getContent
-     * @method static resource|string getContent(bool $asResource = false)
+     * @method static false|resource|string getContent($asResource = false)
      * @see \Symfony\Component\HttpFoundation\Request::getBaseUrl
-     * @method static false|string getBaseUrl()
+     * @method static false|mixed|string getBaseUrl()
      * @see \Illuminate\Http\Request::is
      * @method static bool is()
      * @see \Symfony\Component\HttpFoundation\Request::getUriForPath
-     * @method static string getUriForPath(string $path)
+     * @method static string getUriForPath($path)
      * @see \Illuminate\Http\Request::ips
      * @method static array ips()
      * @see \Illuminate\Http\Request::getRouteResolver
@@ -1267,7 +1267,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::route
      * @method static mixed route($param = null)
      * @see \Symfony\Component\HttpFoundation\Request::getPathInfo
-     * @method static string getPathInfo()
+     * @method static array|mixed|null|string getPathInfo()
      * @see \Illuminate\Http\Request::offsetUnset
      * @method static void offsetUnset($offset)
      * @see \Illuminate\Http\Request::flashOnly
@@ -1277,25 +1277,25 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::decodedPath
      * @method static string decodedPath()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestFormat
-     * @method static string getRequestFormat(string $default = 'html')
+     * @method static mixed|null getRequestFormat($default = 'html')
      * @see \Illuminate\Http\Request::flash
      * @method static void flash($filter = null, $keys = [])
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedHeaderName
-     * @method static void setTrustedHeaderName(string $key, string $value)
+     * @method static void setTrustedHeaderName($key, $value)
      * @see \Illuminate\Http\Request::server
      * @method static void server($key = null, $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::setLocale
-     * @method static void setLocale(string $locale)
+     * @method static void setLocale($locale)
      * @see \Illuminate\Http\Request::setUserResolver
      * @method static \Illuminate\Http\Request setUserResolver(\Closure $callback)
      * @see \Symfony\Component\HttpFoundation\Request::setDefaultLocale
-     * @method static void setDefaultLocale(string $locale)
+     * @method static void setDefaultLocale($locale)
      * @see \Symfony\Component\HttpFoundation\Request::getPort
-     * @method static int|string getPort()
+     * @method static array|int|mixed|null|string getPort()
      * @see \Illuminate\Http\Request::setRouteResolver
      * @method static \Illuminate\Http\Request setRouteResolver(\Closure $callback)
      * @see \Symfony\Component\HttpFoundation\Request::setRequestFormat
-     * @method static void setRequestFormat(string $format)
+     * @method static void setRequestFormat($format)
      * @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies
      * @method static void setTrustedProxies(array $proxies)
      * @see \Illuminate\Http\Request::wantsJson
@@ -1303,17 +1303,17 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getHttpMethodParameterOverride
      * @method static bool getHttpMethodParameterOverride()
      * @see \Symfony\Component\HttpFoundation\Request::getETags
-     * @method static array getETags()
+     * @method static array|false|string[] getETags()
      * @see \Illuminate\Http\Request::segments
      * @method static array segments()
      * @see \Illuminate\Http\Request::file
      * @method static mixed file($key = null, $default = null)
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Symfony\Component\HttpFoundation\Request::getContentType
-     * @method static null|string getContentType()
+     * @method static int|string|void getContentType()
      * @see \Symfony\Component\HttpFoundation\Request::get
-     * @method static mixed get(string $key, $default = null)
+     * @method static mixed|null get($key, $default = null)
      * @see \Illuminate\Http\Request::matchesType
      * @method static bool matchesType($actual, $type)
      * @see \Illuminate\Http\Request::acceptsJson
@@ -1321,37 +1321,37 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::prefers
      * @method static mixed|void prefers($contentTypes)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedProxies
-     * @method static array|string[] getTrustedProxies()
+     * @method static array getTrustedProxies()
      * @see \Symfony\Component\HttpFoundation\Request::getDefaultLocale
      * @method static string getDefaultLocale()
      * @see \Symfony\Component\HttpFoundation\Request::getCharsets
      * @method static array getCharsets()
      * @see \Symfony\Component\HttpFoundation\Request::getSession
-     * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
+     * @method static \Symfony\Component\HttpFoundation\Session\SessionInterface getSession()
      * @see \Illuminate\Http\Request::hasHeader
      * @method static bool hasHeader($key)
      * @see \Symfony\Component\HttpFoundation\Request::getUserInfo
-     * @method static null|string getUserInfo()
+     * @method static array|mixed|null|string getUserInfo()
      * @see \Illuminate\Http\Request::url
      * @method static string url()
      * @see \Symfony\Component\HttpFoundation\Request::setMethod
-     * @method static void setMethod(string $method)
+     * @method static void setMethod($method)
      * @see \Symfony\Component\HttpFoundation\Request::getHost
      * @method static string getHost()
      * @see \Symfony\Component\HttpFoundation\Request::getPassword
-     * @method static null|string getPassword()
+     * @method static array|mixed|null|string getPassword()
      * @see \Symfony\Component\HttpFoundation\Request::getLocale
      * @method static string getLocale()
      * @see \Illuminate\Http\Request::exists
      * @method static bool exists($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(), resource|string $content = null)
+     * @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)
      * @see \Symfony\Component\HttpFoundation\Request::getRelativeUriForPath
-     * @method static string getRelativeUriForPath(string $path)
+     * @method static mixed|string getRelativeUriForPath($path)
      * @see \Illuminate\Http\Request::pjax
      * @method static bool pjax()
      * @see \Symfony\Component\HttpFoundation\Request::createFromGlobals
@@ -1367,7 +1367,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getRealMethod
      * @method static string getRealMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getPreferredLanguage
-     * @method static null|string getPreferredLanguage(array $locales = null)
+     * @method static mixed|null getPreferredLanguage(array $locales = null)
      * @see \Illuminate\Http\Request::bearerToken
      * @method static string|void bearerToken()
      * @see \Symfony\Component\HttpFoundation\Request::getClientIps
@@ -1377,15 +1377,15 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::only
      * @method static array only($keys)
      * @see \Symfony\Component\HttpFoundation\Request::setFactory
-     * @method static void setFactory(callable|null $callable)
+     * @method static void setFactory($callable)
      * @see \Symfony\Component\HttpFoundation\Request::create
-     * @method static \Symfony\Component\HttpFoundation\Request create(string $uri, string $method = 'GET', array $parameters = array(), array $cookies = array(), array $files = array(), array $server = array(), string $content = null)
+     * @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)
      * @see \Symfony\Component\HttpFoundation\Request::getHttpHost
      * @method static string getHttpHost()
      * @see \Symfony\Component\HttpFoundation\Request::setFormat
-     * @method static void setFormat(string $format, array|string $mimeTypes)
+     * @method static void setFormat($format, $mimeTypes)
      * @see \Illuminate\Http\Request::all
      * @method static array all()
      * @see \Illuminate\Http\Request::isJson
@@ -1403,13 +1403,13 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::duplicate
      * @method static \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 string getClientIp()
+     * @method static mixed getClientIp()
      * @see \Illuminate\Http\Request::hasCookie
      * @method static bool hasCookie($key)
      * @see \Symfony\Component\HttpFoundation\Request::getUser
-     * @method static null|string getUser()
+     * @method static array|mixed|null|string getUser()
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHosts
-     * @method static array|string[] getTrustedHosts()
+     * @method static array getTrustedHosts()
      * @see \Illuminate\Http\Request::header
      * @method static void header($key = null, $default = null)
      * @see \Symfony\Component\HttpFoundation\Request::getBasePath
@@ -1417,7 +1417,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Http\Request::offsetGet
      * @method static mixed offsetGet($offset)
      * @see \Symfony\Component\HttpFoundation\Request::getTrustedHeaderName
-     * @method static string getTrustedHeaderName(string $key)
+     * @method static string getTrustedHeaderName($key)
      * @see \Illuminate\Http\Request::session
      * @method static null|\Symfony\Component\HttpFoundation\Session\SessionInterface session()
      * @see \Symfony\Component\HttpFoundation\Request::isNoCache
@@ -1427,13 +1427,13 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getMethod
      * @method static string getMethod()
      * @see \Symfony\Component\HttpFoundation\Request::getMimeType
-     * @method static null|string getMimeType(string $format)
+     * @method static mixed|null getMimeType($format)
      * @see \Illuminate\Http\Request::flashExcept
      * @method static void flashExcept($keys)
      * @see \Illuminate\Http\Request::flush
      * @method static void flush()
      * @see \Symfony\Component\HttpFoundation\Request::normalizeQueryString
-     * @method static string normalizeQueryString(string $qs)
+     * @method static string normalizeQueryString($qs)
      * @see \Illuminate\Http\Request::root
      * @method static string root()
      * @see \Illuminate\Http\Request::json
@@ -1443,11 +1443,11 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getUri
      * @method static string getUri()
      * @see \Symfony\Component\HttpFoundation\Request::getFormat
-     * @method static null|string getFormat(string $mimeType)
+     * @method static int|string|void getFormat($mimeType)
      * @see \Symfony\Component\HttpFoundation\Request::getScriptName
-     * @method static string getScriptName()
+     * @method static mixed|null getScriptName()
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Symfony\Component\HttpFoundation\Request::isSecure
      * @method static bool isSecure()
      * @see \Illuminate\Http\Request::fullUrlWithQuery
@@ -1461,7 +1461,7 @@ namespace Illuminate\Support\Facades {
      * @see \Symfony\Component\HttpFoundation\Request::getAcceptableContentTypes
      * @method static array getAcceptableContentTypes()
      * @see \Symfony\Component\HttpFoundation\Request::getRequestUri
-     * @method static string getRequestUri()
+     * @method static array|false|mixed|null|string getRequestUri()
      * @see \Illuminate\Http\Request::toArray
      * @method static array toArray()
      * @see \Illuminate\Http\Request::allFiles
@@ -1563,7 +1563,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Routing\Router::hasGroupStack
      * @method static bool hasGroupStack()
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Illuminate\Routing\Router::getMiddleware
      * @method static array getMiddleware()
      * @see \Illuminate\Routing\Router::get
@@ -1579,7 +1579,7 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Routing\Router::gatherRouteMiddlewares
      * @method static array gatherRouteMiddlewares(\Illuminate\Routing\Route $route)
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Illuminate\Routing\Router::controller
      * @method static void controller(string $uri, string $controller, array $names = [])
      * @see \Illuminate\Routing\Router::middlewareGroup
@@ -1649,9 +1649,9 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Session\SessionManager::getSessionConfig
      * @method static array getSessionConfig()
      * @see \Illuminate\Support\Manager::extend
-     * @method static \Illuminate\Support\Manager extend(string $driver, \Closure $callback)
+     * @method static \Illuminate\Support\Manager extend($driver, \Closure $callback)
      * @see \Illuminate\Support\Manager::driver
-     * @method static mixed driver(string $driver = null)
+     * @method static mixed driver($driver = null)
      * @see \Illuminate\Session\SessionManager::getDefaultDriver
      * @method static string getDefaultDriver()
      * @see \Illuminate\Support\Manager::getDrivers
@@ -1777,19 +1777,19 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\Routing\UrlGenerator::secure
-     * @method static string secure(string $path, array $parameters = [])
+     * @method static string secure($path, $parameters = [])
      * @see \Illuminate\Routing\UrlGenerator::current
      * @method static string current()
      * @see \Illuminate\Support\Traits\Macroable::hasMacro
-     * @method static bool hasMacro(string $name)
+     * @method static bool hasMacro($name)
      * @see \Illuminate\Routing\UrlGenerator::action
-     * @method static string action(string $action, $parameters = [], bool $absolute = true)
+     * @method static string action($action, $parameters = [], $absolute = true)
      * @see \Illuminate\Routing\UrlGenerator::secureAsset
-     * @method static string secureAsset(string $path)
+     * @method static string secureAsset($path)
      * @see \Illuminate\Routing\UrlGenerator::getRequest
      * @method static \Illuminate\Http\Request getRequest()
      * @see \Illuminate\Support\Traits\Macroable::macro
-     * @method static void macro(string $name, callable $macro)
+     * @method static void macro($name, callable $macro)
      * @see \Illuminate\Routing\UrlGenerator::previous
      * @method static string previous($fallback = false)
      * @see \Illuminate\Routing\UrlGenerator::setSessionResolver
@@ -1797,23 +1797,23 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\Routing\UrlGenerator::setRoutes
      * @method static \Illuminate\Routing\UrlGenerator setRoutes(\Illuminate\Routing\RouteCollection $routes)
      * @see \Illuminate\Routing\UrlGenerator::route
-     * @method static string route(string $name, $parameters = [], bool $absolute = true)
+     * @method static string route($name, $parameters = [], $absolute = true)
      * @see \Illuminate\Routing\UrlGenerator::forceRootUrl
-     * @method static void forceRootUrl(string $root)
+     * @method static void forceRootUrl($root)
      * @see \Illuminate\Routing\UrlGenerator::assetFrom
-     * @method static string assetFrom(string $root, string $path, bool|null $secure = null)
+     * @method static string assetFrom($root, $path, $secure = null)
      * @see \Illuminate\Routing\UrlGenerator::forceSchema
-     * @method static void forceSchema(string $schema)
+     * @method static void forceSchema($schema)
      * @see \Illuminate\Routing\UrlGenerator::setRequest
      * @method static void setRequest(\Illuminate\Http\Request $request)
      * @see \Illuminate\Routing\UrlGenerator::setRootControllerNamespace
-     * @method static \Illuminate\Routing\UrlGenerator setRootControllerNamespace(string $rootNamespace)
+     * @method static \Illuminate\Routing\UrlGenerator setRootControllerNamespace($rootNamespace)
      * @see \Illuminate\Routing\UrlGenerator::to
-     * @method static string to(string $path, $extra = [], bool|null $secure = null)
+     * @method static string to($path, $extra = [], $secure = null)
      * @see \Illuminate\Routing\UrlGenerator::isValidUrl
-     * @method static bool isValidUrl(string $path)
+     * @method static bool isValidUrl($path)
      * @see \Illuminate\Routing\UrlGenerator::asset
-     * @method static string asset(string $path, bool|null $secure = null)
+     * @method static string asset($path, $secure = null)
      * @see \Illuminate\Routing\UrlGenerator::full
      * @method static string full()
      */
@@ -1841,17 +1841,17 @@ namespace Illuminate\Support\Facades {
     
     /**
      * @see \Illuminate\View\Factory::stopSection
-     * @method static mixed stopSection($overwrite = false)
+     * @method static string stopSection(bool $overwrite = false)
      * @see \Illuminate\View\Factory::getSections
      * @method static array getSections()
      * @see \Illuminate\View\Factory::callComposer
      * @method static void callComposer(\Illuminate\View\View $view)
      * @see \Illuminate\View\Factory::yieldContent
-     * @method static string|string[] yieldContent($section, $default = '')
+     * @method static string yieldContent(string $section, string $default = '')
      * @see \Illuminate\View\Factory::getEngineResolver
      * @method static \Illuminate\View\Engines\EngineResolver getEngineResolver()
      * @see \Illuminate\View\Factory::prependNamespace
-     * @method static void prependNamespace($namespace, $hints)
+     * @method static void prependNamespace(string $namespace, array|string $hints)
      * @see \Illuminate\View\Factory::setContainer
      * @method static void setContainer(\Illuminate\Contracts\Container\Container $container)
      * @see \Illuminate\View\Factory::flushSectionsIfDoneRendering
@@ -1859,27 +1859,27 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\View\Factory::getContainer
      * @method static \Illuminate\Contracts\Container\Container getContainer()
      * @see \Illuminate\View\Factory::addNamespace
-     * @method static void addNamespace($namespace, $hints)
+     * @method static void addNamespace(string $namespace, array|string $hints)
      * @see \Illuminate\View\Factory::renderEach
-     * @method static false|mixed|string renderEach($view, $data, $iterator, $empty = 'raw|')
+     * @method static string renderEach(string $view, array $data, string $iterator, string $empty = 'raw|')
      * @see \Illuminate\View\Factory::getNames
      * @method static array getNames()
      * @see \Illuminate\View\Factory::addLocation
-     * @method static void addLocation($location)
+     * @method static void addLocation(string $location)
      * @see \Illuminate\View\Factory::incrementRender
      * @method static void incrementRender()
      * @see \Illuminate\View\Factory::decrementRender
      * @method static void decrementRender()
      * @see \Illuminate\View\Factory::getEngineFromPath
-     * @method static mixed getEngineFromPath($path)
+     * @method static \Illuminate\View\Engines\EngineInterface getEngineFromPath(string $path)
      * @see \Illuminate\View\Factory::name
-     * @method static void name($view, $name)
+     * @method static void name(string $view, string $name)
      * @see \Illuminate\View\Factory::yieldSection
-     * @method static string|string[] yieldSection()
+     * @method static string yieldSection()
      * @see \Illuminate\View\Factory::appendSection
-     * @method static mixed appendSection()
+     * @method static string appendSection()
      * @see \Illuminate\View\Factory::shared
-     * @method static array|\ArrayAccess|mixed shared($key, $default = null)
+     * @method static mixed shared(string $key, $default = null)
      * @see \Illuminate\View\Factory::composers
      * @method static array composers(array $composers)
      * @see \Illuminate\View\Factory::setDispatcher
@@ -1891,43 +1891,43 @@ namespace Illuminate\Support\Facades {
      * @see \Illuminate\View\Factory::doneRendering
      * @method static bool doneRendering()
      * @see \Illuminate\View\Factory::hasSection
-     * @method static bool hasSection($name)
+     * @method static bool hasSection(string $name)
      * @see \Illuminate\View\Factory::file
-     * @method static \Illuminate\View\View file($path, $data = [], $mergeData = [])
+     * @method static \Illuminate\Contracts\View\View|\Illuminate\View\View file(string $path, array $data = [], array $mergeData = [])
      * @see \Illuminate\View\Factory::getDispatcher
      * @method static \Illuminate\Contracts\Events\Dispatcher getDispatcher()
      * @see \Illuminate\View\Factory::of
-     * @method static \Illuminate\View\View of($view, $data = [])
+     * @method static \Illuminate\Contracts\View\View|\Illuminate\View\View of(string $view, $data = [])
      * @see \Illuminate\View\Factory::yieldPushContent
-     * @method static mixed|string yieldPushContent($section, $default = '')
+     * @method static string yieldPushContent(string $section, string $default = '')
      * @see \Illuminate\View\Factory::alias
-     * @method static void alias($view, $alias)
+     * @method static void alias(string $view, string $alias)
      * @see \Illuminate\View\Factory::share
-     * @method static mixed|null|void share($key, $value = null)
+     * @method static mixed share(array|string $key, $value = null)
      * @see \Illuminate\View\Factory::make
-     * @method static \Illuminate\View\View make($view, $data = [], $mergeData = [])
+     * @method static \Illuminate\Contracts\View\View|\Illuminate\View\View make(string $view, array $data = [], array $mergeData = [])
      * @see \Illuminate\View\Factory::startPush
-     * @method static void startPush($section, $content = '')
+     * @method static void startPush(string $section, string $content = '')
      * @see \Illuminate\View\Factory::stopPush
-     * @method static mixed stopPush()
+     * @method static string stopPush()
      * @see \Illuminate\View\Factory::creator
-     * @method static array creator($views, $callback)
+     * @method static array creator(array|string $views, \Closure|string $callback)
      * @see \Illuminate\View\Factory::composer
-     * @method static array composer($views, $callback, $priority = null)
+     * @method static array composer(array|string $views, \Closure|string $callback, int|null $priority = null)
      * @see \Illuminate\View\Factory::addExtension
-     * @method static void addExtension($extension, $engine, $resolver = null)
+     * @method static void addExtension(string $extension, string $engine, \Closure $resolver = null)
      * @see \Illuminate\View\Factory::getShared
      * @method static array getShared()
      * @see \Illuminate\View\Factory::startSection
-     * @method static void startSection($section, $content = '')
+     * @method static void startSection(string $section, string $content = '')
      * @see \Illuminate\View\Factory::setFinder
      * @method static void setFinder(\Illuminate\View\ViewFinderInterface $finder)
      * @see \Illuminate\View\Factory::exists
-     * @method static bool exists($view)
+     * @method static bool exists(string $view)
      * @see \Illuminate\View\Factory::inject
-     * @method static void inject($section, $content)
+     * @method static void inject(string $section, string $content)
      * @see \Illuminate\View\Factory::getExtensions
-     * @method static string[] getExtensions()
+     * @method static array|string[] getExtensions()
      * @see \Illuminate\View\Factory::callCreator
      * @method static void callCreator(\Illuminate\View\View $view)
      */