Merge branch '8.x'

# Conflicts:
#	composer.json
#	src/Application.php

Author: driesvints

composer.json

@@ -52,7 +52,7 @@
         "vlucas/phpdotenv": "^5.2"
     },
     "require-dev": {
-        "mockery/mockery": "^1.4.2",
+        "mockery/mockery": "^1.4.4",
         "phpunit/phpunit": "^9.5.8"
     },
     "suggest": {

src/Application.php

@@ -791,10 +791,10 @@ public function path()
     /**
      * Get the base path for the application.
      *
-     * @param  string|null  $path
+     * @param  string  $path
      * @return string
      */
-    public function basePath($path = null)
+    public function basePath($path = '')
     {
         if (isset($this->basePath)) {
             return $this->basePath.($path ? '/'.$path : $path);
@@ -1015,6 +1015,7 @@ protected function registerContainerAliases()
             \Illuminate\Contracts\Cache\Factory::class => 'cache',
             \Illuminate\Contracts\Cache\Repository::class => 'cache.store',
             \Illuminate\Contracts\Config\Repository::class => 'config',
+            \Illuminate\Config\Repository::class => 'config',
             \Illuminate\Container\Container::class => 'app',
             \Illuminate\Contracts\Container\Container::class => 'app',
             \Illuminate\Database\ConnectionResolverInterface::class => 'db',