From 6c46a2016049dc725acb3f373ea67b4bda18a882 Mon Sep 17 00:00:00 2001 From: Justus Moroni Date: Tue, 6 Nov 2018 17:34:56 +0100 Subject: [PATCH 1/3] TASK: Make multiple plugins with flexform settings possible Remove the specified pluginName in the ConfigurationContainer so the correct settings for the context can be fetched. Resolves: #170 --- .../Configuration/ConfigurationContainer.php | 3 +-- Documentation/source/changelog.rst | 1 + ...the-pluginname-in-configurationcontainer.rst | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Documentation/source/changelog/20181106-170-do-not-specify-the-pluginname-in-configurationcontainer.rst diff --git a/Classes/Configuration/ConfigurationContainer.php b/Classes/Configuration/ConfigurationContainer.php index eab76e0..88aa414 100644 --- a/Classes/Configuration/ConfigurationContainer.php +++ b/Classes/Configuration/ConfigurationContainer.php @@ -45,8 +45,7 @@ class ConfigurationContainer implements ConfigurationContainerInterface { $this->settings = $configurationManager->getConfiguration( ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, - 'SearchCore', - 'search' + 'SearchCore' ); if ($this->settings === null) { throw new NoConfigurationException('Could not fetch configuration.', 1484226842); diff --git a/Documentation/source/changelog.rst b/Documentation/source/changelog.rst index 2cad89f..0bde72f 100644 --- a/Documentation/source/changelog.rst +++ b/Documentation/source/changelog.rst @@ -14,3 +14,4 @@ Changelog changelog/20180308-introduce-php70-type-hints changelog/20180306-120-facet-configuration changelog/20180926-163-allow-zero-as-typoscript-filter-value + changelog/20181106-170-do-not-specify-the-pluginname-in-configurationcontainer diff --git a/Documentation/source/changelog/20181106-170-do-not-specify-the-pluginname-in-configurationcontainer.rst b/Documentation/source/changelog/20181106-170-do-not-specify-the-pluginname-in-configurationcontainer.rst new file mode 100644 index 0000000..7bca897 --- /dev/null +++ b/Documentation/source/changelog/20181106-170-do-not-specify-the-pluginname-in-configurationcontainer.rst @@ -0,0 +1,17 @@ +Feature 170 "Do not specify the pluginName in ConfigurationContainer" +=============================================================================== + +Prior to the change it was not possible to create a second plugin in a +separate extension. The pluginName for the configuration was set to `search`. +The problem was that the plugin specific settings could not be fetched. + +The configuration in `plugin.tx_exampleextension_pluginkey.settings {..}` and +from flexform were not fetched. + +Now the pluginName is not set and the ConfigurationManager checks which plugin +is used in the current context. + +It is now possible to create a second plugin. For example if you want to cache +the output of your query or the filters you specified. + +See :issue:`170`. From b7084367ec41b4f91eb7ebdf4f62ef246a09cc8e Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 6 Jun 2019 13:32:52 +0200 Subject: [PATCH 2/3] Fix travis configuration --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54c2637..7e83e4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ sudo: true -addons: - apt: - packages: - - oracle-java8-set-default before_install: - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.2.0.deb && sudo service elasticsearch restart - mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO travis@127.0.0.1;' From 81c3aa7e358c184fe0ac85fcc558c14491f27615 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 6 Jun 2019 13:36:35 +0200 Subject: [PATCH 3/3] Remove unnecessary debugging output during installation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21f6c31..1430633 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ install: clean patch composer.json Tests/InstallPatches/composer.json.patch; \ fi - COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)" + COMPOSER_PROCESS_TIMEOUT=1000 composer require --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)" git checkout composer.json cgl: