Browse Source

Merge branch '1.10'

Jordi Boggiano 5 years ago
parent
commit
eeca9f68ad

+ 16 - 6
composer.lock

@@ -8,16 +8,16 @@
     "packages": [
     "packages": [
         {
         {
             "name": "composer/ca-bundle",
             "name": "composer/ca-bundle",
-            "version": "1.2.6",
+            "version": "1.2.7",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e"
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -63,9 +63,19 @@
             "support": {
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/master"
+                "source": "https://github.com/composer/ca-bundle/tree/1.2.7"
             },
             },
-            "time": "2020-01-13T10:02:55+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-04-08T08:27:21+00:00"
         },
         },
         {
         {
             "name": "composer/semver",
             "name": "composer/semver",

+ 8 - 3
doc/faqs/how-do-i-install-a-package-to-a-custom-path-for-my-framework.md

@@ -7,6 +7,7 @@ the default `vendor` folder by using
 
 
 If you are a **package author** and want your package installed to a custom
 If you are a **package author** and want your package installed to a custom
 directory, simply require `composer/installers` and set the appropriate `type`.
 directory, simply require `composer/installers` and set the appropriate `type`.
+Specifying the package type, will override the default installer path.
 This is common if your package is intended for a specific framework such as
 This is common if your package is intended for a specific framework such as
 CakePHP, Drupal or WordPress. Here is an example composer.json file for a
 CakePHP, Drupal or WordPress. Here is an example composer.json file for a
 WordPress theme:
 WordPress theme:
@@ -30,20 +31,24 @@ As a **package consumer** you can set or override the install path for a package
 that requires composer/installers by configuring the `installer-paths` extra. A
 that requires composer/installers by configuring the `installer-paths` extra. A
 useful example would be for a Drupal multisite setup where the package should be
 useful example would be for a Drupal multisite setup where the package should be
 installed into your sites subdirectory. Here we are overriding the install path
 installed into your sites subdirectory. Here we are overriding the install path
-for a module that uses composer/installers:
+for a module that uses composer/installers, as well as putting all packages of type
+`drupal-theme` into a themes folder:
 
 
 ```json
 ```json
 {
 {
     "extra": {
     "extra": {
         "installer-paths": {
         "installer-paths": {
-            "sites/example.com/modules/{$name}": ["vendor/package"]
+            "sites/example.com/modules/{$name}": ["vendor/package"],
+            "sites/example.com/themes/{$name}": ["type:drupal-theme"]
         }
         }
     }
     }
 }
 }
 ```
 ```
 
 
 Now the package would be installed to your folder location, rather than the default
 Now the package would be installed to your folder location, rather than the default
-composer/installers determined location.
+composer/installers determined location. In addition, `installer-paths` is
+order-dependent, which means moving a package by name should come before the installer
+path of a `type:*` that matches the same package.
 
 
 > **Note:** You cannot use this to change the path of any package. This is only
 > **Note:** You cannot use this to change the path of any package. This is only
 > applicable to packages that require `composer/installers` and use a custom type
 > applicable to packages that require `composer/installers` and use a custom type