[更新]ComposerUpdate

2025-04-06 03:58:04 +08:00 · 2018-06-29 15:35:14 +08:00 · 2018-06-29 15:35:14 +08:00 · 8d232cce8b
commit 8d232cce8b
parent 2725499262
6 changed files with 83 additions and 148 deletions
--- a/composer.json
+++ b/composer.json
@ -1,29 +1,28 @@
 {
-  "name": "topthink/think",
-  "description": "the new thinkphp framework",
  "type": "project",
+  "name": "zoujingli/thinkadmin",
+  "description": "ThinkAdmin Developer CMF",
+  "homepage": "http://demo.thinkadmin.top",
  "keywords": [
-    "framework",
    "thinkphp",
-    "ORM"
+    "thinkadmin"
  ],
-  "homepage": "http://thinkphp.cn/",
-  "license": "Apache-2.0",
+  "license": "MIT",
  "authors": [
    {
-      "name": "liu21st",
-      "email": "liu21st@gmail.com"
+      "name": "Anyon",
+      "email": "zoujingli@qq.com"
    }
  ],
  "require": {
    "php": ">=5.6.0",
+    "qiniu/php-sdk": "^7.2",
    "endroid/qr-code": "^1.9",
    "topthink/framework": "5.1.*",
-    "zoujingli/ip2region": "dev-master",
    "aliyuncs/oss-sdk-php": "^2.2",
-    "zoujingli/weopen-developer": "dev-master",
    "topthink/think-captcha": "^2.0",
-    "qiniu/php-sdk": "^7.2"
+    "zoujingli/ip2region": "dev-master",
+    "zoujingli/weopen-developer": "dev-master"
  },
  "autoload": {
    "psr-4": {
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@ -4,4 +4,4 @@

 require_once __DIR__ . '/composer/autoload_real.php';

-return ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654::getLoader();
+return ComposerAutoloaderInit7c3323b53a4060e1aff01d0992f25786::getLoader();
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@ -2,7 +2,7 @@

 // autoload_real.php @generated by Composer

-class ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654
+class ComposerAutoloaderInit7c3323b53a4060e1aff01d0992f25786
 {
    private static $loader;

@ -19,15 +19,15 @@ class ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654
            return self::$loader;
        }

-        spl_autoload_register(array('ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7c3323b53a4060e1aff01d0992f25786', 'loadClassLoader'), true, true);
        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7c3323b53a4060e1aff01d0992f25786', 'loadClassLoader'));

        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
        if ($useStaticLoader) {
            require_once __DIR__ . '/autoload_static.php';

-            call_user_func(\Composer\Autoload\ComposerStaticInit3917a65c534c33755c27cf34de19b654::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit7c3323b53a4060e1aff01d0992f25786::getInitializer($loader));
        } else {
            $map = require __DIR__ . '/autoload_namespaces.php';
            foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit3917a65c534c33755c27cf34de19b654
        $loader->register(true);

        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit3917a65c534c33755c27cf34de19b654::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit7c3323b53a4060e1aff01d0992f25786::$files;
        } else {
            $includeFiles = require __DIR__ . '/autoload_files.php';
        }
        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire3917a65c534c33755c27cf34de19b654($fileIdentifier, $file);
+            composerRequire7c3323b53a4060e1aff01d0992f25786($fileIdentifier, $file);
        }

        return $loader;
    }
 }

-function composerRequire3917a65c534c33755c27cf34de19b654($fileIdentifier, $file)
+function composerRequire7c3323b53a4060e1aff01d0992f25786($fileIdentifier, $file)
 {
    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
        require $file;
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@ -4,7 +4,7 @@

 namespace Composer\Autoload;

-class ComposerStaticInit3917a65c534c33755c27cf34de19b654
+class ComposerStaticInit7c3323b53a4060e1aff01d0992f25786
 {
    public static $files = array (
        '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
@ -303,9 +303,9 @@ class ComposerStaticInit3917a65c534c33755c27cf34de19b654
    public static function getInitializer(ClassLoader $loader)
    {
        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit3917a65c534c33755c27cf34de19b654::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit3917a65c534c33755c27cf34de19b654::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit3917a65c534c33755c27cf34de19b654::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit7c3323b53a4060e1aff01d0992f25786::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit7c3323b53a4060e1aff01d0992f25786::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit7c3323b53a4060e1aff01d0992f25786::$classMap;

        }, null, ClassLoader::class);
    }
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@ -284,24 +284,77 @@
        "description": "captcha package for thinkphp5"
    },
    {
-        "name": "symfony/options-resolver",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "qiniu/php-sdk",
+        "version": "v7.2.6",
+        "version_normalized": "7.2.6.0",
        "source": {
            "type": "git",
-            "url": "https://github.com/symfony/options-resolver.git",
-            "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e"
+            "url": "https://github.com/qiniu/php-sdk.git",
+            "reference": "305ce1c1c0c71f794661fe45a96facf61ef96c5d"
        },
        "dist": {
            "type": "zip",
-            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/f3109a6aedd20e35c3a33190e932c2b063b7b50e.zip",
-            "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e",
+            "url": "https://files.phpcomposer.com/files/qiniu/php-sdk/305ce1c1c0c71f794661fe45a96facf61ef96c5d.zip",
+            "reference": "305ce1c1c0c71f794661fe45a96facf61ef96c5d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0",
+            "squizlabs/php_codesniffer": "~2.3"
+        },
+        "time": "2018-05-18T04:37:29+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Qiniu\\": "src/Qiniu"
+            },
+            "files": [
+                "src/Qiniu/functions.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Qiniu",
+                "email": "sdk@qiniu.com",
+                "homepage": "http://www.qiniu.com"
+            }
+        ],
+        "description": "Qiniu Resource (Cloud) Storage SDK for PHP",
+        "homepage": "http://developer.qiniu.com/",
+        "keywords": [
+            "cloud",
+            "qiniu",
+            "sdk",
+            "storage"
+        ]
+    },
+    {
+        "name": "symfony/options-resolver",
+        "version": "v3.4.12",
+        "version_normalized": "3.4.12.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/options-resolver.git",
+            "reference": "cc5e98ed91688a22a7162a8800096356f9076b1d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/cc5e98ed91688a22a7162a8800096356f9076b1d.zip",
+            "reference": "cc5e98ed91688a22a7162a8800096356f9076b1d",
            "shasum": ""
        },
        "require": {
            "php": "^5.5.9|>=7.0.8"
        },
-        "time": "2018-01-11T07:56:07+00:00",
+        "time": "2018-05-30T04:26:49+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
@ -443,58 +496,5 @@
        ],
        "description": "Aliyun OSS SDK for PHP",
        "homepage": "http://www.aliyun.com/product/oss/"
-    },
-    {
-        "name": "qiniu/php-sdk",
-        "version": "v7.2.6",
-        "version_normalized": "7.2.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/qiniu/php-sdk.git",
-            "reference": "305ce1c1c0c71f794661fe45a96facf61ef96c5d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://files.phpcomposer.com/files/qiniu/php-sdk/305ce1c1c0c71f794661fe45a96facf61ef96c5d.zip",
-            "reference": "305ce1c1c0c71f794661fe45a96facf61ef96c5d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~2.3"
-        },
-        "time": "2018-05-18T04:37:29+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Qiniu\\": "src/Qiniu"
-            },
-            "files": [
-                "src/Qiniu/functions.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Qiniu",
-                "email": "sdk@qiniu.com",
-                "homepage": "http://www.qiniu.com"
-            }
-        ],
-        "description": "Qiniu Resource (Cloud) Storage SDK for PHP",
-        "homepage": "http://developer.qiniu.com/",
-        "keywords": [
-            "cloud",
-            "qiniu",
-            "sdk",
-            "storage"
-        ]
    }
 ]
--- a/vendor/symfony/options-resolver/Tests/OptionsResolverTest.php
+++ b/vendor/symfony/options-resolver/Tests/OptionsResolverTest.php
@ -29,10 +29,6 @@ class OptionsResolverTest extends TestCase
        $this->resolver = new OptionsResolver();
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // resolve()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
     * @expectedExceptionMessage The option "foo" does not exist. Defined options are: "a", "z".
@ -69,10 +65,6 @@ class OptionsResolverTest extends TestCase
        $this->resolver->resolve();
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setDefault()/hasDefault()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testSetDefaultReturnsThis()
    {
        $this->assertSame($this->resolver, $this->resolver->setDefault('foo', 'bar'));
@ -115,10 +107,6 @@ class OptionsResolverTest extends TestCase
        $this->assertTrue($this->resolver->hasDefault('foo'));
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // lazy setDefault()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testSetLazyReturnsThis()
    {
        $this->assertSame($this->resolver, $this->resolver->setDefault('foo', function (Options $options) {}));
@ -232,10 +220,6 @@ class OptionsResolverTest extends TestCase
        $this->assertSame(2, $calls);
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setRequired()/isRequired()/getRequiredOptions()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testSetRequiredReturnsThis()
    {
        $this->assertSame($this->resolver, $this->resolver->setRequired('foo'));
@ -330,10 +314,6 @@ class OptionsResolverTest extends TestCase
        $this->assertSame(array('foo', 'bar'), $this->resolver->getRequiredOptions());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // isMissing()/getMissingOptions()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testIsMissingIfNotSet()
    {
        $this->assertFalse($this->resolver->isMissing('foo'));
@ -373,10 +353,6 @@ class OptionsResolverTest extends TestCase
        $this->assertSame(array('bar'), $this->resolver->getMissingOptions());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setDefined()/isDefined()/getDefinedOptions()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
     */
@ -474,10 +450,6 @@ class OptionsResolverTest extends TestCase
        $this->assertFalse($this->resolver->isDefined('foo'));
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setAllowedTypes()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
     */
@ -662,10 +634,6 @@ class OptionsResolverTest extends TestCase
        $this->resolver->resolve();
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // addAllowedTypes()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
     */
@ -748,10 +716,6 @@ class OptionsResolverTest extends TestCase
        $this->assertNotEmpty($this->resolver->resolve());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setAllowedValues()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
     */
@ -903,10 +867,6 @@ class OptionsResolverTest extends TestCase
        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // addAllowedValues()
-    ////////////////////////////////////////////////////////////////////////////
-
    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
     */
@ -1023,10 +983,6 @@ class OptionsResolverTest extends TestCase
        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setNormalizer()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testSetNormalizerReturnsThis()
    {
        $this->resolver->setDefault('foo', 'bar');
@ -1278,10 +1234,6 @@ class OptionsResolverTest extends TestCase
        $this->assertEmpty($this->resolver->resolve());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // setDefaults()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testSetDefaultsReturnsThis()
    {
        $this->assertSame($this->resolver, $this->resolver->setDefaults(array('foo', 'bar')));
@ -1316,10 +1268,6 @@ class OptionsResolverTest extends TestCase
        $this->resolver->resolve();
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // remove()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testRemoveReturnsThis()
    {
        $this->resolver->setDefault('foo', 'bar');
@ -1408,10 +1356,6 @@ class OptionsResolverTest extends TestCase
        $this->assertNotNull($this->resolver->remove('foo'));
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // clear()
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testClearReturnsThis()
    {
        $this->assertSame($this->resolver, $this->resolver->clear());
@ -1498,10 +1442,6 @@ class OptionsResolverTest extends TestCase
        $this->assertEmpty($this->resolver->resolve());
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // ArrayAccess
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testArrayAccess()
    {
        $this->resolver->setDefault('default1', 0);
@ -1616,10 +1556,6 @@ class OptionsResolverTest extends TestCase
        $this->resolver->resolve();
    }

-    ////////////////////////////////////////////////////////////////////////////
-    // Countable
-    ////////////////////////////////////////////////////////////////////////////
-
    public function testCount()
    {
        $this->resolver->setDefault('default', 0);