Merge branch 'master' into organisation

This commit is contained in:
lisam 2023-07-06 15:05:08 +02:00
commit b3bd17d10a
5 changed files with 13 additions and 6 deletions

View file

@ -20,7 +20,6 @@ jobs:
matrix: matrix:
php-version: php-version:
- 7.4 - 7.4
- 8.0
- 8.1 - 8.1
- 8.2 - 8.2
steps: steps:

View file

@ -11,7 +11,7 @@
], ],
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"guzzlehttp/guzzle": "^6.5", "guzzlehttp/guzzle": "^7.7",
"php": "7.4.* || 8.1.* || 8.2.*" "php": "7.4.* || 8.1.* || 8.2.*"
}, },
"autoload": { "autoload": {
@ -29,5 +29,10 @@
"phpunit/phpunit": "^9.3", "phpunit/phpunit": "^9.3",
"phpspec/prophecy-phpunit": "^2.0", "phpspec/prophecy-phpunit": "^2.0",
"squizlabs/php_codesniffer": "^3.5" "squizlabs/php_codesniffer": "^3.5"
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
} }
} }

View file

@ -26,6 +26,7 @@ namespace SkillDisplay\PHPToolKit\Tests\Unit\Api;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Psr7\Utils;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\PhpUnit\ProphecyTrait;
use SkillDisplay\PHPToolKit\Api\Campaigns; use SkillDisplay\PHPToolKit\Api\Campaigns;
@ -75,7 +76,7 @@ class CampaignsTest extends TestCase
}))->willReturn($response->reveal()); }))->willReturn($response->reveal());
$response->getStatusCode()->willReturn(200); $response->getStatusCode()->willReturn(200);
$response->getBody()->willReturn('{"Version": "1.0","ErrorMessage": "","Campaigns": [{"uid": 1},{"uid": 2}]}'); $response->getBody()->willReturn(Utils::streamFor('{"Version": "1.0","ErrorMessage": "","Campaigns": [{"uid": 1},{"uid": 2}]}'));
$subject = new Campaigns( $subject = new Campaigns(
$settings->reveal(), $settings->reveal(),

View file

@ -26,6 +26,7 @@ namespace SkillDisplay\PHPToolKit\Tests\Unit\Api;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Psr7\Utils;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\PhpUnit\ProphecyTrait;
use SkillDisplay\PHPToolKit\Api\SkillSet; use SkillDisplay\PHPToolKit\Api\SkillSet;
@ -77,7 +78,7 @@ class SkillSetTest extends TestCase
}))->willReturn($response->reveal()); }))->willReturn($response->reveal());
$response->getStatusCode()->willReturn(200); $response->getStatusCode()->willReturn(200);
$response->getBody()->willReturn('{"uid":10}'); $response->getBody()->willReturn(Utils::streamFor('{"uid":10}'));
$subject = new SkillSet( $subject = new SkillSet(
$settings->reveal(), $settings->reveal(),

View file

@ -26,6 +26,7 @@ namespace SkillDisplay\PHPToolKit\Tests\Unit\Api;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Psr7\Utils;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\PhpUnit\ProphecyTrait;
use SkillDisplay\PHPToolKit\Api\Skill; use SkillDisplay\PHPToolKit\Api\Skill;
@ -77,7 +78,7 @@ class SkillTest extends TestCase
}))->willReturn($response->reveal()); }))->willReturn($response->reveal());
$response->getStatusCode()->willReturn(200); $response->getStatusCode()->willReturn(200);
$response->getBody()->willReturn('{"uid":10}'); $response->getBody()->willReturn(Utils::streamFor('{"uid":10}'));
$subject = new Skill( $subject = new Skill(
$settings->reveal(), $settings->reveal(),