Skip to content

Commit

Permalink
Merge pull request #1459 from php-telegram-bot/api-7.0
Browse files Browse the repository at this point in the history
Bot API 7.0
  • Loading branch information
noplanman authored May 24, 2024
2 parents 57a649c + 6071bb9 commit a019962
Show file tree
Hide file tree
Showing 55 changed files with 1,497 additions and 196 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
php: ['8.1', '8.2', '8.3']

services:
mariadb:
Expand Down Expand Up @@ -70,11 +70,15 @@ jobs:
run: composer check-code

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

- name: Run test suite (with coverage)
if: ${{ matrix.php == '7.3'}}
run: |
composer test-cov
composer test-cov-upload
# - name: Run test suite
# if: ${{ matrix.php != '8.1'}}
# run: composer test-cov

# - name: Run test suite (with coverage)
# if: ${{ matrix.php == '8.1'}}
# run: |
# wget https://scrutinizer-ci.com/ocular.phar
# composer test-cov
# composer test-cov-upload
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
environment:
php: 7.3.0
php: 8.1.0
nodes:
analysis:
tests:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c

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

[unreleased-sql-migration]: https://github.com/php-telegram-bot/core/tree/develop/utils/db-schema-update/0.82.0-unreleased.sql
[unreleased-bc-unreleased-bc-minimum-php-81]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#minimum-php-81
[unreleased-bc-unreleased-bc-user-to-users]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#user-to-users
[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
[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
[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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ A Telegram Bot based on the official [Telegram Bot API]
[![Dependencies](https://tidelift.com/badges/github/php-telegram-bot/core?style=flat)][Tidelift]
[![Total Downloads](https://img.shields.io/packagist/dt/longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
[![Downloads Month](https://img.shields.io/packagist/dm/longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D7.3-8892BF.svg)](https://php.net/)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D8.1-8892BF.svg)](https://php.net/)
[![License](https://img.shields.io/packagist/l/longman/telegram-bot.svg)](https://github.com/php-telegram-bot/core/LICENSE)

## Table of Contents
Expand Down Expand Up @@ -176,7 +176,7 @@ Create *composer.json* file
"name": "yourproject/yourproject",
"type": "project",
"require": {
"php": ">=7.3",
"php": "^8.1",
"longman/telegram-bot": "*"
}
}
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
],
"require": {
"php": "^7.3|^8.0",
"php": "^8.1",
"ext-pdo": "*",
"ext-curl": "*",
"ext-json": "*",
Expand Down Expand Up @@ -64,7 +64,7 @@
"XDEBUG_MODE=coverage \"vendor/bin/phpunit\" --coverage-clover clover.xml"
],
"test-cov-upload": [
"wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover clover.xml"
"@php ocular.phar code-coverage:upload --format=php-clover clover.xml"
]
},
"config": {
Expand All @@ -75,7 +75,7 @@
},
"extra": {
"branch-alias": {
"dev-develop": "0.81.x-dev"
"dev-develop": "0.83.x-dev"
}
}
}
Loading

0 comments on commit a019962

Please sign in to comment.