Skip to content

Update to RxPHP 2.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 22, 2017
Merged

Update to RxPHP 2.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10e23c6
Updated to RxPHP 2.0 (dev)
WyriHaximus Mar 14, 2017
64a9a9e
Merge branch 'master' into rxphp-2.0
WyriHaximus Mar 14, 2017
cd6050c
Updated test utilities
WyriHaximus Mar 17, 2017
dc4f373
Merge remote-tracking branch 'origin/rxphp-2.0' into rxphp-2.0
WyriHaximus Mar 17, 2017
7c24b99
Updated to RxPHP 2.0 final
WyriHaximus Mar 21, 2017
507472e
Updated AppVeyor config
WyriHaximus Mar 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ platform:
- x64
clone_folder: c:\projects\php-project-workspace


## Build matrix for lowest and highest possible targets
environment:
matrix:
Expand All @@ -13,16 +12,20 @@ environment:
php_ver_target: 7.1
- dependencies: current
php_ver_target: 7.0
- dependencies: highest
- dependencies: current
php_ver_target: 7.1
- dependencies: highest
php_ver_target: 7.0
- dependencies: highest
php_ver_target: 7.1

## Cache composer bits
## Cache composer, chocolatey and php bits
cache:
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
- composer.phar
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
- c:\tools\php -> .appveyor.yml

## Set up environment varriables
init:
Expand All @@ -34,7 +37,7 @@ init:
## Install PHP and composer, and run the appropriate composer command
install:
- IF EXIST c:\tools\php (SET PHP=0)
- ps: appveyor-retry cinst -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $Env:php_ver_target | Select-Object -first 1) -replace '[php|]','')
- 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
Expand Down
7 changes: 4 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@
"require": {
"php": "^7.0",
"react/promise": "^2.4",
"reactivex/rxphp": "^1.5"
"reactivex/rxphp": "^2.0"
},
"require-dev": {
"api-clients/test-utilities": "^2.0"
"api-clients/test-utilities": "^3.0.1"
},
"autoload": {
"psr-4": {
"ApiClients\\Tools\\Rx\\": "src/"
},
"files": [
"src/functions_include.php"
"src/functions_include.php",
"src/bootstrap.php"
]
},
"autoload-dev": {
Expand Down
Loading