WIN-2308041133\Administrator 6 months ago
parent
commit
7d5dde8147

+ 6 - 19
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "55c7b718c8177f61479ec7e91f3aa1c4",
+    "content-hash": "3592ef899763b9636efbba2f547d2781",
     "packages": [
         {
             "name": "composer/pcre",
@@ -367,13 +367,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Fenguoz/tron-php/zipball/6e39e8e1fb9e7c6bd3e2f589c7eb13378d8bdf5d",
                 "reference": "6e39e8e1fb9e7c6bd3e2f589c7eb13378d8bdf5d",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "iexbase/tron-api": "^2.0 || ^3.0 || ^3.1",
@@ -941,13 +935,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/ionux/phactor/zipball/271373b65cffe75a8c28f7f8c392fe460251f4f7",
                 "reference": "271373b65cffe75a8c28f7f8c392fe460251f4f7",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "ext-bcmath": "*",
@@ -4591,16 +4579,15 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.0",
         "ext-curl": "*",
         "ext-gmp": "*",
-        "ext-bcmath": "*",
-        "ext-json": "*"
+        "ext-bcmath": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

+ 1 - 4
vendor/autoload.php

@@ -14,10 +14,7 @@ if (PHP_VERSION_ID < 50600) {
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

+ 41 - 4
vendor/composer/InstalledVersions.php

@@ -26,12 +26,23 @@ use Composer\Semver\VersionParser;
  */
 class InstalledVersions
 {
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
+
     /**
      * @var mixed[]|null
      * @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
      */
     private static $installed;
 
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
     /**
      * @var bool|null
      */
@@ -309,6 +320,24 @@ class InstalledVersions
     {
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+
+        return self::$selfDir;
     }
 
     /**
@@ -322,19 +351,27 @@ class InstalledVersions
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @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 */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
                 }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
+                }
             }
         }
 
@@ -350,7 +387,7 @@ class InstalledVersions
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

+ 2 - 2
vendor/composer/autoload_psr4.php

@@ -10,12 +10,12 @@ return array(
     'think\\captcha\\' => array($vendorDir . '/topthink/think-captcha/src'),
     'think\\' => array($vendorDir . '/karsonzhang/fastadmin-addons/src', $baseDir . '/thinkphp/library/think'),
     'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'kornrunner\\' => array($vendorDir . '/kornrunner/keccak/src', $vendorDir . '/kornrunner/secp256k1/src'),
+    'kornrunner\\' => array($vendorDir . '/kornrunner/secp256k1/src', $vendorDir . '/kornrunner/keccak/src'),
     'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
     'Web3p\\RLP\\' => array($vendorDir . '/web3p/rlp/src'),
     'Web3p\\EthereumUtil\\' => array($vendorDir . '/web3p/ethereum-util/src'),
     'Web3p\\EthereumTx\\' => array($vendorDir . '/web3p/ethereum-tx/src'),
-    'Web3\\' => array($vendorDir . '/sc0vu/web3.php/src', $vendorDir . '/web3p/web3.php/src'),
+    'Web3\\' => array($vendorDir . '/web3p/web3.php/src', $vendorDir . '/sc0vu/web3.php/src'),
     'Tron\\' => array($vendorDir . '/fenguoz/tron-php/src'),
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),

+ 4 - 4
vendor/composer/autoload_static.php

@@ -159,8 +159,8 @@ class ComposerStaticInitee15cbb6ed33e5b662fcb3f36298dc5c
         ),
         'kornrunner\\' => 
         array (
-            0 => __DIR__ . '/..' . '/kornrunner/keccak/src',
-            1 => __DIR__ . '/..' . '/kornrunner/secp256k1/src',
+            0 => __DIR__ . '/..' . '/kornrunner/secp256k1/src',
+            1 => __DIR__ . '/..' . '/kornrunner/keccak/src',
         ),
         'ZipStream\\' => 
         array (
@@ -180,8 +180,8 @@ class ComposerStaticInitee15cbb6ed33e5b662fcb3f36298dc5c
         ),
         'Web3\\' => 
         array (
-            0 => __DIR__ . '/..' . '/sc0vu/web3.php/src',
-            1 => __DIR__ . '/..' . '/web3p/web3.php/src',
+            0 => __DIR__ . '/..' . '/web3p/web3.php/src',
+            1 => __DIR__ . '/..' . '/sc0vu/web3.php/src',
         ),
         'Tron\\' => 
         array (

+ 3 - 3
vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'karsonzhang/fastadmin',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '3d8217b93d2cc1672d67cf0d0a0ffcc6a9627204',
+        'reference' => 'da83b03ec3c470751d7d10a1acb0137ea2467474',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -130,7 +130,7 @@
         'karsonzhang/fastadmin' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '3d8217b93d2cc1672d67cf0d0a0ffcc6a9627204',
+            'reference' => 'da83b03ec3c470751d7d10a1acb0137ea2467474',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -549,7 +549,7 @@
             'version' => '1.20.0.0',
             'reference' => '5f03a781d984aae42cebd18e7912fa80f02ee644',
             'type' => 'metapackage',
-            'install_path' => NULL,
+            'install_path' => null,
             'aliases' => array(),
             'dev_requirement' => false,
         ),