From 388cead5cde69b9f39664b345bc1c667156a948d Mon Sep 17 00:00:00 2001 From: loannis Date: Thu, 4 Nov 2021 15:28:45 +0200 Subject: [PATCH] Fix FactoryLocator::get(Table)->get() syntax --- app/src/Lib/Identifier/Sequence.php | 2 +- app/src/Lib/Match/MatchService.php | 2 +- app/src/Lib/Traits/MatchgridLinkTrait.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/Lib/Identifier/Sequence.php b/app/src/Lib/Identifier/Sequence.php index 1fc48e3b4..5081e5b5e 100644 --- a/app/src/Lib/Identifier/Sequence.php +++ b/app/src/Lib/Identifier/Sequence.php @@ -41,7 +41,7 @@ class Sequence extends ReferenceIdService { */ public function generate(\App\Model\Entity\Matchgrid $mgConfig, \ADOConnection $dbc) { - $MatchgridSettings = Cake\Datasource\FactoryLocator::get('MatchgridSettings'); + $MatchgridSettings = Cake\Datasource\FactoryLocator::get('Table')->get('MatchgridSettings'); // We'll use the matchgrid ID rather than name in the sequence name to avoid // issues if the matchgrid is renamed for some reason. diff --git a/app/src/Lib/Match/MatchService.php b/app/src/Lib/Match/MatchService.php index c2e23f5eb..cc5ddcd44 100644 --- a/app/src/Lib/Match/MatchService.php +++ b/app/src/Lib/Match/MatchService.php @@ -104,7 +104,7 @@ public function attachReferenceId(string $sor, string $sorid, AttributeManager $ */ protected function generateReferenceId() { - $MatchgridSettings = FactoryLocator::get('MatchgridSettings'); + $MatchgridSettings = FactoryLocator::get('Table')->get('MatchgridSettings'); if($MatchgridSettings->getReferenceIdMethod($this->mgConfig->id) == ReferenceIdEnum::Sequence) { $IdService = new \App\Lib\Identifier\Sequence; diff --git a/app/src/Lib/Traits/MatchgridLinkTrait.php b/app/src/Lib/Traits/MatchgridLinkTrait.php index 4de262431..af52cae15 100644 --- a/app/src/Lib/Traits/MatchgridLinkTrait.php +++ b/app/src/Lib/Traits/MatchgridLinkTrait.php @@ -79,8 +79,8 @@ public function calculateMatchgridId(int $id) { // Look up $linkAttr to get its Matchgrid. We currently assume only // one level of nesting. - $linkTable = FactoryLocator::get($this->getPrimaryLinkTableName()); - + $linkTable = FactoryLocator::get('Table')->get($this->getPrimaryLinkTableName()); + return $linkTable->calculateMatchgridId($obj->$linkAttr); } }