Requirements bugfixes

Author: harm-less

src/FQ/query/FilesQueryRequirements.php

@@ -214,6 +214,7 @@ protected function requirementLast(FilesQuery $query) {
 		}
 
 		if (!$oneExists) {
+			var_dump($lastRootDirId);
 			if ($lastRootDirId === null) {
 				return new FileQueryRequirementsException('Query requires at least one file to exist in at least one child directory, but there isn\'t even a root directory. Make sure you have at least one root directory in your query');
 			}

tests/FQ/Tests/Query/FilesQueryRequirementsTest.php

@@ -164,6 +164,12 @@ public function testRequirementLastSuccess() {
 		$success = $this->callNonPublicMethod('requirementLast', array($this->query()));
 		$this->assertTrue($success);
 	}
+	public function testRequirementLastFailureNoRootDir() {
+		$this->setExpectedException('\FQ\Exceptions\FileQueryRequirementsException', 'Query requires at least one file to exist in at least one child directory, but there isn\'t even a root directory. Make sure you have at least one root directory in your query');
+		$this->query()->getRootDirSelection()->excludeDirById(self::ROOT_DIR_DEFAULT_ID);
+		$this->runQuery();
+		$this->callNonPublicMethod('requirementLast', array($this->query()));
+	}
 	public function testRequirementLastFailure() {
 		$this->setExpectedException('\FQ\Exceptions\FileQueryRequirementsException');
 		$this->files()->addRootDir($this->_newActualRootDirSecond());

tests/FQ/Tests/Query/FilesQueryTest.php

@@ -220,6 +220,40 @@ public function testListBasePathsWithReversedSetToTrue() {
 			}
 			$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);
+			}
+			$index++;
+		}
+	}
+
+	public function testListRawPathsWithReversedSetToTrue() {
+		$this->files()->addRootDir($this->_newActualRootDirSecond());
+		$query = $this->query();
+		$query->reverse(true);
+		$this->runQuery('File1');
+		$rawPaths = $query->listRawPaths();
+		$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);
+			}
+			$index++;
+		}
 	}
 
 	public function testHasPathsWhenQueryHasNotRan() {