Merge pull request #5 from chadicus/develop

Develop

.coveralls.yml

@@ -0,0 +1,4 @@
+service_name: travis-ci
+src_dir: .
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.gitignore

@@ -1,4 +1,3 @@
 /coverage/
 /vendor/
 clover.xml
-phploc.xml

.scrutinizer.yml

@@ -0,0 +1,27 @@
+filter:
+    excluded_paths:
+        - 'vendor/*'
+        - 'tests/*'
+        - 'examples/*'
+before_commands:
+    - 'composer install --prefer-source'
+tools:
+    php_analyzer: true
+    php_mess_detector: true
+    php_code_sniffer:
+        config:
+            standard: PSR2
+    sensiolabs_security_checker: true
+    php_loc:
+        excluded_dirs:
+            - vendor
+            - tests
+            - examples
+    php_pdepend: true
+    php_sim: true
+build_failure_conditions:
+    - 'elements.rating(<= D).new.exists'           # No new classes/methods with a rating of D or worse allowed (useful for legacy code)
+    - 'issues.label("coding-style").new.exists'    # No new coding style issues allowed
+    - 'issues.label("coding-style").new.count > 5' # More than 5 new coding style issues.
+    - 'issues.severity(>= MAJOR).new.exists'       # New issues of major or higher severity
+    - 'project.metric("scrutinizer.quality", < 6)' # Code Quality Rating drops below 6

.travis.yml

@@ -1,12 +1,12 @@
-branches:
-  except: incubator
+sudo: false
 language: php
 php:
   - 5.6
   - 5.5
   - 5.4
+install: composer install 
 services: mongodb
 before_script:
-  - composer self-update || true
   - echo 'extension="mongo.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-script: ./build.php
+script: ./vendor/bin/phpunit --coverage-clover clover.xml
+after_success: ./vendor/bin/coveralls -v

CONTRIBUTING.md

@@ -4,10 +4,14 @@ Submit via [GitHub Issues](https://github.com/chadicus/marvel-api-client/issues)
 
 ## Pull Requests
 
-Code changes should be sent through [GitHub Pull Requests](https://github.com/chadicus/marvel-api-client/pulls).  Before submitting the pull request, make sure that our [build script](build.php) reports success:
+Code changes should be sent through [GitHub Pull Requests](https://github.com/chadicus/marvel-api-client/pulls).  Before submitting the pull request, make sure that phpunit reports success:
 
 ```sh
-./build.php
+./vendor/bin/phpunit --coverage-html coverage
 ```
 
-This build enforces 100% [PHPUnit](http://www.phpunit.de) code coverage and 0 errors for the [coding standard](https://github.com/chadicus/coding-standard).
+This build enforces 100% [PHPUnit](http://www.phpunit.de) code coverage and 0 errors for the [coding standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
+
+```sh
+./vendor/bin/phpcs --standard=PSR2 src tests
+```

LICENSE

@@ -1,20 +1,22 @@
-Copyright (c) 2014 John Chadwick Gray<chadwickgray@gmail.com>
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2015 Chad Gray
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,5 +1,10 @@
 # Marvel API Client
 [![Build Status](https://travis-ci.org/chadicus/marvel-api-client.png)](https://travis-ci.org/chadicus/marvel-api-client)
+[![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/chadicus/marvel-api-client.svg?style=flat)](https://scrutinizer-ci.com/g/chadicus/marvel-api-client/)
+[![Code Coverage](http://img.shields.io/coveralls/chadicus/marvel-api-client.svg?style=flat)](https://coveralls.io/r/chadicus/marvel-api-client)
+[![Latest Stable Version](http://img.shields.io/packagist/v/chadicus/marvel-api-client.svg?style=flat)](https://packagist.org/packages/chadicus/marvel-api-client)
+[![Total Downloads](http://img.shields.io/packagist/dt/chadicus/marvel-api-client.svg?style=flat)](https://packagist.org/packages/chadicus/marvel-api-client)
+[![License](http://img.shields.io/packagist/l/chadicus/marvel-api-client.svg?style=flat)](https://packagist.org/packages/chadicus/marvel-api-client)
 
 A PHP client for use with the Marvel API.  This project is still under heavy development.
 
@@ -34,7 +39,8 @@ Developers may be contacted at:
 With a checkout of the code get [Composer](http://getcomposer.org) in your PATH and run:
 
 ```sh
-./build.php
+composer install
+./vendor/bin/phpunit
 ```
 
 ## With Great Power Comes Great Responsibility.

composer.json

@@ -13,18 +13,17 @@
     "require": {
         "php": "~5.4",
         "dominionenterprises/util" : "~1.0",
-        "dominionenterprises/filter" : "~1.0"
+        "dominionenterprises/filter" : "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "~3.7.19",
-        "phpdocumentor/phpdocumentor": "~2.0",
-        "phploc/phploc": "~2.0.2",
-        "chadicus/coding-standard": "dev-master"
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "~0.6.1",
+        "squizlabs/php_codesniffer": "~2.0"
     },
     "suggests" : {
         "ext-mongo": "~1.3"
     },
     "autoload": {
-        "psr-0": { "Chadicus": ["src", "tests"] }
+        "psr-4": { "Chadicus\\Marvel\\Api\\": ["src", "tests"] }
     }
 }