From 4fb37ef6f393e4eea60c743fb50c9d4a61534b8b Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 14 Mar 2024 12:40:07 +0000
Subject: revert adding of zip and bump composer php version to 8.1

---
 composer.json                         | 3 +--
 composer.lock                         | 4 ++--
 vendor/composer/autoload_classmap.php | 2 ++
 vendor/composer/autoload_static.php   | 2 ++
 vendor/composer/installed.php         | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 63d98a010..e375b8a32 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,7 @@
         "source": "https://framagit.org/hubzilla/core/"
     },
     "require": {
-        "php": ">=8.0.2",
-        "ext-zip": "*",
+        "php": ">=8.1",
         "ext-curl": "*",
         "ext-iconv": "*",
         "ext-intl": "*",
diff --git a/composer.lock b/composer.lock
index 8b2dbae79..584f08551 100644
--- a/composer.lock
+++ b/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": "a1e6e50cc266ffa9e8cd2a4a64c1dbb6",
+    "content-hash": "238129164013c0705a6a97f8c3ba617b",
     "packages": [
         {
             "name": "blueimp/jquery-file-upload",
@@ -5316,7 +5316,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "ext-curl": "*",
         "ext-iconv": "*",
         "ext-intl": "*",
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 62440f63e..9df6511aa 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1308,6 +1308,7 @@ return array(
     'Zotlabs\\Lib\\SvgSanitizer' => $baseDir . '/Zotlabs/Lib/SvgSanitizer.php',
     'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php',
     'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php',
+    'Zotlabs\\Lib\\Text' => $baseDir . '/Zotlabs/Lib/Text.php',
     'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php',
     'Zotlabs\\Lib\\ThreadListener' => $baseDir . '/Zotlabs/Lib/ThreadListener.php',
     'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php',
@@ -1381,6 +1382,7 @@ return array(
     'Zotlabs\\Module\\Email_validation' => $baseDir . '/Zotlabs/Module/Email_validation.php',
     'Zotlabs\\Module\\Embed' => $baseDir . '/Zotlabs/Module/Embed.php',
     'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
+    'Zotlabs\\Module\\Emoji' => $baseDir . '/Zotlabs/Module/Emoji.php',
     'Zotlabs\\Module\\Event' => $baseDir . '/Zotlabs/Module/Event.php',
     'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
     'Zotlabs\\Module\\Feed' => $baseDir . '/Zotlabs/Module/Feed.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 5e3f3e1cb..d6f2c2f9d 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -1555,6 +1555,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Lib\\SvgSanitizer' => __DIR__ . '/../..' . '/Zotlabs/Lib/SvgSanitizer.php',
         'Zotlabs\\Lib\\System' => __DIR__ . '/../..' . '/Zotlabs/Lib/System.php',
         'Zotlabs\\Lib\\Techlevels' => __DIR__ . '/../..' . '/Zotlabs/Lib/Techlevels.php',
+        'Zotlabs\\Lib\\Text' => __DIR__ . '/../..' . '/Zotlabs/Lib/Text.php',
         'Zotlabs\\Lib\\ThreadItem' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadItem.php',
         'Zotlabs\\Lib\\ThreadListener' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadListener.php',
         'Zotlabs\\Lib\\ThreadStream' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadStream.php',
@@ -1628,6 +1629,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Email_validation' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_validation.php',
         'Zotlabs\\Module\\Embed' => __DIR__ . '/../..' . '/Zotlabs/Module/Embed.php',
         'Zotlabs\\Module\\Embedphotos' => __DIR__ . '/../..' . '/Zotlabs/Module/Embedphotos.php',
+        'Zotlabs\\Module\\Emoji' => __DIR__ . '/../..' . '/Zotlabs/Module/Emoji.php',
         'Zotlabs\\Module\\Event' => __DIR__ . '/../..' . '/Zotlabs/Module/Event.php',
         'Zotlabs\\Module\\Fbrowser' => __DIR__ . '/../..' . '/Zotlabs/Module/Fbrowser.php',
         'Zotlabs\\Module\\Feed' => __DIR__ . '/../..' . '/Zotlabs/Module/Feed.php',
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index bfd0c7e83..8925761d5 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'zotlabs/hubzilla',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '27e57ff7aad9b70a4d088b880fac4af2920fdd31',
+        'reference' => 'a9d4adaf2360f7d02dace4434e4e62d6ce072327',
         'type' => 'application',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -340,7 +340,7 @@
         'zotlabs/hubzilla' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '27e57ff7aad9b70a4d088b880fac4af2920fdd31',
+            'reference' => 'a9d4adaf2360f7d02dace4434e4e62d6ce072327',
             'type' => 'application',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-- 
cgit v1.2.3