composer updates + psr4 autoloading + updates to read (adding badges)…

… + travis conf

.travis.yml

@@ -3,14 +3,22 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
 
 before_script:
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install
+  - composer self-update
+  - composer install --dev --prefer-source
+  - mkdir -p test/_build
 
-script: phpunit --configuration tests/phpunit.xml
+script:
+  - vendor/bin/phpunit -c ./phpunit.xml
+  - vendor/bin/phpcs --standard=PSR2 ./src/
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover test/_build/logs/clover.xml
 
 notifications:
-  email:
-    recipients:
-      - [email protected]
+  irc: "irc.freenode.org#zftalk.modules"
+  email: false

CHANGELOG.md

@@ -0,0 +1,25 @@
+# CHANGELOG
+
+v1.1.0-dev
+
+- relies only on composer for PSR4 autoloading (possible BC)
+
+v1.0.1
+
+- no public facing changes
+
+v1.0.0
+
+- first release
+
+v1.0.0-beta3
+
+- updated to zf2 2.0.0+ ! BC Break by namespace and configuration changes!
+
+v1.0.0-beta2
+
+- 'composerized', updated to zf2-beta-4
+
+v1.0.0-beta1
+
+- initial pre-release

README.md

@@ -16,16 +16,23 @@ BsbPhingService is module for Zend Framework 2 that will enable you to run
   * v1.0.0-beta3 - updated to zf2 2.0.0+ ! BC Break by namespace and configuration changes!
   * v1.0.0 - First release
 
-[![Build Status](https://secure.travis-ci.org/basz/zf2-module-phing-service.png?branch=master)](http://travis-ci.org/basz/zf2-module-phing-service)
+[![Latest Stable Version](https://poser.pugx.org/bushbaby/zf2-module-phing-service/v/stable.svg)](https://packagist.org/packages/bushbaby/zf2-module-phing-service)
+[![Total Downloads](https://poser.pugx.org/bushbaby/zf2-module-phing-service/downloads.svg)](https://packagist.org/packages/bushbaby/zf2-module-phing-service)
+[![Latest Unstable Version](https://poser.pugx.org/bushbaby/zf2-module-phing-service/v/unstable.svg)](https://packagist.org/packages/bushbaby/zf2-module-phing-service)
+[![License](https://poser.pugx.org/bushbaby/zf2-module-phing-service/license.svg)](https://packagist.org/packages/bushbaby/zf2-module-phing-service)
 
+[![Build Status](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/badges/build.png?b=master)](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/build-status/master)
+[![Code Coverage](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/basz/zf2-module-phing-service/?branch=master)
+[![Dependency Status](https://www.versioneye.com/user/projects/54cb8adade7924d4b00002ab/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54cb8adade7924d4b00002ab)
 
 ## Installation
 ### Using Composer (recommended)
 The recommended way to get a working copy of this project is to modify your composer.json
-in your project root. This will take care of dependancies.
+in your project root. This will take care of dependencies.
 
     "require":{
-        "bushbaby/zf2-module-phing-service":"1.*",
+        "bushbaby/zf2-module-phing-service":"~1.0",
      },
 
 and then update

composer.json

@@ -1,33 +1,41 @@
 {
-   "name":"bushbaby/zf2-module-phing-service",
-   "description":"Zend Framework 2 module for Phing, a PHP project build system or build tool based on Apache Ant.",
-   "license":"MIT",
-   "homepage":"https://github.com/basz/zf2-module-phing-service",
-   "authors":[
-      {
-         "name":"Bas Kamer",
-         "email":"[email protected]"
-      }
-   ],
-   "keywords":[
-      "zf2",
-      "phing",
-      "module"
-   ],
-   "require":{
-	  "php": ">=5.3.3",
-      "phing/phing":"~2.4,>=2.4.13",
-      "zendframework/zendframework": "~2.0"
-   },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "~0.5"
-    },
-    "autoload": {
-        "psr-0": {
-            "BsbPhingService": "src/"
-        },
-        "classmap": [
-            "Module.php"
-        ]
+  "name": "bushbaby/zf2-module-phing-service",
+  "description": "Zend Framework 2 module for Phing, a PHP project build system or build tool based on Apache Ant.",
+  "license": "MIT",
+  "homepage": "https://github.com/basz/zf2-module-phing-service",
+  "authors": [
+    {
+      "name": "Bas Kamer",
+      "email": "[email protected]"
     }
- }
+  ],
+  "keywords": [
+    "zf2",
+    "phing",
+    "module"
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "phing/phing": "~2.4,>=2.4.13",
+    "zendframework/zendframework": "~2.0"
+  },
+  "require-dev": {
+    "squizlabs/php_codesniffer": "~2.0",
+    "phpunit/phpunit": "~4.1"
+  },
+  "autoload": {
+    "psr-4": {
+      "BsbPhingService\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "BsbPhingServiceTest\\": "test/"
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.1.x-dev"
+    }
+  }
+}

phpunit.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./test/Bootstrap.php" colors="true">
+
+<testsuites>
+    <testsuite name="BsbPhingService">
+        <directory>test</directory>
+    </testsuite>
+</testsuites>
+
+<filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+        <directory suffix=".php">./src</directory>
+    </whitelist>
+</filter>
+
+<logging>
+    <log type="coverage-clover" target="./test/_build/logs/clover.xml"/>
+    <log type="coverage-html" target="./test/_build/coverage" charset="UTF-8"
+         yui="true" highlight="true" lowUpperBound="90" highLowerBound="100"/>
+</logging>
+</phpunit>

src/BsbPhingService/Module.php → src/Module.php

@@ -11,23 +11,9 @@
 use BsbPhingService\Options\Service as ServiceOptions;
 use BsbPhingService\Options\Phing as PhingOptions;
 
-class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface
+class Module implements ConfigProviderInterface, ServiceProviderInterface
 {
 
-    /**
-     * {@inheritDoc}
-     */
-    public function getAutoloaderConfig()
-    {
-        return array(
-            AutoloaderFactory::STANDARD_AUTOLOADER => array(
-                StandardAutoloader::LOAD_NS => array(
-                    __NAMESPACE__ => __DIR__,
-                ),
-            ),
-        );
-    }
-
     /**
      * {@inheritDoc}
      */

test/.gitignore

@@ -0,0 +1 @@
+_build/*

test/Bootstrap.php

@@ -0,0 +1,4 @@
+<?php
+
+// Load composer autoloader
+require_once __DIR__ . '/../vendor/autoload.php';