Bugfix

- Load method in FilesQuery has a max files load
- Bugfix: adding a dir to the DirCollection caused it to have wrong
indexes because a index of -1 could occur

Author: harm-less

src/FQ/collections/DirCollection.php

@@ -23,7 +23,7 @@ public function addDir(Dir $dir, $index = null) {
 		if (is_int($index) && $totalDirs < $index) {
 			throw new DirCollectionException(sprintf('Trying to add dir, but the provided index of "%s" is to high. There are currently %s dirs.', $index, $totalDirs));
 		}
-		array_splice($this->_dirs, $index === null ? $totalDirs - 1 : $index, 0, array($dir));
+		array_splice($this->_dirs, $index === null ? $totalDirs : $index, 0, array($dir));
 		return $dir;
 	}
 

src/FQ/query/FilesQuery.php

@@ -325,13 +325,23 @@ protected function _prepareQueryChild(ChildDir $childDir, $rootDirs) {
 		return $queryChild;
 	}
 
-	public function load() {
+	/**
+	 * @param int $maxFiles
+	 * @return bool
+	 */
+	public function load($maxFiles = 0) {
 		$this->_hasRunCheck();
 
 		if ($this->queryHasFilter(FilesQuery::FILTER_EXISTING)) {
+			$filesLoaded = 0;
 			foreach ($this->listPathsSimple() as $path) {
 				/** @noinspection PhpIncludeInspection */
 				require_once $path;
+
+				$filesLoaded++;
+				if ($maxFiles > 0 && $filesLoaded >= $maxFiles) {
+					break;
+				}
 			}
 			return true;
 		}

src/FQ/query/FilesQueryRequirements.php

@@ -204,7 +204,7 @@ protected function requirementLast(FilesQuery $query) {
 		$lastRootDirId = null;
 		$rootSelection = $query->getCurrentRootDirSelection();
 		if (count($rootSelection) >= 1) {
-			$lastRootDirId = $rootSelection[0]->id();
+			$lastRootDirId = $rootSelection[count($rootSelection) - 1]->id();
 
 			foreach ($query->queryChildDirs(true) as $child) {
 				$pathExist = $child->pathsExist();

tests/FQ/Tests/FilesTest.php

@@ -224,15 +224,15 @@ public function testQueryPathWithTwoRootDirs() {
 		$this->_addRootDir();
 		$this->_addRootDir(null, $this->_newActualRootDirSecond());
 		$this->_addChildDir();
-		$this->assertEquals(self::ROOT_DIR_SECOND_ABSOLUTE_PATH . '/child1/File1.php', $files->queryPath('File1'));
+		$this->assertEquals(self::ROOT_DIR_DEFAULT_ABSOLUTE_PATH . '/child1/File1.php', $files->queryPath('File1'));
 		$this->assertFalse($files->queryPath('does-not-exist'));
 	}
 	public function testQueryPathWithTwoRootDirsWhenReversed() {
 		$files = $this->files();
 		$this->_addRootDir();
 		$this->_addRootDir(null, $this->_newActualRootDirSecond());
 		$this->_addChildDir();
-		$this->assertEquals(self::ROOT_DIR_DEFAULT_ABSOLUTE_PATH . '/child1/File1.php', $files->queryPath('File1', null, null, true));
+		$this->assertEquals(self::ROOT_DIR_SECOND_ABSOLUTE_PATH . '/child1/File1.php', $files->queryPath('File1', null, null, true));
 		$this->assertFalse($files->queryPath('does-not-exist'));
 	}
 

tests/FQ/Tests/Query/FilesQueryTest.php

@@ -250,27 +250,27 @@ public function testListBasePathsWithReversedSetToTrue() {
 		$index = 0;
 		foreach ($paths as $rootDirId => $path) {
 			if ($index === 0) {
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_BASE_PATH . '/child1/File1.php', $path);
-			}
-			else if ($index === 1) {
 				$this->assertEquals(self::ROOT_DIR_SECOND_ID, $rootDirId);
 				$this->assertEquals(self::ROOT_DIR_SECOND_BASE_PATH . '/child1/File1.php', $path);
 			}
+			else if ($index === 1) {
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_BASE_PATH . '/child1/File1.php', $path);
+			}
 			$index++;
 		}
 
 		$rawPaths = $query->listRawPaths();
 		$index = 0;
 		foreach ($paths as $rootDirId => $path) {
 			if ($index === 0) {
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_BASE_PATH . '/child1/File1.php', $path);
-			}
-			else if ($index === 1) {
 				$this->assertEquals(self::ROOT_DIR_SECOND_ID, $rootDirId);
 				$this->assertEquals(self::ROOT_DIR_SECOND_BASE_PATH . '/child1/File1.php', $path);
 			}
+			else if ($index === 1) {
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_BASE_PATH . '/child1/File1.php', $path);
+			}
 			$index++;
 		}
 	}
@@ -284,13 +284,13 @@ public function testListRawPathsWithReversedSetToTrue() {
 		$index = 0;
 		foreach ($rawPaths as $rootDirId => $path) {
 			if ($index === 0) {
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_ABSOLUTE_PATH . '/child1/File1.php', $path);
-			}
-			else if ($index === 1) {
 				$this->assertEquals(self::ROOT_DIR_SECOND_ID, $rootDirId);
 				$this->assertEquals(self::ROOT_DIR_SECOND_ABSOLUTE_PATH . '/child1/File1.php', $path);
 			}
+			else if ($index === 1) {
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_ABSOLUTE_PATH . '/child1/File1.php', $path);
+			}
 			$index++;
 		}
 	}

tests/FQ/Tests/Samples/SimpleSampleTest.php

@@ -33,14 +33,14 @@ public function testQueryFile1InReverse(){
 		$index = 0;
 		foreach ($paths as $rootDirId => $childPaths) {
 			if ($index === 0) {
-				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
-				$this->assertEquals($this->sample()->root() . 'root1/child2/File1.php', $childPaths[0]);
-				$this->assertEquals($this->sample()->root() . 'root1/child1/File1.php', $childPaths[1]);
+				$this->assertEquals(self::ROOT_DIR_SECOND_ID, $rootDirId);
+				$this->assertEquals($this->sample()->root() . 'root2/child1/File1.php', $childPaths[0]);
+				$this->assertEquals($this->sample()->root() . 'root2/child2/File1.php', $childPaths[1]);
 			}
 			else if ($index === 1) {
-				$this->assertEquals(self::ROOT_DIR_SECOND_ID, $rootDirId);
-				$this->assertEquals($this->sample()->root() . 'root2/child2/File1.php', $childPaths[0]);
-				$this->assertEquals($this->sample()->root() . 'root2/child1/File1.php', $childPaths[1]);
+				$this->assertEquals(self::ROOT_DIR_DEFAULT_ID, $rootDirId);
+				$this->assertEquals($this->sample()->root() . 'root1/child1/File1.php', $childPaths[0]);
+				$this->assertEquals($this->sample()->root() . 'root1/child2/File1.php', $childPaths[1]);
 			}
 			$index++;
 		}