Merge pull request #5280 from deizel/duplicate-object

Fix ObjectRegistry duplicate detection when comparing nested arrays

src/Core/ObjectRegistry.php

@@ -114,10 +114,11 @@ protected function _checkDuplicate($name, $config) {
 		if (!$hasConfig) {
 			throw new RuntimeException($msg);
 		}
-		unset($config['enabled']);
-		if ($hasConfig && array_diff_assoc($config, $existing->config()) != []) {
+		$existingConfig = $existing->config();
+		unset($config['enabled'], $existingConfig['enabled']);
+		if ($hasConfig && json_encode($config) !== json_encode($existingConfig)) {
 			$msg .= ' with the following config: ';
-			$msg .= var_export($this->{$name}->config(), true);
+			$msg .= var_export($existingConfig, true);
 			$msg .= ' which differs from ' . var_export($config, true);
 			throw new RuntimeException($msg);
 		}

tests/TestCase/Controller/ComponentTest.php

@@ -105,6 +105,25 @@ public function testMultipleComponentInitialize() {
 		$this->assertSame($Banana->testField, $Orange->Banana->testField, 'References are broken');
 	}
 
+/**
+ * Test a duplicate component being loaded more than once with same and differing configurations.
+ *
+ * @expectedException RuntimeException
+ * @expectedExceptionMessage The "Banana" alias has already been loaded with the following config:
+ * @return void
+ */
+	public function testDuplicateComponentInitialize() {
+		$Collection = new ComponentRegistry();
+		$Collection->load('Banana', ['property' => ['closure' => function () {
+		}]]);
+		$Collection->load('Banana', ['property' => ['closure' => function () {
+		}]]);
+
+		$this->assertInstanceOf('TestApp\Controller\Component\BananaComponent', $Collection->Banana, 'class is wrong');
+
+		$Collection->load('Banana', ['property' => ['differs']]);
+	}
+
 /**
  * Test mutually referencing components.
  *