Merge remote-tracking branch 'CHH/feature/smarter-packagejson-append'

12 years ago · 9f3f80a8d0
parent e2f8098f53 560d6daccf
commit 9f3f80a8d0
1 changed files with 9 additions and 1 deletions
--- a/src/Composer/Repository/ComposerRepository.php
+++ b/src/Composer/Repository/ComposerRepository.php
@ -191,7 +191,15 @@ class ComposerRepository extends ArrayRepository implements NotifiableRepository
        }

        try {
-            $json = new JsonFile($this->url.'/packages.json', new RemoteFilesystem($this->io));
+            $jsonUrlParts = parse_url($this->url);
+
+            if (isset($jsonUrlParts['path']) and strpos($jsonUrlParts['path'], '/packages.json') !== false) {
+                $jsonUrl = $this->url;
+            } else {
+                $jsonUrl = $this->url . '/packages.json';
+            }
+
+            $json = new JsonFile($jsonUrl, new RemoteFilesystem($this->io));
            $data = $json->read();

            if (!empty($data['notify'])) {