Merge branch 'feature/213'

Close #214
Close #213
Close #210

.gitattributes

@@ -0,0 +1,9 @@
+/doc export-ignore
+/test export-ignore
+/vendor export-ignore
+.coveralls.yml export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -1,8 +1,7 @@
 nbproject
-composer.lock
 .idea
 .buildpath
 .project
 .settings/
 .DS_Store
-vendor
+vendor/

.travis.yml

@@ -1,19 +1,48 @@
+sudo: false
+
 language: php
 
-php:
-  - 5.3.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - vendor
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
+      env:
+        - DEPS=locked
+    - php: 5.6
+      env:
+        - DEPS=latest
+    - php: 7
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
+    - php: 7
+      env:
+        - DEPS=latest
 
 before_install:
- - composer self-update
- - composer install --prefer-source
+  - travis_retry composer self-update
 
-script:
-  - ./vendor/bin/phpunit
+install:
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
+  - composer show
 
-matrix:
-  allow_failures:
-    - php: 7.0
+script:
+  - composer test
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi

CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.1.0 - 2016-06-27
+
+### Added
+
+- [#213](https://github.com/zendframework/ZendDeveloperTools/pull/213) adds
+  support for zend-mvc, zend-eventmanager, and zend-servicemanager v3.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 1.0.0 - 2016-06-27
+
+First stable release.

README.md

@@ -1,39 +1,32 @@
-Zend Developer Tools
-====================
+# Zend Developer Tools
 
 [![Build Status](https://travis-ci.org/zendframework/ZendDeveloperTools.svg)](https://travis-ci.org/zendframework/ZendDeveloperTools)  
 
-Module providing debug tools for working with the [Zend Framework 2](https://github.com/zendframework/zf2) MVC
-layer.
+Module providing debug tools for use with [zend-mvc](https://docs.zendframework.com/zend-mvc) applications.
 
-Installation
-============
+## Installation
 
 1. Install the module via composer by running:
 
-   ```sh
-   composer require zendframework/zend-developer-tools:dev-master
+   ```bash
+   $ composer require --dev zendframework/zend-developer-tools
    ```
+
    or download it directly from github and place it in your application's `module/` directory.
-2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php`
+
+2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php`.
+   Starting with version 1.1.0, if you are using [zend-component-installer](https://docs.zendframework.com/zend-component-installer),
+   this will be done for you automatically.
 3. Copy `./vendor/zendframework/zend-developer-tools/config/zenddevelopertools.local.php.dist` to
    `./config/autoload/zenddevelopertools.local.php`. Change any settings in it
    according to your needs.
-4. If server version of PHP is lower than 5.4.0 add the following in your `index.php`:
-   ```php
-   define('REQUEST_MICROTIME', microtime(true));
-   ```
-
-   **Note:** The displayed execution time in the toolbar will be highly inaccurate
-    if you don't define `REQUEST_MICROTIME` in PHP < 5.4.0.
 
-Extensions
-==========
+## Extensions
 
-* [BjyProfiler](https://github.com/bjyoungblood/BjyProfiler) - profile `Zend\Db` queries
-* [OcraServiceManager](https://github.com/Ocramius/OcraServiceManager) - track dependencies within your application
-* [SanSessionToolbar](https://github.com/samsonasik/SanSessionToolbar) - preview `Zend\Session` data
-* [ZfSnapEventDebugger](https://github.com/snapshotpl/ZfSnapEventDebugger) - debug events from `Zend\EventManager`
-* [DoctrineORMModule](https://github.com/doctrine/DoctrineORMModule) - profile `DoctrineORM` queries
-* [JhuZdtLoggerModule](https://github.com/jhuet/JhuZdtLoggerModule) - log data from `Zend\Log`
-* [aist-git-tools](https://github.com/ma-si/aist-git-tools) - informations about current GIT repository
+- [BjyProfiler](https://github.com/bjyoungblood/BjyProfiler) - profile `Zend\Db` queries
+- [OcraServiceManager](https://github.com/Ocramius/OcraServiceManager) - track dependencies within your application
+- [SanSessionToolbar](https://github.com/samsonasik/SanSessionToolbar) - preview `Zend\Session` data
+- [ZfSnapEventDebugger](https://github.com/snapshotpl/ZfSnapEventDebugger) - debug events from `Zend\EventManager`
+- [DoctrineORMModule](https://github.com/doctrine/DoctrineORMModule) - profile `DoctrineORM` queries
+- [JhuZdtLoggerModule](https://github.com/jhuet/JhuZdtLoggerModule) - log data from `Zend\Log`
+- [aist-git-tools](https://github.com/ma-si/aist-git-tools) - informations about current GIT repository

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "zendframework/zend-developer-tools",
-    "description": "Module for developer and debug tools for working with the ZF2 MVC layer.",
-    "type": "zf-module",
+    "description": "Module for developer and debug tools for use with zend-mvc applications.",
+    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "debug",
@@ -21,19 +21,27 @@
             "email": "[email protected]"
         }
     ],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        },
+        "zf": {
+            "module": "ZendDeveloperTools"
+        }
+    },
     "require": {
-        "php":                               ">=5.3.3",
-        "zendframework/zend-mvc":            "2.*",
-        "zendframework/zend-eventmanager":   "2.*",
-        "zendframework/zend-stdlib":         "2.*",
-        "zendframework/zend-servicemanager": "2.*",
-        "zendframework/zend-modulemanager":  "2.*",
-        "zendframework/zend-version":        "2.*",
-        "zendframework/zend-debug":          "2.*",
-        "zendframework/zend-view":           "2.*"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-mvc": "^2.7 || ^3.0.1",
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-modulemanager": "^2.7",
+        "zendframework/zend-debug": "^2.5 || ^3.0",
+        "zendframework/zend-view": "^2.6"
     },
     "require-dev": {
-      "phpunit/phpunit":                     "~4"
+        "phpunit/phpunit": "^4.8 || ^5.0",
+        "squizlabs/php_codesniffer": "~2.3.1"
     },
     "suggest": {
         "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.",
@@ -45,13 +53,24 @@
         "aist/aist-git-tools": "Show you informations about current GIT repository"
     },
     "autoload": {
-        "psr-0": {
-            "ZendDeveloperTools": "src/"
+        "psr-4": {
+            "ZendDeveloperTools\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-0": {
-            "ZendDeveloperToolsTest": "tests/"
+        "psr-4": {
+            "ZendDeveloperToolsTest\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs",
+            "@test"
+        ],
+        "coveralls": "coveralls",
+        "cs": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit",
+        "test-coverage": "phpunit --coverage-clover clover.xml"
     }
 }