Merge pull request zendframework#213 from samsonasik/zf3

ZF3

.gitignore

@@ -1,5 +1,4 @@
 nbproject
-composer.lock
 .idea
 .buildpath
 .project

.php_cs

@@ -0,0 +1,43 @@
+<?php
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in('src')
+    ->in('test')
+    ->filter(function (SplFileInfo $file) {
+        if (strstr($file->getPath(), 'compatibility')) {
+            return false;
+        }
+    });
+$config = Symfony\CS\Config\Config::create();
+$config->level(null);
+$config->fixers(
+    array(
+        'braces',
+        'duplicate_semicolon',
+        'elseif',
+        'empty_return',
+        'encoding',
+        'eof_ending',
+        'function_call_space',
+        'function_declaration',
+        'indentation',
+        'join_function',
+        'line_after_namespace',
+        'linefeed',
+        'lowercase_keywords',
+        'parenthesis',
+        'multiple_use',
+        'method_argument_space',
+        'object_operator',
+        'php_closing_tag',
+        'remove_lines_between_uses',
+        'short_array_syntax',
+        'short_tag',
+        'standardize_not_equal',
+        'trailing_spaces',
+        'unused_use',
+        'visibility',
+        'whitespacy_lines',
+    )
+);
+$config->finder($finder);
+return $config;

.travis.yml

@@ -1,19 +1,53 @@
 language: php
 
 php:
-  - 5.3.3
-  - 5.4
   - 5.5
   - 5.6
   - 7
 
 before_install:
- - composer self-update
- - composer install --prefer-source
+  - 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 --installed
 
 matrix:
-  allow_failures:
-    - php: 7.0
+  fast_finish: true
+  include:
+    - php: 5.5
+      env:
+        - DEPS=lowest
+    - php: 5.5
+      env:
+        - EXECUTE_CS_CHECK=true
+        - DEPS=locked
+    - php: 5.5
+      env:
+        - DEPS=latest
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
+      env:
+        - DEPS=locked
+        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
+        - PATH="$HOME/.local/bin:$PATH"
+    - php: 5.6
+      env:
+        - DEPS=latest
+    - php: 7
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+    - php: 7
+      env:
+        - DEPS=latest
+
+script:
+  - ./vendor/bin/phpunit
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi

composer.json

@@ -22,18 +22,19 @@
         }
     ],
     "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.5 || ^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-version":        "^2.5",
+        "zendframework/zend-debug":          "^2.5 || ^3.0",
+        "zendframework/zend-view":           "^2.6"
     },
     "require-dev": {
-      "phpunit/phpunit":                     "~4"
+      "phpunit/phpunit":                     "~4 || ~5",
+      "fabpot/php-cs-fixer":                 "1.7.*"
     },
     "suggest": {
         "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.",
@@ -45,13 +46,13 @@
         "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/"
         }
     }
 }