Merge pull request #553 from elifesciences/revert-552-revert-549-upda…

…te-to-php-8.3

Update to PHP 8.3

Dockerfile

@@ -1,7 +1,7 @@
 ##
 ## base image setup
 #
-FROM php:8.0-apache AS base
+FROM php:8.3-apache AS base
 
 USER root
 
@@ -40,7 +40,7 @@ COPY --from=composer:2.8 /usr/bin/composer /usr/bin/composer
 RUN apt-get update && apt-get install retry -y
 
 # install tools and config for xdebug
-RUN pecl install xdebug-3.1.6 && docker-php-ext-enable xdebug
+RUN pecl install xdebug && docker-php-ext-enable xdebug
 
 # Use the PHP dev server to run the app
 CMD ["php", "-S", "0.0.0.0:80", "-t", "./web", "./web/app_dev.php"]

composer.json

@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": "8.0.*",
+        "php": "8.3.*",
         "aws/aws-sdk-php": "3.288.1",
         "clue/block-react": "^1.1",
         "doctrine/annotations": "^1.4",
@@ -28,7 +28,7 @@
         "elife/content-negotiator": "^1.1",
         "elife/logging-sdk": "^1.1",
         "elife/ping": "^1.2",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.3",
         "jms/serializer": "^3.0",
         "justinrainbow/json-schema": "^5.1",
         "mindplay/composer-locator": "^2.1",

src/Search/Api/Elasticsearch/Response/SearchResponse.php

@@ -53,16 +53,6 @@ public function rewind(): void
         $this->cursor = 0;
     }
 
-    public function serialize()
-    {
-        // TODO: Implement serialize() method.
-    }
-
-    public function unserialize($serialized)
-    {
-        // TODO: Implement unserialize() method.
-    }
-
     public function getTypeTotals() : array
     {
         if (isset($this->aggregations['type_agg']['buckets'])) {

src/Search/Api/Query/QueryResponse.php

@@ -3,9 +3,8 @@
 namespace eLife\Search\Api\Query;
 
 use Iterator;
-use Serializable;
 
-interface QueryResponse extends Iterator, Serializable
+interface QueryResponse extends Iterator
 {
     public function getTotalResults() : int;