[更新]ComposerUpdate

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69::getLoader();
+return ComposerAutoloaderInit9f532fe51df20fe03503300614827aa4::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69
+class ComposerAutoloaderInit9f532fe51df20fe03503300614827aa4
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9f532fe51df20fe03503300614827aa4', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9f532fe51df20fe03503300614827aa4', '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\ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit9f532fe51df20fe03503300614827aa4::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInitcd810a1640b6294256452cfc7e3e3b69
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit9f532fe51df20fe03503300614827aa4::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirecd810a1640b6294256452cfc7e3e3b69($fileIdentifier, $file);
+            composerRequire9f532fe51df20fe03503300614827aa4($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirecd810a1640b6294256452cfc7e3e3b69($fileIdentifier, $file)
+function composerRequire9f532fe51df20fe03503300614827aa4($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69
+class ComposerStaticInit9f532fe51df20fe03503300614827aa4
 {
     public static $files = array (
         '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@@ -347,9 +347,9 @@ class ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitcd810a1640b6294256452cfc7e3e3b69::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit9f532fe51df20fe03503300614827aa4::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit9f532fe51df20fe03503300614827aa4::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit9f532fe51df20fe03503300614827aa4::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -118,17 +118,17 @@
     },
     {
         "name": "qiniu/php-sdk",
-        "version": "v7.2.8",
-        "version_normalized": "7.2.8.0",
+        "version": "v7.2.9",
+        "version_normalized": "7.2.9.0",
         "source": {
             "type": "git",
             "url": "https://github.com/qiniu/php-sdk.git",
-            "reference": "464f3eb3b0f51586d274733aee67f372fc6276ef"
+            "reference": "afe7d8715d8a688b1d8d8cdf031240d2363dad90"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/464f3eb3b0f51586d274733aee67f372fc6276ef",
-            "reference": "464f3eb3b0f51586d274733aee67f372fc6276ef",
+            "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/afe7d8715d8a688b1d8d8cdf031240d2363dad90",
+            "reference": "afe7d8715d8a688b1d8d8cdf031240d2363dad90",
             "shasum": "",
             "mirrors": [
                 {
@@ -141,10 +141,10 @@
             "php": ">=5.3.3"
         },
         "require-dev": {
-            "phpunit/phpunit": "~8.0",
+            "phpunit/phpunit": "~4.0",
             "squizlabs/php_codesniffer": "~2.3"
         },
-        "time": "2019-06-21T06:22:05+00:00",
+        "time": "2019-07-09T07:55:07+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -502,12 +502,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "12cc9a956969fa6716cb7da75fe6e5fc5fa8985d"
+            "reference": "861a56cda1b7a0b6ae9a781aa4bd834491d2d03b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/12cc9a956969fa6716cb7da75fe6e5fc5fa8985d",
-            "reference": "12cc9a956969fa6716cb7da75fe6e5fc5fa8985d",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/861a56cda1b7a0b6ae9a781aa4bd834491d2d03b",
+            "reference": "861a56cda1b7a0b6ae9a781aa4bd834491d2d03b",
             "shasum": "",
             "mirrors": [
                 {
@@ -526,7 +526,7 @@
             "qiniu/php-sdk": "^7.2",
             "topthink/framework": "5.1.*"
         },
-        "time": "2019-07-08T02:34:45+00:00",
+        "time": "2019-07-15T06:16:28+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

vendor/qiniu/php-sdk/.travis.yml

@@ -6,7 +6,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - 7.2
 
 before_script:
   - export QINIU_TEST_ENV="travis"

vendor/qiniu/php-sdk/composer.json

@@ -16,7 +16,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.0",
+        "phpunit/phpunit": "~4.0",
         "squizlabs/php_codesniffer": "~2.3"
     },
     "autoload": {

vendor/qiniu/php-sdk/src/Qiniu/Config.php

@@ -3,7 +3,7 @@ namespace Qiniu;
 
 final class Config
 {
-    const SDK_VER = '7.3.0';
+    const SDK_VER = '7.2.9';
 
     const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
 

vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php

@@ -31,8 +31,7 @@ final class FormUploader
         $config,
         $params,
         $mime,
-        $fname,
-        $checkCrc
+        $fname
     ) {
         $fields = array('token' => $upToken);
         if ($key === null) {

vendor/qiniu/php-sdk/src/Qiniu/Storage/UploadManager.php

@@ -46,8 +46,7 @@ final class UploadManager
         $data,
         $params = null,
         $mime = 'application/octet-stream',
-        $fname = null,
-        $checkCrc = false
+        $fname = null
     ) {
     
         $params = self::trimParams($params);
@@ -58,8 +57,7 @@ final class UploadManager
             $this->config,
             $params,
             $mime,
-            $fname,
-            $checkCrc
+            $fname
         );
     }
 
@@ -110,8 +108,7 @@ final class UploadManager
                 $this->config,
                 $params,
                 $mime,
-                basename($filePath),
-                $checkCrc
+                basename($filePath)
             );
         }
 

vendor/qiniu/php-sdk/tests/Qiniu/Tests/AuthTest.php

@@ -5,18 +5,17 @@ namespace Qiniu {
     function time()
     {
         return isset($_SERVER['override_qiniu_auth_time'])
-            ? 2234567890
+            ? 1234567890
             : \time();
     }
 }
 
 namespace Qiniu\Tests {
     use Qiniu\Auth;
-    use PHPUnit\Framework\TestCase;
 
     // @codingStandardsIgnoreEnd
 
-    class AuthTest extends TestCase
+    class AuthTest extends \PHPUnit_Framework_TestCase
     {
 
         public function testSign()
@@ -30,10 +29,7 @@ namespace Qiniu\Tests {
         {
             global $dummyAuth;
             $token = $dummyAuth->signWithData('test');
-            $this->assertEquals(
-                'abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==',
-                $token
-            );
+            $this->assertEquals('abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==', $token);
         }
 
         public function testSignRequest()
@@ -43,10 +39,7 @@ namespace Qiniu\Tests {
             $this->assertEquals('abcdefghklmnopq:cFyRVoWrE3IugPIMP5YJFTO-O-Y=', $token);
             $ctype = 'application/x-www-form-urlencoded';
             $token = $dummyAuth->signRequest('http://www.qiniu.com?go=1', 'test', $ctype);
-            $this->assertEquals(
-                $token,
-                'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4='
-            );
+            $this->assertEquals($token, 'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4=');
         }
 
         public function testPrivateDownloadUrl()
@@ -54,7 +47,7 @@ namespace Qiniu\Tests {
             global $dummyAuth;
             $_SERVER['override_qiniu_auth_time'] = true;
             $url = $dummyAuth->privateDownloadUrl('http://www.qiniu.com?go=1');
-            $expect = 'http://www.qiniu.com?go=1&e=2234571490&token=abcdefghklmnopq:Hvi3R79Sl6wZy1c331nv0iIFoJk=';
+            $expect = 'http://www.qiniu.com?go=1&e=1234571490&token=abcdefghklmnopq:8vzBeLZ9W3E4kbBLFLW0Xe0u7v4=';
             $this->assertEquals($expect, $url);
             unset($_SERVER['override_qiniu_auth_time']);
         }
@@ -65,10 +58,14 @@ namespace Qiniu\Tests {
             $_SERVER['override_qiniu_auth_time'] = true;
             $token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser' => 'y'));
             // @codingStandardsIgnoreStart
-            $exp = 'abcdefghklmnopq:GracWhW1iGwVL6haVH5dr4gjqeo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjIyMzQ1NzE0OTB9';
+            $exp = 'abcdefghklmnopq:yyeexeUkPOROoTGvwBjJ0F0VLEo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjEyMzQ1NzE0OTB9';
             // @codingStandardsIgnoreEnd
             $this->assertEquals($exp, $token);
             unset($_SERVER['override_qiniu_auth_time']);
         }
+
+        public function testVerifyCallback()
+        {
+        }
     }
 }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/Base64Test.php

@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu;
-use PHPUnit\Framework\TestCase;
 
-class Base64Test extends TestCase
+class Base64Test extends \PHPUnit_Framework_TestCase
 {
     public function testUrlSafe()
     {

vendor/qiniu/php-sdk/tests/Qiniu/Tests/BucketTest.php

@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Storage\BucketManager;
-use PHPUnit\Framework\TestCase;
 
-class BucketTest extends TestCase
+class BucketTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketManager;
     protected $dummyBucketManager;
@@ -12,7 +11,7 @@ class BucketTest extends TestCase
     protected $key;
     protected $key2;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         global $key;

vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php

@@ -10,15 +10,14 @@ namespace Qiniu\Tests;
 
 use Qiniu\Cdn\CdnManager;
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class CdnManagerTest extends TestCase
+class CdnManagerTest extends \PHPUnit_Framework_TestCase
 {
     protected $cdnManager;
     protected $encryptKey;
     protected $imgUrl;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $timestampAntiLeechEncryptKey;
         global $customDomain;
@@ -35,17 +34,8 @@ class CdnManagerTest extends TestCase
         $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->imgUrl, $this->encryptKey, 3600);
 
         $response = Client::get($signUrl);
+        
         $this->assertEquals($response->statusCode, 200);
         $this->assertNull($response->error);
-
-        $url2 = $this->imgUrl . '?imageInfo';
-        $signUrl2 = $this->cdnManager->createTimestampAntiLeechUrl($url2, $this->encryptKey, 3600);
-
-        $response = Client::get($signUrl2);
-        $imgInfo = $response->json();
-
-        $this->assertEquals($response->statusCode, 200);
-        $this->assertEquals($imgInfo['size'], 2196145);
-        $this->assertNull($response->error);
     }
 }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/Crc32Test.php

@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu;
-use PHPUnit\Framework\TestCase;
 
-class Crc32Test extends TestCase
+class Crc32Test extends \PHPUnit_Framework_TestCase
 {
     public function testData()
     {

vendor/qiniu/php-sdk/tests/Qiniu/Tests/DownloadTest.php

@@ -2,14 +2,13 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class DownloadTest extends TestCase
+class DownloadTest extends \PHPUnit_Framework_TestCase
 {
     public function test()
     {
         global $testAuth;
-        $base_url = 'http://pojiwyou0.bkt.clouddn.com/demo.png';
+        $base_url = 'http://private-res.qiniudn.com/gogopher.jpg';
         $private_url = $testAuth->privateDownloadUrl($base_url);
         $response = Client::get($private_url);
         $this->assertEquals(200, $response->statusCode);
@@ -18,7 +17,7 @@ class DownloadTest extends TestCase
     public function testFop()
     {
         global $testAuth;
-        $base_url = 'http://pojiwyou0.bkt.clouddn.com/demo.png?imageInfo';
+        $base_url = 'http://private-res.qiniudn.com/gogopher.jpg?exif';
         $private_url = $testAuth->privateDownloadUrl($base_url);
         $response = Client::get($private_url);
         $this->assertEquals(200, $response->statusCode);

vendor/qiniu/php-sdk/tests/Qiniu/Tests/EtagTest.php

@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Etag;
-use PHPUnit\Framework\TestCase;
 
-class EtagTest extends TestCase
+class EtagTest extends \PHPUnit_Framework_TestCase
 {
     public function test0M()
     {

vendor/qiniu/php-sdk/tests/Qiniu/Tests/FopTest.php

@@ -3,14 +3,13 @@ namespace Qiniu\Tests;
 
 use Qiniu\Processing\Operation;
 use Qiniu\Processing\PersistentFop;
-use PHPUnit\Framework\TestCase;
 
-class FopTest extends TestCase
+class FopTest extends \PHPUnit_Framework_TestCase
 {
     public function testExifPub()
     {
-        $fop = new Operation('7xkv1q.com1.z0.glb.clouddn.com');
-        list($exif, $error) = $fop->execute('grape.jpg', 'exif');
+        $fop = new Operation('testres.qiniudn.com');
+        list($exif, $error) = $fop->execute('gogopher.jpg', 'exif');
         $this->assertNull($error);
         $this->assertNotNull($exif);
     }
@@ -27,12 +26,12 @@ class FopTest extends TestCase
     public function testbuildUrl()
     {
         $fops = 'imageView2/2/h/200';
-        $fop = new Operation('7xkv1q.com1.z0.glb.clouddn.com');
-        $url = $fop->buildUrl('grape.jpg', $fops);
-        $this->assertEquals($url, 'http://7xkv1q.com1.z0.glb.clouddn.com/grape.jpg?imageView2/2/h/200');
+        $fop = new Operation('testres.qiniudn.com');
+        $url = $fop->buildUrl('gogopher.jpg', $fops);
+        $this->assertEquals($url, 'http://testres.qiniudn.com/gogopher.jpg?imageView2/2/h/200');
 
         $fops = array('imageView2/2/h/200', 'imageInfo');
-        $url = $fop->buildUrl('grape.jpg', $fops);
-        $this->assertEquals($url, 'http://7xkv1q.com1.z0.glb.clouddn.com/grape.jpg?imageView2/2/h/200|imageInfo');
+        $url = $fop->buildUrl('gogopher.jpg', $fops);
+        $this->assertEquals($url, 'http://testres.qiniudn.com/gogopher.jpg?imageView2/2/h/200|imageInfo');
     }
 }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/FormUpTest.php

@@ -4,15 +4,14 @@ namespace Qiniu\Tests;
 use Qiniu\Storage\FormUploader;
 use Qiniu\Storage\UploadManager;
 use Qiniu\Config;
-use PHPUnit\Framework\TestCase;
 
-class FormUpTest extends TestCase
+class FormUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
     protected $cfg;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;
@@ -25,16 +24,7 @@ class FormUpTest extends TestCase
     public function testData()
     {
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = FormUploader::put(
-            $token,
-            'formput',
-            'hello world',
-            $this->cfg,
-            null,
-            'text/plain',
-            null,
-            false
-        );
+        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -43,7 +33,7 @@ class FormUpTest extends TestCase
     {
         $upManager = new UploadManager();
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = $upManager->put($token, 'formput', 'hello world', null, 'text/plain', null, false);
+        list($ret, $error) = $upManager->put($token, 'formput', 'hello world', null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -52,7 +42,7 @@ class FormUpTest extends TestCase
     {
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', null, false);
+        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -62,7 +52,7 @@ class FormUpTest extends TestCase
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
         $upManager = new UploadManager();
-        list($ret, $error) = $upManager->putFile($token, $key, __file__, null, 'text/plain', null, false);
+        list($ret, $error) = $upManager->putFile($token, $key, __file__, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php

@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class HttpTest extends TestCase
+class HttpTest extends \PHPUnit_Framework_TestCase
 {
     public function testGet()
     {

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ImageUrlBuilderTest.php

@@ -2,8 +2,6 @@
 
 namespace Qiniu\Tests;
 
-use PHPUnit\Framework\TestCase;
-
 /**
  * imageprocess test
  *
@@ -11,7 +9,7 @@ use PHPUnit\Framework\TestCase;
  * @subpackage test
  * @author Sherlock Ren <sherlock_ren@icloud.com>
  */
-class ImageUrlBuilderTest extends TestCase
+class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * 缩略图测试

vendor/qiniu/php-sdk/tests/Qiniu/Tests/PfopTest.php

@@ -3,9 +3,8 @@ namespace Qiniu\Tests;
 
 use Qiniu\Processing\Operation;
 use Qiniu\Processing\PersistentFop;
-use PHPUnit\Framework\TestCase;
 
-class PfopTest extends TestCase
+class PfopTest extends \PHPUnit_Framework_TestCase
 {
     public function testPfop()
     {

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php

@@ -5,14 +5,13 @@ use Qiniu\Storage\ResumeUploader;
 use Qiniu\Storage\UploadManager;
 use Qiniu\Config;
 use Qiniu\Zone;
-use PHPUnit\Framework\TestCase;
 
-class ResumeUpTest extends TestCase
+class ResumeUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;
@@ -36,7 +35,7 @@ class ResumeUpTest extends TestCase
     public function test4ML2()
     {
         $key = 'resumePutFile4ML';
-        $zone = new Zone(array('up.qiniup.com'));
+        $zone = new Zone(array('up.fake.qiniu.com'), array('up.qiniup.com'));
         $cfg = new Config($zone);
         $upManager = new UploadManager($cfg);
         $token = $this->auth->uploadToken($this->bucketName, $key);

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php

@@ -3,9 +3,8 @@ namespace Qiniu\Tests;
 
 use Qiniu;
 use Qiniu\Zone;
-use PHPUnit\Framework\TestCase;
 
-class ZoneTest extends TestCase
+class ZoneTest extends \PHPUnit_Framework_TestCase
 {
     protected $zone;
     protected $zoneHttps;
@@ -16,7 +15,7 @@ class ZoneTest extends TestCase
     protected $bucketNameNA;
 
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;

vendor/qiniu/php-sdk/tests/bootstrap.php

@@ -9,8 +9,8 @@ $secretKey = getenv('QINIU_SECRET_KEY');
 $testAuth = new Auth($accessKey, $secretKey);
 
 $bucketName = 'phpsdk';
-$key = '1503385451.png';
-$key2 = '1503385568.png';
+$key = 'php-logo.png';
+$key2 = 'niu.jpg';
 
 $bucketNameBC = 'phpsdk-bc';
 $bucketNameNA = 'phpsdk-na';
@@ -21,7 +21,7 @@ $dummyAuth = new Auth($dummyAccessKey, $dummySecretKey);
 
 //cdn
 $timestampAntiLeechEncryptKey = getenv('QINIU_TIMESTAMP_ENCRPTKEY');
-$customDomain = "http://phpsdk.support2technical.me";
+$customDomain = "http://phpsdk.peterpy.cn";
 
 $tid = getenv('TRAVIS_JOB_NUMBER');
 if (!empty($tid)) {

vendor/zoujingli/think-library/readme.md

@@ -3,7 +3,7 @@
 # ThinkLibrary for ThinkPHP5.1
 ThinkLibrary 是针对 ThinkPHP5.1 版本封装的一套工具类库，方便快速构建 WEB 应用。
 
-## 主要包含内容
+## 包含组件
 * 数据列表展示（可带高级搜索器）
 * FORM表单处理器（表单展示及数据入库）
 * 数据状态快速处理（数据指定字段更新，支持多字段同时）
@@ -11,29 +11,36 @@ ThinkLibrary 是针对 ThinkPHP5.1 版本封装的一套工具类库，方便快
 * 文件存储通用组件（本地服务存储 + 阿里云OSS存储 + 七牛云存储）
 * 通用数据保存更新（通过 key 值及 where 判定是否存在，存在则更新，不存在则新增）
 * 通用网络请求 （支持 get 及 post，可配置请求证书等）
-* emoji 表情转义处理（部分数据库不支持保存 Emoji 表情，可用这个方法哦）
+* Emoji 表情转义处理（部分数据库不支持保存 Emoji 表情，可用这个方法哦）
 * 系统参数通用 k-v 配置（快速参数长久化配置）
 * UTF8加密算法支持（安全URL参数传参数）
 * 接口 CORS 跨域默认支持（输出 JSON 标准化）
-* 支持表单CSRF安全验证（自动化form标签替换）
+* 支持表单CSRF安全验证（自动化 FORM 标签替换）
 * 更新功能等待您来发现哦....
 
 ## 参考项目
-* Gitee 仓库：https://gitee.com/zoujingli/framework
-* Github 仓库：https://github.com/zoujingli/framework
 
-代码仓库
---
+#### framework - V1.0 / V2.0
+* Gitee 仓库 https://gitee.com/zoujingli/framework
+* Github 仓库 https://github.com/zoujingli/framework
+* 体验地址（账号密码都是admin）https://framework.thinkadmin.top
+
+#### ThinkAdmin - V4.0 / V4.1
+* Gitee 仓库 https://gitee.com/zoujingli/ThinkAdmin
+* Github 仓库 https://github.com/zoujingli/ThinkAdmin
+* 体验地址（账号密码都是admin）https://demo.thinkadmin.top
+
+## 代码仓库
  ThinkLibrary 为 MIT 协议开源项目，安装使用或二次开发不受约束，欢迎 fork 项目。
  
  部分代码来自互联网，若有异议可以联系作者进行删除。
  
- * 在线体验地址：https://framework.thinkadmin.top （账号和密码都是 admin ）
+ * 在线体验地址：https://demo.thinkadmin.top （账号和密码都是 admin ）
  * Gitee仓库地址：https://gitee.com/zoujingli/ThinkLibrary
  * GitHub仓库地址：https://github.com/zoujingli/ThinkLibrary
 
 ## 使用说明
-* ThinkLibrary 需要Composer支持
+* ThinkLibrary 需要 Composer 支持
 * 安装命令 ` composer require zoujingli/think-library 5.1.x-dev`
 * 案例代码：
 控制器需要继承 `library\Controller`，然后`$this`就可能使用全部功能
@@ -69,7 +76,7 @@ CREATE TABLE `system_config` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统配置';
 ```
 
-## 列表处理
+#### 列表处理
 ```php
 // 列表展示
 $this->_page($dbQuery, $isPage, $isDisplay, $total);
@@ -83,19 +90,19 @@ $db = $query->db(); // @todo 这里可以对db进行操作
 $this->_page($db); // 显示列表分页
 ```
 
-## 表单处理
+#### 表单处理
 ```php
 // 表单显示及数据更新
 $this->_form($dbQuery, $tplFile, $pkField , $where, $data);
 ```
 
-## 删除处理
+#### 删除处理
 ```php
 // 数据删除处理
 $this->_deleted($dbQuery);
 ```
 
-## 禁用启用处理
+#### 禁用启用处理
 ```php
 // 数据禁用处理
 $this->_save($dbQuery,['status'=>'0']);
@@ -104,7 +111,7 @@ $this->_save($dbQuery,['status'=>'0']);
 $this->_save($dbQuery,['status'=>'1']);
 ```
 
-## 文件存储组件（ oss 及 qiniu 需要配置参数）
+#### 文件存储组件（ oss 及 qiniu 需要配置参数）
 ```php
 
 // 配置默认存储方式    
@@ -160,13 +167,13 @@ $resutl = \library\File::instance('local')->info($filename);
 $resutl = \library\File::instance('qiniu')->info($filename);
 ```
 
-## 通用数据保存
+#### 通用数据保存
 ```php
 // 指定关键列更新（$where 为扩展条件）
 boolean data_save($dbQuery,$data,'pkname',$where);
 ```
 
-## 通用网络请求
+#### 通用网络请求
 ```php
 // 发起get请求
 $result = http_get($url,$query,$options);
@@ -177,7 +184,7 @@ $result = http_post($url,$data,$options);
 $result = \library\tools\Http::post($url,$data,$options);
 ```
 
-## emoji 表情转义（部分数据库不支持可以用这个）
+#### emoji 表情转义（部分数据库不支持可以用这个）
 ```php
 // 输入数据库前转义
 $content = emoji_encode($content);
@@ -186,7 +193,7 @@ $content = emoji_encode($content);
 $content = emoji_decode($content); 
 ```
 
-## 系统参数配置（基于 system_config 数据表）
+#### 系统参数配置（基于 system_config 数据表）
 ```php
 // 设置参数
 sysconf($keyname,$keyvalue);
@@ -195,11 +202,15 @@ sysconf($keyname,$keyvalue);
 $keyvalue = sysconf($kename);
 ```
 
-## UTF8加密算法
+#### UTF8加密算法
 ```php
 // 字符串加密操作
 $string = encode($content);
 
 // 加密字符串解密
 $content = decode($string);
-```
+```
+
+## 赞助打赏
+
+![赞助](http://static.thinkadmin.top/pay.png)

vendor/zoujingli/think-library/src/Controller.php

@@ -43,7 +43,13 @@ class Controller extends \stdClass
      * 表单CSRF验证状态
      * @var boolean
      */
-    private $csrf = false;
+    private $csrf_state = false;
+
+    /**
+     * 表单CSRF验证失败提示消息
+     * @var string
+     */
+    protected $csrf_message = '表单令牌验证失败，请刷新页面再试！';
 
     /**
      * Controller constructor.
@@ -106,7 +112,7 @@ class Controller extends \stdClass
     public function success($info, $data = [], $code = 1)
     {
         $result = ['code' => $code, 'info' => $info, 'data' => $data];
-        if ($this->csrf) Csrf::clearFormToken(Csrf::getToken());
+        if ($this->csrf_state) Csrf::clearFormToken(Csrf::getToken());
         throw new HttpResponseException(json($result));
     }
 
@@ -130,7 +136,7 @@ class Controller extends \stdClass
     public function fetch($tpl = '', $vars = [], $node = null)
     {
         foreach ($this as $name => $value) $vars[$name] = $value;
-        if ($this->csrf) {
+        if ($this->csrf_state) {
             Csrf::fetchTemplate($tpl, $vars, $node);
         } else {
             throw new HttpResponseException(view($tpl, $vars));
@@ -182,10 +188,10 @@ class Controller extends \stdClass
      */
     protected function applyCsrfToken($return = false)
     {
-        $this->csrf = true;
+        $this->csrf_state = true;
         if ($this->request->isPost() && !Csrf::checkFormToken()) {
             if ($return) return false;
-            $this->error('表单令牌验证失败，请刷新页面再试！');
+            $this->error($this->csrf_message);
         } else {
             return true;
         }