diff --git a/.gitattributes b/.gitattributes index 9cd1bb7da..2ee43db45 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,7 @@ * text=auto eol=lf # These files are always considered text and should use LF. -# See core.whitespace @ http://git-scm.com/docs/git-config for whitespace flags. +# See core.whitespace @ https://git-scm.com/docs/git-config for whitespace flags. *.php text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php *.json text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 *.test text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a0fd0ce54..eee01015b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Contributing to Composer ======================== Please note that this project is released with a -[Contributor Code of Conduct](http://contributor-covenant.org/version/1/4/). +[Contributor Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct/). By participating in this project you agree to abide by its terms. Reporting Issues diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f9fd79a..47211a0a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -759,7 +759,7 @@ ### [1.0.0-alpha6] - 2012-10-23 * Schema: Added ability to pass additional options to repositories (i.e. ssh keys/client certificates to secure private repos) - * Schema: Added a new `~` operator that should be preferred over `>=`, see http://getcomposer.org/doc/01-basic-usage.md#package-versions + * Schema: Added a new `~` operator that should be preferred over `>=`, see https://getcomposer.org/doc/01-basic-usage.md#package-versions * Schema: Version constraints ` | [naderman.de](http://naderman.de) -- Jordi Boggiano | [GitHub](https://github.com/Seldaek) | [Twitter](https://twitter.com/seldaek) | | [seld.be](http://seld.be) +- Nils Adermann | [GitHub](https://github.com/naderman) | [Twitter](https://twitter.com/naderman) | | [naderman.de](https://naderman.de) +- Jordi Boggiano | [GitHub](https://github.com/Seldaek) | [Twitter](https://twitter.com/seldaek) | | [seld.be](https://seld.be) See also the list of [contributors](https://github.com/composer/composer/contributors) who participated in this project. diff --git a/composer.json b/composer.json index 2204a5639..e0ced56f3 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,12 @@ { "name": "Nils Adermann", "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" + "homepage": "https://www.naderman.de" }, { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "require": { diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index db3c8c79c..db34783d0 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -233,7 +233,7 @@ You can even add your own code to the autoloader by adding an } ``` -Composer will register a [PSR-4](http://www.php-fig.org/psr/psr-4/) autoloader +Composer will register a [PSR-4](https://www.php-fig.org/psr/psr-4/) autoloader for the `Acme` namespace. You define a mapping from namespaces to directories. The `src` directory would diff --git a/doc/04-schema.md b/doc/04-schema.md index ecff3d996..71c93a9c9 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -4,7 +4,7 @@ This chapter will explain all of the fields available in `composer.json`. ## JSON schema -We have a [JSON schema](http://json-schema.org) that documents the format and +We have a [JSON schema](https://json-schema.org) that documents the format and can also be used to validate your `composer.json`. In fact, it is used by the `validate` command. You can find it at: https://getcomposer.org/schema.json @@ -214,7 +214,7 @@ An example: { "name": "Nils Adermann", "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de", + "homepage": "https://www.naderman.de", "role": "Developer" }, { @@ -471,7 +471,7 @@ Example: Autoload mapping for a PHP autoloader. -[`PSR-4`](http://www.php-fig.org/psr/psr-4/) and [`PSR-0`](http://www.php-fig.org/psr/psr-0/) +[`PSR-4`](https://www.php-fig.org/psr/psr-4/) and [`PSR-0`](http://www.php-fig.org/psr/psr-0/) autoloading, `classmap` generation and `files` includes are supported. PSR-4 is the recommended way since it offers greater ease of use (no need diff --git a/doc/05-repositories.md b/doc/05-repositories.md index b90c6e347..3d0164bee 100644 --- a/doc/05-repositories.md +++ b/doc/05-repositories.md @@ -710,7 +710,7 @@ variables are parsed in both Windows and Linux/Mac notations. For example `%USERPROFILE%/git/mypackage`. > **Note:** Repository paths can also contain wildcards like ``*`` and ``?``. -> For details, see the [PHP glob function](http://php.net/glob). +> For details, see the [PHP glob function](https://php.net/glob). ## Disabling Packagist.org diff --git a/doc/07-community.md b/doc/07-community.md index 4296f90cd..0a45827ec 100644 --- a/doc/07-community.md +++ b/doc/07-community.md @@ -19,7 +19,7 @@ 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 [PSR-2 Coding Standards](http://www.php-fig.org/psr/psr-2/). +> the [PSR-2 Coding Standards](https://www.php-fig.org/psr/psr-2/). ## IRC / mailing list diff --git a/res/composer-repository-schema.json b/res/composer-repository-schema.json index 914d8e22a..adcc299d6 100644 --- a/res/composer-repository-schema.json +++ b/res/composer-repository-schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", + "$schema": "https://json-schema.org/draft-04/schema#", "description": "A representation of packages metadata.", "type": "object", "oneOf": [ diff --git a/res/composer-schema.json b/res/composer-schema.json index b5918df70..3ee1835ca 100644 --- a/res/composer-schema.json +++ b/res/composer-schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", + "$schema": "https://json-schema.org/draft-04/schema#", "name": "Package", "type": "object", "additionalProperties": false, diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php index fce8549f0..95106127c 100644 --- a/src/Composer/Autoload/ClassLoader.php +++ b/src/Composer/Autoload/ClassLoader.php @@ -37,8 +37,8 @@ namespace Composer\Autoload; * * @author Fabien Potencier * @author Jordi Boggiano - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ */ class ClassLoader { diff --git a/src/Composer/Util/TlsHelper.php b/src/Composer/Util/TlsHelper.php index a53212f2d..cfe89870a 100644 --- a/src/Composer/Util/TlsHelper.php +++ b/src/Composer/Util/TlsHelper.php @@ -98,7 +98,7 @@ final class TlsHelper * By Kevin McArthur of StormTide Digital Studios Inc. * @KevinSMcArthur / https://github.com/StormTide * - * See http://tools.ietf.org/html/draft-ietf-websec-key-pinning-02 + * See https://tools.ietf.org/html/draft-ietf-websec-key-pinning-02 * * This method was adapted from Sslurp. * https://github.com/EvanDotPro/Sslurp diff --git a/tests/Composer/Test/Fixtures/functional/packages.json b/tests/Composer/Test/Fixtures/functional/packages.json index 8b91c40d7..11dfe2d8e 100644 --- a/tests/Composer/Test/Fixtures/functional/packages.json +++ b/tests/Composer/Test/Fixtures/functional/packages.json @@ -18,7 +18,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be", + "homepage": "https://seld.be", "role": "Developer" } ], diff --git a/tests/Composer/Test/Json/Fixtures/composer.json b/tests/Composer/Test/Json/Fixtures/composer.json index ec6df7f18..a50ba4c22 100644 --- a/tests/Composer/Test/Json/Fixtures/composer.json +++ b/tests/Composer/Test/Json/Fixtures/composer.json @@ -9,12 +9,12 @@ { "name": "Nils Adermann", "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" + "homepage": "https://www.naderman.de" }, { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "support": {