Skip to content

Commit

Permalink
Merge pull request #196 from McNetic/zipstreamer-0.7
Browse files Browse the repository at this point in the history
changed ZipStreamer to use composer for updates, update to 0.7
  • Loading branch information
DeepDiver1975 committed Sep 18, 2015
2 parents b94f7d3 + 70d9c40 commit 6b6575b
Show file tree
Hide file tree
Showing 17 changed files with 2,507 additions and 664 deletions.
16 changes: 1 addition & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,10 @@
"config": {
"vendor-dir": "."
},
"repositories": [
{
"type":"package",
"package": {
"name": "mcnetic/phpzipstreamer",
"version":"master",
"source": {
"url": "https://github.com/McNetic/PHPZipStreamer.git",
"type": "git",
"reference":"master"
}
}
}
],
"require": {
"sabre/dav" : "2.1.6",
"doctrine/dbal": "2.5.1",
"mcnetic/phpzipstreamer": "dev-master",
"mcnetic/zipstreamer": "v0.7",
"kriswallsmith/assetic": "1.2.*@dev",
"phpseclib/phpseclib": "~2.0@dev",
"rackspace/php-opencloud": "v1.9.2",
Expand Down
54 changes: 45 additions & 9 deletions composer.lock

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

1 change: 1 addition & 0 deletions composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
return array(
'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'bantu\\IniGetWrapper\\' => array($vendorDir . '/bantu/ini-get-wrapper/src'),
'ZipStreamer\\' => array($vendorDir . '/mcnetic/zipstreamer/src'),
'SuperClosure\\' => array($vendorDir . '/jeremeamia/SuperClosure/src'),
'Sabre\\VObject\\' => array($vendorDir . '/sabre/vobject/lib'),
'Sabre\\HTTP\\' => array($vendorDir . '/sabre/http/lib'),
Expand Down
67 changes: 52 additions & 15 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,6 @@
"minification"
]
},
{
"name": "mcnetic/phpzipstreamer",
"version": "master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/McNetic/PHPZipStreamer.git",
"reference": "master"
},
"type": "library",
"installation-source": "source"
},
{
"name": "guzzle/common",
"version": "v3.8.1",
Expand Down Expand Up @@ -437,7 +425,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/730e81152e827118a5e5b875d169a89785aa7596",
"url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/835a0db62993cb1d85925f9a8aefe13e4ebe2b67",
"reference": "afbdaa044a9a0a9dff2f800bd670e231b3ec99b2",
"shasum": ""
},
Expand Down Expand Up @@ -519,7 +507,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mrclay/minify/zipball/cabd595a5aebf87e5d229814564aa3b466908be1",
"url": "https://api.github.com/repos/mrclay/minify/zipball/d233b65d3dc183933c5be8a16b5b7eaf313ef66c",
"reference": "bd9a450694cda1b54c43a1784adabe36ad522d89",
"shasum": ""
},
Expand Down Expand Up @@ -2308,7 +2296,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/761173bb7f26efef05b523835594f55214f46ce6",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6f6ec7f13a0ca95e504b408d7f176c5572130de2",
"reference": "772d4df5975a721d9c2cc79ca4da1339798c2c86",
"shasum": ""
},
Expand Down Expand Up @@ -2604,5 +2592,54 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency"
},
{
"name": "mcnetic/zipstreamer",
"version": "v0.7",
"version_normalized": "0.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/McNetic/PHPZipStreamer.git",
"reference": "44c99c659abf4dac92882437c1da68de824ca9d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/McNetic/PHPZipStreamer/zipball/44c99c659abf4dac92882437c1da68de824ca9d0",
"reference": "44c99c659abf4dac92882437c1da68de824ca9d0",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"time": "2015-08-26 13:48:01",
"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"
}
],
"description": "Stream zip files without i/o overhead",
"homepage": "https://github.com/McNetic/PHPZipStreamer",
"keywords": [
"stream",
"zip"
]
}
]
10 changes: 0 additions & 10 deletions mcnetic/phpzipstreamer/README.md

This file was deleted.

0 comments on commit 6b6575b

Please sign in to comment.