Minor cleanup to ComposerPackageModifier

Combine `setLinkAsProvides`, `newMediaWikiLink`,
and `getMediaWikiVersionConstraint` single use
private methods into `setProvidesMediaWiki`

Change-Id: I212ce9f25a85b27a9ff87fe9ae993e23626d0444

1 files changed, 17 insertions, 24 deletions

diff --git a/includes/composer/ComposerPackageModifier.php b/includes/composer/ComposerPackageModifier.php
index ccc85a4f5ae3..f52725224385 100644
--- a/includes/composer/ComposerPackageModifier.php
+++ b/includes/composer/ComposerPackageModifier.php
@@ -16,8 +16,15 @@ class ComposerPackageModifier {
 	protected $versionNormalizer;
 	protected $versionFetcher;
 
-	public function __construct( Package $package,
-		ComposerVersionNormalizer $versionNormalizer, MediaWikiVersionFetcher $versionFetcher
+	/**
+	 * @param Package $package
+	 * @param ComposerVersionNormalizer $versionNormalizer
+	 * @param MediaWikiVersionFetcher $versionFetcher
+	 */
+	public function __construct(
+		Package $package,
+		ComposerVersionNormalizer $versionNormalizer,
+		MediaWikiVersionFetcher $versionFetcher
 	) {
 		$this->package = $package;
 		$this->versionNormalizer = $versionNormalizer;
@@ -25,15 +32,14 @@ class ComposerPackageModifier {
 	}
 
 	public function setProvidesMediaWiki() {
-		$this->setLinkAsProvides( $this->newMediaWikiLink() );
-	}
-
-	private function setLinkAsProvides( Link $link ) {
-		$this->package->setProvides( [ $link ] );
-	}
+		$mvVersion = $this->versionFetcher->fetchVersion();
+		$mvVersion = $this->versionNormalizer->normalizeSuffix( $mvVersion );
 
-	private function newMediaWikiLink() {
-		$version = $this->getMediaWikiVersionConstraint();
+		$version = new Constraint(
+			'==',
+			$this->versionNormalizer->normalizeLevelCount( $mvVersion )
+		);
+		$version->setPrettyString( $mvVersion );
 
 		$link = new Link(
 			'__root__',
@@ -43,20 +49,7 @@ class ComposerPackageModifier {
 			$version->getPrettyString()
 		);
 
-		return $link;
-	}
-
-	private function getMediaWikiVersionConstraint() {
-		$mvVersion = $this->versionFetcher->fetchVersion();
-		$mvVersion = $this->versionNormalizer->normalizeSuffix( $mvVersion );
-
-		$version = new Constraint(
-			'==',
-			$this->versionNormalizer->normalizeLevelCount( $mvVersion )
-		);
-		$version->setPrettyString( $mvVersion );
-
-		return $version;
+		$this->package->setProvides( [ $link ] );
 	}
 
 }