[TASK] Update Fluid dependency to 2.0 13/50213/2
authorClaus Due <claus@namelesscoder.net>
Thu, 13 Oct 2016 13:42:13 +0000 (15:42 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 13 Oct 2016 19:59:22 +0000 (21:59 +0200)
This change updates the Fluid dependency and fixes
the single breaking change introduced by this new
major version.

No API functionality is changed except for the cache
interface now returning a Warmer instance.

Main addition:

https://github.com/TYPO3Fluid/Fluid/commit/55d61a87cc2dd63fcb7a77957b6b3aab70d7364f

Change-Id: I88eeaebbf70bf5b565adbf055d72bd63367eb3de
Resolves: #78282
Releases: master
Reviewed-on: https://review.typo3.org/50213
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
composer.json
composer.lock
typo3/sysext/fluid/Classes/Core/Cache/FluidTemplateCache.php

index 12aeca7..a570729 100644 (file)
@@ -46,7 +46,7 @@
                "psr/http-message": "~1.0",
                "cogpowered/finediff": "~0.3.1",
                "mso/idna-convert": "^1.1.0",
-               "typo3fluid/fluid": "^1.1",
+               "typo3fluid/fluid": "^2.0",
                "guzzlehttp/guzzle": "^6.2.1",
                "doctrine/dbal": "~2.5.4"
        },
index 9c8e47a..0805642 100644 (file)
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d871cb37d3ddba70d6b9bc6324aee61c",
-    "content-hash": "7b9db90f3627e82a91c23748c8e70920",
+    "hash": "46f644d4073e537db72d40863fb31541",
+    "content-hash": "b96f1764a6d015f19d8a115367e58d26",
     "packages": [
         {
             "name": "cogpowered/finediff",
         },
         {
             "name": "typo3fluid/fluid",
-            "version": "1.1.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3Fluid/Fluid.git",
-                "reference": "8d9fb64825eb79302b36f973fc2f48e7f19841df"
+                "reference": "008e3156d9d1878d91aec73b40e659ccfd032899"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3Fluid/Fluid/zipball/8d9fb64825eb79302b36f973fc2f48e7f19841df",
-                "reference": "8d9fb64825eb79302b36f973fc2f48e7f19841df",
+                "url": "https://api.github.com/repos/TYPO3Fluid/Fluid/zipball/008e3156d9d1878d91aec73b40e659ccfd032899",
+                "reference": "008e3156d9d1878d91aec73b40e659ccfd032899",
                 "shasum": ""
             },
             "require": {
             "require-dev": {
                 "mikey179/vfsstream": "^1.6",
                 "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "^1.0"
+                "satooshi/php-coveralls": "^1.0",
+                "squizlabs/php_codesniffer": "^2.7"
             },
             "bin": [
                 "bin/fluid"
                 "LGPL-3.0"
             ],
             "description": "The TYPO3 Fluid template rendering engine",
-            "time": "2016-10-12 12:10:55"
+            "time": "2016-10-13 13:13:27"
         }
     ],
     "packages-dev": [
index 507712b..6f4586d 100644 (file)
@@ -17,6 +17,8 @@ namespace TYPO3\CMS\Fluid\Core\Cache;
 use TYPO3\CMS\Core\Cache\Exception\InvalidDataException;
 use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
 use TYPO3Fluid\Fluid\Core\Cache\FluidCacheInterface;
+use TYPO3Fluid\Fluid\Core\Cache\FluidCacheWarmerInterface;
+use TYPO3Fluid\Fluid\Core\Cache\StandardCacheWarmer;
 
 /**
  * Class FluidTemplateCache
@@ -60,4 +62,12 @@ class FluidTemplateCache extends PhpFrontend implements FluidCacheInterface
         }
         parent::set($entryIdentifier, $sourceCode, $tags, time() + 86400);
     }
+
+    /**
+     * @return FluidCacheWarmerInterface
+     */
+    public function getCacheWarmer()
+    {
+        return new StandardCacheWarmer();
+    }
 }