Feature Enhancement: Buttons, PHP 8.1, and Check License Errors (#3)

Author: thefrosty

assets/js/licensemanager.js

@@ -3,7 +3,7 @@
   'use strict'
 
   $(document).ready(function () {
-    $('a[id^="EddSoftwareLicenseManagerButton"]:not(:disabled)').on('click', function (e) {
+    $('a[id^="EddSoftwareLicenseManagerButton"]:not(.disabled)').on('click', function (e) {
       e.preventDefault()
       const $this = $(this)
       const $element = $('input[name$="[' + $this.data('plugin_id') + ']"]')
@@ -27,10 +27,14 @@
           $('<img class="EddLicenseLoader" src="' + EddLicenseManager.loading + '" height="16" width="16">').insertAfter($this)
         },
         success: function (response) {
+          $('img[class="EddLicenseLoader"]').remove()
           if (typeof response.success !== 'undefined' && response.success) {
-            $this.closest('form').submit()
+            if ($this.data('action') === 'check_license') {
+              window.alert(response.data)
+              return
+            }
+            $('input#submit').trigger('click')
           }
-          $('img[class="EddLicenseLoader"]').remove()
         },
         fail: function (response) {
           $this.attr('disabled', false)

composer.json

@@ -18,13 +18,13 @@
     },
     "optimize-autoloader": true,
     "platform": {
-      "php": "8.0"
+      "php": "8.1"
     },
     "preferred-install": "dist",
     "sort-packages": true
   },
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "composer/installers": "~2.0",
     "dwnload/wp-settings-api": "^3.9",
     "thefrosty/wp-utilities": "^3.2"
@@ -35,11 +35,12 @@
     "phpcompatibility/php-compatibility": "^9.3",
     "phpunit/php-code-coverage": "^9",
     "phpunit/phpunit": "^9",
-    "roots/wordpress": "^6.4",
+    "roave/security-advisories": "dev-latest",
+    "roots/wordpress": "^6.7",
     "squizlabs/php_codesniffer": "^3.2",
-    "symfony/var-dumper": "^5.4 || ^6.2",
-    "wp-phpunit/wp-phpunit": "^6.3",
-    "yoast/phpunit-polyfills": "^2.0"
+    "symfony/var-dumper": "^6.4 || ^7.2",
+    "wp-phpunit/wp-phpunit": "^6.7",
+    "yoast/phpunit-polyfills": "^3.0 || ^4.0"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -57,7 +57,7 @@ public function buildSubmitButton(string $plugin_id, string $class, string $acti
         };
 
         \printf(
-            '<a href="javascript:;" id="EddSoftwareLicenseManagerButton_%3$s" class="button %2$s" data-action="%3$s" data-plugin_id="%5$s" data-status="%4$s">%1$s</a>',
+            '<a id="EddSoftwareLicenseManagerButton_%3$s" class="button %2$s" data-action="%3$s" data-plugin_id="%5$s" data-status="%4$s">%1$s</a>',
             $text,
             $class,
             $action,

src/Edd/AbstractLicenceManager.php

@@ -23,11 +23,8 @@ class CheckLicense extends LicenseStatus
     /** @var  int $site_count */
     private int $site_count;
 
-    /** @var  int $activations_left */
-    private int $activations_left;
-
-    /** @var int $price_id */
-    private int $price_id;
+    /** @var  int|string $activations_left */
+    private int|string $activations_left;
 
     /**
      * @param bool $success
@@ -94,34 +91,18 @@ public function getSiteCount(): int
     }
 
     /**
-     * @param int $activations_left
+     * @param int|string $activations_left
      */
-    public function setActivationsLeft(int $activations_left): void
+    public function setActivationsLeft(int|string $activations_left): void
     {
         $this->activations_left = $activations_left;
     }
 
     /**
      * @return int
      */
-    public function getActivationsLeft(): int
+    public function getActivationsLeft(): int|string
     {
         return $this->activations_left;
     }
-
-    /**
-     * @param mixed $price_id
-     */
-    public function setPriceId(int $price_id): void
-    {
-        $this->price_id = $price_id;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getPriceId(): int
-    {
-        return $this->price_id;
-    }
 }

src/Edd/Models/CheckLicense.php

@@ -23,6 +23,7 @@ abstract class LicenseStatus extends BaseModel
     public const LICENSE_FAILED = 'inactive';
     public const LICENSE_INACTIVE = 'inactive';
     public const LICENSE_INVALID = 'invalid';
+    public const LICENSE_VALID = 'valid';
     public const LICENSE_CHECK_LICENSE = 'check_license';
     public const LICENSE_SITE_INACTIVE = 'site_inactive';
 

src/Edd/Models/LicenseStatus.php

@@ -11,48 +11,53 @@
     wp_die();
 }
 
-if (!isset($plugin_id) || !isset($section_id)) {
+if (!isset($plugin_id, $section_id)) {
     return;
 }
 $license_key = Options::getOption($plugin_id, $section_id);
 $license_data = get_option(AbstractLicenceManager::LICENSE_SETTING, []);
 $license_expires = $license_data[$plugin_id]['expires'] ?? '';
 $license_status = $license_data[$plugin_id]['status'] ?? LicenseStatus::LICENSE_INACTIVE;
-
+$active_or_valid = in_array($license_status, [LicenseStatus::LICENSE_ACTIVE, LicenseStatus::LICENSE_VALID], true);
 ob_start();
 
 echo "<div class='EddSoftwareLicenseManager'>";
 printf('License Status: <span class="license-status %1$s">%1$s</span>', $license_status);
 if (!empty($license_expires)) {
     printf(
         ' &mdash; License Expires: <span class="license-expires">%1$s</span>',
-        date_i18n(get_option('date_format'), strtotime($license_expires))
+        $license_expires === 'lifetime' ?
+            'Never (lifetime)' :
+            date_i18n(get_option('date_format'), strtotime($license_expires))
     );
 }
 
 echo '<br><hr>';
 
-if (!empty($license_data) && $license_status === LicenseStatus::LICENSE_ACTIVE) {
-    $this->buildSubmitButton(
-        $plugin_id,
-        'button-primary',
-        LicenseStatus::LICENSE_DEACTIVATE,
-        $license_status,
-    );
+$this->buildSubmitButton(
+    $plugin_id,
+    'button-primary',
+    LicenseStatus::LICENSE_ACTIVATE,
+    $license_status
+);
+
+echo '&nbsp;&nbsp;';
+
+$this->buildSubmitButton(
+    $plugin_id,
+    $active_or_valid ? 'button-primary' : 'button-secondary disabled',
+    $license_status === LicenseStatus::LICENSE_DEACTIVATED ? LicenseStatus::LICENSE_ACTIVATE : LicenseStatus::LICENSE_DEACTIVATE,
+    $license_status,
+);
+
+if (!$active_or_valid) {
     echo '&nbsp;&nbsp;';
     $this->buildSubmitButton(
         $plugin_id,
         'button-secondary',
         LicenseStatus::LICENSE_CHECK_LICENSE,
         $license_status
     );
-} else {
-    $this->buildSubmitButton(
-        $plugin_id,
-        empty($license_key) ? 'button-primary disabled' : 'button-primary',
-        LicenseStatus::LICENSE_ACTIVATE,
-        $license_status
-    );
 }
 echo '</div>';