Skip to content

Commit c8eb861

Browse files
committed
Merge branch 'master' into event-loop-0.5-3.0
# Conflicts: # composer.lock
2 parents 61c6719 + 96753b1 commit c8eb861

File tree

4 files changed

+53
-4
lines changed

4 files changed

+53
-4
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ matrix:
2121
- php: 7.1
2222
env:
2323
- dependencies=lowest
24+
- php: 7.2
25+
env:
26+
- dependencies=lowest
2427
- php: nightly
2528
env:
2629
- dependencies=lowest
@@ -31,6 +34,9 @@ matrix:
3134
- php: 7.1
3235
env:
3336
- dependencies=highest
37+
- php: 7.2
38+
env:
39+
- dependencies=highest
3440
- php: nightly
3541
env:
3642
- dependencies=highest

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php": "^7.0",
1414
"api-clients/command-bus": "^2.0",
1515
"clue/block-react": "^1.1",
16-
"ocramius/package-versions": "^1.1",
16+
"jean85/pretty-package-versions": "^1.0",
1717
"react/dns": "^0.4.9",
1818
"react/http-client": "^0.5 || ^0.4.17",
1919
"reactivex/rxphp": "^2.0.4",

composer.lock

Lines changed: 44 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiSettings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace ApiClients\Client\Pusher;
44

5-
use PackageVersions\Versions;
5+
use Jean85\PrettyVersions;
66

77
final class ApiSettings
88
{
@@ -15,7 +15,7 @@ final class ApiSettings
1515
public static function getVersion(string $version = ''): string
1616
{
1717
if ($version === '') {
18-
$version = Versions::getVersion('api-clients/pusher');
18+
$version = PrettyVersions::getVersion('api-clients/pusher')->getFullVersion();
1919
}
2020

2121
list($version, $hash) = explode('@', $version);

0 commit comments

Comments
 (0)