Renaming Namespaces and Organizing Classes

- Updated OpenId classes to be in API namespace
- Updated PP Naming Convention to PayPal Naming Convention
- FormatConverter Class got its own namespace
- Handlers are grouped in Handler namespace
- Samples and Tests Updated Accordingly
This commit is contained in:
japatel
2014-12-17 17:15:01 -06:00
parent 20038e7525
commit 29a8d8f50d
246 changed files with 1068 additions and 1057 deletions

View File

@@ -1,10 +1,10 @@
<?php
use PayPal\Core\PPConfigManager;
use PayPal\Core\PayPalConfigManager;
class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @var PPConfigManager
* @var PayPalConfigManager
*/
protected $object;
@@ -14,7 +14,7 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$this->object = new \ReflectionClass('PayPal\Core\PPConfigManager');
$this->object = new \ReflectionClass('PayPal\Core\PayPalConfigManager');
runkit_constant_remove('PP_CONFIG_PATH');
}
@@ -32,10 +32,10 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
public function testGetInstance()
{
define("PP_CONFIG_PATH", dirname(dirname(dirname(__DIR__))));
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
$instance = $this->object->getInstance();
$instance2 = $this->object->getInstance();
$this->assertTrue($instance instanceof PPConfigManager);
$this->assertTrue($instance instanceof PayPalConfigManager);
$this->assertSame($instance, $instance2);
}
@@ -43,7 +43,7 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
public function testGet()
{
define("PP_CONFIG_PATH", dirname(dirname(dirname(__DIR__))));
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
$ret = $this->object->get('acct2');
$this->assertConfiguration(
array('acct2.ClientId' => 'TestClientId', 'acct2.ClientSecret' => 'TestClientSecret'),
@@ -57,7 +57,7 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
public function testGetIniPrefix()
{
define("PP_CONFIG_PATH", dirname(dirname(dirname(__DIR__))));
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
$ret = $this->object->getIniPrefix();
$this->assertContains('acct1', $ret);
@@ -71,10 +71,10 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
public function testConfigByDefault()
{
define("PP_CONFIG_PATH", dirname(dirname(dirname(__DIR__))));
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
// Test file based config params and defaults
$config = PPConfigManager::getInstance()->getConfigHashmap();
$config = PayPalConfigManager::getInstance()->getConfigHashmap();
$this->assertConfiguration(array('mode' => 'sandbox', 'http.ConnectionTimeOut' => '60'), $config);
}
@@ -82,25 +82,25 @@ class PPConfigManagerTest extends \PHPUnit_Framework_TestCase
public function testConfigByCustom()
{
define("PP_CONFIG_PATH", dirname(dirname(dirname(__DIR__))));
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
// Test custom config params and defaults
$config = PPConfigManager::getInstance()->addConfigs(array('mode' => 'custom', 'http.ConnectionTimeOut' => 900))->getConfigHashmap();
$config = PayPalConfigManager::getInstance()->addConfigs(array('mode' => 'custom', 'http.ConnectionTimeOut' => 900))->getConfigHashmap();
$this->assertConfiguration(array('mode' => 'custom', 'http.ConnectionTimeOut' => '900'), $config);
}
public function testConfigByFileAndCustom() {
define("PP_CONFIG_PATH", __DIR__. '/non_existent/');
$this->object = PPConfigManager::getInstance();
$this->object = PayPalConfigManager::getInstance();
$config = PPConfigManager::getInstance()->getConfigHashmap();
$config = PayPalConfigManager::getInstance()->getConfigHashmap();
$this->assertArrayHasKey('http.ConnectionTimeOut', $config);
$this->assertEquals('30', $config['http.ConnectionTimeOut']);
$this->assertEquals('5', $config['http.Retry']);
//Add more configs
$config = PPConfigManager::getInstance()->addConfigs(array('http.Retry' => "10", 'mode' => 'sandbox'))->getConfigHashmap();
$config = PayPalConfigManager::getInstance()->addConfigs(array('http.Retry' => "10", 'mode' => 'sandbox'))->getConfigHashmap();
$this->assertConfiguration(array('http.ConnectionTimeOut' => "30", 'http.Retry' => "10", 'mode' => 'sandbox'), $config);
}

View File

@@ -1,15 +1,15 @@
<?php
use PayPal\Core\PPCredentialManager;
use PayPal\Core\PayPalCredentialManager;
/**
* Test class for PPCredentialManager.
* Test class for PayPalCredentialManager.
*
* @runTestsInSeparateProcesses
*/
class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
class PayPalCredentialManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @var PPCredentialManager
* @var PayPalCredentialManager
*/
protected $object;
@@ -34,7 +34,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$this->object = PPCredentialManager::getInstance($this->config);
$this->object = PayPalCredentialManager::getInstance($this->config);
}
/**
@@ -51,7 +51,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
public function testGetInstance()
{
$instance = $this->object->getInstance($this->config);
$this->assertTrue($instance instanceof PPCredentialManager);
$this->assertTrue($instance instanceof PayPalCredentialManager);
}
/**
@@ -68,7 +68,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
/**
* @after testGetDefaultCredentialObject
*
* @throws \PayPal\Exception\PPInvalidCredentialException
* @throws \PayPal\Exception\PayPalInvalidCredentialException
*/
public function testSetCredentialObject()
{
@@ -84,7 +84,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
/**
* @after testGetDefaultCredentialObject
*
* @throws \PayPal\Exception\PPInvalidCredentialException
* @throws \PayPal\Exception\PayPalInvalidCredentialException
*/
public function testSetCredentialObjectWithUserId()
{
@@ -99,7 +99,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
/**
* @after testGetDefaultCredentialObject
*
* @throws \PayPal\Exception\PPInvalidCredentialException
* @throws \PayPal\Exception\PayPalInvalidCredentialException
*/
public function testSetCredentialObjectWithoutDefault()
{
@@ -117,7 +117,7 @@ class PPCredentialManagerTest extends \PHPUnit_Framework_TestCase
*/
public function testGetInvalidCredentialObject()
{
$this->setExpectedException('PayPal\Exception\PPInvalidCredentialException');
$this->setExpectedException('PayPal\Exception\PayPalInvalidCredentialException');
$cred = $this->object->getCredentialObject('invalid_biz_api1.gmail.com');
}

View File

@@ -2,13 +2,13 @@
namespace PayPal\Test\Core;
use PayPal\Core\PPHttpConfig;
use PayPal\Core\PayPalHttpConfig;
/**
* Test class for PPAPIService.
* Test class for PayPalHttpConfigTest.
*
*/
class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
class PayPalHttpConfigTest extends \PHPUnit_Framework_TestCase
{
protected $object;
@@ -40,7 +40,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
*/
public function testHeaderFunctions()
{
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->addHeader('key1', 'value1');
$o->addHeader('key2', 'value');
$o->addHeader('key2', 'overwritten');
@@ -49,7 +49,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('overwritten', $o->getHeader('key2'));
$this->assertNull($o->getHeader('key3'));
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->addHeader('key1', 'value1');
$o->addHeader('key2', 'value');
$o->addHeader('key2', 'and more', false);
@@ -67,7 +67,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
*/
public function testCurlOpts()
{
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->setCurlOptions(array('k' => 'v'));
$curlOpts = $o->getCurlOptions();
@@ -77,7 +77,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
public function testRemoveCurlOpts()
{
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->setCurlOptions(array('k' => 'v'));
$curlOpts = $o->getCurlOptions();
$this->assertEquals(1, count($curlOpts));
@@ -94,7 +94,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
public function testUserAgent()
{
$ua = 'UAString';
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->setUserAgent($ua);
$curlOpts = $o->getCurlOptions();
@@ -109,7 +109,7 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
$sslCert = '../cacert.pem';
$sslPass = 'passPhrase';
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->setSSLCert($sslCert, $sslPass);
$curlOpts = $o->getCurlOptions();
@@ -124,14 +124,14 @@ class PPHttpConfigTest extends \PHPUnit_Framework_TestCase
{
$proxy = 'http://me:secret@hostname:8081';
$o = new PPHttpConfig();
$o = new PayPalHttpConfig();
$o->setHttpProxy($proxy);
$curlOpts = $o->getCurlOptions();
$this->assertEquals('hostname:8081', $curlOpts[CURLOPT_PROXY]);
$this->assertEquals('me:secret', $curlOpts[CURLOPT_PROXYUSERPWD]);
$this->setExpectedException('PayPal\Exception\PPConfigurationException');
$this->setExpectedException('PayPal\Exception\PayPalConfigurationException');
$o->setHttpProxy('invalid string');
}
}

View File

@@ -1,14 +1,14 @@
<?php
use PayPal\Core\PPLoggingManager;
use PayPal\Core\PayPalLoggingManager;
/**
* Test class for PPLoggingManager.
* Test class for PayPalLoggingManager.
*
*/
class PPLoggingManagerTest extends \PHPUnit_Framework_TestCase
class PayPalLoggingManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @var PPLoggingManager
* @var PayPalLoggingManager
*/
protected $object;
@@ -18,7 +18,7 @@ class PPLoggingManagerTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$this->object = PPLoggingManager::getInstance('InvoiceTest');
$this->object = PayPalLoggingManager::getInstance('InvoiceTest');
}
/**