Flexible Shipping for WooCommerce - Version 3.3.11

Version Description

  • 2019-05-06 =
  • Fixed chance for exception when using woocommerce logger
Download this release

Release Info

Developer jablonowski
Plugin Icon 128x128 Flexible Shipping for WooCommerce
Version 3.3.11
Comparing to
See all releases

Code changes from version 3.3.10 to 3.3.11

Files changed (10) hide show
  1. composer.lock +6 -6
  2. flexible-shipping.php +3 -3
  3. readme.txt +4 -1
  4. vendor/autoload.php +1 -1
  5. vendor/composer/autoload_real.php +7 -7
  6. vendor/composer/autoload_static.php +4 -4
  7. vendor/composer/installed.json +6 -6
  8. vendor/wpdesk/wp-logs/CHANGELOG.md +4 -0
  9. vendor/wpdesk/wp-logs/src/WC/WooCommerceMonologPlugin.php +1 -1
  10. vendor/wpdesk/wp-logs/src/WPDeskLoggerFactory.php +3 -2
composer.lock CHANGED
@@ -4,7 +4,7 @@
4
  "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5
  "This file is @generated automatically"
6
  ],
7
- "content-hash": "d1b2adf4dbe1a2073fcdc5aa934f3696",
8
  "packages": [
9
  {
10
  "name": "moneyphp/money",
@@ -416,16 +416,16 @@
416
  },
417
  {
418
  "name": "wpdesk/wp-logs",
419
- "version": "1.5.3",
420
  "source": {
421
  "type": "git",
422
  "url": "https://gitlab.com/wpdesk/wp-logs.git",
423
- "reference": "59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4"
424
  },
425
  "dist": {
426
  "type": "zip",
427
- "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-logs/repository/archive.zip?sha=59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4",
428
- "reference": "59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4",
429
  "shasum": ""
430
  },
431
  "require": {
@@ -456,7 +456,7 @@
456
  "email": "krzysiek@wpdesk.pl"
457
  }
458
  ],
459
- "time": "2019-04-26T08:01:19+00:00"
460
  },
461
  {
462
  "name": "wpdesk/wp-mutex",
4
  "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5
  "This file is @generated automatically"
6
  ],
7
+ "content-hash": "02fb3d3e03cb1d0744240b03086799aa",
8
  "packages": [
9
  {
10
  "name": "moneyphp/money",
416
  },
417
  {
418
  "name": "wpdesk/wp-logs",
419
+ "version": "1.5.4",
420
  "source": {
421
  "type": "git",
422
  "url": "https://gitlab.com/wpdesk/wp-logs.git",
423
+ "reference": "5482c28a049e4500b985e5f5b54ed51a51d53c5c"
424
  },
425
  "dist": {
426
  "type": "zip",
427
+ "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-logs/repository/archive.zip?sha=5482c28a049e4500b985e5f5b54ed51a51d53c5c",
428
+ "reference": "5482c28a049e4500b985e5f5b54ed51a51d53c5c",
429
  "shasum": ""
430
  },
431
  "require": {
456
  "email": "krzysiek@wpdesk.pl"
457
  }
458
  ],
459
+ "time": "2019-05-06T14:12:11+00:00"
460
  },
461
  {
462
  "name": "wpdesk/wp-mutex",
flexible-shipping.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Flexible Shipping
4
  Plugin URI: https://wordpress.org/plugins/flexible-shipping/
5
  Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
6
- Version: 3.3.10
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
@@ -43,8 +43,8 @@ if ( ! class_exists( 'WPDesk_Basic_Requirement_Checker' ) ) {
43
  }
44
 
45
  /* THESE TWO VARIABLES CAN BE CHANGED AUTOMATICALLY */
46
- $plugin_version = '3.3.10';
47
- $plugin_release_timestamp = '2019-05-06 10:47';
48
 
49
  $plugin_name = 'Flexible Shipping';
50
  $plugin_class_name = 'Flexible_Shipping_Plugin';
3
  Plugin Name: Flexible Shipping
4
  Plugin URI: https://wordpress.org/plugins/flexible-shipping/
5
  Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
6
+ Version: 3.3.11
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
43
  }
44
 
45
  /* THESE TWO VARIABLES CAN BE CHANGED AUTOMATICALLY */
46
+ $plugin_version = '3.3.11';
47
+ $plugin_release_timestamp = '2019-05-06 15:25';
48
 
49
  $plugin_name = 'Flexible Shipping';
50
  $plugin_class_name = 'Flexible_Shipping_Plugin';
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://flexibleshipping.com/table-rate/
4
  Tags: table rate, table rate shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes
5
  Requires at least: 4.5
6
  Tested up to: 5.2
7
- Stable tag: 3.3.10
8
  Requires PHP: 5.6
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -175,6 +175,9 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
175
 
176
  == Changelog ==
177
 
 
 
 
178
  = 3.3.10 - 2019-05-06 =
179
  * Changed logs library to the newest version
180
 
4
  Tags: table rate, table rate shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes
5
  Requires at least: 4.5
6
  Tested up to: 5.2
7
+ Stable tag: 3.3.11
8
  Requires PHP: 5.6
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
175
 
176
  == Changelog ==
177
 
178
+ = 3.3.11 - 2019-05-06 =
179
+ * Fixed chance for exception when using woocommerce logger
180
+
181
  = 3.3.10 - 2019-05-06 =
182
  * Changed logs library to the newest version
183
 
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit20ac74c6d69c9bf367e4f0ccfca51876::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
- call_user_func(\Composer\Autoload\ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit7a97e7a0dcb93ac63527758aa965cbd5
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire7a97e7a0dcb93ac63527758aa965cbd5($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire7a97e7a0dcb93ac63527758aa965cbd5($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit20ac74c6d69c9bf367e4f0ccfca51876
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit20ac74c6d69c9bf367e4f0ccfca51876', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit20ac74c6d69c9bf367e4f0ccfca51876', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
+ call_user_func(\Composer\Autoload\ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
+ $includeFiles = Composer\Autoload\ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
+ composerRequire20ac74c6d69c9bf367e4f0ccfca51876($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
+ function composerRequire20ac74c6d69c9bf367e4f0ccfca51876($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5
8
  {
9
  public static $files = array (
10
  '0509b34a4bd7aebefeac629c9dc8a978' => __DIR__ . '/..' . '/wpdesk/wp-notice/src/WPDesk/notice-functions.php',
@@ -565,9 +565,9 @@ class ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5
565
  public static function getInitializer(ClassLoader $loader)
566
  {
567
  return \Closure::bind(function () use ($loader) {
568
- $loader->prefixLengthsPsr4 = ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5::$prefixLengthsPsr4;
569
- $loader->prefixDirsPsr4 = ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5::$prefixDirsPsr4;
570
- $loader->classMap = ComposerStaticInit7a97e7a0dcb93ac63527758aa965cbd5::$classMap;
571
 
572
  }, null, ClassLoader::class);
573
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876
8
  {
9
  public static $files = array (
10
  '0509b34a4bd7aebefeac629c9dc8a978' => __DIR__ . '/..' . '/wpdesk/wp-notice/src/WPDesk/notice-functions.php',
565
  public static function getInitializer(ClassLoader $loader)
566
  {
567
  return \Closure::bind(function () use ($loader) {
568
+ $loader->prefixLengthsPsr4 = ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876::$prefixLengthsPsr4;
569
+ $loader->prefixDirsPsr4 = ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876::$prefixDirsPsr4;
570
+ $loader->classMap = ComposerStaticInit20ac74c6d69c9bf367e4f0ccfca51876::$classMap;
571
 
572
  }, null, ClassLoader::class);
573
  }
vendor/composer/installed.json CHANGED
@@ -425,17 +425,17 @@
425
  },
426
  {
427
  "name": "wpdesk/wp-logs",
428
- "version": "1.5.3",
429
- "version_normalized": "1.5.3.0",
430
  "source": {
431
  "type": "git",
432
  "url": "https://gitlab.com/wpdesk/wp-logs.git",
433
- "reference": "59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4"
434
  },
435
  "dist": {
436
  "type": "zip",
437
- "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-logs/repository/archive.zip?sha=59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4",
438
- "reference": "59dd4a5a380bf1d2bb3a8ea7a98f20a4f7d857b4",
439
  "shasum": ""
440
  },
441
  "require": {
@@ -450,7 +450,7 @@
450
  "wimg/php-compatibility": "^8",
451
  "wp-coding-standards/wpcs": "^0.14.1"
452
  },
453
- "time": "2019-04-26T08:01:19+00:00",
454
  "type": "library",
455
  "installation-source": "dist",
456
  "autoload": {
425
  },
426
  {
427
  "name": "wpdesk/wp-logs",
428
+ "version": "1.5.4",
429
+ "version_normalized": "1.5.4.0",
430
  "source": {
431
  "type": "git",
432
  "url": "https://gitlab.com/wpdesk/wp-logs.git",
433
+ "reference": "5482c28a049e4500b985e5f5b54ed51a51d53c5c"
434
  },
435
  "dist": {
436
  "type": "zip",
437
+ "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-logs/repository/archive.zip?sha=5482c28a049e4500b985e5f5b54ed51a51d53c5c",
438
+ "reference": "5482c28a049e4500b985e5f5b54ed51a51d53c5c",
439
  "shasum": ""
440
  },
441
  "require": {
450
  "wimg/php-compatibility": "^8",
451
  "wp-coding-standards/wpcs": "^0.14.1"
452
  },
453
+ "time": "2019-05-06T14:12:11+00:00",
454
  "type": "library",
455
  "installation-source": "dist",
456
  "autoload": {
vendor/wpdesk/wp-logs/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
 
 
 
 
1
  ## [1.5.3] - 2019-04-25
2
  ### Fixed
3
  - Exception while trying to disable log
1
+ ## [1.5.4] - 2019-05-06
2
+ ### Fixed
3
+ - Exception: must be an instance of WC_Logger, instance of WPDesk\Logger\WC\WooCommerceMonologPlugin given
4
+
5
  ## [1.5.3] - 2019-04-25
6
  ### Fixed
7
  - Exception while trying to disable log
vendor/wpdesk/wp-logs/src/WC/WooCommerceMonologPlugin.php CHANGED
@@ -21,7 +21,7 @@ class WooCommerceMonologPlugin implements \WC_Logger_Interface
21
  /** @var \WC_Logger */
22
  private $originalWCLogger;
23
 
24
- public function __construct(Logger $monolog, \WC_Logger $originalLogger)
25
  {
26
  $this->monolog = $monolog;
27
  $this->originalWCLogger = $originalLogger;
21
  /** @var \WC_Logger */
22
  private $originalWCLogger;
23
 
24
+ public function __construct(Logger $monolog, \WC_Logger_Interface $originalLogger)
25
  {
26
  $this->monolog = $monolog;
27
  $this->originalWCLogger = $originalLogger;
vendor/wpdesk/wp-logs/src/WPDeskLoggerFactory.php CHANGED
@@ -69,7 +69,7 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
69
  * Assumptions:
70
  * - logger is actively working when 'wpdesk_helper_options' has 'debug_log' set to '1';
71
  * - fatal errors, exception and standard errors are recorded but in a transparent way;
72
- * - WooCommerce logger is captured and returns this logger;
73
  * - logs are still correctly written to WooCommerce subsystem in a transparent way;
74
  * - all recorded errors are written to WPDesk file.
75
  *
@@ -87,10 +87,11 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
87
  }
88
  $logger = $this->createLogger($name);
89
 
90
- $this->captureWooCommerce($logger);
91
  $this->appendMainLog($logger);
92
  if ($name !== self::DEFAULT_LOGGER_CHANNEL_NAME) {
93
  $this->appendFileLog($logger, $this->getFileName($name));
 
 
94
  }
95
 
96
  return $logger;
69
  * Assumptions:
70
  * - logger is actively working when 'wpdesk_helper_options' has 'debug_log' set to '1';
71
  * - fatal errors, exception and standard errors are recorded but in a transparent way;
72
+ * - WooCommerce logger is captured and returns this logger; That is true of default logger is instantiated.
73
  * - logs are still correctly written to WooCommerce subsystem in a transparent way;
74
  * - all recorded errors are written to WPDesk file.
75
  *
87
  }
88
  $logger = $this->createLogger($name);
89
 
 
90
  $this->appendMainLog($logger);
91
  if ($name !== self::DEFAULT_LOGGER_CHANNEL_NAME) {
92
  $this->appendFileLog($logger, $this->getFileName($name));
93
+ } else {
94
+ $this->captureWooCommerce($logger);
95
  }
96
 
97
  return $logger;