diff --git a/composer.lock b/composer.lock index ed5a3ea7f..ee48284c2 100644 --- a/composer.lock +++ b/composer.lock @@ -498,16 +498,16 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a" + "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a", - "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed", + "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed", "shasum": "", "mirrors": [ { @@ -554,7 +554,7 @@ "configuration", "options" ], - "time": "2019-10-26T11:02:01+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "topthink/framework", @@ -815,16 +815,16 @@ }, { "name": "topthink/think-view", - "version": "v1.0.13", + "version": "v1.0.14", "source": { "type": "git", "url": "https://github.com/top-think/think-view.git", - "reference": "90803b73f781db5d42619082c4597afc58b2d4c5" + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-view/zipball/90803b73f781db5d42619082c4597afc58b2d4c5", - "reference": "90803b73f781db5d42619082c4597afc58b2d4c5", + "url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d", + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d", "shasum": "", "mirrors": [ { @@ -854,7 +854,7 @@ } ], "description": "thinkphp template driver", - "time": "2019-10-07T12:23:10+00:00" + "time": "2019-11-06T11:40:13+00:00" }, { "name": "zoujingli/ip2region", @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1e0488650982272bedf647c95f02924919dce206" + "reference": "6376bf39396292e9920b43f917d9e3dc307ef898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1e0488650982272bedf647c95f02924919dce206", - "reference": "1e0488650982272bedf647c95f02924919dce206", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6376bf39396292e9920b43f917d9e3dc307ef898", + "reference": "6376bf39396292e9920b43f917d9e3dc307ef898", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-01-14T06:06:23+00:00" + "time": "2020-01-16T03:30:15+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 65dd48abd..6f1a49c39 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -507,17 +507,17 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.36", - "version_normalized": "3.4.36.0", + "version": "v3.4.37", + "version_normalized": "3.4.37.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a" + "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a", - "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed", + "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed", "shasum": "", "mirrors": [ { @@ -529,7 +529,7 @@ "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2019-10-26T11:02:01+00:00", + "time": "2020-01-01T11:03:25+00:00", "type": "library", "extra": { "branch-alias": { @@ -836,17 +836,17 @@ }, { "name": "topthink/think-view", - "version": "v1.0.13", - "version_normalized": "1.0.13.0", + "version": "v1.0.14", + "version_normalized": "1.0.14.0", "source": { "type": "git", "url": "https://github.com/top-think/think-view.git", - "reference": "90803b73f781db5d42619082c4597afc58b2d4c5" + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-view/zipball/90803b73f781db5d42619082c4597afc58b2d4c5", - "reference": "90803b73f781db5d42619082c4597afc58b2d4c5", + "url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d", + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d", "shasum": "", "mirrors": [ { @@ -859,7 +859,7 @@ "php": ">=7.1.0", "topthink/think-template": "^2.0" }, - "time": "2019-10-07T12:23:10+00:00", + "time": "2019-11-06T11:40:13+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1e0488650982272bedf647c95f02924919dce206" + "reference": "6376bf39396292e9920b43f917d9e3dc307ef898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1e0488650982272bedf647c95f02924919dce206", - "reference": "1e0488650982272bedf647c95f02924919dce206", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6376bf39396292e9920b43f917d9e3dc307ef898", + "reference": "6376bf39396292e9920b43f917d9e3dc307ef898", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-01-14T06:06:23+00:00", + "time": "2020-01-16T03:30:15+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 0d827548d..978d386d5 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/symfony/options-resolver/LICENSE b/vendor/symfony/options-resolver/LICENSE index a677f4376..9e936ec04 100644 --- a/vendor/symfony/options-resolver/LICENSE +++ b/vendor/symfony/options-resolver/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2019 Fabien Potencier +Copyright (c) 2004-2020 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/topthink/think-view/src/Think.php b/vendor/topthink/think-view/src/Think.php index 02be10f25..562b54aec 100644 --- a/vendor/topthink/think-view/src/Think.php +++ b/vendor/topthink/think-view/src/Think.php @@ -146,10 +146,6 @@ class Think throw new TemplateNotFoundException('template not exists:' . $template, $template); } - // 记录视图信息 - $this->app['log'] - ->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]'); - $this->template->fetch($template, $data); } diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 9199bead9..23e0e99fd 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -259,8 +259,12 @@ if (!function_exists('format_bytes')) { */ function format_bytes($size) { - $units = [' B', ' KB', ' MB', ' GB', ' TB']; - for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024; - return round($size, 2) . $units[$i]; + if (is_numeric($size)) { + $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024; + return round($size, 2) . ' ' . $units[$i]; + } else { + return $size; + } } } \ No newline at end of file