Skip to content

Commit

Permalink
Merge pull request #1 from cvc-digital/support-php-7.4
Browse files Browse the repository at this point in the history
Support PHP 7.4
  • Loading branch information
markuspoerschke committed Mar 31, 2020
2 parents 70e65f1 + 491349d commit c1b11cc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -23,7 +23,7 @@
}
],
"require": {
"php": ">=7.2,<7.4",
"php": ">=7.2",
"twig/twig": "^2.0",
"phpdocumentor/reflection-docblock": "^4.3"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Describer/AbstractDescriber.php
Expand Up @@ -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()) {
Expand Down

0 comments on commit c1b11cc

Please sign in to comment.