From 006b8a1c52aaf1ad12565f9f80293f7dad689458 Mon Sep 17 00:00:00 2001 From: Laurent VOULLEMIER Date: Sat, 18 Apr 2020 21:06:36 +0200 Subject: [PATCH 1/3] Update index.rst Fix getPropertyAnnotation second argument --- docs/en/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/index.rst b/docs/en/index.rst index 59053125b..3b3368c96 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -73,7 +73,7 @@ annotations of a class. A common one is $property = $reflectionClass->getProperty('bar'); $reader = new AnnotationReader(); - $myAnnotation = $reader->getPropertyAnnotation($property, 'bar'); + $myAnnotation = $reader->getPropertyAnnotation($property, MyAnnotation::class); echo $myAnnotation->myProperty; // result: "value" From d69b21cc2d14619074807b085058a15dd8bea0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 25 May 2020 18:49:18 +0200 Subject: [PATCH 2/3] Allow php 8 The CI passes, the next logical step would be to get reports from downstream users. This allows to remove the ignore-platform-reqs flag when installing dependencies in the CI. The nightly job is kept in "allow_failures", since we should not create a sense of urgency about this. --- .travis.yml | 4 +--- composer.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fb9c803b..80f1162f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,7 @@ cache: before_install: - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" -install: - - if [[ $TRAVIS_PHP_VERSION = nightly ]]; then export COMPOSER_FLAGS="--ignore-platform-reqs"; fi - - travis_retry composer update --prefer-dist $COMPOSER_FLAGS +install: travis_retry composer update --prefer-dist script: - ./vendor/bin/phpunit diff --git a/composer.json b/composer.json index e43a2398a..040e71732 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"} ], "require": { - "php": "^7.1", + "php": "^7.1 || ^8.0", "ext-tokenizer": "*", "doctrine/lexer": "1.*" }, From 4f861a1ea7799313ba2d0665d63b8cf4dde31527 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 25 May 2020 19:00:48 +0200 Subject: [PATCH 3/3] Pretend nightly is 7.4.99 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80f1162f4..32b39b8ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ php: - 7.2 - 7.3 - 7.4 - - nightly cache: directories: @@ -26,6 +25,11 @@ jobs: - php: nightly include: + - stage: Test + php: nightly + before_install: + - composer config platform.php 7.4.99 + - stage: Lint before_script: - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.7