Merge pull request #3 from ARCANEDEV/patch-laravel_53

arcanedev-maroc · web-flow · commit 36962dbf0db9 · 2016-09-04T20:59:37.000+01:00
Adding Laravel 5.3 support
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-/.idea/
-/_arcanedev/
 /build/
 /vendor/
 /composer.phar
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -20,7 +20,7 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 600
+        timeout: 1200
         runs: 12
     php_code_sniffer:
         enabled: true
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ language: php
 sudo: false
 
 php:
-  - 5.5.9
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - nightly
   - hhvm
 
@@ -18,6 +17,7 @@ env:
   - TESTBENCH_VERSION=3.0.*
   - TESTBENCH_VERSION=3.1.*
   - TESTBENCH_VERSION=3.2.*
+  - TESTBENCH_VERSION=3.3.*
 
 before_script:
   - travis_retry composer self-update
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Gravatar/rele
 
 ### Features
 
-  * Framework-agnostic (Works in any PHP projects).
-  * Laravel 5.0, 5.1 & 5.2 are Supported.
+  * Framework-agnostic package.
+  * Laravel `5.0 | 5.1 | 5.2 | 5.3` are Supported.
   * Easy setup & configuration.
   * Well tested (100% code coverage with maximum code quality).
   * Made with :heart: &amp; :coffee:.
diff --git a/_docs/0-Home.md b/_docs/0-Home.md
@@ -6,8 +6,8 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Gravatar/rele
 
 ### Features
 
-  * Framework-agnostic (Works in any PHP projects).
-  * Laravel 5.0, 5.1 & 5.2 are Supported.
+  * Framework-agnostic package.
+  * Laravel `5.0 | 5.1 | 5.2 | 5.3` are Supported.
   * Easy setup & configuration.
   * Well tested (100% code coverage with maximum code quality).
   * Made with :heart: &amp; :coffee:.
diff --git a/_docs/1-Requirements.md b/_docs/1-Requirements.md
@@ -4,4 +4,4 @@
 
 The Gravatar package has a few system requirements:
 
-    - PHP >= 5.5.9
+    - PHP >= 5.6
diff --git a/_docs/3-Configuration.md b/_docs/3-Configuration.md
@@ -16,6 +16,8 @@ Allowed defaults:
 | `wavatar`   | generated faces with differing features and backgrounds.                                                              |
 | `retro`     | awesome generated, 8-bit arcade-style pixelated faces.                                                                |
 
+> **Note :** You can also specify an image URL as a default image.
+
 Example images can be viewed on [the Gravatar website](https://gravatar.com/site/implement/images/).
 
 ### Size
@@ -33,4 +35,4 @@ By default only "g" rated images will be shown.
 | `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.                                   | 
 
-The content rating can be changed by changing the `$rating` argument when calling `Gravatar::src` or `Gravatar::image`.
+The content rating can be changed by changing the `$rating` argument when calling `Gravatar::src` or `Gravatar::image`.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php" :              ">=5.5.9",
+        "php" :              ">=5.6",
         "arcanedev/support": "~3.0"
     },
     "require-dev": {
diff --git a/config/gravatar.php b/config/gravatar.php
@@ -1,11 +1,12 @@
 <?php
 
-// For more details: https://fr.gravatar.com/site/implement/images/
+// For more details: https://en.gravatar.com/site/implement/images/
+
 return [
     /* ------------------------------------------------------------------------------------------------
      |  Default
      | ------------------------------------------------------------------------------------------------
-     |  The default avatar to display if we have no results.
+     |  The default avatar to display if we have no results (you can also set a default image url).
      |
      |  Supported:
      |    * false
diff --git a/src/Gravatar.php b/src/Gravatar.php
@@ -122,7 +122,7 @@ public function getDefaultImage()
      *
      * @param  string|false  $image
      *
-     * @return self
+     * @return \Arcanedev\Gravatar\Gravatar
      *
      * @throws \Arcanedev\Gravatar\Exceptions\InvalidImageUrlException
      */
@@ -131,12 +131,9 @@ public function setDefaultImage($image)
         if ($image !== false) {
             $this->cachedParams = null;
 
-            if (in_array(strtolower($image), $this->supportedImages)) {
-                $image = strtolower($image);
-            }
-            else {
-                $this->checkImageUrl($image);
-            }
+            $image = in_array(strtolower($image), $this->supportedImages)
+                ? strtolower($image)
+                : $this->checkImageUrl($image);
         }
 
         $this->defaultImage = $image;
@@ -159,7 +156,7 @@ public function getSize()
      *
      * @param integer $size - The avatar size to use, must be less than 512 and greater than 0.
      *
-     * @return self
+     * @return \Arcanedev\Gravatar\Gravatar
      *
      * @throws \Arcanedev\Gravatar\Exceptions\InvalidImageSizeException
      */
@@ -201,7 +198,7 @@ public function getRating()
      *
      * @param  string  $rating
      *
-     * @return self
+     * @return \Arcanedev\Gravatar\Gravatar
      *
      * @throws \Arcanedev\Gravatar\Exceptions\InvalidImageRatingException
      */
@@ -310,7 +307,7 @@ public function image($email, $alt = null, $attributes = [], $rating = null)
     /**
      * Enable the use of the secure protocol for image URLs.
      *
-     * @return self
+     * @return \Arcanedev\Gravatar\Gravatar
      */
     public function enableSecure()
     {
@@ -322,7 +319,7 @@ public function enableSecure()
     /**
      * Disable the use of the secure protocol for image URLs.
      *
-     * @return self
+     * @return \Arcanedev\Gravatar\Gravatar
      */
     public function disableSecure()
     {
@@ -368,6 +365,8 @@ public function hashEmail($email)
      *
      * @param  string  $image
      *
+     * @return string
+     *
      * @throws \Arcanedev\Gravatar\Exceptions\InvalidImageUrlException
      */
     private function checkImageUrl($image)
@@ -377,6 +376,8 @@ private function checkImageUrl($image)
                 'The default image specified is not a recognized gravatar "default" and is not a valid URL'
             );
         }
+
+        return $image;
     }
 
     /* ------------------------------------------------------------------------------------------------
diff --git a/src/GravatarServiceProvider.php b/src/GravatarServiceProvider.php
@@ -14,13 +14,6 @@ class GravatarServiceProvider extends ServiceProvider
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /**
-     * Vendor name.
-     *
-     * @var string
-     */
-    protected $vendor  = 'arcanedev';
-
     /**
      * Package name.
      *
diff --git a/tests/GravatarServiceProviderTest.php b/tests/GravatarServiceProviderTest.php
@@ -62,6 +62,6 @@ public function it_can_provides()
             \Arcanedev\Gravatar\Contracts\Gravatar::class,
         ];
 
-        $this->assertEquals($expected, $this->provider->provides());
+        $this->assertSame($expected, $this->provider->provides());
     }
 }
diff --git a/tests/GravatarTest.php b/tests/GravatarTest.php
@@ -62,7 +62,7 @@ public function it_can_set_and_get_image_size()
         foreach (range($mix, $max) as $size) {
             $this->gravatar->setSize($size);
 
-            $this->assertEquals($size, $this->gravatar->getSize());
+            $this->assertSame($size, $this->gravatar->getSize());
         }
     }
 
@@ -111,18 +111,18 @@ public function it_must_throw_invalid_image_url_on_setting_default_image()
     }
 
     /** @test */
-    public function it_can_setand_get_default_image_url()
+    public function it_can_set_and_get_default_image_url()
     {
         $this->gravatar = new Gravatar('http://www.hello.com/img.png');
 
-        $this->assertEquals(
+        $this->assertSame(
             "https://secure.gravatar.com/avatar/00000000000000000000000000000000?s=80&r=g&d=http%3A%2F%2Fwww.hello.com%2Fimg.png&f=y",
             $this->gravatar->get('')
         );
 
         $hashed = md5($this->email);
 
-        $this->assertEquals(
+        $this->assertSame(
             "https://secure.gravatar.com/avatar/$hashed?s=80&r=g&d=http%3A%2F%2Fwww.hello.com%2Fimg.png",
             $this->gravatar->get($this->email)
         );
@@ -156,7 +156,7 @@ public function it_can_hash_email()
         $expected = md5($this->email);
 
         foreach ($emails as $email) {
-            $this->assertEquals(
+            $this->assertSame(
                 $expected, $this->gravatar->hashEmail($email)
             );
         }
@@ -178,7 +178,7 @@ public function it_can_get_gravatar_secure_url()
         foreach($emails as $email) {
             $url = $this->gravatar->get($email);
 
-            $this->assertEquals(1, preg_match($pattern, $url));
+            $this->assertSame(1, preg_match($pattern, $url));
         }
     }
 
@@ -187,30 +187,30 @@ public function it_can_get_gravatar_url_on_empty_email()
     {
         $expected = 'https://secure.gravatar.com/avatar/00000000000000000000000000000000?s=80&r=g&d=identicon&f=y';
 
-        $this->assertEquals($expected, $this->gravatar->get(''));
-        $this->assertEquals($expected, $this->gravatar->get('', false));
+        $this->assertSame($expected, $this->gravatar->get(''));
+        $this->assertSame($expected, $this->gravatar->get('', false));
     }
 
     /** @test */
     public function it_can_get_gravatar_src_url()
     {
         $hashed = md5($this->email);
 
-        $this->assertEquals(
+        $this->assertSame(
             "https://secure.gravatar.com/avatar/$hashed?s=80&r=g&d=identicon",
             $this->gravatar->src($this->email)
         );
 
         $size   = 128;
 
-        $this->assertEquals(
+        $this->assertSame(
             "https://secure.gravatar.com/avatar/$hashed?s=$size&r=g&d=identicon",
             $this->gravatar->src($this->email, $size)
         );
 
         $rating = 'r';
 
-        $this->assertEquals(
+        $this->assertSame(
             "https://secure.gravatar.com/avatar/$hashed?s=$size&r=$rating&d=identicon",
             $this->gravatar->src($this->email, $size, $rating)
         );
@@ -221,19 +221,19 @@ public function it_can_get_gravatar_image_tag()
     {
         $hashed = md5($this->email);
 
-        $this->assertEquals(
+        $this->assertSame(
             "<img src=\"https://secure.gravatar.com/avatar/$hashed?s=80&r=g&d=identicon\">",
             $this->gravatar->image($this->email)
         );
 
         $alt = 'ARCANEDEV';
 
-        $this->assertEquals(
+        $this->assertSame(
             "<img src=\"https://secure.gravatar.com/avatar/$hashed?s=80&r=g&d=identicon\" alt=\"$alt\">",
             $this->gravatar->image($this->email, $alt)
         );
 
-        $this->assertEquals(
+        $this->assertSame(
             "<img src=\"https://secure.gravatar.com/avatar/$hashed?s=80&r=g&d=identicon\" class=\"img-responsive\" alt=\"$alt\">",
             $this->gravatar->image($this->email, $alt, ['class'  => 'img-responsive'])
         );
@@ -252,7 +252,7 @@ public function it_can_set_false_to_default_image()
     {
         $this->gravatar = new Gravatar(false);
 
-        $this->assertEquals(
+        $this->assertSame(
             'https://secure.gravatar.com/avatar/00000000000000000000000000000000?s=80&r=g&f=y',
             $this->gravatar->get('')
         );
@@ -263,19 +263,19 @@ public function it_can_set_size_from_height_or_width_attributes()
     {
         $this->gravatar->image('', null, ['width' => 32]);
 
-        $this->assertEquals(32, $this->gravatar->getSize());
+        $this->assertSame(32, $this->gravatar->getSize());
 
         $this->gravatar->image('', null, ['height' => 64]);
 
-        $this->assertEquals(64, $this->gravatar->getSize());
+        $this->assertSame(64, $this->gravatar->getSize());
 
         $this->gravatar->image('', null, ['width' => 64, 'height' => 128]);
 
-        $this->assertEquals(128, $this->gravatar->getSize());
+        $this->assertSame(128, $this->gravatar->getSize());
 
         $this->gravatar->image('', null, ['width' => 256, 'height' => 128]);
 
-        $this->assertEquals(256, $this->gravatar->getSize());
+        $this->assertSame(256, $this->gravatar->getSize());
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -290,8 +290,8 @@ public function it_can_set_size_from_height_or_width_attributes()
     public function assertGravatarInstance($gravatar)
     {
         $this->assertInstanceOf(\Arcanedev\Gravatar\Gravatar::class, $gravatar);
-        $this->assertEquals('g', $gravatar->getRating());
-        $this->assertEquals(80, $gravatar->getSize());
+        $this->assertSame('g', $gravatar->getRating());
+        $this->assertSame(80, $gravatar->getSize());
         $this->assertTrue($gravatar->isSecured());
     }
 }
diff --git a/tests/Helpers/HtmlBuilderTest.php b/tests/Helpers/HtmlBuilderTest.php
@@ -18,7 +18,7 @@ class HtmlBuilderTest extends TestCase
     /** @test */
     public function it_can_build_image_tag()
     {
-        $this->assertEquals(
+        $this->assertSame(
             '<img src="assets/img/logo.png" class="img-responsive" required="required" alt="Logo">',
             HtmlBuilder::image('assets/img/logo.png', 'Logo', [
                 'class'  => 'img-responsive', 'required'
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -63,14 +63,4 @@ protected function getPackageAliases($app)
             'Gravatar' => \Arcanedev\Gravatar\Facades\Gravatar::class,
         ];
     }
-
-    /**
-     * Define environment setup.
-     *
-     * @param  \Illuminate\Foundation\Application   $app
-     */
-    protected function getEnvironmentSetUp($app)
-    {
-        //
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/.idea/`
`2`		`-/_arcanedev/`
`3`	`1`	`/build/`
`4`	`2`	`/vendor/`
`5`	`3`	`/composer.phar`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`The Gravatar package has a few system requirements:`
`6`	`6`
`7`		`- - PHP >= 5.5.9`
	`7`	`+ - PHP >= 5.6`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function getDefaultImage()`
`122`	`122`	`*`
`123`	`123`	`* @param string\|false $image`
`124`	`124`	`*`
`125`		`- * @return self`
	`125`	`+ * @return \Arcanedev\Gravatar\Gravatar`
`126`	`126`	`*`
`127`	`127`	`* @throws \Arcanedev\Gravatar\Exceptions\InvalidImageUrlException`
`128`	`128`	`*/`
`@@ -131,12 +131,9 @@ public function setDefaultImage($image)`
`131`	`131`	`if ($image !== false) {`
`132`	`132`	`$this->cachedParams = null;`
`133`	`133`
`134`		`- if (in_array(strtolower($image), $this->supportedImages)) {`
`135`		`- $image = strtolower($image);`
`136`		`- }`
`137`		`- else {`
`138`		`- $this->checkImageUrl($image);`
`139`		`- }`
	`134`	`+ $image = in_array(strtolower($image), $this->supportedImages)`
	`135`	`+ ? strtolower($image)`
	`136`	`+ : $this->checkImageUrl($image);`
`140`	`137`	`}`
`141`	`138`
`142`	`139`	`$this->defaultImage = $image;`
`@@ -159,7 +156,7 @@ public function getSize()`
`159`	`156`	`*`
`160`	`157`	`* @param integer $size - The avatar size to use, must be less than 512 and greater than 0.`
`161`	`158`	`*`
`162`		`- * @return self`
	`159`	`+ * @return \Arcanedev\Gravatar\Gravatar`
`163`	`160`	`*`
`164`	`161`	`* @throws \Arcanedev\Gravatar\Exceptions\InvalidImageSizeException`
`165`	`162`	`*/`
`@@ -201,7 +198,7 @@ public function getRating()`
`201`	`198`	`*`
`202`	`199`	`* @param string $rating`
`203`	`200`	`*`
`204`		`- * @return self`
	`201`	`+ * @return \Arcanedev\Gravatar\Gravatar`
`205`	`202`	`*`
`206`	`203`	`* @throws \Arcanedev\Gravatar\Exceptions\InvalidImageRatingException`
`207`	`204`	`*/`
`@@ -310,7 +307,7 @@ public function image($email, $alt = null, $attributes = [], $rating = null)`
`310`	`307`	`/**`
`311`	`308`	`* Enable the use of the secure protocol for image URLs.`
`312`	`309`	`*`
`313`		`- * @return self`
	`310`	`+ * @return \Arcanedev\Gravatar\Gravatar`
`314`	`311`	`*/`
`315`	`312`	`public function enableSecure()`
`316`	`313`	`{`
`@@ -322,7 +319,7 @@ public function enableSecure()`
`322`	`319`	`/**`
`323`	`320`	`* Disable the use of the secure protocol for image URLs.`
`324`	`321`	`*`
`325`		`- * @return self`
	`322`	`+ * @return \Arcanedev\Gravatar\Gravatar`
`326`	`323`	`*/`
`327`	`324`	`public function disableSecure()`
`328`	`325`	`{`
`@@ -368,6 +365,8 @@ public function hashEmail($email)`
`368`	`365`	`*`
`369`	`366`	`* @param string $image`
`370`	`367`	`*`
	`368`	`+ * @return string`
	`369`	`+ *`
`371`	`370`	`* @throws \Arcanedev\Gravatar\Exceptions\InvalidImageUrlException`
`372`	`371`	`*/`
`373`	`372`	`private function checkImageUrl($image)`
`@@ -377,6 +376,8 @@ private function checkImageUrl($image)`
`377`	`376`	`'The default image specified is not a recognized gravatar "default" and is not a valid URL'`
`378`	`377`	`);`
`379`	`378`	`}`
	`379`	`+`
	`380`	`+ return $image;`
`380`	`381`	`}`
`381`	`382`
`382`	`383`	`/* ------------------------------------------------------------------------------------------------`