Apply Rector

Author: MGatner

rector.php

@@ -115,6 +115,6 @@
     $rectorConfig
         ->ruleWithConfiguration(TypedPropertyRector::class, [
             // Set to false if you use in libraries, or it does create breaking changes.
-            TypedPropertyRector::INLINE_PUBLIC => true,
+            TypedPropertyRector::INLINE_PUBLIC => false,
         ]);
 };

src/Config/Events.php

@@ -3,7 +3,5 @@
 use CodeIgniter\Events\Events;
 use Config\Services;
 
-Events::on('post_controller_constructor', function () {
-	// Ignore CLI requests
-	return is_cli() ?: service('visits')->record();
-});
+Events::on('post_controller_constructor', fn() => // Ignore CLI requests
+is_cli() ?: service('visits')->record());

src/Config/Services.php

@@ -13,7 +13,7 @@ public static function visits(VisitsConfig $config = null, bool $getShared = tru
 			return static::getSharedInstance('visits', $config);
 		}
 
-		$config = $config ?? config('Visits');
+		$config ??= config('Visits');
 
 		return new Visits($config);
 	}

src/Entities/Visit.php

@@ -13,14 +13,7 @@ class Visit extends Entity
 	// magic IP string/long converters
 	public function setIpAddress($ipAddress)
 	{
-		if ($long = ip2long($ipAddress))
-		{
-			$this->attributes['ip_address'] = $long;
-		}
-		else
-		{
-			$this->attributes['ip_address'] = $ipAddress;
-		}
+		$this->attributes['ip_address'] = ($long = ip2long($ipAddress)) ? $long : $ipAddress;
 
 		return $this;
 	}
@@ -31,10 +24,8 @@ public function getIpAddress(string $format = 'long')
 		{
 			return long2ip($this->attributes['ip_address']);
 		}
-		else
-		{
-			return $this->attributes['ip_address'];
-		}
+
+        return $this->attributes['ip_address'];
 	}
 
 	// search for a visit with similar characteristics to the current one
@@ -54,13 +45,12 @@ public function getSimilar($trackingMethod, $resetMinutes = 60)
 		$visits = new VisitModel();
 		// check for matching components within the last resetMinutes
 		$since   = date('Y-m-d H:i:s', strtotime('-' . $resetMinutes . ' minutes'));
-		$similar = $visits->where('host', $this->host)
+
+		return $visits->where('host', $this->host)
 			->where('path', $this->path)
 			->where('query', (string)$this->query)
 			->where($trackingMethod, $this->{$trackingMethod})
 			->where('created_at >=', $since)
 			->first();
-
-		return $similar;
 	}
 }

src/Language/en/Visits.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Tatter\Visits\Language\en;
+
 return [
 	'noTrackingMethod'      => 'No tracking method selected.',
 	'invalidResetMinutes'   => 'Minutes-to-reset must be a positive integer or zero.',

src/Visits.php

@@ -1,5 +1,6 @@
 <?php namespace Tatter\Visits;
 
+use CodeIgniter\Session\Session;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Database\ConnectionInterface;
@@ -25,11 +26,11 @@ class Visits
 	protected $db;
 
 	/**
-	 * The active user session, for session data and tracking.
-	 *
-	 * @var \CodeIgniter\Session\Session
-	 */
-	protected $session;
+  * The active user session, for session data and tracking.
+  *
+  * @var Session
+  */
+ protected $session;
 
 	// initiate library, check for existing session
 	public function __construct(VisitsConfig $config, $db = null)