Merge remote-tracking branch 'joomla/master' into 2.0-dev

nibra · nibra · commit 1916eddbe31c · 2020-11-28T14:48:49.000+01:00
# Conflicts:
#	.drone.jsonnet
#	.drone.yml
#	README.md
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -18,7 +18,7 @@ local composer(phpversion, params) = {
     volumes: volumes,
     commands: [
         "php -v",
-        "composer update " + params,
+        "composer update " + params
     ]
 };
 
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,7 @@
+.github/ export-ignore
+Tests/ export-ignore
+.drone.jsonnet export-ignore
+.drone.yml export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.gitmodules export-ignore
-.travis/ export-ignore
-.travis.yml export-ignore
+phpunit.xml.dist export-ignore
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: joomla
+custom: https://community.joomla.org/sponsorship-campaigns.html
diff --git a/README.md b/README.md
@@ -241,3 +241,9 @@ Alternatively, you can simply run the following from the command line:
 ```sh
 composer require joomla/input "2.0.*@dev"
 ```
+
+If you want to include the test sources, use
+
+```sh
+composer require --prefer-source joomla/input "2.0.*@dev"
+```

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ local composer(phpversion, params) = {`
`18`	`18`	`volumes: volumes,`
`19`	`19`	`commands: [`
`20`	`20`	`"php -v",`
`21`		`- "composer update " + params,`
	`21`	`+ "composer update " + params`
`22`	`22`	`]`
`23`	`23`	`};`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+github: joomla`
	`2`	`+custom: https://community.joomla.org/sponsorship-campaigns.html`