Skip to content

Commit 9314aac

Browse files
unicodeveloperunicodeveloper
authored
Merge pull request #7 from ugochimbo/ft-refactor-for-psr2
refactored for psr-2 compliance
2 parents 26a60fd + d321f5d commit 9314aac

File tree

8 files changed

+111
-99
lines changed

8 files changed

+111
-99
lines changed

‎resources/config/paystack.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
*/
3636
'merchantEmail' => getenv('MERCHANT_EMAIL'),
3737

38-
];
38+
];

‎src/Exceptions/PaymentVerificationFailedException.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Exception;
1515

16-
class PaymentVerificationFailedException extends Exception {
16+
class PaymentVerificationFailedException extends Exception
17+
{
1718

18-
}
19+
}

‎src/Exceptions/isNullException.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Exception;
1515

16-
class IsNullException extends Exception {
16+
class IsNullException extends Exception
17+
{
1718

18-
}
19+
}

‎src/Facades/Paystack.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
use Illuminate\Support\Facades\Facade;
1515

16-
class Paystack extends Facade {
16+
class Paystack extends Facade
17+
{
1718
/**
18-
* Get the registered name of the component.
19-
*
20-
* @return string
21-
*/
19+
* Get the registered name of the component
20+
* @return string
21+
*/
2222
protected static function getFacadeAccessor()
2323
{
2424
return 'laravel-paystack';
2525
}
26-
}
26+
}

‎src/Paystack.php

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
use Unicodeveloper\Paystack\Exceptions\IsNullException;
1717
use Unicodeveloper\Paystack\Exceptions\PaymentVerificationFailedException;
1818

19-
class Paystack {
20-
19+
class Paystack
20+
{
2121
/**
2222
* Transaction Verification Successful
2323
*/
@@ -30,13 +30,13 @@ class Paystack {
3030

3131
/**
3232
* Issue Secret Key from your Paystack Dashboard
33-
* @var mixed
33+
* @var string
3434
*/
3535
protected $secretKey;
3636

3737
/**
3838
* Instance of Client
39-
* @var object
39+
* @var Client
4040
*/
4141
protected $client;
4242

@@ -75,7 +75,6 @@ public function setBaseUrl()
7575

7676
/**
7777
* Get secret key from Paystack config file
78-
* @return void
7978
*/
8079
public function setKey()
8180
{
@@ -84,22 +83,26 @@ public function setKey()
8483

8584
/**
8685
* Set options for making the Client request
87-
* @return void
8886
*/
8987
private function setRequestOptions()
9088
{
9189
$authBearer = 'Bearer '. $this->secretKey;
9290

93-
$this->client = new Client(['base_uri' => $this->baseUrl,
94-
'headers' => [
95-
'Authorization' => $authBearer,
96-
'Content-Type' => 'application/json',
97-
'Accept' => 'application/json'
98-
]]);
91+
$this->client = new Client(
92+
[
93+
'base_uri' => $this->baseUrl,
94+
'headers' => [
95+
'Authorization' => $authBearer,
96+
'Content-Type' => 'application/json',
97+
'Accept' => 'application/json'
98+
]
99+
]
100+
);
99101
}
100102

101103
/**
102104
* Initiate a payment request to Paystack
105+
* @return Paystack
103106
*/
104107
public function makePaymentRequest()
105108
{
@@ -112,7 +115,7 @@ public function makePaymentRequest()
112115
"last_name" => request()->last_name,
113116
"callback_url" => request()->callback_url
114117
];
115-
118+
116119
// Remove the fields which were not sent (value would be null)
117120
array_filter($data);
118121

@@ -122,18 +125,30 @@ public function makePaymentRequest()
122125
}
123126

124127

128+
/**
129+
* @param string $relativeUrl
130+
* @param string $method
131+
* @param array $body
132+
* @return Paystack
133+
* @throws IsNullException
134+
*/
125135
private function setHttpResponse($relativeUrl, $method, $body = [])
126136
{
127-
if(is_null($method)){
137+
if (is_null($method)) {
128138
throw new IsNullException("Empty method not allowed");
129139
}
130140

131-
$this->response = $this->client->{strtolower($method)}($this->baseUrl . $relativeUrl, ["body" => json_encode($body)]);
141+
$this->response = $this->client->{strtolower($method)}(
142+
$this->baseUrl . $relativeUrl,
143+
["body" => json_encode($body)]
144+
);
145+
132146
return $this;
133147
}
134148

135149
/**
136150
* Get the authorization url from the callback response
151+
* @return Paystack
137152
*/
138153
public function getAuthorizationUrl()
139154
{
@@ -146,7 +161,6 @@ public function getAuthorizationUrl()
146161

147162
/**
148163
* Hit Paystack Gateway to Verify that the transaction is valid
149-
* @return void
150164
*/
151165
private function verifyTransactionAtGateway()
152166
{
@@ -167,8 +181,7 @@ public function isTransactionVerificationValid()
167181

168182
$result = $this->getResponse()['message'];
169183

170-
switch ($result)
171-
{
184+
switch ($result) {
172185
case self::VS:
173186
$validate = true;
174187
break;
@@ -277,8 +290,8 @@ private function getData()
277290
/**
278291
* Create a plan
279292
*/
280-
public function createPlan(){
281-
293+
public function createPlan()
294+
{
282295
$data = [
283296
"name" => request()->name,
284297
"description" => request()->desc,
@@ -300,7 +313,8 @@ public function createPlan(){
300313
* @param $plan_code
301314
* @return array
302315
*/
303-
public function fetchPlan($plan_code){
316+
public function fetchPlan($plan_code)
317+
{
304318
$this->setRequestOptions();
305319
return $this->setHttpResponse('/plan/' . $plan_code, 'GET', [])->getResponse();
306320
}
@@ -310,7 +324,8 @@ public function fetchPlan($plan_code){
310324
* @param $plan_code
311325
* @return array
312326
*/
313-
public function updatePlan($plan_code){
327+
public function updatePlan($plan_code)
328+
{
314329
$data = [
315330
"name" => request()->name,
316331
"description" => request()->desc,
@@ -327,9 +342,9 @@ public function updatePlan($plan_code){
327342

328343
/**
329344
* Create a customer
330-
* @return array
331345
*/
332-
public function createCustomer(){
346+
public function createCustomer()
347+
{
333348
$data = [
334349
"email" => request()->email,
335350
"first_name" => request()->fname,
@@ -359,7 +374,8 @@ public function fetchCustomer($customer_id)
359374
* @param $customer_id
360375
* @return array
361376
*/
362-
public function updateCustomer($customer_id){
377+
public function updateCustomer($customer_id)
378+
{
363379
$data = [
364380
"email" => request()->email,
365381
"first_name" => request()->fname,
@@ -374,10 +390,11 @@ public function updateCustomer($customer_id){
374390
}
375391

376392
/**
377-
* Export tranactions in .CSV
393+
* Export transactions in .CSV
378394
* @return array
379395
*/
380-
public function exportTransactions(){
396+
public function exportTransactions()
397+
{
381398
$data = [
382399
"from" => request()->from,
383400
"to" => request()->to,
@@ -390,9 +407,9 @@ public function exportTransactions(){
390407

391408
/**
392409
* Create a subscription to a plan from a customer.
393-
* @return array
394410
*/
395-
public function createSubscription(){
411+
public function createSubscription()
412+
{
396413
$data = [
397414
"customer" => request()->customer, //Customer email or code
398415
"plan" => request()->plan,
@@ -407,7 +424,8 @@ public function createSubscription(){
407424
* Enable a subscription using the subscription code and token
408425
* @return array
409426
*/
410-
public function enableSubscription(){
427+
public function enableSubscription()
428+
{
411429
$data = [
412430
"code" => request()->code,
413431
"token" => request()->token,
@@ -421,7 +439,8 @@ public function enableSubscription(){
421439
* Disable a subscription using the subscription code and token
422440
* @return array
423441
*/
424-
public function disableSubscription(){
442+
public function disableSubscription()
443+
{
425444
$data = [
426445
"code" => request()->code,
427446
"token" => request()->token,
@@ -433,7 +452,7 @@ public function disableSubscription(){
433452

434453
/**
435454
* Fetch details about a certain subscription
436-
* @param $subscription_id
455+
* @param mixed $subscription_id
437456
* @return array
438457
*/
439458
public function fetchSubscription($subscription_id)
@@ -444,9 +463,9 @@ public function fetchSubscription($subscription_id)
444463

445464
/**
446465
* Create pages you can share with users using the returned slug
447-
* @return array
448466
*/
449-
public function createPage(){
467+
public function createPage()
468+
{
450469
$data = [
451470
"name" => request()->name,
452471
"description" => request()->description,
@@ -469,7 +488,7 @@ public function getAllPages()
469488

470489
/**
471490
* Fetch details about a certain page using its id or slug
472-
* @param $page_id
491+
* @param mixed $page_id
473492
* @return array
474493
*/
475494
public function fetchPage($page_id)
@@ -483,7 +502,8 @@ public function fetchPage($page_id)
483502
* @param $page_id
484503
* @return array
485504
*/
486-
public function updatePage($page_id){
505+
public function updatePage($page_id)
506+
{
487507
$data = [
488508
"name" => request()->name,
489509
"description" => request()->description,
@@ -493,8 +513,4 @@ public function updatePage($page_id){
493513
$this->setRequestOptions();
494514
return $this->setHttpResponse('/page/'.$page_id, 'PUT', $data)->getResponse();
495515
}
496-
497516
}
498-
499-
500-

0 commit comments

Comments
 (0)