Skip to content

Commit 7f8835e

Browse files
SmetDenisSmetDenis
authored
Update PHP deps (#11)
1 parent 7e46010 commit 7f8835e

File tree

6 files changed

+136
-14
lines changed

6 files changed

+136
-14
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
# @link https://github.com/JBZoo/Http-Client
1212
#
1313

14-
/.phan export-ignore
1514
/build export-ignore
1615
/tests export-ignore
1716
/.editorconfig export-ignore
1817
/.gitattributes export-ignore
1918
/.gitignore export-ignore
2019
/.travis.yml export-ignore
20+
/.phan.php export-ignore
2121
/phpunit.xml.dist export-ignore
2222
/Makefile export-ignore
2323

‎.github/workflows/main.yml

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
#
2+
# JBZoo Toolbox - Http-Client
3+
#
4+
# This file is part of the JBZoo Toolbox project.
5+
# For the full copyright and license information, please view the LICENSE
6+
# file that was distributed with this source code.
7+
#
8+
# @package Http-Client
9+
# @license MIT
10+
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11+
# @link https://github.com/JBZoo/Http-Client
12+
#
13+
14+
name: CI
15+
16+
on:
17+
pull_request:
18+
branches:
19+
- "*"
20+
push:
21+
branches:
22+
- 'master'
23+
schedule:
24+
- cron: '55 */8 * * *'
25+
26+
env:
27+
COLUMNS: 120
28+
TERM_PROGRAM: Hyper
29+
30+
jobs:
31+
phpunit:
32+
name: PHPUnit
33+
runs-on: ubuntu-latest
34+
env:
35+
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
36+
strategy:
37+
matrix:
38+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
39+
composer_flags: [ "--prefer-lowest", "" ]
40+
steps:
41+
- name: Checkout code
42+
uses: actions/checkout@v2
43+
with:
44+
fetch-depth: 0
45+
46+
- name: Setup PHP
47+
uses: shivammathur/setup-php@v2
48+
with:
49+
php-version: ${{ matrix.php-version }}
50+
coverage: xdebug
51+
tools: composer
52+
53+
- name: Build the Project
54+
run: make update --no-print-directory
55+
56+
- name: 🧪 PHPUnit Tests
57+
run: make test --no-print-directory
58+
59+
- name: Upload Artifacts
60+
uses: actions/upload-artifact@v2
61+
with:
62+
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
63+
path: build/
64+
65+
66+
linters:
67+
name: Linters
68+
runs-on: ubuntu-latest
69+
strategy:
70+
matrix:
71+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
72+
steps:
73+
- name: Checkout code
74+
uses: actions/checkout@v2
75+
with:
76+
fetch-depth: 0
77+
78+
- name: Setup PHP
79+
uses: shivammathur/setup-php@v2
80+
with:
81+
php-version: ${{ matrix.php-version }}
82+
tools: composer
83+
84+
- name: Build the Project
85+
run: make update --no-print-directory
86+
87+
- name: 👍 Code Quality
88+
run: make codestyle --no-print-directory
89+
90+
- name: Upload Artifacts
91+
uses: actions/upload-artifact@v2
92+
with:
93+
name: Linters - ${{ matrix.php-version }}
94+
path: build/
95+
96+
97+
report:
98+
name: Reports
99+
runs-on: ubuntu-latest
100+
strategy:
101+
matrix:
102+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
103+
steps:
104+
- name: Checkout code
105+
uses: actions/checkout@v2
106+
with:
107+
fetch-depth: 0
108+
109+
- name: Setup PHP
110+
uses: shivammathur/setup-php@v2
111+
with:
112+
php-version: ${{ matrix.php-version }}
113+
coverage: xdebug
114+
tools: composer
115+
116+
- name: Build the Project
117+
run: make update --no-print-directory
118+
119+
- name: 📝 Build Reports
120+
run: make report-all --no-print-directory
121+
122+
- name: Upload Artifacts
123+
uses: actions/upload-artifact@v2
124+
with:
125+
name: Reports - ${{ matrix.php-version }}
126+
path: build/

‎.phan/config.php renamed to ‎.phan.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
declare(strict_types=1);
1717

18-
$default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
18+
$default = include __DIR__ . '/vendor/jbzoo/codestyle/src/phan/default.php';
1919

2020
return array_merge($default, [
2121
'directory_list' => [

‎.travis.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@ language: php
1515
os: linux
1616
dist: xenial
1717

18+
git:
19+
depth: false
20+
1821
php:
1922
- 7.2
2023
- 7.3
2124
- 7.4
2225
- 8.0
23-
- nightly
24-
25-
jobs:
26-
fast_finish: true
27-
allow_failures:
28-
- php: 8.0
29-
- php: nightly
3026

3127
env:
3228
matrix:

‎composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"php" : ">=7.2",
1818
"ext-json" : "*",
1919

20-
"jbzoo/data" : "^4.2.0",
21-
"jbzoo/utils" : "^4.3.0",
20+
"jbzoo/data" : "^4.3.0",
21+
"jbzoo/utils" : "^4.5.0",
2222
"guzzlehttp/promises" : ">=1.4.0"
2323
},
2424

2525
"require-dev" : {
26-
"jbzoo/toolbox-dev" : "^2.10.0",
27-
"jbzoo/event" : "^3.1.0",
26+
"jbzoo/toolbox-dev" : "^2.13.1",
27+
"jbzoo/event" : "^3.2.0",
2828
"rmccue/requests" : "^1.7.0",
2929
"guzzlehttp/guzzle" : ">=6.5.5"
3030
},

‎src/Response.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @property string $body
3030
* @property float|null $time
3131
*/
32-
final class Response
32+
class Response
3333
{
3434
/**
3535
* @var int

0 commit comments

Comments
 (0)