From 02379b657dede2d6a5eef08b0d28cb11f6d8093d Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sun, 13 May 2018 16:40:31 -0400 Subject: [PATCH] Replace the log writer class with the new one --- app/Services/DaemonKeys/DaemonKeyDeletionService.php | 6 +++--- app/Services/Servers/ServerDeletionService.php | 6 +++--- app/Services/Servers/SuspensionService.php | 6 +++--- .../Services/DaemonKeys/DaemonKeyDeletionServiceTest.php | 4 ++-- tests/Unit/Services/Servers/ServerDeletionServiceTest.php | 4 ++-- tests/Unit/Services/Servers/SuspensionServiceTest.php | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/Services/DaemonKeys/DaemonKeyDeletionService.php b/app/Services/DaemonKeys/DaemonKeyDeletionService.php index 553258ce7..ea5f28a2d 100644 --- a/app/Services/DaemonKeys/DaemonKeyDeletionService.php +++ b/app/Services/DaemonKeys/DaemonKeyDeletionService.php @@ -24,7 +24,7 @@ namespace Pterodactyl\Services\DaemonKeys; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use Webmozart\Assert\Assert; use Pterodactyl\Models\Server; use GuzzleHttp\Exception\RequestException; @@ -57,7 +57,7 @@ class DaemonKeyDeletionService protected $serverRepository; /** - * @var \Illuminate\Log\Writer + * @var \Psr\Log\LoggerInterface */ protected $writer; @@ -68,7 +68,7 @@ class DaemonKeyDeletionService * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Illuminate\Log\Writer $writer + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $connection, diff --git a/app/Services/Servers/ServerDeletionService.php b/app/Services/Servers/ServerDeletionService.php index 5a3f1cb4b..faed3b9ff 100644 --- a/app/Services/Servers/ServerDeletionService.php +++ b/app/Services/Servers/ServerDeletionService.php @@ -9,7 +9,7 @@ namespace Pterodactyl\Services\Servers; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use GuzzleHttp\Exception\RequestException; use Illuminate\Database\ConnectionInterface; use Pterodactyl\Services\Databases\DatabaseManagementService; @@ -51,7 +51,7 @@ class ServerDeletionService protected $repository; /** - * @var \Illuminate\Log\Writer + * @var \Psr\Log\LoggerInterface */ protected $writer; @@ -63,7 +63,7 @@ class ServerDeletionService * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Illuminate\Log\Writer $writer + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $connection, diff --git a/app/Services/Servers/SuspensionService.php b/app/Services/Servers/SuspensionService.php index 896cfeb17..8122dc60a 100644 --- a/app/Services/Servers/SuspensionService.php +++ b/app/Services/Servers/SuspensionService.php @@ -9,7 +9,7 @@ namespace Pterodactyl\Services\Servers; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use Pterodactyl\Models\Server; use GuzzleHttp\Exception\RequestException; use Illuminate\Database\ConnectionInterface; @@ -38,7 +38,7 @@ class SuspensionService protected $repository; /** - * @var \Illuminate\Log\Writer + * @var \Psr\Log\LoggerInterface */ protected $writer; @@ -48,7 +48,7 @@ class SuspensionService * @param \Illuminate\Database\ConnectionInterface $database * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Illuminate\Log\Writer $writer + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $database, diff --git a/tests/Unit/Services/DaemonKeys/DaemonKeyDeletionServiceTest.php b/tests/Unit/Services/DaemonKeys/DaemonKeyDeletionServiceTest.php index 74007dda6..ca83168fa 100644 --- a/tests/Unit/Services/DaemonKeys/DaemonKeyDeletionServiceTest.php +++ b/tests/Unit/Services/DaemonKeys/DaemonKeyDeletionServiceTest.php @@ -11,7 +11,7 @@ namespace Tests\Unit\Services\DaemonKeys; use Mockery as m; use Tests\TestCase; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use GuzzleHttp\Psr7\Response; use Pterodactyl\Models\Server; use Pterodactyl\Models\DaemonKey; @@ -57,7 +57,7 @@ class DaemonKeyDeletionServiceTest extends TestCase protected $service; /** - * @var \Illuminate\Log\Writer|\Mockery\Mock + * @var \Psr\Log\LoggerInterface|\Mockery\Mock */ protected $writer; diff --git a/tests/Unit/Services/Servers/ServerDeletionServiceTest.php b/tests/Unit/Services/Servers/ServerDeletionServiceTest.php index d93d2e985..8dbb3b3d3 100644 --- a/tests/Unit/Services/Servers/ServerDeletionServiceTest.php +++ b/tests/Unit/Services/Servers/ServerDeletionServiceTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Services\Servers; use Mockery as m; use Tests\TestCase; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use GuzzleHttp\Psr7\Response; use Pterodactyl\Models\Server; use Tests\Traits\MocksRequestException; @@ -45,7 +45,7 @@ class ServerDeletionServiceTest extends TestCase private $repository; /** - * @var \Illuminate\Log\Writer|\Mockery\Mock + * @var \Psr\Log\LoggerInterface|\Mockery\Mock */ private $writer; diff --git a/tests/Unit/Services/Servers/SuspensionServiceTest.php b/tests/Unit/Services/Servers/SuspensionServiceTest.php index 116014277..c93004ce6 100644 --- a/tests/Unit/Services/Servers/SuspensionServiceTest.php +++ b/tests/Unit/Services/Servers/SuspensionServiceTest.php @@ -12,7 +12,7 @@ namespace Tests\Unit\Services\Servers; use Exception; use Mockery as m; use Tests\TestCase; -use Illuminate\Log\Writer; +use Psr\Log\LoggerInterface as Writer; use GuzzleHttp\Psr7\Response; use Pterodactyl\Models\Server; use GuzzleHttp\Exception\RequestException; @@ -55,7 +55,7 @@ class SuspensionServiceTest extends TestCase protected $service; /** - * @var \Illuminate\Log\Writer + * @var \Psr\Log\LoggerInterface */ protected $writer;