From 17333cc0960c8e9f75428e17d81b08418e6c88f8 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Sun, 7 Jan 2018 09:19:13 -0600 Subject: [PATCH 01/24] update travis build; add appveyor --- .travis.yml | 55 +++++++++++++++++++++++++++++++++------------------- appveyor.yml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml index 153880f..b1fccf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php - -php: - - 7.1 - - 7.2 +php: [7.1, 7.2, nightly ] +sudo: false matrix: include: @@ -11,26 +9,43 @@ matrix: - php: 7.1 env: PHPSTAN=true -cache: - directories: - - $HOME/.composer/cache +env: + global: + - VERSION=$(echo $TRAVIS_TAG | cut -c 2-10) install: - - composer install --no-interaction - - if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi +- composer install --no-interaction --prefer-dist -o +- if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi -script: - - vendor/bin/phpunit --coverage-clover=coverage.xml -v - - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi - - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi +jobs: + include: + - stage: Test + script: + - vendor/bin/phpunit + - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi + - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi -after_script: - - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; - - php coveralls.phar --verbose; + - stage: Coverage + php: 7.1 + script: + - vendor/bin/phpunit + after_script: + - wget https://scrutinizer-ci.com/ocular.phar + - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml + - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; + - php coveralls.phar --verbose; + + allow_failures: + - php: nightly + +cache: + directories: + - $HOME/.composer/cache/files notifications: - irc: "irc.freenode.org#phpdocumentor" + irc: irc.freenode.org#phpdocumentor + slack: + secure: fjumM0h+4w3EYM4dpgqvpiCug7m4sSIC5+HATgwga/Nrc6IjlbWvGOv3JPgD3kQUhi18VmZfUYPmCv916SIbMnv8JWcrSaJXnPCgmxidvYkuzQDIw1HDJbVppGnkmwQA/qjIrM3sIEMfnu/arLRJQLI363aStZzGPxwIa4PDKcg= email: - - mike.vanriel@naenius.com - - ashnazg@php.net - - boen.robot@gmail.com + - me@mikevanriel.com + - ashnazg@php.net diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..83f4468 --- /dev/null +++ b/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_VERSION: '7.1.13' + VC_VERSION: 'VC14' + - PHP_VERSION: '7.2.1' + VC_VERSION: 'VC15' +matrix: + fast_finish: false + +cache: + - c:\php -> appveyor.yml + - '%LOCALAPPDATA%\Composer\files' + +init: + - SET PATH=c:\php\%PHP_VERSION%;%PATH% + +install: + - IF NOT EXIST c:\php mkdir c:\php + - IF NOT EXIST c:\php\%PHP_VERSION% mkdir c:\php\%PHP_VERSION% + - cd c:\php\%PHP_VERSION% + - IF NOT EXIST php-installed.txt appveyor DownloadFile http://windows.php.net/downloads/releases/php-%PHP_VERSION%-Win32-%VC_VERSION%-x86.zip + - IF NOT EXIST php-installed.txt 7z x php-%PHP_VERSION%-Win32-%VC_VERSION%-x86.zip -y >nul + - IF NOT EXIST php-installed.txt del /Q *.zip + - IF NOT EXIST php-installed.txt copy /Y php.ini-development php.ini + - IF NOT EXIST php-installed.txt echo max_execution_time=1200 >> php.ini + - IF NOT EXIST php-installed.txt echo date.timezone="UTC" >> php.ini + - IF NOT EXIST php-installed.txt echo extension_dir=ext >> php.ini + - IF NOT EXIST php-installed.txt echo extension=php_curl.dll >> php.ini + - IF NOT EXIST php-installed.txt echo extension=php_openssl.dll >> php.ini + - IF NOT EXIST php-installed.txt echo extension=php_mbstring.dll >> php.ini + - IF NOT EXIST php-installed.txt echo extension=php_fileinfo.dll >> php.ini + - IF NOT EXIST php-installed.txt echo zend.assertions=1 >> php.ini + - IF NOT EXIST php-installed.txt echo assert.exception=On >> php.ini + - IF NOT EXIST php-installed.txt appveyor DownloadFile https://getcomposer.org/composer.phar + - IF NOT EXIST php-installed.txt echo @php %%~dp0composer.phar %%* > composer.bat + - IF NOT EXIST php-installed.txt type nul >> php-installed.txt + - cd c:\reflectiondocblock + - composer install --no-interaction --prefer-dist --no-progress + +test_script: + - cd c:\reflectiondocblock + - vendor/bin/phpunit From 355187b692ee5b174d917f7c5a759b6c790a5777 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 07:06:44 -0600 Subject: [PATCH 02/24] move ECS & phpstan into a stage --- .travis.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1fccf7..ef6266b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,28 +2,27 @@ language: php php: [7.1, 7.2, nightly ] sudo: false -matrix: - include: - - php: 7.1 - env: ECS=true - - php: 7.1 - env: PHPSTAN=true - env: global: - VERSION=$(echo $TRAVIS_TAG | cut -c 2-10) install: - composer install --no-interaction --prefer-dist -o -- if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi jobs: include: - stage: Test script: - vendor/bin/phpunit - - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi - - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi + + - stage: lint + php: 7.1 + script: vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; + + - stage lint + php: 7.1 + script: temp/ecs/bin/ecs check src tests; + before_script: composer create-project symplify/easy-coding-standard temp/ecs; - stage: Coverage php: 7.1 From 09489084f8785d26fcc07dd691c7e8c6869f7742 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 07:09:15 -0600 Subject: [PATCH 03/24] target php not allowed in lint stage? --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef6266b..3ba7dfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,9 @@ jobs: - vendor/bin/phpunit - stage: lint - php: 7.1 script: vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; - stage lint - php: 7.1 script: temp/ecs/bin/ecs check src tests; before_script: composer create-project symplify/easy-coding-standard temp/ecs; From da5670bae5e03e66b5ee0970e33992448079d302 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 07:14:21 -0600 Subject: [PATCH 04/24] missing colon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ba7dfe..9f504c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ jobs: - stage: lint script: vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; - - stage lint + - stage: lint script: temp/ecs/bin/ecs check src tests; before_script: composer create-project symplify/easy-coding-standard temp/ecs; From 751934cd9a7d09d9b42edb8f322149a4ebd5a6ff Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 12:09:54 -0600 Subject: [PATCH 05/24] expand gitignore --- .gitignore | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c368807..7db1e88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,16 @@ +# IDE Shizzle; it is recommended to use a global .gitignore for this but since this is an OSS project we want to make +# it easy to contribute .idea -vendor -/build -/temp +/nbproject/private/ +.buildpath +.project +.settings + +# Build folder and vendor folder are generated code; no need to version this +build/* +temp/* +vendor/* +composer.phar + +# By default the phpunit.xml.dist is provided; you can override this using a local config file +phpunit.xml From bd3b8fe05a15b31ef2ccc680ba95cd80a48ab7cd Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 13:08:32 -0600 Subject: [PATCH 06/24] add badges --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7122748..b07c97e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ -The ReflectionDocBlock Component [![Build Status](https://secure.travis-ci.org/phpDocumentor/ReflectionDocBlock.png)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock) +[![Travis Status](https://travis-ci.org/phpDocumentor/ReflectionDocBlock.svg?branch=master)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock) +[![Appveyor Status](https://ci.appveyor.com/api/projects/status/03a9euxrcse7orgu/branch/master?svg=true)](https://ci.appveyor.com/project/phpDocumentor/reflectiondocblock/branch/master) +[![Code Coverage](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) +[![Code Quality](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) + + +The ReflectionDocBlock Component ================================ Introduction From 1d7fe61bc1649e38290ae7eefc62769496b6a20d Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:32:38 -0600 Subject: [PATCH 07/24] travis docs imply quotes necessary are here --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f504c7..2c4ab05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,9 @@ cache: - $HOME/.composer/cache/files notifications: - irc: irc.freenode.org#phpdocumentor + irc: "irc.freenode.org#phpdocumentor" slack: - secure: fjumM0h+4w3EYM4dpgqvpiCug7m4sSIC5+HATgwga/Nrc6IjlbWvGOv3JPgD3kQUhi18VmZfUYPmCv916SIbMnv8JWcrSaJXnPCgmxidvYkuzQDIw1HDJbVppGnkmwQA/qjIrM3sIEMfnu/arLRJQLI363aStZzGPxwIa4PDKcg= + secure: "fjumM0h+4w3EYM4dpgqvpiCug7m4sSIC5+HATgwga/Nrc6IjlbWvGOv3JPgD3kQUhi18VmZfUYPmCv916SIbMnv8JWcrSaJXnPCgmxidvYkuzQDIw1HDJbVppGnkmwQA/qjIrM3sIEMfnu/arLRJQLI363aStZzGPxwIa4PDKcg=" email: - me@mikevanriel.com - ashnazg@php.net From 66e1fd3837d97b977fc3423c82ef8b50e7e0d2ca Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:34:10 -0600 Subject: [PATCH 08/24] unstaged scripts default to 'test' stage; --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c4ab05..b165937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ env: install: - composer install --no-interaction --prefer-dist -o +script: + - vendor/bin/phpunit + jobs: include: - - stage: Test - script: - - vendor/bin/phpunit - stage: lint script: vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; From cda86e1f1758f88677002aeb7023a7f998cd27c2 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:34:47 -0600 Subject: [PATCH 09/24] VERSION not needed in this package build --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b165937..3c2cbd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ php: [7.1, 7.2, nightly ] sudo: false env: - global: - - VERSION=$(echo $TRAVIS_TAG | cut -c 2-10) install: - composer install --no-interaction --prefer-dist -o From f845cf656713851a6dfcad98dd798a67b0489ff6 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:35:36 -0600 Subject: [PATCH 10/24] put lint stages together --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c2cbd7..fad6834 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,13 @@ script: jobs: include: - - stage: lint - script: vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; - - - stage: lint - script: temp/ecs/bin/ecs check src tests; - before_script: composer create-project symplify/easy-coding-standard temp/ecs; + php: 7.1 + before_script: + - composer create-project symplify/easy-coding-standard temp/ecs + script: + - temp/ecs/bin/ecs check src tests + - vendor/bin/phpstan analyse src --level max --configuration phpstan.neon - stage: Coverage php: 7.1 From a7d3aca8683ea2a6d40858e7cc56aa2efea2fc51 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:36:22 -0600 Subject: [PATCH 11/24] use matrix for allow_failures; add fast_finish; --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fad6834..2d683e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ php: [7.1, 7.2, nightly ] sudo: false env: +matrix: + fast_finish: true + allow_failures: + - php: nightly install: - composer install --no-interaction --prefer-dist -o @@ -30,8 +34,6 @@ jobs: - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; - php coveralls.phar --verbose; - allow_failures: - - php: nightly cache: directories: From 41266d5ef50ad1e29e835a4ff01423ee36d26fe7 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:36:40 -0600 Subject: [PATCH 12/24] add coveralls --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d683e0..4ec73e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,8 @@ jobs: after_script: - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml - - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; - - php coveralls.phar --verbose; - + - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar + - php coveralls.phar --verbose cache: directories: From 43f7d784e710c802c6e824e4bb0c3b9805bc08c7 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 14:37:09 -0600 Subject: [PATCH 13/24] use php section layout from travis docs; --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ec73e0..3b1b4b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: php -php: [7.1, 7.2, nightly ] +php: + - 7.1 + - 7.2 + - nightly sudo: false env: @@ -9,7 +12,7 @@ matrix: - php: nightly install: -- composer install --no-interaction --prefer-dist -o + - composer install --no-interaction --prefer-dist --optimize-autoloader script: - vendor/bin/phpunit From 74a79e1014d3178af765aa2050ee79d8a1df9b5b Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 15:02:42 -0600 Subject: [PATCH 14/24] add coveralls --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b07c97e..3799df5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ [![Travis Status](https://travis-ci.org/phpDocumentor/ReflectionDocBlock.svg?branch=master)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock) [![Appveyor Status](https://ci.appveyor.com/api/projects/status/03a9euxrcse7orgu/branch/master?svg=true)](https://ci.appveyor.com/project/phpDocumentor/reflectiondocblock/branch/master) -[![Code Coverage](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) [![Code Quality](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) +[![Code Coverage](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/phpDocumentor/ReflectionDocBlock/badge.svg?branch=master)](https://coveralls.io/github/phpDocumentor/ReflectionDocBlock?branch=master) The ReflectionDocBlock Component From 99338f3687fd08a978df7e28b6612a9f4372337e Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 15:12:29 -0600 Subject: [PATCH 15/24] no coverage needed in test stage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b1b4b8..122eb09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: - composer install --no-interaction --prefer-dist --optimize-autoloader script: - - vendor/bin/phpunit + - vendor/bin/phpunit --no-coverage jobs: include: From 09f8c7c6b6331e1f88fdec73f751ad793946c154 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 15:23:40 -0600 Subject: [PATCH 16/24] try disabling xdebug for test stage only --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 122eb09..32607a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ matrix: allow_failures: - php: nightly -install: +before_script: + - phpenv config-rm xdebug.ini - composer install --no-interaction --prefer-dist --optimize-autoloader - script: - vendor/bin/phpunit --no-coverage From c4fcd7458405f2a3a2d999f9a2c3d3204e2921e3 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 16:14:16 -0600 Subject: [PATCH 17/24] add more badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3799df5..028ab3a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Travis Status](https://travis-ci.org/phpDocumentor/ReflectionDocBlock.svg?branch=master)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock) [![Appveyor Status](https://ci.appveyor.com/api/projects/status/03a9euxrcse7orgu/branch/master?svg=true)](https://ci.appveyor.com/project/phpDocumentor/reflectiondocblock/branch/master) [![Code Quality](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/phpDocumentor/ReflectionDocBlock/badge.svg?branch=master)](https://coveralls.io/github/phpDocumentor/ReflectionDocBlock?branch=master) +[![PHPStan](https://img.shieldss.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan) The ReflectionDocBlock Component From 15a808b6a820bd54ab933f96b193160019bc65e8 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 16:28:20 -0600 Subject: [PATCH 18/24] xdebug removal proves complicated --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 32607a7..e8805f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ matrix: - php: nightly before_script: - - phpenv config-rm xdebug.ini - composer install --no-interaction --prefer-dist --optimize-autoloader script: - vendor/bin/phpunit --no-coverage From fe337a20d66adf34e9fa562767c2cc29857d4a2d Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 17:01:56 -0600 Subject: [PATCH 19/24] some steps belong together --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8805f9..728f121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,8 @@ jobs: script: - vendor/bin/phpunit after_script: - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml - - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar - - php coveralls.phar --verbose + - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml + - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && php coveralls.phar --verbose cache: directories: From 90a60e6406f4a08bdde35aa9e3048855e470df40 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 17:03:21 -0600 Subject: [PATCH 20/24] put test stage back together --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 728f121..ec1391a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,13 @@ matrix: before_script: - composer install --no-interaction --prefer-dist --optimize-autoloader -script: - - vendor/bin/phpunit --no-coverage jobs: include: + - stage: test + script: + - vendor/bin/phpunit --no-coverage + - stage: lint php: 7.1 before_script: From ff49ab6be78054616d74c67dd3fba86d474d0ceb Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Mon, 8 Jan 2018 17:03:37 -0600 Subject: [PATCH 21/24] see if install makes it persist into stages --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec1391a..0f5bd61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,13 @@ php: sudo: false env: + matrix: fast_finish: true allow_failures: - php: nightly -before_script: +install: - composer install --no-interaction --prefer-dist --optimize-autoloader jobs: From e6fb1cbc9bb737746272e0175cb42ea51921e0df Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Tue, 9 Jan 2018 12:25:08 -0600 Subject: [PATCH 22/24] add scrunitizer --- .scrutinizer.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 2 +- phpmd.xml.dist | 23 +++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 .scrutinizer.yml create mode 100644 phpmd.xml.dist diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..8b22db8 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,43 @@ +before_commands: + - "composer install --no-dev --prefer-source" + +tools: + external_code_coverage: + enabled: true + timeout: 300 + filter: + excluded_paths: ["examples", "tests", "vendor"] + php_code_sniffer: + enabled: true + config: + standard: PSR2 + filter: + paths: ["src/*", "tests/*"] + excluded_paths: [] + php_cpd: + enabled: true + excluded_dirs: ["examples", "tests", "vendor"] + php_cs_fixer: + enabled: true + config: + level: all + filter: + paths: ["src/*", "tests/*"] + php_loc: + enabled: true + excluded_dirs: ["examples", "tests", "vendor"] + php_mess_detector: + enabled: true + config: + ruleset: phpmd.xml.dist + design_rules: { eval_expression: false } + filter: + paths: ["src/*"] + php_pdepend: + enabled: true + excluded_dirs: ["examples", "tests", "vendor"] + php_analyzer: + enabled: true + filter: + paths: ["src/*", "tests/*"] + sensiolabs_security_checker: true diff --git a/.travis.yml b/.travis.yml index 0f5bd61..1bfa78d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: - temp/ecs/bin/ecs check src tests - vendor/bin/phpstan analyse src --level max --configuration phpstan.neon - - stage: Coverage + - stage: coverage php: 7.1 script: - vendor/bin/phpunit diff --git a/phpmd.xml.dist b/phpmd.xml.dist new file mode 100644 index 0000000..9abf85c --- /dev/null +++ b/phpmd.xml.dist @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + 40 + + + From 4f81271c85115e9b0d0ebbc121844e514a7104d5 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Tue, 9 Jan 2018 12:58:19 -0600 Subject: [PATCH 23/24] run coverage before lint --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bfa78d..269ffd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,6 @@ jobs: script: - vendor/bin/phpunit --no-coverage - - stage: lint - php: 7.1 - before_script: - - composer create-project symplify/easy-coding-standard temp/ecs - script: - - temp/ecs/bin/ecs check src tests - - vendor/bin/phpstan analyse src --level max --configuration phpstan.neon - - stage: coverage php: 7.1 script: @@ -37,6 +29,14 @@ jobs: - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && php coveralls.phar --verbose + - stage: lint + php: 7.1 + before_script: + - composer create-project symplify/easy-coding-standard temp/ecs + script: + - temp/ecs/bin/ecs check src tests + - vendor/bin/phpstan analyse src --level max --configuration phpstan.neon + cache: directories: - $HOME/.composer/cache/files From 264e58724ea35dfb848cf5ab73abd30134770d7b Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Tue, 9 Jan 2018 14:20:11 -0600 Subject: [PATCH 24/24] url typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 028ab3a..746816f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Code Quality](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/phpDocumentor/ReflectionDocBlock/badge.svg?branch=master)](https://coveralls.io/github/phpDocumentor/ReflectionDocBlock?branch=master) -[![PHPStan](https://img.shieldss.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan) +[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan) The ReflectionDocBlock Component