Pre-release 4.2.123 → 4.2.122 — task 4.5 (foundation): the Exception package folds into Foundation's v13-shaped Handler

composer.json

@@ -68,7 +68,6 @@
         "voku/portable-ascii": "2.0.3"
     },
     "replace": {
-        "illuminate/exception": "self.version",
         "illuminate/foundation": "self.version"
     },
     "require-dev": {

src/Illuminate/Foundation/Application.php

@@ -14,7 +14,7 @@
 use Illuminate\Bus\BusServiceProvider;
 use Illuminate\Events\EventServiceProvider;
 use Illuminate\Routing\RoutingServiceProvider;
-use Illuminate\Exception\ExceptionServiceProvider;
+use Illuminate\Foundation\Providers\ExceptionServiceProvider;
 use Illuminate\Foundation\Configuration\ApplicationBuilder;
 use Illuminate\Config\FileEnvironmentVariablesLoader;
 use Symfony\Component\Console\Input\InputInterface;
@@ -361,8 +361,6 @@ public function bootstrapWithStartScript()
 	public function startExceptionHandling()
 	{
 		$this['exception']->register($this->environment());
-
-		$this['exception']->setDebug($this['config']['app.debug']);
 	}
 
 	/**

src/Illuminate/Foundation/Configuration/Exceptions.php

@@ -1,6 +1,6 @@
 <?php namespace Illuminate\Foundation\Configuration;
 
-use Illuminate\Exception\Handler;
+use Illuminate\Foundation\Exceptions\Handler;
 use Illuminate\Support\Arr;
 
 /**
@@ -13,7 +13,7 @@ class Exceptions {
 	/**
 	 * Create a new exception handling configuration instance.
 	 *
-	 * @param  \Illuminate\Exception\Handler  $handler
+	 * @param  \Illuminate\Foundation\Exceptions\Handler  $handler
 	 * @return void
 	 */
 	public function __construct(public Handler $handler)

src/Illuminate/Exception/ExceptionDisplayerInterface.php → src/Illuminate/Foundation/Exceptions/Displayers/ExceptionDisplayerInterface.php

@@ -1,4 +1,4 @@
-<?php namespace Illuminate\Exception;
+<?php namespace Illuminate\Foundation\Exceptions\Displayers;
 
 use Exception;
 

src/Illuminate/Exception/PlainDisplayer.php → src/Illuminate/Foundation/Exceptions/Displayers/PlainDisplayer.php

@@ -1,4 +1,4 @@
-<?php namespace Illuminate\Exception;
+<?php namespace Illuminate\Foundation\Exceptions\Displayers;
 
 use Exception;
 use Symfony\Component\HttpFoundation\Response;

src/Illuminate/Exception/WhoopsDisplayer.php → src/Illuminate/Foundation/Exceptions/Displayers/WhoopsDisplayer.php

@@ -1,4 +1,4 @@
-<?php namespace Illuminate\Exception;
+<?php namespace Illuminate\Foundation\Exceptions\Displayers;
 
 use Exception;
 use Whoops\Run;