Merge branch 'develop'

ppi · May 5, 2015 · 8f4ccb4 · 8f4ccb4
2 parents a67d2a4 + 1a9ee00
commit 8f4ccb4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ PPI Bower Module
 [@ppi]:     http://ppi.io/      "PPI Framework - The PHP Meta Framework!"
 [@bower]:   http://bower.io/    "A package manager for the web"
 
-[PPI][@ppi] module to manage web assets with [Bower][@bower].
+[PPI2][@ppi] module to manage web assets with [Bower][@bower].
 
 <!--- [![Build Status](https://secure.travis-ci.org/ppi/ppi-bower-module.png)](http://travis-ci.org/ppi/ppi-bower-module) -->
 

diff --git a/composer.json b/composer.json
@@ -7,19 +7,32 @@
     "authors": [
         {
             "name": "Vítor Brandão",
-            "email": "vitor@noiselabs.org"
+            "email": "vitor@ppi.io"
+        },
+        {
+            "name": "Paul Dragoonis",
+            "email": "paul@ppi.io"
         }
     ],
     "support": {
         "irc": "irc://irc.freenode.org/ppi",
         "issues": "https://github.com/ppi/ppi-bower-module/issues"
     },
     "require": {
-        "ppi/framework": "dev-2.1"
+        "ppi/framework": "dev-master",
+        "symfony/process": "~2.6"
+    },
+    "require-dev":{
+        "phpunit/phpunit": "3.7.*"
+    },
+    "config": {
+        "bin-dir": "bin"
     },
     "autoload": {
-        "psr-0": { "PPI\\BowerModule": "" }
+        "psr-4": {
+            "PPI\\BowerModule\\": "src/",
+            "PPI\\BowerModule\\Tests\\": "tests"
+        }
     },
-    "target-dir": "PPI/BowerModule",
     "minimum-stability": "dev"
 }
diff --git a/Module.php → src/Module.php b/Module.php → src/Module.php