change the loader logic of load dict files. (#121)

* change the loader logic of load dict files. * change the loader logic of load dict files.
overtrue · Apr 21, 2019 · 89f560e · 89f560e
1 parent 046e162
commit 89f560e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/FileDictLoader.php b/src/FileDictLoader.php
@@ -49,7 +49,9 @@ public function __construct($path)
      */
     public function map(Closure $callback)
     {
-        for ($i = 0; $i < 100; ++$i) {
+        $dirs = scandir($this->path);
+        $size = count($dirs) - 2;
+        for ($i = 0; $i < $size; ++$i) {
             $segment = $this->path.'/'.sprintf($this->segmentName, $i);
 
             if (file_exists($segment)) {

diff --git a/src/GeneratorFileDictLoader.php b/src/GeneratorFileDictLoader.php
@@ -57,7 +57,9 @@ public function __construct($path)
     {
         $this->path = $path;
 
-        for ($i = 0; $i < 100; ++$i) {
+        $dirs = scandir($this->path);
+        $size = count($dirs) - 2;
+        for ($i = 0; $i < $size; ++$i) {
             $segment = $this->path.'/'.sprintf($this->segmentName, $i);
 
             if (file_exists($segment) && is_file($segment)) {
@@ -70,6 +72,7 @@ public function __construct($path)
      * Construct a new file object.
      *
      * @param string $filename file path
+     * @param string $mode file open mode
      *
      * @return SplFileObject
      */
@@ -82,6 +85,8 @@ protected function openFile($filename, $mode = 'r')
      * get Generator syntax.
      *
      * @param array $handles SplFileObjects
+     *
+     * @return Generator
      */
     protected function getGenerator(array $handles)
     {

diff --git a/src/MemoryFileDictLoader.php b/src/MemoryFileDictLoader.php
@@ -55,7 +55,9 @@ public function __construct($path)
     {
         $this->path = $path;
 
-        for ($i = 0; $i < 100; ++$i) {
+        $dirs = scandir($this->path);
+        $size = count($dirs) - 2;
+        for ($i = 0; $i < $size; ++$i) {
             $segment = $path.'/'.sprintf($this->segmentName, $i);
 
             if (file_exists($segment)) {