= 1.5.5 - July 04, 2024 =

bruce-atkinson · bruce-atkinson · commit efd54f58be46 · 2024-07-04T07:10:59.000+02:00
* Test Wordpress 6.5.5 and Gravity Forms 2.8.13.
* Improve compatibility with other gateways.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # mod-gravityforms
 
-## Payfast module v1.5.4 for Gravity Forms v2.8.7
+## Payfast module v1.5.5 for Gravity Forms v2.8.13
 
 This is the Payfast module for Gravity Forms. Please feel free
 to [contact the Payfast support team](https://payfast.io/contact/) should you require any assistance.
@@ -9,11 +9,12 @@ to [contact the Payfast support team](https://payfast.io/contact/) should you re
 
 1. Unzip the module to a temporary location on your computer.
 2. Copy the **gravityformspayfast** folder in the archive to your base **wp-content/plugins** folder.
-   - This should NOT overwrite any existing files or folders and merely supplement them with the Payfast files.
-   - This is, however, dependent on the FTP program you use.
+    - This should NOT overwrite any existing files or folders and merely supplement them with the Payfast files.
+    - This is, however, dependent on the FTP program you use.
 3. Login to the WordPress Administrator console.
 4. Go to **Plugins** and activate the Payfast Gravity Forms plugin.
-5. Go to **Forms** -> **Settings**, under **Default Currency**, select **South African Rand** and click **Save Settings**.
+5. Go to **Forms** -> **Settings**, under **Default Currency**, select **South African Rand** and click **Save Settings
+   **.
 6. You will then need to create a form with options included from the **Pricing Fields** section and click **Save**.
 7. Go to **Forms** -> **Settings** -> **Payfast**, and add feed settings for Payfast per form.
 8. Complete the Payfast settings as required, and select **Mode** -> **Test** for testing purposes.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,11 @@
+=====================================
+Version : Date : Description
+=====================================
+
+= 1.5.5 - July 04, 2024 =
+* Test Wordpress 6.5.5 and Gravity Forms 2.8.13.
+* Improve compatibility with other gateways.
+
 = 1.5.4 - April 9, 2024 =
 * Test WordPress 6.5 and Gravity Forms 2.8.7.
 * Update for PHP 8.1.
diff --git a/gravityformspayfast/class-gf-payfast.php b/gravityformspayfast/class-gf-payfast.php
diff --git a/gravityformspayfast/composer.json b/gravityformspayfast/composer.json
@@ -1,5 +1,5 @@
 {
-    "require": {
-      "payfast/payfast-common": "v1.0.2"
-    }
+  "require": {
+    "payfast/payfast-common": "v1.1.0"
+  }
 }
diff --git a/gravityformspayfast/composer.lock b/gravityformspayfast/composer.lock
diff --git a/gravityformspayfast/payfast.php b/gravityformspayfast/payfast.php
@@ -4,7 +4,7 @@
 Plugin Name:  Gravity Forms Payfast Add-On
 Plugin URI:   https://github.com/Payfast/mod-gravityforms
 Description:  Integrates Gravity Forms with Payfast, a South African payment gateway.
-Version:      1.5.4
+Version:      1.5.5
 Author:       Payfast (Pty) Ltd
 Author URI:   https://payfast.io
 Text Domain:  gravityformspayfast
@@ -17,7 +17,7 @@ class GF_PayFast_Bootstrap
 {
     public static function load()
     {
-        if ( ! method_exists('GFForms', 'include_payment_addon_framework')) {
+        if (!method_exists('GFForms', 'include_payment_addon_framework')) {
             return;
         }
 
diff --git a/gravityformspayfast/vendor/autoload.php b/gravityformspayfast/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit403b9e524a78d4c8d2bbefbff79e0422::getLoader();
+return ComposerAutoloaderInit1b330ff27468c529ebbc764bd41fd09f::getLoader();
diff --git a/gravityformspayfast/vendor/composer/autoload_real.php b/gravityformspayfast/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit403b9e524a78d4c8d2bbefbff79e0422
+class ComposerAutoloaderInit1b330ff27468c529ebbc764bd41fd09f
 {
     private static $loader;
 
@@ -24,12 +24,12 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit403b9e524a78d4c8d2bbefbff79e0422', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit1b330ff27468c529ebbc764bd41fd09f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit403b9e524a78d4c8d2bbefbff79e0422', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit1b330ff27468c529ebbc764bd41fd09f', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::getInitializer($loader));
 
         $loader->register(true);
 
diff --git a/gravityformspayfast/vendor/composer/autoload_static.php b/gravityformspayfast/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422
+class ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f
 {
     public static $prefixLengthsPsr4 = array (
         'P' => 
@@ -27,9 +27,9 @@ class ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/gravityformspayfast/vendor/composer/installed.json b/gravityformspayfast/vendor/composer/installed.json
@@ -2,23 +2,23 @@
     "packages": [
         {
             "name": "payfast/payfast-common",
-            "version": "v1.0.2",
-            "version_normalized": "1.0.2.0",
+            "version": "v1.1.0",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Payfast/payfast-common.git",
-                "reference": "04c664a1d49e118c85507a56de35fe85eaee6048"
+                "reference": "7458222d53da34ed9303dc097e6df500ba4ede17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Payfast/payfast-common/zipball/04c664a1d49e118c85507a56de35fe85eaee6048",
-                "reference": "04c664a1d49e118c85507a56de35fe85eaee6048",
+                "url": "https://api.github.com/repos/Payfast/payfast-common/zipball/7458222d53da34ed9303dc097e6df500ba4ede17",
+                "reference": "7458222d53da34ed9303dc097e6df500ba4ede17",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.0"
             },
-            "time": "2024-01-29T19:49:41+00:00",
+            "time": "2024-06-07T02:30:19+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -40,7 +40,7 @@
             "homepage": "https://github.com/PayFast/payfast-common",
             "support": {
                 "issues": "https://github.com/Payfast/payfast-common/issues",
-                "source": "https://github.com/Payfast/payfast-common/tree/v1.0.2"
+                "source": "https://github.com/Payfast/payfast-common/tree/v1.1.0"
             },
             "install-path": "../payfast/payfast-common"
         }
diff --git a/gravityformspayfast/vendor/composer/installed.php b/gravityformspayfast/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '264382aff76001992ae8e4350f20823a28aa0572',
+        'reference' => '58d4263b2fba84e6dbecea2b3492818c71e23fd9',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         '__root__' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '264382aff76001992ae8e4350f20823a28aa0572',
+            'reference' => '58d4263b2fba84e6dbecea2b3492818c71e23fd9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'payfast/payfast-common' => array(
-            'pretty_version' => 'v1.0.2',
-            'version' => '1.0.2.0',
-            'reference' => '04c664a1d49e118c85507a56de35fe85eaee6048',
+            'pretty_version' => 'v1.1.0',
+            'version' => '1.1.0.0',
+            'reference' => '7458222d53da34ed9303dc097e6df500ba4ede17',
             'type' => 'library',
             'install_path' => __DIR__ . '/../payfast/payfast-common',
             'aliases' => array(),
diff --git a/gravityformspayfast/vendor/payfast/payfast-common/README.md b/gravityformspayfast/vendor/payfast/payfast-common/README.md
@@ -12,10 +12,66 @@ You can install this module using composer:
 composer require payfast/payfast-common
 ```
 
-You will need to also declare the following module constants:
+## Module parameters for pfValidData()
 
-- Set `PF_DEBUG` to the debug status e.g. true|false.
-- Set `PF_SOFTWARE_NAME` to the e-Commerce platform e.g. OpenCart.
-- Set `PF_SOFTWARE_VER` to the e-Commerce platform version e.g. 4.0.2.0.
-- Set `PF_MODULE_NAME` to the module name e.g. PF_OpenCart.
-- Set `PF_MODULE_VER` to the module version e.g. 2.3.1.
+Declare the relevant $moduleInfo values when using the **pfValidData()** method, for example:
+
+```
+$moduleInfo = [
+    "pfSoftwareName"       => 'OpenCart',
+    "pfSoftwareVer"        => '4.0.2.0',
+    "pfSoftwareModuleName" => 'PF_OpenCart',
+    "pfModuleVer"          => '2.3.1',
+];
+
+$pfValid = $payfastCommon->pfValidData($moduleInfo, $pfHost, $pfParamString);
+```
+
+### Debug Mode
+
+Configure debug mode by passing true|false when instantiating the PayfastCommon class.
+
+```
+$payfastCommon = new PayfastCommon(true);
+```
+
+## Breaking Change since v1.1.0
+
+We have migrated from static to instance methods.
+
+For example, prior to v1.1.0 we used:
+
+```
+// Debug mode
+define('PF_DEBUG', true);
+
+// Module parameters for pfValidData
+define('PF_SOFTWARE_NAME', 'GravityForms');
+define('PF_SOFTWARE_VER', '2.8.7');
+define('PF_MODULE_NAME', 'PayFast-GravityForms');
+define('PF_MODULE_VER', '1.5.4');
+
+// Calling methods on PayfastCommon
+$pfData = PayfastCommon::pfGetData();
+PayfastCommon::pflog('Verify data received');
+```
+
+But this has now become:
+
+```
+// Debug mode
+$payfastCommon = new PayfastCommon(true);
+
+// Module parameters for pfValidData
+$moduleInfo = [
+    "pfSoftwareName"       => 'GravityForms',
+    "pfSoftwareVer"        => '2.8.7',
+    "pfSoftwareModuleName" => 'PayFast-GravityForms',
+    "pfModuleVer"          => '1.5.4',
+];
+$pfValid = $payfastCommon->pfValidData($moduleInfo, $pfHost, $pfParamString);
+
+// Calling methods on PayfastCommon
+$pfData = $payfastCommon->pfGetData();
+$payfastCommon->pflog('Verify data received');
+```
diff --git a/gravityformspayfast/vendor/payfast/payfast-common/changelog.txt b/gravityformspayfast/vendor/payfast/payfast-common/changelog.txt
@@ -0,0 +1,13 @@
+= 1.1.0 - 2024-06-07 =
+- **Breaking:** Refactor static to instance methods.
+- **Breaking:** Convert constants to object properties.
+
+= 1.0.2 - 2024-01-29 =
+- Add samples.
+- Code quality improvements.
+
+= 1.0.1 - 2023-07-23 =
+- Catch for write permission issues.
+
+= 1.0.0 - 2023-04-12 =
+- Initial release.
diff --git a/gravityformspayfast/vendor/payfast/payfast-common/src/PayfastCommon.php b/gravityformspayfast/vendor/payfast/payfast-common/src/PayfastCommon.php

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "require": {`
`3`		`- "payfast/payfast-common": "v1.0.2"`
`4`		`- }`
	`2`	`+ "require": {`
	`3`	`+ "payfast/payfast-common": "v1.1.0"`
	`4`	`+ }`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`Plugin Name: Gravity Forms Payfast Add-On`
`5`	`5`	`Plugin URI: https://github.com/Payfast/mod-gravityforms`
`6`	`6`	`Description: Integrates Gravity Forms with Payfast, a South African payment gateway.`
`7`		`-Version: 1.5.4`
	`7`	`+Version: 1.5.5`
`8`	`8`	`Author: Payfast (Pty) Ltd`
`9`	`9`	`Author URI: https://payfast.io`
`10`	`10`	`Text Domain: gravityformspayfast`
`@@ -17,7 +17,7 @@ class GF_PayFast_Bootstrap`
`17`	`17`	`{`
`18`	`18`	`public static function load()`
`19`	`19`	`{`
`20`		`- if ( ! method_exists('GFForms', 'include_payment_addon_framework')) {`
	`20`	`+ if (!method_exists('GFForms', 'include_payment_addon_framework')) {`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`
`23`	`23`	`require_once __DIR__ . '/composer/autoload_real.php';`
`24`	`24`
`25`		`-return ComposerAutoloaderInit403b9e524a78d4c8d2bbefbff79e0422::getLoader();`
	`25`	`+return ComposerAutoloaderInit1b330ff27468c529ebbc764bd41fd09f::getLoader();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Composer\Autoload;`
`6`	`6`
`7`		`-class ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422`
	`7`	`+class ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f`
`8`	`8`	`{`
`9`	`9`	`public static $prefixLengthsPsr4 = array (`
`10`	`10`	`'P' =>`
`@@ -27,9 +27,9 @@ class ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422`
`27`	`27`	`public static function getInitializer(ClassLoader $loader)`
`28`	`28`	`{`
`29`	`29`	`return \Closure::bind(function () use ($loader) {`
`30`		`- $loader->prefixLengthsPsr4 = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$prefixLengthsPsr4;`
`31`		`- $loader->prefixDirsPsr4 = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$prefixDirsPsr4;`
`32`		`- $loader->classMap = ComposerStaticInit403b9e524a78d4c8d2bbefbff79e0422::$classMap;`
	`30`	`+ $loader->prefixLengthsPsr4 = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$prefixLengthsPsr4;`
	`31`	`+ $loader->prefixDirsPsr4 = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$prefixDirsPsr4;`
	`32`	`+ $loader->classMap = ComposerStaticInit1b330ff27468c529ebbc764bd41fd09f::$classMap;`
`33`	`33`
`34`	`34`	`}, null, ClassLoader::class);`
`35`	`35`	`}`