Skip to content

Commit

Permalink
Merge branch 'main' into metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
abraham committed Jul 24, 2023
2 parents dca93a7 + 233bd80 commit a87fea6
Show file tree
Hide file tree
Showing 37 changed files with 2,471 additions and 1,336 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Expand Up @@ -9,5 +9,6 @@
/phpmd.xml export-ignore
/phpunit.xml export-ignore
/README.md export-ignore
/rector.php export-ignore
/tests export-ignore
/.github export-ignore
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug, Triage
assignees: ''
---

<!-- DO NOT INCLUDE CONSUMER_SECRET OR ACCESS_TOKEN_SECRET -->

**What are you attempting to do**
A clear and concise description of what you are trying to do.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Actual behavior**
A clear and concise description of what is actually happening.

**Code example**

```php
// Include code that demonstrates the issue.
```

**Versions:**

- TwitterOAuth: [e.g. v3.3.0]
- PHP: v [e.g. v8.0]

**Additional context**
Add any other context about the problem here.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: Triage
assignees: ''
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
12 changes: 6 additions & 6 deletions .github/dependabot.yml
@@ -1,14 +1,14 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: weekly
- package-ecosystem: npm
directory: '/'
schedule:
interval: daily
time: '11:00'
open-pull-requests-limit: 10
interval: weekly
- package-ecosystem: composer
directory: '/'
schedule:
interval: daily
time: '11:00'
open-pull-requests-limit: 10
interval: weekly
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Expand Up @@ -4,9 +4,9 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 20
- run: npm ci
- run: npm run lint
5 changes: 3 additions & 2 deletions .github/workflows/test.yaml
Expand Up @@ -6,13 +6,14 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4', '8.0']
php-versions: ['8.0', '8.1']
name: PHP ${{ matrix.php-versions }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: soap
- run: composer validate --no-interaction --strict
- run: composer install --no-interaction --prefer-dist
- run: npm test
2 changes: 1 addition & 1 deletion .prettierrc.json
@@ -1,6 +1,6 @@
{
"singleQuote": true,
"phpVersion": "7.3",
"phpVersion": "8.0",
"trailingCommaPHP": true,
"braceStyle": "psr-2"
}
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Expand Up @@ -12,6 +12,7 @@ GitHub has [outlined instructions](https://help.github.com/articles/fork-a-repo/

- Fork the repo
- Make the changes
- Add tests
- Submit a pull request

Once the [pull request](https://help.github.com/articles/about-pull-requests/) is reviewed, if the changes are approved they will be merged in to the project.
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,4 +1,4 @@
<span itemprop="name">TwitterOAuth</span> [![Build Status](https://github.com/abraham/twitteroauth/workflows/Test/badge.svg)](https://github.com/abraham/twitteroauth/actions) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/abraham/twitteroauth/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/abraham/twitteroauth/?branch=master) [![Issues Count](https://img.shields.io/github/issues/abraham/twitteroauth.svg)](https://github.com/abraham/twitteroauth/issues) [![Latest Version](https://img.shields.io/packagist/v/abraham/twitteroauth.svg)](https://packagist.org/packages/abraham/twitteroauth) [![Downloads this Month](https://img.shields.io/packagist/dm/abraham/twitteroauth.svg)](https://packagist.org/packages/abraham/twitteroauth)
<span itemprop="name">TwitterOAuth</span> [![Build Status](https://github.com/abraham/twitteroauth/workflows/Test/badge.svg)](https://github.com/abraham/twitteroauth/actions) [![Issues Count](https://img.shields.io/github/issues/abraham/twitteroauth.svg)](https://github.com/abraham/twitteroauth/issues) [![Latest Version](https://img.shields.io/packagist/v/abraham/twitteroauth.svg)](https://packagist.org/packages/abraham/twitteroauth) [![Downloads this Month](https://img.shields.io/packagist/dm/abraham/twitteroauth.svg)](https://packagist.org/packages/abraham/twitteroauth)

---

Expand All @@ -8,4 +8,4 @@ See documentation at https://twitteroauth.com.

PHP versions [listed](https://secure.php.net/supported-versions.php) as "active support" or "security fixes only" are supported.

<img src="https://raw.githubusercontent.com/abraham/twitteroauth-com/master/images/twitter-logo-blue.png" itemprop="image" alt="Twitter bird" width="200px">
<img src="https://github.com/abraham/twitteroauth-com/blob/main/src/images/twitter-logo-blue.png?raw=true" itemprop="image" alt="Twitter bird" width="200px">
11 changes: 4 additions & 7 deletions composer.json
Expand Up @@ -26,26 +26,23 @@
"issues": "https://github.com/abraham/twitteroauth/issues"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/morozov/php-vcr"
},
{
"type": "git",
"url": "https://github.com/abraham/phpunit-testlistener-vcr"
}
],
"require": {
"php": "^7.3 || ^7.4 || ^8.0",
"php": "^8.0 || ^8.1",
"ext-curl": "*",
"composer/ca-bundle": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "^8 || ^9",
"phpunit/phpunit": "^9",
"squizlabs/php_codesniffer": "^3",
"phpmd/phpmd": "^2",
"php-vcr/php-vcr": "^1",
"php-vcr/phpunit-testlistener-vcr": "dev-php-8"
"php-vcr/phpunit-testlistener-vcr": "dev-php8",
"rector/rector": "^0.15.7"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit a87fea6

Please sign in to comment.