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

Merge pull request #3998 from SpacePossum/use_https 

Use HTTPS where possible
pull/4001/head
Jordi Boggiano 2015-05-05 16:42:33 +01:00
parent 0e0cb62fb8 2e99b9fdf5
commit e8572ca6f9
28 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -21,4 +21,4 @@ Fork the project, create a feature branch, and send us a pull request.
To ensure a consistent code base, you should make sure the code follows
the [PSR-2 Coding Standards](http://www.php-fig.org/psr/psr-2/).
If you would like to help, take a look at the [list of issues](http://github.com/composer/composer/issues).
If you would like to help, take a look at the [list of issues](https://github.com/composer/composer/issues).

16
README.md
View File

@ -19,7 +19,7 @@ Installation / Usage
2. Create a composer.json defining your dependencies. Note that this example is
a short version for applications that are not meant to be published as packages
themselves. To create libraries/packages please read the
[documentation](http://getcomposer.org/doc/02-libraries.md).
[documentation](https://getcomposer.org/doc/02-libraries.md).
``` json
{
@ -35,7 +35,7 @@ themselves. To create libraries/packages please read the
Global installation of Composer (manual)
----------------------------------------
Follow instructions [in the documentation](http://getcomposer.org/doc/00-intro.md#globally)
Follow instructions [in the documentation](https://getcomposer.org/doc/00-intro.md#globally)
Updating Composer
-----------------
@ -47,14 +47,14 @@ install with the latest version.
Community
---------
Mailing lists for [user support](http://groups.google.com/group/composer-users) and
[development](http://groups.google.com/group/composer-dev).
Mailing lists for [user support](https://groups.google.com/group/composer-users) and
[development](https://groups.google.com/group/composer-dev).
IRC channels are on irc.freenode.org: [#composer](irc://irc.freenode.org/composer)
for users and [#composer-dev](irc://irc.freenode.org/composer-dev) for development.
Stack Overflow has a growing collection of
[Composer related questions](http://stackoverflow.com/questions/tagged/composer-php).
[Composer related questions](https://stackoverflow.com/questions/tagged/composer-php).
Requirements
------------
@ -64,8 +64,8 @@ PHP 5.3.2 or above (at least 5.3.4 recommended to avoid potential bugs)
Authors
-------
Nils Adermann - <naderman@naderman.de> - <http://twitter.com/naderman> - <http://www.naderman.de><br />
Jordi Boggiano - <j.boggiano@seld.be> - <http://twitter.com/seldaek> - <http://seld.be><br />
Nils Adermann - <naderman@naderman.de> - <https://twitter.com/naderman> - <http://www.naderman.de><br />
Jordi Boggiano - <j.boggiano@seld.be> - <https://twitter.com/seldaek> - <http://seld.be><br />
See also the list of [contributors](https://github.com/composer/composer/contributors) who participated in this project.
@ -78,6 +78,6 @@ Acknowledgments
---------------
- This project's Solver started out as a PHP port of openSUSE's
[Libzypp satsolver](http://en.opensuse.org/openSUSE:Libzypp_satsolver).
[Libzypp satsolver](https://en.opensuse.org/openSUSE:Libzypp_satsolver).
- This project uses hiddeninput.exe to prompt for passwords on windows, sources
and details can be found on the [github page of the project](https://github.com/Seldaek/hidden-input).

2
composer.json
View File

@ -2,7 +2,7 @@
"name": "composer/composer",
"description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
"keywords": ["package", "dependency", "autoload"],
"homepage": "http://getcomposer.org/",
"homepage": "https://getcomposer.org/",
"type": "library",
"license": "MIT",
"authors": [

4
doc/00-intro.md
View File

@ -11,8 +11,8 @@ it manages them on a per-project basis, installing them in a directory (e.g. `ve
inside your project. By default it will never install anything globally. Thus,
it is a dependency manager.
This idea is not new and Composer is strongly inspired by node's [npm](http://npmjs.org/)
and ruby's [bundler](http://gembundler.com/). But there has not been such a tool
This idea is not new and Composer is strongly inspired by node's [npm](https://npmjs.org/)
and ruby's [bundler](http://bundler.io/). But there has not been such a tool
for PHP.
The problem that Composer solves is this:

6
doc/03-cli.md
View File

@ -259,8 +259,8 @@ name : monolog/monolog
versions : master-dev, 1.0.2, 1.0.1, 1.0.0, 1.0.0-RC1
type : library
names : monolog/monolog
source : [git] http://github.com/Seldaek/monolog.git 3d4e60d0cbc4b888fe5ad223d77964428b1978da
dist : [zip] http://github.com/Seldaek/monolog/zipball/3d4e60d0cbc4b888fe5ad223d77964428b1978da 3d4e60d0cbc4b888fe5ad223d77964428b1978da
source : [git] https://github.com/Seldaek/monolog.git 3d4e60d0cbc4b888fe5ad223d77964428b1978da
dist : [zip] https://github.com/Seldaek/monolog/zipball/3d4e60d0cbc4b888fe5ad223d77964428b1978da 3d4e60d0cbc4b888fe5ad223d77964428b1978da
license : MIT
autoload
@ -418,7 +418,7 @@ In addition to modifying the config section, the `config` command also supports
changes to the repositories section by using it the following way:
```sh
php composer.phar config repositories.foo vcs http://github.com/foo/bar
php composer.phar config repositories.foo vcs https://github.com/foo/bar
```
## create-project

6
doc/04-schema.md
View File

@ -157,7 +157,7 @@ The recommended notation for the most common licenses is (alphabetical):
- MIT
Optional, but it is highly recommended to supply this. More identifiers are
listed at the [SPDX Open Source License Registry](http://www.spdx.org/licenses/).
listed at the [SPDX Open Source License Registry](https://www.spdx.org/licenses/).
For closed-source software, you may use `"proprietary"` as the license identifier.
@ -703,7 +703,7 @@ Example:
},
{
"type": "pear",
"url": "http://pear2.php.net"
"url": "https://pear2.php.net"
},
{
"type": "package",
@ -715,7 +715,7 @@ Example:
"type": "zip"
},
"source": {
"url": "http://smarty-php.googlecode.com/svn/",
"url": "https://smarty-php.googlecode.com/svn/",
"type": "svn",
"reference": "tags/Smarty_3_1_7/distribution/"
}

8
doc/05-repositories.md
View File

@ -216,7 +216,7 @@ repository.
The `packages.json` file is loaded using a PHP stream. You can set extra options
on that stream using the `options` parameter. You can set any valid PHP stream
context option. See [Context options and parameters](http://php.net/manual/en/context.php)
context option. See [Context options and parameters](https://php.net/manual/en/context.php)
for more information.
### VCS
@ -293,8 +293,8 @@ The only requirement is the installation of SSH keys for a git client.
Git is not the only version control system supported by the VCS repository.
The following are supported:
* **Git:** [git-scm.com](http://git-scm.com)
* **Subversion:** [subversion.apache.org](http://subversion.apache.org)
* **Git:** [git-scm.com](https://git-scm.com)
* **Subversion:** [subversion.apache.org](https://subversion.apache.org)
* **Mercurial:** [mercurial.selenic.com](http://mercurial.selenic.com)
To get packages from these systems you need to have their respective clients
@ -389,7 +389,7 @@ Example using `pear2.php.net`:
"repositories": [
{
"type": "pear",
"url": "http://pear2.php.net"
"url": "https://pear2.php.net"
}
],
"require": {

8
doc/06-community.md
View File

@ -17,18 +17,18 @@ The most important guidelines are described as follows:
> Fork the project, create a feature branch, and send us a pull request.
>
> To ensure a consistent code base, you should make sure the code follows
> the [Coding Standards](http://symfony.com/doc/2.0/contributing/code/standards.html)
> the [Coding Standards](https://symfony.com/doc/2.0/contributing/code/standards.html)
> which we borrowed from Symfony.
## IRC / mailing list
Mailing lists for [user support](http://groups.google.com/group/composer-users) and
[development](http://groups.google.com/group/composer-dev).
Mailing lists for [user support](https://groups.google.com/group/composer-users) and
[development](https://groups.google.com/group/composer-dev).
IRC channels are on irc.freenode.org: [#composer](irc://irc.freenode.org/composer)
for users and [#composer-dev](irc://irc.freenode.org/composer-dev) for development.
Stack Overflow has a growing collection of
[Composer related questions](http://stackoverflow.com/questions/tagged/composer-php).
[Composer related questions](https://stackoverflow.com/questions/tagged/composer-php).
&larr; [Repositories](05-repositories.md)

18
doc/articles/handling-private-packages-with-satis.md
View File

@ -21,7 +21,7 @@ find more information about how to set it up and use it on the [Toran Proxy](htt
Satis on the other hand is open source but only a static `composer`
repository generator. It is a bit like an ultra-lightweight, static file-based
version of packagist and can be used to host the metadata of your company's
private packages, or your own. You can get it from [GitHub](http://github.com/composer/satis)
private packages, or your own. You can get it from [GitHub](https://github.com/composer/satis)
or install via CLI:
`php composer.phar create-project composer/satis --stability=dev --keep-vcs`.
@ -44,9 +44,9 @@ The default file Satis looks for is `satis.json` in the root of the repository.
"name": "My Repository",
"homepage": "http://packages.example.org",
"repositories": [
{ "type": "vcs", "url": "http://github.com/mycompany/privaterepo" },
{ "type": "vcs", "url": "https://github.com/mycompany/privaterepo" },
{ "type": "vcs", "url": "http://svn.example.org/private/repo" },
{ "type": "vcs", "url": "http://github.com/mycompany/privaterepo2" }
{ "type": "vcs", "url": "https://github.com/mycompany/privaterepo2" }
],
"require-all": true
}
@ -60,9 +60,9 @@ constraint if you want really specific versions.
```json
{
"repositories": [
{ "type": "vcs", "url": "http://github.com/mycompany/privaterepo" },
{ "type": "vcs", "url": "https://github.com/mycompany/privaterepo" },
{ "type": "vcs", "url": "http://svn.example.org/private/repo" },
{ "type": "vcs", "url": "http://github.com/mycompany/privaterepo2" }
{ "type": "vcs", "url": "https://github.com/mycompany/privaterepo2" }
],
"require": {
"company/package": "*",
@ -135,7 +135,7 @@ Example using a custom repository using SSH (requires the SSH2 PECL extension):
}
```
> **Tip:** See [ssh2 context options](http://www.php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-options) for more information.
> **Tip:** See [ssh2 context options](https://www.php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-options) for more information.
Example using HTTP over SSL using a client certificate:
@ -155,7 +155,7 @@ Example using HTTP over SSL using a client certificate:
}
```
> **Tip:** See [ssl context options](http://www.php.net/manual/en/context.ssl.php) for more information.
> **Tip:** See [ssl context options](https://www.php.net/manual/en/context.ssl.php) for more information.
Example using a custom HTTP Header field for token authentication:
@ -232,8 +232,8 @@ Once enabled, all downloads (include those from GitHub and BitBucket) will be re
Prefixing the URL with another host is especially helpful if the downloads end up in a private Amazon S3
bucket or on a CDN host. A CDN would drastically improve download times and therefore package installation.
Example: A `prefix-url` of `http://my-bucket.s3.amazonaws.com` (and `directory` set to `dist`) creates download URLs
which look like the following: `http://my-bucket.s3.amazonaws.com/dist/vendor-package-version-ref.zip`.
Example: A `prefix-url` of `https://my-bucket.s3.amazonaws.com` (and `directory` set to `dist`) creates download URLs
which look like the following: `https://my-bucket.s3.amazonaws.com/dist/vendor-package-version-ref.zip`.
### Resolving dependencies

2
doc/articles/http-basic-authentication.md
View File

@ -17,7 +17,7 @@ of credentials inline with the repository specification such as:
"repositories": [
{
"type": "composer",
"url": "http://extremely:secret@repo.example.org"
"url": "https://extremely:secret@repo.example.org"
}
]
}

2
res/composer-schema.json
View File

@ -35,7 +35,7 @@
},
"version": {
"type": "string",
"description": "Package version, see http://getcomposer.org/doc/04-schema.md#version for more info on valid schemes."
"description": "Package version, see https://getcomposer.org/doc/04-schema.md#version for more info on valid schemes."
},
"time": {
"type": "string",

2
src/Composer/Command/AboutCommand.php
View File

@ -37,7 +37,7 @@ EOT
$this->getIO()->write(<<<EOT
<info>Composer - Package Management for PHP</info>
<comment>Composer is a dependency manager tracking local dependencies of your projects and libraries.
See http://getcomposer.org/ for more information.</comment>
See https://getcomposer.org/ for more information.</comment>
EOT
);
}

4
src/Composer/Command/ValidateCommand.php
View File

@ -78,11 +78,11 @@ EOT
$this->getIO()->write('<info>' . $file . ' is valid</info>');
} elseif (!$errors && !$publishErrors) {
$this->getIO()->writeError('<info>' . $file . ' is valid, but with a few warnings</info>');
$this->getIO()->writeError('<warning>See http://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
$this->getIO()->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
} elseif (!$errors) {
$this->getIO()->writeError('<info>' . $file . ' is valid for simple usage with composer but has</info>');
$this->getIO()->writeError('<info>strict errors that make it unable to be published as a package:</info>');
$this->getIO()->writeError('<warning>See http://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
$this->getIO()->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
} else {
$this->getIO()->writeError('<error>' . $file . ' is invalid, the following errors/warnings were found:</error>');
}

2
src/Composer/DependencyResolver/SolverProblemsException.php
View File

@ -36,7 +36,7 @@ class SolverProblemsException extends \RuntimeException
}
if (strpos($text, 'could not be found') || strpos($text, 'no matching package found')) {
$text .= "\nPotential causes:\n - A typo in the package name\n - The package is not available in a stable-enough version according to your minimum-stability setting\n see <https://groups.google.com/d/topic/composer-dev/_g3ASeIFlrc/discussion> for more details.\n\nRead <http://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.";
$text .= "\nPotential causes:\n - A typo in the package name\n - The package is not available in a stable-enough version according to your minimum-stability setting\n see <https://groups.google.com/d/topic/composer-dev/_g3ASeIFlrc/discussion> for more details.\n\nRead <https://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.";
}
return $text;

2
src/Composer/Downloader/GitDownloader.php
View File

@ -74,7 +74,7 @@ class GitDownloader extends VcsDownloader
GitUtil::cleanEnv();
$path = $this->normalizePath($path);
if (!is_dir($path.'/.git')) {
throw new \RuntimeException('The .git directory is missing from '.$path.', see http://getcomposer.org/commit-deps for more information');
throw new \RuntimeException('The .git directory is missing from '.$path.', see https://getcomposer.org/commit-deps for more information');
}
$ref = $target->getSourceReference();

2
src/Composer/Downloader/HgDownloader.php
View File

@ -48,7 +48,7 @@ class HgDownloader extends VcsDownloader
$this->io->writeError(" Updating to ".$target->getSourceReference());
if (!is_dir($path.'/.hg')) {
throw new \RuntimeException('The .hg directory is missing from '.$path.', see http://getcomposer.org/commit-deps for more information');
throw new \RuntimeException('The .hg directory is missing from '.$path.', see https://getcomposer.org/commit-deps for more information');
}
$command = sprintf('hg pull %s && hg up %s', $url, $ref);

2
src/Composer/Downloader/SvnDownloader.php
View File

@ -42,7 +42,7 @@ class SvnDownloader extends VcsDownloader
$ref = $target->getSourceReference();
if (!is_dir($path.'/.svn')) {
throw new \RuntimeException('The .svn directory is missing from '.$path.', see http://getcomposer.org/commit-deps for more information');
throw new \RuntimeException('The .svn directory is missing from '.$path.', see https://getcomposer.org/commit-deps for more information');
}
$flags = "";

2
src/Composer/Factory.php
View File

@ -214,7 +214,7 @@ class Factory
} else {
$message = 'Composer could not find the config file: '.$localConfig;
}
$instructions = 'To initialize a project, please create a composer.json file as described in the http://getcomposer.org/ "Getting Started" section';
$instructions = 'To initialize a project, please create a composer.json file as described in the https://getcomposer.org/ "Getting Started" section';
throw new \InvalidArgumentException($message.PHP_EOL.$instructions);
}

2
src/Composer/Json/JsonFormatter.php
View File

@ -65,7 +65,7 @@ class JsonFormatter
}
if ($unescapeUnicode && function_exists('mb_convert_encoding')) {
// http://stackoverflow.com/questions/2934563/how-to-decode-unicode-escape-sequences-like-u00ed-to-proper-utf-8-encoded-cha
// https://stackoverflow.com/questions/2934563/how-to-decode-unicode-escape-sequences-like-u00ed-to-proper-utf-8-encoded-cha
$buffer = preg_replace_callback('/(\\\\+)u([0-9a-f]{4})/i', function ($match) {
$l = strlen($match[1]);

2
src/Composer/Package/Locker.php
View File

@ -238,7 +238,7 @@ class Locker
{
$lock = array(
'_readme' => array('This file locks the dependencies of your project to a known state',
'Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file',
'Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file',
'This file is @gener'.'ated automatically'),
'hash' => $this->hash,
'packages' => null,

2
src/Composer/Repository/Pear/PackageDependencyParser.php
View File

@ -40,7 +40,7 @@ class PackageDependencyParser
/**
* Builds dependency information from package.xml 1.0 format
*
* http://pear.php.net/manual/en/guide.developers.package2.dependencies.php
* https://pear.php.net/manual/en/guide.developers.package2.dependencies.php
*
* package.xml 1.0 format consists of array of
* { type="php|os|sapi|ext|pkg" rel="has|not|eq|ge|gt|le|lt" optional="yes"

2
tests/Composer/Test/DependencyResolver/SolverTest.php
View File

@ -709,7 +709,7 @@ class SolverTest extends TestCase
$msg .= " - A typo in the package name\n";
$msg .= " - The package is not available in a stable-enough version according to your minimum-stability setting\n";
$msg .= " see <https://groups.google.com/d/topic/composer-dev/_g3ASeIFlrc/discussion> for more details.\n\n";
$msg .= "Read <http://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.";
$msg .= "Read <https://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.";
$this->assertEquals($msg, $e->getMessage());
}
}

2
tests/Composer/Test/Fixtures/functional/packages.json
View File

@ -24,7 +24,7 @@
],
"source": {
"type": "git",
"url": "http://github.com/Seldaek/jsonlint",
"url": "https://github.com/Seldaek/jsonlint",
"reference": "4451f2066efdc53f3fa954c44a47ead73f6838d2"
},
"type": "library",

2
tests/Composer/Test/Fixtures/installer/broken-deps-do-not-replace.test
View File

@ -35,7 +35,7 @@ Potential causes:
- The package is not available in a stable-enough version according to your minimum-stability setting
see <https://groups.google.com/d/topic/composer-dev/_g3ASeIFlrc/discussion> for more details.
Read <http://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.
Read <https://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.
--EXPECT-EXIT-CODE--
2

2
tests/Composer/Test/Json/Fixtures/composer.json
View File

@ -2,7 +2,7 @@
"name": "composer/schema-test",
"description": "Dummy file to test the schema verification",
"keywords": ["package", "dependency", "autoload"],
"homepage": "http://getcomposer.org/",
"homepage": "https://getcomposer.org/",
"type": "library",
"license": "MIT",
"authors": [

2
tests/Composer/Test/Package/Dumper/ArrayDumperTest.php
View File

@ -114,7 +114,7 @@ class ArrayDumperTest extends \PHPUnit_Framework_TestCase
),
array(
'homepage',
'http://getcomposer.org'
'https://getcomposer.org'
),
array(
'description',

2
tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
View File

@ -118,7 +118,7 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'repositories' => array(
array(
'type' => 'composer',
'url' => 'http://packagist.org/',
'url' => 'https://packagist.org/',
)
),
'config' => array(

2
tests/Composer/Test/Package/LockerTest.php
View File

@ -121,7 +121,7 @@ class LockerTest extends \PHPUnit_Framework_TestCase
->method('write')
->with(array(
'_readme' => array('This file locks the dependencies of your project to a known state',
'Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file',
'Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file',
'This file is @gener'.'ated automatically'),
'hash' => 'md5',
'packages' => array(