Merge pull request #7 from ARCANEDEV/patch-1

Updating the package

Author: arcanedev-maroc

.scrutinizer.yml

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

.travis.yml

@@ -10,7 +10,6 @@ php:
 
 matrix:
   allow_failures:
-    - php: 7.2
     - php: nightly
 
 before_script:
@@ -23,5 +22,5 @@ script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" != "7.2" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "7.2" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; 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-2017 | ARCANEDEV - Gravatar
+Copyright (c) 2015-2018 | 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

composer.json

@@ -17,7 +17,7 @@
     "license": "MIT",
     "require": {
         "php" :              ">=7.0",
-        "arcanedev/support": "~4.0"
+        "arcanedev/support": "~4.2.0"
     },
     "require-dev": {
         "phpunit/phpunit":     "~6.0",

config/gravatar.php

@@ -3,32 +3,28 @@
 // For more details: https://en.gravatar.com/site/implement/images/
 
 return [
-    /* ------------------------------------------------------------------------------------------------
+
+    /* -----------------------------------------------------------------
      |  Default
-     | ------------------------------------------------------------------------------------------------
-     |  The default avatar to display if we have no results (you can also set a default image url).
+     | -----------------------------------------------------------------
+     |  The default avatar to display if we have no results.
      |
-     |  Supported:
-     |    * false
-     |    * '404'
-     |    * 'mm'        : (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash).
-     |    * 'identicon' : a geometric pattern based on an email hash.
-     |    * 'monsterid' : a generated 'monster' with different colors, faces, etc.
-     |    * 'wavatar'   : generated faces with differing features and backgrounds.
-     |    * 'retro'     : awesome generated, 8-bit arcade-style pixelated faces.
+     |  Supported: 'identicon', '404', 'mm', 'monsterid', 'wavatar', 'retro', false
      */
+
     'default' => 'identicon',
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Size
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      |  The default avatar size.
      */
+
     'size' => 80,
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Rating
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      |  Set the type of avatars we allow to show.
      |
      |  Supported:
@@ -37,5 +33,7 @@
      |    * 'r'  : may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
      |    * 'x'  : may contain hardcore sexual imagery or extremely disturbing violence.
      */
+
     'max-rating' => 'g',
+
 ];

src/Gravatar.php

@@ -64,28 +64,14 @@ class Gravatar implements Contracts\Gravatar
      *
      * @var array
      */
-    private $supportedImages    = [
-        '404',        // Do not load any image if none is associated with the email hash,
-                      // instead return an HTTP 404 response
-        'mm',         // (mystery-man) a simple, cartoon-style silhouetted outline of a person.
-        'identicon',  // a geometric pattern based on an email hash
-        'monsterid',  // a generated 'monster' with different colors, faces, etc
-        'wavatar',    // generated faces with differing features and backgrounds
-        'retro',      // awesome generated, 8-bit arcade-style pixelated faces
-        // 'blank',
-    ];
+    private $supportedImages    = ['404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'];
 
     /**
      * Supported image ratings.
      *
      * @var array
      */
-    private $supportedRatings   = [
-        'g',   // suitable for display on all websites with any audience type.
-        'pg',  // may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.
-        'r',   // may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
-        'x'    // may contain hardcore sexual imagery or extremely disturbing violence.
-    ];
+    private $supportedRatings   = ['g', 'pg', 'r', 'x'];
 
     /* -----------------------------------------------------------------
      |  Constructor
@@ -270,7 +256,7 @@ public function get($email, $hash = true)
 
         $params = $this->getParams($email);
 
-        return $url . '?' . http_build_query($params);
+        return $url.'?'.http_build_query($params);
     }
 
     /**
@@ -293,9 +279,9 @@ public function image($email, $alt = null, array $attributes = [], $rating = nul
             ? min(512, max($dimensions))
             : $this->getSize();
 
-        $src  = $this->src($email, $size, $rating);
-
-        return HtmlBuilder::image($src, $alt, $attributes);
+        return HtmlBuilder::image(
+            $this->src($email, $size, $rating), $alt, $attributes
+        );
     }
 
     /**

src/Helpers/HtmlBuilder.php

@@ -8,10 +8,11 @@
  */
 class HtmlBuilder
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
+
     /**
      * Generate an HTML image element.
      *
@@ -25,7 +26,7 @@ public static function image($url, $alt = null, $attributes = [])
     {
         $attributes['alt'] = $alt;
 
-        return '<img src="' . $url . '"' . self::attributes($attributes) . '>';
+        return '<img src="'.$url.'"'.static::attributes($attributes).'>';
     }
 
 
@@ -44,14 +45,19 @@ public static function attributes($attributes)
         // as this will convert HTML attributes such as "required" to a correct
         // form like required="required" instead of using incorrect numerics.
         foreach ((array) $attributes as $key => $value) {
-            $html[] = self::attributeElement($key, $value);
+            $html[] = static::attributeElement($key, $value);
         }
 
         $html = array_filter($html);
 
-        return count($html) > 0 ? ' ' . implode(' ', $html) : '';
+        return count($html) > 0 ? ' '.implode(' ', $html) : '';
     }
 
+    /* -----------------------------------------------------------------
+     |  Other Methods
+     | -----------------------------------------------------------------
+     */
+
     /**
      * Build a single attribute element.
      *
@@ -60,16 +66,11 @@ public static function attributes($attributes)
      *
      * @return string|null
      */
-    private static function attributeElement($key, $value)
+    protected static function attributeElement($key, $value)
     {
-        if (is_numeric($key)) {
+        if (is_numeric($key))
             $key = $value;
-        }
-
-        if ( ! is_null($value)) {
-            return $key . '="' . htmlentities($value, ENT_QUOTES, 'UTF-8', false) . '"';
-        }
 
-        return null;
+        return is_null($value) ? null : $key.'="'.e($value).'"';
     }
 }

tests/GravatarServiceProviderTest.php

@@ -15,7 +15,7 @@ class GravatarServiceProviderTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    /** @var GravatarServiceProvider */
+    /** @var  \Arcanedev\Gravatar\GravatarServiceProvider */
     private $provider;
 
     /* -----------------------------------------------------------------
@@ -53,7 +53,7 @@ public function it_can_be_instantiated()
         ];
 
         foreach ($expectations as $expected) {
-            $this->assertInstanceOf($expected, $this->provider);
+            static::assertInstanceOf($expected, $this->provider);
         }
     }
 
@@ -64,6 +64,6 @@ public function it_can_provides()
             \Arcanedev\Gravatar\Contracts\Gravatar::class,
         ];
 
-        $this->assertSame($expected, $this->provider->provides());
+        static::assertSame($expected, $this->provider->provides());
     }
 }