Skip to content

Commit

Permalink
Merge pull request #35 from Grandt/2.0.5
Browse files Browse the repository at this point in the history
2.0.5
  • Loading branch information
Grandt committed Aug 7, 2014
2 parents daf79b1 + 682dbfb commit 9b654a4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 929 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,12 @@ tests/vendor/*
vendor
/legacy/*.lock
/legacy/vendor
legacy/vendor/autoload.php
tests/composer.lock
tests/composer.lock
tests/composer.lock
legacy/vendor/autoload.php
/tests/*.lock
/legacy/vendor
*.lock
vendor
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": ["phpzip", "zip", "pkzip", "archive", "compressed", "compression", "stream"],
"homepage": "https://github.com/Grandt/PHPZip",
"license": "LGPL-2.1",
"version": "2.0.5",
"version": "2.0.6",
"authors": [
{
"name": "A. Grandt",
Expand All @@ -25,8 +25,8 @@
}
],
"require": {
"grandt/binstring": "0.2.0.*@dev",
"grandt/relativepath": "1.0.1.*@dev",
"grandt/binstring": ">=0.2.0",
"grandt/relativepath": ">=1.0.1",
"grandt/phpzipmerge": ">=1.0.1",
"php": ">=5.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions legacy/composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"require": {
"php": ">=5.3.0",
"grandt/binstring": "0.2.0.*@dev",
"grandt/relativepath": "1.0.1.*@dev",
"grandt/binstring": ">=0.2.0",
"grandt/relativepath": ">=1.0.1",
"grandt/phpzipmerge": ">=1.0.1"
},
"autoload": {
Expand Down
7 changes: 0 additions & 7 deletions legacy/vendor/autoload.php

This file was deleted.

4 changes: 2 additions & 2 deletions tests/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
},
"require-dev": {
"phpunit/phpunit-selenium": ">=1.2",
"grandt/binstring": "0.2.0.*@dev",
"grandt/relativepath": "1.0.1.*@dev",
"grandt/binstring": ">=0.2.0",
"grandt/relativepath": ">=1.0.1",
"grandt/phpzipmerge": ">=1.0.1"
},
"autoload": {
Expand Down
Loading

0 comments on commit 9b654a4

Please sign in to comment.