Returns false if the Qualified Name is not found

Author: natanfelles

system/Autoloader/FileLocator.php

@@ -220,9 +220,7 @@ public function search(string $path, string $ext = 'php'): array
 
 		foreach ($this->getNamespaces() as $namespace)
 		{
-			$namespace['path'] = rtrim($namespace['path'], '/') . '/';
-
-			if (is_file($namespace['path'] . $path) === true)
+			if (is_file($namespace['path'] . $path))
 			{
 				$foundPaths[] = $namespace['path'] . $path;
 			}
@@ -294,21 +292,20 @@ protected function getNamespaces(string $prefix = null)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Attempts to load a file and instantiate a new class by looking
-	 * at its full path and comparing that to our existing psr4 namespaces
-	 * in Autoloader config file.
+	 * Find the qualified name of a file according to
+	 * the namespace of the first matched namespace path.
 	 *
 	 * @param string $path
 	 *
-	 * @return string|void
+	 * @return string|false The qualified name or false if the path is not found
 	 */
 	public function findQualifiedNameFromPath(string $path)
 	{
 		$path = realpath($path);
 
 		if (! $path)
 		{
-			return;
+			return false;
 		}
 
 		foreach ($this->getNamespaces() as $namespace)
@@ -332,6 +329,8 @@ public function findQualifiedNameFromPath(string $path)
 				return $className;
 			}
 		}
+
+		return false;
 	}
 
 	//--------------------------------------------------------------------

tests/system/Autoloader/FileLocatorTest.php

@@ -245,14 +245,14 @@ public function testFindQNameFromPathWithFileNotExist()
 	{
 		$ClassName = $this->locator->findQualifiedNameFromPath('modules/blog/Views/index.php');
 
-		$this->assertNull($ClassName);
+		$this->assertFalse($ClassName);
 	}
 
 	public function testFindQNameFromPathWithoutCorrespondingNamespace()
 	{
 		$ClassName = $this->locator->findQualifiedNameFromPath('/etc/hosts');
 
-		$this->assertNull($ClassName);
+		$this->assertFalse($ClassName);
 	}
 
 	public function testGetClassNameFromClassFile()