Spl bugs fixing and visibility changes

o2system · Mar 12, 2019 · 4b00101 · 4b00101
1 parent e43013f
commit 4b00101
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/src/DataStructures/SplArrayQueue.php b/src/DataStructures/SplArrayQueue.php
@@ -94,7 +94,7 @@ public function has($needle, $strict = false)
     // -----------------------------------------------------------------------
 
     /**
-     * SplArrayStack::getArrayCopy
+     * SplArrayQueue::getArrayCopy
      *
      * Creates a copy of the storage.
      *
@@ -104,8 +104,8 @@ public function getArrayCopy()
     {
         $arrayCopy = [];
 
-        foreach ($this as $key => $value) {
-            $arrayCopy[ $key ] = $value;
+        for ($this->rewind(); $this->valid(); $this->next()) {
+            $arrayCopy[] = $this->current();
         }
 
         return $arrayCopy;

diff --git a/src/DataStructures/SplArrayStack.php b/src/DataStructures/SplArrayStack.php
@@ -43,24 +43,6 @@ public function __construct(array $stack = [])
 
     // -----------------------------------------------------------------------
 
-    /**
-     * SplArrayStack::current
-     *
-     * Replacement for \SplStack current method
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        if (null === ($current = parent::current())) {
-            $this->rewind();
-        }
-
-        return parent::current();
-    }
-
-    // -----------------------------------------------------------------------
-
     /**
      * SplArrayStack::isEmpty
      *
@@ -104,8 +86,8 @@ public function getArrayCopy()
     {
         $arrayCopy = [];
 
-        foreach ($this as $key => $value) {
-            $arrayCopy[ $key ] = $value;
+        for ($this->rewind(); $this->valid(); $this->next()) {
+            $arrayCopy[] = $this->current();
         }
 
         return $arrayCopy;

diff --git a/src/Traits/Collectors/FilePathCollectorTrait.php b/src/Traits/Collectors/FilePathCollectorTrait.php
@@ -101,6 +101,13 @@ public function addFilePath($filePath, $offset = null)
                 ) . $this->fileDirName . DIRECTORY_SEPARATOR;
         }
 
+        return $this->pushFilePath($filePath, $offset);
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function pushFilePath($filePath, $offset = null)
+    {
         if (is_dir($filePath) AND ! in_array($filePath, $this->filePaths)) {
             if (isset($offset)) {
                 $this->filePaths[ $offset ] = $filePath;
@@ -111,6 +118,4 @@ public function addFilePath($filePath, $offset = null)
 
         return $this;
     }
-
-    // ------------------------------------------------------------------------
 }