Merge pull request #521 from LorbusChris/bump-zipstreamer

Bump deepdiver/zipstreamer from 1.1.1 to 2.0.0
nextcloud · Dec 23, 2020 · aea1df9 · aea1df9
2 parents 82d0c23 + f554551
commit aea1df9
Show file tree

Hide file tree

Showing 23 changed files with 1,741 additions and 341 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
 		"aws/aws-sdk-php": "^3.35",
 		"bantu/ini-get-wrapper": "v1.0.1",
 		"christophwurst/id3parser": "^0.1.1",
-		"deepdiver/zipstreamer": "1.1.1",
+		"deepdiver/zipstreamer": "2.0.0",
 		"deepdiver1975/tarstreamer": "v2.0.0",
 		"doctrine/dbal": "2.12.0",
 		"guzzlehttp/guzzle": "6.5.2",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
+    'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -72,12 +72,12 @@ class InstalledVersions
     ),
     'deepdiver/zipstreamer' => 
     array (
-      'pretty_version' => '1.1.1',
-      'version' => '1.1.1.0',
+      'pretty_version' => '2.0.0',
+      'version' => '2.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c8e73ca3204bd0e06abdb0bc533f073b616d6e47',
+      'reference' => 'b8c59647ff34fb97e8937aefb2a65de2bc4b4755',
     ),
     'deepdiver1975/tarstreamer' => 
     array (
@@ -284,7 +284,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
+      'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
     ),
     'nextcloud/lognormalizer' => 
     array (

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -2826,6 +2826,11 @@
     'Webauthn\\TrustPath\\TrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPath.php',
     'Webauthn\\TrustPath\\TrustPathLoader' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php',
     'Webauthn\\Util\\CoseSignatureFixer' => $vendorDir . '/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php',
+    'ZipStreamer\\COMPR' => $vendorDir . '/deepdiver/zipstreamer/src/COMPR.php',
+    'ZipStreamer\\Count64' => $vendorDir . '/deepdiver/zipstreamer/src/Count64.php',
+    'ZipStreamer\\Lib\\Count64Base' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64Base.php',
+    'ZipStreamer\\Lib\\Count64_32' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64_32.php',
+    'ZipStreamer\\Lib\\Count64_64' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64_64.php',
     'ZipStreamer\\ZipStreamer' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
     'bantu\\IniGetWrapper\\IniGetWrapper' => $vendorDir . '/bantu/ini-get-wrapper/src/IniGetWrapper.php',
     'libphonenumber\\AlternateFormatsCountryCodeSet' => $vendorDir . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php',

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -3327,6 +3327,11 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\TrustPath\\TrustPath' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/TrustPath.php',
         'Webauthn\\TrustPath\\TrustPathLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php',
         'Webauthn\\Util\\CoseSignatureFixer' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php',
+        'ZipStreamer\\COMPR' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/COMPR.php',
+        'ZipStreamer\\Count64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Count64.php',
+        'ZipStreamer\\Lib\\Count64Base' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64Base.php',
+        'ZipStreamer\\Lib\\Count64_32' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64_32.php',
+        'ZipStreamer\\Lib\\Count64_64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64_64.php',
         'ZipStreamer\\ZipStreamer' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
         'bantu\\IniGetWrapper\\IniGetWrapper' => __DIR__ . '/..' . '/bantu/ini-get-wrapper/src/IniGetWrapper.php',
         'libphonenumber\\AlternateFormatsCountryCodeSet' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -226,17 +226,17 @@
         },
         {
             "name": "deepdiver/zipstreamer",
-            "version": "1.1.1",
-            "version_normalized": "1.1.1.0",
+            "version": "2.0.0",
+            "version_normalized": "2.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DeepDiver1975/PHPZipStreamer.git",
-                "reference": "c8e73ca3204bd0e06abdb0bc533f073b616d6e47"
+                "reference": "b8c59647ff34fb97e8937aefb2a65de2bc4b4755"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DeepDiver1975/PHPZipStreamer/zipball/c8e73ca3204bd0e06abdb0bc533f073b616d6e47",
-                "reference": "c8e73ca3204bd0e06abdb0bc533f073b616d6e47",
+                "url": "https://api.github.com/repos/DeepDiver1975/PHPZipStreamer/zipball/b8c59647ff34fb97e8937aefb2a65de2bc4b4755",
+                "reference": "b8c59647ff34fb97e8937aefb2a65de2bc4b4755",
                 "shasum": ""
             },
             "require": {
@@ -245,7 +245,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^5.7"
             },
-            "time": "2018-03-26T14:48:40+00:00",
+            "time": "2020-07-21T07:45:14+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -290,6 +290,10 @@
                 "stream",
                 "zip"
             ],
+            "support": {
+                "issues": "https://github.com/DeepDiver1975/PHPZipStreamer/issues",
+                "source": "https://github.com/DeepDiver1975/PHPZipStreamer/tree/master"
+            },
             "install-path": "../deepdiver/zipstreamer"
         },
         {
@@ -5242,6 +5246,6 @@
             "install-path": "../web-auth/webauthn-lib"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/composer/installed.php b/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
+    'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -49,12 +49,12 @@
     ),
     'deepdiver/zipstreamer' => 
     array (
-      'pretty_version' => '1.1.1',
-      'version' => '1.1.1.0',
+      'pretty_version' => '2.0.0',
+      'version' => '2.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c8e73ca3204bd0e06abdb0bc533f073b616d6e47',
+      'reference' => 'b8c59647ff34fb97e8937aefb2a65de2bc4b4755',
     ),
     'deepdiver1975/tarstreamer' => 
     array (
@@ -261,7 +261,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
+      'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
     ),
     'nextcloud/lognormalizer' => 
     array (

diff --git a/deepdiver/zipstreamer/.gitignore b/deepdiver/zipstreamer/.gitignore
@@ -0,0 +1,3 @@
+/composer.phar
+/vendor/
+/composer.lock
diff --git a/deepdiver/zipstreamer/composer.json b/deepdiver/zipstreamer/composer.json
@@ -5,7 +5,7 @@
   "keywords": ["zip", "stream"],
   "homepage": "https://github.com/DeepDiver1975/PHPZipStreamer",
   "license": "GPL-3.0+",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "authors": [ {
       "name": "Nicolai Ehemann",
       "email": "en@enlightened.de",

diff --git a/deepdiver/zipstreamer/src/COMPR.php b/deepdiver/zipstreamer/src/COMPR.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Class that holds compression type and level constants.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Nicolai Ehemann <en@enlightened.de>
+ * @author André Rothe <arothe@zks.uni-leipzig.de>
+ * @copyright Copyright (C) 2013-2015 Nicolai Ehemann and contributors
+ * @license GNU GPL
+ * @version 1.0
+ */
+namespace ZipStreamer;
+
+class COMPR {
+  // compression method
+  const STORE = 0x0000; //  0 - The file is stored (no compression)
+  const DEFLATE = 0x0008; //  8 - The file is deflated
+
+  // compression level (for deflate compression)
+  const NONE = 0;
+  const NORMAL = 1;
+  const MAXIMUM = 2;
+  const SUPERFAST = 3;
+}