Skip to content

Commit d14fc93

Browse files
noplanmannoplanman
committed
Merge branch 'develop' into 955-bot_api_4.3
2 parents 7529fc4 + 2e57ef0 commit d14fc93

File tree

129 files changed

+901
-1270
lines changed

Some content is hidden

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

129 files changed

+901
-1270
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ charset = utf-8
77
indent_style = space
88
indent_size = 4
99
trim_trailing_whitespace = true
10+
11+
[*.{yml, yaml}]
12+
indent_size = 2

‎.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.* export-ignore
2+
/composer.lock export-ignore
3+
/phpcs.xml.dist export-ignore
4+
/phpunit.xml.dist export-ignore
5+
/tests export-ignore

‎.github/FUNDING.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tidelift: packagist/longman%2Ftelegram-bot
2+
patreon: phptelegrambot
3+
liberapay: PHP-Telegram-Bot
4+
open_collective: php-telegram-bot
5+
ko_fi: phptelegrambot
6+
custom: https://github.com/php-telegram-bot/core#donate

‎.github/ISSUE_TEMPLATE.md

-26
This file was deleted.

‎.github/ISSUE_TEMPLATE/BC_Break.md

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: 💥 BC Break
3+
about: Have you encountered an issue during an upgrade? 💣
4+
---
5+
6+
<!--
7+
Before reporting a BC break, please consult the changelog and wiki entry for the particular version to make sure it's not an expected change:
8+
- https://github.com/php-telegram-bot/core/blob/master/CHANGELOG.md
9+
- https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility
10+
-->
11+
12+
### BC Break Report
13+
14+
<--
15+
❗ NEVER put your Telegram API key or any other private details here. (like passwords, user IDs, etc.)
16+
Substitute them like <API_KEY> or <USER_ID> etc.
17+
-->
18+
19+
#### Required Information
20+
21+
<!-- Fill in the relevant information below to help triage your pull request. -->
22+
<!-- Please enter exact version numbers, not just "latest" etc.! -->
23+
24+
| ? | !
25+
| --- | ---
26+
| Operating system | Name and version
27+
| PHP Telegram Bot version | x.y.z
28+
| PHP version | x.y.z
29+
| MySQL version | x.y.z / none
30+
| Update Method | Webhook / getUpdates
31+
| Self-signed certificate | yes / no
32+
| RAW update (if available) | `{...}`
33+
34+
#### Summary
35+
36+
<!-- Provide a summary describing the problem you are experiencing. -->
37+
38+
#### Previous behaviour
39+
40+
<!-- What was the previous (working) behaviour? -->
41+
42+
#### Current behaviour
43+
44+
<!-- What is the current (broken) behaviour? -->
45+
46+
#### How to reproduce
47+
48+
<!--
49+
Provide steps to reproduce the bug.
50+
If possible, also add any relevant code snippet.
51+
-->
52+
53+
#### Expected behaviour
54+
55+
<!-- What was the expected (correct) behaviour? -->

‎.github/ISSUE_TEMPLATE/Bug.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: 🐞 Bug Report
3+
about: Something is broken? 🔨
4+
---
5+
6+
### Bug Report
7+
8+
<--
9+
❗ NEVER put your Telegram API key or any other private details here. (like passwords, user IDs, etc.)
10+
Substitute them like <API_KEY> or <USER_ID> etc.
11+
-->
12+
13+
#### Required Information
14+
15+
<!-- Fill in the relevant information below to help triage your pull request. -->
16+
<!-- Please enter exact version numbers, not just "latest" etc.! -->
17+
18+
| ? | !
19+
| --- | ---
20+
| Operating system | Name and version
21+
| PHP Telegram Bot version | x.y.z
22+
| PHP version | x.y.z
23+
| MySQL version | x.y.z / none
24+
| Update Method | Webhook / getUpdates
25+
| Self-signed certificate | yes / no
26+
| RAW update (if available) | `{...}`
27+
28+
#### Summary
29+
30+
<!-- Provide a summary describing the problem you are experiencing. -->
31+
32+
### Current behaviour
33+
34+
<!-- What is the current (buggy) behaviour? -->
35+
36+
#### How to reproduce
37+
38+
<!--
39+
Provide steps to reproduce the bug.
40+
If possible, also add any relevant code snippet.
41+
-->
42+
43+
#### Expected behaviour
44+
45+
<!-- What was the expected (correct) behaviour? -->

‎.github/ISSUE_TEMPLATE/Feature_Request.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: 🎉 Feature Request
3+
about: You have a neat idea that should be implemented? 🎩
4+
---
5+
6+
### Feature Request
7+
8+
#### Summary
9+
10+
<!-- Provide a summary of the feature you would like to see implemented. -->

‎.github/ISSUE_TEMPLATE/Support_Question.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
name: ❓ Support Question
3+
about: Have a problem that you can't figure out? 🤔
4+
---
5+
6+
### Support Question
7+
8+
<!--
9+
Before asking a question here, please try asking in the support group first.
10+
https://telegram.me/PHP_Telegram_Bot_Support
11+
12+
Keep in mind that GitHub is primarily an issue tracker.
13+
-->
14+
15+
<--
16+
❗ NEVER put your Telegram API key or any other private details here. (like passwords, user IDs, etc.)
17+
Substitute them like <API_KEY> or <USER_ID> etc.
18+
-->
19+
20+
#### Required Information
21+
22+
<!-- Fill in the relevant information below to help triage your pull request. -->
23+
<!-- Please enter exact version numbers, not just "latest" etc.! -->
24+
25+
| ? | !
26+
| --- | ---
27+
| Operating system | Name and version
28+
| PHP Telegram Bot version | x.y.z
29+
| PHP version | x.y.z
30+
| MySQL version | x.y.z / none
31+
| Update Method | Webhook / getUpdates
32+
| Self-signed certificate | yes / no
33+
| RAW update (if available) | `{...}`
34+
35+
#### Summary
36+
37+
<!-- Describe the issue you are facing here. -->

‎.github/PULL_REQUEST_TEMPLATE.md

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
<!-- Important: If this pull request is not related to any issue and contains a new feature, please create an issue first for discussion. -->
1+
<!--
2+
Important:
3+
If this pull request is not related to any issue and contains a new feature, please create an issue first for discussion.
4+
https://github.com/php-telegram-bot/core/issues/new?template=Feature_Request.md
25
3-
<!-- Make sure this pull request is pointed towards the "develop" branch and refers to any issue that it's related to! -->
6+
Make sure this pull request is pointed towards the "develop" branch and refers to any issue that it's related to!
7+
-->
48

5-
<!-- Explain in detail what this pull request contains. -->
9+
<!-- Fill in the relevant information below to help triage your pull request. -->
10+
11+
| ? | !
12+
|--- | ---
13+
| Type | bug / feature / improvement
14+
| BC Break | yes / no
15+
| Fixed issues | <!-- use #NUM format to reference an issue -->
16+
17+
#### Summary
18+
19+
<!-- Provide a summary of your change. -->

‎.gitignore

+8-16
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,20 @@
55
.DS_Store
66
.idea
77
.phpintel
8-
composer.phar
9-
10-
# Local System Files (i.e. cache, logs, etc.) #
11-
/cache
12-
/build/logs
13-
/build/coverage
14-
/tmp
15-
16-
# Test Related Files #
17-
/phpunit.xml
18-
19-
#Exception output
20-
TelegramException.log
218

229
# Composer
23-
vendor/
10+
/composer.phar
11+
/vendor
2412

13+
# Test-Related Files
14+
/clover.xml
15+
/phpcs.xml
16+
/phpunit.xml
2517

26-
# phpDocumentor Logs #
18+
# phpDocumentor Logs
2719
phpdoc-*
2820

29-
# OSX #
21+
# OSX
3022
._*
3123
.Spotlight-V100
3224
.Trashes

‎.scrutinizer.yml

+36-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,41 @@
1+
build:
2+
nodes:
3+
analysis:
4+
tests:
5+
override:
6+
- php-scrutinizer-run
7+
18
filter:
2-
paths: [src/*]
9+
paths:
10+
- src/
11+
dependency_paths:
12+
- lib/
313

414
checks:
5-
php:
6-
remove_extra_empty_lines: true
7-
remove_php_closing_tag: true
8-
remove_trailing_whitespace: true
9-
fix_use_statements:
10-
remove_unused: true
11-
preserve_multiple: false
12-
preserve_blanklines: true
13-
order_alphabetically: true
14-
fix_php_opening_tag: true
15-
fix_linefeed: true
16-
fix_line_ending: true
17-
fix_identation_4spaces: true
18-
fix_doc_comments: true
15+
php:
16+
check_method_contracts:
17+
verify_interface_like_constraints: true
18+
verify_documented_constraints: true
19+
verify_parent_constraints: true
20+
fix_doc_comments: true
21+
fix_identation_4spaces: true
22+
fix_line_ending: true
23+
fix_linefeed: true
24+
fix_php_opening_tag: true
25+
fix_use_statements:
26+
remove_unused: true
27+
preserve_multiple: false
28+
preserve_blanklines: true
29+
order_alphabetically: true
30+
more_specific_types_in_doc_comments: true
31+
no_goto: true
32+
param_doc_comment_if_not_inferrable: true
33+
parameter_doc_comments: true
34+
remove_extra_empty_lines: true
35+
return_doc_comment_if_not_inferrable: true
36+
return_doc_comments: true
37+
simplify_boolean_return: true
1938

2039
tools:
21-
external_code_coverage:
22-
timeout: 120
40+
external_code_coverage:
41+
timeout: 300

‎.travis.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
dist: trusty
2-
sudo: required
31
language: php
2+
sudo: required
3+
dist: trusty
44

55
addons:
66
mariadb: 10.1
77

88
cache:
99
directories:
10-
- "$HOME/.composer/cache"
10+
- vendor
11+
- $HOME/.composer/cache
1112

1213
php:
13-
- 5.5
14-
- 5.6
15-
- 7.0
16-
- 7.1
17-
- 7.2
1814
- 7.3
15+
- 7.2
16+
- 7.1
17+
- 7.0
18+
- 5.6
19+
- 5.5
1920
- nightly
2021
- hhvm
2122

@@ -44,7 +45,7 @@ before_script:
4445

4546
script:
4647
- composer check-code
47-
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ] ; then composer test-cov; else composer test; fi
48+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov; else composer test; fi
4849

4950
after_script:
50-
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then composer test-cov-upload; fi
51+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov-upload; fi

0 commit comments

Comments
 (0)