rename methods

Author: staabm

src/Analyser/ConstantResolver.php

@@ -88,10 +88,10 @@ public function resolvePredefinedConstant(string $resolvedConstantName): ?Type
 			$maxMajor = null;
 
 			if ($this->composerMinPhpVersion !== null) {
-				$minMajor = max($minMajor, $this->composerMinPhpVersion->getMajor());
+				$minMajor = max($minMajor, $this->composerMinPhpVersion->getMajorVersionId());
 			}
 			if ($this->composerMaxPhpVersion !== null) {
-				$maxMajor = $this->composerMaxPhpVersion->getMajor();
+				$maxMajor = $this->composerMaxPhpVersion->getMajorVersionId();
 			}
 
 			return $this->createInteger($minMajor, $maxMajor);
@@ -103,10 +103,10 @@ public function resolvePredefinedConstant(string $resolvedConstantName): ?Type
 			if (
 				$this->composerMinPhpVersion !== null
 				&& $this->composerMaxPhpVersion !== null
-				&& $this->composerMaxPhpVersion->getMajor() === $this->composerMinPhpVersion->getMajor()
+				&& $this->composerMaxPhpVersion->getMajorVersionId() === $this->composerMinPhpVersion->getMajorVersionId()
 			) {
-				$minMinor = $this->composerMinPhpVersion->getMinor();
-				$maxMinor = $this->composerMaxPhpVersion->getMinor();
+				$minMinor = $this->composerMinPhpVersion->getMinorVersionId();
+				$maxMinor = $this->composerMaxPhpVersion->getMinorVersionId();
 			}
 
 			return $this->createInteger($minMinor, $maxMinor);
@@ -118,11 +118,11 @@ public function resolvePredefinedConstant(string $resolvedConstantName): ?Type
 			if (
 				$this->composerMinPhpVersion !== null
 				&& $this->composerMaxPhpVersion !== null
-				&& $this->composerMaxPhpVersion->getMajor() === $this->composerMinPhpVersion->getMajor()
-				&& $this->composerMaxPhpVersion->getMinor() === $this->composerMinPhpVersion->getMinor()
+				&& $this->composerMaxPhpVersion->getMajorVersionId() === $this->composerMinPhpVersion->getMajorVersionId()
+				&& $this->composerMaxPhpVersion->getMinorVersionId() === $this->composerMinPhpVersion->getMinorVersionId()
 			) {
-				$minRelease = $this->composerMinPhpVersion->getPatch();
-				$maxRelease = $this->composerMaxPhpVersion->getPatch();
+				$minRelease = $this->composerMinPhpVersion->getPatchVersionId();
+				$maxRelease = $this->composerMaxPhpVersion->getPatchVersionId();
 			}
 
 			return $this->createInteger($minRelease, $maxRelease);

src/Php/PhpVersion.php

@@ -41,26 +41,26 @@ public function getVersionId(): int
 		return $this->versionId;
 	}
 
-	public function getMajor(): int
+	public function getMajorVersionId(): int
 	{
 		return (int) floor($this->versionId / 10000);
 	}
 
-	public function getMinor(): int
+	public function getMinorVersionId(): int
 	{
 		return (int) floor(($this->versionId % 10000) / 100);
 	}
 
-	public function getPatch(): int
+	public function getPatchVersionId(): int
 	{
 		return (int) floor($this->versionId % 100);
 	}
 
 	public function getVersionString(): string
 	{
-		$first = $this->getMajor();
-		$second = $this->getMinor();
-		$third = $this->getPatch();
+		$first = $this->getMajorVersionId();
+		$second = $this->getMinorVersionId();
+		$third = $this->getPatchVersionId();
 
 		return $first . '.' . $second . ($third !== 0 ? '.' . $third : '');
 	}