1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From edab489323b587e414564b6417cbb15d7d1b90aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 8 Jun 2018 10:46:04 +0200
Subject: [PATCH] use PHP_BINARY instead of php and allow override
---
tests/RedisTest.php | 10 ++++++----
tests/TestRedis.php | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
index ff0b7537..efb25f2e 100644
--- a/tests/RedisTest.php
+++ b/tests/RedisTest.php
@@ -5550,6 +5550,7 @@ private function startSessionProcess($sessionId, $sleepTime, $background, $maxEx
$this->markTestSkipped();
return true;
} else {
+ $phpcmd = (getenv("PHPCMD") ?: PHP_BINARY);
$commandParameters = array($this->getFullHostPath(), $this->sessionSaveHandler, $sessionId, $sleepTime, $maxExecutionTime, $lock_retries, $lock_expires, $sessionData, $sessionLifetime);
if ($locking_enabled) {
$commandParameters[] = '1';
@@ -5560,9 +5561,8 @@ private function startSessionProcess($sessionId, $sleepTime, $background, $maxEx
}
$commandParameters = array_map('escapeshellarg', $commandParameters);
- $command = 'php ' . __DIR__ . '/startSession.php ' . implode(' ', $commandParameters);
+ $command = "$phpcmd " . __DIR__ . '/startSession.php ' . implode(' ', $commandParameters);
$command .= $background ? ' 2>/dev/null > /dev/null &' : ' 2>&1';
-
exec($command, $output);
return ($background || (count($output) == 1 && $output[0] == 'SUCCESS')) ? true : false;
}
@@ -5576,7 +5576,8 @@ private function startSessionProcess($sessionId, $sleepTime, $background, $maxEx
*/
private function getSessionData($sessionId, $sessionLifetime = 1440)
{
- $command = 'php ' . __DIR__ . '/getSessionData.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . escapeshellarg($sessionId) . ' ' . escapeshellarg($sessionLifetime);
+ $phpcmd = (getenv("PHPCMD") ?: PHP_BINARY);
+ $command = "$phpcmd " . __DIR__ . '/getSessionData.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . escapeshellarg($sessionId) . ' ' . escapeshellarg($sessionLifetime);
exec($command, $output);
return $output[0];
@@ -5594,7 +5595,8 @@ private function regenerateSessionId($sessionId, $locking = false, $destroyPrevi
{
$args = array_map('escapeshellarg', array($sessionId, $locking, $destroyPrevious, $sessionProxy));
- $command = 'php --no-php-ini --define extension=igbinary.so --define extension=' . __DIR__ . '/../modules/redis.so ' . __DIR__ . '/regenerateSessionId.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . implode(' ', $args);
+ $phpcmd = (getenv("PHPCMD") ?: PHP_BINARY . ' --no-php-ini --define extension=igbinary.so --define extension=' . __DIR__ . '/../modules/redis.so');
+ $command = "$phpcmd " . __DIR__ . '/regenerateSessionId.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . implode(' ', $args);
exec($command, $output);
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
index 4348c7d8..7107669e 100644
--- a/tests/TestRedis.php
+++ b/tests/TestRedis.php
@@ -35,6 +35,8 @@
/* Let the user know this can take a bit of time */
echo "Note: these tests might take up to a minute. Don't worry :-)\n";
echo "Using PHP version " . PHP_VERSION . " (" . (PHP_INT_SIZE*8) . " bits)\n";
+$phpcmd = (getenv("PHPCMD") ?: PHP_BINARY);
+echo "Using PHP command: $phpcmd\n";
/* Depending on the classes being tested, run our tests on it */
echo "Testing class ";
|
