From 145e108d66d56b8efff5cc227e8c1d3a2b121cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= <p.schuele@metaways.de>
Date: Wed, 2 Dec 2020 17:13:39 +0100
Subject: [PATCH] fix(TB ZF1 RedisProxy) php7.4 compat: Redis::delete is
 deprecated

use del instead (yey, we really cleaned up nicely here)

execute composer:
composer require "zendframework/zendframework1 1.12.20pl41 as 1.12.20"

Change-Id: I3575990609db5febd17c2cfb69a2bd3a16ff5323
---
 tine20/composer.json |  4 ++--
 tine20/composer.lock | 46 ++++++++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tine20/composer.json b/tine20/composer.json
index d0b53a329ab..74ac2adb60c 100644
--- a/tine20/composer.json
+++ b/tine20/composer.json
@@ -88,7 +88,6 @@
     "ezyang/htmlpurifier": "dev-master",
     "firebase/php-jwt": "^5",
     "giggsey/libphonenumber-for-php": "^8",
-    "psr/http-server-middleware": "^1.0",
     "jumbojett/openid-connect-php": "dev-master",
     "metaways/opendocument": "1.2",
     "metaways/timezoneconvert": "1.*",
@@ -97,6 +96,7 @@
     "phpoffice/phpexcel": "1.8.*",
     "phpoffice/phpspreadsheet": "1.10.1pl3 as 1.10.1",
     "phpoffice/phpword": "v0.14.0 as v0.13.0",
+    "psr/http-server-middleware": "^1.0",
     "sabre/dav": "1.8.*",
     "sabre/vobject": "3.5.3pl1 as 2.1.0",
     "sentry/sentry": "^1.8",
@@ -112,7 +112,7 @@
     "zendframework/zend-diactoros": "^1.6",
     "zendframework/zend-http": "2.5.*",
     "zendframework/zend-stratigility": "^3.2",
-    "zendframework/zendframework1": "1.12.20pl39 as 1.12.20"
+    "zendframework/zendframework1": "1.12.20pl41 as 1.12.20"
   },
   "require-dev": {
     "phing/phing": "2.16.*",
diff --git a/tine20/composer.lock b/tine20/composer.lock
index ac7f93941b5..223dd803173 100644
--- a/tine20/composer.lock
+++ b/tine20/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a391f42e7fbe4841728fe76779294cc3",
+    "content-hash": "1e481c3938b5992817bb6e3366a8f3ba",
     "packages": [
         {
             "name": "clue/socket-raw",
@@ -4153,11 +4153,11 @@
         },
         {
             "name": "zendframework/zendframework1",
-            "version": "1.12.20pl39",
+            "version": "1.12.20pl41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tine20/zendframework1.git",
-                "reference": "79c11374a4422d8f26fe794d82483e363afac71f"
+                "reference": "252e2b9b53fa3e948267e45479fa57352221bcbf"
             },
             "require": {
                 "php": ">=5.3.0"
@@ -4174,7 +4174,7 @@
                 "New BSD License"
             ],
             "description": "Metaways Infosystems GmbH - Patched Zendframework1",
-            "time": "2020-05-07T15:40:15+00:00"
+            "time": "2020-12-01T10:50:44+00:00"
         }
     ],
     "packages-dev": [
@@ -5771,40 +5771,40 @@
     ],
     "aliases": [
         {
-            "package": "doctrine/dbal",
-            "version": "2.5.13.0-patch6",
             "alias": "v2.5.13",
-            "alias_normalized": "2.5.13.0"
+            "alias_normalized": "2.5.13.0",
+            "version": "2.5.13.0-patch6",
+            "package": "doctrine/dbal"
         },
         {
-            "package": "doctrine/orm",
-            "version": "2.5.14.0-patch1",
             "alias": "v2.5.14",
-            "alias_normalized": "2.5.14.0"
+            "alias_normalized": "2.5.14.0",
+            "version": "2.5.14.0-patch1",
+            "package": "doctrine/orm"
         },
         {
-            "package": "phpoffice/phpspreadsheet",
-            "version": "1.10.1.0-patch3",
             "alias": "1.10.1",
-            "alias_normalized": "1.10.1.0"
+            "alias_normalized": "1.10.1.0",
+            "version": "1.10.1.0-patch3",
+            "package": "phpoffice/phpspreadsheet"
         },
         {
-            "package": "phpoffice/phpword",
-            "version": "0.14.0.0",
             "alias": "v0.13.0",
-            "alias_normalized": "0.13.0.0"
+            "alias_normalized": "0.13.0.0",
+            "version": "0.14.0.0",
+            "package": "phpoffice/phpword"
         },
         {
-            "package": "sabre/vobject",
-            "version": "3.5.3.0-patch1",
             "alias": "2.1.0",
-            "alias_normalized": "2.1.0.0"
+            "alias_normalized": "2.1.0.0",
+            "version": "3.5.3.0-patch1",
+            "package": "sabre/vobject"
         },
         {
-            "package": "zendframework/zendframework1",
-            "version": "1.12.20.0-patch39",
             "alias": "1.12.20",
-            "alias_normalized": "1.12.20.0"
+            "alias_normalized": "1.12.20.0",
+            "version": "1.12.20.0-patch41",
+            "package": "zendframework/zendframework1"
         }
     ],
     "minimum-stability": "stable",
@@ -5838,5 +5838,5 @@
         "php": "7.2.5",
         "ext-filter": "7.2"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "1.1.0"
 }