Introduce proper namespace (#31)

tpay-com · Aug 21, 2023 · 8b9af76 · 8b9af76
1 parent 2d43d96
commit 8b9af76
Show file tree

Hide file tree

Showing 200 changed files with 1,051 additions and 571 deletions.
diff --git a/.dev-tools/.php-cs-fixer.php b/.dev-tools/.php-cs-fixer.php
@@ -58,6 +58,7 @@
         'phpdoc_var_annotation_correct_order' => true,
         'return_assignment' => true,
         'simplified_if_return' => true,
+        'single_line_empty_body' => true,
         'single_quote' => true,
         'single_space_around_construct' => true,
         'trailing_comma_in_multiline' => ['elements' => ['arrays']],

diff --git a/.dev-tools/psalm.xml b/.dev-tools/psalm.xml
@@ -12,7 +12,7 @@
         <ignoreFiles>
             <directory name='./' />
             <directory name='../vendor/' />
-            <file name='../Model/Objects/Authorization/Token.php' />
+            <file name='../src/Model/Objects/Authorization/Token.php' />
         </ignoreFiles>
     </projectFiles>
 

diff --git a/Examples/AccountsApi/AccountsApiExample.php b/Examples/AccountsApi/AccountsApiExample.php
@@ -2,11 +2,11 @@
 
 namespace tpaySDK\Examples\AccountsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
 use tpaySDK\Examples\ExamplesConfig;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class AccountsApiExample extends ExamplesConfig
 {

diff --git a/Examples/ExamplesConfig.php b/Examples/ExamplesConfig.php
@@ -2,7 +2,7 @@
 
 namespace tpaySDK\Examples;
 
-use tpaySDK\Loader;
+use Tpay\Loader;
 
 class ExamplesConfig
 {

diff --git a/Examples/Notifications/PaymentNotificationExample.php b/Examples/Notifications/PaymentNotificationExample.php
@@ -2,13 +2,13 @@
 
 namespace tpaySDK\Examples\Notifications;
 
+use Tpay\Model\Objects\NotificationBody\BasicPayment;
+use Tpay\Utilities\TpayException;
+use Tpay\Webhook\JWSVerifiedPaymentNotification;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Model\Objects\NotificationBody\BasicPayment;
-use tpaySDK\Utilities\TpayException;
-use tpaySDK\Webhook\JWSVerifiedPaymentNotification;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class PaymentNotificationExample extends ExamplesConfig
 {

diff --git a/Examples/RefundsApi/RefundsApiExample.php b/Examples/RefundsApi/RefundsApiExample.php
@@ -2,11 +2,11 @@
 
 namespace tpaySDK\Examples\RefundsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
 use tpaySDK\Examples\ExamplesConfig;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class RefundsApiExample extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/BankSelectionForm.php b/Examples/TransactionsApi/BankSelectionForm.php
@@ -2,13 +2,13 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Forms\PaymentForms;
+use Tpay\Utilities\TpayException;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Forms\PaymentForms;
-use tpaySDK\Utilities\TpayException;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class BankSelectionForm extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/BlikPayment.php b/Examples/TransactionsApi/BlikPayment.php
@@ -2,13 +2,13 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Forms\PaymentForms;
+use Tpay\Utilities\TpayException;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Forms\PaymentForms;
-use tpaySDK\Utilities\TpayException;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class BlikPayment extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/CardGate.php b/Examples/TransactionsApi/CardGate.php
@@ -2,15 +2,15 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Forms\PaymentForms;
+use Tpay\Model\Fields\FieldTypes;
+use Tpay\Utilities\TpayException;
+use Tpay\Utilities\Util;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Forms\PaymentForms;
-use tpaySDK\Model\Fields\FieldTypes;
-use tpaySDK\Utilities\TpayException;
-use tpaySDK\Utilities\Util;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class CardGate extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/CardGateExtended.php b/Examples/TransactionsApi/CardGateExtended.php
@@ -2,16 +2,16 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Forms\PaymentForms;
+use Tpay\Model\Fields\FieldTypes;
+use Tpay\Utilities\Logger;
+use Tpay\Utilities\TpayException;
+use Tpay\Utilities\Util;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Forms\PaymentForms;
-use tpaySDK\Model\Fields\FieldTypes;
-use tpaySDK\Utilities\Logger;
-use tpaySDK\Utilities\TpayException;
-use tpaySDK\Utilities\Util;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class CardGateExtended extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/RecurrentPayment.php b/Examples/TransactionsApi/RecurrentPayment.php
@@ -2,12 +2,12 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Utilities\TpayException;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Utilities\TpayException;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class RecurrentPayment extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/RedirectPayment.php b/Examples/TransactionsApi/RedirectPayment.php
@@ -2,12 +2,12 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
+use Tpay\Utilities\TpayException;
 use tpaySDK\Examples\ExamplesConfig;
-use tpaySDK\Utilities\TpayException;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class RedirectPayment extends ExamplesConfig
 {

diff --git a/Examples/TransactionsApi/TransactionsApiExample.php b/Examples/TransactionsApi/TransactionsApiExample.php
@@ -2,11 +2,11 @@
 
 namespace tpaySDK\Examples\TransactionsApi;
 
-use tpaySDK\Api\TpayApi;
+use Tpay\Api\TpayApi;
 use tpaySDK\Examples\ExamplesConfig;
 
 require_once '../ExamplesConfig.php';
-require_once '../../Loader.php';
+require_once '../../src/Loader.php';
 
 class TransactionsApiExample extends ExamplesConfig
 {

diff --git a/Loader.php b/Loader.php
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ https://github.com/tpay-com/tpay-openapi-php/archive/master.zip
 The only thing you need to do is to set your [OAuth](https://oauth.net) credentials like in example config file ([see example](Examples/ExamplesConfig.php)).
 You can generate access keys in [Tpay's merchant panel](https://panel.tpay.com).
 
-The [`Loader.php`](Loader.php) file handles all required class loading, so you can include this file to any file you are editing.
+The [`src/Loader.php`](src/Loader.php) file handles all required class loading, so you can include this file to any file you are editing.
 
 All methods described in [Tpay OpenAPI documentation](https://openapi.tpay.com) can be easily executed by running one of the library methods like:
 ```php

diff --git a/README_PL.md b/README_PL.md
@@ -35,7 +35,7 @@ https://github.com/tpay-com/tpay-openapi-php/archive/master.zip
 Jedyne, co musisz zrobić, to ustawić dane uwierzytelniające [OAuth](https://oauth.net), tak jak w przykładowym pliku konfiguracyjnym ([zobacz przykład](Examples/ExamplesConfig.php)).
 Klucze dostępu możesz wygenerować w [panelu sprzedawcy Tpay](https://panel.tpay.com).
 
-Plik [`loader.php`](Loader.php) obsługuje ładowanie wszystkich wymaganych klas, więc możesz dołączyć ten plik do dowolnego pliku, który edytujesz.
+Plik [`src/Loader.php`](src/Loader.php) obsługuje ładowanie wszystkich wymaganych klas, więc możesz dołączyć ten plik do dowolnego pliku, który edytujesz.
 
 Wszystkie metody opisane w [dokumentacji Tpay OpenAPI](https://openapi.tpay.com) można łatwo wykonać, uruchamiając jedną z metod z tej biblioteki, takie jak:
 ```php

diff --git a/View/Templates/bankSelection.phtml b/View/Templates/bankSelection.phtml
@@ -1,4 +1,4 @@
-<?php use tpaySDK\Locale\Lang; ?>
+<?php use Tpay\Locale\Lang; ?>
 <link rel="stylesheet" type="text/css" href="<?php echo $data['static_files_url'] ?>View/Styles/style.css"/>
 <div class="tpay-insidebg" id="main-payment">
     <?php if ($data['is_simple'] === false) { ?>

diff --git a/View/Templates/blikForm.phtml b/View/Templates/blikForm.phtml
@@ -1,4 +1,4 @@
-<?php use tpaySDK\Locale\Lang; ?>
+<?php use Tpay\Locale\Lang; ?>
 <link rel="stylesheet" type="text/css" href="<?php echo $data['static_files_url'] ?>View/Styles/style.css"/>
 <div class="tpay-insidebg" id="main-payment">
     <div class="tpay-header-wrapper">

diff --git a/View/Templates/gate.phtml b/View/Templates/gate.phtml
@@ -1,5 +1,6 @@
 <?php
-use tpaySDK\Locale\Lang;
+
+use Tpay\Locale\Lang;
 
 const STATIC_FILES_URL = 'static_files_url';
 const CARD_SAVE_ALLOWED = 'card_save_allowed';

diff --git a/View/Templates/savedCardForm.phtml b/View/Templates/savedCardForm.phtml
@@ -1,4 +1,4 @@
-<?php use tpaySDK\Locale\Lang; ?>
+<?php use Tpay\Locale\Lang; ?>
 <link rel="stylesheet" type="text/css" href="<?php echo $data['static_files_url'] ?>View/Styles/style.css"/>
 <div class="tpay-insidebg" id="main-payment">
     <div class="tpay-header-wrapper">

diff --git a/composer.json b/composer.json
@@ -26,10 +26,10 @@
     },
     "autoload": {
         "psr-4": {
-            "tpaySDK\\": ""
+            "Tpay\\": "src/"
         },
-        "exclude-from-classmap": [
-            "**/Examples/"
+        "files": [
+            "src/legacy_classes.php"
         ]
     },
     "autoload-dev": {

diff --git a/Api/Accounts/AccountsApi.php → src/Api/Accounts/AccountsApi.php b/Api/Accounts/AccountsApi.php → src/Api/Accounts/AccountsApi.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace tpaySDK\Api\Accounts;
+namespace Tpay\Api\Accounts;
 
-use tpaySDK\Api\ApiAction;
-use tpaySDK\Model\Objects\RequestBody\Account;
+use Tpay\Api\ApiAction;
+use Tpay\Model\Objects\RequestBody\Account;
 
 class AccountsApi extends ApiAction
 {

diff --git a/Api/ApiAction.php → src/Api/ApiAction.php b/Api/ApiAction.php → src/Api/ApiAction.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace tpaySDK\Api;
-
-use tpaySDK\Curl\Curl;
-use tpaySDK\Dictionary\HttpCodesDictionary;
-use tpaySDK\Manager\Manager;
-use tpaySDK\Model\Objects\Authorization\Token;
-use tpaySDK\Utilities\Logger;
-use tpaySDK\Utilities\TpayException;
+namespace Tpay\Api;
+
+use Tpay\Curl\Curl;
+use Tpay\Dictionary\HttpCodesDictionary;
+use Tpay\Manager\Manager;
+use Tpay\Model\Objects\Authorization\Token;
+use Tpay\Utilities\Logger;
+use Tpay\Utilities\TpayException;
 
 class ApiAction
 {

diff --git a/Api/Authorization/AuthorizationApi.php → src/Api/Authorization/AuthorizationApi.php b/Api/Authorization/AuthorizationApi.php → src/Api/Authorization/AuthorizationApi.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace tpaySDK\Api\Authorization;
+namespace Tpay\Api\Authorization;
 
-use tpaySDK\Api\ApiAction;
-use tpaySDK\Model\Objects\RequestBody\Auth;
+use Tpay\Api\ApiAction;
+use Tpay\Model\Objects\RequestBody\Auth;
 
 class AuthorizationApi extends ApiAction
 {

diff --git a/Api/Refunds/RefundsApi.php → src/Api/Refunds/RefundsApi.php b/Api/Refunds/RefundsApi.php → src/Api/Refunds/RefundsApi.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace tpaySDK\Api\Refunds;
+namespace Tpay\Api\Refunds;
 
-use tpaySDK\Api\ApiAction;
+use Tpay\Api\ApiAction;
 
 class RefundsApi extends ApiAction
 {

diff --git a/Api/TpayApi.php → src/Api/TpayApi.php b/Api/TpayApi.php → src/Api/TpayApi.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace tpaySDK\Api;
+namespace Tpay\Api;
 
-use tpaySDK\Api\Accounts\AccountsApi;
-use tpaySDK\Api\Authorization\AuthorizationApi;
-use tpaySDK\Api\Refunds\RefundsApi;
-use tpaySDK\Api\Transactions\TransactionsApi;
-use tpaySDK\Model\Objects\Authorization\Token;
-use tpaySDK\Utilities\TpayException;
+use Tpay\Api\Accounts\AccountsApi;
+use Tpay\Api\Authorization\AuthorizationApi;
+use Tpay\Api\Refunds\RefundsApi;
+use Tpay\Api\Transactions\TransactionsApi;
+use Tpay\Model\Objects\Authorization\Token;
+use Tpay\Utilities\TpayException;
 
 class TpayApi
 {

diff --git a/Api/Transactions/TransactionsApi.php → src/Api/Transactions/TransactionsApi.php b/Api/Transactions/TransactionsApi.php → src/Api/Transactions/TransactionsApi.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace tpaySDK\Api\Transactions;
+namespace Tpay\Api\Transactions;
 
-use tpaySDK\Api\ApiAction;
-use tpaySDK\Model\Objects\RequestBody\Pay;
-use tpaySDK\Model\Objects\RequestBody\Refund;
-use tpaySDK\Model\Objects\RequestBody\Transaction;
-use tpaySDK\Model\Objects\RequestBody\TransactionWithInstantRedirection;
+use Tpay\Api\ApiAction;
+use Tpay\Model\Objects\RequestBody\Pay;
+use Tpay\Model\Objects\RequestBody\Refund;
+use Tpay\Model\Objects\RequestBody\Transaction;
+use Tpay\Model\Objects\RequestBody\TransactionWithInstantRedirection;
 
 class TransactionsApi extends ApiAction
 {