Cleaned up composer setup and removed custom autoloader.

zumba · Sep 20, 2013 · 1ac5cee · 1ac5cee
1 parent cd0f195
commit 1ac5cee
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+bin/
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,11 @@ env:
   - MONGO_VERSION=1.3.1
 
 before_script:
-   - pecl -q install mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - pecl -q install mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - composer install --dev
 
-script: phpunit --coverage-text
+
+script: ./bin/phpunit --coverage-text
 
 notifications:
   email: false
diff --git a/README.md b/README.md
@@ -11,8 +11,6 @@ __Current Version__: v1.1
 
 ## Testing
 
-After cloning the repo, simply `cd` to the cloned directly and run:
-
-```shell
-$ phpunit
-```
+1. Clone repo.
+1. Install dependencies `composer install -dev`
+1. Run `./bin/phpunit`
diff --git a/composer.json b/composer.json
@@ -22,16 +22,20 @@
     },
     "require": {
         "php": ">=5.3.0",
-        "phpunit/phpunit": ">=3.7.0",
         "ext-mongo": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
     "bin": [
         "composer/bin/mongounit"
     ],
     "config": {
         "bin-dir": "bin"
     },
     "autoload": {
-        "files": ["src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php"]
+        "psr-0": {
+            "Zumba\\PHPUnit\\Extensions\\Mongo\\": "src/"
+        }
     }
-}
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit backupGlobals="false"
 		 backupStaticAttributes="false"
-		 bootstrap="./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php"
+		 bootstrap="vendor/autoload.php"
 		 convertErrorsToExceptions="true"
 		 convertNoticesToExceptions="true"
 		 convertWarningsToExceptions="true"
@@ -19,15 +19,8 @@
 		</testsuite>
 	</testsuites>
 	<filter>
-		<blacklist>
-			<file>./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php</file>
-			<directory>./tests</directory>
-		</blacklist>
 		<whitelist addUncoveredFilesFromWhitelist="true">
 			<directory>./src/Zumba/PHPUnit</directory>
-			<exclude>
-				<file>./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php</file>
-			</exclude>
 		</whitelist>
 	</filter>
-</phpunit>
+</phpunit>
diff --git a/src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php b/src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php