diff --git a/.editorconfig b/.editorconfig index f79a7831e..54f5ab4b1 100644 --- a/.editorconfig +++ b/.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 \ No newline at end of file +indent_size = 2 diff --git a/Build/Test/bootstrap.sh b/Build/Test/bootstrap.sh index 45196dc56..a92bfd992 100755 --- a/Build/Test/bootstrap.sh +++ b/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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 389ae8287..c8504b161 100644 --- a/CONTRIBUTING.md +++ b/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 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). diff --git a/Classes/Routing/RoutingService.php b/Classes/Routing/RoutingService.php index b341cbc6f..284e4a936 100644 --- a/Classes/Routing/RoutingService.php +++ b/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 */ diff --git a/Documentation/Includes.txt b/Documentation/Includes.txt index b8a9eee4c..dcbd62443 100644 --- a/Documentation/Includes.txt +++ b/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: diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index d1b3ca13a..f7b35601a 100644 --- a/Documentation/Settings.cfg +++ b/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 # ................................................................. diff --git a/README.md b/README.md index bfc6e3e6e..6deb55be4 100644 --- a/README.md +++ b/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,7 +41,7 @@ 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) @@ -48,7 +49,7 @@ To try out Apache Solr for TYPO3 visit [www.typo3-solr.com](http://www.typo3-sol - **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:** diff --git a/Resources/Private/Solr/configsets/ext_solr_11_5_0/conf/solrconfig.xml b/Resources/Private/Solr/configsets/ext_solr_11_5_0/conf/solrconfig.xml index 8a62c9837..2e54fb9c4 100644 --- a/Resources/Private/Solr/configsets/ext_solr_11_5_0/conf/solrconfig.xml +++ b/Resources/Private/Solr/configsets/ext_solr_11_5_0/conf/solrconfig.xml @@ -317,21 +317,21 @@ diff --git a/Tests/Unit/System/Solr/Service/Fixtures/solrconfig.xml b/Tests/Unit/System/Solr/Service/Fixtures/solrconfig.xml index c12a9d148..0d3bacefa 100644 --- a/Tests/Unit/System/Solr/Service/Fixtures/solrconfig.xml +++ b/Tests/Unit/System/Solr/Service/Fixtures/solrconfig.xml @@ -327,21 +327,21 @@