[TASK] Follow ups to renaming the master to main branch

Fixes: #3012

.editorconfig

@@ -1,5 +1,5 @@
 # EditorConfig is awesome: http://EditorConfig.org
-# TYPO3 Standard: https://github.com/TYPO3/TYPO3.CMS/blob/master/.editorconfig
+# TYPO3 Standard: https://github.com/TYPO3/typo3/blob/master/.editorconfig
 
 # top-most EditorConfig file
 root = true
@@ -32,4 +32,4 @@ indent_style = tab
 # Bash scripts
 [*.sh]
 indent_style = space
-indent_size = 2
+indent_size = 2

Build/Test/bootstrap.sh

@@ -65,7 +65,7 @@ echo "Using database user: $TYPO3_DATABASE_USERNAME"
 echo "Using database password: $TYPO3_DATABASE_PASSWORD"
 
 if [ -z $TYPO3_VERSION ]; then
-  echo "Must set env var TYPO3_VERSION (e.g. dev-master or ^10.4)"
+  echo "Must set env var TYPO3_VERSION (e.g. dev-main or ^11.5)"
   exit 1
 fi
 

CONTRIBUTING.md

@@ -19,12 +19,12 @@ guidelines and where you can get further information.
 The source-code of EXT:solr is hosted on [GitHub](https://github.com/TYPO3-Solr/ext-solr).
 The code is organized in branches
 
-* master: The master branch is the branch where the development for the latest
+* main: The main branch is the branch where the development for the latest
   TYPO3 version and the latest features is happening. It is our goal to keep
   this branch always working, but nevertheless it is a development branch. It is
   not recommended to use this branch in production.
 
-* release-X.X.x: Whenever major and minor releases are created from master we
+* release-X.X.x: Whenever major and minor releases are created from main we
   create a release branch. This is needed to allow providing bug fixes for older
   release branches.
 
@@ -98,20 +98,20 @@ changes during review.
 #### Keep your fork up to date
 
 Before you create a branch for new changes you should update your fork with the
-latest changes from our master.
+latest changes from our main.
 
 To do this you need to do the following steps:
 
-1. Checkout your master branch
+1. Checkout your main branch
 2. Make sure our repository is configured as upstream (You only need to do this once)
-3. Rebase your master onto the upstream repository's changes
-4. Push the changes to your master
+3. Rebase your main onto the upstream repository's changes
+4. Push the changes to your main
 
 ```bash
-git checkout master
+git checkout main
 git remote add upstream https://github.com/TYPO3-Solr/ext-solr.git
-git pull --rebase upstream master
-git push --force origin master
+git pull --rebase upstream main
+git push --force origin main
 ```
 
 #### An example git workflow
@@ -123,7 +123,7 @@ Before you start, create your own fork on GitHub and follow these steps:
 
 ```bash
 git clone https://github.com/YourGitHubAccount/ext-solr.git
-git checkout master
+git checkout main
 git remote add upstream https://github.com/TYPO3-Solr/ext-solr.git
 git checkout -b 'bugfix/4711-my-bugifx'
 
@@ -151,7 +151,7 @@ commit 1ea657dfed4d41a4e457a15520d4e95efba4a4c3
 Author: Ingo Renner <ingo@typo3.org>
 Date:   Thu Jan 7 22:12:37 2016 -0800
 
-    Last commit from master
+    Last commit from main
 
     Change-Id: I17905b641ef322da09d2b93ed8adbd279ec680f0
 
@@ -287,7 +287,7 @@ The documentation for typo3-solr exists in the *Documentation* subdirectory.
 
 It is rendered on docs.typo3.org:
 
-* https://docs.typo3.org/p/apache-solr-for-typo3/solr/master/en-us/
+* https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/
 
 It can be modified by changing the reStructuredText files (.rst).
 

Classes/Routing/RoutingService.php

@@ -212,7 +212,7 @@ public function isCoreParameter(string $parameterName): bool
 
     /**
      * This returns the plugin namespace
-     * @see https://docs.typo3.org/p/apache-solr-for-typo3/solr/master/en-us/Configuration/Reference/TxSolrView.html#pluginnamespace
+     * @see https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/Configuration/Reference/TxSolrView.html#pluginnamespace
      *
      * @return string
      */

Documentation/Includes.txt

@@ -2,7 +2,7 @@
    every ReST source file in THIS documentation project (= manual).
 
 .. This files lives at
-   https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-HowToDocument/blob/master/Documentation/Includes.txt
+   https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-HowToDocument/blob/master/Documentation/Includes.rst.txt
    Version: 2018-10-16
 
 .. More information about this file:

Documentation/Settings.cfg

@@ -19,7 +19,7 @@ t3api       = https://docs.typo3.org/typo3cms/CoreApiReference/
 # ...  (recommended) to get the "Edit me on GitHub Button"
 # ........................................................
 
-github_branch        = master
+github_branch        = main
 github_repository    = TYPO3-Solr/ext-solr
 
 # .................................................................

README.md

@@ -1,12 +1,13 @@
 # Apache Solr for TYPO3 CMS
 
-[![Build Status](https://travis-ci.com/TYPO3-Solr/ext-solr.svg?branch=master)](https://travis-ci.com/TYPO3-Solr/ext-solr)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=master)
+[![Build Status](https://travis-ci.com/TYPO3-Solr/ext-solr.svg?branch=main)](https://travis-ci.com/TYPO3-Solr/ext-solr)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=main)
+[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=main)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=main)
 [![Latest Stable Version](https://poser.pugx.org/apache-solr-for-typo3/solr/v/stable)](https://packagist.org/packages/apache-solr-for-typo3/solr)
 [![Latest Unstable Version](https://poser.pugx.org/apache-solr-for-typo3/solr/v/unstable)](https://packagist.org/packages/apache-solr-for-typo3/solr)
 [![License](https://poser.pugx.org/apache-solr-for-typo3/solr/license)](https://packagist.org/packages/apache-solr-for-typo3/solr)
 [![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/solr/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/solr)
+[![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/solr/downloads)](https://packagist.org/packages/apache-solr-for-typo3/solr)
 
 A TYPO3 extension that integrates the Apache Solr enterprise search server with TYPO3 CMS.
 
@@ -40,15 +41,15 @@ Please find further information regarding Apache Solr and its related projects a
 - http://tomcat.apache.org
 - http://www.eclipse.org/jetty/
 
-To try out Apache Solr for TYPO3 visit [www.typo3-solr.com](http://www.typo3-solr.com) where we've set up a basic configuration. 
+To try out Apache Solr for TYPO3 visit [www.typo3-solr.com](http://www.typo3-solr.com) where we've set up a basic configuration.
 
 ![dkd Internet Service GmbH](./Resources/Public/Images/dkd_logo.png)
 
 ## Documentation and Support
 
 -   **Main Documentation:**
 
-   https://docs.typo3.org/p/apache-solr-for-typo3/solr/master/en-us/Index.html
+   https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/Index.html
 
 
 -   **Slack Channel:**

Resources/Private/Solr/configsets/ext_solr_11_5_0/conf/solrconfig.xml

@@ -317,21 +317,21 @@
 
 	<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy">
 		<!--
-		To enable simple master/slave replication, uncomment one of the
+		To enable simple primary/replica replication, uncomment one of the
 		sections below, depending on whether this solr instance should be
-		the "master" or a "slave".  If this instance is a "slave" you will
-		also need to fill in the masterUrl to point to a real machine.
+		the "primary" or a "replica".  If this instance is a "replica" you will
+		also need to fill in the primaryUrl to point to a real machine.
 		-->
 		<!--
-		<lst name="master">
+		<lst name="primary">
 				<str name="replicateAfter">commit</str>
 				<str name="replicateAfter">startup</str>
 				<str name="confFiles">schema.xml,stopwords.txt</str>
 		</lst>
 		-->
 		<!--
-		<lst name="slave">
-				<str name="masterUrl">http://your-master-hostname:8983/solr</str>
+		<lst name="replica">
+				<str name="primaryUrl">http://your-primary-hostname:8983/solr</str>
 				<str name="pollInterval">00:00:60</str>
 		</lst>
 		-->

Tests/Unit/System/Solr/Service/Fixtures/solrconfig.xml

@@ -327,21 +327,21 @@
 
 	<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy">
 		<!--
-		To enable simple master/slave replication, uncomment one of the
+		To enable simple primary/replica replication, uncomment one of the
 		sections below, depending on whether this solr instance should be
-		the "master" or a "slave".  If this instance is a "slave" you will
-		also need to fill in the masterUrl to point to a real machine.
+		the "primary" or a "replica".  If this instance is a "replica" you will
+		also need to fill in the primaryUrl to point to a real machine.
 		-->
 		<!--
-		<lst name="master">
+		<lst name="primary">
 				<str name="replicateAfter">commit</str>
 				<str name="replicateAfter">startup</str>
 				<str name="confFiles">schema.xml,stopwords.txt</str>
 		</lst>
 		-->
 		<!--
-		<lst name="slave">
-				<str name="masterUrl">http://your-master-hostname:8983/solr</str>
+		<lst name="replica">
+				<str name="primaryUrl">http://your-primary-hostname:8983/solr</str>
 				<str name="pollInterval">00:00:60</str>
 		</lst>
 		-->