Merge pull request #6 from nubs/master

Update build scripts to use phpunit/phpcs as a library.

Author: nubs

.gitignore

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

.scrutinizer.yml

@@ -1,6 +1,7 @@
 filter:
     excluded_paths:
         - 'vendor/*'
+        - 'tests/*'
 before_commands:
     - 'composer install --dev'
 tools:
@@ -11,9 +12,10 @@ tools:
             standard: PSR1
     sensiolabs_security_checker: true
     php_code_coverage:
-        test_command: './vendor/bin/phpunit --strict'
+        test_command: './vendor/bin/phpunit'
     php_loc:
         excluded_dirs:
             - vendor
+            - tests
     php_pdepend: true
     php_sim: true

.travis.yml

@@ -5,4 +5,5 @@ php:
   - 5.4
   - 5.3
   - hhvm
-script: ./build.php
+install: composer install
+script: ./vendor/bin/phpunit

README.md

@@ -1,14 +1,13 @@
 # Memoize
 A PHP library for memoizing repeated function calls.
 
-[![Build Status](https://travis-ci.org/dominionenterprises/memoize-php.png)](https://travis-ci.org/dominionenterprises/memoize-php)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/badges/quality-score.png?s=25ab188709941f6b6de105c8250c971f4f3d8982)](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/)
-[![Code Coverage](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/badges/coverage.png?s=927286917d2abd01c27eea906b91fbef071810f5)](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/)
-
-[![Latest Stable Version](https://poser.pugx.org/dominionenterprises/memoize/v/stable.png)](https://packagist.org/packages/dominionenterprises/memoize)
-[![Total Downloads](https://poser.pugx.org/dominionenterprises/memoize/downloads.png)](https://packagist.org/packages/dominionenterprises/memoize)
-[![Latest Unstable Version](https://poser.pugx.org/dominionenterprises/memoize/v/unstable.png)](https://packagist.org/packages/dominionenterprises/memoize)
-[![License](https://poser.pugx.org/dominionenterprises/memoize/license.png)](https://packagist.org/packages/dominionenterprises/memoize)
+[![Build Status](http://img.shields.io/travis/dominionenterprises/memoize-php.svg?style=flat)](https://travis-ci.org/dominionenterprises/memoize-php)
+[![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/dominionenterprises/memoize-php.svg?style=flat)](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/)
+[![Code Coverage](http://img.shields.io/scrutinizer/coverage/g/dominionenterprises/memoize-php.svg?style=flat)](https://scrutinizer-ci.com/g/dominionenterprises/memoize-php/)
+
+[![Latest Stable Version](http://img.shields.io/packagist/v/dominionenterprises/memoize.svg?style=flat)](https://packagist.org/packages/dominionenterprises/memoize)
+[![Total Downloads](http://img.shields.io/packagist/dt/dominionenterprises/memoize.svg?style=flat)](https://packagist.org/packages/dominionenterprises/memoize)
+[![License](http://img.shields.io/packagist/l/dominionenterprises/memoize.svg?style=flat)](https://packagist.org/packages/dominionenterprises/memoize)
 
 ## Requirements
 This library requires PHP 5.3, or newer.

build.php

@@ -3,17 +3,33 @@
 chdir(__DIR__);
 
 $returnStatus = null;
-passthru('composer install --dev', $returnStatus);
+passthru('composer install', $returnStatus);
 if ($returnStatus !== 0) {
     exit(1);
 }
 
-passthru('./vendor/bin/phpcs --standard=PSR1 -n src tests *.php', $returnStatus);
-if ($returnStatus !== 0) {
+require 'vendor/autoload.php';
+
+$phpcsCLI = new PHP_CodeSniffer_CLI();
+$phpcsArguments = array('standard' => array('PSR1'), 'files' => array('src', 'tests', 'build.php'), 'warningSeverity' => 0);
+$phpcsViolations = $phpcsCLI->process($phpcsArguments);
+if ($phpcsViolations > 0) {
     exit(1);
 }
 
-passthru('./vendor/bin/phpunit --coverage-html coverage --strict tests', $returnStatus);
-if ($returnStatus !== 0) {
+$phpunitConfiguration = PHPUnit_Util_Configuration::getInstance(__DIR__ . '/phpunit.xml');
+$phpunitArguments = array('coverageHtml' => __DIR__ . '/coverage', 'configuration' => $phpunitConfiguration);
+$testRunner = new PHPUnit_TextUI_TestRunner();
+$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments);
+if (!$result->wasSuccessful()) {
     exit(1);
 }
+
+$coverageFactory = new PHP_CodeCoverage_Report_Factory();
+$coverageReport = $coverageFactory->create($result->getCodeCoverage());
+if ($coverageReport->getNumExecutedLines() !== $coverageReport->getNumExecutableLines()) {
+    file_put_contents('php://stderr', "Code coverage was NOT 100%\n");
+    exit(1);
+}
+
+echo "Code coverage was 100%\n";

phpunit.xml

@@ -1,4 +1,4 @@
-<phpunit colors="true">
+<phpunit colors="true" forceCoversAnnotation="true" strict="true">
     <testsuite name="Unit Tests">
         <directory>./tests</directory>
     </testsuite>