Merge pull request #22 from keboola/pepa/PAT-514_bump

pepamartinec · web-flow · commit 42baf288a963 · 2025-07-07T16:40:54.000+02:00
Bump versions
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7-cli
+FROM php:8.2-cli
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
@@ -13,7 +13,7 @@ COPY docker/php.ini /usr/local/etc/php/php.ini
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
 
-RUN pecl install xdebug-3.1.6 \
+RUN pecl install xdebug \
  && docker-php-ext-enable xdebug
 
 COPY composer.* ./
diff --git a/composer.json b/composer.json
@@ -25,16 +25,16 @@
         }
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.2",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3|^7.2",
-        "myclabs/php-enum": "^1.8",
-        "psr/log": "^1.1",
-        "symfony/validator": "^5.2|^6.0"
+        "psr/log": "^2|^3",
+        "symfony/validator": "^6.4|^7.0"
     },
     "require-dev": {
         "infection/infection": "^0.26",
         "keboola/coding-standard": ">=14.0",
+        "monolog/monolog": "^3.9",
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-phpunit": "^1.1",
         "phpunit/phpunit": "^9.5",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,12 +1,11 @@
 parameters:
     level: max
-    checkMissingIterableValueType: false
     paths:
         - src
         - tests
     stubFiles:
         - tests/stubs/Guzzle.stub
     ignoreErrors:
-
+        - identifier: missingType.iterableValue
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/src/Client.php b/src/Client.php
@@ -42,7 +42,7 @@ abstract class Client
     public function __construct(
         string $baseUrl,
         ?string $token,
-        array $options
+        array $options,
     ) {
         $validator = Validation::createValidator();
         $errors = $validator->validate($baseUrl, [new Url()]);
@@ -79,10 +79,10 @@ private function createDefaultDecider(int $maxRetries, LoggerInterface $logger):
             $retries,
             RequestInterface $request,
             ?ResponseInterface $response = null,
-            ?Throwable $error = null
+            ?Throwable $error = null,
         ) use (
             $maxRetries,
-            $logger
+            $logger,
         ) {
             if ($retries >= $maxRetries) {
                 $logger->notice(sprintf('We have tried this %d times. Giving up.', $maxRetries));
diff --git a/src/Requests/PostEvent/JobData.php b/src/Requests/PostEvent/JobData.php
@@ -26,7 +26,7 @@ public function __construct(
         string $componentId,
         string $componentName,
         ?string $configurationId,
-        ?string $configurationName
+        ?string $configurationName,
     ) {
         $this->jobId = $jobId;
         $this->jobUrl = $jobUrl;
diff --git a/src/Requests/PostEvent/JobFailedEventData.php b/src/Requests/PostEvent/JobFailedEventData.php
@@ -19,7 +19,7 @@ public function __construct(
         string $projectName,
         string $branchId,
         string $errorMessage,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/JobProcessingLongEventData.php b/src/Requests/PostEvent/JobProcessingLongEventData.php
@@ -23,7 +23,7 @@ public function __construct(
         float $durationOvertimePercentage,
         float $averageDuration,
         float $currentDuration,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/JobSucceededEventData.php b/src/Requests/PostEvent/JobSucceededEventData.php
@@ -17,7 +17,7 @@ public function __construct(
         string $projectId,
         string $projectName,
         string $branchId,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/JobSucceededWithWarningEventData.php b/src/Requests/PostEvent/JobSucceededWithWarningEventData.php
@@ -19,7 +19,7 @@ public function __construct(
         string $projectName,
         string $branchId,
         string $errorMessage,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/PhaseJobFailedEventData.php b/src/Requests/PostEvent/PhaseJobFailedEventData.php
@@ -23,7 +23,7 @@ public function __construct(
         string $phaseName,
         string $phaseId,
         string $errorMessage,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/PhaseJobProcessingLongEventData.php b/src/Requests/PostEvent/PhaseJobProcessingLongEventData.php
@@ -27,7 +27,7 @@ public function __construct(
         float $durationOvertimePercentage,
         float $averageDuration,
         float $currentDuration,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/PhaseJobSucceededEventData.php b/src/Requests/PostEvent/PhaseJobSucceededEventData.php
@@ -21,7 +21,7 @@ public function __construct(
         string $branchId,
         string $phaseName,
         string $phaseId,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostEvent/PhaseJobSucceededWithWarningEventData.php b/src/Requests/PostEvent/PhaseJobSucceededWithWarningEventData.php
@@ -23,7 +23,7 @@ public function __construct(
         string $phaseName,
         string $phaseId,
         string $errorMessage,
-        JobData $jobData
+        JobData $jobData,
     ) {
         $this->projectId = $projectId;
         $this->projectName = $projectName;
diff --git a/src/Requests/PostNotification/ProjectEmail.php b/src/Requests/PostNotification/ProjectEmail.php
@@ -21,7 +21,7 @@ public function __construct(
         string $projectId,
         string $projectName,
         string $title,
-        string $message
+        string $message,
     ) {
         $this->recipient = $recipient;
         $this->projectId = $projectId;
diff --git a/src/Requests/PostNotification/ProjectWebhook.php b/src/Requests/PostNotification/ProjectWebhook.php
@@ -21,7 +21,7 @@ public function __construct(
         string $projectId,
         string $projectName,
         string $title,
-        ?string $message
+        ?string $message,
     ) {
         $this->recipient = $recipient;
         $this->projectId = $projectId;
diff --git a/src/Requests/PostSubscription/Filter.php b/src/Requests/PostSubscription/Filter.php
@@ -27,7 +27,7 @@ public function jsonSerialize(): array
         ];
 
         if ($this->operator !== null) {
-            $data['operator'] = $this->operator->getValue();
+            $data['operator'] = $this->operator->value;
         }
 
         return $data;
diff --git a/src/Requests/PostSubscription/FilterOperator.php b/src/Requests/PostSubscription/FilterOperator.php
@@ -4,30 +4,11 @@
 
 namespace Keboola\NotificationClient\Requests\PostSubscription;
 
-use DomainException;
-use MyCLabs\Enum\Enum;
-
-/**
- * @method static self EQUAL()
- * @method static self LESS_THAN()
- * @method static self GREATER_THAN()
- * @method static self LESS_THAN_OR_EQUAL()
- * @method static self GREATER_THAN_OR_EQUAL()
- *
- * @phpstan-extends Enum<string>
- */
-class FilterOperator extends Enum
+enum FilterOperator: string
 {
-    // phpcs:disable SlevomatCodingStandard.Classes.UnusedPrivateElements
-    // @phpstan-ignore-next-line
-    private const EQUAL = '=='; // can't be called EQUALS because there is a method called `equals` on base Enum class
-    // @phpstan-ignore-next-line
-    private const LESS_THAN = '<';
-    // @phpstan-ignore-next-line
-    private const GREATER_THAN = '>';
-    // @phpstan-ignore-next-line
-    private const LESS_THAN_OR_EQUAL = '<=';
-    // @phpstan-ignore-next-line
-    private const GREATER_THAN_OR_EQUAL = '>=';
-    // phpcs:enable SlevomatCodingStandard.Classes.UnusedPrivateElements
+    case Equal = '==';
+    case LessThan = '<';
+    case GreaterThan = '>';
+    case LessThanOrEqual = '<=';
+    case GreaterThanOrEqual = '>=';
 }
diff --git a/tests/ClientFactoryTest.php b/tests/ClientFactoryTest.php
@@ -13,8 +13,9 @@
 use Keboola\NotificationClient\EventsClient;
 use Keboola\NotificationClient\NotificationsClient;
 use Keboola\NotificationClient\SubscriptionClient;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\Test\TestLogger;
 
 class ClientFactoryTest extends TestCase
 {
@@ -55,7 +56,9 @@ public function testGetClient(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
 
         $clientFactory = new ClientFactory(
             'https://dummy',
@@ -77,8 +80,8 @@ public function testGetClient(): void
         /** @var Request $request */
         $request = $requestHistory[0]['request'];
         self::assertSame('test agent', $request->getHeader('User-Agent')[0]);
-        self::assertTrue($logger->hasDebugThatContains('"GET  /1.1" 200 '));
-        self::assertTrue($logger->hasDebugThatContains('test agent'));
+        self::assertTrue($logsHandler->hasDebugThatContains('"GET  /1.1" 200 '));
+        self::assertTrue($logsHandler->hasDebugThatContains('test agent'));
     }
 
     public function testGetClientLazy(): void
@@ -94,7 +97,9 @@ public function testGetClientLazy(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
 
         $clientFactory = new ClientFactory(
             'https://dummy',
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -15,9 +15,10 @@
 use Keboola\NotificationClient\Requests\Event;
 use Keboola\NotificationClient\Requests\PostEvent\JobData;
 use Keboola\NotificationClient\Requests\PostEvent\JobFailedEventData;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Psr\Log\Test\TestLogger;
 
 class ClientTest extends TestCase
 {
@@ -182,7 +183,10 @@ public function testLogger(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             [
                 'handler' => $stack,
@@ -195,8 +199,8 @@ public function testLogger(): void
         /** @var Request $request */
         $request = $requestHistory[0]['request'];
         self::assertSame('test agent', $request->getHeader('User-Agent')[0]);
-        self::assertTrue($logger->hasDebugThatContains('"POST  /1.1" 200 '));
-        self::assertTrue($logger->hasDebugThatContains('test agent'));
+        self::assertTrue($logsHandler->hasDebugThatContains('"POST  /1.1" 200 '));
+        self::assertTrue($logsHandler->hasDebugThatContains('test agent'));
     }
 
     public function testRetrySuccess(): void
@@ -234,7 +238,10 @@ public function testRetrySuccess(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             [
                 'handler' => $stack,
@@ -252,7 +259,7 @@ public function testRetrySuccess(): void
         self::assertSame('https://example.com/events/job-failed', $request->getUri()->__toString());
         $request = $requestHistory[2]['request'];
         self::assertSame('https://example.com/events/job-failed', $request->getUri()->__toString());
-        self::assertTrue($logger->hasNoticeThatContains('retrying'));
+        self::assertTrue($logsHandler->hasNoticeThatContains('retrying'));
     }
 
     public function testRetryFailure(): void
@@ -271,7 +278,10 @@ public function testRetryFailure(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             ['handler' => $stack, 'backoffMaxTries' => 1, 'userAgent' => 'Test', 'logger' => $logger],
         );
@@ -282,7 +292,7 @@ public function testRetryFailure(): void
             self::assertStringContainsString('500 Internal Server Error', $e->getMessage());
         }
         self::assertCount(2, $requestHistory);
-        self::assertTrue($logger->hasNoticeThatContains('We have tried this 1 times. Giving up.'));
+        self::assertTrue($logsHandler->hasNoticeThatContains('We have tried this 1 times. Giving up.'));
     }
 
     public function testNoRetry(): void
diff --git a/tests/Requests/PostSubscription/FilterOperatorTest.php b/tests/Requests/PostSubscription/FilterOperatorTest.php
@@ -14,15 +14,15 @@ class FilterOperatorTest extends TestCase
      */
     public function testOperatorValues(FilterOperator $operator, string $expectedValue): void
     {
-        self::assertSame($expectedValue, $operator->getValue());
+        self::assertSame($expectedValue, $operator->value);
     }
 
     public function provideOperatorValues(): iterable
     {
-        yield 'equals' => [FilterOperator::EQUAL(), '=='];
-        yield 'less than' => [FilterOperator::LESS_THAN(), '<'];
-        yield 'greater than' => [FilterOperator::GREATER_THAN(), '>'];
-        yield 'less than or equals' => [FilterOperator::LESS_THAN_OR_EQUAL(), '<='];
-        yield 'greater than or equals' => [FilterOperator::GREATER_THAN_OR_EQUAL(), '>='];
+        yield 'equals' => [FilterOperator::Equal, '=='];
+        yield 'less than' => [FilterOperator::LessThan, '<'];
+        yield 'greater than' => [FilterOperator::GreaterThan, '>'];
+        yield 'less than or equals' => [FilterOperator::LessThanOrEqual, '<='];
+        yield 'greater than or equals' => [FilterOperator::GreaterThanOrEqual, '>='];
     }
 }
diff --git a/tests/Requests/PostSubscription/FilterTest.php b/tests/Requests/PostSubscription/FilterTest.php
@@ -24,7 +24,7 @@ public function testJsonSerialize(): void
 
     public function testJsonSerializeWithOperator(): void
     {
-        $filter = new Filter('someName', 'someValue', FilterOperator::GREATER_THAN_OR_EQUAL());
+        $filter = new Filter('someName', 'someValue', FilterOperator::GreaterThanOrEqual);
         self::assertSame(
             [
                 'field' => 'someName',
diff --git a/tests/Requests/SubscriptionTest.php b/tests/Requests/SubscriptionTest.php
@@ -121,7 +121,7 @@ public function testPhaseJobFailedSubscription(RecipientInterface $recipient, ar
     /** @dataProvider recipientProvider */
     public function testPhaseJobSucceededWithWarningSubscription(
         RecipientInterface $recipient,
-        array $expectedRecipient
+        array $expectedRecipient,
     ): void {
         $subscriptionRequest = new Subscription(
             'phase-job-succeeded-with-warning',
@@ -225,7 +225,7 @@ public function testPhaseJobSucceededSubscription(RecipientInterface $recipient,
     /** @dataProvider recipientProvider */
     public function testPhaseJobProcessingLongSubscription(
         RecipientInterface $recipient,
-        array $expectedRecipient
+        array $expectedRecipient,
     ): void {
         $subscriptionRequest = new Subscription(
             'phase-job-processing-long',
diff --git a/tests/StorageApiIndexClientTest.php b/tests/StorageApiIndexClientTest.php
