From 5fe23f323ea442207503c95c13fdb5c0673fb596 Mon Sep 17 00:00:00 2001 From: Matthias Krauser Date: Wed, 18 Sep 2019 22:10:15 +0200 Subject: [PATCH 1/3] issue 97: Use @var instead of @property in class-property doc-blocks --- src/Php/ClassGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Php/ClassGenerator.php b/src/Php/ClassGenerator.php index a4f46819..86829f5d 100644 --- a/src/Php/ClassGenerator.php +++ b/src/Php/ClassGenerator.php @@ -7,7 +7,7 @@ use GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPProperty; use Zend\Code\Generator; use Zend\Code\Generator\DocBlock\Tag\ParamTag; -use Zend\Code\Generator\DocBlock\Tag\PropertyTag; +use Zend\Code\Generator\DocBlock\Tag\VarTag; use Zend\Code\Generator\DocBlock\Tag\ReturnTag; use Zend\Code\Generator\DocBlockGenerator; use Zend\Code\Generator\MethodGenerator; @@ -328,7 +328,7 @@ private function handleProperty(Generator\ClassGenerator $class, PHPProperty $pr if ($prop->getDoc()) { $docBlock->setLongDescription($prop->getDoc()); } - $tag = new PropertyTag($prop->getName(), 'mixed'); + $tag = new VarTag($prop->getName(), 'mixed'); $type = $prop->getType(); From 039575bea9fa6b3ba7802fd084de9c92a3f9f5d5 Mon Sep 17 00:00:00 2001 From: Matthias Krauser Date: Wed, 18 Sep 2019 22:21:16 +0200 Subject: [PATCH 2/3] VarTag was added in ZendCode 3.3.2, updated dependencies accordingly --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 234b2db2..258c5d13 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "symfony/config": "^2.2|^3.0|^4.0", "goetas-webservices/xsd-reader": "^0.2.8|^0.3.5", "doctrine/inflector": "^1.0", - "zendframework/zend-code": "^3.0.3", + "zendframework/zend-code": "^3.3.2", "psr/log": "^1.0" }, From c777cab7641abdd1546dc53b2495c2f659fd4ebb Mon Sep 17 00:00:00 2001 From: Matthias Krauser Date: Wed, 18 Sep 2019 22:32:55 +0200 Subject: [PATCH 3/3] bump php-version requirement to 7.1 --- .travis.yml | 11 +++-------- composer.json | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c04eba8..4380fb4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,22 +6,17 @@ cache: - vendor - $HOME/.composer/cache php: - - 5.5 - - 5.6 - - 7.0 - 7.1 - 7.2 matrix: include: - - php: 5.5 + - php: 7.1 env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable' before_script: - pecl install xmldiff - echo "xdebug.max_nesting_level=1000" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - if [[ $TRAVIS_PHP_VERSION = '7.0' ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi - - if [[ $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi - if [[ $TRAVIS_PHP_VERSION == '7.'* ]]; then composer --dev require ocramius/package-versions:^1.0 --no-update; fi - composer update $COMPOSER_FLAGS @@ -32,5 +27,5 @@ script: after_script: - wget https://scrutinizer-ci.com/ocular.phar - - if [[ $TRAVIS_PHP_VERSION = '7.0' ]] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi - + - if [[ $TRAVIS_PHP_VERSION = '7.1' ]] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi + diff --git a/composer.json b/composer.json index 258c5d13..a1f53bfb 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "license": "MIT", "require": { - "php": "^5.5|^7.0", + "php": "^7.1", "symfony/console": "^2.7|^3.0|^4.0", "symfony/dependency-injection": "^2.2|^3.0|^4.0", "symfony/yaml": "^2.2|^3.0|^4.0",