Skip to content

Commit 91a8572

Browse files
Merge pull request #4 from ARCANEDEV/update-laravel_5.4_support
Adding Laravel 5.4 Support
2 parents 36962db + 0246d66 commit 91a8572

File tree

12 files changed

+47
-36
lines changed

12 files changed

+47
-36
lines changed

.gitattributes

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
* text=auto
2+
3+
/.github export-ignore
14
/_docs export-ignore
25
/tests export-ignore
3-
/.editorconfig export-ignore
4-
/.gitattributes export-ignore
5-
/.gitignore export-ignore
6-
/.scrutinizer.yml export-ignore
7-
/.travis.yml export-ignore
8-
/CONTRIBUTING.md export-ignore
9-
/phpunit.xml export-ignore
6+
.editorconfig export-ignore
7+
.gitattributes export-ignore
8+
.gitignore export-ignore
9+
.scrutinizer.yml export-ignore
10+
.travis.yml export-ignore
11+
phpunit.xml export-ignore
12+
CONTRIBUTING.md export-ignore

.github/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- Gravatar Version: #.#.#
2+
- Laravel Version: #.#.#
3+
- PHP Version: #.#.#
4+
5+
### Description:
6+
7+
### Steps To Reproduce:

.scrutinizer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ checks:
2020

2121
tools:
2222
external_code_coverage:
23-
timeout: 1200
24-
runs: 12
23+
timeout: 600
24+
runs: 3
2525
php_code_sniffer:
2626
enabled: true
2727
config:

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ php:
77
- 7.0
88
- 7.1
99
- nightly
10-
- hhvm
1110

1211
matrix:
1312
allow_failures:
1413
- php: nightly
1514

1615
env:
17-
- TESTBENCH_VERSION=3.0.*
18-
- TESTBENCH_VERSION=3.1.*
19-
- TESTBENCH_VERSION=3.2.*
20-
- TESTBENCH_VERSION=3.3.*
16+
- TESTBENCH_VERSION=3.4.*
2117

2218
before_script:
2319
- travis_retry composer self-update
@@ -29,5 +25,5 @@ script:
2925
- vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
3026

3127
after_script:
32-
- if [ "$TRAVIS_PHP_VERSION" != "nightly" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
33-
- if [ "$TRAVIS_PHP_VERSION" != "nightly" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
28+
- if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
29+
- if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

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) 2015-2016 | ARCANEDEV - Gravatar
3+
Copyright (c) 2015-2017 | ARCANEDEV - Gravatar
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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Gravatar [![Packagist License][badge_license]](LICENSE.md) [![For PHP][badge_php]][link-github-repo]
22

33
[![Travis Status][badge_build]][link-travis]
4-
[![HHVM Status][badge_hhvm]][link-hhvm]
54
[![Coverage Status][badge_coverage]][link-scrutinizer]
65
[![Scrutinizer Code Quality][badge_quality]][link-scrutinizer]
76
[![SensioLabs Insight][badge_insight]][link-insight]
@@ -21,7 +20,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Gravatar/rele
2120
### Features
2221

2322
* Framework-agnostic package.
24-
* Laravel `5.0 | 5.1 | 5.2 | 5.3` are Supported.
23+
* Laravel `5.0 | 5.1 | 5.2 | 5.3 | 5.4` are Supported.
2524
* Easy setup & configuration.
2625
* Well tested (100% code coverage with maximum code quality).
2726
* Made with :heart: & :coffee:.
@@ -45,7 +44,6 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
4544
[badge_license]: http://img.shields.io/packagist/l/arcanedev/gravatar.svg?style=flat-square
4645
[badge_php]: https://img.shields.io/badge/PHP-Framework%20agnostic-4F5B93.svg?style=flat-square
4746
[badge_build]: http://img.shields.io/travis/ARCANEDEV/Gravatar.svg?style=flat-square
48-
[badge_hhvm]: https://img.shields.io/hhvm/arcanedev/gravatar.svg?style=flat-square
4947
[badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/Gravatar.svg?style=flat-square
5048
[badge_quality]: https://img.shields.io/scrutinizer/g/ARCANEDEV/Gravatar.svg?style=flat-square
5149
[badge_insight]: https://img.shields.io/sensiolabs/i/b295ae87-bc10-4a43-9ca4-fbeab5c7fcda.svg?style=flat-square
@@ -61,6 +59,5 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
6159
[link-contributors]: https://github.com/ARCANEDEV/Gravatar/graphs/contributors
6260
[link-packagist]: https://packagist.org/packages/arcanedev/gravatar
6361
[link-travis]: https://travis-ci.org/ARCANEDEV/Gravatar
64-
[link-hhvm]: http://hhvm.h4cc.de/package/arcanedev/gravatar
6562
[link-scrutinizer]: https://scrutinizer-ci.com/g/ARCANEDEV/Gravatar/?branch=master
6663
[link-insight]: https://insight.sensiolabs.com/projects/b295ae87-bc10-4a43-9ca4-fbeab5c7fcda

_docs/0-Home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Gravatar/rele
77
### Features
88

99
* Framework-agnostic package.
10-
* Laravel `5.0 | 5.1 | 5.2 | 5.3` are Supported.
10+
* Laravel `5.0 | 5.1 | 5.2 | 5.3 | 5.4` are Supported.
1111
* Easy setup & configuration.
1212
* Well tested (100% code coverage with maximum code quality).
1313
* Made with :heart: & :coffee:.

_docs/2-Installation-and-Setup.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
# 2. Installation
22

3-
## Composer
3+
## Version Compatibility
44

5-
You can install this package via [Composer](http://getcomposer.org/) by running this command: `composer require arcanedev/gravatar`.
5+
| Gravatar | Laravel |
6+
|:-------------------------------|:--------------------------------------------------------------------------------------------------------------------|
7+
| ![Gravatar v1.x][gravatar_1_x] | ![Laravel v5.0][laravel_5_0] ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] |
8+
| ![Gravatar v2.x][gravatar_2_x] | ![Laravel v5.4][laravel_5_4] |
9+
10+
> **Note :** This is a framework-agnostic package, so you can use any version of this package in your PHP project.
611
7-
##### OR
12+
[laravel_5_0]: https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0"
13+
[laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
14+
[laravel_5_2]: https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2"
15+
[laravel_5_3]: https://img.shields.io/badge/v5.3-supported-brightgreen.svg?style=flat-square "Laravel v5.3"
16+
[laravel_5_4]: https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4"
817

9-
By adding the package `"arcanedev/gravatar": "~1.0"` inside the `"require"` in your `composer.json`.
18+
[gravatar_1_x]: https://img.shields.io/badge/version-1.*-blue.svg?style=flat-square "Gravatar v1.*"
19+
[gravatar_2_x]: https://img.shields.io/badge/version-2.*-blue.svg?style=flat-square "Gravatar v3.*"
1020

11-
Then install it via `composer install` or `composer update`.
21+
## Composer
22+
23+
You can install this package via [Composer](http://getcomposer.org/) by running this command: `composer require arcanedev/gravatar`.
1224

1325
## Laravel Setup
1426

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"license": "MIT",
1818
"require": {
1919
"php" : ">=5.6",
20-
"arcanedev/support": "~3.0"
20+
"arcanedev/support": "~4.0"
2121
},
2222
"require-dev": {
23-
"phpunit/phpcov": "~2.0|~3.0",
24-
"phpunit/phpunit": "~4.0|~5.0"
23+
"phpunit/phpcov": "~3.0",
24+
"phpunit/phpunit": "~5.0"
2525
},
2626
"autoload": {
2727
"psr-4": {

src/GravatarServiceProvider.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public function boot()
7171
public function provides()
7272
{
7373
return [
74-
'arcanedev.gravatar',
7574
Contracts\Gravatar::class,
7675
];
7776
}
@@ -85,7 +84,7 @@ public function provides()
8584
*/
8685
private function registerGravatar()
8786
{
88-
$this->singleton('arcanedev.gravatar', function($app) {
87+
$this->singleton(Contracts\Gravatar::class, function($app) {
8988
/** @var \Illuminate\Config\Repository $config */
9089
$config = $app['config'];
9190

@@ -95,7 +94,5 @@ private function registerGravatar()
9594
$config->get('gravatar.max-rating', 'g')
9695
);
9796
});
98-
99-
$this->bind(Contracts\Gravatar::class, 'arcanedev.gravatar');
10097
}
10198
}

0 commit comments

Comments
 (0)