Changeset 3354771

Timestamp:

09/02/2025 01:56:00 PM (3 months ago)

Author:

neosinner

Message:

Release 5.14.1

Location:

mailpoet/trunk

Files:

• lang/mailpoet.pot (modified) (3 diffs)
• lib/API/JSON/v1/Premium.php (modified) (4 diffs)
• lib/Config/Installer.php (modified) (2 diffs)
• lib/Segments/SegmentSubscribersRepository.php (modified) (5 diffs)
• mailpoet.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

mailpoet/trunk/lang/mailpoet.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: MailPoet 5.14.0\n"
+"Project-Id-Version: MailPoet 5.14.1\n"
 "Report-Msgid-Bugs-To: http://support.mailpoet.com/\n"
 "Last-Translator: MailPoet i18n (https://www.transifex.com/organization/wysija)\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-08-25T19:08:16+00:00\n"
+"POT-Creation-Date: 2025-09-01T17:39:39+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
@@ -6957 +6957 @@
 msgstr ""
 
-#: lib/API/JSON/v1/Premium.php:45
-#: lib/API/JSON/v1/Premium.php:80
+#: lib/API/JSON/v1/Premium.php:46
+#: lib/API/JSON/v1/Premium.php:71
 msgid "Premium key is not valid."
 msgstr ""
 
-#: lib/API/JSON/v1/Premium.php:53
-#: lib/API/JSON/v1/Premium.php:72
+#: lib/API/JSON/v1/Premium.php:63
 msgid "Error when installing MailPoet Premium plugin."
 msgstr ""
 
-#: lib/API/JSON/v1/Premium.php:85
+#: lib/API/JSON/v1/Premium.php:76
 msgid "Error when activating MailPoet Premium plugin."
 msgstr ""

mailpoet/trunk/lib/API/JSON/v1/Premium.php

@@ -9 +9 @@
 use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Config\AccessControl;
+use MailPoet\Config\Installer;
 use MailPoet\Config\ServicesChecker;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoet\WPCOM\DotcomHelperFunctions;
-use WP_Error;
 
 class Premium extends APIEndpoint {
@@ -24 +24 @@
   ];
 
-  /** @var ServicesChecker */
-  private $servicesChecker;
+  private ServicesChecker $servicesChecker;
 
-  /** @var WPFunctions */
-  private $wp;
+  private WPFunctions $wp;
 
-  /** @var DotcomHelperFunctions */
-  private $dotcomHelperFunctions;
+  private DotcomHelperFunctions $dotcomHelperFunctions;
+
+  private Installer $premiumInstaller;
 
   public function __construct(
     ServicesChecker $servicesChecker,
     WPFunctions $wp,
-    DotcomHelperFunctions $dotcomHelperFunctions
+    DotcomHelperFunctions $dotcomHelperFunctions,
+    ?Installer $premiumInstaller = null
   ) {
     $this->servicesChecker = $servicesChecker;
     $this->wp = $wp;
     $this->dotcomHelperFunctions = $dotcomHelperFunctions;
+    $this->premiumInstaller = $premiumInstaller ?? new Installer(Installer::PREMIUM_PLUGIN_SLUG);
   }
 
@@ -48 +49 @@
       return $this->error(__('Premium key is not valid.', 'mailpoet'));
     }
-
-    $pluginInfo = $this->wp->pluginsApi('plugin_information', [
-      'slug' => self::PREMIUM_PLUGIN_SLUG,
-    ]);
-
-    if (!$pluginInfo || $pluginInfo instanceof WP_Error) {
-      return $this->error(__('Error when installing MailPoet Premium plugin.', 'mailpoet'));
-    }
-
-    $pluginInfo = (array)$pluginInfo;
 
     // If we are in Dotcom platform, we try to symlink the plugin instead of downloading it
@@ -71 +62 @@
     }
 
-    $result = $this->wp->installPlugin($pluginInfo['download_link']);
+    $result = $this->wp->installPlugin($this->premiumInstaller->generatePluginDownloadUrl());
     if ($result !== true) {
       return $this->error(__('Error when installing MailPoet Premium plugin.', 'mailpoet'));

mailpoet/trunk/lib/Config/Installer.php

@@ -34 +34 @@
   public function generatePluginDownloadUrl(): string {
     $premiumKey = $this->settings->get(Bridge::PREMIUM_KEY_SETTING_NAME);
-    return "https://release.mailpoet.com/downloads/mailpoet-premium/$premiumKey/latest/mailpoet-premium.zip";
+    $freeMinorVersion = self::getFreeMinorVersionZero();
+    return sprintf(
+      'https://release.mailpoet.com/downloads/mailpoet-premium/%s/%s/mailpoet-premium.zip',
+      rawurlencode((string)$premiumKey),
+      rawurlencode($freeMinorVersion)
+    );
   }
 
@@ -101 +106 @@
     return $api->getPluginInformation($this->slug);
   }
+
+  private static function getFreeMinorVersionZero(): string {
+    $version = defined('MAILPOET_VERSION') ? (string)MAILPOET_VERSION : '';
+    if ($version === '') {
+      return 'latest';
+    }
+
+    $parts = explode('.', $version);
+    $major = $parts[0] ?? '0';
+    $minor = $parts[1] ?? '0';
+    return $major . '.' . $minor . '.0';
+  }
 }

mailpoet/trunk/lib/Segments/SegmentSubscribersRepository.php

@@ -12 +12 @@
 use MailPoet\Entities\SubscriberSegmentEntity;
 use MailPoet\InvalidStateException;
+use MailPoet\Logging\LoggerFactory;
 use MailPoet\NotFoundException;
 use MailPoet\Segments\DynamicSegments\Exceptions\InvalidFilterException;
@@ -128 +129 @@
     $queryBuilder = $this->filterSubscribersInDynamicSegment($queryBuilder, $segment, null);
     $statement = $this->executeQuery($queryBuilder);
-    /** @var array{all:string} $result */
     $result = $statement->fetch();
+
+    if (!is_array($result)) {
+      $result = $this->logErrorAndReturnEmptyResult(null, $queryBuilder, $result);
+    }
+
     return (int)$result['all'];
   }
@@ -327 +332 @@
     $result = $statement->fetch();
 
-    return $result;
+    if (is_array($result)) {
+      return $result;
+    }
+
+    return $this->logErrorAndReturnEmptyResult(null, $queryBuilder, $result);
   }
 
@@ -480 +489 @@
 
     $statement = $this->executeQuery($queryBuilder);
-    return $statement->fetch();
+    $result = $statement->fetch();
+    if (is_array($result)) {
+      return $result;
+    }
+
+    return $this->logErrorAndReturnEmptyResult($segment, $queryBuilder, $result);
   }
 
@@ -492 +506 @@
 
     $statement = $this->executeQuery($queryBuilder);
-    return $statement->fetch();
+    $result = $statement->fetch();
+    if (is_array($result)) {
+      return $result;
+    }
+
+    return $this->logErrorAndReturnEmptyResult($segment, $queryBuilder, $result);
+  }
+
+  /**
+   * @param null|SegmentEntity $segment
+   * @param QueryBuilder $queryBuilder
+   * @param mixed $result
+   * @return int[]
+   */
+  private function logErrorAndReturnEmptyResult(?SegmentEntity $segment, QueryBuilder $queryBuilder, $result): array {
+    $logger = LoggerFactory::getInstance()->getLogger(LoggerFactory::TOPIC_SEGMENTS);
+    $logger->error('Invalid result for segment statistics count', [
+      'segment_id' => $segment ? $segment->getId() : null,
+      'result' => $result,
+      'query' => $queryBuilder->getSQL(),
+    ]);
+
+    return [
+      'all' => 0,
+      'trash' => 0,
+      'subscribed' => 0,
+      'unsubscribed' => 0,
+      'inactive' => 0,
+      'unconfirmed' => 0,
+      'bounced' => 0,
+    ];
   }
 }

mailpoet/trunk/mailpoet.php

@@ -6 +6 @@
 /*
  * Plugin Name: MailPoet
- * Version: 5.14.0
+ * Version: 5.14.1
  * Plugin URI: https://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
@@ -24 +24 @@
 
 $mailpoetPlugin = [
-  'version' => '5.14.0',
+  'version' => '5.14.1',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),

mailpoet/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 6.7
 Tested up to: 6.8
-Stable tag: 5.14.0
+Stable tag: 5.14.1
 Requires PHP: 7.4
 License: GPLv3
@@ -228 +228 @@
 == Changelog ==
 
-= 5.14.0 - 2025-08-25 =
-* Updated: Update the email editor version;
-* Fixed: Fix: license expiration notice was displayed only on the Plugins page; it now appears on all MailPoet admin pages;
-* Fixed: Fix the error "Call to a member function format on null"..
+= 5.14.1 - 2025-09-01 =
+* Improved: Use specific version when downloading premium plugin.
 
 [See the changelog for all versions.](https://github.com/mailpoet/mailpoet/blob/trunk/mailpoet/changelog.txt)

mailpoet/trunk/vendor/composer/installed.php

@@ -6 +6 @@
  'pretty_version' => 'dev-trunk',
  'version' => 'dev-trunk',
- 'reference' => '38d0fc05e6d78c2a372e689d7358021e834ddf69',
+ 'reference' => 'aedf8f4c5c21ce058e3fe283df12b423a801acd7',
  'type' => 'library',
  'install_path' => __DIR__ . '/../../',
@@ -16 +16 @@
  'pretty_version' => 'dev-trunk',
  'version' => 'dev-trunk',
- 'reference' => '38d0fc05e6d78c2a372e689d7358021e834ddf69',
+ 'reference' => 'aedf8f4c5c21ce058e3fe283df12b423a801acd7',
  'type' => 'library',
  'install_path' => __DIR__ . '/../../',