Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4f32ded

Browse files
Merge pull request sendgrid#828 from sendgrid/twilio
Update Twilio branding, CLA policy
2 parents f58bb7b + ce689c2 commit 4f32ded

Some content is hidden

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

69 files changed

+377
-314
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--
22
We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.
33

4+
**All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.**
45

56
Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
67
e.g.
@@ -10,6 +11,7 @@ Closes #2
1011
# Fixes #
1112

1213
### Checklist
14+
- [ ] I acknowledge that all my contributions will be made under the project's license
1315
- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
1416
- [ ] I have read the [Contribution Guide] and my PR follows them.
1517
- [ ] I updated my branch with the development branch.
@@ -21,4 +23,4 @@ Closes #2
2123
-
2224
-
2325

24-
If you have questions, please send an email to [Sendgrid](mailto:[email protected]), or file a Github Issue in this repository.
26+
If you have questions, please send an email to [Twilio Sendgrid](mailto:[email protected]), or file a Github Issue in this repository.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ test/prism/*
1616
prism*
1717
temp.php
1818
example*.php
19-
TODO.txt
19+
TODO.txt

CODE_OF_CONDUCT.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
1-
# SendGrid Community Code of Conduct
1+
# Twilio SendGrid Community Code of Conduct
22

3-
The SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.
3+
The Twilio SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.
44

55
### Be Open
66
Members of the community are open to collaboration, whether it's on pull requests, code reviews, approvals, issues or otherwise. We're receptive to constructive comments and criticism, as the experiences and skill sets of all members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate, and everyone can make a difference.
77

88
### Be Considerate
9-
Members of the community are considerate of their peers, which include other contributors and users of SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
9+
Members of the community are considerate of their peers, which include other contributors and users of Twilio SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
1010

1111
### Be Respectful
12-
Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments and their efforts. We're respectful of the volunteer efforts that permeate the SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues. Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
12+
Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments and their efforts. We're respectful of the volunteer efforts that permeate the Twilio SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues. Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
1313

1414
## Additional Guidance
1515

1616
### Disclose Potential Conflicts of Interest
1717
Community discussions often involve interested parties. We expect participants to be aware when they are conflicted due to employment or other projects they are involved in and disclose those interests to other project members. When in doubt, over-disclose. Perceived conflicts of interest are important to address so that the community’s decisions are credible even when unpopular, difficult or favorable to the interests of one group over another.
1818

1919
### Interpretation
20-
This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter. When in doubt, try to abide by [SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.
20+
This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter. When in doubt, try to abide by [Twilio SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.
2121

2222
### Enforcement
23-
Most members of the SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
23+
Most members of the Twilio SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
2424

2525
## If you have concerns about someone’s conduct
2626
**Initiate Direct Contact** - It is always appropriate to email a community member (if contact information is available), mention that you think their behavior was out of line, and (if necessary) point them to this Code.
2727

2828
**Discuss Publicly** - Discussing publicly is always acceptable. Note, though, that approaching the person directly may be better, as it tends to make them less defensive, and it respects the time of other community members, so you probably want to try direct contact first.
2929

30-
**Contact the Moderators** - You can reach the SendGrid moderators by emailing [email protected].
31-
32-
## Submission to SendGrid Repositories
33-
Finally, just a reminder, changes to the SendGrid repositories will only be accepted upon completion of the [SendGrid Contributor Agreement](https://cla.sendgrid.com).
30+
**Contact the Moderators** - You can reach the Twilio SendGrid moderators by emailing [email protected].
3431

3532
## Attribution
3633

37-
SendGrid thanks the following, on which it draws for content and inspiration:
34+
Twilio SendGrid thanks the following, on which it draws for content and inspiration:
3835

3936
* [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/)
4037
* [Open Source Initiative General Code of Conduct](https://opensource.org/codeofconduct)

CONTRIBUTING.md

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
1-
Hello! Thank you for choosing to help contribute to one of the SendGrid open source libraries. There are many ways you can contribute and help is always welcome. We simply ask that you follow the following contribution policies.
1+
Hello! Thank you for choosing to help contribute to one of the Twilio SendGrid open source libraries. There are many ways you can contribute and help is always welcome. We simply ask that you follow the following contribution policies.
2+
3+
All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.
24

3-
- [CLAs and CCLAs](#cla)
4-
- [Roadmap & Milestones](#roadmap)
55
- [Feature Request](#feature-request)
66
- [Submit a Bug Report](#submit-a-bug-report)
7+
- [Please use our Bug Report Template](#please-use-our-bug-report-template)
78
- [Improvements to the Codebase](#improvements-to-the-codebase)
8-
- [Understanding the Code Base](#understanding-the-codebase)
9+
- [Development Environment](#development-environment)
10+
- [Install and Run Locally](#install-and-run-locally)
11+
- [Prerequisites](#prerequisites)
12+
- [Initial setup:](#initial-setup)
13+
- [Environment Variables](#environment-variables)
14+
- [Execute:](#execute)
15+
- [Understanding the Code Base](#understanding-the-code-base)
916
- [Testing](#testing)
10-
- [Style Guidelines & Naming Conventions](#style-guidelines-and-naming-conventions)
11-
- [Creating a Pull Request](#creating-a-pull-request)
17+
- [Style Guidelines & Naming Conventions](#style-guidelines--naming-conventions)
18+
- [Creating a Pull Request<a name="creating_a_pull_request"></a>](#creating-a-pull-requesta-name%22creatingapullrequest%22a)
1219
- [Code Reviews](#code-reviews)
1320

1421
<a name="roadmap"></a>
1522
We use [Milestones](https://github.com/sendgrid/sendgrid-php/milestones) to help define current roadmaps, please feel free to grab an issue from the current milestone. Please indicate that you have begun work on it to avoid collisions. Once a PR is made, community review, comments, suggestions and additional PRs are welcomed and encouraged.
1623

17-
<a name="cla"></a>
18-
## CLAs and CCLAs
19-
20-
Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) be filled out by every contributor to a SendGrid open source project.
21-
22-
Our goal with the CLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions. The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution. In this way the CLA encourages broad participation by our open source community and helps us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
23-
24-
SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA. Copies of the CLA are available [here](https://gist.github.com/SendGridDX/98b42c0a5d500058357b80278fde3be8#file-sendgrid_cla).
25-
26-
When you create a Pull Request, after a few seconds, a comment will appear with a link to the CLA. Click the link and fill out the brief form and then click the "I agree" button and you are all set. You will not be asked to re-sign the CLA unless we make a change.
27-
2824
There are a few ways to contribute, which we'll enumerate below:
2925

3026
<a name="feature-request"></a>
@@ -79,7 +75,7 @@ composer install
7975

8076
### Environment Variables
8177

82-
First, get your free SendGrid account [here](https://sendgrid.com/free?source=sendgrid-php).
78+
First, get your free Twilio SendGrid account [here](https://sendgrid.com/free?source=sendgrid-php).
8379

8480
Next, update your environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys).
8581

@@ -116,7 +112,7 @@ Unit tests for the HTTP client.
116112

117113
**/lib**
118114

119-
The interface to the SendGrid API. The subfolders are helpers.
115+
The interface to the Twilio SendGrid API. The subfolders are helpers.
120116

121117
<a name="testing"></a>
122118
## Testing

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2012-2018 SendGrid, Inc.
3+
Copyright (c) 2012-19 Twilio SendGrid, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![SendGrid Logo](https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)
1+
![SendGrid Logo](https://github.com/sendgrid/sendgrid-python/raw/master/twilio_sendgrid_logo.png)
22

33
[![BuildStatus](https://travis-ci.org/sendgrid/sendgrid-php.svg?branch=master)](https://travis-ci.org/sendgrid/sendgrid-php)
44
[![Packagist](https://img.shields.io/packagist/v/sendgrid/sendgrid.svg)](https://packagist.org/packages/sendgrid/sendgrid)
@@ -9,13 +9,15 @@
99
[![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-php.svg)](https://github.com/sendgrid/sendgrid-php/graphs/contributors)
1010
[![Open Source Helpers](https://www.codetriage.com/sendgrid/sendgrid-php/badges/users.svg)](https://www.codetriage.com/sendgrid/sendgrid-php)
1111

12-
**NEW:** Subscribe to email [notifications](https://dx.sendgrid.com/newsletter/php) for releases and breaking changes.
12+
**NEW:**
13+
- Subscribe to email [notifications](https://dx.sendgrid.com/newsletter/php) for releases and breaking changes.
14+
- Send SMS messages with [Twilio](https://github.com/sendgrid/sendgrid-php/blob/master/USE_CASES.md#sms).
1315

14-
**This library allows you to quickly and easily use the SendGrid Web API v3 via PHP.**
16+
**This library allows you to quickly and easily use the Twilio SendGrid Web API v3 via PHP.**
1517

16-
Version 7.X.X of this library provides full support for all SendGrid [Web API v3](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html) endpoints, including the new [v3 /mail/send](https://sendgrid.com/blog/introducing-v3mailsend-sendgrids-new-mail-endpoint).
18+
Version 7.X.X of this library provides full support for all Twilio SendGrid [Web API v3](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html) endpoints, including the new [v3 /mail/send](https://sendgrid.com/blog/introducing-v3mailsend-sendgrids-new-mail-endpoint).
1719

18-
We want this library to be community driven and SendGrid led. Your help is needed to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/sendgrid/sendgrid-php/issues) and [pull requests](https://github.com/sendgrid/sendgrid-php/blob/master/CONTRIBUTING.md) or simply upvote or comment on existing issues or pull requests.
20+
We want this library to be community driven and Twilio SendGrid led. Your help is needed to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/sendgrid/sendgrid-php/issues) and [pull requests](https://github.com/sendgrid/sendgrid-php/blob/master/CONTRIBUTING.md) or simply upvote or comment on existing issues or pull requests.
1921

2022
Please browse the rest of this README for further details.
2123

@@ -40,7 +42,8 @@ We appreciate your continued support, thank you!
4042
## Prerequisites
4143

4244
- PHP version 5.6, 7.0, 7.1 or 7.2
43-
- The SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-php) to send up to 40,000 emails for the first 30 days, then send 100 emails/day free forever or check out [our pricing](https://sendgrid.com/pricing?source=sendgrid-php).
45+
- The Twilio SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-php) to send up to 40,000 emails for the first 30 days, then send 100 emails/day free forever or check out [our pricing](https://sendgrid.com/pricing?source=sendgrid-php).
46+
- For SMS messages, you will need a free [Twilio account](https://www.twilio.com/try-twilio?source=sendgrid-php).
4447

4548
## Setup Environment Variables
4649

@@ -58,7 +61,7 @@ source ./.env
5861

5962
## Install Package
6063

61-
Add SendGrid to your `composer.json` file. If you are not using [Composer](http://getcomposer.org), we highly recommend it. It's an excellent way to manage dependencies in your PHP application.
64+
Add Twilio SendGrid to your `composer.json` file. If you are not using [Composer](http://getcomposer.org), we highly recommend it. It's an excellent way to manage dependencies in your PHP application.
6265

6366
```json
6467
{
@@ -78,7 +81,7 @@ Previous versions of the library can be found in the [version index](https://sen
7881

7982
## Dependencies
8083

81-
- The SendGrid Service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-php)
84+
- The Twilio SendGrid Service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-php)
8285
- The dependency free [php-http-client](https://github.com/sendgrid/php-http-client)
8386

8487
<a name="quick-start"></a>
@@ -101,7 +104,7 @@ require 'vendor/autoload.php'; // If you're using Composer (recommended)
101104

102105
$email = new \SendGrid\Mail\Mail();
103106
$email->setFrom("[email protected]", "Example User");
104-
$email->setSubject("Sending with SendGrid is Fun");
107+
$email->setSubject("Sending with Twilio SendGrid is Fun");
105108
$email->addTo("[email protected]", "Example User");
106109
$email->addContent("text/plain", "and easy to do anywhere, even with PHP");
107110
$email->addContent(
@@ -182,7 +185,7 @@ try {
182185
<a name="usage"></a>
183186
# Usage
184187

185-
- [SendGrid Docs](https://sendgrid.com/docs/API_Reference/index.html)
188+
- [Twilio SendGrid Docs](https://sendgrid.com/docs/API_Reference/index.html)
186189
- [Generic Library Usage
187190
Documentation](https://github.com/sendgrid/sendgrid-php/tree/master/USAGE.md)
188191
- [Example Code](https://github.com/sendgrid/sendgrid-php/blob/master/USE_CASES.md)
@@ -220,9 +223,9 @@ Please see our [troubleshooting guide](https://github.com/sendgrid/sendgrid-php/
220223
<a name="about"></a>
221224
# About
222225

223-
sendgrid-php is guided and supported by the SendGrid [Developer Experience Team](mailto:[email protected]).
226+
sendgrid-php is guided and supported by the Twilio [Developer Experience Team](mailto:[email protected]).
224227

225-
sendgrid-php is maintained and funded by SendGrid, Inc. The names and logos for sendgrid-php are trademarks of SendGrid, Inc.
228+
sendgrid-php is maintained and funded by Twilio SendGrid, Inc. The names and logos for sendgrid-php are trademarks of Twilio SendGrid, Inc.
226229

227230

228231
# License

0 commit comments

Comments
 (0)