Skip to content

Commit

Permalink
Remove old upgrade code
Browse files Browse the repository at this point in the history
  • Loading branch information
Hlavtox committed Aug 31, 2023
1 parent 014ac06 commit a42cc5c
Show file tree
Hide file tree
Showing 296 changed files with 21 additions and 17,694 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/nightly_upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ jobs:
strategy:
fail-fast: false
matrix:
from: ['8.0.4', '1.7.6.9', '1.7.7.0', '1.6.1.24']
from: ['8.0.4', '1.7.6.9', '1.7.7.0']
ps-versions: ${{ fromJson(needs.get_matrix.outputs.matrix) }}
branch: ['dev', 'master']
exclude:
- from: '1.6.1.24'
ps-versions: {branch: 'develop'}
- from: '1.7.6.9'
ps-versions: {branch: 'develop'}
- from: '1.7.7.0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
presta-versions: ['1.6.1.18', '1.7.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '1.7.6', '1.7.7', '1.7.8', '8.0.0', 'latest']
presta-versions: ['1.7.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '1.7.6', '1.7.7', '1.7.8', '8.0.0', 'latest']
steps:
- name: Checkout
uses: actions/checkout@v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
upgrade:
strategy:
matrix:
from: ['1.6.1.11', '1.7.6.9', '1.7.6.1', '1.7.7.0']
from: ['1.7.6.9', '1.7.6.1', '1.7.7.0']
ps-versions:
- channel: minor
- channel: major
Expand Down
6 changes: 0 additions & 6 deletions classes/TaskRunner/Upgrade/UpgradeDb.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

use PrestaShop\Module\AutoUpgrade\TaskRunner\AbstractTask;
use PrestaShop\Module\AutoUpgrade\UpgradeException;
use PrestaShop\Module\AutoUpgrade\UpgradeTools\CoreUpgrader\CoreUpgrader16;
use PrestaShop\Module\AutoUpgrade\UpgradeTools\CoreUpgrader\CoreUpgrader17;
use PrestaShop\Module\AutoUpgrade\UpgradeTools\CoreUpgrader\CoreUpgrader80;
use PrestaShop\Module\AutoUpgrade\UpgradeTools\CoreUpgrader\CoreUpgrader81;
Expand Down Expand Up @@ -61,10 +60,6 @@ public function run()

public function getCoreUpgrader()
{
if (version_compare($this->container->getState()->getInstallVersion(), '1.7', '<')) {
return new CoreUpgrader16($this->container, $this->logger);
}

if (version_compare($this->container->getState()->getInstallVersion(), '8', '<')) {
return new CoreUpgrader17($this->container, $this->logger);
}
Expand All @@ -85,7 +80,6 @@ public function init()

// Migrating settings file
$this->container->initPrestaShopAutoloader();
(new SettingsFileWriter($this->translator))->migrateSettingsFile($this->logger);
parent::init();
}
}
3 changes: 1 addition & 2 deletions classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ protected function initConstants()
define('SETTINGS_FILE_YML', $this->container->getProperty(UpgradeContainer::PS_ROOT_PATH) . '/app/config/parameters.yml');
define('DEFINES_FILE', $this->container->getProperty(UpgradeContainer::PS_ROOT_PATH) . '/config/defines.inc.php');
define('INSTALLER__PS_BASE_URI', substr($_SERVER['REQUEST_URI'], 0, -1 * (strlen($_SERVER['REQUEST_URI']) - strrpos($_SERVER['REQUEST_URI'], '/')) - strlen(substr(dirname($_SERVER['REQUEST_URI']), strrpos(dirname($_SERVER['REQUEST_URI']), '/') + 1))));
// define('INSTALLER__PS_BASE_URI_ABSOLUTE', 'http://'.ToolsInstall::getHttpHost(false, true).INSTALLER__PS_BASE_URI);

define('_PS_INSTALL_PATH_', $this->pathToInstallFolder . '/');
define('_PS_INSTALL_DATA_PATH_', _PS_INSTALL_PATH_ . 'data/');
Expand Down Expand Up @@ -675,7 +674,7 @@ protected function updateTheme()
}

$this->logger->info($this->container->getTranslator()->trans('Switching to default theme.', [], 'Modules.Autoupgrade.Admin'));
$themeAdapter = new ThemeAdapter($this->db, $this->destinationUpgradeVersion);
$themeAdapter = new ThemeAdapter($this->db);

Cache::clean('*');

Expand Down
186 changes: 0 additions & 186 deletions classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php

This file was deleted.

2 changes: 1 addition & 1 deletion classes/UpgradeTools/CoreUpgrader/CoreUpgrader17.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ protected function updateRTLFiles()
return;
}
$this->logger->info($this->container->getTranslator()->trans('Upgrade the RTL files.', [], 'Modules.Autoupgrade.Admin'));
$themeAdapter = new ThemeAdapter($this->db, $this->destinationUpgradeVersion);
$themeAdapter = new ThemeAdapter($this->db);

$themes = $themeAdapter->getListFromDisk();
$this->removeExistingRTLFiles($themes);
Expand Down
1 change: 0 additions & 1 deletion classes/UpgradeTools/FileFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ public function getFilesToIgnoreOnUpgrade()
// If set to false, we need to preserve the default themes
if (!$this->configuration->shouldUpdateDefaultTheme()) {
$this->excludeAbsoluteFilesFromUpgrade[] = '/themes/classic';
$this->excludeAbsoluteFilesFromUpgrade[] = '/themes/default-bootstrap';
}

return $this->excludeAbsoluteFilesFromUpgrade;
Expand Down
4 changes: 1 addition & 3 deletions classes/UpgradeTools/ModuleAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,7 @@ public function upgradeModule($id, $name)
unlink($zip_fullpath);
}

// Only 1.7 step
if (version_compare($this->upgradeVersion, '1.7.0.0', '>=')
&& !$this->doUpgradeModule($name)) {
if (!$this->doUpgradeModule($name)) {
throw (new UpgradeException('<strong>' . $this->translator->trans('[WARNING] Error when trying to upgrade module %s.', [$name], 'Modules.Autoupgrade.Admin') . '</strong>'))->setSeverity(UpgradeException::SEVERITY_WARNING)->setQuickInfos(\Module::getInstanceByName($name)->getErrors());
}
}
Expand Down
89 changes: 0 additions & 89 deletions classes/UpgradeTools/SettingsFileWriter.php

This file was deleted.

0 comments on commit a42cc5c

Please sign in to comment.