Fix extendConfig default overriding user-defined values in the config.

Author: atanas-dev

src/ServiceProviders/ExtendsConfigTrait.php

@@ -18,16 +18,16 @@ trait ExtendsConfigTrait {
 	/**
 	 * Extends the WP Emerge config in the container with a new key.
 	 *
-	 * @codeCoverageIgnore
 	 * @param  \Pimple\Container $container
 	 * @param  string            $key
 	 * @param  mixed             $default
 	 * @return void
 	 */
-	protected function extendConfig( $container, $key, $default ) {
-		$config = Arr::get( $container, WPEMERGE_CONFIG_KEY . '.' . $key, $default );
+	public function extendConfig( $container, $key, $default ) {
+		$config = isset( $container[ WPEMERGE_CONFIG_KEY ] ) ? $container[ WPEMERGE_CONFIG_KEY ] : [];
+		$config = Arr::get( $config, $key, $default );
 
-		if ( is_array( $default ) && is_array( $config ) ) {
+		if ( $config !== $default && is_array( $config ) && is_array( $default ) ) {
 			$config = array_replace_recursive( $default, $config );
 		}
 

tests/unit-tests/ServiceProviders/ExtendsConfigTraitTest.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace WPEmergeTests\ServiceProviders;
+
+use Mockery;
+use Pimple\Container;
+use WPEmerge\ServiceProviders\ExtendsConfigTrait;
+use WP_UnitTestCase;
+
+/**
+ * @coversDefaultClass \WPEmerge\ServiceProviders\ExtendsConfigTrait
+ */
+class ExtendsConfigTraitTest extends WP_UnitTestCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->subject = $this->getMockForTrait( ExtendsConfigTrait::class );
+	}
+
+	public function tearDown() {
+		parent::tearDown();
+
+		unset( $this->subject );
+	}
+
+	/**
+	 * @covers ::extendConfig
+	 */
+	public function testExtendConfig_ConfigNotSet_Default() {
+		$container = new Container( [
+			WPEMERGE_CONFIG_KEY => [],
+		] );
+		$key = 'foo';
+		$default = 'bar';
+		$expected = $default;
+
+		$this->subject->extendConfig( $container, $key, $default );
+
+		$this->assertEquals( $expected, $container[ WPEMERGE_CONFIG_KEY ][ $key ] );
+	}
+
+	/**
+	 * @covers ::extendConfig
+	 */
+	public function testExtendConfig_NotArrays_Replace() {
+		$container = new Container( [
+			WPEMERGE_CONFIG_KEY => [
+				'foo' => 'foo',
+			],
+		] );
+		$key = 'foo';
+		$default = 'bar';
+		$expected = 'foo';
+
+		$this->subject->extendConfig( $container, $key, $default );
+
+		$this->assertEquals( $expected, $container[ WPEMERGE_CONFIG_KEY ][ $key ] );
+	}
+
+	/**
+	 * @covers ::extendConfig
+	 */
+	public function testExtendConfig_Arrays_RecursiveReplace() {
+		$container = new Container( [
+			WPEMERGE_CONFIG_KEY => [
+				'foo' => [
+					'foo' => 'foo',
+					'bar' => 'bar',
+					'baz' => [
+						'foo' => 'foo',
+					]
+				],
+			],
+		] );
+		$key = 'foo';
+		$default = [
+			'bar' => 'foobarbaz',
+			'baz' => [
+				'bar' => 'bar',
+			],
+			'foobarbaz' => 'foobarbaz',
+		];
+		$expected = [
+			// Value is NOT missing.
+			'foo' => 'foo',
+			// Value is NOT replaced by default.
+			'bar' => 'bar',
+			'baz' => [
+				'foo' => 'foo',
+				// Key from default is added in nested array.
+				'bar' => 'bar',
+			],
+			// Key from default is added.
+			'foobarbaz' => 'foobarbaz',
+		];
+
+		$this->subject->extendConfig( $container, $key, $default );
+
+		$this->assertEquals( $expected, $container[ WPEMERGE_CONFIG_KEY ][ $key ] );
+	}
+}