moving common methods from IPAddressV[46] to AbstractIpAddress

Signed-off-by: Oliver Wegner <[email protected]>

lib/private/Net/AbstractIpAddress.php

@@ -8,28 +8,49 @@
 abstract class AbstractIpAddress implements IIpAddress {
 	abstract public function getMaxBitlength(): int;
 	abstract protected function getCidrRegex(): string;
-
-	abstract protected function setOriginal(string $original);
-	abstract public function getOriginal(): string;
-	abstract protected function setAddress(string $address);
-	abstract public function getAddress(): string;
-	abstract protected function setNetmaskBits(int $bits);
-	abstract public function getNetmaskBits(): int;
 	abstract protected function matchCidr(IIpAddress $other): bool;
 
+	private $original = '';
+	private $netPart = '';
+	private $netmaskBits = 0;
+
 	public function __construct(string $address) {
 		$this->setOriginal($address);
 
 		if (preg_match($this->getCidrRegex(), $address, $match)) {
-			$this->setAddress($match[1]);
+			$this->setNetPart($match[1]);
 			$this->setNetmaskBits(max(0, min($this->getMaxBitlength(), intval($match[2]))));
 		} else {
-			$this->setAddress($address);
+			$this->setNetPart($address);
 			$this->setNetmaskbits($this->getMaxBitlength());
 		}
 	}
 
-	protected function matchLiteral(IIpAddress $other): bool {
+	protected function setOriginal(string $original) {
+		$this->original = $original;
+	}
+
+	protected function getOriginal(): string {
+		return $this->original;
+	}
+
+	protected function setNetPart(string $netPart) {
+		$this->netPart = $netPart;
+	}
+
+	protected function getNetPart(): string {
+		return $this->netPart;
+	}
+
+	protected function setNetmaskBits(int $bits) {
+		$this->netmaskBits = $bits;
+	}
+
+	protected function getNetmaskBits(): int {
+		return $this->netmaskBits;
+	}
+
+	protected function matchOriginal(IIpAddress $other): bool {
 		return $other->getOriginal() === $this->getOriginal();
 	}
 
@@ -40,7 +61,7 @@ public function isRange(): bool {
 	public function containsAddress(IIpAddress $other): bool {
 		return $this->isRange()
 			? $this->matchCidr($other)
-			: $this->matchLiteral($other);
+			: $this->matchOriginal($other);
 	}
 }
 

lib/private/Net/IpAddressV4.php

@@ -11,10 +11,6 @@ class IpAddressV4 extends AbstractIpAddress {
 	private $address = '';
 	private $cidrBits = 0;
 
-	public function __construct(string $address) {
-		parent::__construct($address);
-	}
-
 	public function getMaxBitlength(): int {
 		return 32;
 	}
@@ -23,34 +19,10 @@ protected function getCidrRegex(): string {
 		return '/^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\/([0-9]{1,2})$/';
 	}
 
-	protected function setOriginal(string $original) {
-		$this->original = $original;
-	}
-
-	public function getOriginal(): string {
-		return $this->original;
-	}
-
-	protected function setAddress(string $address) {
-		$this->address = $address;
-	}
-
-	public function getAddress(): string {
-		return $this->address;
-	}
-
-	protected function setNetmaskBits(int $bits) {
-		$this->cidrBits = $bits;
-	}
-
-	public function getNetmaskBits(): int {
-		return $this->cidrBits;
-	}
-
 	protected function matchCidr(IIpAddress $other): bool {
 		$shiftbits = $this->getMaxBitlength() - $this->getNetmaskBits();
-		$thisnum = ip2long($this->getAddress()) >> $shiftbits;
-		$othernum = ip2long($other->getAddress()) >> $shiftbits;
+		$thisnum = ip2long($this->getNetPart()) >> $shiftbits;
+		$othernum = ip2long($other->getNetPart()) >> $shiftbits;
 
 		return $othernum === $thisnum;
 	}

lib/private/Net/IpAddressV6.php

@@ -11,10 +11,6 @@ class IpAddressV6 extends AbstractIpAddress {
 	private $address = '';
 	private $cidrBits = 0;
 
-	public function __construct(string $address) {
-		parent::__construct($address);
-	}
-
 	public function getMaxBitlength(): int {
 		return 128;
 	}
@@ -23,36 +19,12 @@ protected function getCidrRegex(): string {
 		return '/^([0-9a-fA-F:]+[0-9a-fA-F:]+)\/([0-9]{1,3})$/';
 	}
 
-	protected function setOriginal(string $original) {
-		$this->original = $original;
-	}
-
-	public function getOriginal(): string {
-		return $this->original;
-	}
-
-	protected function setAddress(string $address) {
-		$this->address = $address;
-	}
-
-	public function getAddress(): string {
-		return $this->address;
-	}
-
-	protected function setNetmaskBits(int $bits) {
-		$this->cidrBits = $bits;
-	}
-
-	public function getNetmaskBits(): int {
-		return $this->cidrBits;
-	}
-
 	protected function matchCidr(IIpAddress $other): bool {
-		$thisaddrn = inet_pton($this->getAddress());
-		$otheraddrn = inet_pton($other->getAddress());
+		$thisaddrn = inet_pton($this->getNetPart());
+		$otheraddrn = inet_pton($other->getNetPart());
 		if ($thisaddrn === false || $otheraddrn === false) {
 			// if we can't handle ipV6 addresses, simply compare strings:
-			return $this->matchLiteral($other);
+			return $this->matchOriginal($other);
 		}
 
 		$netbits = $this->getNetmaskBits();