Reorganise test project hierarchy

PhpGt · Jul 18, 2019 · 523e898 · 523e898
1 parent bca1d67
commit 523e898
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,6 +24,7 @@ jobs:
 
       - run: mkdir test/unit/_junit
       - run: vendor/bin/phpunit -c test/unit/phpunit.xml --log-junit test/unit/_junit/junit.xml -d memory_limit=512M
+      - run:
 
       - store_test_results:
           path: test/unit/_junit

diff --git a/src/FileSystem/DirectoryWalker.php b/src/FileSystem/DirectoryWalker.php
@@ -12,8 +12,9 @@ public function __construct(string $directory) {
 	public function findParentContaining(string $match):?string {
 		$path = $this->directory;
 
-		while(!$this->pathIsRoot($path)
-		&& !$this->directoryContains($path, $match)) {
+		while(strlen($path) > 0
+		&& (!$this->pathIsRoot($path)
+		&& !$this->directoryContains($path, $match))) {
 			$lastSlashPos = strrpos($path, DIRECTORY_SEPARATOR);
 			$path = substr($path, 0, $lastSlashPos);
 		}

diff --git a/...ect/dynamic-uris/test/behaviour/behat.yml → test/behaviour/behat.yml b/...ect/dynamic-uris/test/behaviour/behat.yml → test/behaviour/behat.yml
diff --git a/...st/behaviour/features/CommonLogic.feature → test/behaviour/features/CommonLogic.feature b/...st/behaviour/features/CommonLogic.feature → test/behaviour/features/CommonLogic.feature
diff --git a/...t/behaviour/features/DynamicPages.feature → test/behaviour/features/DynamicPages.feature b/...t/behaviour/features/DynamicPages.feature → test/behaviour/features/DynamicPages.feature
diff --git a/...our/features/bootstrap/FeatureContext.php → ...our/features/bootstrap/FeatureContext.php b/...our/features/bootstrap/FeatureContext.php → ...our/features/bootstrap/FeatureContext.php
diff --git a/...aviour/project/dynamic-uris/composer.json → test/project/dynamic-uris/composer.json b/...aviour/project/dynamic-uris/composer.json → test/project/dynamic-uris/composer.json
diff --git a/...aviour/project/dynamic-uris/composer.lock → test/project/dynamic-uris/composer.lock b/...aviour/project/dynamic-uris/composer.lock → test/project/dynamic-uris/composer.lock
diff --git a/...behaviour/project/dynamic-uris/config.ini → test/project/dynamic-uris/config.ini b/...behaviour/project/dynamic-uris/config.ini → test/project/dynamic-uris/config.ini
diff --git a/...our/project/dynamic-uris/page/_common.php → test/project/dynamic-uris/page/_common.php b/...our/project/dynamic-uris/page/_common.php → test/project/dynamic-uris/page/_common.php
diff --git a/...project/dynamic-uris/page/dir/_common.php → ...project/dynamic-uris/page/dir/_common.php b/...project/dynamic-uris/page/dir/_common.php → ...project/dynamic-uris/page/dir/_common.php
diff --git a/.../project/dynamic-uris/page/dir/index.html → .../project/dynamic-uris/page/dir/index.html b/.../project/dynamic-uris/page/dir/index.html → .../project/dynamic-uris/page/dir/index.html
diff --git a/...r/project/dynamic-uris/page/dir/index.php → test/project/dynamic-uris/page/dir/index.php b/...r/project/dynamic-uris/page/dir/index.php → test/project/dynamic-uris/page/dir/index.php
diff --git a/...age/dir/nested-no-index/@dynamicPage.html → ...age/dir/nested-no-index/@dynamicPage.html b/...age/dir/nested-no-index/@dynamicPage.html → ...age/dir/nested-no-index/@dynamicPage.html
diff --git a/...page/dir/nested-no-index/@dynamicPage.php → ...page/dir/nested-no-index/@dynamicPage.php b/...page/dir/nested-no-index/@dynamicPage.php → ...page/dir/nested-no-index/@dynamicPage.php
diff --git a/...uris/page/dir/nested-no-index/_common.php → ...uris/page/dir/nested-no-index/_common.php b/...uris/page/dir/nested-no-index/_common.php → ...uris/page/dir/nested-no-index/_common.php
diff --git a/...ic-uris/page/dir/nested/@dynamicPage.html → ...ic-uris/page/dir/nested/@dynamicPage.html b/...ic-uris/page/dir/nested/@dynamicPage.html → ...ic-uris/page/dir/nested/@dynamicPage.html
diff --git a/...mic-uris/page/dir/nested/@dynamicPage.php → ...mic-uris/page/dir/nested/@dynamicPage.php b/...mic-uris/page/dir/nested/@dynamicPage.php → ...mic-uris/page/dir/nested/@dynamicPage.php
diff --git a/.../dynamic-uris/page/dir/nested/_common.php → .../dynamic-uris/page/dir/nested/_common.php b/.../dynamic-uris/page/dir/nested/_common.php → .../dynamic-uris/page/dir/nested/_common.php
diff --git a/...t/dynamic-uris/page/dir/nested/index.html → ...t/dynamic-uris/page/dir/nested/index.html b/...t/dynamic-uris/page/dir/nested/index.html → ...t/dynamic-uris/page/dir/nested/index.html
diff --git a/...ct/dynamic-uris/page/dir/nested/index.php → ...ct/dynamic-uris/page/dir/nested/index.php b/...ct/dynamic-uris/page/dir/nested/index.php → ...ct/dynamic-uris/page/dir/nested/index.php
diff --git a/...iour/project/dynamic-uris/page/index.html → test/project/dynamic-uris/page/index.html b/...iour/project/dynamic-uris/page/index.html → test/project/dynamic-uris/page/index.html
diff --git a/...viour/project/dynamic-uris/page/index.php → test/project/dynamic-uris/page/index.php b/...viour/project/dynamic-uris/page/index.php → test/project/dynamic-uris/page/index.php
diff --git a/test/unit/Logic/AutoloaderTest.php b/test/unit/Logic/AutoloaderTest.php
@@ -11,7 +11,7 @@ public function testAutoloadFindsCommonPage() {
 			"..",
 			"..",
 			"project",
-			"CommonAutoloader",
+			"dynamic-uris",
 		]);
 
 		$autoloader = new Autoloader(
@@ -35,7 +35,7 @@ public function testAutoloadFindsNestedCommonPage() {
 			"..",
 			"..",
 			"project",
-			"CommonAutoloader",
+			"dynamic-uris",
 		]);
 
 		$autoloader = new Autoloader(
@@ -44,11 +44,11 @@ public function testAutoloadFindsNestedCommonPage() {
 		);
 
 		$autoloader->autoload(
-			"\\Test\\App\\Page\\subdir\\_CommonPage"
+			"\\Test\\App\\Page\\dir\\nested\\_CommonPage"
 		);
 
 		self::assertTrue(class_exists(
-			"\\Test\\App\\Page\\SubDir\\_CommonPage",
+			"\\Test\\App\\Page\\dir\\nested\\_CommonPage",
 			false
 		));
 	}