- Yet another code cleaning

ipublikuj-archive · Mar 18, 2018 · cfdc3a9 · cfdc3a9
1 parent 4ef0408
commit cfdc3a9
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 38 deletions.
diff --git a/src/IPub/MobileDetect/DI/MobileDetectExtension.php b/src/IPub/MobileDetect/DI/MobileDetectExtension.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     DI
  * @since          1.0.0
@@ -19,7 +19,6 @@
 use Nette;
 use Nette\Bridges;
 use Nette\DI;
-use Nette\PhpGenerator as Code;
 
 use Tracy;
 

diff --git a/src/IPub/MobileDetect/Diagnostics/Panel.php b/src/IPub/MobileDetect/Diagnostics/Panel.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@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
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Events
  * @since          1.0.0
@@ -299,7 +299,7 @@ private function hasMobileRedirect() : bool
 	private function needPhoneResponseModify() : bool
 	{
 		if (($this->deviceView->getViewType() === NULL || $this->deviceView->isPhoneView()) && $this->mobileDetect->isMobile() && !$this->mobileDetect->isTablet()) {
-			$this->onResponseHandler->modifyResponseClosure = function ($deviceView) {
+			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) : Http\IResponse {
 				return $deviceView->modifyPhoneResponse();
 			};
 
@@ -317,7 +317,7 @@ private function needPhoneResponseModify() : bool
 	private function needTabletResponseModify() : bool
 	{
 		if (($this->deviceView->getViewType() === NULL || $this->deviceView->isTabletView()) && $this->mobileDetect->isTablet()) {
-			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) {
+			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) : Http\IResponse {
 				return $deviceView->modifyTabletResponse();
 			};
 
@@ -335,7 +335,7 @@ private function needTabletResponseModify() : bool
 	private function needMobileResponseModify() : bool
 	{
 		if (($this->deviceView->getViewType() === NULL || $this->deviceView->isMobileView()) && $this->mobileDetect->isMobile()) {
-			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) {
+			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) : Http\IResponse {
 				return $deviceView->modifyMobileResponse();
 			};
 
@@ -353,7 +353,7 @@ private function needMobileResponseModify() : bool
 	private function needNotMobileResponseModify() : bool
 	{
 		if ($this->deviceView->getViewType() === NULL || $this->deviceView->isNotMobileView()) {
-			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) {
+			$this->onResponseHandler->modifyResponseClosure = function (Helpers\DeviceView $deviceView) : Http\IResponse {
 				return $deviceView->modifyNotMobileResponse();
 			};
 
@@ -391,29 +391,31 @@ private function getRedirectResponseBySwitchParam() : Responses\RedirectResponse
 
 	/**
 	 * Gets the device RedirectResponse
-	 * 
+	 *
 	 * @param string $device
 	 *
-	 * @return Responses\RedirectResponse
+	 * @return Responses\RedirectResponse|NULL
 	 */
-	private function getDeviceRedirectResponse(string $device) : Responses\RedirectResponse
+	private function getDeviceRedirectResponse(string $device) : ?Responses\RedirectResponse
 	{
 		if ($host = $this->getRedirectUrl($device)) {
 			return $this->deviceView->getMobileRedirectResponse(
 				$host,
 				$this->redirectConf[$device]['statusCode']
 			);
 		}
+
+		return NULL;
 	}
 
 	/**
 	 * Gets the redirect url
 	 *
 	 * @param string $platform
 	 *
-	 * @return string
+	 * @return string|NULL
 	 */
-	private function getRedirectUrl(string $platform) : string
+	private function getRedirectUrl(string $platform) : ?string
 	{
 		if ($routingOption = $this->getRoutingOption($platform)) {
 			switch ($routingOption) {
@@ -424,6 +426,8 @@ private function getRedirectUrl(string $platform) : string
 					return $this->redirectConf[$platform]['host'];
 			}
 		}
+
+		return NULL;
 	}
 
 	/**

diff --git a/src/IPub/MobileDetect/Events/OnResponseHandler.php b/src/IPub/MobileDetect/Events/OnResponseHandler.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Events
  * @since          1.0.0
@@ -17,7 +17,6 @@
 namespace IPub\MobileDetect\Events;
 
 use Nette\Application;
-use Nette\Http;
 
 use IPub\MobileDetect\Helpers\DeviceView;
 
@@ -74,8 +73,6 @@ public function __invoke(Application\Application $application) : void
 		if ($this->needModifyResponse && $this->modifyResponseClosure instanceof \Closure) {
 			$modifyClosure = $this->modifyResponseClosure;
 			$modifyClosure($this->deviceView);
-
-			return;
 		}
 	}
 }
diff --git a/src/IPub/MobileDetect/Exceptions/CompileException.php b/src/IPub/MobileDetect/Exceptions/CompileException.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@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
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@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
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Exceptions
  * @since          2.0.0

diff --git a/src/IPub/MobileDetect/Helpers/CookieSettings.php b/src/IPub/MobileDetect/Helpers/CookieSettings.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Helpers
  * @since          1.0.0

diff --git a/src/IPub/MobileDetect/Helpers/DeviceView.php b/src/IPub/MobileDetect/Helpers/DeviceView.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Helpers
  * @since          1.0.0
@@ -19,7 +19,6 @@
 use Nette;
 use Nette\Application;
 use Nette\Http;
-use Nette\Utils;
 
 /**
  * Device view detector helper
@@ -194,7 +193,7 @@ public function setNotMobileView() : void
 	 */
 	public function getSwitchParameterName() : string
 	{
-		$this->switchParameterName;
+		return $this->switchParameterName;
 	}
 
 	/**

diff --git a/src/IPub/MobileDetect/Latte/Macros.php b/src/IPub/MobileDetect/Latte/Macros.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Latte
  * @since          1.0.0
@@ -16,9 +16,6 @@
 
 namespace IPub\MobileDetect\Latte;
 
-use Nette;
-
-use Latte;
 use Latte\Compiler;
 use Latte\MacroNode;
 use Latte\PhpWriter;

diff --git a/src/IPub/MobileDetect/MobileDetect.php b/src/IPub/MobileDetect/MobileDetect.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     common
  * @since          1.0.0
@@ -16,11 +16,9 @@
 
 namespace IPub\MobileDetect;
 
-use Nette;
 use Nette\Http;
 
 use IPub\MobileDetect\Helpers;
-use IPub\MobileDetect\Templating;
 
 use Jenssegers\Agent;
 

diff --git a/src/IPub/MobileDetect/TMobileDetect.php b/src/IPub/MobileDetect/TMobileDetect.php
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@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
@@ -4,7 +4,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Templating
  * @since          1.0.0

diff --git a/tests/IPubTests/MobileDetect/DeviceViewTest.phpt b/tests/IPubTests/MobileDetect/DeviceViewTest.phpt
@@ -5,7 +5,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Tests
  * @since          1.0.0

diff --git a/tests/IPubTests/MobileDetect/ExtensionTest.phpt b/tests/IPubTests/MobileDetect/ExtensionTest.phpt
@@ -5,7 +5,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Tests
  * @since          1.0.0

diff --git a/tests/IPubTests/MobileDetect/MobileDetectTest.phpt b/tests/IPubTests/MobileDetect/MobileDetectTest.phpt
@@ -5,7 +5,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Tests
  * @since          1.0.0

diff --git a/tests/IPubTests/MobileDetect/TemplateTest.phpt b/tests/IPubTests/MobileDetect/TemplateTest.phpt
@@ -5,7 +5,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Tests
  * @since          1.0.0

diff --git a/tests/IPubTests/MobileDetect/libs/RouterFactory.php b/tests/IPubTests/MobileDetect/libs/RouterFactory.php
@@ -5,7 +5,7 @@
  *
  * @copyright      More in license.md
  * @license        https://www.ipublikuj.eu
- * @author         Adam Kadlec https://www.ipublikuj.eu
+ * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
  * @package        iPublikuj:MobileDetect!
  * @subpackage     Tests
  * @since          2.1.1