v4.0.0

__BREAKING CHANGES__

* Require php 8.1 and allow symfony 5.x|6.x.
* Require gdbots/schemas and gdbots/query-parser 3.x

Author: gdbrown

CHANGELOG-4.x.md

@@ -0,0 +1,9 @@
+# CHANGELOG for 4.x
+This changelog references the relevant changes done in 4.x versions.
+
+
+## v4.0.0
+__BREAKING CHANGES__
+
+* Require php 8.1 and allow symfony 5.x|6.x.
+* Require gdbots/schemas and gdbots/query-parser 3.x

composer.json

@@ -4,18 +4,18 @@
   "type": "library",
   "license": "Apache-2.0",
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.1",
     "ext-json": "*",
-    "gdbots/query-parser": "^2.0",
-    "gdbots/schemas": "^2.0",
-    "psr/log": "^1",
-    "symfony/event-dispatcher": "^5.1"
+    "gdbots/query-parser": "^3.0",
+    "gdbots/schemas": "^3.0",
+    "psr/log": "^1|^2|^3",
+    "symfony/event-dispatcher": "^5.4|^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.2",
+    "phpunit/phpunit": "^9.5",
     "aws/aws-sdk-php": "^3.138",
-    "gdbots/acme-schemas": "^2.0",
-    "ruflin/elastica": "^7.0"
+    "gdbots/acme-schemas": "^3.0",
+    "ruflin/elastica": "^7.1"
   },
   "autoload": {
     "psr-4": {

src/AbstractServiceLocator.php

@@ -122,7 +122,7 @@ final public function getEventStore(): EventStore
 
     protected function doGetEventStore(): EventStore
     {
-        throw new LogicException('No EventStore has been configured.', Code::UNIMPLEMENTED);
+        throw new LogicException('No EventStore has been configured.', Code::UNIMPLEMENTED->value);
     }
 
     final public function getEventSearch(): EventSearch
@@ -136,7 +136,7 @@ final public function getEventSearch(): EventSearch
 
     protected function doGetEventSearch(): EventSearch
     {
-        throw new LogicException('No EventSearch has been configured.', Code::UNIMPLEMENTED);
+        throw new LogicException('No EventSearch has been configured.', Code::UNIMPLEMENTED->value);
     }
 
     final public function getScheduler(): Scheduler
@@ -150,7 +150,7 @@ final public function getScheduler(): Scheduler
 
     protected function doGetScheduler(): Scheduler
     {
-        throw new LogicException('No Scheduler has been configured.', Code::UNIMPLEMENTED);
+        throw new LogicException('No Scheduler has been configured.', Code::UNIMPLEMENTED->value);
     }
 
     final protected function getDefaultTransport(): Transport

src/Consumer/AbstractConsumer.php

@@ -178,7 +178,7 @@ private function handleRequest(Message $request): Message
         return $this->locator->getRequestBus()->receiveRequest($request);
     }
 
-    final public function handleSignals(int $signo, $signinfo = null): void
+    final public function handleSignals(int $signo, mixed $signinfo = null): void
     {
         switch ($signo) {
             case SIGINT:

src/Event/EnrichContextEvent.php

@@ -69,7 +69,7 @@ public function has(string $name): bool
         return isset($this->context[$name]);
     }
 
-    public function get(string $name, $default = null)
+    public function get(string $name, mixed $default = null): mixed
     {
         return $this->context[$name] ?? $default;
     }

src/EventSearch/Elastica/AwsAuthV4.php

@@ -8,11 +8,11 @@
 use Aws\Signature\SignatureV4;
 use Elastica\Connection;
 use Elastica\Transport\Guzzle;
-use GuzzleHttp;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\RequestOptions;
+use GuzzleHttp\Utils;
 use Psr\Http\Message\RequestInterface;
 
 /**
@@ -32,7 +32,7 @@ class AwsAuthV4 extends Guzzle
     protected function _getGuzzleClient(bool $persistent = true): Client
     {
         if (!$persistent || !self::$_guzzleClientConnection) {
-            $stack = HandlerStack::create(GuzzleHttp\choose_handler());
+            $stack = HandlerStack::create(Utils::chooseHandler());
             $stack->push($this->getConnectTimeoutMiddleware(), 'connect_timeout');
             $stack->push($this->getSigningMiddleware(), 'sign');
 

src/EventSearch/Elastica/ElasticaEventSearch.php

@@ -90,7 +90,7 @@ final public function createStorage(array $context = []): void
                             ClassUtil::getShortName($e),
                             $indexName
                         ),
-                        Code::INTERNAL,
+                        Code::INTERNAL->value,
                         $e
                     );
                 }
@@ -207,7 +207,7 @@ final public function indexEvents(array $events, array $context = []): void
                     ClassUtil::getShortName($e),
                     $e->getMessage()
                 ),
-                Code::INTERNAL,
+                Code::INTERNAL->value,
                 $e
             );
         }
@@ -265,7 +265,7 @@ final public function deleteEvents(array $eventIds, array $context = []): void
                     ClassUtil::getShortName($e),
                     $e->getMessage()
                 ),
-                Code::INTERNAL,
+                Code::INTERNAL->value,
                 $e
             );
         }
@@ -310,7 +310,7 @@ final public function searchEvents(Message $request, ParsedQuery $parsedQuery, M
                     $request->get('q'),
                     ClassUtil::getShortName($e) . '::' . $e->getMessage()
                 ),
-                Code::INTERNAL,
+                Code::INTERNAL->value,
                 $e
             );
         }

src/EventSearch/Elastica/IndexManager.php

@@ -219,14 +219,14 @@ final public function updateIndex(Client $client, string $name): void
                 'allow_no_indices'   => true,
             ]);
         } catch (\Throwable $e) {
-            if (false !== strpos($e->getMessage(), 'no such index')) {
+            if (str_contains($e->getMessage(), 'no such index')) {
                 $this->logger->info(sprintf('No index exists yet [%s] in ElasticSearch. Ignoring.', $name));
                 return;
             }
 
             throw new EventSearchOperationFailed(
                 sprintf('Failed to put mapping for index [%s] into ElasticSearch.', $name),
-                Code::INTERNAL,
+                Code::INTERNAL->value,
                 $e
             );
         }

src/EventSearch/Elastica/QueryFactory.php

@@ -44,18 +44,18 @@ final public function create(Message $request, ParsedQuery $parsedQuery, array $
 
     protected function applyDateFilters(Message $request, ParsedQuery $parsedQuery): void
     {
-        $required = BoolOperator::REQUIRED();
+        $required = BoolOperator::REQUIRED;
 
         $dateFilters = [
             [
                 'query'    => 'occurred_after',
                 'field'    => 'occurred_at',
-                'operator' => ComparisonOperator::GT(),
+                'operator' => ComparisonOperator::GT,
             ],
             [
                 'query'    => 'occurred_before',
                 'field'    => 'occurred_at',
-                'operator' => ComparisonOperator::LT(),
+                'operator' => ComparisonOperator::LT,
             ],
         ];
 
@@ -105,7 +105,7 @@ protected function filterCuries(Message $request, Query\BoolQuery $query, array
      */
     protected function createSortedQuery(AbstractQuery $query, Message $request): Query
     {
-        switch ($request->get('sort')->getValue()) {
+        switch ($request->get('sort')) {
             case SearchEventsSort::DATE_DESC:
                 $query = Query::create($query);
                 $query->setSort(['occurred_at' => 'desc']);

src/EventSearch/EventIndexer.php

@@ -9,7 +9,7 @@
 
 final class EventIndexer implements EventSubscriber
 {
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             'gdbots:pbjx:mixin:indexed' => 'onIndexed',