fix(DirectorySnapshot) sort files

Author: lucatume

.github/main.workflow

@@ -0,0 +1,14 @@
+workflow "Test on PHP 5.6" {
+  on = "push"
+  resolves = "test"
+}
+
+action "install" {
+  uses = "MilesChou/composer-action/5.6/install@master"
+}
+
+action "test" {
+  needs = ["install"]
+  uses = "docker://php:5.6-alpine"
+  args = "vendor/bin/codecept run"
+}

src/DirectorySnapshot.php

@@ -36,14 +36,12 @@ protected function buildIterator($dir)
     {
         $dir = rtrim($dir, '\\/');
 
-        $iterator = new \RecursiveIteratorIterator(
+        return new \RecursiveIteratorIterator(
             new \RecursiveDirectoryIterator(
                 $dir,
                 \RecursiveDirectoryIterator::SKIP_DOTS | \RecursiveDirectoryIterator::UNIX_PATHS
             )
         );
-
-        return $iterator;
     }
 
     /**
@@ -105,6 +103,8 @@ protected function assertData($data)
             return '/' . ltrim(str_replace($root, '', $file->getPathname()), '/');
         }, iterator_to_array($currentIterator, false));
 
+        usort($currentFiles, 'strcasecmp');
+
         $this->prettyAssert(
             $snapshotFiles,
             $currentFiles,
@@ -113,7 +113,15 @@ protected function assertData($data)
 
         $multiIterator = new \MultipleIterator();
         $multiIterator->attachIterator(new \ArrayIterator($snapshotFiles));
-        $multiIterator->attachIterator($currentIterator);
+        $sortedFiles = iterator_to_array($currentIterator);
+        $sortedFiles = array_combine(
+            array_map(static function (\SplFileInfo $f) {
+                return $f->getPathname();
+            }, $sortedFiles),
+            $sortedFiles
+        );
+        uksort($sortedFiles, 'strcasecmp');
+        $multiIterator->attachIterator(new \ArrayIterator($sortedFiles));
 
         /** @var \SplFileInfo $file */
         foreach ($multiIterator as list($fileRelativePath, $file)) {
@@ -163,6 +171,8 @@ protected function readFileListFromSnapshot($snapshotFilePath)
             throw new \RuntimeException("Could not close snapshot file [{$snapshotFilePath}].");
         }
 
+        usort($filePaths, 'strcasecmp');
+
         return $filePaths;
     }