Skip to content

Commit 4010f82

Browse files
committed
Issue #64 update root namespace throughout
1 parent 6fc770f commit 4010f82

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+188
-188
lines changed

README.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ The `CreateSessionKey` message has had PSR-7 support added, and can be used like
8989

9090
use GuzzleHttp\Client;
9191
use GuzzleHttp\Exception\ClientException; // Or your favourite PSR-18 client
92-
use Academe\SagePay\Psr7\Model\Auth;
93-
use Academe\SagePay\Psr7\Model\Endpoint;
94-
use Academe\SagePay\Psr7\Request\CreateSessionKey;
95-
use Academe\SagePay\Psr7\Factory;
96-
use Academe\SagePay\Psr7\Request\CreateCardIdentifier;
97-
use Academe\SagePay\Psr7\Factory\ResponseFactory;
92+
use Academe\Opayo\Pi\Model\Auth;
93+
use Academe\Opayo\Pi\Model\Endpoint;
94+
use Academe\Opayo\Pi\Request\CreateSessionKey;
95+
use Academe\Opayo\Pi\Factory;
96+
use Academe\Opayo\Pi\Request\CreateCardIdentifier;
97+
use Academe\Opayo\Pi\Factory\ResponseFactory;
9898

9999
// Set up authentication details object.
100100

@@ -154,7 +154,7 @@ development, the card details can be sent from your test script, emulating
154154
the front end.
155155

156156
```php
157-
use Academe\SagePay\Psr7\Request\CreateCardIdentifier;
157+
use Academe\Opayo\Pi\Request\CreateCardIdentifier;
158158

159159
// Create a card indentifier on the API.
160160
// Note the MMYY order is most often used for GB gateways like Sage Pay. Many European
@@ -217,14 +217,14 @@ then identifies a single card within the storage area.
217217
A transaction can be initiated using the card identifier.
218218

219219
```php
220-
use Academe\SagePay\Psr7\Money;
221-
use Academe\SagePay\Psr7\PaymentMethod;
222-
use Academe\SagePay\Psr7\Request\CreatePayment;
223-
use Academe\SagePay\Psr7\Request\Model\SingleUseCard;
224-
use Academe\SagePay\Psr7\Money\Amount;
225-
use Academe\SagePay\Psr7\Request\Model\Person;
226-
use Academe\SagePay\Psr7\Request\Model\Address;
227-
use Academe\SagePay\Psr7\Money\MoneyAmount;
220+
use Academe\Opayo\Pi\Money;
221+
use Academe\Opayo\Pi\PaymentMethod;
222+
use Academe\Opayo\Pi\Request\CreatePayment;
223+
use Academe\Opayo\Pi\Request\Model\SingleUseCard;
224+
use Academe\Opayo\Pi\Money\Amount;
225+
use Academe\Opayo\Pi\Request\Model\Person;
226+
use Academe\Opayo\Pi\Request\Model\Address;
227+
use Academe\Opayo\Pi\Money\MoneyAmount;
228228
use Money\Money as MoneyPhp;
229229

230230
// We need a billing address.
@@ -363,7 +363,7 @@ You can amend the shipping details and the amount (with no limit)
363363
but not the payee details or address.
364364

365365
```php
366-
use Academe\SagePay\Psr7\Request\CreateRepeatPayment;
366+
use Academe\Opayo\Pi\Request\CreateRepeatPayment;
367367

368368
$repeat_payment = new CreateRepeatPayment(
369369
$endpoint,
@@ -464,7 +464,7 @@ Now you need to handle the return from the bank. Using Diactoros (and now Guzzle
464464
message as a PSR-7 ServerRequest like this:
465465

466466
```php
467-
use Academe\SagePay\Psr7\ServerRequest\Secure3DAcs;
467+
use Academe\Opayo\Pi\ServerRequest\Secure3DAcs;
468468

469469
$serverRequest = \GuzzleHttp\Psr7\ServerRequest::fromGlobals();
470470
// or if using a framework that supplies a PSR-7 server request, just use that.
@@ -483,7 +483,7 @@ if (Secure3DAcs::isRequest($serverRequest->getBody()))
483483
or
484484

485485
```php
486-
use Academe\SagePay\Psr7\ServerRequest\Secure3DAcs;
486+
use Academe\Opayo\Pi\ServerRequest\Secure3DAcs;
487487

488488
if (Secure3DAcs::isRequest($_POST)) {
489489
$secure3dServerRequest = Secure3DAcs::fromData($_POST);
@@ -499,7 +499,7 @@ Handling the 3D Secure result involves two steps:
499499
2. Fetching the final transaction result from Sage Pay.
500500

501501
```php
502-
use Academe\SagePay\Psr7\Request\CreateSecure3D;
502+
use Academe\Opayo\Pi\Request\CreateSecure3D;
503503

504504
$request = new CreateSecure3D(
505505
$endpoint,
@@ -596,7 +596,7 @@ or while testing).
596596
A CVV can be linked to a reusable card with the `LinkSecurityCode` message:
597597

598598
```php
599-
use Academe\SagePay\Psr7\Request\LinkSecurityCode;
599+
use Academe\Opayo\Pi\Request\LinkSecurityCode;
600600

601601
$securityCode = new LinkSecurityCode(
602602
$endpoint,

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "academe/sagepaymsg",
2+
"name": "academe/opayo-pi",
33
"license": "MIT",
44
"type": "library",
5-
"description": "A library to handle the message content and structure for the Sage Pay Integration service",
5+
"description": "A library to handle the message content and structure for the Opayo Pi (ne Sage Pay Integration) payment gateway",
66
"keywords": [
77
"gateway",
88
"merchant",
@@ -34,7 +34,7 @@
3434
},
3535
"autoload": {
3636
"psr-4": {
37-
"Academe\\SagePay\\Psr7\\": "src/"
37+
"Academe\\Opayo\\Pi\\": "src/"
3838
}
3939
}
4040
}

src/AbstractMessage.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7;
3+
namespace Academe\Opayo\Pi;
44

55
/**
66
* Shared (Request and Response) abstract message.
77
*/
88

99
use ReflectionClass;
1010
use Psr\Http\Message\MessageInterface;
11-
use Academe\SagePay\Psr7\Helper;
11+
use Academe\Opayo\Pi\Helper;
1212

1313
abstract class AbstractMessage
1414
{

src/Factory/DiactorosFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Factory;
3+
namespace Academe\Opayo\Pi\Factory;
44

55
/**
66
* Zend Diactoros Factory for creating PSR-7 objects.

src/Factory/FactoryInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Factory;
3+
namespace Academe\Opayo\Pi\Factory;
44

55
/**
66
* @deprecated Use RequestFactoryInterface instead.

src/Factory/GuzzleFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Factory;
3+
namespace Academe\Opayo\Pi\Factory;
44

55
/**
66
* Guzzle Factory for creating PSR-7 objects.

src/Factory/RequestFactoryInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Factory;
3+
namespace Academe\Opayo\Pi\Factory;
44

55
/**
66
* Factory interface for creating PSR-7 request objects.

src/Factory/ResponseFactory.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Factory;
3+
namespace Academe\Opayo\Pi\Factory;
44

55
/**
66
* Factory to return the appropriate Response object given
@@ -10,11 +10,11 @@
1010
* application would otherwise have to deal with.
1111
*/
1212

13-
use Academe\SagePay\Psr7\Response\AbstractTransaction;
14-
use Academe\SagePay\Psr7\Request\AbstractRequest;
13+
use Academe\Opayo\Pi\Response\AbstractTransaction;
14+
use Academe\Opayo\Pi\Request\AbstractRequest;
1515
use Psr\Http\Message\ResponseInterface;
16-
use Academe\SagePay\Psr7\Response;
17-
use Academe\SagePay\Psr7\Helper;
16+
use Academe\Opayo\Pi\Response;
17+
use Academe\Opayo\Pi\Helper;
1818
use Teapot\StatusCode\Http;
1919

2020
class ResponseFactory

src/Helper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php namespace Academe\SagePay\Psr7;
1+
<?php namespace Academe\Opayo\Pi;
22

33
/**
44
* Shared message abstract.

src/Iso3166/Countries.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Iso3166;
3+
namespace Academe\Opayo\Pi\Iso3166;
44

55
class Countries
66
{

src/Iso3166/States.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php namespace Academe\SagePay\Psr7\Iso3166;
1+
<?php namespace Academe\Opayo\Pi\Iso3166;
22

33
class States
44
{

src/Model/Auth.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?php namespace Academe\SagePay\Psr7\Model;
1+
<?php namespace Academe\Opayo\Pi\Model;
22

33
/**
44
* Value object given the account authentication details.
55
* Provides the as needed, and the correct base URL.
66
*/
77

8-
use Academe\SagePay\Psr7\Security\SensitiveValue;
8+
use Academe\Opayo\Pi\Security\SensitiveValue;
99

1010
class Auth
1111
{

src/Model/Endpoint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Model;
3+
namespace Academe\Opayo\Pi\Model;
44

55
/**
66
* The endpoint to use to access the Sage Pay API.

src/Money/Amount.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Money;
3+
namespace Academe\Opayo\Pi\Money;
44

55
/**
66
* Value object for the amount, in the appropriate currency.
@@ -19,7 +19,7 @@ class Amount implements AmountInterface
1919
protected $currency;
2020

2121
/**
22-
* @param Academe\SagePay\Psr7\Money\Currency|Currency $currency
22+
* @param Academe\Opayo\Pi\Money\Currency|Currency $currency
2323
* @param int $amount Minor unit total amount, with no decimal part
2424
*/
2525
public function __construct(CurrencyInterface $currency, $amount = 0)

src/Money/AmountInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Money;
3+
namespace Academe\Opayo\Pi\Money;
44

55
/**
66
* Amount interface, for carrying an amount and its currency.

src/Money/Currency.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Money;
3+
namespace Academe\Opayo\Pi\Money;
44

55
/**
66
* Defines a currency.
77
* Only supports currencies that SagePay supports.
88
* TODO: create a CurrencyInterface for this.
99
*/
1010

11-
//use Academe\SagePay\Psr7\Iso4217\Currencies;
11+
//use Academe\Opayo\Pi\Iso4217\Currencies;
1212
use UnexpectedValueException;
1313
use Alcohol\ISO4217;
1414

@@ -21,7 +21,7 @@ class Currency implements CurrencyInterface
2121

2222
/**
2323
* Object holding all currencies, initialised on instantiation.
24-
* @var Academe\SagePay\Psr7\Iso4217\Currencies
24+
* @var Academe\Opayo\Pi\Iso4217\Currencies
2525
*/
2626
protected $all_currencies;
2727

src/Money/CurrencyInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Money;
3+
namespace Academe\Opayo\Pi\Money;
44

55
/**
66
* Currency interface, for defining a currency instance.

src/Money/MoneyAmount.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Money;
3+
namespace Academe\Opayo\Pi\Money;
44

55
/**
66
* Value object for the amount, wrapping the moneyphp/money package.

src/Request/AbstractInstruction.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Request;
3+
namespace Academe\Opayo\Pi\Request;
44

55
/**
66
* Abstract for shared functionality across "instructions" requests.
77
*/
88

9-
use Academe\SagePay\Psr7\Model\Auth;
10-
use Academe\SagePay\Psr7\Model\Endpoint;
9+
use Academe\Opayo\Pi\Model\Auth;
10+
use Academe\Opayo\Pi\Model\Endpoint;
1111

1212
abstract class AbstractInstruction extends AbstractRequest
1313
{

src/Request/AbstractRequest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Request;
3+
namespace Academe\Opayo\Pi\Request;
44

55
/**
66
* Shared message abstract.
77
* Contains base methods that request messages will use.
88
*/
99

10-
use Academe\SagePay\Psr7\AbstractMessage;
11-
use Academe\SagePay\Psr7\Model\Endpoint;
12-
use Academe\SagePay\Psr7\Model\Auth;
13-
use Academe\SagePay\Psr7\Factory\FactoryInterface;
14-
use Academe\SagePay\Psr7\Factory\DiactorosFactory;
15-
use Academe\SagePay\Psr7\Factory\GuzzleFactory;
10+
use Academe\Opayo\Pi\AbstractMessage;
11+
use Academe\Opayo\Pi\Model\Endpoint;
12+
use Academe\Opayo\Pi\Model\Auth;
13+
use Academe\Opayo\Pi\Factory\FactoryInterface;
14+
use Academe\Opayo\Pi\Factory\DiactorosFactory;
15+
use Academe\Opayo\Pi\Factory\GuzzleFactory;
1616
use UnexpectedValueException;
1717
use JsonSerializable;
1818
use Exception;

src/Request/CreateAbort.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Request;
3+
namespace Academe\Opayo\Pi\Request;
44

55
/**
66
* The "abort" instruction request.

src/Request/CreateCardIdentifier.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Request;
3+
namespace Academe\Opayo\Pi\Request;
44

55
/**
66
* Request message for sending card details to Sage Pay to get a
@@ -13,10 +13,10 @@
1313
* similat to how Sage Pay Direct would.
1414
*/
1515

16-
use Academe\SagePay\Psr7\Model\Auth;
17-
use Academe\SagePay\Psr7\Model\Endpoint;
18-
use Academe\SagePay\Psr7\Response\SessionKey;
19-
use Academe\SagePay\Psr7\Security\SensitiveValue;
16+
use Academe\Opayo\Pi\Model\Auth;
17+
use Academe\Opayo\Pi\Model\Endpoint;
18+
use Academe\Opayo\Pi\Response\SessionKey;
19+
use Academe\Opayo\Pi\Security\SensitiveValue;
2020

2121
class CreateCardIdentifier extends AbstractRequest
2222
{

src/Request/CreateDeferred.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?php
22

3-
namespace Academe\SagePay\Psr7\Request;
3+
namespace Academe\Opayo\Pi\Request;
44

55
/**
66
* The transaction value object to send a transaction to Sage Pay.
77
* See https://test.sagepay.com/documentation/#transactions
88
*/
99

1010
use UnexpectedValueException;
11-
use Academe\SagePay\Psr7\Model\Endpoint;
12-
use Academe\SagePay\Psr7\Model\Auth;
13-
use Academe\SagePay\Psr7\PaymentMethod\PaymentMethodInterface;
14-
use Academe\SagePay\Psr7\Money\AmountInterface;
11+
use Academe\Opayo\Pi\Model\Endpoint;
12+
use Academe\Opayo\Pi\Model\Auth;
13+
use Academe\Opayo\Pi\PaymentMethod\PaymentMethodInterface;
14+
use Academe\Opayo\Pi\Money\AmountInterface;
1515

1616
class CreateDeferred extends CreatePayment
1717
{

0 commit comments

Comments
 (0)