Permalink
Browse files

added phpunit to require-dev

  • Loading branch information...
1 parent 522ed97 commit 077a35b75c63d9594bacaa0652995275720e3d16 @kriswallsmith committed Feb 11, 2013
Showing with 10 additions and 5 deletions.
  1. +3 −2 .gitignore
  2. +1 −1 .travis.yml
  3. +6 −2 composer.json
View
@@ -1,4 +1,5 @@
+bin/
+composer.lock
+composer.phar
phpunit.xml
vendor/
-composer.phar
-composer.lock
View
@@ -37,4 +37,4 @@ before_script:
- wget -q http://static.jonof.id.au/dl/kenutils/pngout-20120530-linux.tar.gz && tar -xzf pngout-20120530-linux.tar.gz && mv pngout-20120530-linux vendor
- export PNGOUT_BIN=vendor/pngout-20120530-linux/i386/pngout
-script: phpunit -v
+script: ./bin/phpunit -v
View
@@ -2,7 +2,7 @@
"name": "kriswallsmith/assetic",
"minimum-stability": "dev",
"description": "Asset Management for PHP",
- "keywords": ["assets", "compression", "minification"],
+ "keywords": [ "assets", "compression", "minification" ],
"homepage": "https://github.com/kriswallsmith/assetic",
"type": "library",
"license": "MIT",
@@ -18,6 +18,7 @@
"symfony/process": ">=2.1.0,<2.3-dev"
},
"require-dev": {
+ "phpunit/phpunit": "3.7.*",
"twig/twig": ">=1.6.0,<2.0",
"leafo/lessphp": "*",
"leafo/scssphp": "*",
@@ -39,7 +40,10 @@
},
"autoload": {
"psr-0": { "Assetic": "src/" },
- "files": ["src/functions.php"]
+ "files": [ "src/functions.php" ]
+ },
+ "config": {
+ "bin-dir": "bin"
},
"extra": {
"branch-alias": {

0 comments on commit 077a35b

Please sign in to comment.