Merge branch 'b-6.2.x'

# Conflicts: # source/Setup/Sql/initial_data.sql # tests/Integration/Internal/Framework/Module/MetaData/Dao/MetaDataProviderTest.php # tests/Unit/Internal/Framework/Module/MetaData/Dao/MetaDataNormalizerTest.php # tests/Unit/Internal/Framework/Module/MetaData/Dao/MetaDataSchemataProviderTest.php # tests/Unit/Internal/Framework/Module/MetaData/Validator/MetaDataSchemaValidatorTest.php
OXID-eSales · Apr 3, 2020 · 0eff78f · 0eff78f
2 parents e340e73 + b947e03
commit 0eff78f
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 36 deletions.
diff --git a/source/Core/Module/Module.php b/source/Core/Module/Module.php
@@ -13,7 +13,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleConfigurationDaoBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ShopConfiguration;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 

diff --git a/source/Internal/Framework/Module/MetaData/Converter/ModuleSettingsBooleanConverter.php b/source/Internal/Framework/Module/MetaData/Converter/ModuleSettingsBooleanConverter.php
@@ -9,7 +9,7 @@
 
 namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Converter;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 
 class ModuleSettingsBooleanConverter implements MetaDataConverterInterface
 {

diff --git a/...e/MetaData/Service/MetaDataNormalizer.php → ...odule/MetaData/Dao/MetaDataNormalizer.php b/...e/MetaData/Service/MetaDataNormalizer.php → ...odule/MetaData/Dao/MetaDataNormalizer.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 use function is_string;
 

diff --git a/...a/Service/MetaDataNormalizerInterface.php → ...aData/Dao/MetaDataNormalizerInterface.php b/...a/Service/MetaDataNormalizerInterface.php → ...aData/Dao/MetaDataNormalizerInterface.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 interface MetaDataNormalizerInterface
 {

diff --git a/...ule/MetaData/Service/MetaDataProvider.php → .../Module/MetaData/Dao/MetaDataProvider.php b/...ule/MetaData/Service/MetaDataProvider.php → .../Module/MetaData/Dao/MetaDataProvider.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Converter\MetaDataConverterInterface;

diff --git a/...ata/Service/MetaDataProviderInterface.php → ...etaData/Dao/MetaDataProviderInterface.php b/...ata/Service/MetaDataProviderInterface.php → ...etaData/Dao/MetaDataProviderInterface.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\InvalidMetaDataException;
 

diff --git a/...Data/Service/MetaDataSchemataProvider.php → ...MetaData/Dao/MetaDataSchemataProvider.php b/...Data/Service/MetaDataSchemataProvider.php → ...MetaData/Dao/MetaDataSchemataProvider.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataVersionException;
 

diff --git a/...ice/MetaDataSchemataProviderInterface.php → ...Dao/MetaDataSchemataProviderInterface.php b/...ice/MetaDataSchemataProviderInterface.php → ...Dao/MetaDataSchemataProviderInterface.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao;
 
 interface MetaDataSchemataProviderInterface
 {

diff --git a/source/Internal/Framework/Module/MetaData/Dao/ModuleConfigurationDao.php b/source/Internal/Framework/Module/MetaData/Dao/ModuleConfigurationDao.php
@@ -11,7 +11,7 @@
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\DataMapper\MetaDataToModuleConfigurationDataMapperInterface;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProviderInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProviderInterface;
 
 class ModuleConfigurationDao implements ModuleConfigurationDaoInterface
 {

diff --git a/source/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapper.php b/source/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapper.php
@@ -19,7 +19,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration\Template;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration\TemplateBlock;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataValueTypeException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidator;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidatorInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setting\Setting;

diff --git a/source/Internal/Framework/Module/MetaData/Validator/MetaDataSchemaValidator.php b/source/Internal/Framework/Module/MetaData/Validator/MetaDataSchemaValidator.php
@@ -11,8 +11,8 @@
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataKeyException;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataValueTypeException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataSchemataProviderInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataSchemataProviderInterface;
 
 class MetaDataSchemaValidator implements MetaDataSchemaValidatorInterface
 {

diff --git a/source/Internal/Framework/Module/MetaData/Validator/ModuleIdValidator.php b/source/Internal/Framework/Module/MetaData/Validator/ModuleIdValidator.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\ModuleIdNotValidException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 
 class ModuleIdValidator implements MetaDataValidatorInterface
 {

diff --git a/source/Internal/Framework/Module/MetaData/Validator/ModuleSettingBooleanValidator.php b/source/Internal/Framework/Module/MetaData/Validator/ModuleSettingBooleanValidator.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\SettingNotValidException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 
 class ModuleSettingBooleanValidator implements MetaDataValidatorInterface
 {

diff --git a/source/Internal/Framework/Module/MetaData/bootstrap-services.yaml b/source/Internal/Framework/Module/MetaData/bootstrap-services.yaml
@@ -86,8 +86,8 @@ services:
     autowire: true
     public: false
 
-  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProviderInterface:
-    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider
+  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProviderInterface:
+    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider
     arguments:
       $context: '@OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface'
 
@@ -100,13 +100,13 @@ services:
   OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidatorInterface:
     class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidator
 
-  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataSchemataProviderInterface:
-    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataSchemataProvider
+  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataSchemataProviderInterface:
+    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataSchemataProvider
     arguments:
       - '%oxid_esales.module.metadata.service.metadata_schemata%'
 
-  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataNormalizerInterface:
-    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataNormalizer
+  OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataNormalizerInterface:
+    class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataNormalizer
 
   OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataValidatorInterface:
     class: OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataValidatorAggregate

diff --git a/...MetaData/Service/MetaDataProviderTest.php → ...ule/MetaData/Dao/MetaDataProviderTest.php b/...MetaData/Service/MetaDataProviderTest.php → ...ule/MetaData/Dao/MetaDataProviderTest.php
@@ -7,13 +7,13 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Module\MetaData\Dao;
 
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Converter\MetaDataConverterInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\ModuleIdNotValidException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataNormalizer;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataNormalizer;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataValidatorInterface;
 use OxidEsales\EshopCommunity\Tests\Integration\Internal\ContainerTrait;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\InvalidMetaDataException;

diff --git a/tests/Integration/Internal/Framework/Module/MetaData/MetaDataMapperTest.php b/tests/Integration/Internal/Framework/Module/MetaData/MetaDataMapperTest.php
@@ -13,7 +13,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\ModuleIdNotValidException;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataKeyException;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataValueTypeException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProviderInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProviderInterface;
 use OxidEsales\EshopCommunity\Tests\Integration\Internal\TestContainerFactory;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/.../Unit/Internal/Framework/Module/MetaData/Converter/ModuleSettingsBooleanConverterTest.php b/.../Unit/Internal/Framework/Module/MetaData/Converter/ModuleSettingsBooleanConverterTest.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Converter;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Converter\ModuleSettingsBooleanConverter;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ModuleSettingsBooleanConverterTest extends TestCase

diff --git a/...taData/Service/MetaDataNormalizerTest.php → ...e/MetaData/Dao/MetaDataNormalizerTest.php b/...taData/Service/MetaDataNormalizerTest.php → ...e/MetaData/Dao/MetaDataNormalizerTest.php
@@ -7,9 +7,9 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Dao;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataNormalizer;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataNormalizer;
 use PHPUnit\Framework\TestCase;
 
 class MetaDataNormalizerTest extends TestCase

diff --git a/.../Service/MetaDataSchemataProviderTest.php → ...Data/Dao/MetaDataSchemataProviderTest.php b/.../Service/MetaDataSchemataProviderTest.php → ...Data/Dao/MetaDataSchemataProviderTest.php
@@ -7,16 +7,16 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Service;
+namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Dao;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataSchemataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataSchemataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataVersionException;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class MetaDataSchemataProviderTest
  *
- * @package OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Service
+ * @package OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Dao
  */
 class MetaDataSchemataProviderTest extends TestCase
 {

diff --git a/tests/Unit/Internal/Framework/Module/MetaData/Dao/ModuleConfigurationDaoTest.php b/tests/Unit/Internal/Framework/Module/MetaData/Dao/ModuleConfigurationDaoTest.php
@@ -12,7 +12,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\ModuleConfigurationDao;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\DataMapper\MetaDataToModuleConfigurationDataMapperInterface;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProviderInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProviderInterface;
 use PHPUnit\Framework\TestCase;
 
 class ModuleConfigurationDaoTest extends TestCase

diff --git a/tests/Unit/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapperTest.php b/tests/Unit/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapperTest.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\DataMapper\MetaDataMapper;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidatorInterface;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/Unit/Internal/Framework/Module/MetaData/Validator/MetaDataSchemaValidatorTest.php b/tests/Unit/Internal/Framework/Module/MetaData/Validator/MetaDataSchemaValidatorTest.php
@@ -11,8 +11,8 @@
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataKeyException;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataValueTypeException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataSchemataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataSchemataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\MetaDataSchemaValidator;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\UnsupportedMetaDataVersionException;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Unit/Internal/Framework/Module/MetaData/Validator/ModuleIdValidatorTest.php b/tests/Unit/Internal/Framework/Module/MetaData/Validator/ModuleIdValidatorTest.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Validator;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\ModuleIdNotValidException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\ModuleIdValidator;
 use PHPUnit\Framework\TestCase;
 

diff --git a/...it/Internal/Framework/Module/MetaData/Validator/ShopModuleSettingBooleanValidatorTest.php b/...it/Internal/Framework/Module/MetaData/Validator/ShopModuleSettingBooleanValidatorTest.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Unit\Internal\Framework\Module\MetaData\Validator;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Exception\SettingNotValidException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Service\MetaDataProvider;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Validator\ModuleSettingBooleanValidator;
 use PHPUnit\Framework\TestCase;