Merge branch 'hotfix/180' into dev-4.0

Forward port #180

Author: michalbundyra

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -13,14 +11,15 @@ env:
     - TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT=true
 
 matrix:
+  fast_finish: true
   include:
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
+        - LEGACY_DEPS="doctrine/annotations phpunit/phpunit"
         - CS_CHECK=true
         - TEST_COVERAGE=true
     - php: 7.1
@@ -44,6 +43,15 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
+    - php: 7.4
+      env:
+        - DEPS=lowest
+    - php: 7.4
+      env:
+        - DEPS=locked
+    - php: 7.4
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -51,7 +51,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#180](https://github.com/zendframework/zend-code/pull/180) adds support for PHP 7.4.
 
 ### Changed
 
@@ -69,6 +69,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#179](https://github.com/zendframework/zend-code/pull/179) fixes exception message when invalid value provided in `Zend\Code\Generator\ValueGenerator`.
 
+- [#180](https://github.com/zendframework/zend-code/pull/190) fixes PHP 7.4 compatibility.
+
 ## 3.4.0 - 2019-10-06
 
 ### Added

composer.json

@@ -20,11 +20,14 @@
     },
     "require-dev": {
         "ext-phar": "*",
-        "doctrine/annotations": "^1.0",
+        "doctrine/annotations": "^1.7",
         "phpunit/phpunit": "^7.5.16 || ^8.4",
         "zendframework/zend-coding-standard": "^1.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
+    "conflict": {
+        "phpspec/prophecy": "<1.9.0"
+    },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
         "zendframework/zend-stdlib": "Zend\\Stdlib component"