Merge pull request #68 from cakephp/issue-6270

Ignore associations that point at missing tables.
cakephp · Apr 8, 2015 · 4cf1c99 · 4cf1c99
2 parents 919fd4f + a47a633
commit 4cf1c99
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/src/Utility/Model/AssociationFilter.php b/src/Utility/Model/AssociationFilter.php
@@ -16,6 +16,7 @@
 
 use Cake\ORM\Table;
 use Cake\Utility\Inflector;
+use Exception;
 
 /**
  * Utility class to filter Model Table associations
@@ -87,16 +88,20 @@ public function filterAssociations(Table $model)
                     $className = $alias;
                 }
 
-                $associations[$type][$assocName] = [
-                    'property' => $assoc->property(),
-                    'variable' => Inflector::variable($assocName),
-                    'primaryKey' => (array)$target->primaryKey(),
-                    'displayField' => $target->displayField(),
-                    'foreignKey' => $assoc->foreignKey(),
-                    'alias' => $alias,
-                    'controller' => $className,
-                    'fields' => $target->schema()->columns(),
-                ];
+                try {
+                    $associations[$type][$assocName] = [
+                        'property' => $assoc->property(),
+                        'variable' => Inflector::variable($assocName),
+                        'primaryKey' => (array)$target->primaryKey(),
+                        'displayField' => $target->displayField(),
+                        'foreignKey' => $assoc->foreignKey(),
+                        'alias' => $alias,
+                        'controller' => $className,
+                        'fields' => $target->schema()->columns(),
+                    ];
+                } catch (Exception $e) {
+                    // Do nothing it could be a bogus association name.
+                }
             }
         }
         return $associations;

diff --git a/tests/TestCase/Utility/Model/AssociationFilterTest.php b/tests/TestCase/Utility/Model/AssociationFilterTest.php
@@ -35,6 +35,8 @@ class AssociationFilterTest extends TestCase
      * @var array
      */
     public $fixtures = [
+        'core.authors',
+        'core.tags',
         'plugin.bake.bake_articles',
         'plugin.bake.bake_comments',
         'plugin.bake.bake_articles_bake_tags',
@@ -59,6 +61,7 @@ public function setUp()
      */
     public function tearDown()
     {
+        TableRegistry::clear();
         unset($this->associationFilter);
         parent::tearDown();
     }
@@ -130,4 +133,20 @@ public function testFilterAssociations()
         $expected = ['authors', 'tags'];
         $this->assertEquals($expected, $result);
     }
+
+    /**
+     * testFilterAssociations
+     *
+     * @return void
+     */
+    public function testFilterAssociationsMissingTable()
+    {
+        $table = TableRegistry::get('Articles', [
+            'className' => '\Bake\Test\App\Model\Table\ArticlesTable'
+        ]);
+        $table->hasMany('Nopes');
+
+        $result = $this->associationFilter->filterAssociations($table);
+        $this->assertArrayNotHasKey('HasMany', $result);
+    }
 }