Skip to content

Commit

Permalink
rename ModuleOverrideVerifier into ModuleOverrideChecker
Browse files Browse the repository at this point in the history
  • Loading branch information
matthieu-rolland committed Sep 10, 2024
1 parent 77648e7 commit a1611c9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions classes/module/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
use PrestaShop\PrestaShop\Core\Exception\ContainerNotFoundException;
use PrestaShop\PrestaShop\Core\Foundation\Filesystem\FileSystem;
use PrestaShop\PrestaShop\Core\Module\Legacy\ModuleInterface;
use PrestaShop\PrestaShop\Core\Module\ModuleOverrideVerifier;
use PrestaShop\PrestaShop\Core\Module\ModuleOverrideChecker;
use PrestaShop\PrestaShop\Core\Module\WidgetInterface;
use PrestaShop\TranslationToolsBundle\Translation\Helper\DomainHelper;
use Symfony\Component\DependencyInjection\ContainerInterface;
Expand Down Expand Up @@ -413,12 +413,12 @@ public function install()
}

// Check for override conflicts
$moduleOverrideVerifier = $this->get(ModuleOverrideVerifier::class);
if (!$moduleOverrideVerifier) {
$moduleOverrideVerifier = new ModuleOverrideVerifier($this->getTranslator());
$moduleOverrideChecker = $this->get(ModuleOverrideChecker::class);
if (!$moduleOverrideChecker) {
$moduleOverrideChecker = new ModuleOverrideChecker($this->getTranslator());
}
if ($moduleOverrideVerifier->hasOverrideConflict($this->getLocalPath() . 'override')) {
$this->_errors = array_merge($moduleOverrideVerifier->getErrors(), $this->_errors);
if ($moduleOverrideChecker->hasOverrideConflict($this->getLocalPath() . 'override')) {
$this->_errors = array_merge($moduleOverrideChecker->getErrors(), $this->_errors);

return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Tools;
use Symfony\Contracts\Translation\TranslatorInterface;

class ModuleOverrideVerifier
class ModuleOverrideChecker
{
/**
* @var TranslatorInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ services:
public: true
deprecated: ~

PrestaShop\PrestaShop\Core\Module\ModuleOverrideVerifier:
PrestaShop\PrestaShop\Core\Module\ModuleOverrideChecker:
arguments:
- '@translator'

0 comments on commit a1611c9

Please sign in to comment.