Changeset 3232769

activecampaign-for-woocommerce/trunk/README.txt

-                      r3227747
+                      r3232769
 Requires at least: 6.0
 Tested up to: 6.7.1
 Stable tag: 2.8.3
+Stable tag: 2.8.4
 Requires PHP: 7.4
 License: GPLv2 or later
 …
 = WooCommerce Compatibility =
 * Tested up to version: 9.5.2
+* Tested up to version: 9.6.0
 * Minimal version requirement: 7.4.0
 * HPOS Compatible
 …
 == Changelog ==
+= 2.8.4 2025-01-30 =
+* Improvement - Recovered orders should track better
+* Bugfix - Fixing issues discovered in WC version 9.6.0
+* Bugfix - Abandoned carts would sometimes not get picked up
+* Bugfix - Metadata relevant to order syncing was not being saved by WC
 = 2.8.3 2025-01-16 =

activecampaign-for-woocommerce/trunk/ac_vendor/autoload.php

r3227747	r3232769
5	5	require_once __DIR__ . '/composer/autoload_real.php';
6	6
7		return ComposerAutoloaderInit~~260c9fd4b34cebb5c211b0f72df1d798~~::getLoader();
	7	return ComposerAutoloaderInitcc9ef1be9ee2971fdac871aab192449a::getLoader();

activecampaign-for-woocommerce/trunk/ac_vendor/composer/InstalledVersions.php

r3032832	r3232769
7	7	class InstalledVersions
8	8	{
9		private static $installed = array('root' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL, 'name' => 'activecampaign/activecampaign-for-woocommerce'), 'versions' => array('activecampaign/activecampaign-for-woocommerce' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL), 'brick/math' => array('pretty_version' => '0.10.2', 'version' => '0.10.2.0', 'aliases' => array(), 'reference' => '459f2781e1a08d52ee56b0b1444086e038561e3f'), 'brick/money' => array('pretty_version' => '0.6.0', 'version' => '0.6.0.0', 'aliases' => array(), 'reference' => '7074e1bd463f517fb78447dff63454f4b1523c1b'), 'guzzlehttp/guzzle' => array('pretty_version' => '7.8.1', 'version' => '7.8.1.0', 'aliases' => array(), 'reference' => '41042bc7ab002487b876a0683fc8dce04ddce104'), 'guzzlehttp/promises' => array('pretty_version' => '2.0.2', 'version' => '2.0.2.0', 'aliases' => array(), 'reference' => 'bbff78d96034045e58e13dedd6ad91b5d1253223'), 'guzzlehttp/psr7' => array('pretty_version' => '2.6.2', 'version' => '2.6.2.0', 'aliases' => array(), 'reference' => '45b30f99ac27b5ca93cb4831afe16285f57b8221'), 'laravel/serializable-closure' => array('pretty_version' => 'v1.3.3', 'version' => '1.3.3.0', 'aliases' => array(), 'reference' => '3dbf8a8e914634c48d389c1234552666b3d43754'), 'php-di/invoker' => array('pretty_version' => '2.3.4', 'version' => '2.3.4.0', 'aliases' => array(), 'reference' => '33234b32dafa8eb69202f950a1fc92055ed76a86'), 'php-di/php-di' => array('pretty_version' => '6.4.0', 'version' => '6.4.0.0', 'aliases' => array(), 'reference' => 'ae0f1b3b03d8b29dff81747063cbfd6276246cc4'), 'php-di/phpdoc-reader' => array('pretty_version' => '2.2.1', 'version' => '2.2.1.0', 'aliases' => array(), 'reference' => '66daff34cbd2627740ffec9469ffbac9f8c8185c'), 'psr/container' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'aliases' => array(), 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f'), 'psr/container-implementation' => array('provided' => array(0 => '^1.0')), 'psr/http-client' => array('pretty_version' => '1.0.3', 'version' => '1.0.3.0', 'aliases' => array(), 'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90'), 'psr/http-client-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-factory' => array('pretty_version' => '1.0.2', 'version' => '1.0.2.0', 'aliases' => array(), 'reference' => 'e616d01114759c4c489f93b099585439f795fe35'), 'psr/http-factory-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-message' => array('pretty_version' => '2.0', 'version' => '2.0.0.0', 'aliases' => array(), 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71'), 'psr/http-message-implementation' => array('provided' => array(0 => '1.0')), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'aliases' => array(), 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11'), 'ralouphie/getallheaders' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'aliases' => array(), 'reference' => '120b605dfeb996808c31b6477290a714d356e822'), 'symfony/deprecation-contracts' => array('pretty_version' => 'v2.5.2', 'version' => '2.5.2.0', 'aliases' => array(), 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66')));
	9	private static $installed = array('root' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL, 'name' => 'activecampaign/activecampaign-for-woocommerce'), 'versions' => array('activecampaign/activecampaign-for-woocommerce' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL), 'brick/math' => array('pretty_version' => '0.10.2', 'version' => '0.10.2.0', 'aliases' => array(), 'reference' => '459f2781e1a08d52ee56b0b1444086e038561e3f'), 'brick/money' => array('pretty_version' => '0.6.0', 'version' => '0.6.0.0', 'aliases' => array(), 'reference' => '7074e1bd463f517fb78447dff63454f4b1523c1b'), 'guzzlehttp/guzzle' => array('pretty_version' => '7.9.2', 'version' => '7.9.2.0', 'aliases' => array(), 'reference' => 'd281ed313b989f213357e3be1a179f02196ac99b'), 'guzzlehttp/promises' => array('pretty_version' => '2.0.4', 'version' => '2.0.4.0', 'aliases' => array(), 'reference' => 'f9c436286ab2892c7db7be8c8da4ef61ccf7b455'), 'guzzlehttp/psr7' => array('pretty_version' => '2.7.0', 'version' => '2.7.0.0', 'aliases' => array(), 'reference' => 'a70f5c95fb43bc83f07c9c948baa0dc1829bf201'), 'laravel/serializable-closure' => array('pretty_version' => 'v1.3.7', 'version' => '1.3.7.0', 'aliases' => array(), 'reference' => '4f48ade902b94323ca3be7646db16209ec76be3d'), 'php-di/invoker' => array('pretty_version' => '2.3.6', 'version' => '2.3.6.0', 'aliases' => array(), 'reference' => '59f15608528d8a8838d69b422a919fd6b16aa576'), 'php-di/php-di' => array('pretty_version' => '6.4.0', 'version' => '6.4.0.0', 'aliases' => array(), 'reference' => 'ae0f1b3b03d8b29dff81747063cbfd6276246cc4'), 'php-di/phpdoc-reader' => array('pretty_version' => '2.2.1', 'version' => '2.2.1.0', 'aliases' => array(), 'reference' => '66daff34cbd2627740ffec9469ffbac9f8c8185c'), 'psr/container' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'aliases' => array(), 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f'), 'psr/container-implementation' => array('provided' => array(0 => '^1.0')), 'psr/http-client' => array('pretty_version' => '1.0.3', 'version' => '1.0.3.0', 'aliases' => array(), 'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90'), 'psr/http-client-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-factory' => array('pretty_version' => '1.1.0', 'version' => '1.1.0.0', 'aliases' => array(), 'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a'), 'psr/http-factory-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-message' => array('pretty_version' => '2.0', 'version' => '2.0.0.0', 'aliases' => array(), 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71'), 'psr/http-message-implementation' => array('provided' => array(0 => '1.0')), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'aliases' => array(), 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11'), 'ralouphie/getallheaders' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'aliases' => array(), 'reference' => '120b605dfeb996808c31b6477290a714d356e822'), 'symfony/deprecation-contracts' => array('pretty_version' => 'v2.5.4', 'version' => '2.5.4.0', 'aliases' => array(), 'reference' => '605389f2a7e5625f273b53960dc46aeaf9c62918')));
10	10	private static $canGetVendors;
11	11	private static $installedByVendor = array();

activecampaign-for-woocommerce/trunk/ac_vendor/composer/autoload_real.php

-                      r3227747
+                      r3232769
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit260c9fd4b34cebb5c211b0f72df1d798
+class ComposerAutoloaderInitcc9ef1be9ee2971fdac871aab192449a
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit260c9fd4b34cebb5c211b0f72df1d798', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitcc9ef1be9ee2971fdac871aab192449a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInit260c9fd4b34cebb5c211b0f72df1d798', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitcc9ef1be9ee2971fdac871aab192449a', 'loadClassLoader'));
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
 …
             require __DIR__ . '/autoload_static.php';
             call_user_func(\Composer\Autoload\ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
 …
         if ($useStaticLoader) {
             $includeFiles = Composer\Autoload\ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire260c9fd4b34cebb5c211b0f72df1d798($fileIdentifier, $file);
+            composerRequirecc9ef1be9ee2971fdac871aab192449a($fileIdentifier, $file);
+        }
 …
+}
 function composerRequire260c9fd4b34cebb5c211b0f72df1d798($fileIdentifier, $file)
+function composerRequirecc9ef1be9ee2971fdac871aab192449a($fileIdentifier, $file)
+{
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

activecampaign-for-woocommerce/trunk/ac_vendor/composer/autoload_static.php

-                      r3227747
+                      r3232769
 namespace Composer\Autoload;
 class ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798
+class ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a
+{
     public static $files = array (
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit260c9fd4b34cebb5c211b0f72df1d798::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitcc9ef1be9ee2971fdac871aab192449a::$classMap;
         }, null, ClassLoader::class);

activecampaign-for-woocommerce/trunk/ac_vendor/composer/installed.json

-                      r3032832
+                      r3232769
+        {
             "name": "guzzlehttp\/guzzle",
             "version": "7.8.1",
             "version_normalized": "7.8.1.0",
+            "version": "7.9.2",
+            "version_normalized": "7.9.2.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/guzzle\/guzzle.git",
                 "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/guzzle\/guzzle\/zipball\/41042bc7ab002487b876a0683fc8dce04ddce104",
                 "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/guzzle\/guzzle\/zipball\/d281ed313b989f213357e3be1a179f02196ac99b",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp\/promises": "^1.5.3 || ^2.0.1",
                 "guzzlehttp\/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp\/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp\/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr\/http-client": "^1.0",
 …
                 "bamarni\/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
                 "php-http\/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle\/client-integration-tests": "3.0.2",
                 "php-http\/message-factory": "^1.1",
                 "phpunit\/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit\/phpunit": "^8.5.39 || ^9.6.20",
                 "psr\/log": "^1.1 || ^2.0 || ^3.0"
             },
 …
                 "psr\/log": "Required for using the Log middleware"
             },
             "time": "2023-12-03T20:35:24+00:00",
+            "time": "2024-07-24T11:22:20+00:00",
             "type": "library",
             "extra": {
 …
+        {
             "name": "guzzlehttp\/promises",
             "version": "2.0.2",
             "version_normalized": "2.0.2.0",
+            "version": "2.0.4",
+            "version_normalized": "2.0.4.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/guzzle\/promises.git",
                 "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/guzzle\/promises\/zipball\/bbff78d96034045e58e13dedd6ad91b5d1253223",
                 "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/guzzle\/promises\/zipball\/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
 …
             "require-dev": {
                 "bamarni\/composer-bin-plugin": "^1.8.2",
                 "phpunit\/phpunit": "^8.5.36 || ^9.6.15"
             },
             "time": "2023-12-03T20:19:20+00:00",
+                "phpunit\/phpunit": "^8.5.39 || ^9.6.20"
+            },
+            "time": "2024-10-17T10:06:22+00:00",
             "type": "library",
             "extra": {
 …
+        {
             "name": "guzzlehttp\/psr7",
             "version": "2.6.2",
             "version_normalized": "2.6.2.0",
+            "version": "2.7.0",
+            "version_normalized": "2.7.0.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/guzzle\/psr7.git",
                 "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/guzzle\/psr7\/zipball\/45b30f99ac27b5ca93cb4831afe16285f57b8221",
                 "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/guzzle\/psr7\/zipball\/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
 …
             "require-dev": {
                 "bamarni\/composer-bin-plugin": "^1.8.2",
                 "http-interop\/http-factory-tests": "^0.9",
                 "phpunit\/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop\/http-factory-tests": "0.9.0",
+                "phpunit\/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas\/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "time": "2023-12-03T20:05:35+00:00",
+            "time": "2024-07-18T11:15:46+00:00",
             "type": "library",
             "extra": {
 …
+        {
             "name": "laravel\/serializable-closure",
             "version": "v1.3.3",
             "version_normalized": "1.3.3.0",
+            "version": "v1.3.7",
+            "version_normalized": "1.3.7.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/laravel\/serializable-closure.git",
                 "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/laravel\/serializable-closure\/zipball\/3dbf8a8e914634c48d389c1234552666b3d43754",
                 "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/laravel\/serializable-closure\/zipball\/4f48ade902b94323ca3be7646db16209ec76be3d",
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d",
                 "shasum": ""
             },
 …
             },
             "require-dev": {
+                "nesbot\/carbon": "^2.61",
+                "illuminate\/support": "^8.0|^9.0|^10.0|^11.0",
+                "nesbot\/carbon": "^2.61|^3.0",
                 "pestphp\/pest": "^1.21.3",
                 "phpstan\/phpstan": "^1.8.2",
                 "symfony\/var-dumper": "^5.4.11"
             },
             "time": "2023-11-08T14:08:06+00:00",
+                "symfony\/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
+            },
+            "time": "2024-11-14T18:34:49+00:00",
             "type": "library",
             "extra": {
 …
+        {
             "name": "php-di\/invoker",
             "version": "2.3.4",
             "version_normalized": "2.3.4.0",
+            "version": "2.3.6",
+            "version_normalized": "2.3.6.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/PHP-DI\/Invoker.git",
                 "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/PHP-DI\/Invoker\/zipball\/33234b32dafa8eb69202f950a1fc92055ed76a86",
                 "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86",
+                "reference": "59f15608528d8a8838d69b422a919fd6b16aa576"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/PHP-DI\/Invoker\/zipball\/59f15608528d8a8838d69b422a919fd6b16aa576",
+                "reference": "59f15608528d8a8838d69b422a919fd6b16aa576",
                 "shasum": ""
             },
 …
                 "phpunit\/phpunit": "^9.0"
             },
             "time": "2023-09-08T09:24:21+00:00",
+            "time": "2025-01-17T12:49:27+00:00",
             "type": "library",
             "installation-source": "dist",
 …
+        {
             "name": "psr\/http-factory",
             "version": "1.0.2",
             "version_normalized": "1.0.2.0",
+            "version": "1.1.0",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/php-fig\/http-factory.git",
                 "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/php-fig\/http-factory\/zipball\/e616d01114759c4c489f93b099585439f795fe35",
                 "reference": "e616d01114759c4c489f93b099585439f795fe35",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0.0",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/php-fig\/http-factory\/zipball\/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
                 "psr\/http-message": "^1.0 || ^2.0"
             },
             "time": "2023-04-10T20:10:41+00:00",
+            "time": "2024-04-15T12:06:14+00:00",
             "type": "library",
             "extra": {
 …
+                }
             ],
             "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
 …
+        {
             "name": "symfony\/deprecation-contracts",
             "version": "v2.5.2",
             "version_normalized": "2.5.2.0",
+            "version": "v2.5.4",
+            "version_normalized": "2.5.4.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/symfony\/deprecation-contracts.git",
                 "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
                 "url": "https:\/\/api.github.com\/repos\/symfony\/deprecation-contracts\/zipball\/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https:\/\/api.github.com\/repos\/symfony\/deprecation-contracts\/zipball\/605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918",
                 "shasum": ""
             },
 …
                 "php": ">=7.1"
             },
             "time": "2022-01-02T09:53:40+00:00",
+            "time": "2024-09-25T14:11:13+00:00",
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https:\/\/github.com\/symfony\/contracts",
+                    "name": "symfony\/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony\/contracts",
-                    "url": "https:\/\/github.com\/symfony\/contracts"
+                }
             },

activecampaign-for-woocommerce/trunk/ac_vendor/composer/installed.php

r3032832	r3232769
3	3	namespace AcVendor;
4	4
5		return array('root' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL, 'name' => 'activecampaign/activecampaign-for-woocommerce'), 'versions' => array('activecampaign/activecampaign-for-woocommerce' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL), 'brick/math' => array('pretty_version' => '0.10.2', 'version' => '0.10.2.0', 'aliases' => array(), 'reference' => '459f2781e1a08d52ee56b0b1444086e038561e3f'), 'brick/money' => array('pretty_version' => '0.6.0', 'version' => '0.6.0.0', 'aliases' => array(), 'reference' => '7074e1bd463f517fb78447dff63454f4b1523c1b'), 'guzzlehttp/guzzle' => array('pretty_version' => '7.8.1', 'version' => '7.8.1.0', 'aliases' => array(), 'reference' => '41042bc7ab002487b876a0683fc8dce04ddce104'), 'guzzlehttp/promises' => array('pretty_version' => '2.0.2', 'version' => '2.0.2.0', 'aliases' => array(), 'reference' => 'bbff78d96034045e58e13dedd6ad91b5d1253223'), 'guzzlehttp/psr7' => array('pretty_version' => '2.6.2', 'version' => '2.6.2.0', 'aliases' => array(), 'reference' => '45b30f99ac27b5ca93cb4831afe16285f57b8221'), 'laravel/serializable-closure' => array('pretty_version' => 'v1.3.3', 'version' => '1.3.3.0', 'aliases' => array(), 'reference' => '3dbf8a8e914634c48d389c1234552666b3d43754'), 'php-di/invoker' => array('pretty_version' => '2.3.4', 'version' => '2.3.4.0', 'aliases' => array(), 'reference' => '33234b32dafa8eb69202f950a1fc92055ed76a86'), 'php-di/php-di' => array('pretty_version' => '6.4.0', 'version' => '6.4.0.0', 'aliases' => array(), 'reference' => 'ae0f1b3b03d8b29dff81747063cbfd6276246cc4'), 'php-di/phpdoc-reader' => array('pretty_version' => '2.2.1', 'version' => '2.2.1.0', 'aliases' => array(), 'reference' => '66daff34cbd2627740ffec9469ffbac9f8c8185c'), 'psr/container' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'aliases' => array(), 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f'), 'psr/container-implementation' => array('provided' => array(0 => '^1.0')), 'psr/http-client' => array('pretty_version' => '1.0.3', 'version' => '1.0.3.0', 'aliases' => array(), 'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90'), 'psr/http-client-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-factory' => array('pretty_version' => '1.0.2', 'version' => '1.0.2.0', 'aliases' => array(), 'reference' => 'e616d01114759c4c489f93b099585439f795fe35'), 'psr/http-factory-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-message' => array('pretty_version' => '2.0', 'version' => '2.0.0.0', 'aliases' => array(), 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71'), 'psr/http-message-implementation' => array('provided' => array(0 => '1.0')), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'aliases' => array(), 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11'), 'ralouphie/getallheaders' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'aliases' => array(), 'reference' => '120b605dfeb996808c31b6477290a714d356e822'), 'symfony/deprecation-contracts' => array('pretty_version' => 'v2.5.2', 'version' => '2.5.2.0', 'aliases' => array(), 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66')));
	5	return array('root' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL, 'name' => 'activecampaign/activecampaign-for-woocommerce'), 'versions' => array('activecampaign/activecampaign-for-woocommerce' => array('pretty_version' => '1.5.0', 'version' => '1.5.0.0', 'aliases' => array(), 'reference' => NULL), 'brick/math' => array('pretty_version' => '0.10.2', 'version' => '0.10.2.0', 'aliases' => array(), 'reference' => '459f2781e1a08d52ee56b0b1444086e038561e3f'), 'brick/money' => array('pretty_version' => '0.6.0', 'version' => '0.6.0.0', 'aliases' => array(), 'reference' => '7074e1bd463f517fb78447dff63454f4b1523c1b'), 'guzzlehttp/guzzle' => array('pretty_version' => '7.9.2', 'version' => '7.9.2.0', 'aliases' => array(), 'reference' => 'd281ed313b989f213357e3be1a179f02196ac99b'), 'guzzlehttp/promises' => array('pretty_version' => '2.0.4', 'version' => '2.0.4.0', 'aliases' => array(), 'reference' => 'f9c436286ab2892c7db7be8c8da4ef61ccf7b455'), 'guzzlehttp/psr7' => array('pretty_version' => '2.7.0', 'version' => '2.7.0.0', 'aliases' => array(), 'reference' => 'a70f5c95fb43bc83f07c9c948baa0dc1829bf201'), 'laravel/serializable-closure' => array('pretty_version' => 'v1.3.7', 'version' => '1.3.7.0', 'aliases' => array(), 'reference' => '4f48ade902b94323ca3be7646db16209ec76be3d'), 'php-di/invoker' => array('pretty_version' => '2.3.6', 'version' => '2.3.6.0', 'aliases' => array(), 'reference' => '59f15608528d8a8838d69b422a919fd6b16aa576'), 'php-di/php-di' => array('pretty_version' => '6.4.0', 'version' => '6.4.0.0', 'aliases' => array(), 'reference' => 'ae0f1b3b03d8b29dff81747063cbfd6276246cc4'), 'php-di/phpdoc-reader' => array('pretty_version' => '2.2.1', 'version' => '2.2.1.0', 'aliases' => array(), 'reference' => '66daff34cbd2627740ffec9469ffbac9f8c8185c'), 'psr/container' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'aliases' => array(), 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f'), 'psr/container-implementation' => array('provided' => array(0 => '^1.0')), 'psr/http-client' => array('pretty_version' => '1.0.3', 'version' => '1.0.3.0', 'aliases' => array(), 'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90'), 'psr/http-client-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-factory' => array('pretty_version' => '1.1.0', 'version' => '1.1.0.0', 'aliases' => array(), 'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a'), 'psr/http-factory-implementation' => array('provided' => array(0 => '1.0')), 'psr/http-message' => array('pretty_version' => '2.0', 'version' => '2.0.0.0', 'aliases' => array(), 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71'), 'psr/http-message-implementation' => array('provided' => array(0 => '1.0')), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'aliases' => array(), 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11'), 'ralouphie/getallheaders' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'aliases' => array(), 'reference' => '120b605dfeb996808c31b6477290a714d356e822'), 'symfony/deprecation-contracts' => array('pretty_version' => 'v2.5.4', 'version' => '2.5.4.0', 'aliases' => array(), 'reference' => '605389f2a7e5625f273b53960dc46aeaf9c62918')));

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/BodySummarizer.php

r2950993	r3232769
10	10	*/
11	11	private $truncateAt;
12		public function __construct(int $truncateAt = null)
	12	public function __construct(?int $truncateAt = null)
13	13	{
14	14	$this->truncateAt = $truncateAt;
…	…
19	19	public function summarize(MessageInterface $message) : ?string
20	20	{
21		return $this->truncateAt === null ? ~~\AcVendor\GuzzleHttp\Psr7\Message::bodySummary($message) : \AcVendor\GuzzleHttp\~~Psr7\Message::bodySummary($message, $this->truncateAt);
	21	return $this->truncateAt === null ? Psr7\Message::bodySummary($message) : Psr7\Message::bodySummary($message, $this->truncateAt);
22	22	}
23	23	}

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Client.php

-                      r3032832
+                      r3232769
      * @param array $config Client configuration settings.
+     *
      * @see \GuzzleHttp\RequestOptions for a list of available request options.
+     * @see RequestOptions for a list of available request options.
      */
     public function __construct(array $config = [])
 …
      * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
      */
     public function getConfig(string $option = null)
+    public function getConfig(?string $option = null)
+    {
         return $option === null ? $this->config : $this->config[$option] ?? null;

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/ClientInterface.php

r3032832	r3232769
75	75	* @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
76	76	*/
77		public function getConfig(string $option = null);
	77	public function getConfig(?string $option = null);
78	78	}

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php

r3032832	r3232769
87	87	}, $this->getIterator()->getArrayCopy());
88	88	}
89		public function clear(~~string $domain = null, string $path = null,~~ string $name = null) : void
	89	public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void
90	90	{
91	91	if (!$domain) {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php

r3032832	r3232769
59	59	* @param string\|null $name Clears cookies matching a domain, path, and name
60	60	*/
61		public function clear(~~string $domain = null, string $path = null,~~ string $name = null) : void;
	61	public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void;
62	62	/**
63	63	* Discard all sessions cookies.

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php

r2950993	r3232769
10	10	class BadResponseException extends RequestException
11	11	{
12		public function __construct(string $message, RequestInterface $request, ResponseInterface $response, \Throwable $previous = null, array $handlerContext = [])
	12	public function __construct(string $message, RequestInterface $request, ResponseInterface $response, ?\Throwable $previous = null, array $handlerContext = [])
13	13	{
14	14	parent::__construct($message, $request, $response, $previous, $handlerContext);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php

r2950993	r3232769
20	20	*/
21	21	private $handlerContext;
22		public function __construct(string $message, RequestInterface $request, \Throwable $previous = null, array $handlerContext = [])
	22	public function __construct(string $message, RequestInterface $request, ?\Throwable $previous = null, array $handlerContext = [])
23	23	{
24	24	parent::__construct($message, 0, $previous);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Exception/RequestException.php

-                      r2950993
+                      r3232769
 use AcVendor\Psr\Http\Message\RequestInterface;
 use AcVendor\Psr\Http\Message\ResponseInterface;
-use AcVendor\Psr\Http\Message\UriInterface;
 /**
  * HTTP Request exception
 …
      */
     private $handlerContext;
     public function __construct(string $message, RequestInterface $request, ResponseInterface $response = null, \Throwable $previous = null, array $handlerContext = [])
+    public function __construct(string $message, RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [])
+    {
         // Set the code of the exception if the response is set and not future.
 …
      * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer
      */
     public static function create(RequestInterface $request, ResponseInterface $response = null, \Throwable $previous = null, array $handlerContext = [], BodySummarizerInterface $bodySummarizer = null) : self
+    public static function create(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [], ?BodySummarizerInterface $bodySummarizer = null) : self
+    {
         if (!$response) {
 …
             $className = __CLASS__;
+        }
+        $uri = $request->getUri();
+        $uri = static::obfuscateUri($uri);
+        $uri = \AcVendor\GuzzleHttp\Psr7\Utils::redactUserInfo($request->getUri());
         // Client Error: `GET /` resulted in a `404 Not Found` response:
         // <html> ... (truncated)
 …
+        }
         return new $className($message, $request, $response, $previous, $handlerContext);
+    }
-    /**
-     * Obfuscates URI if there is a username and a password present
-     */
-    private static function obfuscateUri(UriInterface $uri) : UriInterface
+    {
-        $userInfo = $uri->getUserInfo();
-        if (\false !== ($pos = \strpos($userInfo, ':'))) {
-            return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***');
+        }
-        return $uri;
+    }
     /**

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php

-                      r3032832
+                      r3232769
 use AcVendor\GuzzleHttp\Utils;
 use AcVendor\Psr\Http\Message\RequestInterface;
+use AcVendor\Psr\Http\Message\UriInterface;
 /**
  * Creates curl resources from a request
 …
     public function create(RequestInterface $request, array $options) : EasyHandle
+    {
+        $protocolVersion = $request->getProtocolVersion();
+        if ('2' === $protocolVersion || '2.0' === $protocolVersion) {
+            if (!self::supportsHttp2()) {
+                throw new ConnectException('HTTP/2 is supported by the cURL handler, however libcurl is built without HTTP/2 support.', $request);
+            }
+        } elseif ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
+            throw new ConnectException(\sprintf('HTTP/%s is not supported by the cURL handler.', $protocolVersion), $request);
+        }
         if (isset($options['curl']['body_as_string'])) {
             $options['_body_as_string'] = $options['curl']['body_as_string'];
 …
         \curl_setopt_array($easy->handle, $conf);
         return $easy;
+    }
+    private static function supportsHttp2() : bool
+    {
+        static $supportsHttp2 = null;
+        if (null === $supportsHttp2) {
+            $supportsHttp2 = self::supportsTls12() && \defined('CURL_VERSION_HTTP2') && \CURL_VERSION_HTTP2 & \curl_version()['features'];
+        }
+        return $supportsHttp2;
+    }
+    private static function supportsTls12() : bool
+    {
+        static $supportsTls12 = null;
+        if (null === $supportsTls12) {
+            $supportsTls12 = \CURL_SSLVERSION_TLSv1_2 & \curl_version()['features'];
+        }
+        return $supportsTls12;
+    }
+    private static function supportsTls13() : bool
+    {
+        static $supportsTls13 = null;
+        if (null === $supportsTls13) {
+            $supportsTls13 = \defined('CURL_SSLVERSION_TLSv1_3') && \CURL_SSLVERSION_TLSv1_3 & \curl_version()['features'];
+        }
+        return $supportsTls13;
+    }
     public function release(EasyHandle $easy) : void
 …
         // Get error information and release the handle to the factory.
         $ctx = ['errno' => $easy->errno, 'error' => \curl_error($easy->handle), 'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME)] + \curl_getinfo($easy->handle);
         $ctx[self::CURL_VERSION_STR] = \curl_version()['version'];
+        $ctx[self::CURL_VERSION_STR] = self::getCurlVersion();
         $factory->release($easy);
         // Retry when nothing is present or when curl failed to rewind.
 …
         return self::createRejection($easy, $ctx);
+    }
+    private static function getCurlVersion() : string
+    {
+        static $curlVersion = null;
+        if (null === $curlVersion) {
+            $curlVersion = \curl_version()['version'];
+        }
+        return $curlVersion;
+    }
     private static function createRejection(EasyHandle $easy, array $ctx) : PromiseInterface
+    {
 …
             return P\Create::rejectionFor(new RequestException('An error was encountered during the on_headers event', $easy->request, $easy->response, $easy->onHeadersException, $ctx));
+        }
+        $message = \sprintf('cURL error %s: %s (%s)', $ctx['errno'], $ctx['error'], 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html');
+        $uriString = (string) $easy->request->getUri();
+        if ($uriString !== '' && \false === \strpos($ctx['error'], $uriString)) {
+            $message .= \sprintf(' for %s', $uriString);
+        $uri = $easy->request->getUri();
+        $sanitizedError = self::sanitizeCurlError($ctx['error'] ?? '', $uri);
+        $message = \sprintf('cURL error %s: %s (%s)', $ctx['errno'], $sanitizedError, 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html');
+        if ('' !== $sanitizedError) {
+            $redactedUriString = \AcVendor\GuzzleHttp\Psr7\Utils::redactUserInfo($uri)->__toString();
+            if ($redactedUriString !== '' && \false === \strpos($sanitizedError, $redactedUriString)) {
+                $message .= \sprintf(' for %s', $redactedUriString);
+            }
+        }
         // Create a connection exception if it was a specific error code.
 …
         return P\Create::rejectionFor($error);
+    }
+    private static function sanitizeCurlError(string $error, UriInterface $uri) : string
+    {
+        if ('' === $error) {
+            return $error;
+        }
+        $baseUri = $uri->withQuery('')->withFragment('');
+        $baseUriString = $baseUri->__toString();
+        if ('' === $baseUriString) {
+            return $error;
+        }
+        $redactedUriString = \AcVendor\GuzzleHttp\Psr7\Utils::redactUserInfo($baseUri)->__toString();
+        return \str_replace($baseUriString, $redactedUriString, $error);
+    }
     /**
      * @return array<int|string, mixed>
 …
+        }
         $version = $easy->request->getProtocolVersion();
+        if ($version == 1.1) {
+        if ('2' === $version || '2.0' === $version) {
+            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2_0;
+        } elseif ('1.1' === $version) {
             $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1;
-        } elseif ($version == 2.0) {
-            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2_0;
         } else {
             $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_0;
 …
                 // sets a matching 'Accept-Encoding' header.
                 $conf[\CURLOPT_ENCODING] = '';
+                // But as the user did not specify any acceptable encodings we need
+                // to overwrite this implicit header with an empty one.
+                // But as the user did not specify any encoding preference,
+                // let's leave it up to server by preventing curl from sending
+                // the header, which will be interpreted as 'Accept-Encoding: *'.
+                // https://www.rfc-editor.org/rfc/rfc9110#field.accept-encoding
                 $conf[\CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
+            }
 …
+        }
         if (isset($options['crypto_method'])) {
+            if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
+                if (!\defined('CURL_SSLVERSION_TLSv1_0')) {
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL');
+                }
+            $protocolVersion = $easy->request->getProtocolVersion();
+            // If HTTP/2, upgrade TLS 1.0 and 1.1 to 1.2
+            if ('2' === $protocolVersion || '2.0' === $protocolVersion) {
+                if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method'] || \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method'] || \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
+                    $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
+                } elseif (\defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
+                    if (!self::supportsTls13()) {
+                        throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
+                    }
+                    $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
+                } else {
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
+                }
+            } elseif (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) {
-                if (!\defined('CURL_SSLVERSION_TLSv1_1')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL');
+                }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
                 if (!\defined('CURL_SSLVERSION_TLSv1_2')) {
+                if (!self::supportsTls12()) {
                     throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL');
+                }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
             } elseif (\defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
                 if (!\defined('CURL_SSLVERSION_TLSv1_3')) {
+                if (!self::supportsTls13()) {
                     throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
+                }

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php

-                      r3032832
+                      r3232769
 namespace AcVendor\GuzzleHttp\Handler;
+use Closure;
 use AcVendor\GuzzleHttp\Promise as P;
 use AcVendor\GuzzleHttp\Promise\Promise;
 …
+            }
+        }
+        // Run curl_multi_exec in the queue to enable other async tasks to run
+        P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
         // Step through the task queue which may add additional requests.
         P\Utils::queue()->run();
 …
+        }
         while (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+            // Prevent busy looping for slow HTTP requests.
+            \curl_multi_select($this->_mh, $this->selectTimeout);
+        }
         $this->processMessages();
+    }
+    /**
+     * Runs \curl_multi_exec() inside the event loop, to prevent busy looping
+     */
+    private function tickInQueue() : void
+    {
+        if (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+            \curl_multi_select($this->_mh, 0);
+            P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
+        }
+    }
     /**

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php

-                      r2950993
+                      r3232769
      * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
      */
     public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null) : HandlerStack
+    public static function createWithMiddleware(?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null) : HandlerStack
+    {
         return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
 …
     /**
      * The passed in value must be an array of
      * {@see \Psr\Http\Message\ResponseInterface} objects, Exceptions,
+     * {@see ResponseInterface} objects, Exceptions,
      * callables, or Promises.
+     *
 …
      * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
      */
     public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
+    public function __construct(?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null)
+    {
         $this->onFulfilled = $onFulfilled;
 …
      * @param mixed $reason Promise or reason.
      */
     private function invokeStats(RequestInterface $request, array $options, ResponseInterface $response = null, $reason = null) : void
+    private function invokeStats(RequestInterface $request, array $options, ?ResponseInterface $response = null, $reason = null) : void
+    {
         if (isset($options['on_stats'])) {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php

r2950993	r3232769
38	38	\usleep($options['delay'] * 1000);
39	39	}
	40	$protocolVersion = $request->getProtocolVersion();
	41	if ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
	42	throw new ConnectException(\sprintf('HTTP/%s is not supported by the stream handler.', $protocolVersion), $request);
	43	}
40	44	$startTime = isset($options['on_stats']) ? Utils::currentTime() : null;
41	45	try {
…	…
63	67	}
64	68	}
65		private function invokeStats(array $options, RequestInterface $request, ?float $startTime, ~~ResponseInterface $response = null,~~ \Throwable $error = null) : void
	69	private function invokeStats(array $options, RequestInterface $request, ?float $startTime, ?ResponseInterface $response = null, ?\Throwable $error = null) : void
66	70	{
67	71	if (isset($options['on_stats'])) {
…	…
211	215	// HTTP/1.1 streams using the PHP stream wrapper require a
212	216	// Connection: close header
213		if ($request->getProtocolVersion() == '1.1' && !$request->hasHeader('Connection')) {
	217	if ($request->getProtocolVersion() === '1.1' && !$request->hasHeader('Connection')) {
214	218	$request = $request->withHeader('Connection', 'close');
215	219	}

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/HandlerStack.php

-                      r3032832
+                      r3232769
      *                                                                            system will be utilized.
      */
     public static function create(callable $handler = null) : self
+    public static function create(?callable $handler = null) : self
+    {
         $stack = new self($handler ?: Utils::chooseHandler());
 …
      * @param (callable(RequestInterface, array): PromiseInterface)|null $handler Underlying HTTP handler.
      */
     public function __construct(callable $handler = null)
+    public function __construct(?callable $handler = null)
+    {
         $this->handler = $handler;
 …
      * @param string                       $name       Name to register for this middleware.
      */
     public function unshift(callable $middleware, string $name = null) : void
+    public function unshift(callable $middleware, ?string $name = null) : void
+    {
         \array_unshift($this->stack, [$middleware, $name]);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/MessageFormatter.php

r3032832	r3232769
65	65	* @param \Throwable\|null $error Exception that was received
66	66	*/
67		public function format(RequestInterface $request, ~~ResponseInterface $response = null,~~ \Throwable $error = null) : string
	67	public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null) : string
68	68	{
69	69	$cache = [];

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php

r3032832	r3232769
14	14	* @param \Throwable\|null $error Exception that was received
15	15	*/
16		public function format(RequestInterface $request, ~~ResponseInterface $response = null,~~ \Throwable $error = null) : string;
	16	public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null) : string;
17	17	}

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Middleware.php

-                      r2950993
+                      r3232769
      * @return callable(callable): callable Returns a function that accepts the next handler.
      */
     public static function httpErrors(BodySummarizerInterface $bodySummarizer = null) : callable
+    public static function httpErrors(?BodySummarizerInterface $bodySummarizer = null) : callable
+    {
         return static function (callable $handler) use($bodySummarizer) : callable {
 …
      * @return callable Returns a function that accepts the next handler.
      */
     public static function tap(callable $before = null, callable $after = null) : callable
+    public static function tap(?callable $before = null, ?callable $after = null) : callable
+    {
         return static function (callable $handler) use($before, $after) : callable {
 …
      * @return callable Returns a function that accepts the next handler.
      */
     public static function retry(callable $decider, callable $delay = null) : callable
+    public static function retry(callable $decider, ?callable $delay = null) : callable
+    {
         return static function (callable $handler) use($decider, $delay) : RetryMiddleware {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php

r2950993	r3232769
63	63	}
64	64	$expect = $options['expect'] ?? null;
65		// Return if disabled or ~~if you're not using HTTP/1.1 or HTTP/2~~.0
66		if ($expect === \false \|\| $request->getProtocolVersion() ~~< 1.1~~) {
	65	// Return if disabled or using HTTP/1.0
	66	if ($expect === \false \|\| $request->getProtocolVersion() === '1.0') {
67	67	return;
68	68	}

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/RequestOptions.php

r3032832	r3232769
58	58	* jar to use or what cookies to send. This option only works if your
59	59	* handler has the `cookie` middleware. Valid values are `false` and
60		* an instance of {@see ~~\GuzzleHttp\~~Cookie\CookieJarInterface}.
	60	* an instance of {@see Cookie\CookieJarInterface}.
61	61	*/
62	62	public const COOKIES = 'cookies';

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/RetryMiddleware.php

r2950993	r3232769
37	37	* milliseconds to delay.
38	38	*/
39		public function __construct(callable $decider, callable $nextHandler, callable $delay = null)
	39	public function __construct(callable $decider, callable $nextHandler, ?callable $delay = null)
40	40	{
41	41	$this->decider = $decider;
…	…
84	84	};
85	85	}
86		private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null) : PromiseInterface
	86	private function doRetry(RequestInterface $request, array $options, ?ResponseInterface $response = null) : PromiseInterface
87	87	{
88	88	$options['delay'] = ($this->delay)(++$options['retries'], $response, $request);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/TransferStats.php

r3032832	r3232769
39	39	* @param array $handlerStats Handler specific stats.
40	40	*/
41		public function __construct(RequestInterface $request, ~~ResponseInterface $response = null,~~ float $transferTime = null, $handlerErrorData = null, array $handlerStats = [])
	41	public function __construct(RequestInterface $request, ?ResponseInterface $response = null, ?float $transferTime = null, $handlerErrorData = null, array $handlerStats = [])
42	42	{
43	43	$this->request = $request;

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/guzzle/src/Utils.php

r3032832	r3232769
65	65	return \STDOUT;
66	66	}
67		return ~~\AcVendor\GuzzleHttp\~~Psr7\Utils::tryFopen('php://output', 'w');
	67	return Psr7\Utils::tryFopen('php://output', 'w');
68	68	}
69	69	/**
…	…
79	79	{
80	80	$handler = null;
81		if (\defined('CURLOPT_CUSTOMREQUEST')) {
	81	if (\defined('CURLOPT_CUSTOMREQUEST') && \function_exists('curl_version') && \version_compare(\curl_version()['version'], '7.21.2') >= 0) {
82	82	if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
83	83	$handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/Coroutine.php

r2950993	r3232769
77	77	return new self($generatorFn);
78	78	}
79		public function then(~~callable $onFulfilled = null,~~ callable $onRejected = null) : PromiseInterface
	79	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
80	80	{
81	81	return $this->result->then($onFulfilled, $onRejected);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/Each.php

-                      r3032832
+                      r3232769
      * @param mixed $iterable Iterator or array to iterate over.
      */
     public static function of($iterable, callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface
+    public static function of($iterable, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+    {
         return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected]))->promise();
 …
      * @param int|callable $concurrency
      */
     public static function ofLimit($iterable, $concurrency, callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface
+    public static function ofLimit($iterable, $concurrency, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+    {
         return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected, 'concurrency' => $concurrency]))->promise();
 …
      * @param int|callable $concurrency
      */
     public static function ofLimitAll($iterable, $concurrency, callable $onFulfilled = null) : PromiseInterface
+    public static function ofLimitAll($iterable, $concurrency, ?callable $onFulfilled = null) : PromiseInterface
+    {
         return self::ofLimit($iterable, $concurrency, $onFulfilled, function ($reason, $idx, PromiseInterface $aggregate) : void {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/FulfilledPromise.php

r2950993	r3232769
25	25	$this->value = $value;
26	26	}
27		public function then(~~callable $onFulfilled = null,~~ callable $onRejected = null) : PromiseInterface
	27	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
28	28	{
29	29	// Return itself if there is no onFulfilled function.

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/Promise.php

r2950993	r3232769
23	23	* @param callable $cancelFn Fn that when invoked cancels the promise.
24	24	*/
25		public function __construct(~~callable $waitFn = null,~~ callable $cancelFn = null)
	25	public function __construct(?callable $waitFn = null, ?callable $cancelFn = null)
26	26	{
27	27	$this->waitFn = $waitFn;
28	28	$this->cancelFn = $cancelFn;
29	29	}
30		public function then(~~callable $onFulfilled = null,~~ callable $onRejected = null) : PromiseInterface
	30	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
31	31	{
32	32	if ($this->state === self::PENDING) {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/PromiseInterface.php

r2950993	r3232769
25	25	* @param callable $onRejected Invoked when the promise is rejected.
26	26	*/
27		public function then(~~callable $onFulfilled = null,~~ callable $onRejected = null) : PromiseInterface;
	27	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface;
28	28	/**
29	29	* Appends a rejection handler callback to the promise, and returns a new

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/RejectedPromise.php

r2950993	r3232769
25	25	$this->reason = $reason;
26	26	}
27		public function then(~~callable $onFulfilled = null,~~ callable $onRejected = null) : PromiseInterface
	27	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
28	28	{
29	29	// If there's no onRejected callback then just return self.

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/RejectionException.php

r3032832	r3232769
17	17	* @param string\|null $description Optional description.
18	18	*/
19		public function __construct($reason, string $description = null)
	19	public function __construct($reason, ?string $description = null)
20	20	{
21	21	$this->reason = $reason;

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/promises/src/Utils.php

-                      r2950993
+                      r3232769
      * @param TaskQueueInterface|null $assign Optionally specify a new queue instance.
      */
     public static function queue(TaskQueueInterface $assign = null) : TaskQueueInterface
+    public static function queue(?TaskQueueInterface $assign = null) : TaskQueueInterface
+    {
         static $queue;
 …
             $results[$idx] = $value;
         }, function ($reason, $idx, Promise $aggregate) : void {
+            $aggregate->reject($reason);
+            if (Is::pending($aggregate)) {
+                $aggregate->reject($reason);
+            }
         })->then(function () use(&$results) {
             \ksort($results);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/CachingStream.php

r2950993	r3232769
26	26	* @param StreamInterface $target Optionally specify where data is cached
27	27	*/
28		public function __construct(StreamInterface $stream, StreamInterface $target = null)
	28	public function __construct(StreamInterface $stream, ?StreamInterface $target = null)
29	29	{
30	30	$this->remoteStream = $stream;

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/HttpFactory.php

r2950993	r3232769
24	24	final class HttpFactory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
25	25	{
26		public function createUploadedFile(StreamInterface $stream, ~~int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null,~~ string $clientMediaType = null) : UploadedFileInterface
	26	public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface
27	27	{
28	28	if ($size === null) {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/MultipartStream.php

r3032832	r3232769
28	28	* @throws \InvalidArgumentException
29	29	*/
30		public function __construct(array $elements = [], string $boundary = null)
	30	public function __construct(array $elements = [], ?string $boundary = null)
31	31	{
32	32	$this->boundary = $boundary ?: \bin2hex(\random_bytes(20));

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/Query.php

-                      r2950993
+                      r3232769
      * encountered (like `http_build_query()` would).
+     *
+     * @param array     $params   Query string parameters.
+     * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
+     *                            to encode using RFC3986, or PHP_QUERY_RFC1738
+     *                            to encode using RFC1738.
+     * @param array     $params           Query string parameters.
+     * @param int|false $encoding         Set to false to not encode,
+     *                                    PHP_QUERY_RFC3986 to encode using
+     *                                    RFC3986, or PHP_QUERY_RFC1738 to
+     *                                    encode using RFC1738.
+     * @param bool      $treatBoolsAsInts Set to true to encode as 0/1, and
+     *                                    false as false/true.
      */
     public static function build(array $params, $encoding = \PHP_QUERY_RFC3986) : string
+    public static function build(array $params, $encoding = \PHP_QUERY_RFC3986, bool $treatBoolsAsInts = \true) : string
+    {
         if (!$params) {
 …
             throw new \InvalidArgumentException('Invalid type');
+        }
+        $castBool = $treatBoolsAsInts ? static function ($v) {
+            return (int) $v;
+        } : static function ($v) {
+            return $v ? 'true' : 'false';
+        };
         $qs = '';
         foreach ($params as $k => $v) {
 …
             if (!\is_array($v)) {
                 $qs .= $k;
                 $v = \is_bool($v) ? (int) $v : $v;
+                $v = \is_bool($v) ? $castBool($v) : $v;
                 if ($v !== null) {
                     $qs .= '=' . $encoder((string) $v);
 …
                 foreach ($v as $vv) {
                     $qs .= $k;
                     $vv = \is_bool($vv) ? (int) $vv : $vv;
+                    $vv = \is_bool($vv) ? $castBool($vv) : $vv;
                     if ($vv !== null) {
                         $qs .= '=' . $encoder((string) $vv);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/Response.php

r3032832	r3232769
25	25	* @param string\|null $reason Reason phrase (when empty a default will be used based on the status code)
26	26	*/
27		public function __construct(int $status = 200, array $headers = [], $body = null, string $version = '1.1', string $reason = null)
	27	public function __construct(int $status = 200, array $headers = [], $body = null, string $version = '1.1', ?string $reason = null)
28	28	{
29	29	$this->assertStatusCodeRange($status);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/StreamWrapper.php

-                      r3032832
+                      r3232769
+        }
+    }
     public function stream_open(string $path, string $mode, int $options, string &$opened_path = null) : bool
+    public function stream_open(string $path, string $mode, int $options, ?string &$opened_path = null) : bool
+    {
         $options = \stream_context_get_options($this->context);
 …
      *   blksize: int,
      *   blocks: int
      * }
+     * }|false
      */
     public function stream_stat() : array
+    public function stream_stat()
+    {
+        if ($this->stream->getSize() === null) {
+            return \false;
+        }
         static $modeMap = ['r' => 33060, 'rb' => 33060, 'r+' => 33206, 'w' => 33188, 'wb' => 33188];
         return ['dev' => 0, 'ino' => 0, 'mode' => $modeMap[$this->mode], 'nlink' => 0, 'uid' => 0, 'gid' => 0, 'rdev' => 0, 'size' => $this->stream->getSize() ?: 0, 'atime' => 0, 'mtime' => 0, 'ctime' => 0, 'blksize' => 0, 'blocks' => 0];

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/UploadedFile.php

r3032832	r3232769
42	42	* @param StreamInterface\|string\|resource $streamOrFile
43	43	*/
44		public function __construct($streamOrFile, ?int $size, int $errorStatus, ~~string $clientFilename = null,~~ string $clientMediaType = null)
	44	public function __construct($streamOrFile, ?int $size, int $errorStatus, ?string $clientFilename = null, ?string $clientMediaType = null)
45	45	{
46	46	$this->setError($errorStatus);

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/Uri.php

r3032832	r3232769
217	217	* @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.4
218	218	*/
219		public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null) : bool
	219	public static function isSameDocumentReference(UriInterface $uri, ?UriInterface $base = null) : bool
220	220	{
221	221	if ($base !== null) {

activecampaign-for-woocommerce/trunk/ac_vendor/guzzlehttp/psr7/src/Utils.php

-                      r3032832
+                      r3232769
      * @param int|null        $maxLength Maximum buffer length
      */
     public static function readLine(StreamInterface $stream, int $maxLength = null) : string
+    public static function readLine(StreamInterface $stream, ?int $maxLength = null) : string
+    {
         $buffer = '';
 …
+        }
         return $buffer;
+    }
+    /**
+     * Redact the password in the user info part of a URI.
+     */
+    public static function redactUserInfo(UriInterface $uri) : UriInterface
+    {
+        $userInfo = $uri->getUserInfo();
+        if (\false !== ($pos = \strpos($userInfo, ':'))) {
+            return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***');
+        }
+        return $uri;
+    }
     /**

activecampaign-for-woocommerce/trunk/ac_vendor/laravel/serializable-closure/src/Serializers/Native.php

-                      r2950993
+                      r3232769
                         continue;
+                    }
+                    if (\PHP_VERSION >= 8.1 && $property->isReadOnly()) {
+                        continue;
+                    }
                     $item = $property->getValue($data);
                     if ($item instanceof SerializableClosure || $item instanceof UnsignedSerializableClosure || $item instanceof SelfReference && $item->hash === $this->code['self']) {
 …
                         continue;
+                    }
+                    if (\PHP_VERSION >= 8.1 && $property->isReadOnly() && $property->class !== $reflection->name) {
+                        continue;
+                    }
                     $value = $property->getValue($instance);
                     if (\is_array($value) || \is_object($value)) {

activecampaign-for-woocommerce/trunk/ac_vendor/laravel/serializable-closure/src/Support/ReflectionClosure.php

r3032832	r3232769
746	746	}
747	747	/**
748		* The ~~the~~ hash of the current file name.
	748	* The hash of the current file name.
749	749	*
750	750	* @return string

activecampaign-for-woocommerce/trunk/ac_vendor/psr/http-factory/src/UploadedFileFactoryInterface.php

-                      r2950993
+                      r3232769
      * @param StreamInterface $stream Underlying stream representing the
      *     uploaded file content.
      * @param int $size in bytes
+     * @param int|null $size in bytes
      * @param int $error PHP file upload error
      * @param string $clientFilename Filename as provided by the client, if any.
      * @param string $clientMediaType Media type as provided by the client, if any.
+     * @param string|null $clientFilename Filename as provided by the client, if any.
+     * @param string|null $clientMediaType Media type as provided by the client, if any.
+     *
      * @return UploadedFileInterface
 …
      * @throws \InvalidArgumentException If the file resource is not readable.
      */
     public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null) : UploadedFileInterface;
+    public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface;
+}

activecampaign-for-woocommerce/trunk/activecampaign-for-woocommerce.php

-                      r3227747
+                      r3232769
  * Plugin URI:           https://www.activecampaign.com/
  * Description:          Add Abandoned Cart functionality to your WooCommerce store, synchronize order & customer information using ActiveCampaign.
  * Version:              2.8.3
+ * Version:              2.8.4
  * WC requires at least: 7.4.0
  * WC tested up to:      9.5.2
+ * WC tested up to:      9.6.0
  * Requires at least:    6.0
  * Requires PHP:         7.4

activecampaign-for-woocommerce/trunk/admin/class-activecampaign-for-woocommerce-admin-historical-sync.php

-                      r3220303
+                      r3232769
             wp_schedule_single_event(
                 time() + 10,
+                time() + 30,
                 'activecampaign_for_woocommerce_prep_historical_data',
                 array()
+                array('current_page' => 0)
             );

activecampaign-for-woocommerce/trunk/admin/class-activecampaign-for-woocommerce-admin-wc-order-page.php

-                      r3220303
+                      r3232769
         try {
             $order = ( $post_or_order_object instanceof WP_Post ) ? wc_get_order( $post_or_order_object->ID ) : $post_or_order_object;
             if ( isset( $order->ID ) ) {
                 $wc_order_id = $order->ID;
+            $wc_order = ( $post_or_order_object instanceof WP_Post ) ? wc_get_order( $post_or_order_object->ID ) : $post_or_order_object;
+            if ( isset( $wc_order->ID ) ) {
+                $wc_order_id = $wc_order->ID;
             } else {
+                $wc_order_id = $order->get_id();
+            }
+            $order = wc_get_order( $wc_order_id );
+            if ( isset( $order ) && self::validate_object( $order, 'get_id' ) ) {
+                $table_data = $wpdb->get_row(
+                    // phpcs:disable
+                    $wpdb->prepare( 'SELECT id, synced_to_ac, ac_order_id, wc_order_id, ac_customer_id, abandoned_date, customer_email, ac_externalcheckoutid, customer_first_name, customer_last_name
+                        FROM
+                        `' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '`
+                        WHERE wc_order_id = %d
+                        LIMIT 1',
+                        $wc_order_id
+                    )
+                    // phpcs:enable
+                );
+                if ( ! isset( $table_data, $table_data->id ) ) {
+                    $order_ac    = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->check_for_synced_order( $wc_order_id );
+                    $order_ac_id = $order_ac->get_id();
+                $wc_order_id = $wc_order->get_id();
+            }
+            $wc_order = wc_get_order( $wc_order_id );
+            if ( self::validate_object( $wc_order, 'get_id' ) ) {
+                $table_data = self::get_table_data( $wc_order_id );
+                if ( ! isset( $table_data, $table_data->id, $table_data->ac_order_id ) ) {
+                    $ac_order    = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->check_for_synced_order( $wc_order_id );
+                    $order_ac_id = $ac_order->get_id();
+                }
                 if (
                     ! isset( $order_ac ) &&
+                    ! isset( $ac_order ) &&
                     isset( $table_data->synced_to_ac ) &&
                     in_array( $table_data->synced_to_ac, array( 0, '0' ) )
+                    in_array( $table_data->synced_to_ac, array( self::STATUS_UNSYNCED, self::STATUS_ABANDONED_CART_UNSYNCED, self::STATUS_ABANDONED_CART_RECOVERED ) )
                 ) {
+                    $order_ac    = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->check_for_synced_order( $wc_order_id );
+                    $order_ac_id = $order_ac->get_id();
+                    $ac_order    = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->check_for_synced_order( $wc_order_id );
+                    $order_ac_id = $ac_order->get_id();
+                }
+                if (
+                    isset( $ac_order ) &&
+                    self::validate_object( $ac_order, 'get_id' )
+                ) {
+                    $table_data->ac_order_id    = $ac_order->get_id();
+                    $table_data->ac_customer_id = $ac_order->get_customerid();
+                    self::save_table_data( $wc_order, $table_data );
+                }
                 if ( ! isset( $table_data, $table_data->id ) ) {
                     if ( isset( $order_ac_id ) && ! empty( $order_ac_id ) ) {
                         self::save_table_data( $order, null, 1 );
+                        self::save_table_data( $wc_order, null, 1 );
+                    }
 …
+                }
                 $ac_contact = get_transient( 'activecampaign_for_woocommerce_contact' . $order->get_billing_email() );
                 if ( ! isset( $ac_contact ) || false === $ac_contact ) {
                     $ac_contact = $contact_repository->find_by_email( $order->get_billing_email() );
                     set_transient( 'activecampaign_for_woocommerce_contact' . $order->get_billing_email(), $ac_contact, 3600 );
+                }
                 if ( isset( $table_data ) && is_null( $table_data->customer_email ) ) {
                     self::save_table_data( $order, $table_data );
+                $ac_contact = get_transient( 'activecampaign_for_woocommerce_contact' . $wc_order->get_billing_email() );
+                if ( ! isset( $ac_contact ) || false === $ac_contact || '' === $ac_contact ) {
+                    $ac_contact = $contact_repository->find_by_email( $wc_order->get_billing_email() );
+                    set_transient( 'activecampaign_for_woocommerce_contact' . $wc_order->get_billing_email(), $ac_contact, 300 );
+                }
+                if ( isset( $table_data ) && is_null( $table_data->customer_email ) || ! isset( $table_data->ac_order_id ) ) {
+                    self::save_table_data( $wc_order, $table_data );
                     $table_data = self::get_table_data( $wc_order_id );
 …
                 if (
-                    isset( $order_ac_id ) &&
                     ! empty( $order_ac_id ) &&
                     isset( $table_data->synced_to_ac ) &&
                     in_array( $table_data->synced_to_ac, array( 0, '0' ) )
                 ) {
+                    $table_data->synced_to_ac = 1;
+                    self::save_table_data( $order, $table_data );
+                    self::save_table_data( $wc_order, $table_data );
+                }
                 if ( isset( $table_data ) ) {
+                    $activecampaign_for_woocommerce_data = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->get_order_page_data( $table_data, $ac_contact );
+                }
+                    $activecampaign_for_woocommerce_data                        = ( new Activecampaign_For_Woocommerce_Admin_WC_Order_Page() )->get_order_page_data( $table_data, $ac_contact );
+                    $activecampaign_for_woocommerce_data['meta_abandoned_date'] = $wc_order->get_meta( 'activecampaign_for_woocommerce_abandoned_date', $wc_order_id );
+                }
                 require_once plugin_dir_path( __FILE__ ) . 'partials/activecampaign-for-woocommerce-order-meta.php';
+            }
         } catch ( Throwable $t ) {
             $logger->warning( 'There was an issue retrieving or loading the order data for this page.', array( $post_or_order_object ) );
+            $logger->warning( 'There was an issue retrieving or loading the order data for this page.', array($t->getMessage(), $post_or_order_object, 'trace' => $t->getTrace() ) );
+        }
+    }
 …
+    }
+    /**
+     * Runs through a hook ac_ajax_sync_single_record.
+     *
+     * @return void
+     */
     public function ac_ajax_sync_single_record() {
         $nonce = self::get_request_data( 'activecampaign_for_woocommerce_settings_nonce_field' );
 …
                 if ( 'new' === $type ) {
+                    $data['type'] = 'new';
                     do_action( 'activecampaign_for_woocommerce_admin_sync_single_order_active', $data );
                 } elseif ( 'historical' === $type ) {
+                    $data['type'] = 'historical';
                     do_action( 'activecampaign_for_woocommerce_admin_sync_single_order_historical', $data );
+                }
 …
+                }
+                if ( isset( $table_data->ac_order_id ) ) {
+                    $store_data['ac_order_id'] = $table_data->ac_order_id;
+                }
+                if ( isset( $table_data->ac_customer_id ) ) {
+                    $store_data['ac_customer_id'] = $table_data->ac_customer_id;
+                }
                 if ( isset( $status_override ) && ! empty( $status_override ) ) {
                     $store_data['synced_to_ac'] = $status_override;

activecampaign-for-woocommerce/trunk/admin/class-activecampaign-for-woocommerce-admin.php

-                      r3227747
+                      r3232769
         $this->contact_repository    = $contact_repository;
         $this->api_client            = $api_client;
+    }
+    public function cron_add_ten_minute( $schedules ) {
+        // Adds once weekly to the existing schedules.
+        $schedules['ten_minute'] = array(
+            'interval' => 600,
+            'display'  => __( 'Ten Minutes', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN ),
+        );
+        return $schedules;
+    }
 …
                 $this->is_configured()
             ) {
                 wp_schedule_event( time() + 10, 'every_minute', 'activecampaign_for_woocommerce_cart_updated_recurring_event' );
                 wp_schedule_event( time() + 10, 'every_minute', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME );
+                wp_schedule_event( time() + 10, 'ten_minute', 'activecampaign_for_woocommerce_cart_updated_recurring_event' );
+                wp_schedule_event( time() + 10, 'ten_minute', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME );
                 wp_schedule_event( time() + 15, 'every_minute', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_HISTORICAL_RECUR );
+            }

activecampaign-for-woocommerce/trunk/admin/partials/activecampaign-for-woocommerce-order-meta.php

-                      r2968938
+                      r3232769
                         </p>
                     <?php endif; ?>
                     <?php if ( ! empty( $activecampaign_for_woocommerce_data['abandoned_date'] ) ) : ?>
                         <p>
                             <?php esc_html_e( 'This is a recovered order. Abandoned on: ', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN ); ?>
+                            <?php echo esc_html( activecampaign_for_woocommerce_convert_date_to_local( $activecampaign_for_woocommerce_data['abandoned_date'] ) ); ?>
+                            <?php if ( isset( $activecampaign_for_woocommerce_data['meta_abandoned_date'] ) ) : ?>
+                                <?php echo esc_html( activecampaign_for_woocommerce_convert_date_to_local( $activecampaign_for_woocommerce_data['meta_abandoned_date'] ) ); ?>
+                            <?php else : ?>
+                                <?php echo esc_html( activecampaign_for_woocommerce_convert_date_to_local( $activecampaign_for_woocommerce_data['abandoned_date'] ) ); ?>
+                            <?php endif; ?>
                         </p>
                     <?php endif; ?>
 …
         </div>
         <?php if ( $activecampaign_for_woocommerce_data['debug'] ) : ?>
+        <?php if ( isset( $activecampaign_for_woocommerce_data['debug'] ) && in_array( $activecampaign_for_woocommerce_data['debug'], array( 1, '1') ) ) : ?>
             <div style="margin-top:20px;border-top:1px solid #ccc;">
                 <h4><?php esc_html_e( 'ActiveCampaign Debug info', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN ); ?></h4>

activecampaign-for-woocommerce/trunk/admin/scripts/activecampaign-for-woocommerce-settings-page.js

r3227747	r3232769
128	128	// https://my-woocommerce-store.shop/**/products/{{sku}}
129	129	function validProductUrlPattern(pattern) {
130		let validUrlPatternVariables = ['sku', 'storePrimaryId', 'storeBaseProductId', 'upc', 'baseProduct~~Slug', 'variant~~Slug'];
	130	let validUrlPatternVariables = ['sku', 'storePrimaryId', 'storeBaseProductId', 'upc', 'baseProductUrlSlug', 'variantProductUrlSlug'];
131	131	const regexp = /\{\{(.*?)}}/g;
132	132

activecampaign-for-woocommerce/trunk/admin/views/activecampaign-for-woocommerce-abandoned-cart-display.php

-                      r3220303
+                      r3232769
                                                 ! empty( $activecampaign_for_woocommerce_ab_cart->order_date ) &&
                                                 ! empty( $activecampaign_for_woocommerce_ab_cart->abandoned_date ) &&
                                                 in_array( $activecampaign_for_woocommerce_ab_cart->synced_to_ac, array( 23, '23', 1, '1' ), true )
+                                                in_array( $activecampaign_for_woocommerce_ab_cart->synced_to_ac, array( 23, '23', 1, '1', 0, '0' ), true )
                                         ) :
                                             ?>
 …
                                         if (
                                                 ( empty( $activecampaign_for_woocommerce_ab_cart->order_date ) && empty( $activecampaign_for_woocommerce_ab_cart->abandoned_date ) ) ||
                                                 in_array( $activecampaign_for_woocommerce_ab_cart->synced_to_ac, array( 0, 20, '0', '20' ), true )
+                                                in_array( $activecampaign_for_woocommerce_ab_cart->synced_to_ac, array( 20, '20' ), true )
                                         ) :
                                             ?>
 …
                                             </div>
                                             <?php
+                                            $activecampaign_for_woocommerce_array_data = json_decode( $activecampaign_for_woocommerce_ab_cart->customer_ref_json, true );
+                                            if ( is_array( $activecampaign_for_woocommerce_array_data ) ) {
+                                                echo nl2br( esc_html( activecampaign_for_woocommerce_parse_array( $activecampaign_for_woocommerce_array_data ) ) );
+                                            if (isset( $activecampaign_for_woocommerce_ab_cart->customer_ref_json ) ) {
+                                                $activecampaign_for_woocommerce_array_data = json_decode( $activecampaign_for_woocommerce_ab_cart->customer_ref_json, true );
+                                                if ( is_array( $activecampaign_for_woocommerce_array_data ) ) {
+                                                    echo nl2br( esc_html( activecampaign_for_woocommerce_parse_array( $activecampaign_for_woocommerce_array_data ) ) );
+                                                } else {
+                                                    echo 'There was an issue parsing this data.';
+                                                }
+                                            } else {
+                                                echo 'Cart data could not be retrieved for this record.';
+                                            }
                                             ?>
 …
                                             <h2>Cart details</h2>
                                             <?php
+                                            $activecampaign_for_woocommerce_array_data = json_decode( $activecampaign_for_woocommerce_ab_cart->cart_ref_json, true );
+                                            if ( is_array( $activecampaign_for_woocommerce_array_data ) ) {
+                                                echo nl2br( esc_html( activecampaign_for_woocommerce_parse_array( array_values( $activecampaign_for_woocommerce_array_data )[0] ) ) );
+                                            if (isset( $activecampaign_for_woocommerce_ab_cart->cart_ref_json ) ) {
+                                                $activecampaign_for_woocommerce_array_data = json_decode( $activecampaign_for_woocommerce_ab_cart->cart_ref_json, true );
+                                                if ( is_array( $activecampaign_for_woocommerce_array_data ) ) {
+                                                    echo nl2br( esc_html( activecampaign_for_woocommerce_parse_array( array_values( $activecampaign_for_woocommerce_array_data )[0] ) ) );
+                                                } else {
+                                                    echo '<h2>There was an issue parsing this data.</h2>';
+                                                }
+                                            } else {
+                                                echo 'Cart data could not be retrieved for this record.';
+                                            }
                                             ?>

activecampaign-for-woocommerce/trunk/admin/views/activecampaign-for-woocommerce-admin-display.php

-                      r3227747
+                      r3232769
     esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/?product={{storeBaseProductId}}' ) ),
     esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/?**product={{storeBaseProductId}}&**' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/product/{{storeBaseProductId}}' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/shop/{{storeBaseProductId}}' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/shop/**/{{storeBaseProductId}}' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/product/{{baseProductUrlSlug}}' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/product/{{baseProductUrlSlug}}/**' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/shop/{{baseProductUrlSlug}}' ) ),
+    esc_html( sanitize_text_field( $activecampaign_for_woocommerce_external_id . '/shop/**/{{baseProductUrlSlug}}' ) ),
 );
 $activecampaign_for_woocommerce_optin_checkbox_text             = esc_html__( 'Keep me up to date on news and exclusive offers', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN );
 $activecampaign_for_woocommerce_optin_checkbox_display_option   = 'visible_checked_by_default';
 $activecampaign_for_woocommerce_custom_email_field              = esc_html__( 'billing_email', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN );
 $activecampaign_for_woocommerce_debug_excess                    = 0;
 $activecampaign_for_woocommerce_desc_select                     = '0';
 $activecampaign_for_woocommerce_browse_tracking                 = '0';
 $activecampaign_for_woocommerce_debug_disable_meta_save         = '0';
 $activecampaign_for_woocommerce_debug_disable_ots               = '0';
+$activecampaign_for_woocommerce_optin_checkbox_text           = esc_html__( 'Keep me up to date on news and exclusive offers', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN );
+$activecampaign_for_woocommerce_optin_checkbox_display_option = 'visible_checked_by_default';
+$activecampaign_for_woocommerce_custom_email_field            = esc_html__( 'billing_email', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN );
+$activecampaign_for_woocommerce_debug_excess                  = 0;
+$activecampaign_for_woocommerce_desc_select                   = '0';
+$activecampaign_for_woocommerce_browse_tracking               = '0';
+$activecampaign_for_woocommerce_debug_disable_meta_save       = '0';
+$activecampaign_for_woocommerce_debug_disable_ots             = '0';
 if ( is_array( $activecampaign_for_woocommerce_options ) ) {
 …
     '24' => esc_html__( '24 hours', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_LOCALIZATION_DOMAIN ),
 );
 $activecampaign_for_woocommerce_ba_product_url_valid_variables                    = array( 'sku', 'storePrimaryId', 'storeBaseProductId', 'upc', 'baseProductSlug', 'variantSlug' );
+$activecampaign_for_woocommerce_ba_product_url_valid_variables                    = array( 'sku', 'storePrimaryId', 'storeBaseProductId', 'upc', 'baseProductUrlSlug', 'variantProductUrlSlug' );
 $activecampaign_for_woocommerce_ac_debug_options = array(

activecampaign-for-woocommerce/trunk/includes/abandoned_carts/class-activecampaign-for-woocommerce-cart-events.php

-                      r3220303
+                      r3232769
 use Activecampaign_For_Woocommerce_Save_Abandoned_Cart_Command as Abandoned_Cart;
 use Activecampaign_For_Woocommerce_Cofe_Browse_Session_Repository as Browse_Session_Repository;
+use Activecampaign_For_Woocommerce_Synced_Status_Interface as Synced_Status;
 class Activecampaign_For_Woocommerce_Cart_Events {
     use Activecampaign_For_Woocommerce_Data_Validation;
     use Activecampaign_For_Woocommerce_Abandoned_Cart_Utilities;
+    use Activecampaign_For_Woocommerce_Order_Data_Gathering;
     /**
 …
          */
         $logger = new Logger();
+        if ( ! is_admin() && ! WC()->session->has_session() ) {
+            WC()->session->set_customer_session_cookie( true );
+        }
         try {
 …
                 if ( ! $user_id ) {
                     // Guest checkout
                     $persistant_cart_id_name = $this->generate_externalcheckoutid(
+                    $persistant_cart_id = $this->generate_externalcheckoutid(
                         wc()->session->get_customer_id(),
                         $order->get_billing_email()
 …
                     if ( $cart_id ) {
                         // Registered user (customer) initiated cart and completed checkout
                         $persistant_cart_id_name = $cart_id;
+                        $persistant_cart_id = $cart_id;
                     } else {
                         // Registered user (customer) only completed checkout (guest initiated cart)
 …
                         $woocommerce_session_hash = $woocommerce_session_cookie[0];
                         $persistant_cart_id_name = $this->generate_externalcheckoutid(
+                        $persistant_cart_id = $this->generate_externalcheckoutid(
                             $woocommerce_session_hash,
                             $order->get_billing_email()
 …
                 $order->add_meta_data(
                     ACTIVECAMPAIGN_FOR_WOOCOMMERCE_PERSISTENT_CART_ID_NAME,
                     $persistant_cart_id_name,
+                    $persistant_cart_id,
                     true
                 );
-                // $order->update_meta_data(
-                // ACTIVECAMPAIGN_FOR_WOOCOMMERCE_PERSISTENT_CART_ID_NAME,
-                // $persistant_cart_id_name
-                // );
                 return $order;

activecampaign-for-woocommerce/trunk/includes/abandoned_carts/class-activecampaign-for-woocommerce-save-abandoned-cart-command.php

-                      r3220303
+                      r3232769
         // Store the cart
         try {
+            if ( ! is_admin() && ! WC()->session->has_session() ) {
+                WC()->session->set_customer_session_cookie( true );
+            }
             $this->prep_abandoned_cart_data();
         } catch ( Throwable $e ) {

activecampaign-for-woocommerce/trunk/includes/class-activecampaign-for-woocommerce-plugin-upgrade.php

-                      r3220303
+                      r3232769
         $this->logger->info( 'Plugin Upgrade Command: Table upgrade finished!' );
         $this->disable_old_webhooks();
+        // v1.1.6 //
+        // Clear the scheduled hooks and build new ten minute ones.
+        wp_clear_scheduled_hook( 'activecampaign_for_woocommerce_cart_updated_recurring_event' );
+        wp_clear_scheduled_hook( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME );
+    }

activecampaign-for-woocommerce/trunk/includes/class-activecampaign-for-woocommerce.php

-                      r3220303
+                      r3232769
+        }
+        $this->loader->add_filter(
+            'cron_schedules',
+            $this->admin,
+            'cron_add_ten_minute'
+        );
         // Cart actions
         $this->loader->add_action(
 …
             'woocommerce_checkout_update_order_meta',
             $this->cart_events,
+            'cart_emptied'
+            'cart_emptied',
         );
 …
             $this->new_order_sync,
             'execute',
 ,
+,
         );
 …
             $this->historical_sync,
             'prep_data',
+,
         );
 …
             $this->new_subscription_sync,
             'execute',
 ,
+,
         );
 …
         $this->loader->add_action(
             'woocommerce_checkout_create_order',
+            $this->cart_events,
+            'cart_to_order_transition'
+        );
+        // For blocks
+        $this->loader->add_action(
+            'woocommerce_store_api_checkout_order_processed',
             $this->cart_events,
             'cart_to_order_transition'
 …
                 );
+                $this->loader->add_action(
+                    'woocommerce_store_api_checkout_order_processed',
+                    $this->add_accepts_marketing_to_customer_meta_command,
+                    'execute'
+                );
                 // Add the checkbox to the billing form
                 $this->loader->add_action(

activecampaign-for-woocommerce/trunk/includes/commands/class-activecampaign-for-woocommerce-add-accepts-marketing-to-customer-meta-command.php

r3220303	r3232769
73	73	if ( ! isset( $args[0] ) ) {
74	74	$this->logger->notice( 'Accepts Marketing: Valid order not passed in args.' );
75		return;
	75	return $args;
76	76	}
77	77

activecampaign-for-woocommerce/trunk/includes/commands/class-activecampaign-for-woocommerce-create-or-update-connection-option-command.php

-                      r3220303
+                      r3232769
                 $this->repository->create( $connection_option );
                 $this->logger->info( 'Create or update connection option command:  single connection option created -' . $connection_option->get_option() );
+                $this->logger->info( 'Create or update connection option command:  single connection option created -', ['option' => $connection_option->get_option(), 'value' => $connection_option->get_value()] );
             } catch ( Throwable $t ) {
                 $this->admin->add_async_processing_notification(
 …
                 $this->repository->update( $connection_option );
                 $this->logger->info( 'Create or update connection option command:  single connection option updated - ' . $connection_option->get_option() );
+                $this->logger->info( 'Create or update connection option command:  single connection option updated - ', ['option' => $connection_option->get_option(), 'value' => $connection_option->get_value()] );
             } catch ( Throwable $t ) {
                 $this->admin->add_async_processing_notification(

activecampaign-for-woocommerce/trunk/includes/config/activecampaign-for-woocommerce-global-constants.php

-                      r3227747
+                      r3232769
  */
 if ( ! defined( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_VERSION' ) ) {
     define( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_VERSION', '2.8.3' );
+    define( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_VERSION', '2.8.4' );
+}
 …
  */
 if ( ! defined( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_VERSION' ) ) {
     define( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_VERSION', '1.1.5' );
+    define( 'ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_VERSION', '1.1.6' );
+}

activecampaign-for-woocommerce/trunk/includes/models/class-activecampaign-for-woocommerce-cofe-ecom-order.php

r3189047	r3232769
1023	1023
1024	1024	$this->set_accepts_marketing( $this->get_order_metadata( $order_data, 'activecampaign_for_woocommerce_accepts_marketing' ) );
	1025	$this->set_externalcheckoutid( $this->get_order_metadata( $order_data, 'activecampaign_for_woocommerce_external_checkout_id' ) );
1025	1026
1026	1027	if ( ! empty( $order_data['date_created'] ) ) {

activecampaign-for-woocommerce/trunk/includes/orders/class-activecampaign-for-woocommerce-new-order-created-event.php

-                      r3220303
+                      r3232769
 use Activecampaign_For_Woocommerce_Logger as Logger;
 use Activecampaign_For_Woocommerce_Customer_Utilities as Customer_Utilities;
+use Activecampaign_For_Woocommerce_Synced_Status_Interface as Synced_Status;
 /**
 …
             if ( $this->is_renewal( $wc_order ) ) {
+                // A renewal may not have set the external checkout ID so make sure it's set.
                 $wc_order->update_meta_data(
                     ACTIVECAMPAIGN_FOR_WOOCOMMERCE_PERSISTENT_CART_ID_NAME,
 …
             $stored_row = $wpdb->get_row(
                 $wpdb->prepare(
                     'SELECT id, wc_order_id FROM ' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '
+                    'SELECT id, wc_order_id, abandoned_date FROM ' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '
                     WHERE wc_order_id = %d LIMIT 1',
                     [ $order_id ]
 …
             $stored_row = $wpdb->get_row(
                 $wpdb->prepare(
                     'SELECT id, wc_order_id FROM ' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '
+                    'SELECT id, wc_order_id, abandoned_date FROM ' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '
                     WHERE ac_externalcheckoutid = %s OR activecampaignfwc_order_external_uuid = %s LIMIT 1',
                     [ $externalcheckoutid, $cart_uuid ]
 …
+            }
+            $was_abandoned = false;
+            if ( null !== $stored_row->abandoned_date ) {
+                $was_abandoned = true;
+            }
             if (
                 isset( wc()->session ) &&
 …
+        }
+        if ( $was_abandoned ) {
+            // Abandoned cart item mark as recovered in synced_to_ac
+            $store_data['synced_to_ac'] = Synced_Status::STATUS_ABANDONED_CART_RECOVERED;
+        }
         try {
+            if ( isset( $stored_id ) && ! empty( $stored_id ) ) {
+            if ( ! empty( $abandoned_cart_id ) ) {
+                // Abandoned cart item mark as recovered in synced_to_ac
+                $store_data['synced_to_ac'] = Synced_Status::STATUS_ABANDONED_CART_RECOVERED;
+                $wpdb->update(
+                    $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME,
+                    $store_data,
+                    array(
+                        'id' => $abandoned_cart_id,
+                    )
+                );
+            } elseif ( isset( $stored_id ) && ! empty( $stored_id ) ) {
+                if ( $was_abandoned ) {
+                    // Abandoned cart item mark as recovered in synced_to_ac
+                    $store_data['synced_to_ac'] = Synced_Status::STATUS_ABANDONED_CART_RECOVERED;
+                }
                 $wpdb->update(
                     $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME,
 …
                 $this->schedule_sync_job( $order_id );
-            } elseif ( ! empty( $abandoned_cart_id ) ) {
-                // Abandoned cart item mark as recovered in synced_to_ac
-                $wpdb->update(
-                    $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME,
-                    $store_data,
-                    array(
-                        'id' => $abandoned_cart_id,
+                    )
-                );
             } else {
                 if ( ! isset( $stored_id ) ) {
                     $stored_id = null;
 …
             // wp_clear_scheduled_hook('activecampaign_for_woocommerce_cart_updated_recurring_event');
             if ( ! wp_next_scheduled( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME ) ) {
                 wp_schedule_event( time() + 10, 'every_minute', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME );
+                wp_schedule_event( time() + 10, 'ten_minute', ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, null, true );
             } elseif ( function_exists( 'wp_get_scheduled_event' ) ) {
                 $logger->debug_excess(
 …
      * Schedules the sync job.
+     *
      * @param int $row_id The row id.
      */
     private function schedule_sync_job( $row_id ) {
+     * @param int $order_id The order id.
+     */
+    private function schedule_sync_job( $order_id ) {
         try {
             if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'row_id' => $row_id ) ) ) {
+            if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'wc_order_id' => $order_id, 'event' => 'onetime' ) ) ) {
                 wp_schedule_single_event(
                     time() + 10,
                     ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME,
+                    time() + 40,
+                    'activecampaign_for_woocommerce_admin_sync_single_order_active',
                     array(
+                        'row_id' => $row_id,
+                    )
+                        'wc_order_id' => $order_id,
+                        'event'       => 'onetime',
+                    ),
+                    true
                 );
+            }
 …
                 'Schedule finished order for immediate sync.',
                 array(
+                    'row_id'       => $row_id,
+                    'current_time' => time() + 10,
+                    'schedule'     => wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'row_id' => $row_id ) ),
+                    'wc_order_id'         => $order_id,
+                    'current_time'        => time(),
+                    'scheduled_time'      => time() + 40,
+                    'schedule validation' => wp_get_scheduled_event( 'activecampaign_for_woocommerce_admin_sync_single_order_active', array( 'wc_order_id' => $order_id, 'event' => 'onetime' ) ),
+                )
             );

activecampaign-for-woocommerce/trunk/includes/orders/class-activecampaign-for-woocommerce-new-order-sync-job.php

-                      r3220303
+                      r3232769
             );
+        }
+        return $args;
+    }
 …
                     return false;
+                }
+                $this->add_meta_to_order( $wc_order );
                 $ac_customer_id = $this->get_ac_customer_id( $wc_order->get_billing_email() );
 …
                 $last_run = get_option( 'activecampaign_for_woocommerce_abandoned_cart_last_run' );
+                // Try and keep this event from running too many times.
+                // The cron will run every minute but this needs to run every 10 instead.
+                if ( false !== $last_run ) {
+                    $interval         = date_diff( $now, $last_run );
+                    $interval_minutes = $interval->format( '%i' );
+                } else {
+                    $interval_minutes = 10;
+                }
+                if ( ! isset( $interval_minutes ) || empty( $interval_minutes ) || $interval_minutes >= 10 ) {
+                    $unsynced_order_data = $this->get_unsynced_orders_from_table( null, false );
+                    $recovered_orders    = $this->get_unsynced_orders_from_table( null, true );
+                }
+                $unsynced_order_data = $this->get_unsynced_orders_from_table( null, false );
+                $recovered_orders    = $this->get_unsynced_orders_from_table( null, true );
+            }
         } catch ( Throwable $t ) {
 …
             );
+        }
+        return $args;
+    }
 …
+     *
      * @param WC_Order $wc_order The WC order.
      * @param string   $externalcheckoutid The external checkout ID passed only if it's recovered order.
+     * @param string   $externalcheckoutid The external checkout ID passed only if it's an unsynced recovered order.
+     *
      * @return false|void
 …
             $result = $this->cofe_order_repository->upsert_order( $ecom_order->serialize_to_array() );
+            delete_transient( 'activecampaign_for_woocommerce_contact' . $wc_order->get_billing_email() );
             // Change this to return the response from AC if we have a data response
             return $result;
 …
             // Get the expired carts from our table
             if ( null !== $id ) {
+                // We have an order ID, get that specific one.
                 if ( true === $recovered ) {
                     $where = 'abandoned_date IS NOT NULL';
 …
                 );
+            } elseif ( true === $recovered ) {
+                    $orders = $wpdb->get_results(
+                    // phpcs:disable
+                        $wpdb->prepare( 'SELECT id, wc_order_id, ac_externalcheckoutid, customer_email, ac_customer_id
+                    FROM
+                        `' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '`
+                    WHERE
+                        wc_order_id IS NOT NULL
+                        AND abandoned_date IS NOT NULL
+                        AND (
+                            synced_to_ac = %d
+                            OR synced_to_ac = %d
+                            )
+                        ORDER BY id ASC
+                        LIMIT 50',
+                            self::STATUS_ABANDONED_CART_RECOVERED, self::STATUS_UNSYNCED
+                        )
+                    // phpcs:enable
+                    );
             } else {
-                if ( true === $recovered ) {
-                    $where = 'AND abandoned_date IS NOT NULL';
-                } else {
-                    $where = 'AND abandoned_date IS NULL';
+                }
                 $orders = $wpdb->get_results(
                 // phpcs:disable
 …
                     WHERE
                         wc_order_id IS NOT NULL
                         '.$where.'
+                        AND abandoned_date IS NULL
                         AND synced_to_ac = %d
                         ORDER BY id ASC
                         LIMIT 100',
+                        LIMIT 50',
 …
             $wc_order->add_meta_data( 'ac_datahash', md5( json_encode( $wc_order->get_data() ) ), true );
+        }
+        $disable_meta_save = false;
+        $settings          = get_option( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_SETTINGS_NAME );
+        if (isset( $settings['disable_meta_save'] ) ) {
+            $disable_meta_save = $settings['disable_meta_save'];
+        }
+        if ( false === $disable_meta_save ) {
+            $wc_order->save_meta_data();
+        }
+        // Update order meta with relevant data from the stored data so we do not lose it
+        global $wpdb;
+        $ac_stored_row = $wpdb->get_row(
+        // phpcs:disable
+             $wpdb->prepare( 'SELECT id, wc_order_id, ac_externalcheckoutid, customer_email, abandoned_date, ac_customer_id
+                        FROM
+                            `' . $wpdb->prefix . ACTIVECAMPAIGN_FOR_WOOCOMMERCE_TABLE_NAME . '`
+                        WHERE wc_order_id = %s
+                            LIMIT 1',
+                $wc_order->get_id()
+            )
+        // phpcs:enable
+        );
+        if (isset( $ac_stored_row->ac_externalcheckoutid ) && ! empty( $ac_stored_row->ac_externalcheckoutid ) ) {
+            $wc_order->add_meta_data(
+                ACTIVECAMPAIGN_FOR_WOOCOMMERCE_PERSISTENT_CART_ID_NAME,
+                $ac_stored_row->ac_externalcheckoutid,
+                true
+            );
+        }
+        if ( ! empty( $ac_stored_row->abandoned_date ) ) {
+            $wc_order->add_meta_data(
+                'activecampaign_for_woocommerce_abandoned_date',
+                $ac_stored_row->abandoned_date,
+                false
+            );
+        }
+        $settings = get_option( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_SETTINGS_NAME );
+        if ( isset( $settings['disable_meta_save'] ) && 1 === $settings['disable_meta_save'] ) {
+            return;
+        }
+        $wc_order->save_meta_data();
+    }
+}

activecampaign-for-woocommerce/trunk/includes/orders/class-activecampaign-for-woocommerce-order-action-events.php

r3220303	r3232769
127	127	wp_schedule_single_event(
128	128	time() + 10,
129		'activecampaign_for_woocommerce_admin_sync_single_order_~~active~~',
	129	'activecampaign_for_woocommerce_admin_sync_single_order_status',
130	130	array(
131	131	'wc_order_id' => $order_id,

activecampaign-for-woocommerce/trunk/includes/orders/historical/class-activecampaign-for-woocommerce-historical-sync-prep.php

r3220303	r3232769
198	198	self::STATUS_ON_HOLD,
199	199	self::STATUS_REFUND,
	200	self::STATUS_ABANDONED_CART_RECOVERED,
200	201	)
201	202	);

activecampaign-for-woocommerce/trunk/includes/orders/trait-activecampaign-for-woocommerce-synced-status-handler.php

-                      r3220303
+                      r3232769
         ),
 => array(
             'title' => 'Abandoned cart recovered',
             'help'  => '',
+            'title' => 'Abandoned cart recovered, not synced',
+            'help'  => 'This order was abandoned, recovered, but has not been synced.',
         ),
 => array(
 …
     public function get_readable_sync_status( $status_ref ) {
+        $mappings = $this->readable_status_mapping;
+        $status_ref = (int) $status_ref;
+        $mappings   = $this->readable_status_mapping;
         foreach ( $mappings as $local_numeric => $readable ) {
             if ( $status_ref == $local_numeric ) {
+            if ( $status_ref === $local_numeric ) {
                 return $readable;
+            }

activecampaign-for-woocommerce/trunk/includes/subscriptions/class-activecampaign-for-woocommerce-new-subscription-sync-job.php

-                      r3220303
+                      r3232769
         if ( isset( $wc_order_id ) && ! empty( $wc_order_id ) ) {
             $this->execute( array( 'wc_order_id' => $wc_order_id ) );
+            return $args;
         } else {
             return false;
 …
             $wc_subscription->add_meta_data( 'ac_datahash', md5( json_encode( $wc_subscription->get_data() ) ), true );
+        }
+        $disable_meta_save = false;
+        $settings          = get_option( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_SETTINGS_NAME );
+        if ( isset( $settings['disable_meta_save'] ) ) {
+            $disable_meta_save = $settings['disable_meta_save'];
+        }
+        if ( false === $disable_meta_save ) {
+            $wc_subscription->save_meta_data();
+        }
+        $settings = get_option( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_DB_SETTINGS_NAME );
+        if ( isset( $settings['disable_meta_save'] ) && 1 === $settings['disable_meta_save'] ) {
+            return;
+        }
+        $wc_subscription->save_meta_data();
+    }
+}

activecampaign-for-woocommerce/trunk/includes/subscriptions/class-activecampaign-for-woocommerce-subscription-events.php

-                      r3220303
+                      r3232769
             if ( isset( $subscription_id ) && null !== $subscription_id && ! empty( $subscription_id ) ) {
                 if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'wc_order_id' => $subscription_id ) ) ) {
+                if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'wc_order_id' => $subscription_id, 'event' => 'onetime' ) ) ) {
                     wp_schedule_single_event(
                         time() + 30,
                         'activecampaign_for_woocommerce_update_subscription',
+                        array( 'wc_order_id' => $subscription_id )
+                        array( 'wc_order_id' => $subscription_id, 'event' => 'onetime' ),
+                        true
                     );
+                }
 …
             $this->update_status( $wc_subscription, 0 );
             if ( isset( $subscription_id ) && null !== $subscription_id && ! empty( $subscription_id ) ) {
                 if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'wc_order_id' => $subscription_id ) ) ) {
+                if ( ! wp_get_scheduled_event( ACTIVECAMPAIGN_FOR_WOOCOMMERCE_RUN_NEW_ORDER_SYNC_NAME, array( 'wc_order_id' => $subscription_id, 'event' => 'onetime' ) ) ) {
                     wp_schedule_single_event(
                         time() + 30,
                         'activecampaign_for_woocommerce_update_subscription',
+                        array( 'wc_order_id' => $subscription_id )
+                        array( 'wc_order_id' => $subscription_id, 'event' => 'onetime' ),
+                        true
                     );
+                }

activecampaign-for-woocommerce/trunk/includes/traits/class-activecampaign-for-woocommerce-interacts-with-api-trait.php

r3220303	r3232769
64	64
65	65	if ( ! is_object( $result ) \|\| ! self::validate_object( $result, 'getBody' ) ) {
66		$logger->debug(
	66	$logger->debug_excess(
67	67	'Result of get and set model from get_and_set_model_properties_from_api_by_id',
68	68	array(

Context Navigation

Legend:

Download in other formats: