Merge pull request #1 from ARCANEDEV/develop

Updating the package

Author: arcanedev-maroc

.editorconfig

@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_size = 2

.scrutinizer.yml

@@ -21,7 +21,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 3
+        runs: 12
     php_code_sniffer:
         enabled: true
         config:

.travis.yml

@@ -1,23 +1,28 @@
 language: php
 
+sudo: false
+
 php:
   - 5.5.9
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
-sudo: false
+env:
+  - TESTBENCH_VERSION=3.0.*
+  - TESTBENCH_VERSION=3.1.*
+  - TESTBENCH_VERSION=3.2.*
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --prefer-source --no-interaction
+  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench:${TESTBENCH_VERSION}"
 
 script:
   - composer validate
   - mkdir -p build/logs
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 ARCANEDEV - Gravatar
+Copyright (c) 2015-2016 | ARCANEDEV - Gravatar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -32,12 +32,12 @@
 Gravatar is a small library that provides an easy way to integrate and generate … Gravatars ??
 
 Feel free to check out the [releases](https://github.com/ARCANEDEV/Gravatar/releases), [license](LICENSE.md), and [contribution guidelines](CONTRIBUTING.md).
-  
+
 ### Features
 
   * Framework-agnostic (Works in any PHP projects).
-  * Laravel 5 Supported.
-  * Easy setup & configuration. 
+  * Laravel 5.0, 5.1 & 5.2 are Supported.
+  * Easy setup & configuration.
   * Well tested (100% code coverage with maximum code quality).
   * Made with :heart: & :coffee:.
 

composer.json

@@ -1,26 +1,27 @@
 {
     "name":        "arcanedev/gravatar",
-    "description": "Gravatar Package for Laravel",
-    "keywords":    ["arcanedev", "gravatar", "avatar", "identicon", "monsterid", "wavatar", "retro", "laravel"],
+    "description": "A library providing easy gravatar integration/generation (Laravel supported).",
+    "keywords":    [
+        "arcanedev", "gravatar", "avatar", "identicon", "monsterid", "wavatar", "retro", "laravel"
+    ],
     "homepage":    "https://github.com/ARCANEDEV/Gravatar",
     "authors": [
         {
             "name":     "ARCANEDEV",
             "email":    "arcanedev.maroc@gmail.com",
-            "homepage": "https://github.com/ARCANEDEV",
+            "homepage": "https://github.com/arcanedev-maroc",
             "role":     "Developer"
         }
     ],
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php" :                ">=5.5.9",
-        "arcanedev/support":   "~3.0"
+        "php" :              ">=5.5.9",
+        "arcanedev/support": "~3.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.1",
-        "phpunit/phpunit":     "~4.0|~5.0",
-        "phpunit/phpcov":      "~2.0"
+        "phpunit/phpcov":    "~2.0|~3.0",
+        "phpunit/phpunit":   "~4.0|~5.0"
     },
     "autoload": {
         "psr-4": {
@@ -33,6 +34,9 @@
             "Arcanedev\\Gravatar\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "testbench": "composer require --dev \"orchestra/testbench=~3.0\""
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"

helpers.php

@@ -4,11 +4,11 @@
     /**
      * Get the gravatar instance.
      *
-     * @return \Arcanedev\Gravatar\Gravatar
+     * @return Arcanedev\Gravatar\Contracts\Gravatar
      */
     function gravatar()
     {
-        return app('arcanedev.gravatar');
+        return app(Arcanedev\Gravatar\Contracts\Gravatar::class);
     }
 }
 

src/Contracts/GravatarInterface.php renamed to src/Contracts/Gravatar.php

@@ -1,12 +1,12 @@
 <?php namespace Arcanedev\Gravatar\Contracts;
 
 /**
- * Interface  GravatarInterface
+ * Interface  Gravatar
  *
  * @package   Arcanedev\Gravatar\Contracts
  * @author    ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-interface GravatarInterface
+interface Gravatar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters

src/Gravatar.php

@@ -1,9 +1,5 @@
 <?php namespace Arcanedev\Gravatar;
 
-use Arcanedev\Gravatar\Contracts\GravatarInterface;
-use Arcanedev\Gravatar\Exceptions\InvalidImageRatingException;
-use Arcanedev\Gravatar\Exceptions\InvalidImageSizeException;
-use Arcanedev\Gravatar\Exceptions\InvalidImageUrlException;
 use Arcanedev\Gravatar\Helpers\HtmlBuilder;
 
 /**
@@ -12,7 +8,7 @@
  * @package  Arcanedev\Gravatar
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class Gravatar implements GravatarInterface
+class Gravatar implements Contracts\Gravatar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Constants
@@ -30,35 +26,35 @@ class Gravatar implements GravatarInterface
      *
      * @var mixed
      */
-    protected $defaultImage = false;
+    protected $defaultImage     = false;
 
     /**
      * The maximum rating to allow for the avatar.
      *
      * @var string
      */
-    protected $rating       = 'g';
+    protected $rating           = 'g';
 
     /**
      * The avatar size.
      *
      * @var int
      */
-    protected $size         = 80;
+    protected $size             = 80;
 
     /**
      * Should we use the secure (HTTPS) URL base ?
      *
      * @var bool
      */
-    protected $secure       = false;
+    protected $secure           = false;
 
     /**
      * A temporary internal cache of the URL parameters.
      *
      * @var string
      */
-    protected $cachedParams  = null;
+    protected $cachedParams     = null;
 
     /**
      * Supported image defaults.
@@ -172,15 +168,15 @@ public function setSize($size)
         $this->cachedParams = null;
 
         if ( ! is_val_integer($size)) {
-            throw new InvalidImageSizeException(
+            throw new Exceptions\InvalidImageSizeException(
                 'Avatar size specified must be an integer.'
             );
         }
 
         $size = (int) $size;
 
         if (is_int_not_between($size, 0, 512)) {
-            throw new InvalidImageSizeException(
+            throw new Exceptions\InvalidImageSizeException(
                 'Avatar size must be within 0 pixels and 512 pixels.'
             );
         }
@@ -216,7 +212,7 @@ public function setRating($rating)
         $rating = strtolower($rating);
 
         if ( ! in_array($rating, $this->supportedRatings)) {
-            throw new InvalidImageRatingException(
+            throw new Exceptions\InvalidImageRatingException(
                 "Invalid rating '$rating' specified, only 'g', 'pg', 'r' or 'x' are supported."
             );
         }
@@ -377,7 +373,7 @@ public function hashEmail($email)
     private function checkImageUrl($image)
     {
         if ( ! filter_var($image, FILTER_VALIDATE_URL)) {
-            throw new InvalidImageUrlException(
+            throw new Exceptions\InvalidImageUrlException(
                 'The default image specified is not a recognized gravatar "default" and is not a valid URL'
             );
         }

src/GravatarServiceProvider.php

@@ -19,14 +19,21 @@ class GravatarServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $vendor       = 'arcanedev';
+    protected $vendor  = 'arcanedev';
 
     /**
      * Package name.
      *
      * @var string
      */
-    protected $package      = 'gravatar';
+    protected $package = 'gravatar';
+
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer   = true;
 
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters
@@ -48,8 +55,6 @@ public function getBasePath()
      */
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function register()
     {
@@ -59,13 +64,9 @@ public function register()
 
     /**
      * Boot the service provider.
-     *
-     * @return void
      */
     public function boot()
     {
-        parent::boot();
-
         $this->publishConfig();
     }
 
@@ -76,29 +77,22 @@ public function boot()
      */
     public function provides()
     {
-        return ['arcanedev.gravatar'];
+        return [
+            'arcanedev.gravatar',
+            Contracts\Gravatar::class,
+        ];
     }
 
     /* ------------------------------------------------------------------------------------------------
      |  Other Functions
      | ------------------------------------------------------------------------------------------------
      */
-    /**
-     * Publishes configs.
-     */
-    private function publishConfig()
-    {
-        $this->publishes([
-            $this->getConfigFile() => config_path("{$this->package}.php"),
-        ], 'config');
-    }
-
     /**
      * Register Gravatar Helper.
      */
     private function registerGravatar()
     {
-        $this->app->singleton('arcanedev.gravatar', function($app) {
+        $this->singleton('arcanedev.gravatar', function($app) {
             /** @var \Illuminate\Config\Repository $config */
             $config = $app['config'];
 
@@ -108,5 +102,17 @@ private function registerGravatar()
                 $config->get('gravatar.max-rating', 'g')
             );
         });
+
+        $this->bind(Contracts\Gravatar::class, 'arcanedev.gravatar');
+    }
+
+    /**
+     * Publishes configs.
+     */
+    private function publishConfig()
+    {
+        $this->publishes([
+            $this->getConfigFile() => config_path("{$this->package}.php"),
+        ], 'config');
     }
 }