Fix node update tests

Author: DaneEveritt

app/Repositories/Wings/DaemonConfigurationRepository.php

@@ -34,7 +34,7 @@ public function getSystemInformation(): array
      * @return \Psr\Http\Message\ResponseInterface
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
-    public function update(?Node $node)
+    public function update(Node $node)
     {
         try {
             return $this->getHttpClient()->post(

app/Services/Helpers/SoftwareVersionService.php

@@ -4,7 +4,7 @@
 
 use Exception;
 use GuzzleHttp\Client;
-use Cake\Chronos\Chronos;
+use Carbon\CarbonImmutable;
 use Illuminate\Support\Arr;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 use Pterodactyl\Exceptions\Service\Helper\CdnVersionFetchingException;
@@ -120,7 +120,7 @@ public function isLatestDaemon($version)
      */
     protected function cacheVersionData()
     {
-        return $this->cache->remember(self::VERSION_CACHE_KEY, Chronos::now()->addMinutes(config()->get('pterodactyl.cdn.cache_time', 60)), function () {
+        return $this->cache->remember(self::VERSION_CACHE_KEY, CarbonImmutable::now()->addMinutes(config()->get('pterodactyl.cdn.cache_time', 60)), function () {
             try {
                 $response = $this->client->request('GET', config()->get('pterodactyl.cdn.url'));
 

app/Services/Nodes/NodeCreationService.php

@@ -5,7 +5,7 @@
 use Ramsey\Uuid\Uuid;
 use Illuminate\Support\Str;
 use Pterodactyl\Models\Node;
-use Illuminate\Encryption\Encrypter;
+use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 
 class NodeCreationService
@@ -16,14 +16,14 @@ class NodeCreationService
     protected $repository;
 
     /**
-     * @var \Illuminate\Encryption\Encrypter
+     * @var \Illuminate\Contracts\Encryption\Encrypter
      */
     private $encrypter;
 
     /**
      * CreationService constructor.
      *
-     * @param \Illuminate\Encryption\Encrypter $encrypter
+     * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository
      */
     public function __construct(Encrypter $encrypter, NodeRepositoryInterface $repository)

tests/Unit/Services/Eggs/EggConfigurationServiceTest.php

@@ -9,6 +9,8 @@
 use Illuminate\Contracts\Validation\Factory;
 use Pterodactyl\Services\Eggs\Variables\VariableCreationService;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableCreationServiceTest extends TestCase
 {
@@ -91,10 +93,11 @@ public function testNullOptionValueIsPassedAsArray()
      * @param string $variable
      *
      * @dataProvider reservedNamesProvider
-     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
     public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames(string $variable)
     {
+        $this->expectException(ReservedVariableNameException::class);
+
         $this->getService()->handle(1, ['env_variable' => $variable]);
     }
 
@@ -114,12 +117,12 @@ public function testEggIdPassedInDataIsNotApplied()
 
     /**
      * Test that validation errors due to invalid rules are caught and handled properly.
-     *
-     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
-     * @expectedExceptionMessage The validation rule "hodor_door" is not a valid rule for this application.
      */
     public function testInvalidValidationRulesResultInException()
     {
+        $this->expectException(BadValidationRuleException::class);
+        $this->expectExceptionMessage('The validation rule "hodor_door" is not a valid rule for this application.');
+
         $data = ['env_variable' => 'TEST_VAR_123', 'rules' => 'string|hodorDoor'];
 
         $this->validator->shouldReceive('make')->once()
@@ -135,12 +138,12 @@ public function testInvalidValidationRulesResultInException()
 
     /**
      * Test that an exception not stemming from a bad rule is not caught.
-     *
-     * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Received something, but no expectations were specified.
      */
     public function testExceptionNotCausedByBadRuleIsNotCaught()
     {
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Received something, but no expectations were specified.');
+
         $data = ['env_variable' => 'TEST_VAR_123', 'rules' => 'string'];
 
         $this->validator->shouldReceive('make')->once()

tests/Unit/Services/Eggs/Variables/VariableCreationServiceTest.php

@@ -11,6 +11,8 @@
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Services\Eggs\Variables\VariableUpdateService;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableUpdateServiceTest extends TestCase
 {
@@ -159,21 +161,22 @@ public function testExceptionIsThrownIfEnvironmentVariableIsNotUnique()
      * Test that all of the reserved variables defined in the model trigger an exception.
      *
      * @dataProvider reservedNamesProvider
-     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
     public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames(string $variable)
     {
+        $this->expectException(ReservedVariableNameException::class);
+
         $this->getService()->handle($this->model, ['env_variable' => $variable]);
     }
 
     /**
      * Test that validation errors due to invalid rules are caught and handled properly.
-     *
-     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
-     * @expectedExceptionMessage The validation rule "hodor_door" is not a valid rule for this application.
      */
     public function testInvalidValidationRulesResultInException()
     {
+        $this->expectException(BadValidationRuleException::class);
+        $this->expectExceptionMessage('The validation rule "hodor_door" is not a valid rule for this application.');
+
         $data = ['env_variable' => 'TEST_VAR_123', 'rules' => 'string|hodorDoor'];
 
         $this->repository->shouldReceive('setColumns->findCountWhere')->once()->andReturn(0);
@@ -191,12 +194,12 @@ public function testInvalidValidationRulesResultInException()
 
     /**
      * Test that an exception not stemming from a bad rule is not caught.
-     *
-     * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Received something, but no expectations were specified.
      */
     public function testExceptionNotCausedByBadRuleIsNotCaught()
     {
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Received something, but no expectations were specified.');
+
         $data = ['rules' => 'string'];
 
         $this->validator->shouldReceive('make')->once()