Code refactoring due to comments @ #8824 (comment)

cakephp · May 15, 2016 · 7727e20 · 7727e20
1 parent 456c6fc
commit 7727e20
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 31 deletions.
diff --git a/src/ORM/Exception/MissingAssociationException.php b/src/ORM/Exception/MissingAssociationException.php
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -59,6 +59,7 @@ public function __construct(Table $table)
      * Build the map of property => association names.
      *
      * @param array $options List of options containing the 'associated' key.
+     * @throws \InvalidArgumentException
      * @return array
      */
     protected function _buildPropertyMap($options)
@@ -78,11 +79,10 @@ protected function _buildPropertyMap($options)
             $assoc = $this->_table->association($key);
             if ($assoc) {
                 $map[$assoc->property()] = ['association' => $assoc] + $nested + ['associated' => []];
-            } else {
-                if (substr($key, 0, 1) !== "_") { // if $key is a special underscored field eg _ids or _joinData
-                    throw new MissingAssociationException([$this->_table->alias(), $key]);
-                }
-
+                continue;
+            }
+            if (substr($key, 0, 1) !== "_") { // if $key is not a special underscored field eg _ids or _joinData
+                throw new \InvalidArgumentException(vsprintf("%s is not associated with %s",[$this->_table->alias(), $key]));
             }
         }
         return $map;

diff --git a/tests/TestCase/ORM/MarshallerTest.php b/tests/TestCase/ORM/MarshallerTest.php
@@ -1135,10 +1135,11 @@ public function testManyAssociations()
     /**
      * Test if exceptin is raised when called with [associated=>NonExistingAssociation]
      * Previously such association has been simply ignored
+     * @expectedException \InvalidArgumentException
+     * @return void
      */
     public function testManyInvalidAssociation()
     {
-        $this->expectException(MissingAssociationException::class);
         $data = [
             [
                 'comment' => 'First post',
@@ -1156,7 +1157,7 @@ public function testManyInvalidAssociation()
             ],
         ];
         $marshall = new Marshaller($this->comments);
-        $result = $marshall->many($data, ['associated' => ['Users','People']]);
+        $marshall->many($data, ['associated' => ['Users','People']]);
     }
 
     /**