WordPress.org
Get WordPress

Plugin Directory

Changeset 3246408


Ignore:
Timestamp:
02/25/2025 11:42:18 AM (13 months ago)
Author:
dotMailer
Message:

Updating trunk for version 1.4.5

Location:
dotdigital-for-woocommerce/trunk/vendor
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • dotdigital-for-woocommerce/trunk/vendor/composer/InstalledVersions.php

    r3173706 r3246408  
    3131    private static $installed;
    3232    /**
     33     * @var bool
     34     */
     35    private static $installedIsLocalDir;
     36    /**
    3337     * @var bool|null
    3438     */
    … …  
    270274        self::$installed = $data;
    271275        self::$installedByVendor = array();
     276        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
     277        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
     278        // so we have to assume it does not, and that may result in duplicate data being returned when listing
     279        // all installed packages for example
     280        self::$installedIsLocalDir = \false;
    272281    }
    273282    /**
    … …  
    281290        }
    282291        $installed = array();
     292        $copiedLocalDir = \false;
    283293        if (self::$canGetVendors) {
     294            $selfDir = strtr(__DIR__, '\\', '/');
    284295            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
     296                $vendorDir = strtr($vendorDir, '\\', '/');
    285297                if (isset(self::$installedByVendor[$vendorDir])) {
    286298                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    288300                    /** @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 */
    289301                    $required = require $vendorDir . '/composer/installed.php';
    290                     $installed[] = self::$installedByVendor[$vendorDir] = $required;
    291                     if (null === self::$installed && strtr($vendorDir . '/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
    292                         self::$installed = $installed[count($installed) - 1];
     302                    self::$installedByVendor[$vendorDir] = $required;
     303                    $installed[] = $required;
     304                    if (self::$installed === null && $vendorDir . '/composer' === $selfDir) {
     305                        self::$installed = $required;
     306                        self::$installedIsLocalDir = \true;
    293307                    }
     308                }
     309                if (self::$installedIsLocalDir && $vendorDir . '/composer' === $selfDir) {
     310                    $copiedLocalDir = \true;
    294311                }
    295312            }
    … …  
    306323            }
    307324        }
    308         if (self::$installed !== array()) {
     325        if (self::$installed !== array() && !$copiedLocalDir) {
    309326            $installed[] = self::$installed;
    310327        }

  • dotdigital-for-woocommerce/trunk/vendor/scoper-autoload.php

    r3173706 r3246408  
    3131}
    3232humbug_phpscoper_expose_class('ComposerAutoloaderInit4428d88a89890c368aa4fc3f77bebc6b', 'Dotdigital_Woo_Vendor\ComposerAutoloaderInit4428d88a89890c368aa4fc3f77bebc6b');
     33humbug_phpscoper_expose_class('JsonException', 'Dotdigital_Woo_Vendor\JsonException');
     34humbug_phpscoper_expose_class('ValueError', 'Dotdigital_Woo_Vendor\ValueError');
     35humbug_phpscoper_expose_class('PhpToken', 'Dotdigital_Woo_Vendor\PhpToken');
     36humbug_phpscoper_expose_class('Stringable', 'Dotdigital_Woo_Vendor\Stringable');
     37humbug_phpscoper_expose_class('Attribute', 'Dotdigital_Woo_Vendor\Attribute');
    3338humbug_phpscoper_expose_class('UnhandledMatchError', 'Dotdigital_Woo_Vendor\UnhandledMatchError');
    34 humbug_phpscoper_expose_class('ValueError', 'Dotdigital_Woo_Vendor\ValueError');
    35 humbug_phpscoper_expose_class('Stringable', 'Dotdigital_Woo_Vendor\Stringable');
    36 humbug_phpscoper_expose_class('PhpToken', 'Dotdigital_Woo_Vendor\PhpToken');
    37 humbug_phpscoper_expose_class('Attribute', 'Dotdigital_Woo_Vendor\Attribute');
    38 humbug_phpscoper_expose_class('JsonException', 'Dotdigital_Woo_Vendor\JsonException');
    3939
    4040// Function aliases. For more information see:
Note: See TracChangeset for help on using the changeset viewer.