优化对 Phar 的支持 top-think#3049

Author: big-dream

src/think/App.php

@@ -173,7 +173,7 @@ class App extends Container
      */
     public function __construct(string $rootPath = '')
     {
-        $this->thinkPath   = realpath(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
+        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
         $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
         $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
         $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
@@ -538,14 +538,12 @@ protected function load(): void
 
         $configPath = $this->getConfigPath();
 
-        $files = [];
-
         if (is_dir($configPath)) {
-            $files = glob($configPath . '*' . $this->configExt);
-        }
+            foreach (scandir($configPath) as $name) {
+                if (!str_ends_with($name, $this->configExt) || !is_file($configPath . $name)) continue;
 
-        foreach ($files as $file) {
-            $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
+                $this->config->load($configPath . $name, pathinfo($name, PATHINFO_FILENAME));
+            }
         }
 
         if (is_file($appPath . 'event.php')) {

src/think/Http.php

@@ -229,9 +229,10 @@ protected function loadRoutes(): void
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
-            foreach ($files as $file) {
-                include $file;
+            foreach (scandir($routePath) as $name) {
+                if (!str_ends_with($name, '.php') || !is_file($routePath . $name)) continue;
+
+                include $routePath . $name;
             }
         }
 

src/think/Lang.php

@@ -137,8 +137,22 @@ public function switchLangSet(string $langset)
         ]);
 
         // 加载系统语言包
-        $files = glob($this->app->getAppPath() . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
-        $this->load($files);
+        $appLangDir = $this->app->getAppPath() . 'lang' . DIRECTORY_SEPARATOR;
+        if (is_dir($appLangDir)) {
+            $files = [];
+
+            foreach (scandir($appLangDir) as $name) {
+                $path = $appLangDir . $name;
+
+                if (!str_starts_with($name, $langset) || !is_file($path) || !in_array(pathinfo($name, PATHINFO_EXTENSION), ['php', 'yaml', 'json'])) {
+                    continue;
+                }
+
+                $files[] = $path;
+            }
+
+            $this->load($files);
+        }
 
         // 加载扩展（自定义）语言包
         $list = $this->app->config->get('lang.extend_list', []);

src/think/log/driver/File.php

@@ -135,7 +135,12 @@ protected function getMasterLogFile(): string
     {
 
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = [];
+            foreach (scandir($this->config['path']) as $name) {
+                if (!str_ends_with($name, '.log') || !is_file($this->config['path'] . $name)) continue;
+
+                $files[] = $this->config['path'] . $name;
+            }
 
             try {
                 if (count($files) > $this->config['max_files']) {