Skip to content

Commit a019962

Browse files
authored
Merge pull request #1459 from php-telegram-bot/api-7.0
Bot API 7.0
2 parents 57a649c + 6071bb9 commit a019962

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1497
-196
lines changed

.github/workflows/tests.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
19+
php: ['8.1', '8.2', '8.3']
2020

2121
services:
2222
mariadb:
@@ -70,11 +70,15 @@ jobs:
7070
run: composer check-code
7171

7272
- name: Run test suite
73-
if: ${{ matrix.php != '7.3'}}
74-
run: composer test-cov
73+
run: composer test
7574

76-
- name: Run test suite (with coverage)
77-
if: ${{ matrix.php == '7.3'}}
78-
run: |
79-
composer test-cov
80-
composer test-cov-upload
75+
# - name: Run test suite
76+
# if: ${{ matrix.php != '8.1'}}
77+
# run: composer test-cov
78+
79+
# - name: Run test suite (with coverage)
80+
# if: ${{ matrix.php == '8.1'}}
81+
# run: |
82+
# wget https://scrutinizer-ci.com/ocular.phar
83+
# composer test-cov
84+
# composer test-cov-upload

.scrutinizer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build:
22
environment:
3-
php: 7.3.0
3+
php: 8.1.0
44
nodes:
55
analysis:
66
tests:

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
55

66
## [Unreleased]
77
### Notes
8-
- [:ledger: View file changes][Unreleased]
8+
- [:ledger: View file changes][Unreleased][:page_with_curl: DB migration script][unreleased-sql-migration]
9+
- [:exclamation:][unreleased-bc-minimum-php-81] PHP 8.1+ required!
910
### Added
11+
- Bot API 7.0 (@noplanman, @TiiFuchs) (#1459)
1012
### Changed
13+
- [:exclamation:][unreleased-bc-user-to-users] Various fields have been pluralised from "user" to "users".
1114
### Deprecated
1215
### Removed
1316
### Fixed
@@ -634,6 +637,9 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
634637
### Deprecated
635638
- Move `hideKeyboard` to `removeKeyboard`.
636639

640+
[unreleased-sql-migration]: https://github.com/php-telegram-bot/core/tree/develop/utils/db-schema-update/0.82.0-unreleased.sql
641+
[unreleased-bc-unreleased-bc-minimum-php-81]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#minimum-php-81
642+
[unreleased-bc-unreleased-bc-user-to-users]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#user-to-users
637643
[0.82.0-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.81.0-0.82.0.sql
638644
[0.81.0-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.80.0-0.81.0.sql
639645
[0.80.0-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.79.0-0.80.0.sql

README.md

+2-2
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.3-8892BF.svg)](https://php.net/)
21+
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D8.1-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
@@ -176,7 +176,7 @@ Create *composer.json* file
176176
"name": "yourproject/yourproject",
177177
"type": "project",
178178
"require": {
179-
"php": ">=7.3",
179+
"php": "^8.1",
180180
"longman/telegram-bot": "*"
181181
}
182182
}

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
}
3030
],
3131
"require": {
32-
"php": "^7.3|^8.0",
32+
"php": "^8.1",
3333
"ext-pdo": "*",
3434
"ext-curl": "*",
3535
"ext-json": "*",
@@ -64,7 +64,7 @@
6464
"XDEBUG_MODE=coverage \"vendor/bin/phpunit\" --coverage-clover clover.xml"
6565
],
6666
"test-cov-upload": [
67-
"wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover clover.xml"
67+
"@php ocular.phar code-coverage:upload --format=php-clover clover.xml"
6868
]
6969
},
7070
"config": {
@@ -75,7 +75,7 @@
7575
},
7676
"extra": {
7777
"branch-alias": {
78-
"dev-develop": "0.81.x-dev"
78+
"dev-develop": "0.83.x-dev"
7979
}
8080
}
8181
}

0 commit comments

Comments
 (0)