Skip to content
Permalink
Browse files

Merge branch 'b-6.x'

# Conflicts:
#	source/Application/Controller/Admin/DiagnosticsMain.php
#	source/Application/Controller/Admin/ModuleConfiguration.php
#	source/Application/Controller/Admin/ModuleList.php
#	source/Application/Controller/Admin/ModuleMain.php
#	source/Application/Controller/Admin/ModuleSortList.php
#	source/Core/Module/Module.php
#	source/Core/Module/ModuleChainsGenerator.php
#	source/Core/Module/ModuleInstaller.php
#	source/Core/Module/ModuleList.php
#	tests/Integration/Modules/ModuleWithNoMetadataSupportTest.php
#	tests/Integration/OnlineInfo/OnlineModuleNotifierRequestFormationTest.php
#	tests/Unit/Application/Controller/Admin/ModuleListTest.php
#	tests/Unit/Application/Controller/Admin/ModuleSortListTest.php
#	tests/Unit/Core/Module/ModuleListTest.php
#	tests/Unit/Core/Module/ModuleTest.php
#	tests/Unit/Core/SystemRequirementsTest.php
  • Loading branch information...
iegupov committed Jul 9, 2019
2 parents c532030 + 1b22f9d commit 4d112684d4dc9576991a8e3360d582a948cba2c0
Showing 369 changed files with 11,212 additions and 8,002 deletions.
@@ -38,8 +38,8 @@
.DS_Store

# DI cache
/source/Internal/Application/containercache.php
/source/Internal/Application/container_cache.php

# DI for modules and packages
/source/generated_project.yaml
/var/generated_services.yaml
/tests/Integration/Internal/Application/Dao/generated_project.yaml
@@ -117,13 +117,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- OXID eShop console, which allows to register custom commands for modules and for components via `services.yaml`.
- New command to activate module.
- New command to deactivate module.
- New oe-console command to install module configuration: oe:module:install-configuration
- New parameter in config file to change database connection charset - `dbCharset` [PR-670](https://github.com/OXID-eSales/oxideshop_ce/pull/670)
- Module configuration:
- option `activeModules` in table oxconfig in order to determine the currently active modules
- Events:
- `\OxidEsales\EshopCommunity\Internal\Module\MetaData\Event\BadMetaDataFoundEvent`
- `\OxidEsales\EshopCommunity\Internal\Module\Setup\Event\BeforeModuleDeactivationEvent`
- `\OxidEsales\EshopCommunity\Internal\Module\Setup\Event\FinalizingModuleActivationEvent`
- `\OxidEsales\EshopCommunity\Internal\Module\Setup\Event\FinalizingModuleDeactivationEvent`
@@ -146,6 +143,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
for hashing passwords.
- Constants
- `\OxidEsales\EshopCommunity\Application\Model\User::USER_COOKIE_SALT`
- Directory
- var/ directory, it contains files to which the application writes data during the course of its operation. Must always be writable by the HTTP server during the run time.
### Changed
- category_main form layout improvements [PR-585](https://github.com/OXID-eSales/oxideshop_ce/pull/585)
@@ -165,6 +164,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Was `HELP_ENERAL_NAME` changed to `HELP_GENERAL_NAME`
- Drop support for PHP 7.0
- Use user from Order::validateOrder method in validatePayment as well [PR-706](https://github.com/OXID-eSales/oxideshop_ce/pull/706)
- Methods in the following classes return information based on the project configuration. [See documentation about module installation](https://docs.oxid-esales.com/developer/en/6.2/modules/installation/)
- `\OxidEsales\EshopCommunity\source\Module\Core\Module`
- `\OxidEsales\EshopCommunity\source\Module\Core\ModuleList`
- Config option `aDisabledModules` isn't used anymore.
- Config option `aModulePaths`: module path will be added to the option only after the module activation.
- Travis runs phpcs and tests scripts with calling the php directly, not relying on script shebang anymore.
### Removed
@@ -197,6 +201,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- `\OxidEsales\EshopCommunity\Core\Email::getConfig`
- `blDoNotDisableModuleOnError` config option
- `OrderArticle::$_aOrderCache`
- `\OxidEsales\EshopCommunity\Application\Controller\Admin\ModuleConfiguration::_getModuleForConfigVars`
- `\OxidEsales\EshopCommunity\Application\Controller\Admin\ModuleConfiguration::__loadMetadataConfVars`
- `\OxidEsales\EshopCommunity\Core\Module\ModuleChainsGenerator::filterInactiveExtensions()` Now, there are only extensions of active modules in the class chain. No need to filter inactive extensions any more.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleChainsGenerator::cleanModuleFromClassChain()` If you want to clean a module from the class chain, deactivate the module.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleChainsGenerator::getDisabledModuleIds()` Use `OxidEsales\EshopCommunity\Internal\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface` instead to get inactive modules.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleChainsGenerator::getModuleDirectoryByModuleId()` Use `\OxidEsales\EshopCommunity\Internal\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface` instead.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectoryValidator` Validation was moved to Internal\Module package and will be executed during the module activation.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectoryRepository::save` Module smarty plugins directory are stored in project configuration file now. Use appropriate Dao to save them.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectories::getWithRelativePath` Module smarty plugins directory are stored in project configuration file now. Use appropriate Dao to get them.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectories::add` Module smarty plugins directory are stored in project configuration file now. Use appropriate Dao to add them.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectories::set` Module smarty plugins directory are stored in project configuration file now. Use appropriate Dao to set them.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleSmartyPluginDirectories::remove` Module smarty plugins directory are stored in project configuration file now. Use appropriate Dao to remove them.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleExtensionsCleaner::cleanExtensions` will use internal module services instead aModulePaths
- `\OxidEsales\EshopCommunity\Core\Module\ModuleInstaller` Use service "OxidEsales\EshopCommunity\Internal\Module\Setup\Bridge\ModuleActivationBridgeInterface".
- `\OxidEsales\EshopCommunity\Core\Module\Module` Use service 'OxidEsales\EshopCommunity\Internal\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface'.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleList` Use service 'OxidEsales\EshopCommunity\Internal\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface'.
- `\OxidEsales\EshopCommunity\Core\Contract\IModuleValidator` Validation was moved to Internal\Module package and will be executed during the module activation.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleMetadataValidator` Validation was moved to Internal\Module package and will be executed during the module activation.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleCache` ModuleCache moved to Internal\Module package.
- `\OxidEsales\EshopCommunity\Core\Module\ModuleExtensionsCleaner` The whole chain is updated during module activation and deactivation in the database. We do not need this functionality any more
- `\OxidEsales\EshopCommunity\Core\Module\ModuleValidatorFactory` Module metadata validation moved to Internal\Module package
- `\OxidEsales\EshopCommunity\Core\Routing\Module\ClassProviderStorage` Use service "OxidEsales\EshopCommunity\Internal\Common\Storage\YamlFileStorage".
- `\OxidEsales\EshopCommunity\Core\Contract\ClassProviderStorageInterface` Use service "OxidEsales\EshopCommunity\Internal\Common\Storage\ArrayStorageInterface".
## [6.3.4] - 2019-05-24
@@ -208,6 +235,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- Fix Bank code validation bug in Direct Debit [#0006939](https://bugs.oxid-esales.com/view.php?id=6939)
- Classes:
- `OxidEsales\EshopCommunity\Core\Module\ModuleInstaller`
- `OxidEsales\EshopCommunity\source\Module\Core\Module`
- `OxidEsales\EshopCommunity\source\Module\Core\ModuleList`
- `OxidEsales\EshopCommunity\Core\Contract\IModuleValidator `
- `OxidEsales\EshopCommunity\Core\Module\ModuleMetadataValidator`
## [6.3.3] - 2019-04-16
### Fixed
@@ -7,6 +7,8 @@
"license": "GPL-3.0-only",
"require": {
"php": "^7.1",
"ext-pdo": "*",
"ext-json": "*",
"phpmailer/phpmailer": "^v6.0.6",
"smarty/smarty": "^v2.6.31",
"doctrine/dbal": "^v2.5.13",
@@ -15,9 +17,12 @@
"psr/container": "1.0.*",
"symfony/event-dispatcher": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/expression-language": "^3.4",
"symfony/lock": "^3.4",
"symfony/console": "^v3.4.15",
"webmozart/path-util": "^2.3"
"webmozart/path-util": "^2.3",
"symfony/finder": "^3.4",
"symfony/filesystem": "^3.4"
},
"require-dev": {
"oxid-esales/flow-theme": "^v3.0.2",
@@ -6,6 +6,9 @@
namespace OxidEsales\EshopCommunity\Application\Controller\Admin;
use OxidEsales\Eshop\Core\Module\Module;
use OxidEsales\EshopCommunity\Internal\Application\ContainerFactory;
use OxidEsales\EshopCommunity\Internal\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
use OxidEsales\Eshop\Core\Registry;
/**
@@ -149,12 +152,8 @@ protected function _runBasicDiagnostics()
* Modules
*/
if ($this->getParam('oxdiag_frm_modules')) {
$sModulesDir = \OxidEsales\Eshop\Core\Registry::getConfig()->getModulesDir();
$oModuleList = oxNew(\OxidEsales\Eshop\Core\Module\ModuleList::class);
$aModules = $oModuleList->getModulesFromDir($sModulesDir);
$aViewData['oxdiag_frm_modules'] = true;
$aViewData['mylist'] = $aModules;
$aViewData['mylist'] = $this->getInstalledModules();
}
/**
@@ -235,4 +234,23 @@ public function getParam($name)
return $request->getRequestEscapedParameter($name);
}
/**
* @return array
*/
private function getInstalledModules(): array
{
$container = ContainerFactory::getInstance()->getContainer();
$shopConfiguration = $container->get(ShopConfigurationDaoBridgeInterface::class)->get();
$modules = [];
foreach ($shopConfiguration->getModuleConfigurations() as $moduleConfiguration) {
$module = oxNew(Module::class);
$module->load($moduleConfiguration->getId());
$modules[$moduleConfiguration->getId()] = $module;
}
return $modules;
}
}

0 comments on commit 4d11268

Please sign in to comment.
You can’t perform that action at this time.