Skip to content

Commit 3161b58

Browse files
noplanmannoplanman
authored
Merge branch 'develop' into remove_botan
2 parents d606f27 + 7800b3c commit 3161b58

19 files changed

+410
-112
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
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‎

Lines changed: 5 additions & 0 deletions
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‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tidelift: packagist/php-telegram-bot%2Ftelegram-bot-manager
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/telegram-bot-manager#donate

‎.github/ISSUE_TEMPLATE/BC_Break.md‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
name: 💥 BC Break
3+
about: Have you encountered an issue during an upgrade? 💣
4+
labels: bc break
5+
---
6+
7+
<!--
8+
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:
9+
- https://github.com/php-telegram-bot/telegram-bot-manager/blob/master/CHANGELOG.md
10+
- https://github.com/php-telegram-bot/telegram-bot-manager/wiki/Breaking-backwards-compatibility
11+
-->
12+
13+
### BC Break Report
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 Manager version | x.y.z
29+
| PHP Telegram Bot version | x.y.z
30+
| PHP version | x.y.z
31+
| MySQL version | x.y.z / none
32+
| Update Method | Webhook / getUpdates
33+
| Self-signed certificate | yes / no
34+
| RAW update (if available) | `{...}`
35+
36+
#### Summary
37+
38+
<!-- Provide a summary describing the problem you are experiencing. -->
39+
40+
#### Previous behaviour
41+
42+
<!-- What was the previous (working) behaviour? -->
43+
44+
#### Current behaviour
45+
46+
<!-- What is the current (broken) behaviour? -->
47+
48+
#### How to reproduce
49+
50+
<!--
51+
Provide steps to reproduce the bug.
52+
If possible, also add any relevant code snippet.
53+
-->
54+
55+
#### Expected behaviour
56+
57+
<!-- What was the expected (correct) behaviour? -->

‎.github/ISSUE_TEMPLATE/Bug.md‎

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

‎.github/ISSUE_TEMPLATE/Feature_Request.md‎

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

‎.github/ISSUE_TEMPLATE/Support_Question.md‎

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

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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/telegram-bot-manager/issues/new?template=Feature_Request.md
5+
6+
Make sure this pull request is pointed towards the "develop" branch and refers to any issue that it's related to!
7+
-->
8+
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‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1-
composer.phar
2-
/vendor/
3-
phpunit.xml
1+
# Composer
2+
/composer.phar
3+
/vendor
4+
5+
# Test-Related Files
6+
/clover.xml
7+
/phpcs.xml
8+
/phpunit.xml
9+
10+
# phpDocumentor Logs
11+
phpdoc-*
12+
13+
# IDE & System-Related Files
14+
.buildpath
15+
.project
16+
.settings
17+
.idea
18+
.phpintel
19+
._*
20+
.DS_Store
21+
.Spotlight-V100
22+
.Trashes

‎.scrutinizer.yml‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
1+
build:
2+
nodes:
3+
analysis:
4+
tests:
5+
override:
6+
- php-scrutinizer-run
7+
18
filter:
2-
excluded_paths: [tests/*]
9+
paths:
10+
- src/
311

412
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
13+
php:
14+
check_method_contracts:
15+
verify_interface_like_constraints: true
16+
verify_documented_constraints: true
17+
verify_parent_constraints: true
18+
fix_doc_comments: true
19+
fix_identation_4spaces: true
20+
fix_line_ending: true
21+
fix_linefeed: true
22+
fix_php_opening_tag: true
23+
fix_use_statements:
24+
remove_unused: true
25+
preserve_multiple: false
26+
preserve_blanklines: true
27+
order_alphabetically: true
28+
more_specific_types_in_doc_comments: true
29+
no_goto: true
30+
param_doc_comment_if_not_inferrable: true
31+
parameter_doc_comments: true
32+
remove_extra_empty_lines: true
33+
return_doc_comment_if_not_inferrable: true
34+
return_doc_comments: true
35+
simplify_boolean_return: true

0 commit comments

Comments
 (0)