- Just small code cleaning

akadlec · akadlec · commit 4ef04083b2ca · 2018-03-18T09:40:13.000+01:00
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
 		{
 			"name"		: "iPublikuj:cms",
 			"email"		: "info@ipublikuj.eu",
-			"homepage"	: "http://www.ipublikuj.eu/"
+			"homepage"	: "https://www.ipublikuj.eu/"
 		}
 	],
 
diff --git a/readme.md b/readme.md
@@ -50,4 +50,4 @@ class BasePresenter extends Nette\Application\UI\Presenter
 Learn how to get info about visitor device in [documentation](https://github.com/iPublikuj/mobile-detect/blob/master/docs/en/index.md).
 
 ***
-Homepage [http://www.ipublikuj.eu](http://www.ipublikuj.eu) and repository [http://github.com/iPublikuj/mobile-detect](http://github.com/iPublikuj/mobile-detect).
+Homepage [https://www.ipublikuj.eu](https://www.ipublikuj.eu) and repository [http://github.com/iPublikuj/mobile-detect](http://github.com/iPublikuj/mobile-detect).
diff --git a/src/IPub/MobileDetect/DI/MobileDetectExtension.php b/src/IPub/MobileDetect/DI/MobileDetectExtension.php
@@ -3,8 +3,8 @@
  * MobileDetectExtension.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     DI
  * @since          1.0.0
@@ -21,8 +21,10 @@
 use Nette\DI;
 use Nette\PhpGenerator as Code;
 
-use IPub;
+use Tracy;
+
 use IPub\MobileDetect;
+use IPub\MobileDetect\Diagnostics;
 use IPub\MobileDetect\Events;
 use IPub\MobileDetect\Helpers;
 use IPub\MobileDetect\Templating;
@@ -41,7 +43,7 @@ final class MobileDetectExtension extends DI\CompilerExtension
 	 * @var array
 	 */
 	private $defaults = [
-		'redirect'         => [
+		'redirect'            => [
 			'mobile'               => [
 				'isEnabled'  => FALSE,
 				'host'       => NULL,
@@ -63,19 +65,19 @@ final class MobileDetectExtension extends DI\CompilerExtension
 			'detectPhoneAsMobile'  => FALSE,
 			'detectTabletAsMobile' => FALSE,
 		],
-		'switchDeviceView' => [
+		'switchDeviceView'    => [
 			'saveRefererPath' => TRUE
 		],
 		'switchParameterName' => 'device_view',
-		'deviceViewCookie' => [
+		'deviceViewCookie'    => [
 			'name'        => 'device_view',
 			'domain'      => NULL,
 			'expireAfter' => '+1 month',
 			'path'        => '/',
 			'secure'      => FALSE,
 			'httpOnly'    => TRUE,
 		],
-		'debugger' => '%debugMode%'
+		'debugger'            => '%debugMode%'
 	];
 
 	/**
@@ -90,14 +92,14 @@ public function loadConfiguration() : void
 
 		// Install mobile detect service
 		$mobileDetect = $builder->addDefinition($this->prefix('mobileDetect'))
-			->setClass(MobileDetect\MobileDetect::class);
+			->setType(MobileDetect\MobileDetect::class);
 
 		$builder->addDefinition($this->prefix('deviceView'))
-			->setClass(Helpers\DeviceView::class)
+			->setType(Helpers\DeviceView::class)
 			->setArguments(['setSwitchParameterName' => $configuration['switchParameterName']]);
 
 		$builder->addDefinition($this->prefix('cookieSettings'))
-			->setClass(Helpers\CookieSettings::class)
+			->setType(Helpers\CookieSettings::class)
 			->setArguments([
 				'name'        => $configuration['deviceViewCookie']['name'],
 				'domain'      => $configuration['deviceViewCookie']['domain'],
@@ -107,24 +109,24 @@ public function loadConfiguration() : void
 				'httpOnly'    => $configuration['deviceViewCookie']['httpOnly'],
 			]);
 
-		if ($configuration['debugger'] && interface_exists('Tracy\IBarPanel')) {
+		if ($configuration['debugger'] && interface_exists(Tracy\IBarPanel::class)) {
 			$builder->addDefinition($this->prefix('panel'))
-				->setClass('IPub\MobileDetect\Diagnostics\Panel');
+				->setType(Diagnostics\Panel::class);
 
 			$mobileDetect->addSetup('?->register(?)', [$this->prefix('@panel'), '@self']);
 		}
 
 		$builder->addDefinition($this->prefix('onRequestHandler'))
-			->setClass(Events\OnRequestHandler::class)
+			->setType(Events\OnRequestHandler::class)
 			->addSetup('$redirectConf', [$configuration['redirect']])
 			->addSetup('$isFullPath', [$configuration['switchDeviceView']['saveRefererPath']]);
 
 		$builder->addDefinition($this->prefix('onResponseHandler'))
-			->setClass(Events\OnResponseHandler::class);
+			->setType(Events\OnResponseHandler::class);
 
 		// Register template helpers
 		$builder->addDefinition($this->prefix('helpers'))
-			->setClass(Templating\Helpers::class)
+			->setType(Templating\Helpers::class)
 			->setAutowired(FALSE);
 
 		$application = $builder->getDefinition('application');
@@ -166,7 +168,7 @@ public function beforeCompile() : void
 	 *
 	 * @return void
 	 */
-	public static function register(Nette\Configurator $config, string $extensionName = 'mobileDetect')
+	public static function register(Nette\Configurator $config, string $extensionName = 'mobileDetect') : void
 	{
 		$config->onCompile[] = function (Nette\Configurator $config, Nette\DI\Compiler $compiler) use ($extensionName) : void {
 			$compiler->addExtension($extensionName, new MobileDetectExtension());
diff --git a/src/IPub/MobileDetect/Diagnostics/Panel.php b/src/IPub/MobileDetect/Diagnostics/Panel.php
@@ -3,8 +3,8 @@
  * Panel.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Diagnostics
  * @since          1.0.0
diff --git a/src/IPub/MobileDetect/Events/OnRequestHandler.php b/src/IPub/MobileDetect/Events/OnRequestHandler.php
@@ -3,8 +3,8 @@
  * OnRequestHandler.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Events
  * @since          1.0.0
@@ -33,13 +33,13 @@
  */
 final class OnRequestHandler
 {
-	const REDIRECT = 'redirect';
-	const NO_REDIRECT = 'noRedirect';
-	const REDIRECT_WITHOUT_PATH = 'redirectWithoutPath';
+	private const REDIRECT = 'redirect';
+	private const NO_REDIRECT = 'noRedirect';
+	private const REDIRECT_WITHOUT_PATH = 'redirectWithoutPath';
 
-	const MOBILE = 'mobile';
-	const TABLET = 'tablet';
-	const PHONE = 'phone';
+	private const MOBILE = 'mobile';
+	private const TABLET = 'tablet';
+	private const PHONE = 'phone';
 
 	/**
 	 * @var array
diff --git a/src/IPub/MobileDetect/Events/OnResponseHandler.php b/src/IPub/MobileDetect/Events/OnResponseHandler.php
@@ -3,8 +3,8 @@
  * OnResponseHandler.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Events
  * @since          1.0.0
diff --git a/src/IPub/MobileDetect/Exceptions/CompileException.php b/src/IPub/MobileDetect/Exceptions/CompileException.php
@@ -3,8 +3,8 @@
  * CompileException.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Exceptions
  * @since          2.0.0
diff --git a/src/IPub/MobileDetect/Exceptions/IException.php b/src/IPub/MobileDetect/Exceptions/IException.php
@@ -3,8 +3,8 @@
  * IException.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Exceptions
  * @since          2.0.0
diff --git a/src/IPub/MobileDetect/Exceptions/InvalidArgumentException.php b/src/IPub/MobileDetect/Exceptions/InvalidArgumentException.php
@@ -3,8 +3,8 @@
  * InvalidArgumentException.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Exceptions
  * @since          2.0.0
@@ -16,8 +16,6 @@
 
 namespace IPub\MobileDetect\Exceptions;
 
-use Nette;
-
-class MobileDetect extends Nette\InvalidArgumentException implements IException
+class InvalidArgumentException extends \InvalidArgumentException implements IException
 {
 }
diff --git a/src/IPub/MobileDetect/Helpers/CookieSettings.php b/src/IPub/MobileDetect/Helpers/CookieSettings.php
@@ -3,8 +3,8 @@
  * CookieSettings.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Helpers
  * @since          1.0.0
@@ -18,7 +18,6 @@
 
 use Nette;
 
-use IPub;
 use IPub\MobileDetect\Exceptions;
 
 /**
@@ -76,7 +75,7 @@ final class CookieSettings
 	 *
 	 * @throws Exceptions\InvalidArgumentException
 	 */
-	public function __construct(string $name, string $domain = NULL, string $expireAfter = NULL, string $path = '/',  bool $secure = FALSE, bool $httpOnly = TRUE)
+	public function __construct(string $name, ?string $domain = NULL, ?string $expireAfter = NULL, string $path = '/',  bool $secure = FALSE, bool $httpOnly = TRUE)
 	{
 		// from PHP source code
 		if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
@@ -116,7 +115,7 @@ public function getName() : string
 	 *
 	 * @return string|NULL
 	 */
-	public function getDomain()
+	public function getDomain() : ?string
 	{
 		return $this->domain;
 	}
diff --git a/src/IPub/MobileDetect/Helpers/DeviceView.php b/src/IPub/MobileDetect/Helpers/DeviceView.php
@@ -3,8 +3,8 @@
  * DeviceView.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Helpers
  * @since          1.0.0
@@ -36,11 +36,11 @@ final class DeviceView
 	 */
 	use Nette\SmartObject;
 
-	const VIEW_MOBILE = 'mobile';
-	const VIEW_PHONE = 'phone';
-	const VIEW_TABLET = 'tablet';
-	const VIEW_FULL = 'full';
-	const VIEW_NOT_MOBILE = 'not_mobile';
+	public const VIEW_MOBILE = 'mobile';
+	public const VIEW_PHONE = 'phone';
+	public const VIEW_TABLET = 'tablet';
+	public const VIEW_FULL = 'full';
+	public const VIEW_NOT_MOBILE = 'not_mobile';
 
 	/**
 	 * @var Http\IRequest
diff --git a/src/IPub/MobileDetect/Latte/Macros.php b/src/IPub/MobileDetect/Latte/Macros.php
@@ -3,8 +3,8 @@
  * Macros.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Latte
  * @since          1.0.0
@@ -24,7 +24,6 @@
 use Latte\PhpWriter;
 use Latte\Macros\MacroSet;
 
-use IPub;
 use IPub\MobileDetect\Exceptions;
 
 /**
@@ -321,7 +320,7 @@ public function macroIsNotMobileView(MacroNode $node, PhpWriter $writer) : strin
 	 */
 	public static function prepareMacroArguments($macro) : array
 	{
-		$arguments = array_map(function ($value) {
+		$arguments = array_map(function ($value) : string {
 			return trim($value);
 		}, explode(',', $macro));
 
diff --git a/src/IPub/MobileDetect/MobileDetect.php b/src/IPub/MobileDetect/MobileDetect.php
@@ -3,8 +3,8 @@
  * MobileDetect.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     common
  * @since          1.0.0
@@ -19,7 +19,6 @@
 use Nette;
 use Nette\Http;
 
-use IPub;
 use IPub\MobileDetect\Helpers;
 use IPub\MobileDetect\Templating;
 
@@ -83,18 +82,18 @@ public function view() : string
 	}
 
 	/**
-	 * @return float|string
+	 * @return string
 	 */
-	public function browserVersion()
+	public function browserVersion() : string
 	{
-		return $this->version($this->browser());
+		return (string) $this->version($this->browser());
 	}
 
 	/**
-	 * @return float|string
+	 * @return string
 	 */
-	public function platformVersion()
+	public function platformVersion() : string
 	{
-		return $this->version($this->platform());
+		return (string) $this->version($this->platform());
 	}
 }
diff --git a/src/IPub/MobileDetect/TMobileDetect.php b/src/IPub/MobileDetect/TMobileDetect.php
@@ -3,8 +3,8 @@
  * TMobileDetect.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     common
  * @since          1.0.0
diff --git a/src/IPub/MobileDetect/Templating/Helpers.php b/src/IPub/MobileDetect/Templating/Helpers.php
@@ -3,8 +3,8 @@
  * Helpers.php
  *
  * @copyright      More in license.md
- * @license        http://www.ipublikuj.eu
- * @author         Adam Kadlec http://www.ipublikuj.eu
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec https://www.ipublikuj.eu
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Templating
  * @since          1.0.0
@@ -18,7 +18,6 @@
 
 use Nette;
 
-use IPub;
 use IPub\MobileDetect;
 
 /**
diff --git a/tests/IPubTests/MobileDetect/DeviceViewTest.phpt b/tests/IPubTests/MobileDetect/DeviceViewTest.phpt
diff --git a/tests/IPubTests/MobileDetect/ExtensionTest.phpt b/tests/IPubTests/MobileDetect/ExtensionTest.phpt
diff --git a/tests/IPubTests/MobileDetect/MobileDetectTest.phpt b/tests/IPubTests/MobileDetect/MobileDetectTest.phpt
diff --git a/tests/IPubTests/MobileDetect/TemplateTest.phpt b/tests/IPubTests/MobileDetect/TemplateTest.phpt
diff --git a/tests/IPubTests/MobileDetect/libs/RouterFactory.php b/tests/IPubTests/MobileDetect/libs/RouterFactory.php
diff --git a/tests/IPubTests/bootstrap.php b/tests/IPubTests/bootstrap.php
diff --git a/tests/IPubTests/php.ini b/tests/IPubTests/php.ini

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`{`
`11`	`11`	`"name" : "iPublikuj:cms",`
`12`	`12`	`"email" : "[email protected]",`
`13`		`- "homepage" : "http://www.ipublikuj.eu/"`
	`13`	`+ "homepage" : "https://www.ipublikuj.eu/"`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`* InvalidArgumentException.php`
`4`	`4`	`*`
`5`	`5`	`* @copyright More in license.md`
`6`		`- * @license http://www.ipublikuj.eu`
`7`		`- * @author Adam Kadlec http://www.ipublikuj.eu`
	`6`	`+ * @license https://www.ipublikuj.eu`
	`7`	`+ * @author Adam Kadlec https://www.ipublikuj.eu`
`8`	`8`	`* @package iPublikuj:MobileDetect!`
`9`	`9`	`* @subpackage Exceptions`
`10`	`10`	`* @since 2.0.0`
`@@ -16,8 +16,6 @@`
`16`	`16`
`17`	`17`	`namespace IPub\MobileDetect\Exceptions;`
`18`	`18`
`19`		`-use Nette;`
`20`		`-`
`21`		`-class MobileDetect extends Nette\InvalidArgumentException implements IException`
	`19`	`+class InvalidArgumentException extends \InvalidArgumentException implements IException`
`22`	`20`	`{`
`23`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`* CookieSettings.php`
`4`	`4`	`*`
`5`	`5`	`* @copyright More in license.md`
`6`		`- * @license http://www.ipublikuj.eu`
`7`		`- * @author Adam Kadlec http://www.ipublikuj.eu`
	`6`	`+ * @license https://www.ipublikuj.eu`
	`7`	`+ * @author Adam Kadlec https://www.ipublikuj.eu`
`8`	`8`	`* @package iPublikuj:MobileDetect!`
`9`	`9`	`* @subpackage Helpers`
`10`	`10`	`* @since 1.0.0`
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`use Nette;`
`20`	`20`
`21`		`-use IPub;`
`22`	`21`	`use IPub\MobileDetect\Exceptions;`
`23`	`22`
`24`	`23`	`/**`
`@@ -76,7 +75,7 @@ final class CookieSettings`
`76`	`75`	`*`
`77`	`76`	`* @throws Exceptions\InvalidArgumentException`
`78`	`77`	`*/`
`79`		`- public function __construct(string $name, string $domain = NULL, string $expireAfter = NULL, string $path = '/', bool $secure = FALSE, bool $httpOnly = TRUE)`
	`78`	`+ public function __construct(string $name, ?string $domain = NULL, ?string $expireAfter = NULL, string $path = '/', bool $secure = FALSE, bool $httpOnly = TRUE)`
`80`	`79`	`{`
`81`	`80`	`// from PHP source code`
`82`	`81`	`if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {`
`@@ -116,7 +115,7 @@ public function getName() : string`
`116`	`115`	`*`
`117`	`116`	`* @return string\|NULL`
`118`	`117`	`*/`
`119`		`- public function getDomain()`
	`118`	`+ public function getDomain() : ?string`
`120`	`119`	`{`
`121`	`120`	`return $this->domain;`
`122`	`121`	`}`