Laravel 10 (#4706)
This commit is contained in:
parent
ad4ddc6300
commit
1d38b4f0e2
136 changed files with 1735 additions and 2008 deletions
|
@ -4,7 +4,6 @@ namespace Pterodactyl\Tests\Traits\Http;
|
|||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use BadFunctionCallException;
|
||||
|
||||
trait MocksMiddlewareClosure
|
||||
{
|
||||
|
@ -12,10 +11,10 @@ trait MocksMiddlewareClosure
|
|||
* Provide a closure to be used when validating that the response from the middleware
|
||||
* is the same request object we passed into it.
|
||||
*/
|
||||
protected function getClosureAssertions(): Closure
|
||||
protected function getClosureAssertions(): \Closure
|
||||
{
|
||||
if (is_null($this->request)) {
|
||||
throw new BadFunctionCallException('Calling getClosureAssertions without defining a request object is not supported.');
|
||||
throw new \BadFunctionCallException('Calling getClosureAssertions without defining a request object is not supported.');
|
||||
}
|
||||
|
||||
return function ($response) {
|
||||
|
|
|
@ -6,7 +6,6 @@ use Mockery as m;
|
|||
use Mockery\Mock;
|
||||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Models\User;
|
||||
use InvalidArgumentException;
|
||||
use Symfony\Component\HttpFoundation\ParameterBag;
|
||||
|
||||
trait RequestMockHelpers
|
||||
|
@ -68,7 +67,7 @@ trait RequestMockHelpers
|
|||
{
|
||||
$this->request = m::mock($this->requestMockClass);
|
||||
if (!$this->request instanceof Request) {
|
||||
throw new InvalidArgumentException('Request mock class must be an instance of ' . Request::class . ' when mocked.');
|
||||
throw new \InvalidArgumentException('Request mock class must be an instance of ' . Request::class . ' when mocked.');
|
||||
}
|
||||
|
||||
$this->request->attributes = new ParameterBag();
|
||||
|
|
|
@ -23,7 +23,7 @@ trait MocksPdoConnection
|
|||
|
||||
Model::unsetConnectionResolver();
|
||||
|
||||
$connection = new MySqlConnection($mock = Mockery::mock(PDO::class), 'testing_mock');
|
||||
$connection = new MySqlConnection($mock = \Mockery::mock(\PDO::class), 'testing_mock');
|
||||
$resolver = new ConnectionResolver(['mocked' => $connection]);
|
||||
$resolver->setDefaultConnection('mocked');
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Pterodactyl\Tests\Traits;
|
||||
|
||||
use Mockery;
|
||||
use Mockery\Mock;
|
||||
use Mockery\MockInterface;
|
||||
use GuzzleHttp\Exception\RequestException;
|
||||
|
@ -27,6 +26,6 @@ trait MocksRequestException
|
|||
*/
|
||||
protected function getExceptionMock(string $abstract = RequestException::class): MockInterface
|
||||
{
|
||||
return $this->exception ?? $this->exception = Mockery::mock($abstract);
|
||||
return $this->exception ?? $this->exception = \Mockery::mock($abstract);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue