Skip to content

Commit 379dc2f

Browse files
committed
wip
1 parent 8690702 commit 379dc2f

4 files changed

Lines changed: 21 additions & 35 deletions

File tree

.github/workflows/qa.yml

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
tests:
1111
env:
1212
TNT_IMAGE: tarantool/tarantool:3.1
13-
PHP_IMAGE: php:8.3-cli
13+
PHP_IMAGE: php:8.5-cli
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -31,55 +31,39 @@ jobs:
3131
- TNT_IMAGE: tarantool/tarantool:1.9
3232
- TNT_IMAGE: tarantool/tarantool:1.7
3333

34-
- PHP_IMAGE: php:8.3-cli
35-
TNT_LISTEN_URI: /tmp/tarantool_client.sock
36-
37-
- PHP_IMAGE: php:8.2-cli
38-
- PHP_IMAGE: php:8.2-cli
39-
TNT_LISTEN_URI: /tmp/tarantool_client.sock
40-
41-
- PHP_IMAGE: php:8.1-cli
42-
- PHP_IMAGE: php:8.1-cli
34+
- PHP_IMAGE: php:8.5-cli
4335
TNT_LISTEN_URI: /tmp/tarantool_client.sock
4436

45-
- PHP_IMAGE: php:8.0-cli
46-
- PHP_IMAGE: php:8.0-cli
37+
- PHP_IMAGE: php:8.4-cli
38+
- PHP_IMAGE: php:8.4-cli
4739
TNT_LISTEN_URI: /tmp/tarantool_client.sock
4840

49-
- PHP_IMAGE: php:7.4-cli
50-
- PHP_IMAGE: php:7.4-cli
41+
- PHP_IMAGE: php:8.3-cli
42+
- PHP_IMAGE: php:8.3-cli
5143
TNT_LISTEN_URI: /tmp/tarantool_client.sock
5244

53-
- PHP_IMAGE: php:7.3-cli
45+
- PHP_IMAGE: php:8.2-cli
5446
QA: 1
55-
- PHP_IMAGE: php:7.3-cli
56-
TNT_LISTEN_URI: /tmp/tarantool_client.sock
57-
58-
- PHP_IMAGE: php:7.2-cli
59-
- PHP_IMAGE: php:7.2-cli
47+
- PHP_IMAGE: php:8.2-cli
6048
TNT_LISTEN_URI: /tmp/tarantool_client.sock
6149

6250
- COVERAGE_FILE: coverage.clover
63-
# scrutinizer doesn't support PHP 8
64-
PHP_IMAGE: php:7.4-cli
51+
PHP_IMAGE: php:8.2-cli
6552
- COVERAGE_FILE: coverage.clover
66-
# scrutinizer doesn't support PHP 8
67-
PHP_IMAGE: php:7.4-cli
53+
PHP_IMAGE: php:8.2-cli
6854
EXT_DISABLE_DECIMAL: true
6955
- COVERAGE_FILE: coverage.clover
70-
# scrutinizer doesn't support PHP 8
71-
PHP_IMAGE: php:7.4-cli
56+
PHP_IMAGE: php:8.2-cli
7257
TNT_LISTEN_URI: /tmp/tarantool_client.sock
7358
- COVERAGE_FILE: coverage.clover
74-
# scrutinizer doesn't support PHP 8
75-
PHP_IMAGE: php:7.4-cli
59+
PHP_IMAGE: php:8.2-cli
7660
# some tests are skipped on Tarantool > 2.8
7761
TNT_IMAGE: tarantool/tarantool:2.8
7862

7963
runs-on: ${{ matrix.operating-system }}
8064
steps:
8165
- name: Checkout
82-
uses: actions/checkout@v4
66+
uses: actions/checkout@v6
8367

8468
- name: Build docker image
8569
env: ${{ matrix.env }}
@@ -104,5 +88,7 @@ jobs:
10488
env: ${{ matrix.env }}
10589
if: ${{ env.COVERAGE_FILE }}
10690
run: |
107-
curl -sSOL https://scrutinizer-ci.com/ocular.phar
108-
docker run --net=tarantool-php --rm -v $PWD:/client -w /client client php ocular.phar code-coverage:upload --format=php-clover "$COVERAGE_FILE"
91+
docker run --net=tarantool-php -e COVERAGE_FILE --rm -v $PWD:/client -w /client client sh -lc '
92+
composer global require --no-progress --no-interaction scrutinizer/ocular:^1.9 >/dev/null &&
93+
"$(composer global config bin-dir --absolute)/ocular" code-coverage:upload --format=php-clover "$COVERAGE_FILE"
94+
'

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2024 Eugene Leonovich
3+
Copyright (c) 2015-2026 Eugene Leonovich
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.2.5|^8",
15-
"rybakit/msgpack": "^0.9",
14+
"php": "^8.2",
15+
"rybakit/msgpack": "^0.10",
1616
"symfony/uid": "^5.1|^6|^7"
1717
},
1818
"require-dev": {

src/Packer/Extension/DecimalExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public function unpackExt(BufferUnpacker $unpacker, int $extLength)
8080
: \substr_replace($dec, '.', -$scale, 0);
8181
}
8282

83-
return new Decimal($sign.$dec, self::PRECISION);
83+
return Decimal::valueOf($sign.$dec, self::PRECISION);
8484
}
8585
}

0 commit comments

Comments
 (0)