Merge pull request #98 from mkrauser/master

Use @var instead of @Property in class-property doc-blocks
goetas-webservices · Sep 19, 2019 · 5258cf8 · 5258cf8
2 parents e6f7795 + c777cab
commit 5258cf8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -18,14 +18,14 @@
   ],
   "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",
     "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"
   },

diff --git 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();