Skip to content

Commit 2611679

Browse files
Merge 4429064 into 37848bf
2 parents 37848bf + 4429064 commit 2611679

File tree

11 files changed

+398
-278
lines changed

11 files changed

+398
-278
lines changed

clients/algoliasearch-client-php/composer.lock

Lines changed: 367 additions & 247 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clients/algoliasearch-client-php/lib/Exceptions/UnreachableException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ final class UnreachableException extends AlgoliaException
77
public function __construct($message = '', $code = 0, $previous = null)
88
{
99
if (!$message) {
10-
$message =
11-
'Impossible to connect, please check your Algolia Application Id.';
10+
$message
11+
= 'Impossible to connect, please check your Algolia Application Id.';
1212
}
1313

1414
parent::__construct($message, $code, $previous);

clients/algoliasearch-client-php/lib/Http/Psr7/Uri.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -656,10 +656,10 @@ private function filterPath($path)
656656
}
657657

658658
return preg_replace_callback(
659-
'/(?:[^'.
660-
self::$charUnreserved.
661-
self::$charSubDelims.
662-
'%:@\/]++|%(?![A-Fa-f0-9]{2}))/',
659+
'/(?:[^'
660+
.self::$charUnreserved
661+
.self::$charSubDelims
662+
.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/',
663663
[$this, 'rawurlencodeMatchZero'],
664664
$path
665665
);
@@ -681,10 +681,10 @@ private function filterQueryAndFragment($str)
681681
}
682682

683683
return preg_replace_callback(
684-
'/(?:[^'.
685-
self::$charUnreserved.
686-
self::$charSubDelims.
687-
'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/',
684+
'/(?:[^'
685+
.self::$charUnreserved
686+
.self::$charSubDelims
687+
.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/',
688688
[$this, 'rawurlencodeMatchZero'],
689689
$str
690690
);
@@ -714,8 +714,8 @@ private function validateState()
714714
}
715715
} elseif (isset($this->path[0]) && '/' !== $this->path[0]) {
716716
@trigger_error(
717-
'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI '.
718-
'by adding a leading slash to the path is deprecated since version 1.4 and will throw an exception instead.',
717+
'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI '
718+
.'by adding a leading slash to the path is deprecated since version 1.4 and will throw an exception instead.',
719719
E_USER_DEPRECATED
720720
);
721721
$this->path = '/'.$this->path;

clients/algoliasearch-client-php/lib/Http/Psr7/UriResolver.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public static function resolve(UriInterface $base, UriInterface $rel)
8989
$targetAuthority = $base->getAuthority();
9090
if ('' === $rel->getPath()) {
9191
$targetPath = $base->getPath();
92-
$targetQuery =
93-
'' !== $rel->getQuery()
92+
$targetQuery
93+
= '' !== $rel->getQuery()
9494
? $rel->getQuery()
9595
: $base->getQuery();
9696
} else {
@@ -105,8 +105,8 @@ public static function resolve(UriInterface $base, UriInterface $rel)
105105
if (false === $lastSlashPos) {
106106
$targetPath = $rel->getPath();
107107
} else {
108-
$targetPath =
109-
mb_substr(
108+
$targetPath
109+
= mb_substr(
110110
$base->getPath(),
111111
0,
112112
$lastSlashPos + 1
@@ -236,9 +236,9 @@ private static function getRelativePath(
236236
}
237237
}
238238
$targetSegments[] = $targetLastSegment;
239-
$relativePath =
240-
str_repeat('../', count($sourceSegments)).
241-
implode('/', $targetSegments);
239+
$relativePath
240+
= str_repeat('../', count($sourceSegments))
241+
.implode('/', $targetSegments);
242242

243243
// A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".
244244
// This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used

clients/algoliasearch-client-php/lib/RetryStrategy/ApiWrapper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public function __construct(
6363
$this->http = $http;
6464
$this->clusterHosts = $clusterHosts;
6565
$this->config = $config;
66-
$this->requestOptionsFactory =
67-
$RqstOptsFactory ?: new RequestOptionsFactory($config);
66+
$this->requestOptionsFactory
67+
= $RqstOptsFactory ?: new RequestOptionsFactory($config);
6868
$this->logger = $logger ?: Algolia::getLogger();
6969
if (defined('JSON_UNESCAPED_UNICODE')) {
7070
// `JSON_UNESCAPED_UNICODE` is introduced in PHP 5.4.0
@@ -238,8 +238,8 @@ private function handleResponse(
238238
null === $response->getReasonPhrase()
239239
|| '' === $response->getReasonPhrase()
240240
) {
241-
$reason =
242-
$statusCode >= 500
241+
$reason
242+
= $statusCode >= 500
243243
? 'Internal Server Error'
244244
: 'Unreachable Host';
245245
}

clients/algoliasearch-client-php/lib/Support/AlgoliaAgent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ private static function getDefaultSegments($clientName)
5858
if (defined('\GuzzleHttp\ClientInterface::VERSION')) {
5959
$segments['Guzzle'] = ClientInterface::VERSION;
6060
} else {
61-
$segments['Guzzle'] =
62-
ClientInterface::MAJOR_VERSION;
61+
$segments['Guzzle']
62+
= ClientInterface::MAJOR_VERSION;
6363
}
6464
}
6565

config/.php-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3.13
1+
8.4.12

config/.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11.6
1+
3.11.13

scripts/docker/Dockerfile.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ARG CSHARP_VERSION
88
FROM dart:${DART_VERSION} AS dart-builder
99
FROM mcr.microsoft.com/dotnet/sdk:${CSHARP_VERSION} AS csharp-builder
1010
FROM golang:${GO_VERSION}-alpine AS go-builder
11-
FROM python:${PYTHON_VERSION}-bullseye AS python-builder
12-
FROM php:${PHP_VERSION}-bullseye AS builder
11+
FROM python:${PYTHON_VERSION}-trixie AS python-builder
12+
FROM php:${PHP_VERSION}-trixie AS builder
1313

1414
SHELL ["/bin/bash", "--login", "-c"]
1515

scripts/docker/Dockerfile.ruby

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG RUBY_VERSION
2-
FROM ruby:${RUBY_VERSION}-bullseye
2+
FROM ruby:${RUBY_VERSION}-trixie
33

44
ADD https://github.com/fables-tales/rubyfmt/releases/download/v0.10.0/rubyfmt-v0.10.0-Linux-aarch64.tar.gz rubyfmt.tar.gz
55
RUN tar -xzf rubyfmt.tar.gz && \

0 commit comments

Comments
 (0)