Removing exception that prevented matching and contain in the same as…

…sociation

This type of conflic is not possible anymore

src/ORM/EagerLoader.php

@@ -409,13 +409,6 @@ protected function _correctStrategy(&$config, $alias) {
 			return $config;
 		}
 
-		if (!empty($config['config']['matching'])) {
-			throw new \RuntimeException(sprintf(
-				'Cannot use "matching" on "%s" as there is another association with the same alias',
-				$alias
-			));
-		}
-
 		$config['canBeJoined'] = false;
 		$config['config']['strategy'] = $config['instance']::STRATEGY_SELECT;
 	}

tests/TestCase/ORM/QueryTest.php

@@ -1996,26 +1996,6 @@ public function testRepeatedAssociationAliases($strategy) {
 		$this->assertNotEmpty($results[2]['article']);
 	}
 
-/**
- * Tests that it is not allowed to use matching on an association
- * that is already added to containments.
- *
- * @expectedException \RuntimeException
- * @expectedExceptionMessage Cannot use "matching" on "Authors" as there is another association with the same alias
- * @return void
- */
-	public function testConflitingAliases() {
-		$this->markTestIncomplete('Needs an actual conflicting case');
-		$table = TableRegistry::get('ArticlesTags');
-		$table->belongsTo('Articles')->target()->belongsTo('Authors');
-		$table->belongsTo('Tags');
-		$table->Tags->target()->hasOne('Authors');
-		$table->find()
-			->contain(['Articles.Authors'])
-			->matching('Tags.Authors')
-			->sql();
-	}
-
 /**
  * Tests that a hasOne association using the select strategy will still have the
  * key present in the results when no match is found