Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump deepdiver/zipstreamer from 1.1.1 to 2.0.0 #521

Merged
merged 1 commit into from
Dec 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 10 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -284,7 +284,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
),
'nextcloud/lognormalizer' =>
array (
Expand Down
5 changes: 5 additions & 0 deletions composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
18 changes: 11 additions & 7 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -5242,6 +5246,6 @@
"install-path": "../web-auth/webauthn-lib"
}
],
"dev": true,
"dev": false,
"dev-package-names": []
}
10 changes: 5 additions & 5 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -261,7 +261,7 @@
'aliases' =>
array (
),
'reference' => '81a9fcefae15dfe4fb7c581ff99708e176c7a88d',
'reference' => '455f47df98504ef1336cd9e4c5b59c60903ebb22',
),
'nextcloud/lognormalizer' =>
array (
Expand Down
3 changes: 3 additions & 0 deletions deepdiver/zipstreamer/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/composer.phar
/vendor/
/composer.lock
2 changes: 1 addition & 1 deletion deepdiver/zipstreamer/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
36 changes: 36 additions & 0 deletions deepdiver/zipstreamer/src/COMPR.php
Original file line number Diff line number Diff line change
@@ -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;
}
Loading