From c18cc18bb8235290b9d57d94329d887abaf052fe Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 30 Jan 2012 21:41:49 -0500 Subject: [PATCH] Working Composer Deps, versioning, autoloader from composer implemented --- .gitignore | 3 ++- composer.json | 8 ++++++-- composer.lock | 21 +++++++++++++++++++++ tests/bootstrap.php | 10 +--------- 4 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 2a2625d..4da07a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ phpunit.xml coverage docs -sandbox \ No newline at end of file +sandbox +vendor diff --git a/composer.json b/composer.json index e890714..b5fdc13 100644 --- a/composer.json +++ b/composer.json @@ -3,17 +3,21 @@ , "type": "library" , "description": "PHP WebSocket server component library" , "keywords": ["WebSocket"] + , "homepage": "http://socketo.me" + , "repository": "https://github.com/cboden/Ratchet" , "license": "MIT" + , "version": "0.1" , "authors": [ { "name": "Chris Boden" , "email": "cboden@gmail.com" - , "homepage": "http://socketo.me" + , "homepage": "http://res.im" } ] , "autoload": { "psr-0": { - "Ratchet": "src/" + "Ratchet\\Tests": "tests" + , "Ratchet": "lib" } } , "require": { diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..35761a5 --- /dev/null +++ b/composer.lock @@ -0,0 +1,21 @@ +{ + "hash": "f237c18d57c8cda8acb08f4d1e917930", + "packages": [ + { + "package": "doctrine\/common", + "version": "master-dev" + }, + { + "package": "symfony\/validator", + "version": "2.1.0-dev" + }, + { + "package": "symfony\/event-dispatcher", + "version": "2.1.0-dev" + }, + { + "package": "guzzle\/guzzle", + "version": "master-dev" + } + ] +} \ No newline at end of file diff --git a/tests/bootstrap.php b/tests/bootstrap.php index d8416df..259d106 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,11 +1,3 @@ register(); - - $app = new SplClassLoader('Ratchet', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'lib'); - $app->register(); - - $app = new SplClassLoader('Guzzle', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'guzzle' . DIRECTORY_SEPARATOR . 'src'); - $app->register(); \ No newline at end of file + require_once dirname(__DIR__) . '/vendor/.composer/autoload.php'; \ No newline at end of file