Moving the sort to also sort plugin objects, sorting in test removed

cakephp · May 26, 2011 · 266058e · 266058e
1 parent cea4e4e
commit 266058e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
@@ -499,10 +499,10 @@ public static function objects($type, $path = null, $cache = true) {
 			if ($cache === true) {
 				self::$__cache = true;
 			}
+			sort($objects);
 			if ($plugin) {
 				return $objects;
 			}
-			sort($objects);
 			self::$__objects[$cacheLocation][$name] = $objects;
 			self::$_objectCacheChange = true;
 		}

diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
@@ -319,7 +319,7 @@ function testListObjectsInPlugin() {
 		App::build(array(
 			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
+		), true);
 		CakePlugin::loadAll();
 
 		$result = App::objects('TestPlugin.model');
@@ -333,11 +333,9 @@ function testListObjectsInPlugin() {
 		$this->assertTrue(in_array('TestPluginPersisterOne', $result));
 
 		$result = App::objects('TestPlugin.helper');
-		sort($result);
 		$expected = array('OtherHelperHelper', 'PluggedHelperHelper', 'TestPluginAppHelper');
 		$this->assertEquals($expected, $result);
 		$result = App::objects('TestPlugin.View/Helper');
-		sort($result);
 		$expected = array('OtherHelperHelper', 'PluggedHelperHelper', 'TestPluginAppHelper');
 		$this->assertEquals($expected, $result);