Skip to content

Commit f5cda73

Browse files
abrahamabraham
committed
Merge branch 'main' into v1
2 parents d54b71c + 49a04e1 commit f5cda73

Some content is hidden

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

63 files changed

+7388
-3830
lines changed

‎.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: daily
7+
time: '11:00'
8+
open-pull-requests-limit: 10
9+
- package-ecosystem: composer
10+
directory: '/'
11+
schedule:
12+
interval: daily
13+
time: '11:00'
14+
open-pull-requests-limit: 10

‎.github/workflows/lint.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Lint
2+
on: push
3+
jobs:
4+
lint:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-node@v1
9+
with:
10+
node-version: 12
11+
- run: npm ci
12+
- run: npm run lint

‎.github/workflows/test.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Test
2+
on: push
3+
jobs:
4+
run:
5+
runs-on: ubuntu-latest
6+
strategy:
7+
fail-fast: false
8+
matrix:
9+
php-versions: ['7.2', '7.3', '7.4']
10+
name: PHP ${{ matrix.php-versions }}
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: shivammathur/setup-php@v2
14+
with:
15+
php-version: ${{ matrix.php-versions }}
16+
- run: composer validate --no-interaction --strict
17+
- run: composer install --no-interaction --prefer-dist
18+
- run: npm test

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.DS_Store
2-
composer.lock
32
vendor
43
env
5-
.cache
4+
*.cache
5+
node_modules

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
vendor
2+
composer.lock
3+
tests/fixtures

‎.prettierrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"phpVersion": "7.2",
4+
"trailingCommaPHP": true,
5+
"braceStyle": "psr-2"
6+
}

‎.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
11+
- Using welcoming and inclusive language
12+
- Being respectful of differing viewpoints and experiences
13+
- Gracefully accepting constructive criticism
14+
- Focusing on what is best for the community
15+
- Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
19+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
- Trolling, insulting/derogatory comments, and personal or political attacks
21+
- Public or private harassment
22+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
- Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

‎CONTRIBUTING.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
Contributing to TwitterOAuth
2-
====
1+
# Contributing to TwitterOAuth
32

4-
👏 Thanks!
5-
----
3+
## 👏 Thanks!
64

75
Thanks for your interest in contributing to TwitterOAuth. We appreciate contributions small and large.
86

9-
🌱 Grow
10-
----
7+
## 🌱 Grow
118

129
If you have an idea for something new or would like to improve something. Please [open a quick issue](https://github.com/abraham/twitteroauth/issues/new) explaining the changes and the reasons for them. Everyone's time is important and we don't want you duplicating work someone else might already be working on.
1310

@@ -19,7 +16,6 @@ GitHub has [outlined instructions](https://help.github.com/articles/fork-a-repo/
1916

2017
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.
2118

22-
🐛 Bugs
23-
----
19+
## 🐛 Bugs
2420

2521
Please [open a new issue](https://github.com/abraham/twitteroauth/issues/new) and details what you are trying to do, what is happening, and what you expect to happen. Err on the side of providing more details.

‎LICENSE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2009 Abraham Williams - http://abrah.am - [email protected]
2-
2+
33
Permission is hereby granted, free of charge, to any person
44
obtaining a copy of this software and associated documentation
55
files (the "Software"), to deal in the Software without
@@ -8,10 +8,10 @@ copy, modify, merge, publish, distribute, sublicense, and/or sell
88
copies of the Software, and to permit persons to whom the
99
Software is furnished to do so, subject to the following
1010
conditions:
11-
11+
1212
The above copyright notice and this permission notice shall be
1313
included in all copies or substantial portions of the Software.
14-
14+
1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1616
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1717
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<span itemprop="name">TwitterOAuth</span> [![Build Status](https://img.shields.io/travis/abraham/twitteroauth.svg)](https://travis-ci.org/abraham/twitteroauth) [![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)
1+
<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)
22

3-
------------
3+
---
44

55
<p itemprop="description">The most popular PHP library for Twitter's OAuth REST API.</p>
66

77
See documentation at https://twitteroauth.com.
88

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

11-
<img src="https://raw.githubusercontent.com/abraham/twitteroauth-demo/master/images/twitter-logo-blue.png" itemprop="image" alt="Twitter bird" width="200px">
11+
<img src="https://raw.githubusercontent.com/abraham/twitteroauth-com/master/images/twitter-logo-blue.png" itemprop="image" alt="Twitter bird" width="200px">

‎autoload.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* @return void
88
*/
99
spl_autoload_register(function ($class) {
10-
1110
// project-specific namespace prefix
1211
$prefix = 'Abraham\\TwitterOAuth\\';
1312

‎composer.json

Lines changed: 48 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,51 @@
11
{
2-
"name": "abraham/twitteroauth",
3-
"type": "library",
4-
"description": "The most popular PHP library for use with the Twitter OAuth REST API.",
5-
"keywords": ["twitter", "api", "oauth", "rest", "social", "twitter api", "twitter oauth"],
6-
"license": "MIT",
7-
"homepage": "https://twitteroauth.com",
8-
"authors": [
9-
{
10-
"name": "Abraham Williams",
11-
"email": "[email protected]",
12-
"homepage": "https://abrah.am",
13-
"role": "Developer"
14-
}
15-
],
16-
"support": {
17-
"source": "https://github.com/abraham/twitteroauth",
18-
"issues": "https://github.com/abraham/twitteroauth/issues"
19-
},
20-
"require": {
21-
"php": "^7.2 || ^7.3",
22-
"ext-curl": "*"
23-
},
24-
"require-dev": {
25-
"phpunit/phpunit": "~5.7",
26-
"squizlabs/php_codesniffer": "~3.0",
27-
"phpmd/phpmd": "~2.6"
28-
},
29-
"autoload": {
30-
"psr-4": {
31-
"Abraham\\TwitterOAuth\\": "src"
32-
}
2+
"name": "abraham/twitteroauth",
3+
"type": "library",
4+
"description": "The most popular PHP library for use with the Twitter OAuth REST API.",
5+
"keywords": [
6+
"twitter",
7+
"api",
8+
"oauth",
9+
"rest",
10+
"social",
11+
"twitter api",
12+
"twitter oauth"
13+
],
14+
"license": "MIT",
15+
"homepage": "https://twitteroauth.com",
16+
"authors": [
17+
{
18+
"name": "Abraham Williams",
19+
"email": "[email protected]",
20+
"homepage": "https://abrah.am",
21+
"role": "Developer"
3322
}
23+
],
24+
"support": {
25+
"source": "https://github.com/abraham/twitteroauth",
26+
"issues": "https://github.com/abraham/twitteroauth/issues"
27+
},
28+
"repositories": [
29+
{
30+
"type": "git",
31+
"url": "https://github.com/morozov/php-vcr"
32+
}
33+
],
34+
"require": {
35+
"php": "^7.2 || ^7.3 || ^7.4",
36+
"ext-curl": "*",
37+
"composer/ca-bundle": "^1.2"
38+
},
39+
"require-dev": {
40+
"phpunit/phpunit": "^8",
41+
"squizlabs/php_codesniffer": "^3",
42+
"phpmd/phpmd": "^2",
43+
"php-vcr/php-vcr": "^1",
44+
"php-vcr/phpunit-testlistener-vcr": "^3"
45+
},
46+
"autoload": {
47+
"psr-4": {
48+
"Abraham\\TwitterOAuth\\": "src"
49+
}
50+
}
3451
}

0 commit comments

Comments
 (0)