Merge remote-tracking branch 'origin/develop' into 2.1

Author: dragoonis

.gitignore

@@ -0,0 +1,13 @@
+<?php
+
+return Symfony\CS\Config\Config::create()->finder(Symfony\CS\Finder\DefaultFinder::create()
+    ->notName('LICENSE')
+    ->notName('README.md')
+    ->notName('composer.*')
+    ->notName('phpunit.xml*')
+    ->notName('*.phar')
+    ->notName('ExceptionHandler.php')
+    ->exclude('src/Debug')
+    ->exclude('vendor')
+    ->in(__DIR__)
+);

.php_cs

@@ -1,15 +1,22 @@
 language: php
 
 php:
-  - 5.3.3
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
 
 before_install:
   - phpenv rehash
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-  - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
+  - COMPOSER_ROOT_VERSION=dev-master composer self-update
+  - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --no-interaction --dev install
 
 script: phpunit
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm

.travis.yml

@@ -10,42 +10,24 @@
 [@php]:           http://php.net/                                 "PHP: Hypertext Preprocessor"
 
 Version **2.1.0-DEV**
-[![Build Status](https://travis-ci.org/ppi/framework.png?branch=2.1)](https://travis-ci.org/ppi/framework)
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ppi/framework/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
-* [Official website][@website]
-* [Download][@download]
-* [Documentation][@documentation]
-
-## What is PPI?
-
-The [PPI Framework][@website] is a micro to light full-stack web framework. It
-focuses on having a light footprint, convenient and minimalistic. It allows
-developers to rapidly develop web applications and utilize features from 3rd
-party libraries without the tedious integration of them into your project. It
-also allows developers to build better and easy to maintain websites/web
-applications.
+[![Latest Stable Version](https://poser.pugx.org/ppi/framework/v/stable.png)](https://packagist.org/packages/ppi/framework)
+[![Latest Unstable Version](https://poser.pugx.org/ppi/framework/v/unstable.png)](https://packagist.org/packages/ppi/framework)
+[![Build Status](https://secure.travis-ci.org/ppi/framework.png?branch=develop)](http://travis-ci.org/ppi/framework)
+[![Dependency Status](https://www.versioneye.com/php/ppi:framework/dev-develop/badge.png)](https://www.versioneye.com/php/ppi:framework/dev-develop)
+[![License](https://poser.pugx.org/ppi/framework/license.png)](https://packagist.org/packages/ppi/framework)
 
-### Why is PPI different?
+[PPI][@website] is the the PHP Interoperability Framework. It provides an equal and open platform to empower PHP developers to pick the best tools from the best PHP frameworks
 
-PPI is not another framework to re-invent the wheel. The idea behind it is to
-build a more pragmatic, simplistic and easier version of the wheel. It's built
-re-using the core components of other web frameworks such as Symfony2, Doctrine2
-and ZendFramework2.
+PPI bootstraps framework components for you from the top frameworks such as ZendFramework2, Symfony2, Laravel4 and FuelPHP.
 
-PPI pre-integrates third libraries for you (aka autoloading) so that you can
-drop their components into your Vendor folder and you're up and running
-instantly. From PPI you're able to seamlessly have plug and play, moreso play
-because that's the fun part!
-
-PPI doesn't just stop at the PHP side of things, the skeleton application comes
-pre-bundled with the latest and greatest trending libraries for frontend
-development such as [HTML5 Boilerplate][@h5bp] and [Twitter
-Bootstrap][@twbootstrap].
+* [Official website][@website]
+* [Download][@download]
+* [Documentation][@documentation]
 
 ## Requirements
 
-* [PHP][@php] 5.3.3 or above
+* [PHP][@php] 5.3.23 or above
 
 ## Installation
 

README.md

@@ -19,34 +19,34 @@
             "homepage": "http://www.ppi.io/contributors"
         }
     ],
-    "autoload": {
-        "psr-0": { "PPI": "" }
-    },
     "require": {
-        "monolog/monolog": "1.7.*@stable",
-        "symfony/dependency-injection": "2.3.*@dev",
-        "symfony/config": "2.3.*@dev",
-        "symfony/console": "2.3.*@dev",
-        "symfony/debug": "2.3.*@dev",
-        "symfony/finder": "2.3.*@dev",
-        "symfony/http-foundation": "2.2.*@dev",
-        "symfony/routing": "2.3.*@dev",
-        "symfony/templating": "2.3.*@dev",
-        "symfony/yaml": "2.3.*@dev",
-        "symfony/http-kernel": "2.3.*@dev",
-        "symfony/framework-bundle": "2.3.*@dev",
+        "psr/log": "~1.0",
+        "symfony/dependency-injection": "2.5.*@stable",
+        "symfony/config": "2.5.*@stable",
+        "symfony/console": "2.5.*@stable",
+        "symfony/debug": "2.5.*@stable",
+        "symfony/finder": "2.5.*@stable",
+        "symfony/http-foundation": "2.5.*@stable",
+        "symfony/routing": "2.5.*@stable",
+        "symfony/templating": "2.5.*@stable",
+        "symfony/yaml": "2.5.*@stable",
+        "symfony/http-kernel": "2.5.*@stable",
+        "symfony/framework-bundle": "2.5.*@stable",
         "zendframework/zend-eventmanager": "2.3.*@dev",
         "zendframework/zend-modulemanager": "2.3.*@dev",
         "zendframework/zend-servicemanager": "2.3.*@dev",
         "zendframework/zend-loader": "2.3.*@dev"
     },
+    "autoload": {
+        "psr-4": {
+            "PPI\\": "src/",
+            "PPI\\Tests\\": "tests"
+        }
+    },
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev"
         }
-    },
-    "minimum-stability": "dev",
-    "autoload": {
-        "psr-4": { "PPI\\": "src/" }
     }
 }

composer.json

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="PPI/Test/Bootstrap.php"
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true">
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
     <testsuites>
-        <testsuite name="Composer Test Suite">
-            <directory>./PPI/Tests</directory>
+        <testsuite name="PPI Framework Test Suite">
+            <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>