Skip to content

Use internal table locator with fallback classes #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nicosp wants to merge 3 commits into from
Closed

Use internal table locator with fallback classes #1046

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3102485
Use internal table locator with fallback classes
nicosp Jul 14, 2025
329a9c0
Add missing use
nicosp Jul 14, 2025
c6e9a2c
Do not create another table locator if fallback is enabled.
nicosp Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/Command/BakeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
use Cake\Core\ConventionsTrait;
use Cake\Event\Event;
use Cake\Event\EventManager;
use Cake\ORM\Exception\MissingTableClassException;
use Cake\ORM\Locator\TableLocator;
use InvalidArgumentException;
use function Cake\Core\pluginSplit;

Expand Down Expand Up @@ -67,6 +69,31 @@
return 'bake ' . $name;
}

/**
* @inheritDoc
*/
public function initialize(): void
{
parent::initialize();

$locator = $this->getTableLocator();

try {
$locator->get('NonExistingTable');
$fallbackEnabled = true;
$locator->remove('NonExistingTable');
} catch (MissingTableClassException $e) {
$fallbackEnabled = false;

Check warning on line 86 in src/Command/BakeCommand.php

View check run for this annotation

Codecov / codecov/patch

src/Command/BakeCommand.php#L85-L86 

Added lines #L85 - L86 were not covered by tests
}

if (!$fallbackEnabled) {
// Use our own table locator with fallback classes
$locator = new TableLocator();
$locator->allowFallbackClass(true);
$this->setTableLocator($locator);

Check warning on line 93 in src/Command/BakeCommand.php

View check run for this annotation

Codecov / codecov/patch

src/Command/BakeCommand.php#L91-L93 

Added lines #L91 - L93 were not covered by tests
}
}

/**
* Handles splitting up the plugin prefix and classname.
*
Expand Down
Loading