Merge pull request #2 from php-api-clients/rxphp-2.0

Update to RxPHP 2.0

appveyor.yml

@@ -3,7 +3,6 @@ platform:
   - x64
 clone_folder: c:\projects\php-project-workspace
 
-
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:
@@ -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:
@@ -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

composer.json

@@ -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": {