RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-04-11 12:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix error for 1.7.7.x

Browse source
This commit is contained in:
Uryvskiy Dima 2023-08-23 19:26:16 +03:00
parent 870ccfb602
commit 505293e3e1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -14,7 +14,7 @@ delete_archive:
rm -f $(ARCHIVE_NAME)
rm -f /tmp/retailcrm.zip
composer: clone_prestashop clone_composer fix-version-bugs
composer: clone_prestashop clone_composer fix-version-lang-bugs
ifeq ($(COMPOSERV1),1)
cd $(PRESTASHOP_DIR) && php composer.phar install --prefer-dist --no-interaction --no-progress
else
@ -56,13 +56,13 @@ else
endif
endif
fix-version-bugs:
# Required for versions 1.7.7.x
fix-version-lang-bugs:
ifeq ($(COMPOSERV1),1)
cd $(PRESTASHOP_DIR) \
&& sed -i 's/throw new Exception/#throw new Exception/g' src/PrestaShopBundle/Install/DatabaseDump.php
endif
ifeq ($(BRANCH),$(filter $(BRANCH), 1.7.7.8))
cd $(PRESTASHOP_DIR) \
&& sed -i "s/SymfonyContainer::getInstance()->get('translator')/\\\\Context::getContext()->getTranslator()/g" classes/lang/DataLang.php
cat $(PRESTASHOP_DIR)/classes/lang/DataLang.php | grep -A 3 -B 3 'this->translator = '
@ -70,7 +70,6 @@ ifeq ($(BRANCH),$(filter $(BRANCH), 1.7.7.8))
cd $(PRESTASHOP_DIR) \
&& sed -i "s/SymfonyContainer::getInstance()->get('translator')/\\\\Context::getContext()->getTranslator()/g" classes/Language.php
cat $(PRESTASHOP_DIR)/classes/Language.php | grep -A 3 -B 3 'translator = '
endif
lint:
php-cs-fixer fix --config=$(ROOT_DIR)/.php-cs-fixer.php -v