Pass the locator to the constructor.

cakephp · Sep 19, 2017 · cb4d38d · cb4d38d
1 parent 8ee1cfc
commit cb4d38d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/ORM/AssociationCollection.php b/src/ORM/AssociationCollection.php
@@ -17,6 +17,7 @@
 use ArrayIterator;
 use Cake\Datasource\EntityInterface;
 use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\Locator\LocatorInterface;
 use InvalidArgumentException;
 use IteratorAggregate;
 
@@ -39,6 +40,21 @@ class AssociationCollection implements IteratorAggregate
      */
     protected $_items = [];
 
+    /**
+     * Constructor.
+     *
+     * Sets the default table locator for associations.
+     * If no locator is provided, the global one will be used.
+     *
+     * @param \Cake\ORM\Locator\LocatorInterface|null $tableLocator Table locator instance.
+     */
+    public function __construct(LocatorInterface $tableLocator = null)
+    {
+        if ($tableLocator !== null) {
+            $this->_tableLocator = $tableLocator;
+        }
+    }
+
     /**
      * Add an association to the collection
      *

diff --git a/src/ORM/Locator/TableLocator.php b/src/ORM/Locator/TableLocator.php
@@ -213,8 +213,7 @@ public function get($alias, array $options = [])
             $options['connection'] = ConnectionManager::get($connectionName);
         }
         if (empty($options['associations'])) {
-            $associations = new AssociationCollection();
-            $associations->setTableLocator($this);
+            $associations = new AssociationCollection($this);
             $options['associations'] = $associations;
         }
 

diff --git a/tests/TestCase/ORM/AssociationCollectionTest.php b/tests/TestCase/ORM/AssociationCollectionTest.php
@@ -19,6 +19,7 @@
 use Cake\ORM\Association\BelongsToMany;
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorInterface;
+use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -42,6 +43,20 @@ public function setUp()
         $this->associations = new AssociationCollection();
     }
 
+    /**
+     * Test the constructor.
+     *
+     * @return void
+     */
+    public function testConstructor()
+    {
+        $this->assertSame(TableRegistry::getTableLocator(), $this->associations->getTableLocator());
+
+        $tableLocator = $this->createMock(LocatorInterface::class);
+        $associations = new AssociationCollection($tableLocator);
+        $this->assertSame($tableLocator, $associations->getTableLocator());
+    }
+
     /**
      * Test the simple add/has and get methods.
      *