Merge pull request #178 from alexander-schranz/enhancement/update-type-resolver

Update dependencies

Author: jaapio

.travis.yml

@@ -1,23 +1,40 @@
 language: php
 
-php:
-  - 7.0
-  - 7.1
-  - 7.2
+
+env:
+  global:
+    - COMPOSER_FLAGS="--no-interaction"
 
 matrix:
   include:
+    - php: 7.0
+      env:
+        # Test commited lock file
+        - COMPOSER_LOCK=true
     - php: 7.1
-      env: STATIC_ANALYSIS=true
+      env:
+        # Test lowest dependencies
+        - COMPOSER_FLAGS="--no-interaction --prefer-lowest"
+        # Test code standard
+        - STATIC_ANALYSIS=true
+    # Test with updated dependencies
+    - php: 7.2
+    - php: 7.3
 
 cache:
   directories:
     - $HOME/.composer/cache
 
 install:
-  - composer install --no-interaction
+  - |
+    if [[ $COMPOSER_LOCK = true ]]; then
+         composer install $COMPOSER_FLAGS
+    else
+         composer update $COMPOSER_FLAGS
+    fi
+  - composer $COMPOSER
   # coding style
-  - if [[ $STATIC_ANALYSIS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi
+  - if [[ $STATIC_ANALYSIS != "" ]]; then composer create-project symplify/easy-coding-standard:v2.5.9 temp/ecs; fi
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml -v

appveyor.yml

@@ -0,0 +1,54 @@
+build: false
+clone_folder: c:\reflectiondocblock
+max_jobs: 3
+platform: x86
+pull_requests:
+  do_not_increment_build_number: true
+version: '{build}.{branch}'
+skip_tags: true
+branches:
+  only:
+    - master
+
+environment:
+  matrix:
+    - php_ver_target: 7.1
+    - php_ver_target: 7.2
+matrix:
+  fast_finish: false
+
+cache:
+  - c:\php -> appveyor.yml
+  - '%LOCALAPPDATA%\Composer\files'
+
+init:
+  - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
+  - SET COMPOSER_NO_INTERACTION=1
+  - SET PHP=1
+  - SET ANSICON=121x90 (121x90)
+
+
+install:
+  - IF EXIST c:\tools\php (SET PHP=0)
+  - ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+  - cd c:\tools\php
+  - IF %PHP%==1 copy /Y php.ini-development php.ini
+  - IF %PHP%==1 echo max_execution_time=1200 >> php.ini
+  - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+  - IF %PHP%==1 echo extension_dir=ext >> php.ini
+  - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
+  - IF %PHP%==1 echo zend.assertions=1 >> php.ini
+  - IF %PHP%==1 echo assert.exception=On >> php.ini
+  - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
+  - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
+  - cd c:\reflectiondocblock
+  - composer install --no-interaction --prefer-dist --no-progress
+  - composer global require phpunit/phpunit ^6
+  - composer global config bin-dir --absolute
+
+test_script:
+  - cd c:\reflectiondocblock
+  - c:\Users\appveyor\AppData\Roaming\Composer\vendor\bin\phpunit --no-coverage

composer.json

@@ -11,8 +11,8 @@
     ],
     "require": {
         "php": "^7.0",
-        "phpdocumentor/reflection-common": "^1.0.0",
-        "phpdocumentor/type-resolver": "^0.4.0",
+        "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+        "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
         "webmozart/assert": "^1.0"
     },
     "autoload": {
@@ -24,7 +24,7 @@
     "require-dev": {
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^6.4",
-        "doctrine/instantiator": "~1.0.5"
+        "doctrine/instantiator": "^1.0.5"
     },
     "extra": {
         "branch-alias": {

tests/integration/DocblocksWithAnnotationsTest.php

@@ -44,7 +44,7 @@ public function testDocblockWithAnnotations()
         $this->assertCount(3, $docblock->getTags());
     }
 
-    public function testDocblockWithAnnotationHavingZeroValue(): void
+    public function testDocblockWithAnnotationHavingZeroValue()
     {
         $docComment = <<<DOCCOMMENT
             /**