public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

A couple of minor omissions from the merge

pull/2745/head
Padraic Brady 2015-01-29 20:57:23 +00:00
parent 6ce20d36b6
commit 510ec6b91c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Command/CreateProjectCommand.php
View File

@ -239,19 +239,14 @@ EOT
{ {
if (null === $repositoryUrl) { if (null === $repositoryUrl) {
$sourceRepo = new CompositeRepository(Factory::createDefaultRepositories($io, $config)); $sourceRepo = new CompositeRepository(Factory::createDefaultRepositories($io, $config));
<<<<<<< HEAD
} elseif ("json" === pathinfo($repositoryUrl, PATHINFO_EXTENSION)) {
$sourceRepo = new FilesystemRepository(new JsonFile($repositoryUrl, Factory::createRemoteFilesystem($io, $config)));
=======
} elseif ("json" === pathinfo($repositoryUrl, PATHINFO_EXTENSION) && file_exists($repositoryUrl)) { } elseif ("json" === pathinfo($repositoryUrl, PATHINFO_EXTENSION) && file_exists($repositoryUrl)) {
$json = new JsonFile($repositoryUrl, new RemoteFilesystem($io, $config)); $json = new JsonFile($repositoryUrl, Factory::createRemoteFilesystem($io, $config));
$data = $json->read(); $data = $json->read();
if (!empty($data['packages']) || !empty($data['includes']) || !empty($data['provider-includes'])) { if (!empty($data['packages']) || !empty($data['includes']) || !empty($data['provider-includes'])) {
$sourceRepo = new ComposerRepository(array('url' => 'file://' . strtr(realpath($repositoryUrl), '\\', '/')), $io, $config); $sourceRepo = new ComposerRepository(array('url' => 'file://' . strtr(realpath($repositoryUrl), '\\', '/')), $io, $config);
} else { } else {
$sourceRepo = new FilesystemRepository($json); $sourceRepo = new FilesystemRepository($json);
} }
>>>>>>> master
} elseif (0 === strpos($repositoryUrl, 'http')) { } elseif (0 === strpos($repositoryUrl, 'http')) {
$sourceRepo = new ComposerRepository(array('url' => $repositoryUrl), $io, $config); $sourceRepo = new ComposerRepository(array('url' => $repositoryUrl), $io, $config);
} else { } else {

3
src/Composer/Command/SelfUpdateCommand.php
View File

@ -70,7 +70,8 @@ EOT
} }
$remoteFilesystem = Factory::createRemoteFilesystem($this->getIO(), $config); $remoteFilesystem = Factory::createRemoteFilesystem($this->getIO(), $config);
//$baseUrl = (extension_loaded('openssl') ? 'https' : 'http') . '://' . self::HOMEPAGE; // TODO: Silent switch probably should be kicking out exception
$baseUrl = (extension_loaded('openssl') ? 'https' : 'http') . '://' . self::HOMEPAGE;
$cacheDir = $config->get('cache-dir'); $cacheDir = $config->get('cache-dir');
$rollbackDir = $config->get('home'); $rollbackDir = $config->get('home');