Skip to content

Commit 6743a2f

Browse files
authored
Merge pull request #156 from skaut/version-1.1.24
Version 1.1.24
2 parents 7df739a + 374485e commit 6743a2f

File tree

9 files changed

+429
-1171
lines changed

9 files changed

+429
-1171
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
branches: "*"
55
pull_request:
66
env:
7-
php-version: 7.4
7+
php-version: 8.1
88
cache-version: 1
99
jobs:
1010
platform-check:
11-
name: "PHP 7.0 compatibility"
11+
name: "PHP 7.4 compatibility"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: "Checkout"
@@ -17,7 +17,7 @@ jobs:
1717
- name: "Setup PHP"
1818
uses: shivammathur/setup-php@2.16.0
1919
with:
20-
php-version: 7.0
20+
php-version: 7.4
2121
coverage: none
2222

2323
- name: "Check dependency compatibility"

.phan/config.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
return array(
9-
'target_php_version' => '8.0',
10-
'minimum_target_php_version' => '7.0',
9+
'target_php_version' => '8.1',
10+
'minimum_target_php_version' => '7.4',
1111
'backward_compatibility_checks' => false, // Covered by PHPCS.
1212
'warn_about_undocumented_throw_statements' => true,
1313
'strict_method_checking' => true,

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
"source": "https://github.com/skaut/skautis-integration"
2828
},
2929
"require": {
30-
"php": "^7.0",
31-
"pimple/pimple": "^3.2.3 <3.3.0",
32-
"psr/container": "^1.0.0 <1.1.0",
33-
"skautis/skautis": "~2.1"
30+
"php": "^7.4 || ^8.0",
31+
"pimple/pimple": "^3.5",
32+
"skautis/skautis": "^2.2"
3433
},
3534
"require-dev": {
3635
"squizlabs/php_codesniffer": "^3.6",

composer.lock

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

0 commit comments

Comments
 (0)