Merge pull request #349 from dereuromark/remove-lying-alias

Remove lying through annotation.
dereuromark · Mar 15, 2024 · 141f290 · 141f290
2 parents 37887de + 6189f40
commit 141f290
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/src/Annotator/ModelAnnotator.php b/src/Annotator/ModelAnnotator.php
@@ -7,7 +7,6 @@
 use Cake\Datasource\EntityInterface;
 use Cake\Datasource\ResultSetInterface;
 use Cake\ORM\Association\BelongsToMany;
-use Cake\ORM\Association\HasMany;
 use Cake\ORM\AssociationCollection;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
@@ -278,28 +277,6 @@ protected function getAssociations(AssociationCollection $tableAssociations): ar
 			$className = App::className($table, 'Model/Table', 'Table') ?: static::CLASS_TABLE;
 
 			$associations[$type][$name] = $className;
-
-			if ($type !== BelongsToMany::class) {
-				continue;
-			}
-
-			/** @var \Cake\ORM\Association\BelongsToMany<\Cake\ORM\Table> $association */
-			$through = $this->throughAlias($association);
-			if (!$through) {
-				continue;
-			}
-
-			$className = App::className($through, 'Model/Table', 'Table') ?: static::CLASS_TABLE;
-			[, $throughName] = pluginSplit($through);
-			if (strpos($throughName, '\\') !== false) {
-				$throughName = substr($throughName, strrpos($throughName, '\\') + 1, -5);
-			}
-			$type = HasMany::class;
-			if (isset($associations[$type][$throughName])) {
-				continue;
-			}
-
-			$associations[$type][$throughName] = $className;
 		}
 
 		return $associations;

diff --git a/tests/TestCase/Annotator/ModelAnnotatorTest.php b/tests/TestCase/Annotator/ModelAnnotatorTest.php
@@ -124,7 +124,7 @@ public function testAnnotate() {
 
 		$output = $this->out->output();
 
-		$this->assertTextContains('  -> 18 annotations added', $output);
+		$this->assertTextContains('  -> 17 annotations added', $output);
 	}
 
 	/**
@@ -275,7 +275,7 @@ public function testAnnotateProtectedParent() {
 		$annotator->annotate($path);
 
 		$output = $this->out->output();
-		$this->assertTextContains('  -> 18 annotations added', $output);
+		$this->assertTextContains('  -> 17 annotations added', $output);
 	}
 
 }
diff --git a/tests/test_files/Model/Table/BarBarsAbstractTable.php b/tests/test_files/Model/Table/BarBarsAbstractTable.php
@@ -4,7 +4,6 @@
 /**
  * @property \Cake\ORM\Association\BelongsTo<\TestApp\Model\Table\FoosTable> $Foos
  * @property \Cake\ORM\Association\BelongsToMany<\Awesome\Model\Table\HousesTable> $Houses
- * @property \Cake\ORM\Association\HasMany<\Awesome\Model\Table\WindowsTable> $Windows
  *
  * @method \TestApp\Model\Entity\BarBarsAbstract newEmptyEntity()
  * @method \TestApp\Model\Entity\BarBarsAbstract newEntity(array $data, array $options = [])

diff --git a/tests/test_files/Model/Table/BarBarsTable.php b/tests/test_files/Model/Table/BarBarsTable.php
@@ -6,7 +6,6 @@
 /**
  * @property \Cake\ORM\Association\BelongsTo<\TestApp\Model\Table\FoosTable> $Foos
  * @property \Cake\ORM\Association\BelongsToMany<\Awesome\Model\Table\HousesTable> $Houses
- * @property \Cake\ORM\Association\HasMany<\Awesome\Model\Table\WindowsTable> $Windows
  *
  * @method \TestApp\Model\Entity\BarBar newEmptyEntity()
  * @method \TestApp\Model\Entity\BarBar newEntity(array $data, array $options = [])