summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--711.patch36
-rw-r--r--php-solarium4.spec11
2 files changed, 45 insertions, 2 deletions
diff --git a/711.patch b/711.patch
new file mode 100644
index 0000000..24e8f78
--- /dev/null
+++ b/711.patch
@@ -0,0 +1,36 @@
+From c124072397b395a6ec260a29958f471e0bc753a5 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 16 Oct 2019 11:24:18 +0200
+Subject: [PATCH] fix Passing glue string after array is deprecated
+
+---
+ src/Core/Query/AbstractRequestBuilder.php | 2 +-
+ src/Core/Query/Helper.php | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Core/Query/AbstractRequestBuilder.php b/src/Core/Query/AbstractRequestBuilder.php
+index 73b6ee72..a3c49ba4 100644
+--- a/src/Core/Query/AbstractRequestBuilder.php
++++ b/src/Core/Query/AbstractRequestBuilder.php
+@@ -68,7 +68,7 @@ public function renderLocalParams(string $value, array $localParams = []): strin
+ }
+
+ if (is_array($paramValue)) {
+- $paramValue = implode($paramValue, ',');
++ $paramValue = implode(',', $paramValue);
+ }
+
+ $params .= $paramName.'='.$paramValue.' ';
+diff --git a/src/Core/Query/Helper.php b/src/Core/Query/Helper.php
+index 0cf77152..a996bdcf 100644
+--- a/src/Core/Query/Helper.php
++++ b/src/Core/Query/Helper.php
+@@ -343,7 +343,7 @@ public function functionCall(string $name, array $params = [], bool $dereference
+ return $name.'()';
+ }
+
+- return $name.'('.implode($params, ',').')';
++ return $name.'('.implode(',', $params).')';
+ }
+
+ /**
diff --git a/php-solarium4.spec b/php-solarium4.spec
index 4504b5d..f6037cf 100644
--- a/php-solarium4.spec
+++ b/php-solarium4.spec
@@ -16,13 +16,15 @@
Name: php-%{gh_project}%{major}
Summary: Solarium PHP Solr client library
Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.solarium-project.org/
License: BSD
Source0: %{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
+Patch0: https://patch-diff.githubusercontent.com/raw/solariumphp/solarium/pull/711.patch
+
BuildArch: noarch
%if %{with_tests}
# For tests
@@ -89,6 +91,7 @@ Documentation: http://wiki.solarium-project.org/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
rm examples/.gitignore
@@ -135,7 +138,7 @@ EOF
: Run upstream test suite against installed library
ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73 php73; do
if which $cmd; then
$cmd %{_bindir}/phpunit6 --bootstrap vendor/autoload.php || ret=1
fi
@@ -155,6 +158,10 @@ exit $ret
%changelog
+* Wed Oct 16 2019 Remi Collet <remi@remirepo.net> - 4.2.0-2
+- add patch for PHP 7.4 from
+ https://github.com/solariumphp/solarium/pull/711
+
* Mon Nov 26 2018 Remi Collet <remi@remirepo.net> - 4.2.0-1
- update to 4.2.0