Merge pull request #34 from Grandt/2.0.5

2.0.5

.gitignore

@@ -50,3 +50,8 @@ Thumbs.db
 #####################################
 tests/screenshots/*
 tests/vendor/*
+/composer.lock
+/*.phar
+vendor
+/legacy/*.lock
+/legacy/vendor

composer.json

@@ -4,8 +4,8 @@
  "description": "Package to create and stream archives of compressed files in ZIP format with PHP 5.3+",
  "keywords": ["phpzip", "zip", "pkzip", "archive", "compressed", "compression", "stream"],
  "homepage": "https://github.com/Grandt/PHPZip",
- "license": "GNU LGPL 2.1",
- "version": "2.0.3",
+ "license": "LGPL-2.1",
+ "version": "2.0.5",
  "authors": [
  {
  "name": "A. Grandt",
@@ -25,6 +25,9 @@
  }
  ],
  "require": {
+ "grandt/binstring": "0.2.0.*@dev",
+ "grandt/relativepath": "1.0.1.*@dev",
+ "grandt/phpzipmerge": ">=1.0.1",
  "php": ">=5.3.0"
  },
  "autoload": {

legacy/README.txt

@@ -0,0 +1,11 @@
+If you already know how to use composer, skip this file.
+
+Start by reading https://getcomposer.org/download/
+
+1. download composer.phar as shown in that page.
+
+2. from the legacy folder, run
+#>php <path to composer>/composer.phar install
+
+This will download dependencies for these test files.
+

legacy/composer.json

@@ -0,0 +1,13 @@
+{
+ "require": {
+ "php": ">=5.3.0",
+ "grandt/binstring": "0.2.0.*@dev",
+ "grandt/relativepath": "1.0.1.*@dev",
+ "grandt/phpzipmerge": ">=1.0.1"
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPZip\\Zip\\": "../src/Zip"
+ }
+ }
+}

legacy/vendor/autoload.php

@@ -1,33 +1,7 @@
 <?php
-/**
- * User: Grandt
- * Date: 29-07-14
- */
 
-$currentExtensions = spl_autoload_extensions();
-if (strpos($currentExtensions, ",.php") === false) {
- spl_autoload_extensions($currentExtensions . ',.php');
-}
+// autoload.php @generated by Composer
 
-/*** class Loader ***/
-function PHPZipLoader($class) {
- $filename = str_replace('PHPZip\\Zip\\', '../src/Zip/', $class);
+require_once __DIR__ . '/composer' . '/autoload_real.php';
 
- $file = $filename . '.php';
-
- if ("\\" != DIRECTORY_SEPARATOR) {
- $file = str_replace("\\", DIRECTORY_SEPARATOR, $file);
- }
-
- if ("/" != DIRECTORY_SEPARATOR) {
- $file = str_replace("/", DIRECTORY_SEPARATOR, $file);
- }
-
- if (!file_exists($file)) {
- return false;
- }
- require($file);
-}
-
-/*** register the loader functions ***/
-spl_autoload_register('PHPZipLoader');
+return ComposerAutoloaderInite6c13717920b2806b80a413638fd1ff9::getLoader();