ComposerUpdate

This commit is contained in:
Anyon 2019-11-23 18:32:57 +08:00
parent 87025970dc
commit ddab1c5775
7 changed files with 26 additions and 22 deletions

8
composer.lock generated
View File

@ -783,12 +783,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b" "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7a0ad7fe8fdd6079d8cc856405ac127505ed840b", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a01d99bd039989a587fdc0c9d38e300b86a71045",
"reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b", "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -832,7 +832,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2019-11-23T09:23:18+00:00" "time": "2019-11-23T10:28:22+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9 class ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517
{ {
private static $loader; private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit078c2496db47e2e94f2057948fdfa517::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$files; $includeFiles = Composer\Autoload\ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire41e48da7c236026fbb8265abc69af9d9($fileIdentifier, $file); composerRequire078c2496db47e2e94f2057948fdfa517($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire41e48da7c236026fbb8265abc69af9d9($fileIdentifier, $file) function composerRequire078c2496db47e2e94f2057948fdfa517($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit41e48da7c236026fbb8265abc69af9d9 class ComposerStaticInit078c2496db47e2e94f2057948fdfa517
{ {
public static $files = array ( public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -471,9 +471,9 @@ class ComposerStaticInit41e48da7c236026fbb8265abc69af9d9
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$classMap; $loader->classMap = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -805,12 +805,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b" "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7a0ad7fe8fdd6079d8cc856405ac127505ed840b", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a01d99bd039989a587fdc0c9d38e300b86a71045",
"reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b", "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -826,7 +826,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2019-11-23T09:23:18+00:00", "time": "2019-11-23T10:28:22+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2019-11-23 17:26:05 // This file is automatically generated at:2019-11-23 18:32:47
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

View File

@ -32,7 +32,11 @@ class Library extends Service
*/ */
public function register() public function register()
{ {
if (PHP_SAPI !== 'cli') { if ($this->app->request->isCli()) {
if (empty($_SERVER['REQUEST_URI']) && isset($_SERVER['argv'][1])) {
$this->app->request->setPathinfo($_SERVER['argv'][1]);
}
} else {
// 注册会话中间键 // 注册会话中间键
$this->app->middleware->add(SessionInit::class); $this->app->middleware->add(SessionInit::class);
// 注册访问中间键 // 注册访问中间键