Skip to content
This repository was archived by the owner on Jun 10, 2024. It is now read-only.

Commit 209d83f

Browse files
committed
Merge branch 'develop' into release/v4
2 parents 19407b9 + af5a7d7 commit 209d83f

File tree

3 files changed

+54
-17
lines changed

3 files changed

+54
-17
lines changed

CONTRIBUTING.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Contributing
2+
3+
Contributions are **welcome** and will be fully **credited**.
4+
5+
We accept contributions via Pull Requests on [Github](https://github.com/biscolab/laravel-recaptcha).
6+
7+
8+
## Pull Requests
9+
10+
- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
11+
12+
- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
13+
14+
- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
15+
16+
- **Consider our release cycle** - We try to follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
17+
18+
- **Create feature branches** - Don't ask us to pull from your master branch.
19+
20+
- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
21+
22+
- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
23+
24+
25+
## Running Tests
26+
27+
``` bash
28+
$ composer test
29+
```
30+
31+
32+
**Happy coding**!

README.md

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
# Laravel ReCAPTCHA v3, checkbox and invisible
2-
Simple and painless Google reCAPTCHA package for Laravel 5, 6 and 7
2+
3+
Simple and painless Google reCAPTCHA package for Laravel 5.5 or greater
34

45
Available reCAPTCHA versions:
5-
* v2 Invisible
6-
* v2 Checkbox
7-
* v3
86

9-
[![Build Status](https://travis-ci.org/biscolab/laravel-recaptcha.svg?branch=master)](https://travis-ci.org/biscolab/laravel-recaptcha) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/?branch=master)
10-
[![Downloads](https://img.shields.io/packagist/dt/biscolab/laravel-recaptcha.svg#img-thumbnail)](https://packagist.org/packages/biscolab/laravel-recaptcha)
7+
- v2 Invisible
8+
- v2 Checkbox
9+
- v3
10+
11+
[![Build Status](https://travis-ci.org/biscolab/laravel-recaptcha.svg?branch=master)](https://travis-ci.org/biscolab/laravel-recaptcha) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/biscolab/laravel-recaptcha/?branch=master)
12+
[![Downloads](https://img.shields.io/packagist/dt/biscolab/laravel-recaptcha.svg#img-thumbnail)](https://packagist.org/packages/biscolab/laravel-recaptcha/stats)
1113
[![Packagist version](https://img.shields.io/packagist/v/biscolab/laravel-recaptcha.svg#img-thumbnail)](https://packagist.org/packages/biscolab/laravel-recaptcha)
1214

1315
## System requirements
14-
| Package | reCAPTCHA | PHP | Laravel | Docs |
15-
|-----------------|-------------|-------------|-----------------|-------------------|
16-
| 4.1.x |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6, 7 | [latest](https://laravel-recaptcha-docs.biscolab.com) |
17-
| 4.0.x |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 | [v4.0.x](https://laravel-recaptcha-docs.biscolab.com/docs/4.0.x/intro) |
18-
| 3.x |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 ready (*) | [v3.6.1](https://laravel-recaptcha-docs.biscolab.com/docs/3.6.1/intro) |
19-
| 2.x | v2 Invisible, v2 Checkbox | 5.5.9, 7.0 or greater | 5.0 or greater | [v2.0.4](https://laravel-recaptcha-docs.biscolab.com/docs/2.0.4/intro) |
2016

21-
> (*) Latest version (3.6.1) is Laravel 6 ready
17+
| Package | reCAPTCHA | PHP | Laravel | Docs |
18+
| ------- | ----------------------------- | --------------------- | ---------------------------- | ---------------------------------------------------------------------- |
19+
| 4.2.x | v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6, 7, 8 | [latest](https://laravel-recaptcha-docs.biscolab.com) |
20+
| 4.1.x | v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6, 7 | [v4.1.x](https://laravel-recaptcha-docs.biscolab.com/docs/4.1.x/intro) |
21+
| 4.0.x | v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 | [v4.0.x](https://laravel-recaptcha-docs.biscolab.com/docs/4.0.x/intro) |
22+
| 3.x | v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 ready (\*) | [v3.6.1](https://laravel-recaptcha-docs.biscolab.com/docs/3.6.1/intro) |
23+
| 2.x | v2 Invisible, v2 Checkbox | 5.5.9, 7.0 or greater | 5.0 or greater | [v2.0.4](https://laravel-recaptcha-docs.biscolab.com/docs/2.0.4/intro) |
24+
25+
> (\*) Latest version (3.6.1) is Laravel 6 ready
2226
2327
> If you are migrating from either v2.x or v3.x to the latest package version, please, take a look about migration to v4.x in [What's new in v4.x](https://laravel-recaptcha-docs.biscolab.com/docs/whats-new) before any changes
2428
@@ -31,4 +35,5 @@ You can find online complete documentation at [https://laravel-recaptcha-docs.bi
3135
Contributions are welcome and will be fully credited. [https://laravel-recaptcha-docs.biscolab.com/docs/contributing](https://laravel-recaptcha-docs.biscolab.com/docs/contributing).
3236

3337
## License
38+
3439
[![MIT License](https://img.shields.io/github/license/biscolab/laravel-recaptcha.svg)](https://github.com/biscolab/laravel-recaptcha/blob/master/LICENSE)

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "biscolab/laravel-recaptcha",
3-
"description": "Simple and painless Google reCAPTCHA package for Laravel 5, 6 and 7",
4-
"version": "4.1.0",
3+
"description": "Simple and painless Google reCAPTCHA package for Laravel 5.5 or greater",
4+
"version": "4.2.0",
55
"license": "MIT",
66
"type": "library",
77
"keywords": [
@@ -21,7 +21,7 @@
2121
],
2222
"require": {
2323
"php": "^7.1",
24-
"laravel/framework": "^5.5|^6.0|^7.0"
24+
"laravel/framework": "^5.5|^6.0|^7.0|^8.0"
2525
},
2626
"require-dev": {
2727
"orchestra/testbench": "~3.0",
@@ -44,7 +44,7 @@
4444
"test": "vendor/bin/phpunit --colors=always"
4545
},
4646
"suggest": {
47-
"biscolab/laravel-authlog": "Allows logged-in users management and forced log-out"
47+
"biscolab/laravel-authlog": "It allows to handle logged-in users and force log-out if needed"
4848
},
4949
"extra": {
5050
"laravel": {

0 commit comments

Comments
 (0)