Browse Source

Merge branch '1.5'

Jordi Boggiano 7 years ago
parent
commit
4853661934
1 changed files with 11 additions and 0 deletions
  1. 11 0
      src/Composer/Repository/PathRepository.php

+ 11 - 0
src/Composer/Repository/PathRepository.php

@@ -142,6 +142,17 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
             );
             $package['transport-options'] = $this->options;
 
+            // carry over the root package version if this path repo is in the same git repository as root package
+            if (!isset($package['version']) && ($rootVersion = getenv('COMPOSER_ROOT_VERSION'))) {
+                if (
+                    0 === $this->process->execute('git rev-parse HEAD', $ref1, $path)
+                    && 0 === $this->process->execute('git rev-parse HEAD', $ref2)
+                    && $ref1 === $ref2
+                ) {
+                    $package['version'] = $rootVersion;
+                }
+            }
+
             if (!isset($package['version'])) {
                 $versionData = $this->versionGuesser->guessVersion($package, $path);
                 $package['version'] = $versionData['version'] ?: 'dev-master';