Merge pull request #16633 from cakephp/issue-16419

Ensure TableLocator returns the same instance when using a table's registry alias. This improves behavior when entities have namespaced classnames as their registry value.
cakephp · Jul 17, 2022 · 92bf43c · 92bf43c
2 parents 24de81a + 17f6e0d
commit 92bf43c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ORM/Locator/TableLocator.php b/src/ORM/Locator/TableLocator.php
@@ -215,8 +215,6 @@ protected function createInstance(string $alias, array $options)
             $options = ['alias' => $classAlias] + $options;
         } elseif (!isset($options['alias'])) {
             $options['className'] = $alias;
-            /** @psalm-suppress PossiblyFalseOperand */
-            $alias = substr($alias, strrpos($alias, '\\') + 1, -5);
         }
 
         if (isset($this->_config[$alias])) {

diff --git a/tests/TestCase/ORM/Locator/TableLocatorTest.php b/tests/TestCase/ORM/Locator/TableLocatorTest.php
@@ -178,6 +178,10 @@ public function testGet(): void
 
         $result = $this->_locator->get(ArticlesTable::class);
         $this->assertSame('Articles', $result->getAlias());
+        $this->assertSame(ArticlesTable::class, $result->getRegistryAlias());
+
+        $result2 = $this->_locator->get($result->getRegistryAlias());
+        $this->assertSame($result, $result2);
     }
 
     /**