Mise à jour des librairies vendor
This commit is contained in:
@@ -20,8 +20,9 @@ namespace Google\Auth\Tests;
|
||||
use google\appengine\api\app_identity\AppIdentityService;
|
||||
// included from tests\mocks\AppIdentityService.php
|
||||
use Google\Auth\Credentials\AppIdentityCredentials;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class AppIdentityCredentialsOnAppEngineTest extends \PHPUnit_Framework_TestCase
|
||||
class AppIdentityCredentialsOnAppEngineTest extends TestCase
|
||||
{
|
||||
public function testIsFalseByDefault()
|
||||
{
|
||||
@@ -33,9 +34,15 @@ class AppIdentityCredentialsOnAppEngineTest extends \PHPUnit_Framework_TestCase
|
||||
$_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
|
||||
$this->assertTrue(AppIdentityCredentials::onAppEngine());
|
||||
}
|
||||
|
||||
public function testIsTrueWhenAppEngineRuntimeIsPhp()
|
||||
{
|
||||
$_SERVER['APPENGINE_RUNTIME'] = 'php';
|
||||
$this->assertTrue(AppIdentityCredentials::onAppEngine());
|
||||
}
|
||||
}
|
||||
|
||||
class AppIdentityCredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
class AppIdentityCredentialsGetCacheKeyTest extends TestCase
|
||||
{
|
||||
public function testShouldBeEmpty()
|
||||
{
|
||||
@@ -44,7 +51,7 @@ class AppIdentityCredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class AppIdentityCredentialsFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
|
||||
class AppIdentityCredentialsFetchAuthTokenTest extends TestCase
|
||||
{
|
||||
public function testShouldBeEmptyIfNotOnAppEngine()
|
||||
{
|
||||
|
||||
@@ -20,8 +20,9 @@ namespace Google\Auth\Tests;
|
||||
use Google\Auth\Credentials\GCECredentials;
|
||||
use GuzzleHttp\Psr7;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class GCECredentialsOnGCETest extends \PHPUnit_Framework_TestCase
|
||||
class GCECredentialsOnGCETest extends TestCase
|
||||
{
|
||||
public function testIsFalseOnClientErrorStatus()
|
||||
{
|
||||
@@ -56,21 +57,27 @@ class GCECredentialsOnGCETest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class GCECredentialsOnAppEngineFlexibleTest extends \PHPUnit_Framework_TestCase
|
||||
class GCECredentialsOnAppEngineFlexibleTest extends TestCase
|
||||
{
|
||||
public function testIsFalseByDefault()
|
||||
{
|
||||
$this->assertFalse(GCECredentials::onAppEngineFlexible());
|
||||
}
|
||||
|
||||
public function testIsTrueWhenGaeVmIsTrue()
|
||||
public function testIsTrueWhenGaeInstanceHasAefPrefix()
|
||||
{
|
||||
$_SERVER['GAE_VM'] = 'true';
|
||||
putenv('GAE_INSTANCE=aef-default-20180313t154438');
|
||||
$this->assertTrue(GCECredentials::onAppEngineFlexible());
|
||||
}
|
||||
|
||||
protected function tearDown()
|
||||
{
|
||||
// removes it if assigned
|
||||
putenv('GAE_INSTANCE');
|
||||
}
|
||||
}
|
||||
|
||||
class GCECredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
class GCECredentialsGetCacheKeyTest extends TestCase
|
||||
{
|
||||
public function testShouldNotBeEmpty()
|
||||
{
|
||||
@@ -79,7 +86,7 @@ class GCECredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class GCECredentialsFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
|
||||
class GCECredentialsFetchAuthTokenTest extends TestCase
|
||||
{
|
||||
public function testShouldBeEmptyIfNotOnGCE()
|
||||
{
|
||||
|
||||
@@ -18,8 +18,9 @@
|
||||
namespace Google\Auth\Tests;
|
||||
|
||||
use Google\Auth\Credentials\IAMCredentials;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class IAMConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
class IAMConstructorTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
@@ -53,7 +54,7 @@ class IAMConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class IAMUpdateMetadataCallbackTest extends \PHPUnit_Framework_TestCase
|
||||
class IAMUpdateMetadataCallbackTest extends TestCase
|
||||
{
|
||||
public function testUpdateMetadataFunc()
|
||||
{
|
||||
@@ -65,17 +66,15 @@ class IAMUpdateMetadataCallbackTest extends \PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
$update_metadata = $iam->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'));
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata[IAMCredentials::SELECTOR_KEY]));
|
||||
$this->assertArrayHasKey(IAMCredentials::SELECTOR_KEY, $actual_metadata);
|
||||
$this->assertEquals(
|
||||
$actual_metadata[IAMCredentials::SELECTOR_KEY],
|
||||
$selector);
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata[IAMCredentials::TOKEN_KEY]));
|
||||
$this->assertArrayHasKey(IAMCredentials::TOKEN_KEY, $actual_metadata);
|
||||
$this->assertEquals(
|
||||
$actual_metadata[IAMCredentials::TOKEN_KEY],
|
||||
$token);
|
||||
|
||||
@@ -23,6 +23,7 @@ use Google\Auth\Credentials\ServiceAccountJwtAccessCredentials;
|
||||
use Google\Auth\CredentialsLoader;
|
||||
use Google\Auth\OAuth2;
|
||||
use GuzzleHttp\Psr7;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
// Creates a standard JSON auth object for testing.
|
||||
function createTestJson()
|
||||
@@ -36,7 +37,7 @@ function createTestJson()
|
||||
];
|
||||
}
|
||||
|
||||
class SACGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
class SACGetCacheKeyTest extends TestCase
|
||||
{
|
||||
public function testShouldBeTheSameAsOAuth2WithTheSameScope()
|
||||
{
|
||||
@@ -87,7 +88,7 @@ class SACGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class SACConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
class SACConstructorTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
@@ -148,7 +149,7 @@ class SACConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class SACFromEnvTest extends \PHPUnit_Framework_TestCase
|
||||
class SACFromEnvTest extends TestCase
|
||||
{
|
||||
protected function tearDown()
|
||||
{
|
||||
@@ -178,7 +179,7 @@ class SACFromEnvTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class SACFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
|
||||
class SACFromWellKnownFileTest extends TestCase
|
||||
{
|
||||
private $originalHome;
|
||||
|
||||
@@ -211,7 +212,7 @@ class SACFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class SACFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
|
||||
class SACFetchAuthTokenTest extends TestCase
|
||||
{
|
||||
private $privateKey;
|
||||
|
||||
@@ -293,21 +294,23 @@ class SACFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
|
||||
$testJson
|
||||
);
|
||||
$update_metadata = $sa->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = null,
|
||||
$httpHandler);
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertArrayHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata
|
||||
);
|
||||
$this->assertEquals(
|
||||
$actual_metadata[CredentialsLoader::AUTH_METADATA_KEY],
|
||||
array('Bearer ' . $access_token));
|
||||
}
|
||||
}
|
||||
|
||||
class SACJwtAccessTest extends \PHPUnit_Framework_TestCase
|
||||
class SACJwtAccessTest extends TestCase
|
||||
{
|
||||
private $privateKey;
|
||||
|
||||
@@ -382,13 +385,15 @@ class SACJwtAccessTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertNotNull($sa);
|
||||
|
||||
$update_metadata = $sa->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = null);
|
||||
$this->assertTrue(
|
||||
!isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertArrayNotHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata
|
||||
);
|
||||
}
|
||||
|
||||
public function testUpdateMetadataFunc()
|
||||
@@ -400,40 +405,44 @@ class SACJwtAccessTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertNotNull($sa);
|
||||
|
||||
$update_metadata = $sa->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = 'https://example.com/service');
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertArrayHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata
|
||||
);
|
||||
|
||||
$authorization = $actual_metadata[CredentialsLoader::AUTH_METADATA_KEY];
|
||||
$this->assertTrue(is_array($authorization));
|
||||
$this->assertInternalType('array', $authorization);
|
||||
|
||||
$bearer_token = current($authorization);
|
||||
$this->assertTrue(is_string($bearer_token));
|
||||
$this->assertTrue(strpos($bearer_token, 'Bearer ') == 0);
|
||||
$this->assertTrue(strlen($bearer_token) > 30);
|
||||
$this->assertInternalType('string', $bearer_token);
|
||||
$this->assertEquals(0, strpos($bearer_token, 'Bearer '));
|
||||
$this->assertGreaterThan(30, strlen($bearer_token));
|
||||
|
||||
$actual_metadata2 = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = 'https://example.com/anotherService');
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata2[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertArrayHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata2
|
||||
);
|
||||
|
||||
$authorization2 = $actual_metadata2[CredentialsLoader::AUTH_METADATA_KEY];
|
||||
$this->assertTrue(is_array($authorization2));
|
||||
$this->assertInternalType('array', $authorization2);
|
||||
|
||||
$bearer_token2 = current($authorization2);
|
||||
$this->assertTrue(is_string($bearer_token2));
|
||||
$this->assertTrue(strpos($bearer_token2, 'Bearer ') == 0);
|
||||
$this->assertTrue(strlen($bearer_token2) > 30);
|
||||
$this->assertTrue($bearer_token != $bearer_token2);
|
||||
$this->assertInternalType('string', $bearer_token2);
|
||||
$this->assertEquals(0, strpos($bearer_token2, 'Bearer '));
|
||||
$this->assertGreaterThan(30, strlen($bearer_token2));
|
||||
$this->assertNotEquals($bearer_token2, $bearer_token);
|
||||
}
|
||||
}
|
||||
|
||||
class SACJwtAccessComboTest extends \PHPUnit_Framework_TestCase
|
||||
class SACJwtAccessComboTest extends TestCase
|
||||
{
|
||||
private $privateKey;
|
||||
|
||||
@@ -464,21 +473,23 @@ class SACJwtAccessComboTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertNotNull($sa);
|
||||
|
||||
$update_metadata = $sa->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = 'https://example.com/service');
|
||||
$this->assertTrue(
|
||||
isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertArrayHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata
|
||||
);
|
||||
|
||||
$authorization = $actual_metadata[CredentialsLoader::AUTH_METADATA_KEY];
|
||||
$this->assertTrue(is_array($authorization));
|
||||
$this->assertInternalType('array', $authorization);
|
||||
|
||||
$bearer_token = current($authorization);
|
||||
$this->assertTrue(is_string($bearer_token));
|
||||
$this->assertTrue(strpos($bearer_token, 'Bearer ') == 0);
|
||||
$this->assertTrue(strlen($bearer_token) > 30);
|
||||
$this->assertInternalType('string', $bearer_token);
|
||||
$this->assertEquals(0, strpos($bearer_token, 'Bearer '));
|
||||
$this->assertGreaterThan(30, strlen($bearer_token));
|
||||
}
|
||||
|
||||
public function testNoScopeAndNoAuthUri()
|
||||
@@ -494,15 +505,17 @@ class SACJwtAccessComboTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertNotNull($sa);
|
||||
|
||||
$update_metadata = $sa->getUpdateMetadataFunc();
|
||||
$this->assertTrue(is_callable($update_metadata));
|
||||
$this->assertInternalType('callable', $update_metadata);
|
||||
|
||||
$actual_metadata = call_user_func($update_metadata,
|
||||
$metadata = array('foo' => 'bar'),
|
||||
$authUri = null);
|
||||
// no access_token is added to the metadata hash
|
||||
// but also, no error should be thrown
|
||||
$this->assertTrue(is_array($actual_metadata));
|
||||
$this->assertTrue(
|
||||
!isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
|
||||
$this->assertInternalType('array', $actual_metadata);
|
||||
$this->assertArrayNotHasKey(
|
||||
CredentialsLoader::AUTH_METADATA_KEY,
|
||||
$actual_metadata
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ use Google\Auth\ApplicationDefaultCredentials;
|
||||
use Google\Auth\Credentials\UserRefreshCredentials;
|
||||
use Google\Auth\OAuth2;
|
||||
use GuzzleHttp\Psr7;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
// Creates a standard JSON auth object for testing.
|
||||
function createURCTestJson()
|
||||
@@ -33,7 +34,7 @@ function createURCTestJson()
|
||||
];
|
||||
}
|
||||
|
||||
class URCGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
class URCGetCacheKeyTest extends TestCase
|
||||
{
|
||||
public function testShouldBeTheSameAsOAuth2WithTheSameScope()
|
||||
{
|
||||
@@ -50,7 +51,7 @@ class URCGetCacheKeyTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class URCConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
class URCConstructorTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
@@ -111,7 +112,7 @@ class URCConstructorTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class URCFromEnvTest extends \PHPUnit_Framework_TestCase
|
||||
class URCFromEnvTest extends TestCase
|
||||
{
|
||||
protected function tearDown()
|
||||
{
|
||||
@@ -141,7 +142,7 @@ class URCFromEnvTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class URCFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
|
||||
class URCFromWellKnownFileTest extends TestCase
|
||||
{
|
||||
private $originalHome;
|
||||
|
||||
@@ -174,7 +175,7 @@ class URCFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class URCFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
|
||||
class URCFetchAuthTokenTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException GuzzleHttp\Exception\ClientException
|
||||
|
||||
Reference in New Issue
Block a user