Skip to content

Commit

Permalink
Applied new CS rules
Browse files Browse the repository at this point in the history
  • Loading branch information
WyriHaximus committed Nov 26, 2018
1 parent 2084949 commit d92747c
Show file tree
Hide file tree
Showing 15 changed files with 842 additions and 521 deletions.
2 changes: 1 addition & 1 deletion .php_cs
@@ -1,6 +1,6 @@
<?php declare(strict_types=1);

use ApiClients\Tools\TestUtilities\PhpCsFixerConfig;
use ApiClients\Tools\CsFixerConfig\PhpCsFixerConfig;
use PhpCsFixer\Config;

return (function (): Config
Expand Down
24 changes: 10 additions & 14 deletions .travis.yml
Expand Up @@ -8,37 +8,33 @@ cache:
## Build matrix for lowest and highest possible targets
matrix:
include:
- php: 7.0
- php: 7.2
env:
- qaExtended=true
- php: 7.1
- php: 7.2
- dropPlatform=false
- php: 7.3
env:
- dropPlatform=false
- php: nightly
env:
- dropPlatform=false
- php: 7.0
env:
- dependencies=lowest
- php: 7.1
- php: 7.2
env:
- dependencies=lowest
- php: 7.2
- dropPlatform=false
- php: 7.3
env:
- dependencies=lowest
- dropPlatform=false
- php: nightly
env:
- dependencies=lowest
- dropPlatform=false
- php: 7.0
env:
- dependencies=highest
- php: 7.1
- php: 7.2
env:
- dependencies=highest
- php: 7.2
- dropPlatform=false
- php: 7.3
env:
- dependencies=highest
- dropPlatform=false
Expand All @@ -63,4 +59,4 @@ script:
- if [ "$qaExtended" = "true" ]; then make ci-extended; fi;

## Gather coverage and set it to coverage servers
after_script: if [ "$qaExtended" = "true" ]; then make ci-coverage; fi;
after_script: if [ "$qaExtended" = "true" ]; then make ci-coverage; fi;
66 changes: 30 additions & 36 deletions appveyor.yml
Expand Up @@ -6,51 +6,45 @@ clone_folder: c:\projects\php-project-workspace
## Build matrix for lowest and highest possible targets
environment:
matrix:
- dependencies: lowest
php_ver_target: 7.0
- dependencies: lowest
php_ver_target: 7.1
- dependencies: current
php_ver_target: 7.0
- dependencies: current
php_ver_target: 7.1
- dependencies: highest
php_ver_target: 7.0
- dependencies: highest
php_ver_target: 7.1
- dependencies: lowest
php_ver_target: 7.2
- dependencies: current
php_ver_target: 7.2
- dependencies: highest
php_ver_target: 7.2

## Cache composer file
cache:
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
- '%LOCALAPPDATA%\Composer\files -> composer.lock'

## Set up environment varriables
init:
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET PHP=1
- SET ANSICON=121x90 (121x90)
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET PHP=1
- SET ANSICON=121x90 (121x90)

## Install PHP and composer, and run the appropriate composer command
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 php.ini-production php.ini /Y
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- IF %PHP%==1 echo extension_dir=ext >> 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 @php %%~dp0composer.phar %%* > composer.bat
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
- cd c:\projects\php-project-workspace
- composer config --unset platform.php
- IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --profile -n
- IF %dependencies%==current appveyor-retry composer install --no-progress --profile
- IF %dependencies%==highest appveyor-retry composer update --no-progress --profile -n
- composer show
- 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 php.ini-production php.ini /Y
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- IF %PHP%==1 echo extension_dir=ext >> 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 @php %%~dp0composer.phar %%* > composer.bat
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
- cd c:\projects\php-project-workspace
- composer config --unset platform.php
- IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --profile -n
- IF %dependencies%==current appveyor-retry composer install --no-progress --profile
- IF %dependencies%==highest appveyor-retry composer update --no-progress --profile -n
#- composer show

## Run the actual test
test_script:
- cd c:\projects\php-project-workspace
- vendor/bin/phpunit -c phpunit.xml.dist
- cd c:\projects\php-project-workspace
- vendor/bin/phpunit -c phpunit.xml.dist
7 changes: 4 additions & 3 deletions composer.json
Expand Up @@ -9,11 +9,12 @@
}
],
"require": {
"php": "^7.0",
"php": "^7.2",
"igorw/get-in": "^1.0"
},
"require-dev": {
"api-clients/test-utilities": "^4.2"
"api-clients/cs-fixer-config": "^1.1",
"api-clients/test-utilities": "^5.2"
},
"autoload": {
"psr-4": {
Expand All @@ -28,7 +29,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.0"
"php": "7.2"
}
},
"scripts": {
Expand Down

0 comments on commit d92747c

Please sign in to comment.