Merge branch 'b-6.x'

OXID-eSales · Feb 28, 2019 · b99455a · b99455a
2 parents 52228b3 + 6dfb502
commit b99455a
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 87 deletions.
diff --git a/source/Internal/Adapter/Configuration/Dao/ShopConfigurationSettingDao.php b/source/Internal/Adapter/Configuration/Dao/ShopConfigurationSettingDao.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/Dao/ShopConfigurationSettingDaoInterface.php b/source/Internal/Adapter/Configuration/Dao/ShopConfigurationSettingDaoInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/DataObject/ShopConfigurationSetting.php b/source/Internal/Adapter/Configuration/DataObject/ShopConfigurationSetting.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/DataObject/ShopSettingType.php b/source/Internal/Adapter/Configuration/DataObject/ShopSettingType.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/Exception/InvalidShopSettingValueException.php b/source/Internal/Adapter/Configuration/Exception/InvalidShopSettingValueException.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/Utility/ShopSettingEncoder.php b/source/Internal/Adapter/Configuration/Utility/ShopSettingEncoder.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Configuration/Utility/ShopSettingEncoderInterface.php b/source/Internal/Adapter/Configuration/Utility/ShopSettingEncoderInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Adapter/Exception/ModuleNotLoadableException.php b/source/Internal/Adapter/Exception/ModuleNotLoadableException.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Application/BootstrapContainer/BootstrapContainerFactory.php b/source/Internal/Application/BootstrapContainer/BootstrapContainerFactory.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Common/Exception/UnsupportedMethodException.php b/source/Internal/Common/Exception/UnsupportedMethodException.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Common/StateMachine/StateMachineInterface.php b/source/Internal/Common/StateMachine/StateMachineInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Common/Storage/ArrayStorageInterface.php b/source/Internal/Common/Storage/ArrayStorageInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Common/Storage/YamlFileStorage.php b/source/Internal/Common/Storage/YamlFileStorage.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Cache/ModuleCacheServiceInterface.php b/source/Internal/Module/Cache/ModuleCacheServiceInterface.php
@@ -1,12 +1,9 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.
  */
 
-
 namespace OxidEsales\EshopCommunity\Internal\Module\Cache;
 
 /**

diff --git a/source/Internal/Module/Cache/ShopModuleCacheService.php b/source/Internal/Module/Cache/ShopModuleCacheService.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Configuration/DataMapper/ModuleConfigurationDataMapper.php b/source/Internal/Module/Configuration/DataMapper/ModuleConfigurationDataMapper.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Configuration/DataMapper/ModuleConfigurationDataMapperInterface.php b/source/Internal/Module/Configuration/DataMapper/ModuleConfigurationDataMapperInterface.php
@@ -1,5 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
 
 /**
  * Copyright © OXID eSales AG. All rights reserved.

diff --git a/source/Internal/Module/Configuration/DataMapper/ProjectConfigurationDataMapper.php b/source/Internal/Module/Configuration/DataMapper/ProjectConfigurationDataMapper.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Configuration/DataMapper/ShopConfigurationDataMapper.php b/source/Internal/Module/Configuration/DataMapper/ShopConfigurationDataMapper.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Configuration/DataMapper/ShopConfigurationDataMapperInterface.php b/source/Internal/Module/Configuration/DataMapper/ShopConfigurationDataMapperInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Configuration/DataObject/Chain.php b/source/Internal/Module/Configuration/DataObject/Chain.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Setup/Exception/ServicesYamlConfigurationError.php b/source/Internal/Module/Setup/Exception/ServicesYamlConfigurationError.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/Setup/Service/ModuleActivationServiceInterface.php b/source/Internal/Module/Setup/Service/ModuleActivationServiceInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/ShopModuleSetting/ShopModuleSetting.php b/source/Internal/Module/ShopModuleSetting/ShopModuleSetting.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/ShopModuleSetting/ShopModuleSettingDao.php b/source/Internal/Module/ShopModuleSetting/ShopModuleSettingDao.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/ShopModuleSetting/ShopModuleSettingDaoInterface.php b/source/Internal/Module/ShopModuleSetting/ShopModuleSettingDaoInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/TemplateExtension/TemplateBlockExtension.php b/source/Internal/Module/TemplateExtension/TemplateBlockExtension.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/TemplateExtension/TemplateBlockExtensionDao.php b/source/Internal/Module/TemplateExtension/TemplateBlockExtensionDao.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.

diff --git a/source/Internal/Module/TemplateExtension/TemplateBlockExtensionDaoInterface.php b/source/Internal/Module/TemplateExtension/TemplateBlockExtensionDaoInterface.php
@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-declare(strict_types=1);
-
 /**
  * Copyright © OXID eSales AG. All rights reserved.
  * See LICENSE file for license details.