From 4b73412a9d629d3ef58d218ffec0519cec3f10a3 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Thu, 14 Jun 2018 07:34:33 -0500 Subject: [PATCH 1/3] bump to next type-resolver alpha --- composer.lock | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index a5e2268..29b1328 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "phpdocumentor/reflection-common", - "version": "2.0.0-alpha2", + "version": "2.0.0-alpha3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "b775523cbbcbbcdd54f6a9dc0902ebe8c76ff511" + "reference": "eedd98e8bc9cfd924f056b4b5847066d4a250d2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/b775523cbbcbbcdd54f6a9dc0902ebe8c76ff511", - "reference": "b775523cbbcbbcdd54f6a9dc0902ebe8c76ff511", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/eedd98e8bc9cfd924f056b4b5847066d4a250d2f", + "reference": "eedd98e8bc9cfd924f056b4b5847066d4a250d2f", "shasum": "" }, "require": { @@ -58,25 +58,25 @@ "reflection", "static analysis" ], - "time": "2018-02-14T18:51:33+00:00" + "time": "2018-06-13T21:44:20+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.6.1", + "version": "0.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2870950c8eb446517e2e29acf8bbc209ed3ab0e4" + "reference": "e81ce9e82df06b49b2d0e0a2393a08955aeda05b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2870950c8eb446517e2e29acf8bbc209ed3ab0e4", - "reference": "2870950c8eb446517e2e29acf8bbc209ed3ab0e4", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e81ce9e82df06b49b2d0e0a2393a08955aeda05b", + "reference": "e81ce9e82df06b49b2d0e0a2393a08955aeda05b", "shasum": "" }, "require": { "php": ">=7.1", - "phpdocumentor/reflection-common": "^2.0" + "phpdocumentor/reflection-common": "^2" }, "require-dev": { "mockery/mockery": "^1.0", @@ -103,7 +103,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2018-02-12T14:33:22+00:00" + "time": "2018-06-14T12:29:58+00:00" }, { "name": "webmozart/assert", @@ -261,16 +261,16 @@ }, { "name": "mockery/mockery", - "version": "1.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38" + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38", + "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", "shasum": "" }, "require": { @@ -279,7 +279,8 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "~5.7.10|~6.5" }, "type": "library", "extra": { @@ -308,8 +309,8 @@ "homepage": "http://davedevelopment.co.uk" } ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/mockery/mockery", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", "keywords": [ "BDD", "TDD", @@ -322,7 +323,7 @@ "test double", "testing" ], - "time": "2017-10-06T16:20:43+00:00" + "time": "2018-05-08T08:54:48+00:00" } ], "aliases": [], From 688e9d1e5499e32df93c930cd8f0fac38b54b51f Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Thu, 14 Jun 2018 07:35:11 -0500 Subject: [PATCH 2/3] update appveyor config format --- appveyor.yml | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 33010b2..2e5eea3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,10 +12,8 @@ branches: environment: matrix: - - PHP_VERSION: '7.1.14' - VC_VERSION: 'VC14' - - PHP_VERSION: '7.2.2' - VC_VERSION: 'VC15' + - php_ver_target: 7.1 + - php_ver_target: 7.2 matrix: fast_finish: false @@ -24,33 +22,31 @@ cache: - '%LOCALAPPDATA%\Composer\files' init: - - SET PATH=c:\php\%PHP_VERSION%;%PATH% + - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH% + - SET COMPOSER_NO_INTERACTION=1 + - SET PHP=1 + - SET ANSICON=121x90 (121x90) + 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 + - 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 + - vendor\bin\phpunit --no-coverage From 26a37cf245be1809e9be637933ac03dc71fb63b8 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Thu, 14 Jun 2018 07:43:12 -0500 Subject: [PATCH 3/3] restore global phpunit --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2e5eea3..2a650d9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,7 +46,9 @@ install: - 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 - - vendor\bin\phpunit --no-coverage + - c:\Users\appveyor\AppData\Roaming\Composer\vendor\bin\phpunit --no-coverage