[packages/composer.git] / autoload.patch

--- composer-1.0.0-14.alpha11/bin/composer~	2015-11-25 23:34:22.000000000 +0200
+++ composer-1.0.0-14.alpha11/bin/composer	2015-11-25 23:34:25.939418752 +0200
@@ -5,7 +5,11 @@
     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
 }
 
-require __DIR__.'/../src/bootstrap.php';
+if (file_exists($autoload = __DIR__ . '/../src/Composer/autoload.php')) {
+	require $autoload;
+} else {
+	require '/usr/share/php/Composer/autoload.php';
+}
 
 use Composer\Console\Application;
 
--- composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php~	2015-11-25 23:45:44.000000000 +0200
+++ composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php	2015-11-25 23:45:49.118198863 +0200
@@ -149,7 +149,7 @@
             self::validateSyntax($content, $this->path);
         }
 
-        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
+        $schemaFile = __DIR__ . '/../res/composer-schema.json';
         $schemaData = json_decode(file_get_contents($schemaFile));
 
         if ($schema === self::LAX_SCHEMA) {
--- composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php~	2015-11-14 18:21:07.000000000 +0200
+++ composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php	2015-11-26 14:52:01.344498517 +0200
@@ -275,7 +275,7 @@
         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
 
         $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
-        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
+        $this->safeCopy(__DIR__.'/../res/LICENSE', $targetDir.'/LICENSE');
 
         $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
             'optimize' => (bool) $scanPsr0Packages,
Commit	Line	Data
65715e5b ER	1	--- composer-1.0.0-14.alpha11/bin/composer~ 2015-11-25 23:34:22.000000000 +0200
	2	+++ composer-1.0.0-14.alpha11/bin/composer 2015-11-25 23:34:25.939418752 +0200
	3	@@ -5,7 +5,11 @@
	4	echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
	5	}
	6
	7	-require __DIR__.'/../src/bootstrap.php';
	8	+if (file_exists($autoload = __DIR__ . '/../src/Composer/autoload.php')) {
	9	+ require $autoload;
	10	+} else {
	11	+ require '/usr/share/php/Composer/autoload.php';
	12	+}
	13
	14	use Composer\Console\Application;
	15
	16	--- composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php~ 2015-11-25 23:45:44.000000000 +0200
	17	+++ composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php 2015-11-25 23:45:49.118198863 +0200
	18	@@ -149,7 +149,7 @@
	19	self::validateSyntax($content, $this->path);
	20	}
	21
	22	- $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
	23	+ $schemaFile = __DIR__ . '/../res/composer-schema.json';
	24	$schemaData = json_decode(file_get_contents($schemaFile));
	25
	26	if ($schema === self::LAX_SCHEMA) {
1295fc99 ER	27	--- composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php~ 2015-11-14 18:21:07.000000000 +0200
	28	+++ composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php 2015-11-26 14:52:01.344498517 +0200
	29	@@ -275,7 +275,7 @@
	30	file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
	31
	32	$this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
	33	- $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
	34	+ $this->safeCopy(__DIR__.'/../res/LICENSE', $targetDir.'/LICENSE');
	35
	36	$this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
	37	'optimize' => (bool) $scanPsr0Packages,