Skip to content

Commit

Permalink
fix: remove trailing ? from GET urls
Browse files Browse the repository at this point in the history
  • Loading branch information
@Justintime50
Justintime50 committed Oct 20, 2021
1 parent 6b45680 commit be6c14c
Show file tree
Hide file tree
Showing 22 changed files with 582 additions and 574 deletions.
12 changes: 8 additions & 4 deletions lib/EasyPost/Requestor.php
View file
Expand Up @@ -197,8 +197,10 @@ private function _curlRequest($method, $absUrl, $headers, $params, $myApiKey)
// Setup the HTTP method and params to use on the request
if ($method == 'get') {
$curlOptions[CURLOPT_HTTPGET] = 1;
$urlParams = self::_urlEncode($params);
$absUrl = "$absUrl?$urlParams";
if (isset($params) && !empty($params)) {
$urlParams = self::_urlEncode($params);
$absUrl = "$absUrl?$urlParams";
}
} elseif ($method == 'post') {
$curlOptions[CURLOPT_POST] = 1;
$curlOptions[CURLOPT_POSTFIELDS] = json_encode($params);
Expand All @@ -207,8 +209,10 @@ private function _curlRequest($method, $absUrl, $headers, $params, $myApiKey)
$curlOptions[CURLOPT_POSTFIELDS] = json_encode($params);
} elseif ($method == 'delete') {
$curlOptions[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
$urlParams = self::_urlEncode($params);
$absUrl = "$absUrl?$urlParams";
if (isset($params) && !empty($params)) {
$urlParams = self::_urlEncode($params);
$absUrl = "$absUrl?$urlParams";
}
} else {
throw new Error("Unrecognized method {$method}");
}
Expand Down
22 changes: 12 additions & 10 deletions test/EasyPost/Test/ReportTest.php
View file
Expand Up @@ -7,6 +7,8 @@
use EasyPost\EasyPost;

EasyPost::setApiKey(getenv('API_KEY'));
define('REPORT_START_DATE', '2021-01-03');
define('REPORT_END_DATE', '2021-01-04');

class ReportTest extends \PHPUnit\Framework\TestCase
{
Expand Down Expand Up @@ -41,8 +43,8 @@ public function testCreatePaymentLogReport()
VCR::insertCassette('reports/createPaymentLogReport.yml');

$payment_log_report = Report::create(array(
"start_date" => "2021-01-02",
"end_date" => "2021-01-03",
"start_date" => REPORT_START_DATE,
"end_date" => REPORT_END_DATE,
"type" => "payment_log"
));

Expand All @@ -64,8 +66,8 @@ public function testCreateRefundReport()
VCR::insertCassette('reports/createRefundReport.yml');

$refund_report = Report::create(array(
"start_date" => "2021-01-02",
"end_date" => "2021-01-03",
"start_date" => REPORT_START_DATE,
"end_date" => REPORT_END_DATE,
"type" => "refund"
));

Expand All @@ -87,8 +89,8 @@ public function testCreateShipmentReport()
VCR::insertCassette('reports/createShipmentReport.yml');

$shipment_report = Report::create(array(
"start_date" => "2021-01-02",
"end_date" => "2021-01-03",
"start_date" => REPORT_START_DATE,
"end_date" => REPORT_END_DATE,
"type" => "shipment"
));

Expand All @@ -110,8 +112,8 @@ public function testCreateShipmentInvoiceReport()
VCR::insertCassette('reports/createShipmentInvoiceReport.yml');

$shipment_invoice_report = Report::create(array(
"start_date" => "2021-01-02",
"end_date" => "2021-01-03",
"start_date" => REPORT_START_DATE,
"end_date" => REPORT_END_DATE,
"type" => "shipment_invoice"
));

Expand All @@ -133,8 +135,8 @@ public function testCreateTrackerReport()
VCR::insertCassette('reports/createTrackerReport.yml');

$tracker_report = Report::create(array(
"start_date" => "2021-01-02",
"end_date" => "2021-01-03",
"start_date" => REPORT_START_DATE,
"end_date" => REPORT_END_DATE,
"type" => "tracker"
));

Expand Down
52 changes: 26 additions & 26 deletions test/cassettes/addresses/create.yml
View file
Expand Up @@ -8,7 +8,7 @@
Accept: application/json
Authorization: ''
Content-Type: application/json
User-Agent: 'EasyPost/v2 PhpClient/3.6.0'
User-Agent: ''
X-Client-User-Agent: ''
EasyPost-Version: '2'
body: '{"address":{"street1":"388 Townsend St","street2":"Apt 20","city":"San Francisco","state":"CA","zip":"94107"}}'
Expand All @@ -24,22 +24,22 @@
x-download-options: noopen
x-permitted-cross-domain-policies: none
referrer-policy: strict-origin-when-cross-origin
x-ep-request-uuid: 8d29b69361578bbbe78bb42b003aed86
x-ep-request-uuid: bee465606170496ce786b3e00015d209
cache-control: 'no-cache, no-store'
pragma: no-cache
expires: '0'
location: /api/v2/addresses/adr_059da1d447734818bee9a1a2fa429230
location: /api/v2/addresses/adr_aef9c7338a384dd0b75c0e0239cd35a1
content-type: 'application/json; charset=utf-8'
content-length: '429'
etag: 'W/"8a84928b0f256fa81df9d80b69ef7c60"'
x-request-id: 025de43a-2840-4d07-bdd0-99543de1234c
x-runtime: '0.033085'
x-node: bigweb5nuq
x-version-label: easypost-202110011858-559f609973-master
etag: 'W/"2e12bf9f14c69813dba0b8e1710f2d10"'
x-request-id: 75eca947-e794-4f43-ba59-b60e34338bd2
x-runtime: '0.048301'
x-node: bigweb4nuq
x-version-label: easypost-202110192143-cc149f31de-master
x-backend: easypost
x-proxied: ['intlb1nuq d40607e4ab', 'extlb2nuq d40607e4ab']
x-proxied: ['intlb2nuq d40607e4ab', 'extlb1nuq d40607e4ab']
strict-transport-security: 'max-age=31536000; includeSubDomains; preload'
body: '{"id":"adr_059da1d447734818bee9a1a2fa429230","object":"Address","created_at":"2021-10-01T22:29:15+00:00","updated_at":"2021-10-01T22:29:15+00:00","name":null,"company":null,"street1":"388 Townsend St","street2":"Apt 20","city":"San Francisco","state":"CA","zip":"94107","country":"US","phone":null,"email":null,"mode":"test","carrier_facility":null,"residential":null,"federal_tax_id":null,"state_tax_id":null,"verifications":{}}'
body: '{"id":"adr_aef9c7338a384dd0b75c0e0239cd35a1","object":"Address","created_at":"2021-10-20T16:53:00+00:00","updated_at":"2021-10-20T16:53:00+00:00","name":null,"company":null,"street1":"388 Townsend St","street2":"Apt 20","city":"San Francisco","state":"CA","zip":"94107","country":"US","phone":null,"email":null,"mode":"test","carrier_facility":null,"residential":null,"federal_tax_id":null,"state_tax_id":null,"verifications":{}}'
curl_info:
url: 'https://api.easypost.com/v2/addresses'
content_type: 'application/json; charset=utf-8'
Expand All @@ -49,32 +49,32 @@
filetime: -1
ssl_verify_result: 0
redirect_count: 0
total_time: 0.290406
namelookup_time: 0.044905
connect_time: 0.109719
pretransfer_time: 0.194584
total_time: 0.349258
namelookup_time: 0.051463
connect_time: 0.144801
pretransfer_time: 0.219276
size_upload: !!float 110
size_download: !!float 429
speed_download: !!float 1477
speed_upload: !!float 378
speed_download: !!float 1228
speed_upload: !!float 314
download_content_length: !!float 429
upload_content_length: !!float 110
starttransfer_time: 0.290299
starttransfer_time: 0.349206
redirect_time: !!float 0
redirect_url: ''
primary_ip: 169.62.110.130
primary_ip: 169.62.110.131
certinfo: { }
primary_port: 443
local_ip: 10.130.6.13
local_port: 59817
local_ip: 10.130.6.4
local_port: 50428
http_version: 2
protocol: 2
ssl_verifyresult: 0
scheme: HTTPS
appconnect_time_us: 194515
connect_time_us: 109719
namelookup_time_us: 44905
pretransfer_time_us: 194584
appconnect_time_us: 219198
connect_time_us: 144801
namelookup_time_us: 51463
pretransfer_time_us: 219276
redirect_time_us: 0
starttransfer_time_us: 290299
total_time_us: 290406
starttransfer_time_us: 349206
total_time_us: 349258
51 changes: 26 additions & 25 deletions test/cassettes/addresses/createVerify.yml
View file
Expand Up @@ -24,57 +24,58 @@
x-download-options: noopen
x-permitted-cross-domain-policies: none
referrer-policy: strict-origin-when-cross-origin
x-ep-request-uuid: af5516ab616e010fe7995cdc0016d634
x-ep-request-uuid: bee4655d6170496de786b3f90015d233
cache-control: 'no-cache, no-store'
pragma: no-cache
expires: '0'
location: /api/v2/addresses/adr_c88caa95c20d494b96c1bc2426e3c7a8
location: /api/v2/addresses/adr_ead917f3f5244f2f9ffa711385519860
content-type: 'application/json; charset=utf-8'
content-length: '632'
etag: 'W/"b40b1f29ab4d1494f4f905ce39b92410"'
x-request-id: b9d87d75-20fb-433f-9202-eaca29cefe36
x-runtime: '0.062946'
x-node: bigweb8nuq
x-version-label: easypost-202110181945-721ecffd7e-master
etag: 'W/"848850ba4309baaf384ef1d37b1d62fb"'
x-request-id: ef46d4e9-20af-4bd9-b6d4-a0c27171264b
x-runtime: '0.077191'
x-node: bigweb7nuq
x-version-label: easypost-202110192143-cc149f31de-master
x-backend: easypost
x-proxied: ['intlb1nuq d40607e4ab', 'extlb1nuq d40607e4ab']
x-canary: direct
x-proxied: ['intlb2nuq d40607e4ab', 'extlb1nuq d40607e4ab']
strict-transport-security: 'max-age=31536000; includeSubDomains; preload'
body: '{"id":"adr_c88caa95c20d494b96c1bc2426e3c7a8","object":"Address","created_at":"2021-10-18T23:19:43+00:00","updated_at":"2021-10-18T23:19:43+00:00","name":null,"company":"EASYPOST","street1":"417 MONTGOMERY ST STE 500","street2":"","city":"SAN FRANCISCO","state":"CA","zip":"94104-1100","country":"US","phone":"4151234567","email":null,"mode":"test","carrier_facility":null,"residential":false,"federal_tax_id":null,"state_tax_id":null,"verifications":{"zip4":{"success":true,"errors":[],"details":null},"delivery":{"success":true,"errors":[],"details":{"latitude":37.79342,"longitude":-122.40288,"time_zone":"America/Los_Angeles"}}}}'
body: '{"id":"adr_ead917f3f5244f2f9ffa711385519860","object":"Address","created_at":"2021-10-20T16:53:01+00:00","updated_at":"2021-10-20T16:53:01+00:00","name":null,"company":"EASYPOST","street1":"417 MONTGOMERY ST STE 500","street2":"","city":"SAN FRANCISCO","state":"CA","zip":"94104-1100","country":"US","phone":"4151234567","email":null,"mode":"test","carrier_facility":null,"residential":false,"federal_tax_id":null,"state_tax_id":null,"verifications":{"zip4":{"success":true,"errors":[],"details":null},"delivery":{"success":true,"errors":[],"details":{"latitude":37.79342,"longitude":-122.40288,"time_zone":"America/Los_Angeles"}}}}'
curl_info:
url: 'https://api.easypost.com/v2/addresses?verify%5B0%5D=1'
content_type: 'application/json; charset=utf-8'
http_code: 201
header_size: 845
header_size: 863
request_size: 705
filetime: -1
ssl_verify_result: 0
redirect_count: 0
total_time: 0.259213
namelookup_time: 0.009251
connect_time: 0.065975
pretransfer_time: 0.137607
total_time: 0.272141
namelookup_time: 0.001417
connect_time: 0.058951
pretransfer_time: 0.135609
size_upload: !!float 173
size_download: !!float 632
speed_download: !!float 2438
speed_upload: !!float 667
speed_download: !!float 2322
speed_upload: !!float 635
download_content_length: !!float 632
upload_content_length: !!float 173
starttransfer_time: 0.259129
starttransfer_time: 0.272098
redirect_time: !!float 0
redirect_url: ''
primary_ip: 169.62.110.131
certinfo: { }
primary_port: 443
local_ip: 10.130.6.11
local_port: 61512
local_ip: 10.130.6.4
local_port: 50430
http_version: 2
protocol: 2
ssl_verifyresult: 0
scheme: HTTPS
appconnect_time_us: 137541
connect_time_us: 65975
namelookup_time_us: 9251
pretransfer_time_us: 137607
appconnect_time_us: 135520
connect_time_us: 58951
namelookup_time_us: 1417
pretransfer_time_us: 135609
redirect_time_us: 0
starttransfer_time_us: 259129
total_time_us: 259213
starttransfer_time_us: 272098
total_time_us: 272141
50 changes: 25 additions & 25 deletions test/cassettes/addresses/retrieve.yml
View file
Expand Up @@ -2,13 +2,13 @@
-
request:
method: GET
url: 'https://api.easypost.com/v2/addresses/adr_059da1d447734818bee9a1a2fa429230'
url: 'https://api.easypost.com/v2/addresses/adr_aef9c7338a384dd0b75c0e0239cd35a1'
headers:
Host: api.easypost.com
Accept: application/json
Authorization: ''
Content-Type: application/json
User-Agent: 'EasyPost/v2 PhpClient/3.6.0'
User-Agent: ''
X-Client-User-Agent: ''
EasyPost-Version: '2'
response:
Expand All @@ -23,56 +23,56 @@
x-download-options: noopen
x-permitted-cross-domain-policies: none
referrer-policy: strict-origin-when-cross-origin
x-ep-request-uuid: 8d29b69961578bbbe78bb42c003aeda7
x-ep-request-uuid: e739257861704a98e786c1820013589c
cache-control: 'no-cache, no-store'
pragma: no-cache
expires: '0'
content-type: 'application/json; charset=utf-8'
content-length: '429'
etag: 'W/"8a84928b0f256fa81df9d80b69ef7c60"'
x-request-id: 67c6b326-9644-4ebd-ab31-480b70e325d9
x-runtime: '0.024227'
x-node: bigweb6nuq
x-version-label: easypost-202110011858-559f609973-master
etag: 'W/"2e12bf9f14c69813dba0b8e1710f2d10"'
x-request-id: 89db7904-bdfb-489d-b344-46e112d6ec17
x-runtime: '0.031635'
x-node: bigweb2nuq
x-version-label: easypost-202110192143-cc149f31de-master
x-backend: easypost
x-proxied: ['intlb2nuq d40607e4ab', 'extlb2nuq d40607e4ab']
x-proxied: ['intlb1nuq d40607e4ab', 'extlb2nuq d40607e4ab']
strict-transport-security: 'max-age=31536000; includeSubDomains; preload'
body: '{"id":"adr_059da1d447734818bee9a1a2fa429230","object":"Address","created_at":"2021-10-01T22:29:15+00:00","updated_at":"2021-10-01T22:29:15+00:00","name":null,"company":null,"street1":"388 Townsend St","street2":"Apt 20","city":"San Francisco","state":"CA","zip":"94107","country":"US","phone":null,"email":null,"mode":"test","carrier_facility":null,"residential":null,"federal_tax_id":null,"state_tax_id":null,"verifications":{}}'
body: '{"id":"adr_aef9c7338a384dd0b75c0e0239cd35a1","object":"Address","created_at":"2021-10-20T16:53:00+00:00","updated_at":"2021-10-20T16:53:00+00:00","name":null,"company":null,"street1":"388 Townsend St","street2":"Apt 20","city":"San Francisco","state":"CA","zip":"94107","country":"US","phone":null,"email":null,"mode":"test","carrier_facility":null,"residential":null,"federal_tax_id":null,"state_tax_id":null,"verifications":{}}'
curl_info:
url: 'https://api.easypost.com/v2/addresses/adr_059da1d447734818bee9a1a2fa429230'
url: 'https://api.easypost.com/v2/addresses/adr_aef9c7338a384dd0b75c0e0239cd35a1'
content_type: 'application/json; charset=utf-8'
http_code: 200
header_size: 774
request_size: 535
filetime: -1
ssl_verify_result: 0
redirect_count: 0
total_time: 0.224275
namelookup_time: 0.001475
connect_time: 0.06067
pretransfer_time: 0.138363
total_time: 0.239975
namelookup_time: 0.010202
connect_time: 0.06796
pretransfer_time: 0.149328
size_upload: !!float 0
size_download: !!float 429
speed_download: !!float 1912
speed_download: !!float 1787
speed_upload: !!float 0
download_content_length: !!float 429
upload_content_length: !!float 0
starttransfer_time: 0.224243
starttransfer_time: 0.239872
redirect_time: !!float 0
redirect_url: ''
primary_ip: 169.62.110.130
certinfo: { }
primary_port: 443
local_ip: 10.130.6.13
local_port: 59818
local_ip: 10.130.6.4
local_port: 50790
http_version: 2
protocol: 2
ssl_verifyresult: 0
scheme: HTTPS
appconnect_time_us: 138332
connect_time_us: 60670
namelookup_time_us: 1475
pretransfer_time_us: 138363
appconnect_time_us: 149065
connect_time_us: 67960
namelookup_time_us: 10202
pretransfer_time_us: 149328
redirect_time_us: 0
starttransfer_time_us: 224243
total_time_us: 224275
starttransfer_time_us: 239872
total_time_us: 239975

0 comments on commit be6c14c

Please sign in to comment.