From: Philipp Schüle <p.schuele@metaways.de>
Date: Thu, 15 Sep 2016 08:51:04 +0000 (+0200)
Subject: 0012206: prevent redis exceptions on load
X-Git-Tag: 2016.09.2^2~1^2~4
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=1a7b1e05578a9e820bf1f5c300bae276d4de2cc0;hp=bef3153b5ae52499096fda5558bc435d05581ee5

0012206: prevent redis exceptions on load

https://forge.tine20.org/view.php?id=12206

Change-Id: I773bc4141c6b1c2cb02f0dec3c535d5735da7a79
Reviewed-on: http://gerrit.tine20.com/customers/3574
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
---

diff --git a/tine20/composer.json b/tine20/composer.json
index 8068a4f..d64762a 100644
--- a/tine20/composer.json
+++ b/tine20/composer.json
@@ -22,7 +22,7 @@
         "url": "http://git.syncroton.org/Syncroton"
     }],
     "require": {
-        "zendframework/zendframework1": "1.12.20pl1 as 1.12.20",
+        "zendframework/zendframework1": "1.12.20pl2 as 1.12.20",
         "tine20/composerapploader": "1.0.*",
         "syncroton/syncroton": "1.2.*",
         "ezyang/htmlpurifier": "v4.6.0",
diff --git a/tine20/composer.lock b/tine20/composer.lock
index ca64ae3..7f15240 100644
--- a/tine20/composer.lock
+++ b/tine20/composer.lock
@@ -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": "b9e525a47efd81f738804919fc63cc00",
-    "content-hash": "31d0ca0bacde0bcc74b23043535be536",
+    "hash": "2ebf4669ccf4c389e36fc387f901a928",
+    "content-hash": "66c9edfdde7271e72d74805b0f3175b9",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -618,7 +618,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f389f0f25b90d0b495308efcfa073981177f0fd",
                 "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd",
-                "shasum": "0038c5991b6c56df465e1e47cbedcd8eb529d15e"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.2"
@@ -1054,7 +1054,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/961546d71c332ab34ad1c5bba7f372c08b388dcf",
                 "reference": "961546d71c332ab34ad1c5bba7f372c08b388dcf",
-                "shasum": "48bc39b88cb0ebaa070553c3233914bd12e290b9"
+                "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
@@ -1244,7 +1244,7 @@
             ],
             "description": "Library to sync mobile devices",
             "homepage": "http://www.syncroton.org",
-            "time": "2016-09-07 12:25:24"
+            "time": "2016-09-09 13:41:37"
         },
         {
             "name": "tine20/composerapploader",
@@ -1582,11 +1582,11 @@
         },
         {
             "name": "zendframework/zendframework1",
-            "version": "1.12.20pl1",
+            "version": "1.12.20pl2",
             "source": {
                 "type": "git",
                 "url": "http://git.tine20.org/git/zendframework1",
-                "reference": "692f69fb10b40f2ecaf27d80d0381a3e1669c148"
+                "reference": "a7ff5a0dffe718f8e9ae60cb2d69ed44aab46dd6"
             },
             "require": {
                 "php": ">=5.3.0"
@@ -1603,7 +1603,7 @@
                 "New BSD License"
             ],
             "description": "Metaways Infosystems GmbH - Patched Zendframework1",
-            "time": "2016-09-09 10:21:17"
+            "time": "2016-09-15 08:24:09"
         }
     ],
     "packages-dev": [
@@ -2026,7 +2026,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
                 "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
-                "shasum": "e2798bcae4e0efe50b6529b0389c7620d61685ed"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
@@ -2163,7 +2163,7 @@
         {
             "alias": "1.12.20",
             "alias_normalized": "1.12.20.0",
-            "version": "1.12.20.0-patch1",
+            "version": "1.12.20.0-patch2",
             "package": "zendframework/zendframework1"
         },
         {