diff --git a/.travis.yml b/.travis.yml
index 18ede860..cd31330f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,10 @@ php:
- 5.4
- 5.5
- 5.6
+ - hhvm
-matrix:
- fast_finish: true
+sudo: false
-before_script:
- - travis_retry composer self-update
- - travis_retry composer install --no-interaction --prefer-source --dev
+install: travis_retry composer install --no-interaction --prefer-source
-script:
- - ./vendor/bin/phpunit --verbose --coverage-text
+script: vendor/bin/phpunit
diff --git a/app/commands/.gitkeep b/app/commands/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/controllers/.gitkeep b/app/controllers/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/database/migrations/.gitkeep b/app/database/migrations/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/database/seeds/.gitkeep b/app/database/seeds/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/composer.json b/composer.json
index 685e627a..e90e0697 100644
--- a/composer.json
+++ b/composer.json
@@ -11,17 +11,16 @@
"require": {
"laravel/framework": "4.2.*",
"guzzlehttp/guzzle": "~5.0",
- "dingo/api": "0.7.*",
+ "dingo/api": "0.8.*",
"watson/validating": "0.10.*",
"thujohn/rss": "~1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.3.0",
+ "phpunit/phpunit": "~4.3",
"mockery/mockery": "0.9.*"
},
"autoload": {
"classmap": [
- "app/commands",
"app/controllers",
"app/models",
"app/database/migrations",
@@ -30,7 +29,7 @@
"app/filters"
],
"psr-4": {
- "CachetHQ\\": "app/CachetHQ"
+ "CachetHQ\\": "app/CachetHQ/"
}
},
"extra": {
diff --git a/composer.lock b/composer.lock
index a32c9aed..23968e5e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "2ae72de35d3545ce3a3be4cda27ba5a8",
+ "hash": "0ac3b5458c174eb2ce493d6a55ff75ea",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -89,21 +89,21 @@
},
{
"name": "dingo/api",
- "version": "v0.7.3",
+ "version": "v0.8.2",
"source": {
"type": "git",
"url": "https://github.com/dingo/api.git",
- "reference": "f6138d3bfced0bd7d2a2a06635b2880c9bfe932f"
+ "reference": "2a4d2afb3f2f2cdb94726e928fd3829f250abbc6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dingo/api/zipball/f6138d3bfced0bd7d2a2a06635b2880c9bfe932f",
- "reference": "f6138d3bfced0bd7d2a2a06635b2880c9bfe932f",
+ "url": "https://api.github.com/repos/dingo/api/zipball/2a4d2afb3f2f2cdb94726e928fd3829f250abbc6",
+ "reference": "2a4d2afb3f2f2cdb94726e928fd3829f250abbc6",
"shasum": ""
},
"require": {
"illuminate/support": "~4.1",
- "league/fractal": "0.10.*",
+ "league/fractal": "0.11.*",
"php": ">=5.4.0"
},
"require-dev": {
@@ -117,7 +117,7 @@
"lucadegasperi/oauth2-server-laravel": "3.0.*",
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5",
+ "squizlabs/php_codesniffer": "~2.0",
"tymon/jwt-auth": "0.3.*"
},
"suggest": {
@@ -127,7 +127,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.7-dev"
+ "dev-master": "0.8-dev"
}
},
"autoload": {
@@ -152,7 +152,7 @@
"laravel",
"restful"
],
- "time": "2014-12-06 07:13:15"
+ "time": "2014-12-14 10:16:02"
},
{
"name": "filp/whoops",
@@ -577,16 +577,16 @@
},
{
"name": "league/fractal",
- "version": "0.10.0",
+ "version": "0.11.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/fractal.git",
- "reference": "557e1803dabe8ce252a4549a29da6d439f62d3c2"
+ "reference": "5abf7b1ce12fea1e575355f76f4f58f15dba4be4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/fractal/zipball/557e1803dabe8ce252a4549a29da6d439f62d3c2",
- "reference": "557e1803dabe8ce252a4549a29da6d439f62d3c2",
+ "url": "https://api.github.com/repos/thephpleague/fractal/zipball/5abf7b1ce12fea1e575355f76f4f58f15dba4be4",
+ "reference": "5abf7b1ce12fea1e575355f76f4f58f15dba4be4",
"shasum": ""
},
"require": {
@@ -595,11 +595,15 @@
"require-dev": {
"illuminate/pagination": "~4.1",
"mockery/mockery": "~0.9",
+ "pagerfanta/pagerfanta": "~1.0.0",
"phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
+ "squizlabs/php_codesniffer": "~1.5",
+ "zendframework/zend-paginator": "~2.3"
},
"suggest": {
- "illuminate/pagination": "The Illuminate Pagination component."
+ "illuminate/pagination": "The Illuminate Pagination component.",
+ "pagerfanta/pagerfanta": "Pagerfanta Paginator",
+ "zendframework/zend-paginator": "Zend Framework Paginator"
},
"type": "library",
"extra": {
@@ -632,7 +636,7 @@
"league",
"rest"
],
- "time": "2014-10-17 17:12:38"
+ "time": "2014-12-10 16:59:07"
},
{
"name": "monolog/monolog",
@@ -2424,16 +2428,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.3.5",
+ "version": "4.4.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1"
+ "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
- "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
+ "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"shasum": ""
},
"require": {
@@ -2450,8 +2454,9 @@
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.0",
"sebastian/diff": "~1.1",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "~1.1",
"sebastian/exporter": "~1.0",
+ "sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
"symfony/yaml": "~2.0"
},
@@ -2464,7 +2469,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3.x-dev"
+ "dev-master": "4.4.x-dev"
}
},
"autoload": {
@@ -2473,10 +2478,6 @@
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "",
- "../../symfony/yaml/"
- ],
"license": [
"BSD-3-Clause"
],
@@ -2488,13 +2489,13 @@
}
],
"description": "The PHP Unit Testing framework.",
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://phpunit.de/",
"keywords": [
"phpunit",
"testing",
"xunit"
],
- "time": "2014-11-11 10:11:09"
+ "time": "2014-12-05 06:49:03"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -2782,6 +2783,57 @@
],
"time": "2014-09-10 00:51:36"
},
+ {
+ "name": "sebastian/global-state",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/global-state.git",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.2"
+ },
+ "suggest": {
+ "ext-uopz": "*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Snapshotting of global state",
+ "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "keywords": [
+ "global state"
+ ],
+ "time": "2014-10-06 09:23:50"
+ },
{
"name": "sebastian/version",
"version": "1.0.3",
@@ -2869,6 +2921,7 @@
"minimum-stability": "stable",
"stability-flags": [],
"prefer-stable": false,
+ "prefer-lowest": false,
"platform": [],
"platform-dev": []
}
diff --git a/phpunit.xml b/phpunit.xml
index c3304205..b12cc839 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,12 +7,23 @@
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
+ stopOnError="false"
stopOnFailure="false"
- syntaxCheck="false"
+ syntaxCheck="true"
+ strict="true"
+ verbose="true"
>
-
+
./app/tests/
+
+
+ ./app/CachetHQ
+ ./app/controllers
+ ./app/filters
+ ./app/models
+
+