Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: felixfbecker/php-advanced-json-rpc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8006920665d1f902e03b67c5d47b637893a4ff67
Choose a base ref
..
head repository: felixfbecker/php-advanced-json-rpc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2693994157e8bcc6919cf26ad5e8c22a442f618
Choose a head ref
Showing with 40 additions and 26 deletions.
  1. +36 −23 .travis.yml
  2. +3 −2 composer.json
  3. +1 −1 tests/DispatcherTest.php
59 changes: 36 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,50 @@
# TravisCI configuration for felixfbecker/php-advanced-json-rpc

branches:
except:
- /^v\d+\.\d+\.\d+$/

language: php
os:
- "linux"
dist: "xenial"

php:
- '7.0'
- '7.2'
- "7.1"
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- nightly

stages:
- name: test
- name: release
if: branch = master AND type = push AND fork = false

jobs:
fast_finish: true
include:
- stage: release
language: node_js
node_js: "8"
install:
- npm ci
script:
- npm run semantic-release
after_success: skip
allow_failures:
- stage: test
php: nightly

env:
global:
- FORCE_COLOR=1

cache:
npm: true
directories:
- $HOME/.composer/cache
- $HOME/.npm

install:
- composer install --prefer-dist
@@ -21,23 +54,3 @@ script:

after_success:
- bash <(curl -s https://codecov.io/bash)

jobs:
include:
- stage: release
language: node_js
node_js: '8'
install:
- npm ci
script:
- npm run semantic-release
after_success: false

stages:
- test
- name: release
if: branch = master AND type = push AND fork = false

branches:
except:
- /^v\d+\.\d+\.\d+$/
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@
}
},
"require": {
"php": ">=7.0",
"php": "^7.1 || ^8.0",
"netresearch/jsonmapper": "^1.0 || ^2.0",
"phpdocumentor/reflection": "^4.0"

},
"require-dev": {
"phpunit/phpunit": "^6.0.0"
"phpunit/phpunit": "^7.0 || ^8.0"
},
"minimum-stability": "dev",
"prefer-stable": true
2 changes: 1 addition & 1 deletion tests/DispatcherTest.php
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class DispatcherTest extends TestCase
private $callsOfNestedTarget;
private $dispatcher;

public function setUp()
public function setUp(): void
{
$this->calls = [];
$this->callsOfNestedTarget = [];