Skip to content

Commit 782eace

Browse files
committed
Testing http_request2 with pear installation
1 parent c607d90 commit 782eace

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

codegens/php-httprequest2/lib/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ self = module.exports = {
8585
indentString = indentString.repeat(options.indentCount);
8686

8787
snippet = '<?php\n';
88+
snippet += 'require_once \'HTTP/Request2.php\';\n';
8889
snippet += '$request = new HTTP_Request2();\n';
8990
snippet += `$request->setUrl('${request.url.toString()}');\n`;
9091
snippet += `$request->setMethod(HTTP_Request2::METHOD_${request.method});\n`;
9192
if (options.requestTimeout !== 0 || options.followRedirect) {
9293
let configArray = [];
93-
snippet += '$request->setOptions(array(';
9494

9595
// PHP-HTTP_Request2 method accepts timeout in seconds and it must be an integer
9696
if (options.requestTimeout !== 0 && Number.isInteger(options.requestTimeout / 1000)) {
@@ -102,7 +102,7 @@ self = module.exports = {
102102
configArray.push(`${indentString}'redirect' => TRUE`);
103103
}
104104
if (configArray.length) {
105-
snippet += '$request->setOptions(array(\n';
105+
snippet += '$request->setConfig(array(\n';
106106
snippet += configArray.join(',\n') + '\n';
107107
}
108108
snippet += '));\n';
@@ -130,14 +130,15 @@ self = module.exports = {
130130
}
131131
snippet += 'try {\n';
132132
snippet += `${indentString}$response = $request->send();\n`;
133-
snippet += `${indentString}if ($response=>getStatus() == 200) {\n`;
133+
snippet += `${indentString}if ($response->getStatus() == 200) {\n`;
134134
snippet += `${indentString.repeat(2)} echo $response->getBody();\n`;
135135
snippet += `${indentString}} else {\n`;
136-
snippet += `${indentString.repeat(2)}echo 'Unexpected HTTP status: . $response->getStatus() . ' ' .\n`;
136+
snippet += `${indentString.repeat(2)}echo 'Unexpected HTTP status: ' . $response->getStatus() . ' ' .\n`;
137137
snippet += `${indentString.repeat(3)}$response->getReasonPhrase();\n`;
138138
snippet += `${indentString}}\n`;
139139
snippet += '} catch(HTTP_Request2_Exception $e) {\n';
140140
snippet += `${indentString}echo 'Error: ' . $e->getMessage();\n}`;
141+
console.log(snippet);
141142
return callback(null, snippet);
142143
}
143144
};

npm/ci-requirements.sh

+7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ pushd ./codegens/csharp-restsharp &>/dev/null;
3434
dotnet add package RestSharp
3535
popd &>/dev/null;
3636
popd &>/dev/null;
37+
38+
echo "Installing dependencies required for tests in codegens/php-httprequest2"
39+
pushd ./codegens/php-httprequest2 &>/dev/null;
40+
wget http://pear.php.net/go-pear.phar -O go-pear.php
41+
php go-pear.php
42+
popd &>/dev/null;
43+
3744
echo "Installing dependencies required for tests in codegens/swift"
3845
pushd ./codegens/swift &>/dev/null;
3946
sudo apt-get update

0 commit comments

Comments
 (0)