summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 14:37:43 +0200
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 14:37:43 +0200
commit4d35ec4d6156b2f999bc06cb6c48ab127ff80156 (patch)
tree1bb64499582b61d9c18aa1a9f97724c212f0162c
parent1fd9c2de819cef67d67feb3f738b3ca89ef28adb (diff)
Move to pradosoft and update composer and travis
-rw-r--r--.travis.yml15
l---------bin/dbunit.php1
-rw-r--r--composer.json4
-rw-r--r--composer.lock2
4 files changed, 18 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 178d7a0b..d24b79fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,18 @@
language: php
+
+env: APPLICATION_ENV travis
+
php:
- 5.3
- 5.4
-script: "./travis-phing.sh test"
+
+before_script:
+ - COMPOSER_PROCESS_TIMEOUT=10000 composer install
+ - ./bin/phing rw
+ - ./bin/phing db -D env=travis
+
+script:
+ - ./bin/phing test
+
+notifications:
+ email: false \ No newline at end of file
diff --git a/bin/dbunit.php b/bin/dbunit.php
new file mode 120000
index 00000000..5e2de34a
--- /dev/null
+++ b/bin/dbunit.php
@@ -0,0 +1 @@
+../vendor/phpunit/dbunit/dbunit.php \ No newline at end of file
diff --git a/composer.json b/composer.json
index ce883af3..ca69a6c0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
{
- "name": "comperio/prado",
+ "name": "pradosoft/prado",
"type": "library",
"description": "Component Framework for PHP",
"keywords": ["Framework", "Component"],
@@ -84,6 +84,6 @@
"bin/prado-cli"
],
"config" : {
- "bin-dir" : "./bin"
+ "bin-dir" : "bin"
}
}
diff --git a/composer.lock b/composer.lock
index 56621a3a..55de132e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "e5d70122872ea7d1cc8b47c1f04db936",
+ "hash": "ae7d91d4c1e387a53b10213eab22fdc8",
"packages": [
],