Merge pull request wikimedia#31 from bd808/scrutinizer

Fix issues reported by Scrutinizer tests

Author: legoktm

src/MergePlugin.php

@@ -20,11 +20,12 @@
 use Composer\Package\BasePackage;
 use Composer\Package\CompletePackage;
 use Composer\Package\Loader\ArrayLoader;
-use Composer\Package\RootPackageInterface;
+use Composer\Package\RootPackage;
 use Composer\Package\Version\VersionParser;
 use Composer\Plugin\PluginInterface;
 use Composer\Script\Event;
 use Composer\Script\ScriptEvents;
+use UnexpectedValueException;
 
 /**
  * Composer plugin that allows merging multiple composer.json files.
@@ -134,7 +135,7 @@ public static function getSubscribedEvents()
  */
  public function onInstallOrUpdate(Event $event)
  {
- $config = $this->readConfig($this->composer->getPackage());
+ $config = $this->readConfig($this->getRootPackage());
  if (isset($config['recurse'])) {
  $this->recurse = (bool)$config['recurse'];
  }
@@ -150,10 +151,10 @@ public function onInstallOrUpdate(Event $event)
  }
 
  /**
- * @param RootPackageInterface $package
+ * @param RootPackage $package
  * @return array
  */
- protected function readConfig(RootPackageInterface $package)
+ protected function readConfig(RootPackage $package)
  {
  $config = array(
  'include' => array(),
@@ -176,7 +177,7 @@ protected function readConfig(RootPackageInterface $package)
  */
  protected function mergePackages(array $config)
  {
- $root = $this->composer->getPackage();
+ $root = $this->getRootPackage();
  foreach (array_reduce(
  array_map('glob', $config['include']),
  'array_merge',
@@ -189,7 +190,7 @@ protected function mergePackages(array $config)
  /**
  * Read a JSON file and merge its contents
  *
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  * @param string $path
  */
  protected function loadFile($root, $path)
@@ -202,7 +203,7 @@ protected function loadFile($root, $path)
  }
  $this->debug("Loading <comment>{$path}</comment>...");
  $json = $this->readPackageJson($path);
- $package = $this->loader->load($json);
+ $package = $this->jsonToPackage($json);
 
  $this->mergeRequires($root, $package);
  $this->mergeDevRequires($root, $package);
@@ -250,15 +251,15 @@ protected function readPackageJson($path)
  }
 
  /**
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  * @param CompletePackage $package
  */
  protected function mergeRequires(
- RootPackageInterface $root,
+ RootPackage $root,
  CompletePackage $package
  ) {
  $requires = $package->getRequires();
- if (!$requires) {
+ if (empty($requires)) {
  return;
  }
 
@@ -272,15 +273,15 @@ protected function mergeRequires(
  }
 
  /**
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  * @param CompletePackage $package
  */
  protected function mergeDevRequires(
- RootPackageInterface $root,
+ RootPackage $root,
  CompletePackage $package
  ) {
  $requires = $package->getDevRequires();
- if (!$requires) {
+ if (empty($requires)) {
  return;
  }
 
@@ -294,18 +295,17 @@ protected function mergeDevRequires(
  }
 
  /**
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  * @param CompletePackage $package
  * @param string $path
  */
  protected function mergeAutoload(
- RootPackageInterface $root,
+ RootPackage $root,
  CompletePackage $package,
  $path
  ) {
  $autoload = $package->getAutoload();
-
- if (!$autoload) {
+ if (empty($autoload)) {
  return;
  }
 
@@ -328,11 +328,11 @@ function(&$path) use ($packagePath) {
  * Extract and merge stability flags from the given collection of
  * requires.
  *
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  * @param array $requires
  */
  protected function mergeStabilityFlags(
- RootPackageInterface $root,
+ RootPackage $root,
  array $requires
  ) {
  $flags = $root->getStabilityFlags();
@@ -350,11 +350,11 @@ protected function mergeStabilityFlags(
  * to the given package and the global repository manager.
  *
  * @param array $repositories
- * @param RootPackageInterface $root
+ * @param RootPackage $root
  */
  protected function addRepositories(
  array $repositories,
- RootPackageInterface $root
+ RootPackage $root
  ) {
  $repoManager = $this->composer->getRepositoryManager();
  $newRepos = array();
@@ -412,7 +412,7 @@ protected function mergeLinks(array $origin, array $merge, array &$dups)
  */
  public function onDependencySolve(InstallerEvent $event)
  {
- if (!$this->duplicateLinks) {
+ if (empty($this->duplicateLinks)) {
  return;
  }
 
@@ -429,6 +429,39 @@ public function onDependencySolve(InstallerEvent $event)
  }
  }
 
+ /**
+ * @return RootPackage
+ */
+ protected function getRootPackage()
+ {
+ $root = $this->composer->getPackage();
+ // @codeCoverageIgnoreStart
+ if (!$root instanceof RootPackage) {
+ throw new UnexpectedValueException(
+ 'Expected instance of RootPackage, got ' . get_class($root)
+ );
+ }
+ // @codeCoverageIgnoreEnd
+ return $root;
+ }
+
+ /**
+ * @return CompletePackage
+ */
+ protected function jsonToPackage($json)
+ {
+ $package = $this->loader->load($json);
+ // @codeCoverageIgnoreStart
+ if (!$package instanceof CompletePackage) {
+ throw new UnexpectedValueException(
+ 'Expected instance of CompletePackage, got ' .
+ get_class($package)
+ );
+ }
+ // @codeCoverageIgnoreEnd
+ return $package;
+ }
+
  /**
  * Log a debug message
  *
@@ -439,6 +472,7 @@ public function onDependencySolve(InstallerEvent $event)
  */
  protected function debug($message)
  {
+ // @codeCoverageIgnoreStart
  if ($this->inputOutput->isVerbose()) {
  $message = " <info>[merge]</info> {$message}";
 
@@ -449,6 +483,7 @@ protected function debug($message)
  $this->inputOutput->write($message);
  }
  }
+ // @codeCoverageIgnoreEnd
  }
 }
 // vim:sw=4:ts=4:sts=4:et: