added composer support and autoloading

php-amqplib · May 10, 2012 · 790f7c5 · 790f7c5
1 parent 3d2678a
commit 790f7c5
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-lib/php-amqplib
+vendor
+composer.lock
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@ Inside the _examples_ folder you can see how to implement RPC, parallel processi
 
 INSTALLATION
 
-Clone this project and then just run `make` to fetch the dependencies.
+@see http://getcomposer.org for composer details.
+
+Clone this project and then just run `composer update` to fetch the dependencies.
 
 This project requires the php-amqplib library.
 

diff --git a/composer.json b/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "videlalvaro/Thumper",
+    "type": "library",
+    "description": "AMQP Tools",
+    "keywords": ["library", "AMQP", "RabbitMQ", "PHPAMQPLib", "Thumper"],
+    "homepage": "git://github.com/videlalvaro/Thumper.git",
+    "autoload": {
+        "psr-0": {"Thumper": "lib"}
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git://github.com/videlalvaro/php-amqplib.git"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "videlalvaro/php-amqplib" : "master-dev"
+    }
+}
diff --git a/config/autoload.php b/config/autoload.php
diff --git a/config/config.php b/config/config.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once dirname(__DIR__) . '/vendor/autoload.php';
 define('HOST', 'localhost');
 define('PORT', 5672);
 define('USER', 'guest');

diff --git a/examples/parallel_processing/char_count_server.php b/examples/parallel_processing/char_count_server.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/RpcServer.php');
 
 $charCount = function($word)
 {

diff --git a/examples/parallel_processing/parallel_rpc.php b/examples/parallel_processing/parallel_rpc.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/RpcClient.php');
 
 $start = time();
 

diff --git a/examples/parallel_processing/random_int_server.php b/examples/parallel_processing/random_int_server.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/RpcServer.php');
 
 $randomInt = function($data)
 {

diff --git a/examples/queue_server/consumer.php b/examples/queue_server/consumer.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/Consumer.php');
 
 $myConsumer = function($msg)
 {

diff --git a/examples/queue_server/producer.php b/examples/queue_server/producer.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/Producer.php');
 
 $producer = new Producer(HOST, PORT, USER, PASS, VHOST);
 $producer->setExchangeOptions(array('name' => 'hello-exchange', 'type' => 'direct'));

diff --git a/examples/rpc/rpc_client.php b/examples/rpc/rpc_client.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/RpcClient.php');
 
 $client = new RpcClient(HOST, PORT, USER, PASS, VHOST);
 $client->initClient();

diff --git a/examples/topic/anon_consumer.php b/examples/topic/anon_consumer.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/AnonConsumer.php');
 
 $myConsumer = function($msg)
 {

diff --git a/examples/topic/topic_consumer.php b/examples/topic/topic_consumer.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/Consumer.php');
 
 $myConsumer = function($msg)
 {

diff --git a/examples/topic/topic_producer.php b/examples/topic/topic_producer.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../../config/autoload.php');
+require_once(dirname(dirname(__DIR__)) . '/config/config.php');
-require_once(__DIR__ . '/../../config/config.php');
-require_once(__DIR__ . '/../../lib/Thumper/Producer.php');
 
 $producer = new Producer(HOST, PORT, USER, PASS, VHOST);
 $producer->setExchangeOptions(array('name' => 'logs-exchange', 'type' => 'topic'));

diff --git a/vendor/symfony/Symfony/Component/ClassLoader b/vendor/symfony/Symfony/Component/ClassLoader
diff --git a/vendor/videlalvaro/php-amqplib b/vendor/videlalvaro/php-amqplib