Skip to content

Commit 90659ff

Browse files
authored
FFWEB-3187: Update PHP version. Set timeout for ClientBuilder
Update PHP version to 7.3 (7.1 and 7.2 is not supported now). Set timeout 10s for ClientBuilder.
1 parent 96ad2b1 commit 90659ff

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
php: ['7.2', '7.4']
11+
php: ['7.3', '8.1']
1212
deps: ['lowest', 'stable']
1313
steps:
1414
- name: Checkout code

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
use PhpCsFixer\Config;
6+
use PhpCsFixer\Finder;
47

5-
$finder = PhpCsFixer\Finder::create()
6-
->in(__DIR__ . '/spec')
8+
$finder = Finder::create()
79
->in(__DIR__ . '/src')
810
->name('*.php')
911
->ignoreDotFiles(true)
1012
->ignoreVCS(true);
1113

12-
return Config::create()
14+
$config = new Config();
15+
16+
return $config
1317
->setRiskyAllowed(true)
1418
->setHideProgress(true)
1519
->setUsingCache(false)
1620
->setRules([
1721
'@PSR2' => true,
1822
'array_syntax' => ['syntax' => 'short'],
19-
'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => true],
23+
'binary_operator_spaces' => [
24+
'operators' => [
25+
'=' => 'align',
26+
'=>' => 'align',
27+
],
28+
],
2029
'blank_line_after_opening_tag' => true,
2130
'blank_line_before_statement' => ['statements' => ['break', 'continue', 'declare', 'try']],
2231
'concat_space' => ['spacing' => 'one'],

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ handled by an HTTP client which is PSR-18 compatible. Behind the scenes, we use
99
GuzzleHTTP, a de-facto industry standard library for HTTP communication.
1010

1111
## Requirements
12-
- PHP 7.x or 8.x
12+
- PHP 7.3 or higher
1313
- FACT-Finder® 7.x or FACT-Finder® NG
1414

1515
## License

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=7.1||~8.1",
13+
"php": ">=7.3 || ~8.1",
1414
"ext-json": "*",
1515
"guzzlehttp/guzzle": "^6.3|^7.0",
1616
"psr/http-client": "^1.0",
1717
"psr/log": "^1.1||^3.0"
1818
},
1919
"require-dev": {
20-
"friendsofphp/php-cs-fixer": "^2.17",
20+
"friendsofphp/php-cs-fixer": "^3.4.0",
2121
"phpmd/phpmd": "^2.9",
22-
"phpspec/phpspec": "^6.0"
22+
"phpspec/phpspec": "^7.2"
2323
},
2424
"autoload": {
2525
"psr-4": {

src/Client/ClientBuilder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public function build(): ClientInterface
6262
'base_uri' => $this->serverUrl,
6363
'handler' => $handler,
6464
'headers' => ['Accept' => 'application/json'],
65+
'timeout' => 10,
6566
'http_errors' => false,
6667
];
6768

0 commit comments

Comments
 (0)