Merge branch 'hotfix/stdlib-3'

Close #52
Fixes #49

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#52](https://github.com/zendframework/zend-code/pull/52) updates several
+  dependency constraints:
+  - zend-stdlib now allows either the 2.7 or 3.0 series, as the APIs consumed by
+    zend-code are compatible across versions.
+  - PHP now excludes the 7.0.5 release, as it has known issues in its tokenizer
+    implementation that make the zend-code token scanner unusable.
 
 ## 3.0.1 - 2016-01-26
 

composer.json

@@ -13,13 +13,13 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
         "zendframework/zend-eventmanager": "^2.6 || ^3.0"
     },
     "require-dev": {
         "ext-phar": "*",
         "doctrine/annotations": "~1.0",
-        "zendframework/zend-stdlib": "~2.7",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0",
         "squizlabs/php_codesniffer": "^2.5",
         "phpunit/PHPUnit": "^4.8.21"
     },

src/Scanner/ClassScanner.php

@@ -919,7 +919,6 @@ protected function scan()
         SCANNER_TOP:
 
         switch ($tokenType) {
-
             case T_DOC_COMMENT:
                 $this->docComment = $tokenContent;
                 goto SCANNER_CONTINUE;
@@ -944,7 +943,6 @@ protected function scan()
                 $this->lineStart = $tokenLine;
 
                 switch ($tokenType) {
-
                     case T_FINAL:
                         $this->isFinal = true;
                         goto SCANNER_CLASS_INFO_CONTINUE;
@@ -1008,7 +1006,6 @@ protected function scan()
                             $classInterfaceIndex++;
                             $this->shortInterfaces[$classInterfaceIndex] = '';
                         }
-
                 }
 
                 SCANNER_CLASS_INFO_CONTINUE:
@@ -1021,7 +1018,6 @@ protected function scan()
                 SCANNER_CLASS_INFO_END:
 
                 goto SCANNER_CONTINUE;
-
         }
 
         if ($tokenType === null && $tokenContent === '{' && $braceCount === 0) {
@@ -1037,7 +1033,6 @@ protected function scan()
             }
 
             switch ($tokenType) {
-
                 case T_CONST:
                     $infos[$infoIndex] = [
                         'type'          => 'constant',
@@ -1239,7 +1234,6 @@ protected function scan()
                     }
 
                     switch ($tokenType) {
-
                         case T_CONST:
                             $memberContext             = 'constant';
                             $infos[$infoIndex]['type'] = 'constant';

src/Scanner/DocBlockScanner.php

@@ -159,7 +159,6 @@ protected function scan()
 
             case 'DOCBLOCK_COMMENTEND':
                 goto SCANNER_END;
-
         }
 
         SCANNER_CONTINUE: