diff --git a/.travis.yml b/.travis.yml index 8caec39..558627e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,9 @@ stages: jobs: include: + - <<: *lint_php + name: Lint PHP 7.4 + php: 7.4 - <<: *lint_php name: Lint PHP 7.3 php: 7.3 @@ -51,13 +54,19 @@ jobs: php: 7.2 - <<: *editor_config name: Lint Editorconfig - php: 7.3 + php: 7.4 - <<: *psalm name: Psalm (PHP 7.3) php: 7.3 + - <<: *psalm + name: Psalm (PHP 7.4) + php: 7.4 - <<: *psalm name: Psalm (PHP 7.2) php: 7.2 + - <<: *unit_tests + name: Unit Tests (PHP 7.4, highest) + php: 7.4 - <<: *unit_tests name: Unit Tests (PHP 7.3, highest) php: 7.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dd88eb..9bf7479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 0.1.0 + +### Added + +* Support PHP 7.4 + ## 0.0.0 ### Added diff --git a/composer.json b/composer.json index 7e393d4..538be72 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=7.2,<7.4", + "php": ">=7.2", "twig/twig": "^2.0", "phpdocumentor/reflection-docblock": "^4.3" }, diff --git a/src/Describer/AbstractDescriber.php b/src/Describer/AbstractDescriber.php index f937f93..23c03a3 100644 --- a/src/Describer/AbstractDescriber.php +++ b/src/Describer/AbstractDescriber.php @@ -129,7 +129,7 @@ private function describeParameters(Description $description, ?DocBlock $docBloc $paramterDescription = new ParameterDescription($parameter->getName()); if ($parameter->hasType()) { - $paramterDescription = $paramterDescription->withType($parameter->getType()); + $paramterDescription = $paramterDescription->withType($parameter->getType()->getName()); } if ($parameter->isDefaultValueAvailable()) {