Skip to content

Commit 974ca20

Browse files
authored
Merge pull request #60 from mindbox-cloud/MBM-353
MBM-353: Поднять версию PHP SDK
2 parents d57a212 + 1484a75 commit 974ca20

File tree

3 files changed

+8
-61
lines changed

3 files changed

+8
-61
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,21 @@ name: Check code style and tests
88
- master
99
jobs:
1010

11-
build_7_3:
12-
runs-on: ubuntu-latest
13-
14-
steps:
15-
16-
- uses: actions/checkout@v2
17-
- uses: php-actions/composer@v6
18-
with:
19-
php_version: 7.3
20-
version: 2
21-
22-
- name: Setup PHP
23-
uses: shivammathur/setup-php@v2
24-
with:
25-
php-version: 7.3
26-
27-
- name: Update packages
28-
run: sudo composer update
29-
30-
- name: PHP version
31-
run: php -v
32-
33-
- name: Run phpcs
34-
run: vendor/bin/phpcs
35-
36-
- name: Run tests
37-
run: vendor/bin/phpunit
38-
39-
40-
build_7_4:
11+
build_8_0:
4112
runs-on: ubuntu-latest
4213

4314
steps:
4415

4516
- uses: actions/checkout@v2
4617
- uses: php-actions/composer@v6
4718
with:
48-
php_version: 7.4
19+
php_version: 8.0
4920
version: 2
5021

5122
- name: Setup PHP
5223
uses: shivammathur/setup-php@v2
5324
with:
54-
php-version: 7.4
25+
php-version: 8.0
5526

5627
- name: Update packages
5728
run: sudo composer update
@@ -63,32 +34,8 @@ jobs:
6334
run: vendor/bin/phpcs
6435

6536
- name: Run tests
66-
run: vendor/bin/phpunit
67-
68-
build_8_0:
69-
runs-on: ubuntu-latest
70-
71-
steps:
72-
73-
- uses: actions/checkout@v2
74-
- uses: php-actions/composer@v6
37+
uses: php-actions/phpunit@v3
7538
with:
39+
version: 9
7640
php_version: 8.0
77-
version: 2
78-
79-
- name: Setup PHP
80-
uses: shivammathur/setup-php@v2
81-
with:
82-
php-version: 8.0
83-
84-
- name: Update packages
85-
run: sudo composer update
86-
87-
- name: PHP version
88-
run: php -v
89-
90-
- name: Run phpcs
91-
run: vendor/bin/phpcs
9241

93-
# - name: Run tests
94-
# uses: php-actions/phpunit@v3.0.0

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"keywords": ["mindbox", "sdk"],
55
"type": "library",
66
"require": {
7-
"php": ">=7.3",
8-
"psr/log": "^1.1",
7+
"php": ">=8.0",
8+
"psr/log": "^3.0.0",
99
"ext-json": "*",
1010
"ext-simplexml": "*",
1111
"ext-libxml": "*"

src/Loggers/MindboxFileLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static function getLogDirPath()
180180
* @param string $message Сообщение.
181181
* @param array $context Контекст.
182182
*/
183-
public function log($level, $message, array $context = [])
183+
public function log($level, $message, array $context = []): void
184184
{
185185
if ($this->toMindboxLogLevel($level) < $this->logLevel) {
186186
return;

0 commit comments

Comments
 (0)