WordPress.org
Get WordPress

Plugin Directory

Changeset 3390351


Ignore:
Timestamp:
11/05/2025 11:13:05 AM (5 months ago)
Author:
sendcloudbv
Message:

Release version 1.0.19

Location:
sendcloud-connected-shipping
Files:
131 added
18 edited

Legend:

Unmodified
Added
Removed

  • sendcloud-connected-shipping/trunk/changelog.txt

    r3389705 r3390351  
    11*** WooCommerce Sendcloud | The all-in-one shipping platform Changelog ***
     2
     3= 2025-11-05 - version 1.0.19 =
     4* Fixed service point data now correctly clears when changing the shipping method from a service point option.
    25
    36= 2025-11-04 - version 1.0.18 =

  • sendcloud-connected-shipping/trunk/composer.lock

    r3389705 r3390351  
    1010    "aliases": [],
    1111    "minimum-stability": "stable",
    12     "stability-flags": {},
     12    "stability-flags": [],
    1313    "prefer-stable": false,
    1414    "prefer-lowest": false,
    … …  
    1717        "ext-json": "*"
    1818    },
    19     "platform-dev": {},
    20     "plugin-api-version": "2.6.0"
     19    "platform-dev": [],
     20    "plugin-api-version": "2.2.0"
    2121}

  • sendcloud-connected-shipping/trunk/includes/Repositories/class-order-repository.php

    r3389705 r3390351  
    5353        $order->save();
    5454    }
     55
     56    /**
     57     * Remove service point
     58     *
     59     * @param int $order_id
     60     */
     61    public function delete_service_point_meta( $order_id ) {
     62        $order = wc_get_order( $order_id );
     63
     64        if ( ! $order ) {
     65            return;
     66        }
     67
     68        $order->delete_meta_data( self::SERVICE_POINT_META_FIELD_NAME );
     69        $order->save();
     70    }
    5571
    5672    /**

  • sendcloud-connected-shipping/trunk/includes/ServicePoint/Checkout/class-checkout-block-handler.php

    r3381752 r3390351  
    9696            return;
    9797        }
     98
     99        $order_repository = new SCCSP_Order_Repository();
    98100        $shipping_method_id = explode( ':', reset( $chosen_shipping_methods ) )[0];
    99 
    100101        if ( Service_Point_Free_Shipping_Method::ID !== $shipping_method_id || empty( $order->get_items( 'shipping' ) ) ) {
     102            $order_repository->delete_service_point_meta( $order->get_id() );
    101103            return;
    102104        }

  • sendcloud-connected-shipping/trunk/includes/ServicePoint/Checkout/class-checkout-handler.php

    r3333025 r3390351  
    177177        SCCSP_Logger::info('Checkout_Handler::update_order_meta(): ' . 'service point selected: ' . $service_point_selected);
    178178
    179         if ($service_point_selected) {
    180             $service_point_json = isset($_POST[self::SERVICE_POINT_EXTRA_FIELD_NAME_V2])
    181                 ? sanitize_text_field(wp_unslash($_POST[self::SERVICE_POINT_EXTRA_FIELD_NAME_V2])) : '';
    182             $service_point_data = json_decode($service_point_json, true);
    183             if (isset($service_point_data['id'], $service_point_data['toPostalCode'], $service_point_data['name'],
    184                 $service_point_data['street'], $service_point_data['city'], $service_point_data['postal_code'], $service_point_data['house_number'])
     179        $chosen_methods = WC()->session->get( 'chosen_shipping_methods' );
     180        $chosen_method  = is_array( $chosen_methods ) ? reset( $chosen_methods ) : null;
     181
     182        if ( empty( $chosen_method ) || strpos( $chosen_method, 'service_point_v2_shipping_method' ) === false ) {
     183            SCCSP_Logger::info( 'Checkout_Handler::update_order_meta(): chosen shipping method is not service_point_v2_shipping_method.' );
     184            $this->order_repository->delete_service_point_meta( $order_id );
     185            return;
     186        }
     187
     188        if ( $service_point_selected ) {
     189            $service_point_json = isset( $_POST[ self::SERVICE_POINT_EXTRA_FIELD_NAME_V2 ] )
     190                ? sanitize_text_field( wp_unslash( $_POST[ self::SERVICE_POINT_EXTRA_FIELD_NAME_V2 ] ) )
     191                : '';
     192
     193            $service_point_data = json_decode( $service_point_json, true );
     194            if (
     195                isset(
     196                    $service_point_data['id'],
     197                    $service_point_data['toPostalCode'],
     198                    $service_point_data['name'],
     199                    $service_point_data['street'],
     200                    $service_point_data['city'],
     201                    $service_point_data['postal_code'],
     202                    $service_point_data['house_number']
     203                )
    185204            ) {
    186                 $this->order_repository->save_service_point_meta($order_id, $service_point_json);
    187 
     205                $this->order_repository->save_service_point_meta( $order_id, $service_point_json );
    188206                return;
    189207            }
    190208        }
    191209
    192         SCCSP_Logger::warning('Service point data not found.');
    193     }
    194 
     210        $this->order_repository->delete_service_point_meta( $order_id );
     211        SCCSP_Logger::warning( 'Service point data not found or not selected.' );
     212    }
    195213    /**
    196214     * Adds service point information in the order thank you page

  • sendcloud-connected-shipping/trunk/includes/class-sendcloud.php

    r3389705 r3390351  
    2727
    2828class SCCSP_Sendcloud {
    29     const VERSION = '1.0.18';
     29    const VERSION = '1.0.19';
    3030
    3131    const INTEGRATION_NAME = 'sendcloudshipping';

  • sendcloud-connected-shipping/trunk/readme.txt

    r3389705 r3390351  
    11=== Sendcloud Shipping ===
    2 Version: 1.0.18
     2Version: 1.0.19
    33Developer: SendCloud Global B.V.
    44Developer URI: http://sendcloud.com
    … …  
    77Requires PHP: 7.0
    88Tested up to: 6.8.2
    9 Stable tag: 1.0.18
     9Stable tag: 1.0.19
    1010License: GPLv2
    1111License URI: http://www.gnu.org/licenses/gpl-2.0.html

  • sendcloud-connected-shipping/trunk/sendcloud-connected-shipping.php

    r3389705 r3390351  
    44 * Plugin URI: https://wordpress.org/plugins/sendcloud-connected-shipping/
    55 * Description: Sendcloud plugin.
    6  * Version: 1.0.18
     6 * Version: 1.0.19
    77 * Woo:
    88 * Author: Sendcloud B.V.

  • sendcloud-connected-shipping/trunk/vendor/autoload.php

    r3389705 r3390351  
    33// autoload.php @generated by Composer
    44
    5 if (PHP_VERSION_ID < 50600) {
    6     if (!headers_sent()) {
    7         header('HTTP/1.1 500 Internal Server Error');
    8     }
    9     $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
    10     if (!ini_get('display_errors')) {
    11         if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
    12             fwrite(STDERR, $err);
    13         } elseif (!headers_sent()) {
    14             echo $err;
    15         }
    16     }
    17     trigger_error(
    18         $err,
    19         E_USER_ERROR
    20     );
    21 }
    22 
    235require_once __DIR__ . '/composer/autoload_real.php';
    246
    25 return ComposerAutoloaderInit799da1d7fc2f83b97f37781f90812d9d::getLoader();
     7return ComposerAutoloaderInit7395fa62f36c55d27fec2c2b6263947d::getLoader();

  • sendcloud-connected-shipping/trunk/vendor/composer/ClassLoader.php

    r3389705 r3390351  
    4343class ClassLoader
    4444{
    45     /** @var \Closure(string):void */
    46     private static $includeFile;
    47 
    48     /** @var string|null */
     45    /** @var ?string */
    4946    private $vendorDir;
    5047
    5148    // PSR-4
    5249    /**
    53      * @var array<string, array<string, int>>
     50     * @var array[]
     51     * @psalm-var array<string, array<string, int>>
    5452     */
    5553    private $prefixLengthsPsr4 = array();
    5654    /**
    57      * @var array<string, list<string>>
     55     * @var array[]
     56     * @psalm-var array<string, array<int, string>>
    5857     */
    5958    private $prefixDirsPsr4 = array();
    6059    /**
    61      * @var list<string>
     60     * @var array[]
     61     * @psalm-var array<string, string>
    6262     */
    6363    private $fallbackDirsPsr4 = array();
    … …  
    6565    // PSR-0
    6666    /**
    67      * List of PSR-0 prefixes
    68      *
    69      * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
    70      *
    71      * @var array<string, array<string, list<string>>>
     67     * @var array[]
     68     * @psalm-var array<string, array<string, string[]>>
    7269     */
    7370    private $prefixesPsr0 = array();
    7471    /**
    75      * @var list<string>
     72     * @var array[]
     73     * @psalm-var array<string, string>
    7674     */
    7775    private $fallbackDirsPsr0 = array();
    … …  
    8179
    8280    /**
    83      * @var array<string, string>
     81     * @var string[]
     82     * @psalm-var array<string, string>
    8483     */
    8584    private $classMap = array();
    … …  
    8988
    9089    /**
    91      * @var array<string, bool>
     90     * @var bool[]
     91     * @psalm-var array<string, bool>
    9292     */
    9393    private $missingClasses = array();
    9494
    95     /** @var string|null */
     95    /** @var ?string */
    9696    private $apcuPrefix;
    9797
    9898    /**
    99      * @var array<string, self>
     99     * @var self[]
    100100     */
    101101    private static $registeredLoaders = array();
    102102
    103103    /**
    104      * @param string|null $vendorDir
     104     * @param ?string $vendorDir
    105105     */
    106106    public function __construct($vendorDir = null)
    107107    {
    108108        $this->vendorDir = $vendorDir;
    109         self::initializeIncludeClosure();
    110     }
    111 
    112     /**
    113      * @return array<string, list<string>>
     109    }
     110
     111    /**
     112     * @return string[]
    114113     */
    115114    public function getPrefixes()
    … …  
    123122
    124123    /**
    125      * @return array<string, list<string>>
     124     * @return array[]
     125     * @psalm-return array<string, array<int, string>>
    126126     */
    127127    public function getPrefixesPsr4()
    … …  
    131131
    132132    /**
    133      * @return list<string>
     133     * @return array[]
     134     * @psalm-return array<string, string>
    134135     */
    135136    public function getFallbackDirs()
    … …  
    139140
    140141    /**
    141      * @return list<string>
     142     * @return array[]
     143     * @psalm-return array<string, string>
    142144     */
    143145    public function getFallbackDirsPsr4()
    … …  
    147149
    148150    /**
    149      * @return array<string, string> Array of classname => path
     151     * @return string[] Array of classname => path
     152     * @psalm-return array<string, string>
    150153     */
    151154    public function getClassMap()
    … …  
    155158
    156159    /**
    157      * @param array<string, string> $classMap Class to filename map
     160     * @param string[] $classMap Class to filename map
     161     * @psalm-param array<string, string> $classMap
    158162     *
    159163     * @return void
    … …  
    172176     * appending or prepending to the ones previously set for this prefix.
    173177     *
    174      * @param string              $prefix  The prefix
    175      * @param list<string>|string $paths   The PSR-0 root directories
    176      * @param bool                $prepend Whether to prepend the directories
     178     * @param string          $prefix  The prefix
     179     * @param string[]|string $paths   The PSR-0 root directories
     180     * @param bool            $prepend Whether to prepend the directories
    177181     *
    178182     * @return void
    … …  
    180184    public function add($prefix, $paths, $prepend = false)
    181185    {
    182         $paths = (array) $paths;
    183186        if (!$prefix) {
    184187            if ($prepend) {
    185188                $this->fallbackDirsPsr0 = array_merge(
    186                     $paths,
     189                    (array) $paths,
    187190                    $this->fallbackDirsPsr0
    188191                );
    … …  
    190193                $this->fallbackDirsPsr0 = array_merge(
    191194                    $this->fallbackDirsPsr0,
    192                     $paths
     195                    (array) $paths
    193196                );
    194197            }
    … …  
    199202        $first = $prefix[0];
    200203        if (!isset($this->prefixesPsr0[$first][$prefix])) {
    201             $this->prefixesPsr0[$first][$prefix] = $paths;
     204            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
    202205
    203206            return;
    … …  
    205208        if ($prepend) {
    206209            $this->prefixesPsr0[$first][$prefix] = array_merge(
    207                 $paths,
     210                (array) $paths,
    208211                $this->prefixesPsr0[$first][$prefix]
    209212            );
    … …  
    211214            $this->prefixesPsr0[$first][$prefix] = array_merge(
    212215                $this->prefixesPsr0[$first][$prefix],
    213                 $paths
     216                (array) $paths
    214217            );
    215218        }
    … …  
    220223     * appending or prepending to the ones previously set for this namespace.
    221224     *
    222      * @param string              $prefix  The prefix/namespace, with trailing '\\'
    223      * @param list<string>|string $paths   The PSR-4 base directories
    224      * @param bool                $prepend Whether to prepend the directories
     225     * @param string          $prefix  The prefix/namespace, with trailing '\\'
     226     * @param string[]|string $paths   The PSR-4 base directories
     227     * @param bool            $prepend Whether to prepend the directories
    225228     *
    226229     * @throws \InvalidArgumentException
    … …  
    230233    public function addPsr4($prefix, $paths, $prepend = false)
    231234    {
    232         $paths = (array) $paths;
    233235        if (!$prefix) {
    234236            // Register directories for the root namespace.
    235237            if ($prepend) {
    236238                $this->fallbackDirsPsr4 = array_merge(
    237                     $paths,
     239                    (array) $paths,
    238240                    $this->fallbackDirsPsr4
    239241                );
    … …  
    241243                $this->fallbackDirsPsr4 = array_merge(
    242244                    $this->fallbackDirsPsr4,
    243                     $paths
     245                    (array) $paths
    244246                );
    245247            }
    … …  
    251253            }
    252254            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
    253             $this->prefixDirsPsr4[$prefix] = $paths;
     255            $this->prefixDirsPsr4[$prefix] = (array) $paths;
    254256        } elseif ($prepend) {
    255257            // Prepend directories for an already registered namespace.
    256258            $this->prefixDirsPsr4[$prefix] = array_merge(
    257                 $paths,
     259                (array) $paths,
    258260                $this->prefixDirsPsr4[$prefix]
    259261            );
    … …  
    262264            $this->prefixDirsPsr4[$prefix] = array_merge(
    263265                $this->prefixDirsPsr4[$prefix],
    264                 $paths
     266                (array) $paths
    265267            );
    266268        }
    … …  
    271273     * replacing any others previously set for this prefix.
    272274     *
    273      * @param string              $prefix The prefix
    274      * @param list<string>|string $paths  The PSR-0 base directories
     275     * @param string          $prefix The prefix
     276     * @param string[]|string $paths  The PSR-0 base directories
    275277     *
    276278     * @return void
    … …  
    289291     * replacing any others previously set for this namespace.
    290292     *
    291      * @param string              $prefix The prefix/namespace, with trailing '\\'
    292      * @param list<string>|string $paths  The PSR-4 base directories
     293     * @param string          $prefix The prefix/namespace, with trailing '\\'
     294     * @param string[]|string $paths  The PSR-4 base directories
    293295     *
    294296     * @throws \InvalidArgumentException
    … …  
    424426    {
    425427        if ($file = $this->findFile($class)) {
    426             $includeFile = self::$includeFile;
    427             $includeFile($file);
     428            includeFile($file);
    428429
    429430            return true;
    … …  
    476477
    477478    /**
    478      * Returns the currently registered loaders keyed by their corresponding vendor directories.
    479      *
    480      * @return array<string, self>
     479     * Returns the currently registered loaders indexed by their corresponding vendor directories.
     480     *
     481     * @return self[]
    481482     */
    482483    public static function getRegisteredLoaders()
    … …  
    555556        return false;
    556557    }
    557 
    558     /**
    559      * @return void
    560      */
    561     private static function initializeIncludeClosure()
    562     {
    563         if (self::$includeFile !== null) {
    564             return;
    565         }
    566 
    567         /**
    568          * Scope isolated include.
    569          *
    570          * Prevents access to $this/self from included files.
    571          *
    572          * @param  string $file
    573          * @return void
    574          */
    575         self::$includeFile = \Closure::bind(static function($file) {
    576             include $file;
    577         }, null, null);
    578     }
    579558}
     559
     560/**
     561 * Scope isolated include.
     562 *
     563 * Prevents access to $this/self from included files.
     564 *
     565 * @param  string $file
     566 * @return void
     567 * @private
     568 */
     569function includeFile($file)
     570{
     571    include $file;
     572}

  • sendcloud-connected-shipping/trunk/vendor/composer/InstalledVersions.php

    r3389705 r3390351  
    2222 *
    2323 * To require its presence, you can require `composer-runtime-api ^2.0`
    24  *
    25  * @final
    2624 */
    2725class InstalledVersions
    … …  
    2927    /**
    3028     * @var mixed[]|null
    31      * @psalm-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[]}>}|array{}|null
     29     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
    3230     */
    3331    private static $installed;
    3432
    3533    /**
    36      * @var bool
    37      */
    38     private static $installedIsLocalDir;
    39 
    40     /**
    4134     * @var bool|null
    4235     */
    … …  
    4538    /**
    4639     * @var array[]
    47      * @psalm-var array<string, 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[]}>}>
     40     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
    4841     */
    4942    private static $installedByVendor = array();
    … …  
    10497        foreach (self::getInstalled() as $installed) {
    10598            if (isset($installed['versions'][$packageName])) {
    106                 return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
     99                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
    107100            }
    108101        }
    … …  
    125118    public static function satisfies(VersionParser $parser, $packageName, $constraint)
    126119    {
    127         $constraint = $parser->parseConstraints((string) $constraint);
     120        $constraint = $parser->parseConstraints($constraint);
    128121        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
    129122
    … …  
    249242    /**
    250243     * @return array
    251      * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
     244     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
    252245     */
    253246    public static function getRootPackage()
    … …  
    263256     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
    264257     * @return array[]
    265      * @psalm-return 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[]}>}
     258     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
    266259     */
    267260    public static function getRawData()
    … …  
    286279     *
    287280     * @return array[]
    288      * @psalm-return list<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[]}>}>
     281     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
    289282     */
    290283    public static function getAllRawData()
    … …  
    309302     * @return void
    310303     *
    311      * @psalm-param 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[]}>} $data
     304     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
    312305     */
    313306    public static function reload($data)
    … …  
    315308        self::$installed = $data;
    316309        self::$installedByVendor = array();
    317 
    318         // when using reload, we disable the duplicate protection to ensure that self::$installed data is
    319         // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
    320         // so we have to assume it does not, and that may result in duplicate data being returned when listing
    321         // all installed packages for example
    322         self::$installedIsLocalDir = false;
    323310    }
    324311
    325312    /**
    326313     * @return array[]
    327      * @psalm-return list<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[]}>}>
     314     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
    328315     */
    329316    private static function getInstalled()
    … …  
    334321
    335322        $installed = array();
    336         $copiedLocalDir = false;
    337323
    338324        if (self::$canGetVendors) {
    339             $selfDir = strtr(__DIR__, '\\', '/');
    340325            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
    341                 $vendorDir = strtr($vendorDir, '\\', '/');
    342326                if (isset(self::$installedByVendor[$vendorDir])) {
    343327                    $installed[] = self::$installedByVendor[$vendorDir];
    344328                } elseif (is_file($vendorDir.'/composer/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 $vendorDir.'/composer/installed.php';
    347                     self::$installedByVendor[$vendorDir] = $required;
    348                     $installed[] = $required;
    349                     if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
    350                         self::$installed = $required;
    351                         self::$installedIsLocalDir = true;
     329                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
     330                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
     331                        self::$installed = $installed[count($installed) - 1];
    352332                    }
    353                 }
    354                 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
    355                     $copiedLocalDir = true;
    356333                }
    357334            }
    … …  
    362339            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
    363340            if (substr(__DIR__, -8, 1) !== 'C') {
    364                 /** @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 */
    365                 $required = require __DIR__ . '/installed.php';
    366                 self::$installed = $required;
     341                self::$installed = require __DIR__ . '/installed.php';
    367342            } else {
    368343                self::$installed = array();
    369344            }
    370345        }
    371 
    372         if (self::$installed !== array() && !$copiedLocalDir) {
    373             $installed[] = self::$installed;
    374         }
     346        $installed[] = self::$installed;
    375347
    376348        return $installed;

  • sendcloud-connected-shipping/trunk/vendor/composer/LICENSE

    r3389705 r3390351  
    1 
    21Copyright (c) Nils Adermann, Jordi Boggiano
    32
    … …  
    1918OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    2019THE SOFTWARE.
    21 

  • sendcloud-connected-shipping/trunk/vendor/composer/autoload_classmap.php

    r3389705 r3390351  
    33// autoload_classmap.php @generated by Composer
    44
    5 $vendorDir = dirname(__DIR__);
     5$vendorDir = dirname(dirname(__FILE__));
    66$baseDir = dirname($vendorDir);
    77

  • sendcloud-connected-shipping/trunk/vendor/composer/autoload_namespaces.php

    r3389705 r3390351  
    33// autoload_namespaces.php @generated by Composer
    44
    5 $vendorDir = dirname(__DIR__);
     5$vendorDir = dirname(dirname(__FILE__));
    66$baseDir = dirname($vendorDir);
    77

  • sendcloud-connected-shipping/trunk/vendor/composer/autoload_psr4.php

    r3389705 r3390351  
    33// autoload_psr4.php @generated by Composer
    44
    5 $vendorDir = dirname(__DIR__);
     5$vendorDir = dirname(dirname(__FILE__));
    66$baseDir = dirname($vendorDir);
    77

  • sendcloud-connected-shipping/trunk/vendor/composer/autoload_real.php

    r3389705 r3390351  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit799da1d7fc2f83b97f37781f90812d9d
     5class ComposerAutoloaderInit7395fa62f36c55d27fec2c2b6263947d
    66{
    77    private static $loader;
    … …  
    2525        require __DIR__ . '/platform_check.php';
    2626
    27         spl_autoload_register(array('ComposerAutoloaderInit799da1d7fc2f83b97f37781f90812d9d', 'loadClassLoader'), true, true);
    28         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    29         spl_autoload_unregister(array('ComposerAutoloaderInit799da1d7fc2f83b97f37781f90812d9d', 'loadClassLoader'));
     27        spl_autoload_register(array('ComposerAutoloaderInit7395fa62f36c55d27fec2c2b6263947d', 'loadClassLoader'), true, true);
     28        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
     29        spl_autoload_unregister(array('ComposerAutoloaderInit7395fa62f36c55d27fec2c2b6263947d', 'loadClassLoader'));
    3030
    31         require __DIR__ . '/autoload_static.php';
    32         call_user_func(\Composer\Autoload\ComposerStaticInit799da1d7fc2f83b97f37781f90812d9d::getInitializer($loader));
     31        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
     32        if ($useStaticLoader) {
     33            require __DIR__ . '/autoload_static.php';
     34
     35            call_user_func(\Composer\Autoload\ComposerStaticInit7395fa62f36c55d27fec2c2b6263947d::getInitializer($loader));
     36        } else {
     37            $map = require __DIR__ . '/autoload_namespaces.php';
     38            foreach ($map as $namespace => $path) {
     39                $loader->set($namespace, $path);
     40            }
     41
     42            $map = require __DIR__ . '/autoload_psr4.php';
     43            foreach ($map as $namespace => $path) {
     44                $loader->setPsr4($namespace, $path);
     45            }
     46
     47            $classMap = require __DIR__ . '/autoload_classmap.php';
     48            if ($classMap) {
     49                $loader->addClassMap($classMap);
     50            }
     51        }
    3352
    3453        $loader->register(true);

  • sendcloud-connected-shipping/trunk/vendor/composer/autoload_static.php

    r3389705 r3390351  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit799da1d7fc2f83b97f37781f90812d9d
     7class ComposerStaticInit7395fa62f36c55d27fec2c2b6263947d
    88{
    99    public static $classMap = array (
    … …  
    7272    {
    7373        return \Closure::bind(function () use ($loader) {
    74             $loader->classMap = ComposerStaticInit799da1d7fc2f83b97f37781f90812d9d::$classMap;
     74            $loader->classMap = ComposerStaticInit7395fa62f36c55d27fec2c2b6263947d::$classMap;
    7575
    7676        }, null, ClassLoader::class);

  • sendcloud-connected-shipping/trunk/vendor/composer/installed.php

    r3389705 r3390351  
    11<?php return array(
    22    'root' => array(
    3         'name' => 'sendcloud/woocommerce',
    43        'pretty_version' => 'dev-main',
    54        'version' => 'dev-main',
    6         'reference' => 'b03c2e08f518aaf80b2602db2b78fbdd8f036b5f',
    75        'type' => 'library',
    86        'install_path' => __DIR__ . '/../../',
    97        'aliases' => array(),
     8        'reference' => 'deb565e7ca2287d42633c259bbe12ef884850ec8',
     9        'name' => 'sendcloud/woocommerce',
    1010        'dev' => false,
    1111    ),
    … …  
    1414            'pretty_version' => 'dev-main',
    1515            'version' => 'dev-main',
    16             'reference' => 'b03c2e08f518aaf80b2602db2b78fbdd8f036b5f',
    1716            'type' => 'library',
    1817            'install_path' => __DIR__ . '/../../',
    1918            'aliases' => array(),
     19            'reference' => 'deb565e7ca2287d42633c259bbe12ef884850ec8',
    2020            'dev_requirement' => false,
    2121        ),
Note: See TracChangeset for help on using the changeset viewer.