Merge branch 'hotfix/psr-4'

Close #17

Author: weierophinney

.php_cs

@@ -0,0 +1,38 @@
+<?php
+printf("Executing php_cs!!!\n\n");
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(__DIR__)
+    ->ignoreDotFiles(true)
+    ->filter(function (SplFileInfo $file) {
+        $path = $file->getPathname();
+
+        switch (true) {
+            case (strrpos($path, '/bin/')):
+                return false;
+            case (strrpos($path, '/test/Bootstrap.php')):
+                return false;
+            case (strrpos($path, '/vendor/')):
+                return false;
+            default:
+                return true;
+        }
+    });
+
+return Symfony\CS\Config\Config::create()
+    ->fixers(array(
+        'controls_spaces',
+        'braces',
+        'elseif',
+        'eof_ending',
+        'function_declaration',
+        'include',
+        'indentation',
+        'linefeed',
+        'php_closing_tag',
+        'psr0',
+        'short_tag',
+        'trailing_spaces',
+        'unused_use',
+        'visibility',
+    ))
+    ->finder($finder);

.travis.yml

@@ -1,15 +1,21 @@
 language: php
 
 php:
-  - "5.3"
-  - "5.4"
-
-before_install:
- - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
+  - 5.3
+  - 5.4
+  - 5.5
 
 before_script:
- - composer install --dev
+  - composer self-update
+  - composer install --dev --prefer-source
 
 script:
- - (cd test ; ../vendor/bin/phpunit -c phpunit.xml)
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 .); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+  - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
+  - ./bin/check-cs.sh
+  
+after_script:
+  - php ./vendor/bin/coveralls -v
+
+notifications:
+  irc: "irc.freenode.org#apigility-dev"
+  email: false

Module.php

@@ -23,7 +23,7 @@ public function getAutoloaderConfig()
     {
         return array(
             'Zend\Loader\StandardAutoloader' => array('namespaces' => array(
-                __NAMESPACE__ => __DIR__ . '/src/ZF/ApiProblem/',
+                __NAMESPACE__ => __DIR__ . '/src/',
             ))
         );
     }

README.md

@@ -1,6 +1,9 @@
 Api-Problem: ZF2 Module for API-Problem representations
 =======================================================
 
+[![Build Status](https://travis-ci.org/zfcampus/zf-api-problem.png)](https://travis-ci.org/zfcampus/zf-api-problem)
+[![Coverage Status](https://coveralls.io/repos/zfcampus/zf-api-problem/badge.png?branch=master)](https://coveralls.io/r/zfcampus/zf-api-problem)
+
 This module provides data structures and rendering for the API-Problem format.
 
 - [Problem API](http://tools.ietf.org/html/draft-nottingham-http-problem-05),

bin/check-cs.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+FIXER_CONFIG="`dirname $0`/../.php_cs"
+FIXER_PATH="`dirname $0`/../vendor/fabpot/php-cs-fixer/php-cs-fixer"
+CS=""
+
+(
+    cd "`dirname $0`/../" ;
+    CS=$(php vendor/fabpot/php-cs-fixer/php-cs-fixer fix -v --dry-run .)
+)
+
+if [[ "$CS" ]];
+then
+    echo -en '\E[31m'"$CS\033[1m\033[0m";
+    printf "\n";
+    echo -en '\E[31;47m'"\033[1mCoding standards check failed!\033[0m"
+    printf "\n";
+    exit 2;
+fi
+
+echo -en '\E[32m'"\033[1mCoding standards check passed!\033[0m"
+printf "\n";
+
+echo $CS

composer.json

@@ -33,13 +33,15 @@
         "zendframework/zend-view": "~2.3"
     },
     "require-dev": {
+        "fabpot/php-cs-fixer": "*@dev",
         "phpunit/PHPUnit": "3.7.*",
+        "satooshi/php-coveralls": ">=0.6.0",
         "zendframework/zend-console": "~2.3",
         "zendframework/zend-http": "~2.3",
         "zendframework/zend-loader": "~2.3"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "ZF\\ApiProblem\\": "src/",
             "ZFTest\\ApiProblem\\": "test/"
         },

test/phpunit.xml phpunit.xmltest/phpunit.xml renamed to phpunit.xml

@@ -1,7 +1,7 @@
-<phpunit bootstrap="./Bootstrap.php" colors="true">
+<phpunit bootstrap="./test/Bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="ZFApiProblem Module Tests">
-            <directory>./ZFTest</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
 </phpunit>