Skip to content

Commit

Permalink
Merge pull request #92 from nextcloud/switch_zipstreamer
Browse files Browse the repository at this point in the history 
Switch over to deepdiver/zipstreamer
  • Loading branch information
@rullzer
rullzer committed Apr 6, 2018
2 parents 58b4c79 + caed770 commit d4e8f89
Show file tree
Hide file tree
Showing 13 changed files with 190 additions and 148 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ stecman/symfony-console-completion/composer.json
stecman/symfony-console-completion/phpunit.xml.dist
stecman/symfony-console-completion/README.md

mcnetic/zipstreamer/tests
deepdiver/zipstreamer/tests

ircmaxell/security-lib/tests

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"require": {
"aws/aws-sdk-php": "^3.35",
"bantu/ini-get-wrapper": "v1.0.1",
"deepdiver/zipstreamer": "1.1.1",
"deepdiver1975/TarStreamer": "v0.1.0",
"doctrine/dbal": "dev-2.5-pg10",
"guzzlehttp/guzzle": "6.3.0",
Expand All @@ -26,7 +27,6 @@
"leafo/scssphp": "^0.7.2",
"league/flysystem": "^1.0",
"lukasreschke/id3parser": "^0.0.1",
"mcnetic/zipstreamer": "^1.0",
"natxet/CssMin": "dev-master",
"nikic/php-parser": "1.4.1",
"patchwork/jsqueeze": "^2.0",
Expand Down
119 changes: 66 additions & 53 deletions composer.lock
View file

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

26 changes: 13 additions & 13 deletions composer/autoload_classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1830,19 +1830,19 @@
'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => $vendorDir . '/symfony/translation/Writer/TranslationWriter.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
'System' => $vendorDir . '/pear/pear-core-minimal/src/System.php',
'ZipStreamer\\COMPR' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\Count64' => $vendorDir . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64Base' => $vendorDir . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_32' => $vendorDir . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_64' => $vendorDir . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\DOS' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflatePeclStream' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStoreStream' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStream' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ExtFileAttr' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\GPFLAGS' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\UNIX' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ZipStreamer' => $vendorDir . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\COMPR' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\Count64' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64Base' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_32' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_64' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\DOS' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflatePeclStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStoreStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ExtFileAttr' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\GPFLAGS' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\UNIX' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ZipStreamer' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'aCssAtBlockEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssAtBlockStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
Expand Down
2 changes: 1 addition & 1 deletion composer/autoload_psr4.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'ownCloud\\TarStreamer\\' => array($vendorDir . '/deepdiver1975/tarstreamer/src'),
'bantu\\IniGetWrapper\\' => array($vendorDir . '/bantu/ini-get-wrapper/src'),
'ZipStreamer\\' => array($vendorDir . '/mcnetic/zipstreamer/src'),
'ZipStreamer\\' => array($vendorDir . '/deepdiver/zipstreamer/src'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
Expand Down
28 changes: 14 additions & 14 deletions composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
),
'ZipStreamer\\' =>
array (
0 => __DIR__ . '/..' . '/mcnetic/zipstreamer/src',
0 => __DIR__ . '/..' . '/deepdiver/zipstreamer/src',
),
'Symfony\\Polyfill\\Mbstring\\' =>
array (
Expand Down Expand Up @@ -2191,19 +2191,19 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => __DIR__ . '/..' . '/symfony/translation/Writer/TranslationWriter.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
'System' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/System.php',
'ZipStreamer\\COMPR' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\Count64' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64Base' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_32' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_64' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\DOS' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflatePeclStream' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStoreStream' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStream' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ExtFileAttr' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\GPFLAGS' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\UNIX' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ZipStreamer' => __DIR__ . '/..' . '/mcnetic/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\COMPR' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\Count64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64Base' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_32' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\Count64_64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/lib/Count64.php',
'ZipStreamer\\DOS' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflatePeclStream' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStoreStream' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\DeflateStream' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ExtFileAttr' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\GPFLAGS' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\UNIX' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'ZipStreamer\\ZipStreamer' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
'aCssAtBlockEndToken' => __DIR__ . '/..' . '/natxet/CssMin/src/CssMin.php',
'aCssAtBlockStartToken' => __DIR__ . '/..' . '/natxet/CssMin/src/CssMin.php',
'aCssDeclarationToken' => __DIR__ . '/..' . '/natxet/CssMin/src/CssMin.php',
Expand Down
121 changes: 67 additions & 54 deletions composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,73 @@
],
"description": "Convenience wrapper around ini_get()"
},
{
"name": "deepdiver/zipstreamer",
"version": "1.1.1",
"version_normalized": "1.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/DeepDiver1975/PHPZipStreamer.git",
"reference": "c8e73ca3204bd0e06abdb0bc533f073b616d6e47"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DeepDiver1975/PHPZipStreamer/zipball/c8e73ca3204bd0e06abdb0bc533f073b616d6e47",
"reference": "c8e73ca3204bd0e06abdb0bc533f073b616d6e47",
"shasum": ""
},
"require": {
"php": ">=5.6.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
},
"time": "2018-03-26T14:48:40+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"ZipStreamer\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-3.0+"
],
"authors": [
{
"name": "Nicolai Ehemann",
"email": "en@enlightened.de",
"role": "Author/Maintainer"
},
{
"name": "André Rothe",
"email": "arothe@zks.uni-leipzig.de",
"role": "Contributor"
},
{
"name": "Lukas Reschke",
"email": "lukas@owncloud.com",
"role": "Contributor"
},
{
"name": "Thomas Müller",
"email": "thomas.mueller@tmit.eu",
"role": "Contributor"
},
{
"name": "Roeland Jago Douma",
"email": "roeland@famdouma.nl",
"role": "Contributor"
}
],
"description": "Stream zip files without i/o overhead",
"homepage": "https://github.com/DeepDiver1975/PHPZipStreamer",
"keywords": [
"stream",
"zip"
]
},
{
"name": "deepdiver1975/tarstreamer",
"version": "v0.1.0",
Expand Down Expand Up @@ -1390,60 +1457,6 @@
"tags"
]
},
{
"name": "mcnetic/zipstreamer",
"version": "v1.0",
"version_normalized": "1.0.0.0",
"source": {
"type": "git",
"url": "https://github.com/McNetic/PHPZipStreamer.git",
"reference": "e57c198486242476587d04844084adbe8330581d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/McNetic/PHPZipStreamer/zipball/e57c198486242476587d04844084adbe8330581d",
"reference": "e57c198486242476587d04844084adbe8330581d",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"time": "2016-02-17T22:47:09+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"ZipStreamer\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-3.0+"
],
"authors": [
{
"name": "Nicolai Ehemann",
"email": "en@enlightened.de",
"role": "Author/Maintainer"
},
{
"name": "André Rothe",
"email": "arothe@zks.uni-leipzig.de",
"role": "Contributor"
},
{
"name": "Lukas Reschke",
"email": "lukas@owncloud.com",
"role": "Contributor"
}
],
"description": "Stream zip files without i/o overhead",
"homepage": "https://github.com/McNetic/PHPZipStreamer",
"keywords": [
"stream",
"zip"
]
},
{
"name": "mtdowling/jmespath.php",
"version": "2.4.0",
Expand Down
0 mcnetic/zipstreamer/COPYING → deepdiver/zipstreamer/COPYING
View file
File renamed without changes.
0 mcnetic/zipstreamer/MANUAL.md → deepdiver/zipstreamer/MANUAL.md
View file
File renamed without changes.
0 mcnetic/zipstreamer/README.md → deepdiver/zipstreamer/README.md
View file
File renamed without changes.

0 comments on commit d4e8f89

Please sign in to comment.