Add hasReference to check if an installed package has the right sourceReference.

Modify add function to also update installed packages, remove exception, it is only called if a package is added or updated. Update InstalledPackage and InstalledPackageDumper to save and load new sourceReference variable. Check and send source reference for installed/updated packages. Fix tests for above changes.

Author: unknownnf

src/MagentoHackathon/Composer/Magento/InstalledPackage.php

@@ -19,6 +19,11 @@ class InstalledPackage
  */
  protected $version;
 
+ /**
+ * @var string
+ */
+ protected $sourceReference;
+
  /**
  * @var array
  */
@@ -28,12 +33,14 @@ class InstalledPackage
  * @param string $name
  * @param string $version
  * @param array $files
+ * @param string $reference
  */
- public function __construct($name, $version, array $files)
+ public function __construct($name, $version, array $files, $reference = null)
  {
  $this->name = $name;
  $this->installedFiles = $files;
  $this->version = $version;
+ $this->sourceReference = $reference;
  }
 
  /**
@@ -52,6 +59,14 @@ public function getVersion()
  return $this->version;
  }
 
+ /**
+ * @return string
+ */
+ public function getSourceReference()
+ {
+ return $this->sourceReference;
+ }
+
  /**
  * @return string
  */

src/MagentoHackathon/Composer/Magento/InstalledPackageDumper.php

@@ -15,9 +15,10 @@ class InstalledPackageDumper
  public function dump(InstalledPackage $installedPackage)
  {
  return array(
- 'packageName' => $installedPackage->getName(),
- 'version' => $installedPackage->getVersion(),
- 'installedFiles' => $installedPackage->getInstalledFiles(),
+ 'packageName' => $installedPackage->getName(),
+ 'version' => $installedPackage->getVersion(),
+ 'installedFiles' => $installedPackage->getInstalledFiles(),
+ 'sourceReference' => $installedPackage->getSourceReference(),
  );
  }
 
@@ -27,6 +28,12 @@ public function dump(InstalledPackage $installedPackage)
  */
  public function restore(array $data)
  {
- return new InstalledPackage($data['packageName'], $data['version'], $data['installedFiles']);
+ $data['sourceReference'] = isset($data['sourceReference']) ? $data['sourceReference'] : null;
+ return new InstalledPackage(
+ $data['packageName'],
+ $data['version'],
+ $data['installedFiles'],
+ $data['sourceReference']
+ );
  }
 }

src/MagentoHackathon/Composer/Magento/ModuleManager.php

@@ -102,7 +102,8 @@ public function updateInstalledPackages(array $currentComposerInstalledPackages)
  $this->installedPackageRepository->add(new InstalledPackage(
  $install->getName(),
  $install->getVersion(),
- $files
+ $files,
+ $install->getSourceReference()
  ));
  }
 
@@ -169,9 +170,12 @@ public function getInstalls(array $currentComposerInstalledPackages)
  {
  $repo = $this->installedPackageRepository;
  $packages = array_filter($currentComposerInstalledPackages, function(PackageInterface $package) use ($repo) {
- return !$repo->has($package->getName(), $package->getVersion());
+ return (
+ !$repo->has($package->getName(), $package->getVersion())
+ || !$repo->hasReference($package->getName(),$package->getSourceReference())
+ );
  });
- 
+
  $config = $this->config;
  usort($packages, function(PackageInterface $aObject, PackageInterface $bObject) use ($config) {
  $a = $config->getModuleSpecificSortValue($aObject->getName());
@@ -186,7 +190,7 @@ public function getInstalls(array $currentComposerInstalledPackages)
  }
  return ($a < $b) ? -1 : 1;
  });
- 
+
  return $packages;
  }
 

src/MagentoHackathon/Composer/Magento/Repository/InstalledPackageFileSystemRepository.php

@@ -113,6 +113,30 @@ public function has($packageName, $version = null)
  }
  }
 
+ /**
+ * If source reference specified, perform a strict check,
+ * which only returns true if repository has the package in the specified source reference
+ *
+ * @param string $packageName
+ * @param string $reference
+ * @return bool
+ */
+ public function hasReference($packageName, $reference = null)
+ {
+ $this->load();
+ try {
+ $package = $this->findByPackageName($packageName);
+
+ if (null === $reference) {
+ return true;
+ }
+
+ return $package->getSourceReference() === $reference;
+ } catch (\Exception $e) {
+ return false;
+ }
+ }
+
  /**
  * @param InstalledPackage $package
  * @throws \Exception
@@ -121,15 +145,20 @@ public function add(InstalledPackage $package)
  {
  $this->load();
 
+ $this->hasChanges = true;
+
  try {
  $this->findByPackageName($package->getName());
+ foreach ($this->packages as &$installedPackage) {
+ if ($installedPackage->getName() === $package->getName()) {
+ $installedPackage = $package;
+ }
+ }
  } catch (\Exception $e) {
  $this->packages[] = $package;
- $this->hasChanges = true;
  return;
  }
 
- throw new \Exception(sprintf('Package: "%s" is already installed', $package->getName()));
  }
 
  /**

src/MagentoHackathon/Composer/Magento/Repository/InstalledPackageRepositoryInterface.php

@@ -40,4 +40,12 @@ public function add(InstalledPackage $package);
  * @return bool
  */
  public function has($packageName, $version = null);
+
+ /**
+ * @param string $packageName
+ * @param string $reference
+ * @return bool
+ */
+
+ public function hasReference($packageName, $reference = null);
 }

tests/MagentoHackathon/Composer/Magento/Repository/InstalledFilesFilesystemRepositoryTest.php

@@ -82,15 +82,6 @@ public function testGetInstalledMappingsReturnsMappingsCorrectly()
  $this->assertInstanceOf('MagentoHackathon\Composer\Magento\InstalledPackage', $package);
  }
 
- public function testExceptionIsThrownIfDuplicatePackageIsAdded()
- {
- $this->setExpectedException('Exception', 'Package: "some-package" is already installed');
-
- $package = new InstalledPackage('some-package', '1.0.0', array());
- $this->repository->add($package);
- $this->repository->add($package);
- }
-
  public function testAddInstalledMappings()
  {
  $files = array(
@@ -103,6 +94,7 @@ public function testAddInstalledMappings()
  'packageName' => 'some-package',
  'version' => '1.0.0',
  'installedFiles' => $files,
+ 'sourceReference' => null
  ));
  $package = new InstalledPackage('some-package', '1.0.0', $files);
  $this->repository->add($package);