From 1477b4b96da21adb7b306390e021157641e687a5 Mon Sep 17 00:00:00 2001 From: Brandon Shipley Date: Sat, 29 Mar 2025 01:11:09 -0700 Subject: [PATCH] dont need to set the config key or the default table anymore - will default to plugin name + table name --- .../ExternalProductCatalogsController.php | 4 ++-- src/Controller/ProductCatalogsController.php | 4 ++-- .../ProductCategoriesController.php | 4 ++-- ...ductCategoryAttributeOptionsController.php | 4 ++-- .../ProductCategoryAttributesController.php | 4 ++-- src/Controller/ProductsController.php | 4 ++-- src/Controller/Traits/OverrideTableTrait.php | 21 ++++++++++++++++--- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/Controller/ExternalProductCatalogsController.php b/src/Controller/ExternalProductCatalogsController.php index 1ca09d2..1729cca 100644 --- a/src/Controller/ExternalProductCatalogsController.php +++ b/src/Controller/ExternalProductCatalogsController.php @@ -25,8 +25,8 @@ class ExternalProductCatalogsController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.ExternalProductCatalogs'; - $this->_tableConfigKey = 'CakeProducts.ExternalProductCatalogs.table'; +// $this->_defaultTable = 'CakeProducts.ExternalProductCatalogs'; +// $this->_tableConfigKey = 'CakeProducts.ExternalProductCatalogs.table'; } /** diff --git a/src/Controller/ProductCatalogsController.php b/src/Controller/ProductCatalogsController.php index 2db3f6a..9867c9c 100644 --- a/src/Controller/ProductCatalogsController.php +++ b/src/Controller/ProductCatalogsController.php @@ -28,8 +28,8 @@ class ProductCatalogsController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.ProductCatalogs'; - $this->_tableConfigKey = 'CakeProducts.ProductCatalogs.table'; +// $this->_defaultTable = 'CakeProducts.ProductCatalogs'; +// $this->_tableConfigKey = 'CakeProducts.ProductCatalogs.table'; } /** diff --git a/src/Controller/ProductCategoriesController.php b/src/Controller/ProductCategoriesController.php index eaa4562..0bdb51e 100644 --- a/src/Controller/ProductCategoriesController.php +++ b/src/Controller/ProductCategoriesController.php @@ -25,8 +25,8 @@ class ProductCategoriesController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.ProductCategories'; - $this->_tableConfigKey = 'CakeProducts.ProductCategories.table'; +// $this->_defaultTable = 'CakeProducts.ProductCategories'; +// $this->_tableConfigKey = 'CakeProducts.ProductCategories.table'; } /** diff --git a/src/Controller/ProductCategoryAttributeOptionsController.php b/src/Controller/ProductCategoryAttributeOptionsController.php index 6db5b99..b39554b 100644 --- a/src/Controller/ProductCategoryAttributeOptionsController.php +++ b/src/Controller/ProductCategoryAttributeOptionsController.php @@ -25,8 +25,8 @@ class ProductCategoryAttributeOptionsController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.ProductCategoryAttributeOptions'; - $this->_tableConfigKey = 'CakeProducts.ProductCategoryAttributeOptions.table'; +// $this->_defaultTable = 'CakeProducts.ProductCategoryAttributeOptions'; +// $this->_tableConfigKey = 'CakeProducts.ProductCategoryAttributeOptions.table'; } /** diff --git a/src/Controller/ProductCategoryAttributesController.php b/src/Controller/ProductCategoryAttributesController.php index 7795a37..d46cc5e 100644 --- a/src/Controller/ProductCategoryAttributesController.php +++ b/src/Controller/ProductCategoryAttributesController.php @@ -29,8 +29,8 @@ class ProductCategoryAttributesController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.ProductCategoryAttributes'; - $this->_tableConfigKey = 'CakeProducts.ProductCategoryAttributes.table'; +// $this->_defaultTable = 'CakeProducts.ProductCategoryAttributes'; +// $this->_tableConfigKey = 'CakeProducts.ProductCategoryAttributes.table'; } /** diff --git a/src/Controller/ProductsController.php b/src/Controller/ProductsController.php index 496566f..871617d 100644 --- a/src/Controller/ProductsController.php +++ b/src/Controller/ProductsController.php @@ -25,8 +25,8 @@ class ProductsController extends AppController public function initialize(): void { parent::initialize(); // TODO: Change the autogenerated stub - $this->_defaultTable = 'CakeProducts.Products'; - $this->_tableConfigKey = 'CakeProducts.Products.table'; +// $this->_defaultTable = 'CakeProducts.Products'; +// $this->_tableConfigKey = 'CakeProducts.Products.table'; } /** diff --git a/src/Controller/Traits/OverrideTableTrait.php b/src/Controller/Traits/OverrideTableTrait.php index 1ff86ec..c02ab2a 100644 --- a/src/Controller/Traits/OverrideTableTrait.php +++ b/src/Controller/Traits/OverrideTableTrait.php @@ -14,9 +14,11 @@ trait OverrideTableTrait protected ?Table $_table = null; /** - * @var string + * This object's default table alias. + * + * @var string|null */ - protected string $_defaultTable = ''; + protected ?string $defaultTable = null; /** * @var string @@ -33,15 +35,28 @@ trait OverrideTableTrait if ($this->_table instanceof Table) { return $this->_table; } + $this->getTableConfigKey(); $table = $tableName; if (!isset($table)) { - $table = $this->_tableConfigKey && Configure::read($this->_tableConfigKey) ? Configure::read($this->_tableConfigKey) : $this->_defaultTable; + $table = $this->defaultTable; + if (Configure::read($this->_tableConfigKey)) { + $table = Configure::read($this->_tableConfigKey); + } } $this->_table = TableRegistry::getTableLocator()->get($table); return $this->_table; } + protected function getTableConfigKey() + { + if (!$this->_tableConfigKey) { + $this->_tableConfigKey = $this->getPlugin() . '.' . $this->defaultTable . '.table'; + } + + return $this->_tableConfigKey; + } + /** * Set the users table *