Merge 14219a6 into d547610

romm · Feb 13, 2017 · 9b1f463 · 9b1f463
2 parents d547610 + 14219a6
commit 9b1f463
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,9 @@ matrix:
   include:
   - env: TYPO3_VERSION=^7.6 COVERAGE=1
     php: 7.0
+    # TYPO3 v8 requires PHP v7+
+  - env: TYPO3_VERSION=^8.5 COVERAGE=0
+    php: 7.0
   exclude:
     # We must exclude TYPO3 6.2 with PHP 7, because the build just doesn't work (have no clue why).
   - env: TYPO3_VERSION=^6.2 COVERAGE=0
@@ -21,7 +24,6 @@ matrix:
   - env: TYPO3_VERSION=^7.6 COVERAGE=0
     php: 7.0
 
-
 sudo: false
 
 addons:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # ![Configuration Object](Documentation/Images/configuration-object-icon@medium.png) Configuration Object – ChangeLog
 
+1.3.0 - 2017-02-13
+------------------
+
+Configuration Object is now compatible with TYPO3 8.5+!
+
+- **[[#5](https://github.com/romm/configuration_object/pull/5)] [FEATURE] Make extension compatible with TYPO3 v8**
+
 1.2.3 - 2017-01-30
 ------------------
 

diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml
@@ -6,8 +6,8 @@
 conf.py:
   copyright: 2016
   project: Configuration Object
-  version: 1.2.3
-  release: 1.2.3
+  version: 1.3.0
+  release: 1.3.0
   latex_documents:
   - - Index
     - configuration_object.tex

diff --git a/Tests/Unit/ConfigurationObjectUnitTestUtility.php b/Tests/Unit/ConfigurationObjectUnitTestUtility.php
@@ -106,8 +106,12 @@ function (array $service) {
             );
 
         $cacheManager = new CacheManager;
-        $cacheFactory = new CacheFactory('foo', $cacheManager);
-        $cacheManager->injectCacheFactory($cacheFactory);
+
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '8.2.0', '<')) {
+            $cacheFactory = new CacheFactory('foo', $cacheManager);
+            $cacheManager->injectCacheFactory($cacheFactory);
+        }
+
         $this->configurationObjectCoreMock->injectCacheManager($cacheManager);
 
         $reflectedCore = new \ReflectionClass(Core::class);

diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
     }
   ],
   "require": {
-    "php": ">=5.5"
+    "php": ">=5.5",
+    "typo3/cms": "^6.2 || ^7.6 || ^8.5"
   },
   "require-dev": {
     "mikey179/vfsStream": "1.4.*@dev",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -3,7 +3,7 @@
 $EM_CONF[$_EXTKEY] = [
     'title'       => 'Configuration Object',
     'description' => 'Transform any configuration plain array into a dynamic and configurable object structure, and pull apart configuration handling from the main logic of your script. Use provided services to add more functionality to your objects: cache, parents, persistence and much more.',
-    'version'     => '1.2.3',
+    'version'     => '1.3.0',
     'state'       => 'stable',
     'category'    => 'backend',
 
@@ -12,7 +12,7 @@
 
     'constraints' => [
         'depends'   => [
-            'typo3' => '6.2.0-7.99.99',
+            'typo3' => '6.2.0-8.5.99',
             'php'   => '5.5.0-7.99.99'
         ],
         'conflicts' => [],