Merge branch 'php72'

.github/workflows/php.yml

@@ -1,4 +1,4 @@
-name: PHP Composer
+name: Build
 
 on:
   push:

examples/webhooks/createWebhook.php

@@ -58,7 +58,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/deleteWebhook.php

@@ -33,7 +33,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/getEventTypes.php

@@ -96,7 +96,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/getWebhook.php

@@ -48,7 +48,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/listWebhooks.php

@@ -78,7 +78,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER
@@ -114,11 +114,11 @@
 <table>
     <tr>
         <th>Successful</th>
-        <td><?= ($successful) ? 'Yes' : 'No';?></td>
+        <td><?= ($successful) ? 'Yes' : 'No' ?></td>
     </tr>
     <?php
     if ($successful) {
-        foreach($response->getWebhooks() as $webhook) {
+        foreach ($response->getWebhooks() as $webhook) {
             ?>
             <tr>
                 <td colspan="2">
@@ -149,8 +149,7 @@
             </tr>
             <?php
         }
-    }
-    elseif ($error) {
+    } elseif ($error) {
         ?>
         <tr>
             <th>Error message</th>

examples/webhooks/notificationHistory.php

@@ -52,7 +52,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/ping.php

@@ -44,7 +44,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

examples/webhooks/updateWebhook.php

@@ -53,7 +53,7 @@
 require '../../config.inc.php';
 
 try {
-    $request = AuthnetApiFactory::getJsonApiHandler(
+    $request = AuthnetApiFactory::getWebhooksHandler(
         AUTHNET_LOGIN,
         AUTHNET_TRANSKEY,
         AuthnetApiFactory::USE_DEVELOPMENT_SERVER

src/Authnetjson/AuthnetJsonRequest.php

@@ -15,6 +15,7 @@
 
 use Authnetjson\Exception\AuthnetCannotSetParamsException;
 use Authnetjson\Exception\AuthnetCurlException;
+use Authnetjson\Exception\AuthnetInvalidJsonException;
 use \Curl\Curl;
 
 /**
@@ -145,11 +146,11 @@ public function __toString()
     /**
      * The __set() method should never be used as all values to be made in the API call must be passed as an array
      *
-     * @param  string $name  unused
-     * @param  mixed  $value unused
+     * @param string $name unused
+     * @param mixed $value unused
      * @throws AuthnetCannotSetParamsException
      */
-    public function __set($name, $value)
+    public function __set(string $name, $value)
     {
         throw new AuthnetCannotSetParamsException(sprintf('You cannot set parameters directly in %s.', __CLASS__));
     }
@@ -158,12 +159,13 @@ public function __set($name, $value)
      * Magic method that dynamically creates our API call based on the name of the method in the client code and
      * the array passed as its parameter.
      *
-     * @param  string $api_call name of the API call to be made
-     * @param  array  $args     the array to be passed to the API
+     * @param string $api_call name of the API call to be made
+     * @param array $args the array to be passed to the API
      * @return AuthnetJsonResponse
+     * @throws AuthnetInvalidJsonException
      * @throws AuthnetCurlException
      */
-    public function __call($api_call, array $args)
+    public function __call(string $api_call, array $args)
     {
         $authentication = [
             'merchantAuthentication' => [
@@ -225,7 +227,7 @@ private function process(): string
      *
      * @param Curl $processor
      */
-    public function setProcessHandler($processor): void
+    public function setProcessHandler(Curl $processor): void
     {
         $this->processor = $processor;
     }

src/Authnetjson/AuthnetJsonResponse.php

@@ -237,10 +237,10 @@ protected function checkTransactionStatus(int $status): bool
      * Gets the transaction response field for AIM and CIM transactions.
      *
      * @param  mixed $field Name or key of the transaction field to be retrieved
-     * @return string Transaction field to be retrieved
+     * @return null|string Transaction field to be retrieved
      * @throws AuthnetTransactionResponseCallException
      */
-    public function getTransactionResponseField($field): string
+    public function getTransactionResponseField($field): ?string
     {
         if ($this->transactionInfo instanceof TransactionResponse) {
             return $this->transactionInfo->getTransactionResponseField($field);

src/Authnetjson/AuthnetSim.php

@@ -55,12 +55,12 @@ class AuthnetSim
      * Creates a SIM wrapper by setting the Authorize.Net credentials and URL of the endpoint to be used
      * for the API call
      *
-     * @param  string $login     Authorize.Net API login ID
-     * @param  string $signature Authorize.Net API Transaction Key
-     * @param  string $api_url   URL endpoint for processing a transaction
+     * @param string $login Authorize.Net API login ID
+     * @param string $signature Authorize.Net API Transaction Key
+     * @param string $api_url URL endpoint for processing a transaction
      * @throws Exception
      */
-    public function __construct($login, $signature, $api_url)
+    public function __construct(string $login, string $signature, string $api_url)
     {
         $this->login     = $login;
         $this->signature = $signature;

src/Authnetjson/AuthnetWebhook.php

@@ -99,10 +99,10 @@ public function __toString()
     /**
      * Gets a response variable from the Webhook notification
      *
-     * @param  string $var
+     * @param string $var
      * @return string          requested variable from the API call response
      */
-    public function __get($var)
+    public function __get(string $var)
     {
         return $this->webhook->{$var};
     }
@@ -146,6 +146,6 @@ protected function getAllHeaders(): array
                 }
             }
         }
-        return $headers;
+        return $headers ?: [];
     }
 }

src/Authnetjson/AuthnetWebhooksRequest.php

@@ -14,6 +14,7 @@
 namespace Authnetjson;
 
 use Authnetjson\Exception\AuthnetCurlException;
+use Authnetjson\Exception\AuthnetInvalidJsonException;
 use Curl\Curl;
 
 /**
@@ -54,7 +55,7 @@ class AuthnetWebhooksRequest
      *
      * @param string $api_url URL endpoint for processing a transaction
      */
-    public function __construct($api_url)
+    public function __construct(string $api_url)
     {
         $this->url = $api_url;
     }
@@ -64,7 +65,7 @@ public function __construct($api_url)
      *
      * @return string  HTML table containing debugging information
      */
-    public function __toString()
+    public function __toString(): string
     {
         $output  = '<table id="authnet-request">'."\n";
         $output .= '<caption>Authorize.Net Request</caption>'."\n";

src/Authnetjson/AuthnetWebhooksResponse.php

@@ -56,7 +56,7 @@ public function __construct(string $responseJson)
      *
      * @return string  HTML table containing debugging information
      */
-    public function __toString()
+    public function __toString(): string
     {
         $output  = '<table id="authnet-response">'."\n";
         $output .= '<caption>Authorize.Net Webhook Response</caption>'."\n";

tests/Authnetjson/AuthnetWebhooksRequestTest.php

@@ -506,7 +506,7 @@ public function testHandleResponseWithErrorMessageNoMessage(): void
      */
     public function testProcessorIsInstanceOfCurlWrapper(): void
     {
-        $request = new AuthnetWebhooksRequest(null, null, $this->server);
+        $request = new AuthnetWebhooksRequest('');
         $request->setProcessHandler(new Curl());
 
         $reflectionOfRequest = new \ReflectionObject($request);