Merge branch 'feature/7263'

Adds PHP 7 support.

Close #7366
Fixes #7270
Fixes #7263

.gitignore

@@ -6,6 +6,5 @@
 .*.sw*
 .*.un~
 build/
-composer.lock
 nbproject
 tmp/

.travis.yml

@@ -5,23 +5,19 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
   - hhvm
   - hhvm-nightly
 
 install:
-  - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != 'hhvm-nightly' ]]; then phpenv config-rm xdebug.ini;  fi
-  - IS_HHVM=`echo $TRAVIS_PHP_VERSION | grep "hhvm" | wc -l`
+  - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != 'hhvm-nightly' && $TRAVIS_PHP_VERSION != '7' ]]; then phpenv config-rm xdebug.ini;  fi
   - sudo apt-get install parallel libpcre3-dev
-  - test $IS_HHVM == "1" || echo "" | pecl install apcu-beta
-  - test $IS_HHVM == "1" || phpenv config-add tests/travis.php.ini
   - composer install --no-interaction --prefer-source
 
 before_script:
   - php --version
-  - sudo /etc/init.d/memcached start
-  - sudo start redis-server
-  - mkdir -p build/coverage
   - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then mkdir -p build/coverage; fi
 
 script:
   # Run tests for the various components in parallel
@@ -43,5 +39,6 @@ notifications:
 matrix:
   fast_finish: true
   allow_failures:
+    - php: 7
     - php: hhvm
     - php: hhvm-nightly

composer.json

@@ -13,10 +13,10 @@
         "zendframework/zendxml": "~1.0-dev"
     },
     "require-dev": {
-        "doctrine/annotations": ">=1.0",
-        "ircmaxell/random-lib": ">=1.1",
-        "mikey179/vfsStream": "1.2.*",
-        "fabpot/php-cs-fixer": "1.*",
+        "doctrine/annotations": "^1.0",
+        "ircmaxell/random-lib": "^1.1",
+        "mikey179/vfsStream": "~1.2",
+        "fabpot/php-cs-fixer": "~1.0",
         "phpunit/PHPUnit": "~4.0",
         "satooshi/php-coveralls": "dev-master",
         "phpunit/phpcov": "~2.0"