From 32643581ba96f8f9b5a01864f5b702485366b27c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 19 Apr 2012 21:56:05 +0200 Subject: [PATCH] Fix line endings --- CHANGELOG.md | 58 +++++++++++++++++++++++------------------------ src/bootstrap.php | 50 ++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b32d8fcb..e11ed2552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,29 +1,29 @@ -* 1.0.0-alpha3 - - * Schema: Added 'require-dev' for development-time requirements (tests, etc), install with --dev - * Schema: Removed 'recommend' - * Schema: 'suggest' is now informational and can use any description for a package, not only a constraint - * Break: .composer/autoload.php and other files in vendor/.composer have been moved to vendor/ - * Added caching of repository metadata (faster startup times & failover if packagist is down) - * Added include_path support for legacy projects that are full of require_once statements - * Added installation notifications API to allow better statistics on Composer repositories - * Improved repository protocol to have large cacheable parts - -* 1.0.0-alpha2 (2012-04-03) - - * Added `create-project` command to install a project from scratch with composer - * Added automated `classmap` autoloading support for non-PSR-0 compliant projects - * Added human readable error reporting when deps can not be solved - * Added support for private GitHub and SVN repositories (use --no-interaction for CI) - * Added "file" downloader type to download plain files - * Added support for authentication with svn repositories - * Added autoload support for PEAR repositories - * Improved clones from GitHub which now automatically select between git/https/http protocols - * Improved `validate` command to give more feedback - * Improved the `search` & `show` commands output - * Removed dependency on filter_var - * Various robustness & error handling improvements, docs fixes and more bug fixes - -* 1.0.0-alpha1 (2012-03-01) - - * Initial release +* 1.0.0-alpha3 + + * Schema: Added 'require-dev' for development-time requirements (tests, etc), install with --dev + * Schema: Removed 'recommend' + * Schema: 'suggest' is now informational and can use any description for a package, not only a constraint + * Break: .composer/autoload.php and other files in vendor/.composer have been moved to vendor/ + * Added caching of repository metadata (faster startup times & failover if packagist is down) + * Added include_path support for legacy projects that are full of require_once statements + * Added installation notifications API to allow better statistics on Composer repositories + * Improved repository protocol to have large cacheable parts + +* 1.0.0-alpha2 (2012-04-03) + + * Added `create-project` command to install a project from scratch with composer + * Added automated `classmap` autoloading support for non-PSR-0 compliant projects + * Added human readable error reporting when deps can not be solved + * Added support for private GitHub and SVN repositories (use --no-interaction for CI) + * Added "file" downloader type to download plain files + * Added support for authentication with svn repositories + * Added autoload support for PEAR repositories + * Improved clones from GitHub which now automatically select between git/https/http protocols + * Improved `validate` command to give more feedback + * Improved the `search` & `show` commands output + * Removed dependency on filter_var + * Various robustness & error handling improvements, docs fixes and more bug fixes + +* 1.0.0-alpha1 (2012-03-01) + + * Initial release diff --git a/src/bootstrap.php b/src/bootstrap.php index 0eab8a25e..3ce95752c 100644 --- a/src/bootstrap.php +++ b/src/bootstrap.php @@ -1,25 +1,25 @@ - - * Jordi Boggiano - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -function includeIfExists($file) { - if (file_exists($file)) { - return include $file; - } -} - -if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../autoload.php'))) { - die('You must set up the project dependencies, run the following commands:'.PHP_EOL. - 'curl -s http://getcomposer.org/installer | php'.PHP_EOL. - 'php composer.phar install'.PHP_EOL); -} - -return $loader; \ No newline at end of file + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +function includeIfExists($file) { + if (file_exists($file)) { + return include $file; + } +} + +if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../autoload.php'))) { + die('You must set up the project dependencies, run the following commands:'.PHP_EOL. + 'curl -s http://getcomposer.org/installer | php'.PHP_EOL. + 'php composer.phar install'.PHP_EOL); +} + +return $loader;