- Fixing coding standards

- PHP71 types

.scrutinizer.yml

@@ -4,7 +4,7 @@ checks:
 build:
     environment:
         php:
-            version: 7.0.7
+            version: 7.1
         variables:
             NETTE: default
 

.travis.yml

@@ -4,7 +4,6 @@ env:
   - NETTE=default
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 

composer.json

@@ -37,19 +37,19 @@
 		"nette/http"		: "~2.4",
 		"nette/utils"		: "~2.4",
 
-		"latte/latte"	: "~2.4",
-
-		"pds/skeleton"	: "@dev"
+		"latte/latte"	: "~2.4"
 	},
 
 	"require-dev": {
-		"nette/bootstrap"		: "~2.3",
-		"nette/mail"			: "~2.3",
+		"nette/bootstrap"		: "~2.4",
+		"nette/mail"			: "~2.4",
+		"nette/robot-loader"	: "~2.4",
 		"nette/safe-stream"		: "~2.3",
-		"nette/robot-loader"	: "~2.3",
-		"nette/tester"			: "@dev",
+		"nette/tester"			: "~2.0",
+
+		"tracy/tracy"	: "~2.4",
 
-		"tracy/tracy"	: "@dev"
+		"pds/skeleton"	: "~1.0"
 	},
 
 	"autoload": {

src/IPub/Gravatar/Application/GravatarResponse.php

@@ -34,6 +34,9 @@
  */
 final class GravatarResponse implements Nette\Application\IResponse
 {
+	/**
+	 * Implement nette smart magic
+	 */
 	use Nette\SmartObject;
 
 	/**
@@ -117,7 +120,7 @@ public function getType() : string
 	 *
 	 * @return void
 	 */
-	public function send(Http\IRequest $httpRequest, Http\IResponse $httpResponse)
+	public function send(Http\IRequest $httpRequest, Http\IResponse $httpResponse) : void
 	{
 		echo $this->image->send($this->type, 85);
 	}

src/IPub/Gravatar/Caching/Cache.php

@@ -36,7 +36,7 @@ final class Cache extends Caching\Cache
 	 *
 	 * @return void
 	 */
-	public function clean(array $conditions = NULL)
+	public function clean(array $conditions = NULL) : void
 	{
 		parent::clean([self::TAGS => ['ipub.gravatar']]);
 	}

src/IPub/Gravatar/DI/GravatarExtension.php

@@ -48,7 +48,7 @@ final class GravatarExtension extends DI\CompilerExtension
 	/**
 	 * @return void
 	 */
-	public function loadConfiguration()
+	public function loadConfiguration() : void
 	{
 		// Get container builder
 		$builder = $this->getContainerBuilder();
@@ -77,7 +77,7 @@ public function loadConfiguration()
 	/**
 	 * {@inheritdoc}
 	 */
-	public function beforeCompile()
+	public function beforeCompile() : void
 	{
 		parent::beforeCompile();
 
@@ -101,7 +101,7 @@ public function beforeCompile()
 	 */
 	public static function register(Nette\Configurator $config, string $extensionName = 'gravatar')
 	{
-		$config->onCompile[] = function (Nette\Configurator $config, Nette\DI\Compiler $compiler) use ($extensionName) {
+		$config->onCompile[] = function (Nette\Configurator $config, Nette\DI\Compiler $compiler) use ($extensionName) : void {
 			$compiler->addExtension($extensionName, new GravatarExtension());
 		};
 	}

src/IPub/Gravatar/Gravatar.php

@@ -35,8 +35,11 @@
  */
 final class Gravatar
 {
+	/**
+	 * Implement nette smart magic
+	 */
 	use Nette\SmartObject;
-	
+
 	/**
 	 * @var string - URL constants for the avatar images
 	 */
@@ -140,7 +143,7 @@ public function getEmailHash(string $email = NULL) : string
 	 *
 	 * @return void
 	 */
-	public function setSize(int $size)
+	public function setSize(int $size) : void
 	{
 		if ($this->isSizeValid($size)) {
 			$this->size = $size;
@@ -180,7 +183,7 @@ public function isSizeValid(int $size) : bool
 	 *
 	 * @return void
 	 */
-	public function setExpiration(int $expiration)
+	public function setExpiration(int $expiration) : void
 	{
 		$this->expiration = $expiration;
 	}
@@ -194,7 +197,7 @@ public function setExpiration(int $expiration)
 	 *
 	 * @throws Exceptions\InvalidArgumentException
 	 */
-	public function setDefaultImage($image)
+	public function setDefaultImage($image) : void
 	{
 		// Quick check against boolean FALSE.
 		if ($image === FALSE) {
@@ -226,7 +229,7 @@ public function setDefaultImage($image)
 	 *
 	 * @return mixed - False if no default image set, string if one is set
 	 */
-	public function getDefaultImage(string $defaultImage = NULL)
+	public function getDefaultImage(string $defaultImage = NULL) : void
 	{
 		if ($defaultImage !== NULL && in_array($defaultImage, ['404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'])) {
 			return $defaultImage;
@@ -248,7 +251,7 @@ public function getDefaultImage(string $defaultImage = NULL)
 	 *
 	 * @throws Exceptions\InvalidArgumentException
 	 */
-	public function setMaxRating(string $rating)
+	public function setMaxRating(string $rating) : void
 	{
 		$rating = strtolower($rating);
 
@@ -310,7 +313,7 @@ public function usingSecureImages() : bool
 	 *
 	 * @return void
 	 */
-	public function enableSecureImages()
+	public function enableSecureImages() : void
 	{
 		$this->useSecureUrl = TRUE;
 	}
@@ -320,7 +323,7 @@ public function enableSecureImages()
 	 *
 	 * @return void
 	 */
-	public function disableSecureImages()
+	public function disableSecureImages() : void
 	{
 		$this->useSecureUrl = FALSE;
 	}
@@ -397,7 +400,7 @@ public function buildUrl(string $email = NULL, int $size = NULL, string $maxRati
 	 *
 	 * @return bool|NULL Boolean if we could connect, null if no connection to gravatar.com
 	 */
-	public function exists(string $email)
+	public function exists(string $email) : ?bool
 	{
 		$path = $this->buildUrl($email, NULL, NULL, '404');
 

src/IPub/Gravatar/TGravatar.php

@@ -36,7 +36,7 @@ trait TGravatar
 	 *
 	 * @return void
 	 */
-	public function injectGravatar(Gravatar $gravatar)
+	public function injectGravatar(Gravatar $gravatar) : void
 	{
 		$this->gravatar = $gravatar;
 	}

src/IPub/Gravatar/Templating/Helpers.php

@@ -32,6 +32,9 @@
  */
 final class Helpers
 {
+	/**
+	 * Implement nette smart magic
+	 */
 	use Nette\SmartObject;
 
 	/**

tests/IPubTests/Gravatar/TemplateTest.phpt

@@ -118,12 +118,7 @@ class TemplateTest extends Tester\TestCase
 
 		$version = getenv('NETTE');
 
-		if (!$version || $version == 'default') {
-			$config->addConfig(__DIR__ . DS . 'files' . DS . 'presenters.neon');
-
-		} else {
-			$config->addConfig(__DIR__ . DS . 'files' . DS . 'presenters_2.3.neon');
-		}
+		$config->addConfig(__DIR__ . DS . 'files' . DS . 'presenters.neon');
 
 		return $config->createContainer();
 	}