Browse Source

Fix defaultUrlParams for 4.x.

mscherer 5 years ago
parent
commit
87afe02217

+ 5 - 2
src/Controller/Component/CommonComponent.php

@@ -150,13 +150,16 @@ class CommonComponent extends Component {
 	/**
 	 * Returns defaultUrlParams including configured prefixes.
 	 *
+	 * Deprecated: Routing.prefixes config is not needed anymore as it is always
+	 * just "prefix" now.
+	 *
 	 * @return array URL params
 	 */
 	public static function defaultUrlParams() {
 		$defaults = ['plugin' => false];
 		$prefixes = (array)Configure::read('Routing.prefixes');
-		foreach ($prefixes as $prefix) {
-			$defaults[$prefix] = false;
+		if ($prefixes) {
+			$defaults['prefix'] = false;
 		}
 
 		return $defaults;

+ 2 - 11
tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -64,14 +64,6 @@ class CommonComponentTest extends TestCase {
 	/**
 	 * @return void
 	 */
-	public function testGetDefaultUrlParams() {
-		$is = $this->Controller->Common->defaultUrlParams();
-		$this->assertNotEmpty($is);
-	}
-
-	/**
-	 * @return void
-	 */
 	public function testCurrentUrl() {
 		$is = $this->Controller->Common->currentUrl();
 		$this->assertTrue(is_array($is) && !empty($is));
@@ -225,15 +217,14 @@ class CommonComponentTest extends TestCase {
 	 * @return void
 	 */
 	public function testDefaultUrlParams() {
-		Configure::write('Routing.prefixes', ['admin', 'tests']);
+		Configure::write('Routing.prefixes', ['Admin', 'Tests']);
 		$result = CommonComponent::defaultUrlParams();
 		$expected = [
 			'plugin' => false,
 			'prefix' => false,
-			'tests' => false,
 		];
 		$this->assertEquals($expected, $result);
-		Configure::write('Routing.prefixes', 'admin');
+		Configure::write('Routing.prefixes', 'Admin');
 		$result = CommonComponent::defaultUrlParams();
 		$expected = [
 			'plugin' => false,