Skip to content

Commit

Permalink
Fix undefined variable error in HttpRequestWrapper
Browse files Browse the repository at this point in the history
Fixes #19
  • Loading branch information
mcrumm committed Mar 9, 2016
1 parent 1fefffd commit ec04043
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/HttpRequestWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function send(RequestInterface $request, array $options = [])
*/
public function signRequest(RequestInterface $request)
{
if (!$this->credentials || $credentials['expiry'] < time()) {
if (!$this->credentials || $this->credentials['expiry'] < time()) {
$this->credentials = $this->fetchCredentials();
}

Expand Down
46 changes: 46 additions & 0 deletions tests/HttpRequestWrapperTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

/**
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

namespace Google\Gcloud\Tests;

use Google\Gcloud\HttpRequestWrapper;
use GuzzleHttp\Message\Request as Guzzle5Request;
use GuzzleHttp\Psr7\Request;
use Prophecy\Argument;

class HttpRequestWrapperTest extends \PHPUnit_Framework_TestCase
{
public function testSignRequestCanCheckTheExistingCredentialsExpiry()
{
if (class_exists('GuzzleHttp\\Message\\Request')) {
$request = new Guzzle5Request('GET', '/foo');
} else {
$request = new Request('GET', '/foo');
}

$wrapper = new HttpRequestWrapper();

// First call loads the application default credentials, and sets an expiry.
$wrapper->signRequest($request);

// The second call _should_ successfully check the existing credentials expiry.
$signedRequest = $wrapper->signRequest($request);

$this->assertStringStartsWith('Bearer', $signedRequest->getHeader('Authorization')[0]);
}
}

0 comments on commit ec04043

Please sign in to comment.