WordPress.org
Get WordPress

Plugin Directory

Changeset 2890325


Ignore:
Timestamp:
03/30/2023 01:42:09 PM (3 years ago)
Author:
ownerrez
Message:

Update to version 1.1.17 from GitHub

Location:
ownerrez
Files:
20 edited
1 copied

Legend:

Unmodified
Added
Removed

  • ownerrez/tags/1.1.17/admin/class-ownerrez-admin.php

    r2455543 r2890325  
    100100    {
    101101        // Get the options that were sent
    102         $apiRoot = !empty($_POST["ownerrez_apiRoot"]) ? esc_url_raw($_POST["ownerrez_apiRoot"], ["http", "https"]) : self::DEFAULT_API_ROOT;
     102        $apiRoot = !empty($_POST["ownerrez_apiRoot"]) ? esc_url_raw($_POST["ownerrez_apiRoot"], ["http", "https"]) : self::DEFAULT_API_ROOT;
    103103        $username = !empty($_POST["ownerrez_username"]) ? sanitize_email($_POST["ownerrez_username"]) : NULL;
    104104        $token = !empty($_POST["ownerrez_token"]) ? sanitize_text_field($_POST["ownerrez_token"]) : NULL;
    … …  
    110110            $webhookToken = wp_generate_password(20, false);
    111111
    112         try {
    113             // test creds
    114             $client = new OwnerRez\Api\Client($username, $token, $apiRoot);
    115             $result = json_decode($client->externalSites()->register($webhookUrl, $webhookToken));
     112        try {
     113                // test creds
     114                $client = new OwnerRez\Api\Client($username, $token, $apiRoot);
     115                $result = json_decode($client->externalSites()->register($webhookUrl, $webhookToken));
    116116
    117             if (isset($result->id)) {
    118                 // save creds
    119                 update_option("ownerrez_apiRoot", $apiRoot, true);
    120                 update_option("ownerrez_username", $username, true);
    121                 update_option("ownerrez_token", $token, true);
    122                 update_option("ownerrez_externalSiteId", $result->id, true);
    123                 update_option("ownerrez_externalSiteName", $result->name, true);
    124                 update_option("ownerrez_webhookToken", $webhookToken, true);
     117                if (isset($result->id)) {
     118                        // save creds
     119                        update_option("ownerrez_apiRoot", $apiRoot, true);
     120                        update_option("ownerrez_username", $username, true);
     121                        update_option("ownerrez_token", $token, true);
     122                        update_option("ownerrez_externalSiteId", $result->id, true);
     123                        update_option("ownerrez_externalSiteName", $result->name, true);
     124                        update_option("ownerrez_webhookToken", $webhookToken, true);
    125125
    126                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=success");
    127                 exit;
    128             } else {
    129                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
    130                 exit;
    131             }
    132         }
    133         catch (Exception $ex)
    134         {
    135             if (WP_DEBUG === true) {
    136                 echo $ex->getMessage();
    137             }
    138             else {
    139                 error_log($ex->getMessage());
    140                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
    141             }
     126                        header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=success");
     127                        exit;
     128                } else {
     129                        header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
     130                        exit;
     131                }
     132        }
     133        catch (GuzzleHttp\Exception\ClientException | GuzzleHttp\Exception\ServerException $ex)
     134        {
     135            if ($ex->hasResponse())
     136            {
     137                $response = $ex->getResponse();
    142138
    143             exit;
    144         }
     139                if ($response->getStatusCode() == 403)
     140                {
     141                    $this->handleException($ex, "connection-blocked");
     142                }
     143                else
     144                {
     145                    $error = json_decode($response->getBody()->getContents());
     146
     147                    if (isset($error->messages))
     148                        $this->handleException($ex, $error->messages[0]);
     149                    else
     150                        $this->handleException($ex, "connection-failure");
     151                }
     152            }
     153            else
     154                $this->handleException($ex, "connection-failure");
     155        }
     156        catch (Exception $ex)
     157        {
     158            $this->handleException($ex, "connection-failure");
     159        }
    145160    }
    146161
    147     public function plugin_links($links)
    148     {
    149         $url = esc_url( add_query_arg('page', 'ownerrez', get_admin_url() . 'admin.php') );
     162    private function handleException($ex, $statusMessage)
     163    {
     164        if (WP_DEBUG === true) {
     165            echo $ex->getMessage();
     166        }
     167        else {
     168                error_log($ex->getMessage());
     169                header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=" . $statusMessage);
     170        }
    150171
    151         // Create the link.
    152         $settings_link = "<a href='$url'>" . __( 'Settings' ) . "</a>";
     172        exit;
     173    }
    153174
    154         // Adds the link to the end of the array.
    155         array_push(
    156             $links,
    157             $settings_link
    158         );
     175    public function plugin_links($links)
     176    {
     177            $url = esc_url( add_query_arg('page', 'ownerrez', get_admin_url() . 'admin.php') );
    159178
    160         return $links;
    161     }
     179            // Create the link.
     180            $settings_link = "<a href='$url'>" . __( 'Settings' ) . "</a>";
     181
     182            // Adds the link to the end of the array.
     183            array_push(
     184                    $links,
     185                    $settings_link
     186            );
     187
     188            return $links;
     189    }
    162190}

  • ownerrez/tags/1.1.17/admin/partials/ownerrez-admin-display.php

    r2455543 r2890325  
    3232
    3333            <div class="notice notice-error is-dismissible">
    34                 <p><strong><?php _e("We were unable to establish a connection with the username and access token provided. Please ensure the values you entered are correct, and that the Hosted Sites premium feature has been enabled on your account.", "ownerrez"); ?></strong></p>
     34                <p><strong><?php _e("We were unable to establish a connection with the username and access token provided. Please ensure the values you entered are correct, and that the WordPress premium feature has been enabled on your account.", "ownerrez"); ?></strong></p>
     35                <button type="button" class="notice-dismiss">
     36                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>
     37                </button>
     38            </div>
     39
     40        <?php } else if ($status == "connection-blocked") { ?>
     41
     42            <div class="notice notice-error is-dismissible">
     43                <p><strong><?php _e("We were unable to establish a connection. Your WordPress host server IP address is blocked. Please add your host server IP address to the allow list under Developer / API settings.", "ownerrez"); ?></strong></p>
     44                <button type="button" class="notice-dismiss">
     45                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>
     46                </button>
     47            </div>
     48
     49        <?php } else if ($status != null) { ?>
     50
     51            <div class="notice notice-error is-dismissible">
     52                <p><strong><?php _e("We were unable to establish a connection. " . $status, "ownerrez"); ?></strong></p>
    3553                <button type="button" class="notice-dismiss">
    3654                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>

  • ownerrez/tags/1.1.17/lib/autoload.php

    r2851893 r2890325  
    2323require_once __DIR__ . '/composer/autoload_real.php';
    2424
    25 return ComposerAutoloaderInit79e476a467056a248099c5a353c5e009::getLoader();
     25return ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e::getLoader();

  • ownerrez/tags/1.1.17/lib/composer/ClassLoader.php

    r2846829 r2890325  
    430430    {
    431431        if ($file = $this->findFile($class)) {
    432             (self::$includeFile)($file);
     432            $includeFile = self::$includeFile;
     433            $includeFile($file);
    433434
    434435            return true;
    … …  
    561562    }
    562563
    563     private static function initializeIncludeClosure(): void
     564    /**
     565     * @return void
     566     */
     567    private static function initializeIncludeClosure()
    564568    {
    565569        if (self::$includeFile !== null) {
    … …  
    575579         * @return void
    576580         */
    577         self::$includeFile = static function($file) {
     581        self::$includeFile = \Closure::bind(static function($file) {
    578582            include $file;
    579         };
     583        }, null, null);
    580584    }
    581585}

  • ownerrez/tags/1.1.17/lib/composer/InstalledVersions.php

    r2753806 r2890325  
    9999        foreach (self::getInstalled() as $installed) {
    100100            if (isset($installed['versions'][$packageName])) {
    101                 return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
     101                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
    102102            }
    103103        }
    … …  
    120120    public static function satisfies(VersionParser $parser, $packageName, $constraint)
    121121    {
    122         $constraint = $parser->parseConstraints($constraint);
     122        $constraint = $parser->parseConstraints((string) $constraint);
    123123        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
    124124
    … …  
    329329                    $installed[] = self::$installedByVendor[$vendorDir];
    330330                } elseif (is_file($vendorDir.'/composer/installed.php')) {
    331                     $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
     331                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
     332                    $required = require $vendorDir.'/composer/installed.php';
     333                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
    332334                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
    333335                        self::$installed = $installed[count($installed) - 1];
    … …  
    341343            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
    342344            if (substr(__DIR__, -8, 1) !== 'C') {
    343                 self::$installed = require __DIR__ . '/installed.php';
     345                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
     346                $required = require __DIR__ . '/installed.php';
     347                self::$installed = $required;
    344348            } else {
    345349                self::$installed = array();
    346350            }
    347351        }
    348         $installed[] = self::$installed;
     352
     353        if (self::$installed !== array()) {
     354            $installed[] = self::$installed;
     355        }
    349356
    350357        return $installed;

  • ownerrez/tags/1.1.17/lib/composer/autoload_real.php

    r2851893 r2890325  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit79e476a467056a248099c5a353c5e009
     5class ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e
    66{
    77    private static $loader;
    … …  
    2525        require __DIR__ . '/platform_check.php';
    2626
    27         spl_autoload_register(array('ComposerAutoloaderInit79e476a467056a248099c5a353c5e009', 'loadClassLoader'), true, true);
     27        spl_autoload_register(array('ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e', 'loadClassLoader'), true, true);
    2828        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    29         spl_autoload_unregister(array('ComposerAutoloaderInit79e476a467056a248099c5a353c5e009', 'loadClassLoader'));
     29        spl_autoload_unregister(array('ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e', 'loadClassLoader'));
    3030
    3131        require __DIR__ . '/autoload_static.php';
    32         call_user_func(\Composer\Autoload\ComposerStaticInit79e476a467056a248099c5a353c5e009::getInitializer($loader));
     32        call_user_func(\Composer\Autoload\ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::getInitializer($loader));
    3333
    3434        $loader->register(true);
    3535
    36         $filesToLoad = \Composer\Autoload\ComposerStaticInit79e476a467056a248099c5a353c5e009::$files;
    37         $requireFile = static function ($fileIdentifier, $file) {
     36        $filesToLoad = \Composer\Autoload\ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$files;
     37        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
    3838            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
    3939                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
    … …  
    4141                require $file;
    4242            }
    43         };
     43        }, null, null);
    4444        foreach ($filesToLoad as $fileIdentifier => $file) {
    45             ($requireFile)($fileIdentifier, $file);
     45            $requireFile($fileIdentifier, $file);
    4646        }
    4747

  • ownerrez/tags/1.1.17/lib/composer/autoload_static.php

    r2851893 r2890325  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit79e476a467056a248099c5a353c5e009
     7class ComposerStaticInitb125be2cd3762de7c7e979beb02b224e
    88{
    99    public static $files = array (
    … …  
    7676    {
    7777        return \Closure::bind(function () use ($loader) {
    78             $loader->prefixLengthsPsr4 = ComposerStaticInit79e476a467056a248099c5a353c5e009::$prefixLengthsPsr4;
    79             $loader->prefixDirsPsr4 = ComposerStaticInit79e476a467056a248099c5a353c5e009::$prefixDirsPsr4;
    80             $loader->classMap = ComposerStaticInit79e476a467056a248099c5a353c5e009::$classMap;
     78            $loader->prefixLengthsPsr4 = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$prefixLengthsPsr4;
     79            $loader->prefixDirsPsr4 = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$prefixDirsPsr4;
     80            $loader->classMap = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$classMap;
    8181
    8282        }, null, ClassLoader::class);

  • ownerrez/tags/1.1.17/ownerrez.php

    r2851893 r2890325  
    1717 * Plugin URI:        https://www.ownerreservations.com/support/wordpress
    1818 * Description:       The official WordPress plugin for the OwnerRez API.
    19  * Version:           1.1.15
     19 * Version:           1.1.17
    2020 * Author:            OwnerRez, Inc.
    2121 * Author URI:        https://www.ownerreservations.com/
    … …  
    3636 * Rename this for your plugin and update it as you release new versions.
    3737 */
    38 define('OWNERREZ_VERSION', '1.1.15');
     38define('OWNERREZ_VERSION', '1.1.17');
    3939
    4040/**

  • ownerrez/tags/1.1.17/public/class-ownerrez-shortcodes.php

    r2846829 r2890325  
    111111        elseif (array_key_exists("format", $additionalArgs))
    112112            return sprintf($additionalArgs["format"], $result);
     113        elseif (is_numeric($result))
     114            return $result;
    113115        else
    114116            return "[Unknown]";

  • ownerrez/tags/1.1.17/readme.txt

    r2851893 r2890325  
    33Tags:
    44Requires at least: 5.4
    5 Tested up to: 5.9.3
    6 Stable tag: 1.1.15
     5Tested up to: 6.0.0
     6Stable tag: 1.1.17
    77License: MIT
    88License URI: https://github.com/ownerrez/orez-wp/blob/master/LICENSE
    … …  
    3333
    3434== Changelog ==
     35= 1.1.17 =
     36- Render numeric shortcode values without a format using default format instead of "[Unknown]"
     37
     38= 1.1.16 =
     39- Provide clearer error messages during registration.
     40
    3541= 1.1.15 =
    3642- Handle external cache implementations.

  • ownerrez/trunk/admin/class-ownerrez-admin.php

    r2455543 r2890325  
    100100    {
    101101        // Get the options that were sent
    102         $apiRoot = !empty($_POST["ownerrez_apiRoot"]) ? esc_url_raw($_POST["ownerrez_apiRoot"], ["http", "https"]) : self::DEFAULT_API_ROOT;
     102        $apiRoot = !empty($_POST["ownerrez_apiRoot"]) ? esc_url_raw($_POST["ownerrez_apiRoot"], ["http", "https"]) : self::DEFAULT_API_ROOT;
    103103        $username = !empty($_POST["ownerrez_username"]) ? sanitize_email($_POST["ownerrez_username"]) : NULL;
    104104        $token = !empty($_POST["ownerrez_token"]) ? sanitize_text_field($_POST["ownerrez_token"]) : NULL;
    … …  
    110110            $webhookToken = wp_generate_password(20, false);
    111111
    112         try {
    113             // test creds
    114             $client = new OwnerRez\Api\Client($username, $token, $apiRoot);
    115             $result = json_decode($client->externalSites()->register($webhookUrl, $webhookToken));
     112        try {
     113                // test creds
     114                $client = new OwnerRez\Api\Client($username, $token, $apiRoot);
     115                $result = json_decode($client->externalSites()->register($webhookUrl, $webhookToken));
    116116
    117             if (isset($result->id)) {
    118                 // save creds
    119                 update_option("ownerrez_apiRoot", $apiRoot, true);
    120                 update_option("ownerrez_username", $username, true);
    121                 update_option("ownerrez_token", $token, true);
    122                 update_option("ownerrez_externalSiteId", $result->id, true);
    123                 update_option("ownerrez_externalSiteName", $result->name, true);
    124                 update_option("ownerrez_webhookToken", $webhookToken, true);
     117                if (isset($result->id)) {
     118                        // save creds
     119                        update_option("ownerrez_apiRoot", $apiRoot, true);
     120                        update_option("ownerrez_username", $username, true);
     121                        update_option("ownerrez_token", $token, true);
     122                        update_option("ownerrez_externalSiteId", $result->id, true);
     123                        update_option("ownerrez_externalSiteName", $result->name, true);
     124                        update_option("ownerrez_webhookToken", $webhookToken, true);
    125125
    126                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=success");
    127                 exit;
    128             } else {
    129                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
    130                 exit;
    131             }
    132         }
    133         catch (Exception $ex)
    134         {
    135             if (WP_DEBUG === true) {
    136                 echo $ex->getMessage();
    137             }
    138             else {
    139                 error_log($ex->getMessage());
    140                 header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
    141             }
     126                        header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=success");
     127                        exit;
     128                } else {
     129                        header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=connection-failure");
     130                        exit;
     131                }
     132        }
     133        catch (GuzzleHttp\Exception\ClientException | GuzzleHttp\Exception\ServerException $ex)
     134        {
     135            if ($ex->hasResponse())
     136            {
     137                $response = $ex->getResponse();
    142138
    143             exit;
    144         }
     139                if ($response->getStatusCode() == 403)
     140                {
     141                    $this->handleException($ex, "connection-blocked");
     142                }
     143                else
     144                {
     145                    $error = json_decode($response->getBody()->getContents());
     146
     147                    if (isset($error->messages))
     148                        $this->handleException($ex, $error->messages[0]);
     149                    else
     150                        $this->handleException($ex, "connection-failure");
     151                }
     152            }
     153            else
     154                $this->handleException($ex, "connection-failure");
     155        }
     156        catch (Exception $ex)
     157        {
     158            $this->handleException($ex, "connection-failure");
     159        }
    145160    }
    146161
    147     public function plugin_links($links)
    148     {
    149         $url = esc_url( add_query_arg('page', 'ownerrez', get_admin_url() . 'admin.php') );
     162    private function handleException($ex, $statusMessage)
     163    {
     164        if (WP_DEBUG === true) {
     165            echo $ex->getMessage();
     166        }
     167        else {
     168                error_log($ex->getMessage());
     169                header("Location: " . get_bloginfo("url") . "/wp-admin/options-general.php?page=ownerrez&status=" . $statusMessage);
     170        }
    150171
    151         // Create the link.
    152         $settings_link = "<a href='$url'>" . __( 'Settings' ) . "</a>";
     172        exit;
     173    }
    153174
    154         // Adds the link to the end of the array.
    155         array_push(
    156             $links,
    157             $settings_link
    158         );
     175    public function plugin_links($links)
     176    {
     177            $url = esc_url( add_query_arg('page', 'ownerrez', get_admin_url() . 'admin.php') );
    159178
    160         return $links;
    161     }
     179            // Create the link.
     180            $settings_link = "<a href='$url'>" . __( 'Settings' ) . "</a>";
     181
     182            // Adds the link to the end of the array.
     183            array_push(
     184                    $links,
     185                    $settings_link
     186            );
     187
     188            return $links;
     189    }
    162190}

  • ownerrez/trunk/admin/partials/ownerrez-admin-display.php

    r2455543 r2890325  
    3232
    3333            <div class="notice notice-error is-dismissible">
    34                 <p><strong><?php _e("We were unable to establish a connection with the username and access token provided. Please ensure the values you entered are correct, and that the Hosted Sites premium feature has been enabled on your account.", "ownerrez"); ?></strong></p>
     34                <p><strong><?php _e("We were unable to establish a connection with the username and access token provided. Please ensure the values you entered are correct, and that the WordPress premium feature has been enabled on your account.", "ownerrez"); ?></strong></p>
     35                <button type="button" class="notice-dismiss">
     36                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>
     37                </button>
     38            </div>
     39
     40        <?php } else if ($status == "connection-blocked") { ?>
     41
     42            <div class="notice notice-error is-dismissible">
     43                <p><strong><?php _e("We were unable to establish a connection. Your WordPress host server IP address is blocked. Please add your host server IP address to the allow list under Developer / API settings.", "ownerrez"); ?></strong></p>
     44                <button type="button" class="notice-dismiss">
     45                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>
     46                </button>
     47            </div>
     48
     49        <?php } else if ($status != null) { ?>
     50
     51            <div class="notice notice-error is-dismissible">
     52                <p><strong><?php _e("We were unable to establish a connection. " . $status, "ownerrez"); ?></strong></p>
    3553                <button type="button" class="notice-dismiss">
    3654                    <span class="screen-reader-text"><?php _e("Dismiss this notice.", "ownerrez"); ?></span>

  • ownerrez/trunk/lib/autoload.php

    r2851893 r2890325  
    2323require_once __DIR__ . '/composer/autoload_real.php';
    2424
    25 return ComposerAutoloaderInit79e476a467056a248099c5a353c5e009::getLoader();
     25return ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e::getLoader();

  • ownerrez/trunk/lib/composer/ClassLoader.php

    r2846829 r2890325  
    430430    {
    431431        if ($file = $this->findFile($class)) {
    432             (self::$includeFile)($file);
     432            $includeFile = self::$includeFile;
     433            $includeFile($file);
    433434
    434435            return true;
    … …  
    561562    }
    562563
    563     private static function initializeIncludeClosure(): void
     564    /**
     565     * @return void
     566     */
     567    private static function initializeIncludeClosure()
    564568    {
    565569        if (self::$includeFile !== null) {
    … …  
    575579         * @return void
    576580         */
    577         self::$includeFile = static function($file) {
     581        self::$includeFile = \Closure::bind(static function($file) {
    578582            include $file;
    579         };
     583        }, null, null);
    580584    }
    581585}

  • ownerrez/trunk/lib/composer/InstalledVersions.php

    r2753806 r2890325  
    9999        foreach (self::getInstalled() as $installed) {
    100100            if (isset($installed['versions'][$packageName])) {
    101                 return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
     101                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
    102102            }
    103103        }
    … …  
    120120    public static function satisfies(VersionParser $parser, $packageName, $constraint)
    121121    {
    122         $constraint = $parser->parseConstraints($constraint);
     122        $constraint = $parser->parseConstraints((string) $constraint);
    123123        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
    124124
    … …  
    329329                    $installed[] = self::$installedByVendor[$vendorDir];
    330330                } elseif (is_file($vendorDir.'/composer/installed.php')) {
    331                     $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
     331                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
     332                    $required = require $vendorDir.'/composer/installed.php';
     333                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
    332334                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
    333335                        self::$installed = $installed[count($installed) - 1];
    … …  
    341343            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
    342344            if (substr(__DIR__, -8, 1) !== 'C') {
    343                 self::$installed = require __DIR__ . '/installed.php';
     345                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
     346                $required = require __DIR__ . '/installed.php';
     347                self::$installed = $required;
    344348            } else {
    345349                self::$installed = array();
    346350            }
    347351        }
    348         $installed[] = self::$installed;
     352
     353        if (self::$installed !== array()) {
     354            $installed[] = self::$installed;
     355        }
    349356
    350357        return $installed;

  • ownerrez/trunk/lib/composer/autoload_real.php

    r2851893 r2890325  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit79e476a467056a248099c5a353c5e009
     5class ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e
    66{
    77    private static $loader;
    … …  
    2525        require __DIR__ . '/platform_check.php';
    2626
    27         spl_autoload_register(array('ComposerAutoloaderInit79e476a467056a248099c5a353c5e009', 'loadClassLoader'), true, true);
     27        spl_autoload_register(array('ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e', 'loadClassLoader'), true, true);
    2828        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    29         spl_autoload_unregister(array('ComposerAutoloaderInit79e476a467056a248099c5a353c5e009', 'loadClassLoader'));
     29        spl_autoload_unregister(array('ComposerAutoloaderInitb125be2cd3762de7c7e979beb02b224e', 'loadClassLoader'));
    3030
    3131        require __DIR__ . '/autoload_static.php';
    32         call_user_func(\Composer\Autoload\ComposerStaticInit79e476a467056a248099c5a353c5e009::getInitializer($loader));
     32        call_user_func(\Composer\Autoload\ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::getInitializer($loader));
    3333
    3434        $loader->register(true);
    3535
    36         $filesToLoad = \Composer\Autoload\ComposerStaticInit79e476a467056a248099c5a353c5e009::$files;
    37         $requireFile = static function ($fileIdentifier, $file) {
     36        $filesToLoad = \Composer\Autoload\ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$files;
     37        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
    3838            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
    3939                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
    … …  
    4141                require $file;
    4242            }
    43         };
     43        }, null, null);
    4444        foreach ($filesToLoad as $fileIdentifier => $file) {
    45             ($requireFile)($fileIdentifier, $file);
     45            $requireFile($fileIdentifier, $file);
    4646        }
    4747

  • ownerrez/trunk/lib/composer/autoload_static.php

    r2851893 r2890325  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit79e476a467056a248099c5a353c5e009
     7class ComposerStaticInitb125be2cd3762de7c7e979beb02b224e
    88{
    99    public static $files = array (
    … …  
    7676    {
    7777        return \Closure::bind(function () use ($loader) {
    78             $loader->prefixLengthsPsr4 = ComposerStaticInit79e476a467056a248099c5a353c5e009::$prefixLengthsPsr4;
    79             $loader->prefixDirsPsr4 = ComposerStaticInit79e476a467056a248099c5a353c5e009::$prefixDirsPsr4;
    80             $loader->classMap = ComposerStaticInit79e476a467056a248099c5a353c5e009::$classMap;
     78            $loader->prefixLengthsPsr4 = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$prefixLengthsPsr4;
     79            $loader->prefixDirsPsr4 = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$prefixDirsPsr4;
     80            $loader->classMap = ComposerStaticInitb125be2cd3762de7c7e979beb02b224e::$classMap;
    8181
    8282        }, null, ClassLoader::class);

  • ownerrez/trunk/ownerrez.php

    r2851893 r2890325  
    1717 * Plugin URI:        https://www.ownerreservations.com/support/wordpress
    1818 * Description:       The official WordPress plugin for the OwnerRez API.
    19  * Version:           1.1.15
     19 * Version:           1.1.17
    2020 * Author:            OwnerRez, Inc.
    2121 * Author URI:        https://www.ownerreservations.com/
    … …  
    3636 * Rename this for your plugin and update it as you release new versions.
    3737 */
    38 define('OWNERREZ_VERSION', '1.1.15');
     38define('OWNERREZ_VERSION', '1.1.17');
    3939
    4040/**

  • ownerrez/trunk/public/class-ownerrez-shortcodes.php

    r2846829 r2890325  
    111111        elseif (array_key_exists("format", $additionalArgs))
    112112            return sprintf($additionalArgs["format"], $result);
     113        elseif (is_numeric($result))
     114            return $result;
    113115        else
    114116            return "[Unknown]";

  • ownerrez/trunk/readme.txt

    r2851893 r2890325  
    33Tags:
    44Requires at least: 5.4
    5 Tested up to: 5.9.3
    6 Stable tag: 1.1.15
     5Tested up to: 6.0.0
     6Stable tag: 1.1.17
    77License: MIT
    88License URI: https://github.com/ownerrez/orez-wp/blob/master/LICENSE
    … …  
    3333
    3434== Changelog ==
     35= 1.1.17 =
     36- Render numeric shortcode values without a format using default format instead of "[Unknown]"
     37
     38= 1.1.16 =
     39- Provide clearer error messages during registration.
     40
    3541= 1.1.15 =
    3642- Handle external cache implementations.
Note: See TracChangeset for help on using the changeset viewer.