Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.4] Rename Http/Exception to Http/Exceptions #17398

Merged
merged 2 commits into from
Jan 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Illuminate\Contracts\Container\Container;
use Illuminate\Validation\ValidationException;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Exception\HttpResponseException;
use Illuminate\Http\Exceptions\HttpResponseException;
use Symfony\Component\Debug\Exception\FlattenException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Illuminate\Foundation\Http\Middleware;

use Closure;
use Illuminate\Http\Exception\PostTooLargeException;
use Illuminate\Http\Exceptions\PostTooLargeException;

class ValidatePostSize
{
Expand All @@ -14,7 +14,7 @@ class ValidatePostSize
* @param \Closure $next
* @return mixed
*
* @throws \Illuminate\Http\Exception\PostTooLargeException
* @throws \Illuminate\Http\Exceptions\PostTooLargeException
*/
public function handle($request, Closure $next)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Illuminate\Http\Exception;
namespace Illuminate\Http\Exceptions;

use RuntimeException;
use Symfony\Component\HttpFoundation\Response;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Illuminate\Http\Exception;
namespace Illuminate\Http\Exceptions;

use Exception;

Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Http/ResponseTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Illuminate\Http;

use Exception;
use Illuminate\Http\Exception\HttpResponseException;
use Illuminate\Http\Exceptions\HttpResponseException;

trait ResponseTrait
{
Expand Down Expand Up @@ -125,7 +125,7 @@ public function withException(Exception $e)
/**
* Throws the response in a HttpResponseException instance.
*
* @throws \Illuminate\Http\Exception\HttpResponseException
* @throws \Illuminate\Http\Exceptions\HttpResponseException
*/
public function throwResponse()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Routing/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Illuminate\Routing\Matching\HostValidator;
use Illuminate\Routing\Matching\MethodValidator;
use Illuminate\Routing\Matching\SchemeValidator;
use Illuminate\Http\Exception\HttpResponseException;
use Illuminate\Http\Exceptions\HttpResponseException;

class Route
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Routing/RoutingRouteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function testBasicDispatchingOfRoutes()

$router = $this->getRouter();
$router->get('foo/bar', function () {
throw new \Illuminate\Http\Exception\HttpResponseException(new Response('hello'));
throw new \Illuminate\Http\Exceptions\HttpResponseException(new Response('hello'));
});
$this->assertEquals('hello', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());

Expand Down