Skip to content

Commit 011dca3

Browse files
authored
Merge pull request #1158 from noplanman/php7.3-8.0
Bump to minimum PHP 7.3 and allow for PHP 8.0
2 parents 0d38087 + 6c69201 commit 011dca3

27 files changed

+955
-430
lines changed

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build:
22
environment:
3-
php: 7.4.11
3+
php: 7.3.0
44
nodes:
55
analysis:
66
tests:

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
dist: trusty
1+
dist: bionic
22
language: php
33

44
addons:
5-
mariadb: '10.1'
5+
mariadb: 10.2
66

77
cache:
88
directories:
99
- vendor
1010
- $HOME/.composer/cache
1111

1212
php:
13-
- 7.4
1413
- 7.3
15-
- 7.2
14+
- 7.4
15+
- 8.0snapshot
1616
- nightly
17-
- hhvm
1817

19-
matrix:
18+
jobs:
2019
allow_failures:
2120
- php: nightly
22-
- php: hhvm
2321
fast_finish: true
2422

2523
git:
@@ -38,10 +36,10 @@ before_script:
3836
script:
3937
- for SCHEMA_UPDATE_FILE in $(ls utils/db-schema-update); do mysql -u root -e "use telegrambot_migrations; source utils/db-schema-update/${SCHEMA_UPDATE_FILE};"; done;
4038
- composer check-code
41-
- if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then composer test-cov; else composer test; fi
39+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov; else composer test; fi
4240

4341
after_script:
44-
- if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then composer test-cov-upload; fi
42+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov-upload; fi
4543

4644
notifications:
4745
on_success: never

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
99
### Added
1010
- Bot API 5.0 (Big update!).
1111
### Changed
12-
- Upgrade code to PHP 7.2. (#1136)
12+
- Upgrade code to PHP 7.3. (#1136, )
1313
- Speed up clean query (@dva-re) (#1139)
1414
- Various code prettifications (@akalongman) (#1140, #1141, #1142, #1143)
1515
### Deprecated
1616
### Removed
1717
### Fixed
1818
### Security
19-
- Minimum PHP 7.2. (#1136)
19+
- Minimum PHP 7.3. (#1136, )
2020

2121
## [0.64.0] - 2020-10-04
2222
### Notes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ A Telegram Bot based on the official [Telegram Bot API]
1818
[![Dependencies](https://tidelift.com/badges/github/php-telegram-bot/core?style=flat)][Tidelift]
1919
[![Total Downloads](https://img.shields.io/packagist/dt/longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
2020
[![Downloads Month](https://img.shields.io/packagist/dm/longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
21-
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D7.2-8892BF.svg)](https://php.net/)
21+
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D7.3-8892BF.svg)](https://php.net/)
2222
[![License](https://img.shields.io/packagist/l/longman/telegram-bot.svg)](https://github.com/php-telegram-bot/core/LICENSE)
2323

2424
## Table of Contents

composer.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,36 @@
1616
"homepage": "http://longman.me",
1717
"role": "Developer"
1818
},
19+
{
20+
"name": "Armando Lüscher",
21+
"email": "[email protected]",
22+
"homepage": "https://noplanman.ch",
23+
"role": "Developer"
24+
},
1925
{
2026
"name": "PHP Telegram Bot Team",
2127
"homepage": "https://github.com/php-telegram-bot/core/graphs/contributors",
2228
"role": "Developer"
2329
}
2430
],
2531
"require": {
26-
"php": "^7.2",
32+
"php": "^7.3|^8.0",
2733
"ext-pdo": "*",
2834
"ext-curl": "*",
2935
"ext-json": "*",
3036
"ext-mbstring": "*",
3137
"psr/log": "^1.1",
32-
"guzzlehttp/guzzle": "^6.5|^7.1"
38+
"guzzlehttp/guzzle": "^6.0|^7.0"
3339
},
3440
"require-dev": {
35-
"phpunit/phpunit": "^8.5",
41+
"phpunit/phpunit": "^9.4",
3642
"squizlabs/php_codesniffer": "^3.5",
37-
"dms/phpunit-arraysubset-asserts": "^0.1",
43+
"dms/phpunit-arraysubset-asserts": "^0.2",
3844
"monolog/monolog": "^2.1"
3945
},
4046
"autoload": {
4147
"psr-4": {
42-
"Longman\\TelegramBot\\": "src/"
48+
"Longman\\TelegramBot\\": "src"
4349
}
4450
},
4551
"autoload-dev": {

0 commit comments

Comments
 (0)