Skip to content

Commit

Permalink
Merge pull request #552 from elifesciences/revert-549-update-to-php-8.3
Browse files Browse the repository at this point in the history
Revert "Update to PHP 8.3"
  • Loading branch information
scottaubrey authored Nov 8, 2024
2 parents 860392d + f9703e1 commit 7d03277
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 106 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## base image setup
#
FROM php:8.3-apache AS base
FROM php:8.0-apache AS base

USER root

Expand Down Expand Up @@ -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 && docker-php-ext-enable xdebug
RUN pecl install xdebug-3.1.6 && 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"]
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"require": {
"php": "8.3.*",
"php": "8.0.*",
"aws/aws-sdk-php": "3.288.1",
"clue/block-react": "^1.1",
"doctrine/annotations": "^1.4",
Expand All @@ -28,7 +28,7 @@
"elife/content-negotiator": "^1.1",
"elife/logging-sdk": "^1.1",
"elife/ping": "^1.2",
"guzzlehttp/guzzle": "^7.3",
"guzzlehttp/guzzle": "^6.3",
"jms/serializer": "^3.0",
"justinrainbow/json-schema": "^5.1",
"mindplay/composer-locator": "^2.1",
Expand Down
139 changes: 38 additions & 101 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Search/Api/Elasticsearch/Response/SearchResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ 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'])) {
Expand Down
3 changes: 2 additions & 1 deletion src/Search/Api/Query/QueryResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
namespace eLife\Search\Api\Query;

use Iterator;
use Serializable;

interface QueryResponse extends Iterator
interface QueryResponse extends Iterator, Serializable
{
public function getTotalResults() : int;

Expand Down

0 comments on commit 7d03277

Please sign in to comment.