From d9ac08e9df3b73264a0e4c2a45414d077b831b0e Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 13:41:04 -0500 Subject: [PATCH 1/6] remove string typehint for Reflection's sake (cannot use phpunit while this typehint exists) --- src/ProjectFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectFactory.php b/src/ProjectFactory.php index 9a41e58..d34fa5c 100644 --- a/src/ProjectFactory.php +++ b/src/ProjectFactory.php @@ -27,5 +27,5 @@ interface ProjectFactory * @param File[] $files * @return Project */ - public function create(string $name, array $files): Project; + public function create($name, array $files): Project; } From ea8d8d67aa914cca1cae0d6fad691bbcde030dd5 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 14:24:03 -0500 Subject: [PATCH 2/6] skip ecs until I can get its usage updated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60bc9ef..a602255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ jobs: - travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan script: - ./tools/phpstan analyse src --level max --configuration phpstan.neon - - composer create-project symplify/easy-coding-standard temp/ecs && temp/ecs/bin/ecs check src tests + #- composer create-project symplify/easy-coding-standard temp/ecs && temp/ecs/bin/ecs check src tests cache: directories: From 0a59e5352b0c6a9f1154a02d4e06bd519b34745b Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 14:35:22 -0500 Subject: [PATCH 3/6] update PHP versions on appveyor --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8af385e..e7333fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,9 @@ branches: environment: matrix: - - PHP_VERSION: '7.1.14' + - PHP_VERSION: '7.1.18' VC_VERSION: 'VC14' - - PHP_VERSION: '7.2.2' + - PHP_VERSION: '7.2.6' VC_VERSION: 'VC15' matrix: fast_finish: false From fbf9783cc849bcc6f4097f2e243908699e202b5b Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 14:41:27 -0500 Subject: [PATCH 4/6] Revert "update PHP versions on appveyor" This reverts commit 0a59e5352b0c6a9f1154a02d4e06bd519b34745b. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e7333fc..8af385e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,9 @@ branches: environment: matrix: - - PHP_VERSION: '7.1.18' + - PHP_VERSION: '7.1.14' VC_VERSION: 'VC14' - - PHP_VERSION: '7.2.6' + - PHP_VERSION: '7.2.2' VC_VERSION: 'VC15' matrix: fast_finish: false From 44b1dea10a6b8b1060fc4f77b565413663e23582 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 14:41:52 -0500 Subject: [PATCH 5/6] look for php tarball in archive --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8af385e..f05709a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ 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 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/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 From e135fd5a0a7f91ed8f6a48c88a36eb9fc4355458 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 13 Jun 2018 16:25:45 -0500 Subject: [PATCH 6/6] update appveyor config format --- appveyor.yml | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f05709a..46e4705 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,28 +22,28 @@ 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/archives/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:\reflectioncommon - composer install --no-interaction --prefer-dist --no-progress