~ fix case sensitive name storing

~ fix incorrect non-class files handling
+ add tests for all cases

Signed-off-by: Christoph Potas <[email protected]>

Author: puschie286

system/Autoloader/FileLocator.php

@@ -194,6 +194,8 @@ public function getClassname(string $file) : string
 			}
 		}
 
+		if( empty( $class_name ) ) return "";
+
 		return $namespace .'\\'. $class_name;
 	}
 

system/Config/Config.php

@@ -27,12 +27,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @package	CodeIgniter
- * @author	CodeIgniter Dev Team
- * @copyright	2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
- * @license	https://opensource.org/licenses/MIT	MIT License
- * @link	https://codeigniter.com
- * @since	Version 3.0.0
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 3.0.0
  * @filesource
  */
 
@@ -51,56 +51,72 @@ class Config
 	 */
 	static private $instances = [];
 
+	//--------------------------------------------------------------------
+
 	/**
-	 * @param string $name
-	 * @param bool   $getShared
+	 * Create new configuration instances or return
+	 * a shared instance
+	 *
+	 * @param string  $name      Configuration name
+	 * @param boolean $getShared Use shared instance
 	 *
 	 * @return mixed|null
 	 */
 	public static function get(string $name, bool $getShared = true)
 	{
 		$class = $name;
-		if( ($pos = strrpos($name, '\\')) !== -1 )
+		if (($pos = strrpos($name, '\\')) !== false)
 		{
-			$class = substr($name, $pos+1);
+			$class = substr($name, $pos + 1);
 		}
 
+		$class = strtolower($class);
+
 		if (! $getShared)
 		{
 			return self::createClass($name);
 		}
 
-		if( !isset( self::$instances[$class] ) )
+		if (! isset( self::$instances[$class] ))
 		{
 			self::$instances[$class] = self::createClass($name);
 		}
 		return self::$instances[$class];
 	}
 
+	//--------------------------------------------------------------------
+
 	/**
-	 * @param string $name
+	 * Find configuration class and create instance
+	 *
+	 * @param string $name Classname
 	 *
 	 * @return mixed|null
 	 */
 	private static function createClass(string $name)
 	{
-		if( class_exists($name))
+		if (class_exists($name))
 		{
 			return new $name();
 		}
 
 		$locator = Services::locator();
-		$file = $locator->locateFile($name,'Config');
+		$file    = $locator->locateFile($name, 'Config');
 
 		if (empty($file))
 		{
 			return null;
 		}
 
-		$classname = $locator->getClassname($file);
+		$name = $locator->getClassname($file);
 
-		return new $classname();
-	}
+		if (empty($name))
+		{
+			return null;
+		}
 
+		return new $name();
+	}
 
-}
+	//--------------------------------------------------------------------
+}

tests/system/Config/ConfigTest.php

@@ -0,0 +1,40 @@
+<?php namespace CodeIgniter\Config;
+
+use Config\Email;
+
+class ConfigTest extends \CIUnitTestCase
+{
+
+	public function testCreateSingleInstance()
+	{
+		$Config = Config::get('email', false);
+		$UpperConfig = Config::get('Email', false);
+		$NamespaceConfig = Config::get('Config\\Email', false);
+
+		$this->assertInstanceOf(Email::class, $Config);
+		$this->assertInstanceOf(Email::class, $UpperConfig);
+		$this->assertInstanceOf(Email::class, $NamespaceConfig);
+	}
+
+	public function testCreateInvalidInstance()
+	{
+		$Config = Config::get('gfnusvjai', false);
+
+		$this->assertNull($Config);
+	}
+
+	public function testCreateSharedInstance()
+	{
+		$Config = Config::get('email' );
+		$Config2 = Config::get('Config\\Email');
+
+		$this->assertTrue($Config === $Config2);
+	}
+
+	public function testCreateNonConfig()
+	{
+		$Config = Config::get('constants', false);
+
+		$this->assertNull($Config);
+	}
+}