Prevent accidental configuration of both model and table.

cakephp · Jan 8, 2016 · 530def4 · 530def4
1 parent 81073ab
commit 530def4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/TestSuite/Fixture/TestFixture.php b/src/TestSuite/Fixture/TestFixture.php
@@ -200,6 +200,9 @@ protected function _schemaFromImport()
         $import = $this->import + ['connection' => 'default', 'table' => null, 'model' => null];
 
         if (!empty($import['model'])) {
+            if (!empty($import['table'])) {
+                throw new CakeException('You cannot define both table and model.');
+            }
             $import['table'] = TableRegistry::get($import['model'])->table();
         }