- Just small code cleaning

.travis.composer.php

@@ -10,7 +10,7 @@
 
 $file = __DIR__ . '/composer.json';
 $content = file_get_contents($file);
-$composer  = json_decode($content, TRUE);
+$composer = json_decode($content, TRUE);
 
 $composer['require']['nette/application'] = $version;
 $composer['require']['nette/di'] = $version;

src/IPub/Gravatar/Application/GravatarResponse.php

@@ -20,7 +20,6 @@
 use Nette\Utils;
 use Nette\Http;
 
-use IPub;
 use IPub\Gravatar;
 use IPub\Gravatar\Exceptions;
 

src/IPub/Gravatar/Caching/Cache.php

@@ -16,7 +16,6 @@
 
 namespace IPub\Gravatar\Caching;
 
-use Nette;
 use Nette\Caching;
 
 /**

src/IPub/Gravatar/DI/GravatarExtension.php

@@ -21,7 +21,6 @@
 use Nette\DI;
 use Nette\PhpGenerator as Code;
 
-use IPub;
 use IPub\Gravatar;
 use IPub\Gravatar\Caching;
 use IPub\Gravatar\Templating;
@@ -57,19 +56,19 @@ public function loadConfiguration() : void
 
 		// Install Gravatar service
 		$builder->addDefinition($this->prefix('gravatar'))
-			->setClass(Gravatar\Gravatar::class)
+			->setType(Gravatar\Gravatar::class)
 			->addSetup('setSize', [$configuration['size']])
 			->addSetup('setExpiration', [$configuration['expiration']])
 			->addSetup('setDefaultImage', [$configuration['defaultImage']]);
 
 		// Create cache services
 		$builder->addDefinition($this->prefix('cache'))
-			->setClass(Caching\Cache::class, ['@cacheStorage', 'IPub.Gravatar'])
+			->setType(Caching\Cache::class, ['@cacheStorage', 'IPub.Gravatar'])
 			->setInject(FALSE);
 
 		// Register template helpers
 		$builder->addDefinition($this->prefix('helpers'))
-			->setClass(Templating\Helpers::class)
+			->setType(Templating\Helpers::class)
 			->setFactory($this->prefix('@gravatar') . '::createTemplateHelpers')
 			->setInject(FALSE);
 	}
@@ -99,7 +98,7 @@ public function beforeCompile() : void
 	 *
 	 * @return void
 	 */
-	public static function register(Nette\Configurator $config, string $extensionName = 'gravatar')
+	public static function register(Nette\Configurator $config, string $extensionName = 'gravatar') : void
 	{
 		$config->onCompile[] = function (Nette\Configurator $config, Nette\DI\Compiler $compiler) use ($extensionName) : void {
 			$compiler->addExtension($extensionName, new GravatarExtension());

src/IPub/Gravatar/Exceptions/InvalidStateException.php

@@ -16,8 +16,6 @@
 
 namespace IPub\Gravatar\Exceptions;
 
-use Nette;
-
-class InvalidStateException extends Nette\InvalidStateException implements IException
+class InvalidStateException extends \RuntimeException implements IException
 {
 }

src/IPub/Gravatar/Gravatar.php

@@ -20,7 +20,6 @@
 use Nette\Http;
 use Nette\Utils;
 
-use IPub;
 use IPub\Gravatar\Caching;
 use IPub\Gravatar\Exceptions;
 use IPub\Gravatar\Templating;
@@ -43,8 +42,8 @@ final class Gravatar
 	/**
 	 * @var string - URL constants for the avatar images
 	 */
-	const HTTP_URL = 'http://www.gravatar.com/avatar/';
-	const HTTPS_URL = 'https://secure.gravatar.com/avatar/';
+	public const HTTP_URL = 'http://www.gravatar.com/avatar/';
+	public const HTTPS_URL = 'https://secure.gravatar.com/avatar/';
 
 	/**
 	 * @var int
@@ -121,7 +120,7 @@ public function __construct(
 	 *
 	 * @return string - The hashed form of the email, post cleaning
 	 */
-	public function getEmailHash(string $email = NULL) : string
+	public function getEmailHash(?string $email = NULL) : string
 	{
 		// Tack the email hash onto the end.
 		if ($this->hashEmail === TRUE && $email !== NULL) {
@@ -229,7 +228,7 @@ public function setDefaultImage($image) : void
 	 *
 	 * @return mixed - False if no default image set, string if one is set
 	 */
-	public function getDefaultImage(string $defaultImage = NULL) : ?string
+	public function getDefaultImage(?string $defaultImage = NULL) : ?string
 	{
 		if ($defaultImage !== NULL && in_array($defaultImage, ['404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'])) {
 			return $defaultImage;
@@ -269,7 +268,7 @@ public function setMaxRating(string $rating) : void
 	 *
 	 * @return string - The string representing the current maximum allowed rating ('g', 'pg', 'r', 'x').
 	 */
-	public function getMaxRating(string $maxRating = NULL) : string
+	public function getMaxRating(?string $maxRating = NULL) : string
 	{
 		if ($maxRating !== NULL && in_array($maxRating, ['g', 'pg', 'r', 'x'])) {
 			return $maxRating;
@@ -338,7 +337,7 @@ public function disableSecureImages() : void
 	 *
 	 * @throws Exceptions\InvalidArgumentException
 	 */
-	public function get(string $email = NULL, int $size = NULL) : Utils\Image
+	public function get(?string $email = NULL, ?int $size = NULL) : Utils\Image
 	{
 		// Set user email address
 		if ($email !== NULL && !Utils\Validators::isEmail($email)) {
@@ -378,7 +377,7 @@ public function get(string $email = NULL, int $size = NULL) : Utils\Image
 	 *
 	 * @throws Exceptions\InvalidArgumentException
 	 */
-	public function buildUrl(string $email = NULL, int $size = NULL, string $maxRating = NULL, string $defaultImage = NULL) : string
+	public function buildUrl(?string $email = NULL, ?int $size = NULL, ?string $maxRating = NULL, ?string $defaultImage = NULL) : string
 	{
 		// Set user email address
 		if ($email !== NULL && !Utils\Validators::isEmail($email)) {
@@ -431,7 +430,7 @@ public function createTemplateHelpers() : Templating\Helpers
 	 *
 	 * @return Http\Url
 	 */
-	private function createUrl(string $email, int $size = NULL, string $maxRating = NULL, string $defaultImage = NULL) : Http\Url
+	private function createUrl(string $email, ?int $size = NULL, ?string $maxRating = NULL, ?string $defaultImage = NULL) : Http\Url
 	{
 		// Tack the email hash onto the end.
 		$emailHash = $this->getEmailHash($email);

src/IPub/Gravatar/Templating/Helpers.php

@@ -56,7 +56,7 @@ public function __construct(Gravatar\Gravatar $gravatar)
 	 *
 	 * @return string
 	 */
-	public function gravatar(string $email, int $size = NULL) : string
+	public function gravatar(string $email, ?int $size = NULL) : string
 	{
 		return $this->gravatar
 			->buildUrl($email, $size);

tests/IPubTests/Gravatar/ExtensionTest.phpt

@@ -22,14 +22,13 @@ use Nette;
 use Tester;
 use Tester\Assert;
 
-use IPub;
 use IPub\Gravatar;
 
 require __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 class ExtensionTest extends Tester\TestCase
 {
-	public function testFunctional()
+	public function testFunctional() : void
 	{
 		$dic = $this->createContainer();
 

tests/IPubTests/Gravatar/GravatarTest.phpt

@@ -22,7 +22,6 @@ use Nette;
 use Tester;
 use Tester\Assert;
 
-use IPub;
 use IPub\Gravatar;
 
 require __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
@@ -37,7 +36,7 @@ class GravatarTest extends Tester\TestCase
 	/**
 	 * {@inheritdoc}
 	 */
-	public function setUp()
+	public function setUp() : void
 	{
 		parent::setUp();
 
@@ -47,19 +46,19 @@ class GravatarTest extends Tester\TestCase
 		$this->gravatar = $dic->getService('gravatar.gravatar');
 	}
 
-	public function testGravatarUrlWithDefaultOptions()
+	public function testGravatarUrlWithDefaultOptions() : void
 	{
 		Assert::equal('http://www.gravatar.com/avatar/aabfda88704a1ab55db46d4116442222?s=80&r=g&d=mm', $this->gravatar->buildUrl('john.doe@ipublikuj.eu'));
 	}
 
-	public function testGravatarSecureUrlWithDefaultOptions()
+	public function testGravatarSecureUrlWithDefaultOptions() : void
 	{
 		$this->gravatar->enableSecureImages();
 
 		Assert::equal('https://secure.gravatar.com/avatar/aabfda88704a1ab55db46d4116442222?s=80&r=g&d=mm', $this->gravatar->buildUrl('john.doe@ipublikuj.eu', NULL));
 	}
 
-	public function testGravatarInitializedWithOptions()
+	public function testGravatarInitializedWithOptions() : void
 	{
 		$this->gravatar->setSize(20);
 		$this->gravatar->setMaxRating('g');
@@ -68,7 +67,7 @@ class GravatarTest extends Tester\TestCase
 		Assert::equal('http://www.gravatar.com/avatar/aabfda88704a1ab55db46d4116442222?s=20&r=g&d=mm', $this->gravatar->buildUrl('john.doe@ipublikuj.eu'));
 	}
 
-	public function testGravatarExists()
+	public function testGravatarExists() : void
 	{
 		Assert::false($this->gravatar->exists('fake.email@ipublikuj.eu'));
 		Assert::true($this->gravatar->exists('adam.kadlec@gmail.com'));

tests/IPubTests/Gravatar/TemplateTest.phpt

@@ -26,7 +26,6 @@ use Nette\Utils;
 use Tester;
 use Tester\Assert;
 
-use IPub;
 use IPub\Gravatar;
 
 require __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
@@ -52,7 +51,7 @@ class TemplateTest extends Tester\TestCase
 	/**
 	 * {@inheritdoc}
 	 */
-	public function setUp()
+	public function setUp() : void
 	{
 		parent::setUp();
 
@@ -65,7 +64,7 @@ class TemplateTest extends Tester\TestCase
 		$this->gravatar = $this->container->getByType(Gravatar\Gravatar::class);
 	}
 
-	public function testMobileVersion()
+	public function testMacroVersion() : void
 	{
 		// Create test presenter
 		$presenter = $this->createPresenter();
@@ -128,7 +127,7 @@ class TestPresenter extends UI\Presenter
 {
 	use Gravatar\TGravatar;
 
-	public function renderDefault()
+	public function renderDefault() : void
 	{
 		// Set template for component testing
 		$this->template->setFile(__DIR__ . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . 'default.latte');

tests/IPubTests/bootstrap.php

@@ -19,10 +19,11 @@
 Tester\Helpers::purge(TEMP_DIR);
 \Tracy\Debugger::$logDirectory = TEMP_DIR;
 
-$_SERVER = array_intersect_key($_SERVER, array_flip(array(
-	'PHP_SELF', 'SCRIPT_NAME', 'SERVER_ADDR', 'SERVER_SOFTWARE', 'HTTP_HOST', 'DOCUMENT_ROOT', 'OS', 'argc', 'argv')));
+$_SERVER = array_intersect_key($_SERVER, array_flip([
+	'PHP_SELF', 'SCRIPT_NAME', 'SERVER_ADDR', 'SERVER_SOFTWARE', 'HTTP_HOST', 'DOCUMENT_ROOT', 'OS', 'argc', 'argv'
+]));
 $_SERVER['REQUEST_TIME'] = 1234567890;
-$_ENV = $_GET = $_POST = array();
+$_ENV = $_GET = $_POST = [];
 
 function id($val)
 {