diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index b18a44dc..9e06c8ef 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -21,13 +21,12 @@ jobs:
fail-fast: false
matrix:
php-version:
- - 7.1
- - 7.2
- - 7.3
- 7.4
- 8.0
- 8.1
- 8.2
+ - 8.3
+ - 8.4
php-compatibility:
name: "PHPCompatibility"
@@ -52,13 +51,12 @@ jobs:
fail-fast: false
matrix:
php-version:
- - "7.1"
- - "7.2"
- - "7.3"
- - "7.4"
- - "8.0"
- - "8.1"
- - "8.2"
+ - 7.4
+ - 8.0
+ - 8.1
+ - 8.2
+ - 8.3
+ - 8.4
code-style:
name: Check code style
@@ -167,20 +165,6 @@ jobs:
fail-fast: false
matrix:
include:
- - typo3-version: ^8.7
- php-version: 7.1
- - typo3-version: ^8.7
- php-version: 7.2
- - typo3-version: ^9.5
- php-version: 7.2
- - typo3-version: ^9.5
- php-version: 7.3
- - typo3-version: ^9.5
- php-version: 7.4
- - typo3-version: ^10.4
- php-version: 7.2
- - typo3-version: ^10.4
- php-version: 7.3
- typo3-version: ^10.4
php-version: 7.4
- typo3-version: ^11.5
@@ -193,3 +177,63 @@ jobs:
php-version: 8.1
- typo3-version: ^12.4
php-version: 8.2
+ - typo3-version: ^12.4
+ php-version: 8.3
+ - typo3-version: ^12.4
+ php-version: 8.4
+
+ phpunit-functional:
+ name: TYPO3 Functional Tests
+ runs-on: ubuntu-latest
+ needs: phpunit
+ steps:
+ - name: "Checkout"
+ uses: actions/checkout@v2
+ - name: "Install PHP"
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: "${{ matrix.php-version }}"
+ tools: composer:2.2.11
+ extensions: zip, sqlite
+ coverage: none
+ - name: "Show Composer version"
+ run: composer --version
+ - name: "Cache dependencies installed with composer"
+ uses: actions/cache@v4
+ with:
+ key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+ path: ~/.composer/cache
+ restore-keys: "php${{ matrix.php-version }}-composer-\n"
+ # The next step is required because the dependencies of PHPStan clash with those of TYPO3 8.7.
+ - name: "Remove PHPStan"
+ run: composer remove --no-update --dev phpstan/phpstan phpstan/phpstan-phpunit phpstan/extension-installer
+ - name: "Install TYPO3 Core"
+ env:
+ TYPO3: "${{ matrix.typo3-version }}"
+ run: |
+ composer require --no-install --no-progress typo3/minimal:"$TYPO3"
+ composer show
+ - name: "Install dependencies with composer"
+ run: |
+ composer update --no-ansi --no-interaction --no-progress --with-dependencies
+ composer show
+ - name: "Run unit tests"
+ run: "TYPO3_PATH_WEB=$PWD/.Build/Web && .Build/bin/phpunit -c ./tests/phpunit.functional.xml"
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - typo3-version: ^12.4
+ php-version: 8.1
+ - typo3-version: ^12.4
+ php-version: 8.2
+ - typo3-version: ^12.4
+ php-version: 8.3
+ - typo3-version: ^12.4
+ php-version: 8.4
+ - typo3-version: ^13.4
+ php-version: 8.2
+ - typo3-version: ^13.4
+ php-version: 8.3
+ - typo3-version: ^13.4
+ php-version: 8.4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a405cfc..73f7b01b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,6 +12,20 @@ jobs:
steps:
- name: "Checkout"
uses: actions/checkout@v4
+
+ - name: "Set up PHP"
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: '8.2'
+ tools: composer
+ coverage: none
+
+ - name: "Run install.sh"
+ run: ./Resources/Private/Php/install.sh
+
+ - name: "show composer"
+ run: cat composer.json
+
- name: "Publish new version to TER"
uses: tomasnorre/typo3-upload-ter@v2
with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe5bb95f..ad2f5f74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
Changelog
---------
+v1.20.0 (24.10.2025)
+* Update for TYPO3 13.4 LTS
+* New query option 'collection' of type 'iterator' for memory-saving database queries
+* BC: showMenu() in ToolBox is not static anymore
+* BC: BEPager requires IModule in constructor
+* BC: Utility\TypoScript::parseTsConfig() is not static anymore.
+* BC: Utility\SimpleMarker::parseTemplate() removed call-by-reference parameters.
+* BC: new Method FilterInterace::setRequest for filter classes. This makes it possible to use filter classes as services.
+
v1.19.4 (11.06.2025)
* Fix github actions and TER release
diff --git a/Classes/Backend/Form/Element/InputText.php b/Classes/Backend/Form/Element/InputText.php
index 7b3ac981..aa6caf0e 100644
--- a/Classes/Backend/Form/Element/InputText.php
+++ b/Classes/Backend/Form/Element/InputText.php
@@ -3,9 +3,8 @@
namespace Sys25\RnBase\Backend\Form\Element;
use Sys25\RnBase\Backend\Utility\Icons;
+use Sys25\RnBase\Typo3Wrapper\Backend\Form\CompatFormElement;
use Sys25\RnBase\Utility\Strings;
-use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
-use TYPO3\CMS\Backend\Form\NodeFactory;
use TYPO3\CMS\Core\Utility\StringUtility;
/***************************************************************
@@ -34,22 +33,8 @@
/**
* Rendert ein einfaches Input-Field.
*/
-class InputText extends AbstractFormElement
+class InputText extends CompatFormElement
{
- /**
- * @param array $data not used right now!
- */
- public function __construct(NodeFactory $nodeFactory, array $data)
- {
- // nodeFactory is not used and will be removed in later version
- parent::__construct($nodeFactory, $data);
- }
-
- public function render()
- {
- return [];
- }
-
public function renderHtml($name, $value, $config)
{
$width = $config['width'];
diff --git a/Classes/Backend/Form/FormBuilder.php b/Classes/Backend/Form/FormBuilder.php
index 706b9de1..d0cb44e7 100644
--- a/Classes/Backend/Form/FormBuilder.php
+++ b/Classes/Backend/Form/FormBuilder.php
@@ -2,13 +2,15 @@
namespace Sys25\RnBase\Backend\Form;
+use Sys25\RnBase\Backend\Module\IModule;
use Sys25\RnBase\Utility\TYPO3;
use tx_rnbase;
+use TYPO3\CMS\Backend\Form\FormDataGroup\TcaDatabaseRecord;
/***************************************************************
* Copyright notice
*
- * (c) 2016-2021 Rene Nitzsche (rene@system25.de)
+ * (c) 2016-2025 Rene Nitzsche (rene@system25.de)
* All rights reserved
*
* This library is free software; you can redistribute it and/or
@@ -49,6 +51,11 @@ class FormBuilder
*/
private $formResultCompiler;
+ /**
+ * @var IModule
+ */
+ private $module;
+
/**
* @var array
*/
@@ -57,7 +64,7 @@ class FormBuilder
public function __construct()
{
/**
- * @var \TYPO3\CMS\Backend\Form\FormDataGroup\TcaDatabaseRecord
+ * @var TcaDatabaseRecord
*/
$formDataGroup = tx_rnbase::makeInstance('TYPO3\\CMS\\Backend\\Form\\FormDataGroup\\TcaDatabaseRecord');
$this->formDataCompiler = tx_rnbase::makeInstance('TYPO3\\CMS\\Backend\\Form\\FormDataCompiler', $formDataGroup);
@@ -65,8 +72,9 @@ public function __construct()
$this->formResultCompiler = tx_rnbase::makeInstance('TYPO3\\CMS\\Backend\\Form\\FormResultCompiler');
}
- public function initDefaultBEmode()
+ public function setModule(IModule $module)
{
+ $this->module = $module;
}
/**
@@ -128,7 +136,13 @@ protected function compileFormData($table, $uid, $record)
'returnUrl' => '',
];
}
- $this->formDataCache[$cacheKey] = $this->formDataCompiler->compile($formDataCompilerInput);
+ $formDataCompilerInput['request'] = $this->module->getRequest();
+
+ if (TYPO3::isTYPO130OrHigher()) {
+ $this->formDataCache[$cacheKey] = $this->formDataCompiler->compile($formDataCompilerInput, tx_rnbase::makeInstance(TcaDatabaseRecord::class));
+ } else {
+ $this->formDataCache[$cacheKey] = $this->formDataCompiler->compile($formDataCompilerInput);
+ }
if ($this->isNEWRecord($uid)) {
// Override generated with given uid
$this->formDataCache[$cacheKey]['databaseRow']['uid'] = $uid;
@@ -171,11 +185,7 @@ public function getSoloField($table, $row, $fieldName)
*/
public function printNeededJSFunctions_top()
{
- if (TYPO3::isTYPO90OrHigher()) {
- $result = $this->formResultCompiler->addCssFiles();
- } else {
- $result = $this->formResultCompiler->JStop();
- }
+ $result = $this->formResultCompiler->addCssFiles();
return $result;
}
diff --git a/Classes/Backend/Form/ToolBox.php b/Classes/Backend/Form/ToolBox.php
index f4d2617f..524c271b 100644
--- a/Classes/Backend/Form/ToolBox.php
+++ b/Classes/Backend/Form/ToolBox.php
@@ -10,6 +10,7 @@
use Sys25\RnBase\Backend\Utility\Icons;
use Sys25\RnBase\Backend\Utility\TCA;
use Sys25\RnBase\Frontend\Request\Parameters;
+use Sys25\RnBase\Utility\LanguageTool;
use Sys25\RnBase\Utility\Link;
use Sys25\RnBase\Utility\Math;
use Sys25\RnBase\Utility\Misc;
@@ -17,6 +18,7 @@
use Sys25\RnBase\Utility\T3General;
use Sys25\RnBase\Utility\TYPO3;
use tx_rnbase;
+use TYPO3\CMS\Backend\Routing\PreviewUriBuilder;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
@@ -78,6 +80,7 @@ class ToolBox
public const OPTION_PARAMS = 'params';
public const OPTION_CSS_CLASSES = 'class';
+ public const OPTION_CSS_STYLES = 'styles';
public const OPTION_DATA_ATTR = 'data-attr';
/**
@@ -107,7 +110,7 @@ public function init(DocumentTemplate $doc, IModule $module)
// TCEform für das Formular erstellen
$this->form = tx_rnbase::makeInstance(FormBuilder::class);
- $this->form->initDefaultBEmode();
+ $this->form->setModule($module);
}
/**
@@ -171,7 +174,7 @@ public function createShowLink($pid, $label, $urlParams = '', $options = [])
if ($options['sprite'] ?? false) {
$label = Icons::getSpriteIcon($options['sprite']);
}
- $jsCode = BackendUtility::viewOnClick($pid, '', null, '', '', $urlParams);
+
$title = '';
if ($options['hover'] ?? false) {
$title = ' title="'.$options['hover'].'" ';
@@ -180,6 +183,16 @@ public function createShowLink($pid, $label, $urlParams = '', $options = [])
$class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
$class = ' class="'.$class.'"';
+ if (TYPO3::isTYPO121OrHigher()) {
+ $uri = (string) PreviewUriBuilder::create($pid)
+ ->withAdditionalQueryParameters($urlParams)
+ ->buildUri();
+
+ return ''.$label.'';
+ }
+
+ $jsCode = BackendUtility::viewOnClick($pid, '', null, '', '', $urlParams);
+
return ''.$label.'';
}
@@ -734,9 +747,11 @@ public function createTextArea($name, $value, $cols = '30', $rows = '5', $option
{
$options = is_array($options) ? $options : [];
$onChangeStr = ($options['onchange'] ?? false) ? ' onchange=" '.$options['onchange'].'" ' : '';
+ $classes = $options[self::OPTION_CSS_CLASSES] ?? 'formField1';
+ $styles = $options[self::OPTION_CSS_STYLES] ?? 'width:288px;';
- return '';
+ return sprintf('', $name, $styles, $classes, $cols, $rows, $value);
}
/**
@@ -760,7 +775,10 @@ public function createTxtInput($name, $value, $width, $options = [])
public function createIntInput($name, $value, $width, $maxlength = 10)
{
/* @var $inputField InputText */
- $inputField = tx_rnbase::makeInstance(InputText::class, $this->getTCEForm()->getNodeFactory(), []);
+ $inputField = TYPO3::isTYPO121OrHigher() ?
+ tx_rnbase::makeInstance(InputText::class)
+ :
+ tx_rnbase::makeInstance(InputText::class, $this->getTCEForm()->getNodeFactory(), []);
$out = $inputField->renderHtml($name, $value, [
'width' => $width,
'maxlength' => $maxlength,
@@ -780,36 +798,43 @@ public function createDateInput($name, $value, array $options = [])
$value += date('Z', $value);
}
$this->initializeJavaScriptFormEngine();
- $dateElementClass = TYPO3::isTYPO121OrHigher() ?
- \TYPO3\CMS\Backend\Form\Element\DatetimeElement::class :
- \TYPO3\CMS\Backend\Form\Element\InputDateTimeElement::class;
// [itemFormElName] => data[tx_cfcleague_games][4][status]
// [itemFormElID] => data_tx_cfcleague_games_4_status
-
- $renderedElement = tx_rnbase::makeInstance(
- $dateElementClass,
- $this->getTCEForm()->getNodeFactory(),
- [
- 'fieldName' => $name,
- 'tableName' => '',
- 'databaseRow' => ['uid' => 0],
- 'processedTca' => ['columns' => [$name => ['config' => ['type' => 'text']]]],
- 'parameterArray' => [
- 'itemFormElValue' => $value,
- 'itemFormElName' => $name,
- 'itemFormElID' => $name,
- 'fieldConf' => [
- 'label' => $options[self::OPTION_LABEL] ?? '',
- 'config' => [
- 'width' => 20,
- 'maxlength' => 20,
- 'eval' => 'datetime',
- ],
+ $options = [
+ 'fieldName' => $name,
+ 'tableName' => '',
+ 'databaseRow' => ['uid' => 0],
+ 'processedTca' => ['columns' => [$name => ['config' => ['type' => 'text']]]],
+ 'parameterArray' => [
+ 'itemFormElValue' => $value,
+ 'itemFormElName' => $name,
+ 'itemFormElID' => $name,
+ 'fieldConf' => [
+ 'label' => $options[self::OPTION_LABEL] ?? '',
+ 'config' => [
+ 'width' => 20,
+ 'maxlength' => 20,
+ 'eval' => 'datetime',
],
],
- ]
- )->render();
+ ],
+ ];
+
+ if (!TYPO3::isTYPO130OrHigher()) {
+ $dateElementClass = TYPO3::isTYPO121OrHigher() ?
+ \TYPO3\CMS\Backend\Form\Element\DatetimeElement::class :
+ \TYPO3\CMS\Backend\Form\Element\InputDateTimeElement::class;
+
+ $renderedElement = tx_rnbase::makeInstance(
+ $dateElementClass,
+ $this->getTCEForm()->getNodeFactory(),
+ $options
+ )->render();
+ } else {
+ $options['renderType'] = 'datetime';
+ $renderedElement = $this->getTCEForm()->getNodeFactory()->create($options)->render();
+ }
if ($renderedElement['requireJsModules'] ?? null) {
$pageRenderer = $this->getDoc()->getPageRenderer();
@@ -871,7 +896,8 @@ protected function initializeJavaScriptFormEngine()
*/
public function createSelectSingle($name, $value, $table, $column, $options = 0)
{
- global $TCA, $LANG;
+ global $TCA;
+ $lang = $this->getLanguageService();
$options = is_array($options) ? $options : [];
$out = '
@@ -1147,7 +1173,7 @@ public function showTabMenu($pid, $name, $modName, $entries)
];
$SETTINGS = BackendUtility::getModuleData(
$MENU,
- T3General::_GP('SET'),
+ Parameters::_GP('SET'),
$modName
);
$menuItems = [];
@@ -1201,14 +1227,16 @@ protected function buildScriptURI($urlParams)
*
* @return array with keys 'menu' and 'value'
*/
- public static function showMenu($pid, $name, $modName, $entries, $script = '', $addparams = '')
+ public function showMenu($pid, $name, $modName, $entries, $script = '', $addparams = '')
{
$MENU = [
$name => $entries,
];
+ $reqData = Parameters::getPostOrGetParameter('SET');
+ $req2 = $this->getModule()->getRequest()->getQueryParams()['SET'] ?? [];
$SETTINGS = BackendUtility::getModuleData(
$MENU,
- Parameters::getPostOrGetParameter('SET'),
+ $reqData,
$modName
);
@@ -1348,7 +1376,7 @@ protected function buildDataHandlerUri(string $params, $redirect)
}
/**
- * @return LanguageService|\TYPO3\CMS\Lang\LanguageService
+ * @return LanguageTool
*/
public function getLanguageService()
{
diff --git a/Classes/Backend/Lister/AbstractLister.php b/Classes/Backend/Lister/AbstractLister.php
index 86eb0c3b..ffc265c3 100644
--- a/Classes/Backend/Lister/AbstractLister.php
+++ b/Classes/Backend/Lister/AbstractLister.php
@@ -186,7 +186,7 @@ protected function getPager()
tx_rnbase::makeInstance(
BEPager::class,
$this->getListerId().'Pager',
- $this->getModule()->getName(),
+ $this->getModule(),
$this->getOptions()->getPid()
)
);
diff --git a/Classes/Backend/Module/BaseModFunc.php b/Classes/Backend/Module/BaseModFunc.php
index 369ac10b..f9f5338e 100644
--- a/Classes/Backend/Module/BaseModFunc.php
+++ b/Classes/Backend/Module/BaseModFunc.php
@@ -41,7 +41,7 @@ abstract class BaseModFunc implements IModFunc
/* @var $mod IModule */
protected $mod;
- public function init(IModule $module, $conf)
+ private function init(IModule $module, $conf)
{
$this->mod = $module;
}
@@ -64,7 +64,9 @@ public function getModule()
public function main(?ServerRequestInterface $request = null)
{
if (TYPO3::isTYPO121OrHigher()) {
+ /** @var IModule $modFuncFrame */
$modFuncFrame = tx_rnbase::makeInstance(ModFuncFrame::class);
+ $this->init($modFuncFrame, []);
return $modFuncFrame->render($this, function () { return $this->renderOutput(); }, $request);
}
diff --git a/Classes/Backend/Module/BaseModule.php b/Classes/Backend/Module/BaseModule.php
index a3e6b589..d23ca059 100644
--- a/Classes/Backend/Module/BaseModule.php
+++ b/Classes/Backend/Module/BaseModule.php
@@ -2,6 +2,7 @@
namespace Sys25\RnBase\Backend\Module;
+use Psr\Http\Message\ServerRequestInterface;
use Sys25\RnBase\Backend\Form\ToolBox;
use Sys25\RnBase\Backend\Template\ModuleParts;
use Sys25\RnBase\Backend\Template\ModuleTemplate;
@@ -12,6 +13,7 @@
use Sys25\RnBase\Frontend\Marker\Templates;
use Sys25\RnBase\Utility\Arrays;
use Sys25\RnBase\Utility\Files;
+use Sys25\RnBase\Utility\LanguageTool;
use Sys25\RnBase\Utility\Misc;
use Sys25\RnBase\Utility\Strings;
use Sys25\RnBase\Utility\TYPO3;
@@ -20,7 +22,7 @@
/***************************************************************
* Copyright notice
*
-* (c) 2009-2023 Rene Nitzsche (rene@system25.de)
+* (c) 2009-2025 Rene Nitzsche (rene@system25.de)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -52,6 +54,8 @@
* );
* Die Funktionsklassen sollten das Interface IModFunc implementieren. Eine Basisklasse mit nützlichen
* Methoden steht natürlich auch bereit: BaseModFunc.
+ *
+ * @deprecated wird nur bis TYPO3 11 verwendet
*/
abstract class BaseModule extends BaseScriptClass implements IModule
{
@@ -91,10 +95,32 @@ public function init()
}
}
+ /**
+ * Sollte bis TYPO3 11 nicht verwendet werden.
+ *
+ * @return ServerRequestInterface|null
+ */
+ public function getRequest(): ?ServerRequestInterface
+ {
+ return null;
+ }
+
+ /**
+ * Sollte bis TYPO3 11 nicht verwendet werden.
+ *
+ * @param IModFunc $modFunc
+ * @param callable $renderFunc
+ * @param ServerRequestInterface $request
+ * @return void
+ */
+ public function render(IModFunc $modFunc, callable $renderFunc, ServerRequestInterface $request)
+ {
+ }
+
/**
* For the new TYPO3 request handlers.
*
- * @param \Psr\Http\Message\ServerRequestInterface $request
+ * @param ServerRequestInterface $request
* @param \Psr\Http\Message\ResponseInterface $response = null
*
* @return bool|\Psr\Http\Message\ResponseInterface TRUE, if the request request could be dispatched
@@ -127,7 +153,7 @@ public function __invoke(
* Main function of the module. Write the content to $this->content
* If you chose "web" as main module, you will need to consider the $this->id parameter which will contain the uid-number of the page clicked in the page tree.
*
- * @param \Psr\Http\Message\ServerRequestInterface|null $request
+ * @param ServerRequestInterface|null $request
*/
public function main($request = null)
{
@@ -159,7 +185,7 @@ protected function prepareModuleParts($parts)
$parts->setContent($this->moduleContent());
$parts->setButtons($this->getButtons());
- $parts->setTitle($GLOBALS['LANG']->getLL('title'));
+ $parts->setTitle($this->getFormTool()->getLanguageService()->getLL('title'));
$parts->setFuncMenu($this->getFuncMenu());
// if we got no array the user got no permissions for the
// selected page or no page is selected
@@ -623,8 +649,11 @@ public function getRouteIdentifier()
return '';
}
+ /**
+ * @return LanguageTool
+ */
public function getLanguageService()
{
- return $GLOBALS['LANG'];
+ return $this->getFormTool()->getLanguageService();
}
}
diff --git a/Classes/Backend/Module/BaseScriptClass.php b/Classes/Backend/Module/BaseScriptClass.php
index 04961986..c0a9afac 100644
--- a/Classes/Backend/Module/BaseScriptClass.php
+++ b/Classes/Backend/Module/BaseScriptClass.php
@@ -15,11 +15,12 @@
* The TYPO3 project - inspiring people to share!
*/
+use Sys25\RnBase\Backend\Template\Override\DocumentTemplate;
+use Sys25\RnBase\Frontend\Request\Parameters;
+use tx_rnbase;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Localization\LanguageService;
-use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -69,6 +70,10 @@
*
* THEN WE CALL THE main() METHOD AND THIS SHOULD SPARK THE CREATION OF THE MODULE OUTPUT.
* $GLOBALS['SOBE']->main();
+ *
+ * TODO: check TYPO3 versions used.
+ *
+ * @deprecated
*/
abstract class BaseScriptClass
{
@@ -225,9 +230,9 @@ public function init()
$this->MCONF = $GLOBALS['MCONF'] ?? [];
}
- $this->id = (int) GeneralUtility::_GP('id');
- $this->CMD = GeneralUtility::_GP('CMD');
- $this->moduleName = GeneralUtility::_GP('M');
+ $this->id = (int) Parameters::_GP('id');
+ $this->CMD = Parameters::_GP('CMD');
+ $this->moduleName = Parameters::_GP('M');
// Das sollte zur Initialisierung des Modules ausreichend sein.
// Das access Level sollte nicht vorgegeben werden.
if (!isset($this->MCONF['name']) && $this->moduleName) {
@@ -264,7 +269,7 @@ public function menuConfig()
exit('Backend module is not initialized. No module functions found in MOD_MENU.');
}
- $this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, GeneralUtility::_GP('SET'), $this->MCONF['name'], $this->modMenu_type, $this->modMenu_dontValidateList, $this->modMenu_setDefaultList);
+ $this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, Parameters::_GP('SET'), $this->MCONF['name'], $this->modMenu_type, $this->modMenu_dontValidateList, $this->modMenu_setDefaultList);
}
/**
@@ -342,10 +347,10 @@ public function getExternalItemConfig($modName, $menuKey, $value = '')
public function checkExtObj()
{
if (is_array($this->extClassConf) && $this->extClassConf['name']) {
- $this->extObj = GeneralUtility::makeInstance($this->extClassConf['name']);
+ $this->extObj = tx_rnbase::makeInstance($this->extClassConf['name']);
$this->extObj->init($this, $this->extClassConf);
// Re-write:
- $this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, GeneralUtility::_GP('SET'), $this->MCONF['name'], $this->modMenu_type, $this->modMenu_dontValidateList, $this->modMenu_setDefaultList);
+ $this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, Parameters::_GP('SET'), $this->MCONF['name'], $this->modMenu_type, $this->modMenu_dontValidateList, $this->modMenu_setDefaultList);
}
}
@@ -376,17 +381,11 @@ public function extObjHeader()
public function extObjContent()
{
if (null === $this->extObj) {
- $flashMessage = GeneralUtility::makeInstance(
- FlashMessage::class,
+ $this->getDoc()->showFlashMessage(
$this->getLanguageService()->sL('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:no_modules_registered'),
- $this->getLanguageService()->getLL('title'),
- FlashMessage::ERROR
+ DocumentTemplate::STATE_ERROR,
+ $this->getLanguageService()->getLL('title')
);
- /** @var FlashMessageService $flashMessageService */
- $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
- $defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
- $defaultFlashMessageQueue->enqueue($flashMessage);
} else {
$this->extObj->pObj = $this;
if (is_callable([$this->extObj, 'main'])) {
@@ -442,4 +441,9 @@ protected function getPageRenderer()
return $this->pageRenderer;
}
+
+ /**
+ * @return DocumentTemplate
+ */
+ abstract public function getDoc();
}
diff --git a/Classes/Backend/Module/ExtendedModFunc.php b/Classes/Backend/Module/ExtendedModFunc.php
index 967bd23a..f4efc144 100644
--- a/Classes/Backend/Module/ExtendedModFunc.php
+++ b/Classes/Backend/Module/ExtendedModFunc.php
@@ -74,6 +74,7 @@ public function main(?ServerRequestInterface $request = null)
{
if (TYPO3::isTYPO121OrHigher()) {
$modFuncFrame = tx_rnbase::makeInstance(ModFuncFrame::class);
+ $this->mod = $modFuncFrame;
return $modFuncFrame->render($this, function () { return $this->renderOutput(); }, $request);
}
diff --git a/Classes/Backend/Module/IModFunc.php b/Classes/Backend/Module/IModFunc.php
index 5b18f3f4..5bee6c62 100644
--- a/Classes/Backend/Module/IModFunc.php
+++ b/Classes/Backend/Module/IModFunc.php
@@ -37,7 +37,7 @@ interface IModFunc
public const ICON_FATAL = 3;
- public function init(IModule $module, $conf);
+ // public function init(IModule $module, $conf);
/**
* Module identifier for ts_config.
diff --git a/Classes/Backend/Module/IModule.php b/Classes/Backend/Module/IModule.php
index aa543617..601b785f 100644
--- a/Classes/Backend/Module/IModule.php
+++ b/Classes/Backend/Module/IModule.php
@@ -2,9 +2,11 @@
namespace Sys25\RnBase\Backend\Module;
+use Psr\Http\Message\ServerRequestInterface;
use Sys25\RnBase\Backend\Form\ToolBox;
use Sys25\RnBase\Backend\Template\Override\DocumentTemplate;
use Sys25\RnBase\Configuration\ConfigurationInterface;
+use Sys25\RnBase\Utility\LanguageTool;
/***************************************************************
* Copyright notice
@@ -36,6 +38,8 @@ interface IModule
*/
public function getDoc();
+ public function getRequest(): ?ServerRequestInterface;
+
/**
* Returns the form tool.
*
@@ -76,6 +80,8 @@ public function getRouteIdentifier();
*/
public function getPid();
+ public function render(IModFunc $modFunc, callable $renderFunc, ServerRequestInterface $request);
+
/**
* Submenu String for the marker ###TABS###.
*
@@ -105,7 +111,7 @@ public function setSelector($selectorString);
public function addMessage($message, $title = '', $severity = 0, $storeInSession = false);
/**
- * @return \TYPO3\CMS\Core\Localization\LanguageService
+ * @return LanguageTool
*/
public function getLanguageService();
}
diff --git a/Classes/Backend/Module/ModFuncFrame.php b/Classes/Backend/Module/ModFuncFrame.php
index e6b4c34a..21a4da28 100644
--- a/Classes/Backend/Module/ModFuncFrame.php
+++ b/Classes/Backend/Module/ModFuncFrame.php
@@ -56,6 +56,8 @@ class ModFuncFrame implements IModule
protected $doc;
protected $tabs;
+ private ?ServerRequestInterface $request = null;
+
/**
* @var array
*/
@@ -74,8 +76,14 @@ public function __construct(
$this->pageRenderer = $pageRenderer;
}
+ public function getRequest(): ?ServerRequestInterface
+ {
+ return $this->request;
+ }
+
public function render(IModFunc $modFunc, callable $renderFunc, ServerRequestInterface $request)
{
+ $this->request = $request;
$this->modFunc = $modFunc;
$this->moduleIdentifier = $modFunc->getModuleIdentifier();
$this->id = (int) ($request->getQueryParams()['id'] ?? $request->getParsedBody()['id'] ?? 0);
@@ -88,11 +96,11 @@ public function render(IModFunc $modFunc, callable $renderFunc, ServerRequestInt
}
$this->getLanguageService()->registerLangFile('EXT:rn_base/Resources/Private/Language/locallang.xlf');
- $this->modFunc->init($this, [
- // 'form' => $this->getFormTag(),
- // 'docstyles' => $this->getDocStyles(),
- // 'template' => $this->getModuleTemplateFilename(),
- ]);
+ // $this->modFunc->init($this, [
+ // // 'form' => $this->getFormTag(),
+ // // 'docstyles' => $this->getDocStyles(),
+ // // 'template' => $this->getModuleTemplateFilename(),
+ // ]);
// Rahmen rendern
$this->moduleTemplate = $this->createModuleTemplate($request);
// Die Variable muss gesetzt sein.
@@ -186,7 +194,6 @@ protected function getFormTag()
*/
public function getLanguageService()
{
- // return $GLOBALS['LANG'];
return $this->languageTool;
}
@@ -211,7 +218,7 @@ protected function getBackendUser()
public function getConfigurations()
{
if (null === $this->configurations) {
- Misc::prepareTSFE(['pid' => $this->id]); // Ist bei Aufruf aus BE notwendig!
+ Misc::prepareTSFE(['pid' => $this->getPid()]); // Ist bei Aufruf aus BE notwendig!
$cObj = TYPO3::getContentObject();
$pageTSconfigFull = BackendUtility::getPagesTSconfig($this->getPid());
diff --git a/Classes/Backend/Template/ModuleTemplate.php b/Classes/Backend/Template/ModuleTemplate.php
index c6e30787..7eb3d539 100644
--- a/Classes/Backend/Template/ModuleTemplate.php
+++ b/Classes/Backend/Template/ModuleTemplate.php
@@ -85,15 +85,15 @@ protected function renderContent12(ModuleParts $parts)
{
/** @var ModuleTemplateFactory $factory */
$factory = tx_rnbase::makeInstance(ModuleTemplateFactory::class);
- $view = $factory->create($this->options['request']);
+ $moduleTemplate = $factory->create($this->options['request']);
$content = '';
// $moduleTemplate->getPageRenderer()->loadJquery();
- $view->getDocHeaderComponent()->setMetaInformation($parts->getPageInfo());
- $this->registerMenu($view, $parts);
+ $moduleTemplate->getDocHeaderComponent()->setMetaInformation($parts->getPageInfo());
+ $this->registerMenu($moduleTemplate, $parts);
$content .= $this->options['form'] ?? $this->module->buildFormTag();
- $view->makeDocHeaderModuleMenu(['id' => $this->module->getPid()]);
+ $moduleTemplate->makeDocHeaderModuleMenu(['id' => $this->module->getPid()]);
if (is_string($parts->getFuncMenu())) {
// Fallback für Module, die das FuncMenu selbst als String generieren
@@ -106,7 +106,7 @@ protected function renderContent12(ModuleParts $parts)
$content .= '';
// Es ist sinnvoll, die Buttons nach der Generierung des Content zu generieren
- $this->generateButtons($view, $parts);
+ $this->generateButtons($moduleTemplate, $parts);
// Workaround: jumpUrl wieder einfügen
// @TODO Weg finden dass ohne das DocumentTemplate zu machen
@@ -115,9 +115,12 @@ protected function renderContent12(ModuleParts $parts)
// @TODO haupttemplate eines BE moduls enthält evtl. JS/CSS etc.
// das wurde bisher über das DocumentTemplate eingefügt, was jetzt
// nicht mehr geht. Dafür muss ein Weg gefunden werden.
- $view->setContent($content);
+ // $moduleTemplate->setContent($content);
+ $moduleTemplate->assign('content', $content);
- return $view->renderContent();
+ return $moduleTemplate->render('ModuleTemplate/Module.html');
+
+ return $moduleTemplate->renderContent();
}
/**
diff --git a/Classes/Backend/Template/Override/DocumentTemplate.php b/Classes/Backend/Template/Override/DocumentTemplate.php
index 9a365c7b..684f4477 100644
--- a/Classes/Backend/Template/Override/DocumentTemplate.php
+++ b/Classes/Backend/Template/Override/DocumentTemplate.php
@@ -4,10 +4,13 @@
use Sys25\RnBase\Backend\Utility\Icons;
use Sys25\RnBase\Utility\Files;
+use Sys25\RnBase\Utility\LanguageTool;
use Sys25\RnBase\Utility\Strings;
use Sys25\RnBase\Utility\T3General;
use Sys25\RnBase\Utility\TYPO3;
+use tx_rnbase;
use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\Locale;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -34,6 +37,11 @@
* This copyright notice MUST APPEAR in all copies of the script!
*/
+/**
+ * Die Klasse sollte zurückgebaut werden. Sie ist nicht wirklich ein Template.
+ * Sie ist eine Sammlung von Hilfsfunktionen, die in den Modulen
+ * verwendet werden. Da ist aber die ToolBox die zentrale Anlaufstelle.
+ */
class DocumentTemplate
{
public const STATE_NOTICE = -2;
@@ -97,17 +105,22 @@ function jumpToUrl(URL) {
/** @var LanguageService */
private $lang;
+ /** @var LanguageTool */
+ private $languageTool;
/**
* Constructor.
*/
- public function __construct()
- {
+ public function __construct(
+ ?LanguageTool $languageTool = null,
+ ?\TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService = null
+ ) {
+ $this->languageTool = $languageTool ?? tx_rnbase::makeInstance(LanguageTool::class);
+ $this->lang = $this->languageTool->getLanguageService();
// Initializes the page rendering object:
$this->initPageRenderer();
- $this->flashMessageService = T3General::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
- $this->lang = $GLOBALS['LANG'];
+ $this->flashMessageService = $flashMessageService ?? tx_rnbase::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
}
/**
@@ -177,10 +190,11 @@ public function getTabMenuRaw($menuItems)
$options = '';
foreach ($menuItems as $def) {
$class = $def['isActive'] ? ' active' : '';
+ $class .= ' nav-link';
$label = $def['label'];
$url = htmlspecialchars($def['url'] ?? '');
$params = $def['addParams'] ?? '';
- $options .= ''.$label.'';
+ $options .= ''.$label.'';
}
return '';
@@ -369,6 +383,10 @@ public function getHtmlTemplate($filename)
*/
public function endPage()
{
+ if (TYPO3::isTYPO121OrHigher()) {
+ return;
+ }
+
$str = $this->postCode.$this->wrapScriptTags(BackendUtility::getUpdateSignalCode()).($this->form ? '
' : '');
// If something is in buffer like debug, put it to end of page
@@ -425,8 +443,13 @@ protected function initPageRenderer()
if (null !== $this->pageRenderer) {
return;
}
+ $lang = $this->getLangSrv()->lang;
+ if (TYPO3::isTYPO121OrHigher()) {
+ $lang = new Locale($lang);
+ }
+
$this->pageRenderer = T3General::makeInstance(PageRenderer::class);
- $this->pageRenderer->setLanguage($GLOBALS['LANG']->lang);
+ $this->pageRenderer->setLanguage($lang);
$this->pageRenderer->enableConcatenateCss();
$this->pageRenderer->enableConcatenateJavascript();
$this->pageRenderer->enableCompressCss();
diff --git a/Classes/Backend/Utility/BEPager.php b/Classes/Backend/Utility/BEPager.php
index 4f7c7825..8dc60e38 100644
--- a/Classes/Backend/Utility/BEPager.php
+++ b/Classes/Backend/Utility/BEPager.php
@@ -2,12 +2,12 @@
namespace Sys25\RnBase\Backend\Utility;
-use Sys25\RnBase\Backend\Form\ToolBox;
+use Sys25\RnBase\Backend\Module\IModule;
/***************************************************************
* Copyright notice
*
-* (c) 2008-2023 Rene Nitzsche (rene@system25.de)
+* (c) 2008-2025 Rene Nitzsche (rene@system25.de)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -41,14 +41,16 @@ class BEPager
private $settings;
private $init = false;
+ private $module;
private $modName;
private $conf;
- public function __construct($id, $modName, $pid, $listSize = 0, $conf = [])
+ public function __construct($id, IModule $module, $pid, $listSize = 0, $conf = [])
{
$this->id = strlen(trim($id)) ? trim($id) : 'pager';
$this->pid = $pid;
- $this->modName = $modName;
+ $this->module = $module;
+ $this->modName = $module->getName();
$this->conf = $conf;
$this->setListSize($listSize);
}
@@ -102,7 +104,8 @@ public function setState()
return;
}
$sizes = $this->getLimits();
- $menu = ToolBox::showMenu($this->pid, $this->getDataName().'_limit', $this->modName, $sizes);
+ $toolbox = $this->module->getFormTool();
+ $menu = $toolbox->showMenu($this->pid, $this->getDataName().'_limit', $this->modName, $sizes);
$this->setSetting('limit', $menu['value']);
$this->setSetting('limitMenu', $menu['menu']);
@@ -118,7 +121,7 @@ public function setState()
}
$pages[$i * $results_at_a_time] = 'Seite '.$i;
}
- $menu = ToolBox::showMenu($this->pid, $this->getDataName().'_offset', $this->modName, $pages);
+ $menu = $toolbox->showMenu($this->pid, $this->getDataName().'_offset', $this->modName, $pages);
$this->setSetting('offset', $menu['value']);
$this->setSetting('offsetMenu', $menu['menu']);
$this->init = true;
diff --git a/Classes/Backend/Utility/BackendUtility.php b/Classes/Backend/Utility/BackendUtility.php
index b403b70c..dc5fd24a 100644
--- a/Classes/Backend/Utility/BackendUtility.php
+++ b/Classes/Backend/Utility/BackendUtility.php
@@ -3,10 +3,15 @@
namespace Sys25\RnBase\Backend\Utility;
use InvalidArgumentException;
+use Psr\Http\Message\ServerRequestInterface;
use Sys25\RnBase\Utility\T3General;
use Sys25\RnBase\Utility\TYPO3;
use tx_rnbase;
+use TYPO3\CMS\Backend\Routing\Route;
use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Utility\HttpUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
/***************************************************************
* Copyright notice
@@ -86,7 +91,10 @@ protected static function getBackendUtilityClass()
*/
public static function getUrlToken($formName = 'securityToken', $tokenName = 'formToken')
{
- $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
+ $formProtection = TYPO3::isTYPO121OrHigher() ?
+ tx_rnbase::makeInstance(\TYPO3\CMS\Core\FormProtection\FormProtectionFactory::class)->createForType('default')
+ :
+ \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
return '&'.$tokenName.'='.$formProtection->generateToken($formName);
}
@@ -221,4 +229,92 @@ public static function editOnClick($params)
return 'window.location.href='.T3General::quoteJSvalue((string) $uri.'&returnUrl=').'+'.$returnUrl.'; return false;';
}
+
+ /**
+ * Returns a selector box to switch the view
+ * Based on BackendUtility::getFuncMenu() but done as new function because it has another purpose.
+ * Mingling with getFuncMenu would harm the docHeader Menu.
+ *
+ * @param mixed $mainParams The "&id=" parameter value to be sent to the module, but it can be also a parameter array which will be passed instead of the &id=...
+ * @param string $elementName The form elements name, probably something like "SET[...]
+ * @param string|int $currentValue the value to be selected currently
+ * @param array $menuItems An array with the menu items for the selector box
+ * @param string $script The script to send the &id to, if empty it's automatically found
+ * @param string $addParams additional parameters to pass to the script
+ * @param array $additionalAttributes Additional attributes for the select element
+ * @return string HTML code for selector box
+ *
+ * @deprecated since TYPO3 v12.2. will be removed in TYPO3 v13.0.
+ */
+ public static function getDropdownMenu(
+ $mainParams,
+ $elementName,
+ $currentValue,
+ $menuItems,
+ $script = '',
+ $addParams = '',
+ array $additionalAttributes = []
+ ) {
+ if (!is_array($menuItems) || count($menuItems) <= 1) {
+ return '';
+ }
+ $scriptUrl = self::buildScriptUrl($mainParams, $addParams, $script);
+ $options = [];
+ foreach ($menuItems as $value => $label) {
+ $options[] = '';
+ }
+ $dataMenuIdentifier = str_replace(['SET[', ']'], '', $elementName);
+ $dataMenuIdentifier = T3General::camelCaseToLowerCaseUnderscored($dataMenuIdentifier);
+ $dataMenuIdentifier = str_replace('_', '-', $dataMenuIdentifier);
+ // relies on module 'TYPO3/CMS/Backend/ActionDispatcher'
+ $attributes = T3General::implodeAttributes(array_merge([
+ 'name' => $elementName,
+ 'data-menu-identifier' => $dataMenuIdentifier,
+ 'data-global-event' => 'change',
+ 'data-action-navigate' => '$data=~s/$value/',
+ 'data-navigate-value' => $scriptUrl.'&'.$elementName.'=${value}',
+ ], $additionalAttributes), true);
+
+ return '
+
+
+
+
';
+ }
+
+ /**
+ * Builds the URL to the current script with given arguments.
+ *
+ * @param mixed $mainParams $id is the "&id=" parameter value to be sent to the module, but it can be also a parameter array which will be passed instead of the &id=...
+ * @param string $addParams additional parameters to pass to the script
+ * @param string $script The script to send the &id to, if empty it's automatically found
+ * @return string The complete script URL
+ * @todo Check if this can be removed or replaced by routing
+ */
+ private static function buildScriptUrl($mainParams, $addParams, $script = '')
+ {
+ if (!is_array($mainParams)) {
+ $mainParams = ['id' => $mainParams];
+ }
+
+ if (($GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface
+ && ($route = $GLOBALS['TYPO3_REQUEST']->getAttribute('route')) instanceof Route
+ ) {
+ $uriBuilder = T3General::makeInstance(UriBuilder::class);
+ $scriptUrl = (string) $uriBuilder->buildUriFromRoute($route->getOption('_identifier'), $mainParams);
+ $scriptUrl .= $addParams;
+ } else {
+ if (!$script) {
+ $script = PathUtility::basename(Environment::getCurrentScript());
+ }
+ $scriptUrl = $script.HttpUtility::buildQueryString($mainParams, '?').$addParams;
+ }
+
+ return $scriptUrl;
+ }
}
diff --git a/Classes/Backend/Utility/BaseLister.php b/Classes/Backend/Utility/BaseLister.php
index be6498cf..685271af 100644
--- a/Classes/Backend/Utility/BaseLister.php
+++ b/Classes/Backend/Utility/BaseLister.php
@@ -7,7 +7,7 @@
use Sys25\RnBase\Backend\Decorator\InterfaceDecorator;
use Sys25\RnBase\Backend\Form\ToolBox;
use Sys25\RnBase\Backend\Module\IModule;
-use Sys25\RnBase\Utility\T3General;
+use Sys25\RnBase\Frontend\Request\Parameters;
use Traversable;
use tx_rnbase;
@@ -275,8 +275,8 @@ protected function prepareFieldsAndOptions(array &$fields, array &$options)
*/
protected function prepareSorting(&$options)
{
- $sortField = \Sys25\RnBase\Frontend\Request\Parameters::getPostOrGetParameter('sortField');
- $sortRev = \Sys25\RnBase\Frontend\Request\Parameters::getPostOrGetParameter('sortRev');
+ $sortField = Parameters::getPostOrGetParameter('sortField');
+ $sortRev = Parameters::getPostOrGetParameter('sortRev');
if (!empty($sortField)) {
$cols = $this->getDecoratorColumns(null);
@@ -515,7 +515,7 @@ protected function buildFilterTable(array $data)
protected function showFreeTextSearchForm(&$marker, $key, array $options = [])
{
$searchstring = ModuleUtility::getModuleValue($key, $this->getModule(), [
- 'changed' => T3General::_GP('SET'),
+ 'changed' => Parameters::_GP('SET'),
]);
// Erst das Suchfeld, danach der Button.
@@ -532,7 +532,7 @@ protected function showHiddenSelector(&$marker, $options = [])
1 => $GLOBALS['LANG']->getLL('label_select_show_hidden'),
];
$selectedItem = ModuleUtility::getModuleValue('showhidden', $this->getModule(), [
- 'changed' => T3General::_GP('SET'),
+ 'changed' => Parameters::_GP('SET'),
]);
$options['label'] = $options['label'] ? $options['label'] : $GLOBALS['LANG']->getLL('label_hidden');
diff --git a/Classes/Backend/Utility/Tables.php b/Classes/Backend/Utility/Tables.php
index 6c01663a..d990f310 100644
--- a/Classes/Backend/Utility/Tables.php
+++ b/Classes/Backend/Utility/Tables.php
@@ -9,6 +9,7 @@
use Sys25\RnBase\Domain\Model\DataInterface;
use Sys25\RnBase\Domain\Model\DataModel;
use Sys25\RnBase\Domain\Model\RecordInterface;
+use Sys25\RnBase\Utility\LanguageTool;
use Traversable;
use tx_rnbase;
@@ -36,11 +37,16 @@
*/
class Tables
{
+ /**
+ * LanguageTool.
+ *
+ * @var mixed
+ */
private $lang;
- public function __construct($lang = null)
+ public function __construct(?LanguageTool $lang = null)
{
- $this->lang = $lang ?: $GLOBALS['LANG'];
+ $this->lang = $lang ?: tx_rnbase::makeInstance(LanguageTool::class);
}
/**
diff --git a/Classes/Configuration/Processor.php b/Classes/Configuration/Processor.php
index b0e11156..4e60118c 100644
--- a/Classes/Configuration/Processor.php
+++ b/Classes/Configuration/Processor.php
@@ -5,7 +5,7 @@
/***************************************************************
* Copyright notice
*
- * (c) 2007-2023 Rene Nitzsche
+ * (c) 2007-2025 Rene Nitzsche
* Contact: rene@system25.de
*
* Original version:
@@ -44,6 +44,7 @@
use Sys25\RnBase\Utility\Strings;
use Sys25\RnBase\Utility\TYPO3;
use Sys25\RnBase\Utility\Typo3Classes;
+use Sys25\RnBase\Utility\TypoScript;
use tx_rnbase;
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -191,6 +192,11 @@ class Processor implements ConfigurationInterface
*/
private $languageTool;
+ /**
+ * @var TypoScript
+ */
+ private $typoscriptTool;
+
private $languageService;
/**
@@ -1040,11 +1046,7 @@ protected function setFlexForm($xmlOrArray)
}
}
if ($flexTs) {
- // This handles ts setup from flexform
- $tsParser = tx_rnbase::makeInstance(Typo3Classes::getTypoScriptParserClass());
- $tsParser->setup = $this->_dataStore->getArrayCopy();
- $tsParser->parse($flexTs);
- $flexTsData = $tsParser->setup;
+ $flexTsData = $this->getTSTool()->parseTsConfig($flexTs, 'plugin_flex_'.$this->getPluginId(), $this->_dataStore->getArrayCopy());
$this->_dataStore->exchangeArray($flexTsData);
}
}
@@ -1064,10 +1066,21 @@ private function mergeTSReference($value, $conf)
// das < abschneiden, um den pfad zum link zu erhalten
$key = trim(substr($value, 1));
- $tsParser = tx_rnbase::makeInstance(Typo3Classes::getTypoScriptParserClass());
+ $tsArray = [];
+ if (TYPO3::isTYPO121OrHigher()) {
+ /** @var TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController $tsc */
+ $tsc = $this->getCObj()->getRequest()->getAttribute('frontend.typoscript');
+ $tsArray = $tsc->getSetupArray();
+ } else {
+ $tsArray = $GLOBALS['TSFE']->tmpl->setup;
+ }
+ // /** @var \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser $tsParser */
+ // $tsParser = tx_rnbase::makeInstance(Typo3Classes::getTypoScriptParserClass());
- // $name and $conf is loaded with the referenced values.
- list($linkValue, $linkConf) = $tsParser->getVal($key, $GLOBALS['TSFE']->tmpl->setup);
+ // // $name and $conf is loaded with the referenced values.
+ // list($linkValue, $linkConf) = $tsParser->getVal($key, $tsArray);
+
+ list($linkValue, $linkConf) = $this->getVal($key, $tsArray);
// Konfigurationen mergen
if (is_array($conf) && count($conf)) {
@@ -1080,6 +1093,37 @@ private function mergeTSReference($value, $conf)
return $linkConf;
}
+ private function getVal(string $key, array $tsArray): array
+ {
+ $segments = explode('.', $key);
+ $currentArray = $tsArray;
+
+ foreach ($segments as $i => $segment) {
+ $segmentWithDot = $segment.'.';
+ $isLast = ($i === count($segments) - 1);
+
+ if ($isLast) {
+ // Ergebnis setzen
+ if (isset($currentArray[$segmentWithDot])) {
+ return ['', $currentArray[$segmentWithDot]];
+ } elseif (isset($currentArray[$segment])) {
+ return [$currentArray[$segment], []];
+ } else {
+ return ['', []];
+ }
+ }
+
+ // tiefer steigen, wenn weiterer Pfad existiert
+ if (isset($currentArray[$segmentWithDot])) {
+ $currentArray = $currentArray[$segmentWithDot];
+ } else {
+ return [null, []];
+ }
+ }
+
+ return ['', []];
+ }
+
/**
* Merges two TypoScript propery array, overlaing the $old_conf onto the $conf array.
*
@@ -1145,10 +1189,18 @@ private function loadLL()
}
if (null === $this->languageService) {
- $this->languageService = tx_rnbase::makeInstance(LanguageServiceFactory::class)
- ->createFromSiteLanguage(
- $this->cObj->getTypoScriptFrontendController()->getLanguage()
- );
+ if (TYPO3::isTYPO121OrHigher()) {
+ $language = $GLOBALS['TYPO3_REQUEST']->getAttribute('language');
+ } else {
+ $language = $this->cObj->getTypoScriptFrontendController()->getLanguage();
+ }
+ $factory = tx_rnbase::makeInstance(LanguageServiceFactory::class);
+
+ if (null === $language) {
+ $this->languageService = $factory->create('en');
+ } else {
+ $this->languageService = $factory->createFromSiteLanguage($language);
+ }
}
$this->languageTool->setLanguageService($this->languageService);
@@ -1213,4 +1265,27 @@ private function renderTS($data, $cObj)
return $data;
}
+
+ /**
+ * @return TypoScript
+ */
+ private function getTSTool()
+ {
+ if (null === $this->typoscriptTool) {
+ $this->typoscriptTool = tx_rnbase::makeInstance(TypoScript::class);
+ }
+
+ return $this->typoscriptTool;
+ }
+
+ /**
+ * Useful for testing.
+ *
+ * @param TypoScript $typoscriptTool
+ * @return void
+ */
+ public function setTSTool(TypoScript $typoscriptTool)
+ {
+ $this->typoscriptTool = $typoscriptTool;
+ }
}
diff --git a/Classes/Database/Connection.php b/Classes/Database/Connection.php
index 6bc6a94d..bcf324b4 100644
--- a/Classes/Database/Connection.php
+++ b/Classes/Database/Connection.php
@@ -29,7 +29,7 @@
/***************************************************************
* Copyright notice
*
- * (c) 2006-2023 Rene Nitzsche
+ * (c) 2006-2025 Rene Nitzsche
* Contact: rene@system25.de
* All rights reserved
*
@@ -88,6 +88,8 @@ public static function getInstance()
* - 'sqlonly' - returns the generated SQL statement or prepared QueryBuilder instance. No database access.
* - 'limit' - limits the number of result rows
* - 'wrapperclass' - A wrapper for each result rows
+ * - 'callback' - A callback function that is called for each row (deprecated)
+ * - 'collection' - A collection class to use for the result set. Default is \Sys25\RnBase\Domain\Collection\BaseCollection. Preferred is 'iterator' for memory-saving queries.
* - 'pidlist' - A list of page-IDs to search for records
* - 'recursive' - the recursive level to search for records in pages
* - 'enablefieldsoff' - deactivate enableFields check
@@ -105,7 +107,7 @@ public static function getInstance()
* @param array $arr The options array
* @param bool $debug Set to true to debug the sql string
*
- * @return array
+ * @return array|Countable|int|ResultIterator
*/
public function doSelect($what, $from, $arr, $debug = false)
{
@@ -129,12 +131,29 @@ public function doSelect($what, $from, $arr, $debug = false)
$arr['debug'] = $debug;
$arr['what'] = $what;
$from = From::buildInstance($from);
+ $resultType = $arr['collection'] ?? null;
- $queryBuilder = null;
- if (TYPO3::isTYPO87OrHigher()) {
- $qbFacade = new QueryBuilderFacade();
- $queryBuilder = $qbFacade->doSelect($what, $from, $arr);
+ $qbFacade = new QueryBuilderFacade();
+ if ('iterator' === $resultType) {
+ // der neue bevorzugte Weg mit Iterator
+ $queryBuilderFactory = function ($from, $arr) use ($qbFacade) {
+ $what = $arr['what'];
+
+ return $qbFacade->doSelect($what, $from, $arr);
+ };
+ $connection = $this;
+ $appendRow = function ($row) use ($from, $arr, $connection) {
+ // Dummy-Array für $rows, da appendRow per Referenz arbeitet
+ $rows = [];
+ $connection->appendRow($rows, $row, $from->getTableName(), $arr['wrapperclass'] ?? null, false, $arr);
+
+ // appendRow hängt das Item ans Ende von $rows
+ return array_pop($rows);
+ };
+
+ return new ResultIterator($queryBuilderFactory, $from, $arr, $appendRow);
}
+ $queryBuilder = $qbFacade->doSelect($what, $from, $arr);
if ($queryBuilder) {
$rows = $this->doSelectByQueryBuilder($queryBuilder, $from, $arr);
@@ -142,17 +161,16 @@ public function doSelect($what, $from, $arr, $debug = false)
$rows = $this->doSelectLegacy($what, $from, $arr, $debug);
}
- if (is_string($rows) || (TYPO3::isTYPO87OrHigher() && $rows instanceof QueryBuilder)) {
+ if (is_string($rows) || $rows instanceof QueryBuilder) {
// sqlOnly
return $rows;
}
if ($debug) {
Debug::debug([
- 'Rows retrieved ' => $rows instanceof Countable ? $rows->count() : count($rows),
+ 'Rows retrieved ' => $rows instanceof Countable ? $rows->count() : (is_array($rows) ? count($rows) : $rows),
'Time ' => (microtime(true) - $time),
'Memory consumed ' => (memory_get_usage() - $mem),
- 'QB used' => is_object($queryBuilder),
], 'SQL statistics');
}
@@ -167,22 +185,38 @@ public function doSelect($what, $from, $arr, $debug = false)
return $rows;
}
- private function doSelectByQueryBuilder(QueryBuilder $queryBuilder, From $from, array $arr)
+ /**
+ * @param QueryBuilder $queryBuilder
+ * @param From $from
+ * @param array $options
+ * @return mixed
+ *
+ * @returns array|Countable|int
+ */
+ private function doSelectByQueryBuilder(QueryBuilder $queryBuilder, From $from, array $options)
{
- $sqlOnly = intval($arr['sqlonly'] ?? null) > 0;
+ $sqlOnly = intval($options['sqlonly'] ?? null) > 0;
if ($sqlOnly) {
return $queryBuilder;
}
- $rows = $this->initRows($arr);
- $wrapper = is_string($arr['wrapperclass'] ?? null) ? trim($arr['wrapperclass']) : 0;
- $callback = isset($arr['callback']) ? $arr['callback'] : false;
+ $rows = $this->initRows($options);
+ $wrapper = is_string($options['wrapperclass'] ?? null) ? trim($options['wrapperclass']) : 0;
+ $callback = isset($options['callback']) ? $options['callback'] : false;
$executeMethod = method_exists($queryBuilder, 'executeQuery') ? 'executeQuery' : 'execute';
+ $result = $queryBuilder->$executeMethod();
+ $fetchMethod = TYPO3::isTYPO130OrHigher() ? 'fetchAllAssociative' : 'fetchAll';
- foreach ($queryBuilder->$executeMethod()->fetchAll() as $row) {
- $this->appendRow($rows, $row, $from->getTableName(), $wrapper, $callback, $arr);
+ if ($callback) {
+ $rows = 0;
+ }
+ foreach ($result->$fetchMethod() as $row) {
+ $this->appendRow($rows, $row, $from->getTableName(), $wrapper, $callback, $options);
+ if ($callback) {
+ ++$rows;
+ }
}
return $rows;
@@ -1199,7 +1233,7 @@ public function handleEnableFieldsOptions(array $options, $tableName, $tableAlia
&& !isset($options['enablefieldsfe'])
) {
$options['enablefieldsbe'] = 1;
- if (Environment::isFrontend()) {
+ if (Environment::isFrontend() && !TYPO3::isTYPO130OrHigher()) {
// wir nehmen nicht Sys25\RnBase\Utility\TYPO3::getTSFE()->set_no_cache weil das durch
// $GLOBALS['TYPO3_CONF_VARS']['FE']['disableNoCacheParameter'] deaktiviert werden
// kann. Das wollen wir aber nicht. Der Cache muss in jedem Fall deaktiviert werden.
diff --git a/Classes/Database/Driver/TYPO3DBAL.php b/Classes/Database/Driver/TYPO3DBAL.php
index 86034c91..ee1802a7 100644
--- a/Classes/Database/Driver/TYPO3DBAL.php
+++ b/Classes/Database/Driver/TYPO3DBAL.php
@@ -335,13 +335,15 @@ public function sql_query($query)
/**
* Returns an associative array that corresponds to the fetched row, or FALSE if there are no more rows.
*
- * @param \Doctrine\DBAL\Driver\Statement $res
+ * @param \Doctrine\DBAL\Driver\Statement|\Doctrine\DBAL\Result $res
*
* @return array associative array of result row
*/
public function sql_fetch_assoc($res)
{
- return $res->fetch(PDO::FETCH_ASSOC);
+ $fetchMethod = TYPO3::isTYPO130OrHigher() ? 'fetchAssociative' : 'fetch';
+
+ return $res->$fetchMethod(PDO::FETCH_ASSOC);
}
/**
diff --git a/Classes/Database/QueryBuilderFacade.php b/Classes/Database/QueryBuilderFacade.php
index 7c540775..c4186d88 100644
--- a/Classes/Database/QueryBuilderFacade.php
+++ b/Classes/Database/QueryBuilderFacade.php
@@ -12,10 +12,10 @@
use tx_rnbase;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
/***************************************************************
* Copyright notice
@@ -178,7 +178,11 @@ public function doSelect($what, From $from, $arr): ?QueryBuilder
$queryBuilder->setFirstResult($offset);
}
if ($orderBy) {
- $queryBuilder->add('orderBy', $orderBy);
+ if (!method_exists($queryBuilder, 'add')) {
+ $queryBuilder->getConcreteQueryBuilder()->orderBy($orderBy);
+ } else {
+ $queryBuilder->add('orderBy', $orderBy);
+ }
}
if ($groupBy) {
$queryBuilder->getConcreteQueryBuilder()->groupBy($groupBy);
@@ -189,7 +193,7 @@ public function doSelect($what, From $from, $arr): ?QueryBuilder
if (strlen($pidList) > 0) {
$pidList = Strings::intExplode(',', Misc::getPidList($pidList, $recursive));
// is there a problem with page aliases here?
- $placeholder = $queryBuilder->createNamedParameter($pidList, \Doctrine\DBAL\Connection::PARAM_INT_ARRAY);
+ $placeholder = $queryBuilder->createNamedParameter($pidList, self::getParamTypeIntArray());
$queryBuilder->andWhere(sprintf('%s.pid IN (%s)', $tableAlias, $placeholder));
}
@@ -228,7 +232,7 @@ private function handleEnableFieldsOptions(QueryBuilder $queryBuilder, array $op
&& !isset($options['enablefieldsfe'])
) {
$options['enablefieldsbe'] = 1;
- if (Environment::isFrontend()) {
+ if (Environment::isFrontend() && !TYPO3::isTYPO130OrHigher()) {
// wir nehmen nicht Sys25\RnBase\Utility\TYPO3::getTSFE()->set_no_cache weil das durch
// $GLOBALS['TYPO3_CONF_VARS']['FE']['disableNoCacheParameter'] deaktiviert werden
// kann. Das wollen wir aber nicht. Der Cache muss in jedem Fall deaktiviert werden.
@@ -243,7 +247,7 @@ private function handleEnableFieldsOptions(QueryBuilder $queryBuilder, array $op
->removeAll();
if (intval($options['enablefieldsbe'] ?? null)) {
$restrictions->add(tx_rnbase::makeInstance(DeletedRestriction::class))
- ->add(tx_rnbase::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(tx_rnbase::makeInstance($this->getWorkspaceRestrictionClass()));
} else {
$restrictions->add(tx_rnbase::makeInstance(FrontendRestrictionContainer::class));
}
@@ -251,7 +255,7 @@ private function handleEnableFieldsOptions(QueryBuilder $queryBuilder, array $op
$restrictions = $queryBuilder->getRestrictions()
->removeAll()
->add(tx_rnbase::makeInstance(DeletedRestriction::class))
- ->add(tx_rnbase::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(tx_rnbase::makeInstance($this->getWorkspaceRestrictionClass()));
if (!($options['enablefieldsbe'] ?? null)) {
$restrictions->add(tx_rnbase::makeInstance(HiddenRestriction::class));
}
@@ -259,6 +263,23 @@ private function handleEnableFieldsOptions(QueryBuilder $queryBuilder, array $op
}
}
+ public static function getParamTypeIntArray()
+ {
+ return TYPO3::isTYPO121OrHigher() ? \TYPO3\CMS\Core\Database\Connection::PARAM_INT_ARRAY : \Doctrine\DBAL\Connection::PARAM_INT_ARRAY;
+ }
+
+ public static function getParamTypeStringArray()
+ {
+ return TYPO3::isTYPO121OrHigher() ? \TYPO3\CMS\Core\Database\Connection::PARAM_STR_ARRAY : \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
+ }
+
+ private function getWorkspaceRestrictionClass(): string
+ {
+ return TYPO3::isTYPO121OrHigher() ?
+ WorkspaceRestriction::class :
+ \TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction::class;
+ }
+
private function getConnectionPool(): ConnectionPool
{
return tx_rnbase::makeInstance(ConnectionPool::class);
diff --git a/Classes/Database/ResultIterator.php b/Classes/Database/ResultIterator.php
new file mode 100644
index 00000000..1ca35578
--- /dev/null
+++ b/Classes/Database/ResultIterator.php
@@ -0,0 +1,104 @@
+queryBuilderFactory = $queryBuilderFactory;
+ $this->from = $from;
+ $this->arr = $arr;
+ $this->rowWrapper = $rowWrapper;
+ $this->rewind();
+ }
+
+ #[ReturnTypeWillChange]
+ public function rewind()
+ {
+ $this->key = 0;
+ $this->queryBuilder = call_user_func($this->queryBuilderFactory, $this->from, $this->arr);
+ $executeMethod = method_exists($this->queryBuilder, 'executeQuery') ? 'executeQuery' : 'execute';
+ $this->result = $this->queryBuilder->$executeMethod();
+ $this->fetchNextRow();
+ }
+
+ #[ReturnTypeWillChange]
+ public function current()
+ {
+ return $this->currentRow;
+ }
+
+ #[ReturnTypeWillChange]
+ public function key()
+ {
+ return $this->key;
+ }
+
+ #[ReturnTypeWillChange]
+ public function next()
+ {
+ $this->fetchNextRow();
+ ++$this->key;
+ }
+
+ #[ReturnTypeWillChange]
+ public function valid()
+ {
+ return false !== $this->currentRow && null !== $this->currentRow;
+ }
+
+ private function fetchNextRow()
+ {
+ if (TYPO3::isTYPO130OrHigher()) {
+ $row = $this->result->fetchAssociative();
+ } else {
+ $row = $this->result->fetch();
+ }
+ if (false !== $row && null !== $row && $this->rowWrapper) {
+ $row = call_user_func($this->rowWrapper, $row);
+ }
+ $this->currentRow = $row;
+ }
+
+ #[ReturnTypeWillChange]
+ public function count()
+ {
+ // Die Implementierung funktioniert vermutlich nicht sicher. Der Aufruf ist im
+ // Normalfall auch nicht nötig. Der Iterator soll nur das ResultSet durchlaufen.
+ $arr = $this->arr;
+ $arr['what'] = 'COUNT(*) as cnt';
+ // Limit und Offset entfernen, damit alle Zeilen gezählt werden
+ unset($arr['limit'], $arr['offset'], $arr['orderby'], $arr['groupby'], $arr['having']);
+
+ /** @var QueryBuilder $queryBuilder */
+ $queryBuilder = call_user_func($this->queryBuilderFactory, $this->from, $arr);
+ $executeMethod = method_exists($queryBuilder, 'executeQuery') ? 'executeQuery' : 'execute';
+ $result = $queryBuilder->$executeMethod();
+
+ if (TYPO3::isTYPO130OrHigher()) {
+ $row = $result->fetchAssociative();
+
+ return (int) array_shift($row);
+ } else {
+ $row = $result->fetch();
+
+ return (int) $row['cnt'];
+ }
+ }
+}
diff --git a/Classes/Domain/Collection/BaseCollection.php b/Classes/Domain/Collection/BaseCollection.php
index 5d815f3c..6a3b55a8 100644
--- a/Classes/Domain/Collection/BaseCollection.php
+++ b/Classes/Domain/Collection/BaseCollection.php
@@ -2,6 +2,7 @@
namespace Sys25\RnBase\Domain\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
use Sys25\RnBase\Domain\Model\RecordInterface;
/***************************************************************
@@ -32,7 +33,7 @@
*
* @author Michael Wagner
*/
-class BaseCollection extends \Contrib\Doctrine\Common\Collections\ArrayCollection
+class BaseCollection extends ArrayCollection
{
/**
* Only a wrapper for add.
@@ -43,7 +44,9 @@ class BaseCollection extends \Contrib\Doctrine\Common\Collections\ArrayCollectio
*/
public function append($value)
{
- return $this->add($value);
+ $this->add($value);
+
+ return true;
}
/**
diff --git a/Classes/Domain/Repository/AbstractRepository.php b/Classes/Domain/Repository/AbstractRepository.php
index de4d3e32..f21b05f9 100644
--- a/Classes/Domain/Repository/AbstractRepository.php
+++ b/Classes/Domain/Repository/AbstractRepository.php
@@ -3,6 +3,7 @@
namespace Sys25\RnBase\Domain\Repository;
use Exception;
+use Iterator;
use Sys25\RnBase\Backend\Utility\TCA;
use Sys25\RnBase\Domain\Collection\BaseCollection;
use Sys25\RnBase\Domain\Model\DomainModelInterface as DomainInterface;
@@ -149,6 +150,10 @@ public function search(array $fields, array $options)
$items = $this->getSearcher()->search($fields, $options);
+ if ($items instanceof Iterator) {
+ return $items;
+ }
+
return $this->prepareItems($items, $options);
}
diff --git a/Classes/ExtBaseFluid/View/Factory.php b/Classes/ExtBaseFluid/View/Factory.php
index d9b255f8..1ea3a5f6 100644
--- a/Classes/ExtBaseFluid/View/Factory.php
+++ b/Classes/ExtBaseFluid/View/Factory.php
@@ -65,7 +65,14 @@ public static function getViewInstance(ConfigurationInterface $configurations, $
$view = tx_rnbase::makeInstance(Standalone::class);
$configurationManager = GeneralUtility::getContainer()->get(ConfigurationManager::class);
- $configurationManager->setContentObject($configurations->getCObj());
+ if (TYPO3::isTYPO130OrHigher()) {
+ $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST']->withAttribute(
+ 'currentContentObject',
+ $configurations->getCObj()
+ );
+ } else {
+ $configurationManager->setContentObject($configurations->getCObj());
+ }
$configurationManager->setConfiguration($frameworkSettings);
$view->setConfigurations($configurations);
if (TYPO3::isTYPO121OrHigher()) {
diff --git a/Classes/ExtBaseFluid/ViewHelper/PageBrowser/PageBaseViewHelper.php b/Classes/ExtBaseFluid/ViewHelper/PageBrowser/PageBaseViewHelper.php
index 99d92761..474989e2 100644
--- a/Classes/ExtBaseFluid/ViewHelper/PageBrowser/PageBaseViewHelper.php
+++ b/Classes/ExtBaseFluid/ViewHelper/PageBrowser/PageBaseViewHelper.php
@@ -2,6 +2,7 @@
namespace Sys25\RnBase\ExtBaseFluid\ViewHelper\PageBrowser;
+use Psr\Http\Message\ServerRequestInterface;
use Sys25\RnBase\ExtBaseFluid\ViewHelper\PageBrowserViewHelper;
use Sys25\RnBase\Utility\Arrays;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -165,6 +166,10 @@ public function render()
$uriBuilder->setTargetPageUid($pageUid);
}
+ if (is_callable([$uriBuilder, 'setRequest']) && $this->renderingContext->hasAttribute(ServerRequestInterface::class)) {
+ $uriBuilder->setRequest($this->renderingContext->getAttribute(ServerRequestInterface::class));
+ }
+
$uri = $uriBuilder->build();
$this->tag->addAttribute('href', $uri);
diff --git a/Classes/Frontend/Filter/BaseFilter.php b/Classes/Frontend/Filter/BaseFilter.php
index 986b1e44..2e6cbb40 100644
--- a/Classes/Frontend/Filter/BaseFilter.php
+++ b/Classes/Frontend/Filter/BaseFilter.php
@@ -12,7 +12,7 @@
/***************************************************************
* Copyright notice
*
- * (c) 2009-2024 Rene Nitzsche
+ * (c) 2009-2025 Rene Nitzsche
* Contact: rene@system25.de
* All rights reserved
*
@@ -65,11 +65,7 @@ class BaseFilter implements FilterInterface
*/
protected $doSearch;
- /**
- * @param RequestInterface $request
- * @param string $confId
- */
- public function __construct($request, $confId)
+ public function setRequest(RequestInterface $request, $confId)
{
$this->configurations = $request->getConfigurations();
$this->parameters = $request->getParameters();
@@ -227,7 +223,10 @@ public static function createFilter(RequestInterface $request, $confId, $filterC
$filterClass = ($filterClass) ? $filterClass : $configurations->get($confId.'class');
$filterClass = ($filterClass) ? $filterClass : $configurations->get($confId.'filter');
$filterClass = ($filterClass) ? $filterClass : self::class;
- $filter = tx_rnbase::makeInstance($filterClass, $request, $confId);
+ /** @var FilterInterface $filter */
+ $filter = tx_rnbase::makeInstance($filterClass);
+ $filter->setRequest($request, $confId);
+
$request->getViewContext()->offsetSet('filter', $filter);
return $filter;
diff --git a/Classes/Frontend/Filter/FilterInterface.php b/Classes/Frontend/Filter/FilterInterface.php
index 99396899..499a1da5 100644
--- a/Classes/Frontend/Filter/FilterInterface.php
+++ b/Classes/Frontend/Filter/FilterInterface.php
@@ -2,6 +2,8 @@
namespace Sys25\RnBase\Frontend\Filter;
+use Sys25\RnBase\Frontend\Request\RequestInterface;
+
/***************************************************************
* Copyright notice
*
@@ -34,6 +36,8 @@ interface FilterInterface
*/
public function init(&$fields, &$options);
+ public function setRequest(RequestInterface $request, $confId);
+
/**
* Whether or not the result list should be displayed.
* It is up to the list view to handle this result.
diff --git a/Classes/Frontend/Filter/Utility/PageBrowserFilter.php b/Classes/Frontend/Filter/Utility/PageBrowserFilter.php
index 6bf45823..80531fab 100644
--- a/Classes/Frontend/Filter/Utility/PageBrowserFilter.php
+++ b/Classes/Frontend/Filter/Utility/PageBrowserFilter.php
@@ -90,7 +90,7 @@ public function handle(ConfigurationInterface $configurations, $confid, $viewdat
// PageBrowser initialisieren
$pbId = $cfg['pbid'] ?? 'pb';
/**
- * @var $pageBrowser PageBrowser
+ * @var PageBrowser $pageBrowser
*/
$pageBrowser = tx_rnbase::makeInstance(PageBrowser::class, $pbId);
$pageSize = $configurations->getInt($confid.'limit');
diff --git a/Classes/Frontend/Marker/IListProvider.php b/Classes/Frontend/Marker/IListProvider.php
index 59adf979..71283359 100644
--- a/Classes/Frontend/Marker/IListProvider.php
+++ b/Classes/Frontend/Marker/IListProvider.php
@@ -26,6 +26,8 @@
/**
* Provide data for ListBuilder.
+ *
+ * @deprecated use query option 'collection' => 'iterator' instead
*/
interface IListProvider
{
diff --git a/Classes/Frontend/Marker/ListBuilder.php b/Classes/Frontend/Marker/ListBuilder.php
index 5889f5ae..289e44b9 100644
--- a/Classes/Frontend/Marker/ListBuilder.php
+++ b/Classes/Frontend/Marker/ListBuilder.php
@@ -3,6 +3,7 @@
namespace Sys25\RnBase\Frontend\Marker;
use ArrayObject;
+use Iterator;
use Sys25\RnBase\Utility\Debug;
use Sys25\RnBase\Utility\Strings;
use Traversable;
@@ -84,6 +85,9 @@ protected function getVisitors()
return $this->visitors;
}
+ /**
+ * @deprecated use query option 'collection' => 'iterator' instead
+ */
public function renderEach(IListProvider $provider, $viewData, $template, $markerClassname, $confId, $marker, $formatter, $markerParams = null)
{
$viewData = is_object($viewData) ? $viewData : new ArrayObject();
@@ -240,7 +244,7 @@ public function render(&$dataArr, $viewData, $template, $markerClassname, $confI
$outerMarker = $this->getOuterMarker($marker, $template);
while ($templateList = Templates::getSubpart($template, '###'.$outerMarker.'S###')) {
- if ((is_array($dataArr) || $dataArr instanceof Traversable) && count($dataArr)) {
+ if (is_countable($dataArr) && count($dataArr) || $dataArr instanceof Iterator && $dataArr->valid()) {
/* @var $listMarker ListMarker */
$listMarker = tx_rnbase::makeInstance(ListMarker::class, $this->info->getListMarkerInfo());
diff --git a/Classes/Frontend/Marker/ListProvider.php b/Classes/Frontend/Marker/ListProvider.php
index 5d18ac92..c832a23c 100644
--- a/Classes/Frontend/Marker/ListProvider.php
+++ b/Classes/Frontend/Marker/ListProvider.php
@@ -28,6 +28,8 @@
/**
* Provide data for ListBuilder.
+ *
+ * @deprecated use query option 'collection' => 'iterator' instead
*/
class ListProvider implements IListProvider
{
diff --git a/Classes/Frontend/Marker/SimpleMarker.php b/Classes/Frontend/Marker/SimpleMarker.php
index 26aa1ac4..7d0dd9a0 100644
--- a/Classes/Frontend/Marker/SimpleMarker.php
+++ b/Classes/Frontend/Marker/SimpleMarker.php
@@ -10,7 +10,7 @@
/***************************************************************
* Copyright notice
*
-* (c) 2009 - 2023 Rene Nitzsche (rene@system25.de)
+* (c) 2009 - 2025 Rene Nitzsche (rene@system25.de)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -56,7 +56,7 @@ public function __construct($options = [])
*
* @return string das geparste Template
*/
- public function parseTemplate($template, &$item, &$formatter, $confId, $marker)
+ public function parseTemplate($template, $item, $formatter, $confId, $marker)
{
if (!is_object($item)) {
if (!$this->classname) {
@@ -162,7 +162,7 @@ protected function prepareItem(
$item->setProperty($newField, $value);
}
if (in_array($field, $dotValueFields)) {
- $item->setProperty($newField, str_replace('.', '_', $value));
+ $item->setProperty($newField, str_replace('.', '_', $value ?? ''));
}
}
}
diff --git a/Classes/Frontend/Marker/Templates.php b/Classes/Frontend/Marker/Templates.php
index 2cb1f7e1..67af6b95 100644
--- a/Classes/Frontend/Marker/Templates.php
+++ b/Classes/Frontend/Marker/Templates.php
@@ -145,7 +145,7 @@ public static function includeSubTemplates($template)
$cache = $included = false;
- if (!TYPO3::getTSFE()->no_cache) {
+ if (!TYPO3::isTYPO130OrHigher() && !TYPO3::getTSFE()->no_cache) {
$cache = CacheManager::getCache('rnbase');
$cacheKey = 'includeSubTemplateFor_'.md5($template);
$included = $cache->get($cacheKey);
diff --git a/Classes/Frontend/Request/Parameters.php b/Classes/Frontend/Request/Parameters.php
index 17f1d93a..d64a3f68 100644
--- a/Classes/Frontend/Request/Parameters.php
+++ b/Classes/Frontend/Request/Parameters.php
@@ -4,12 +4,11 @@
use ArrayObject;
use Sys25\RnBase\Utility\Arrays;
-use Sys25\RnBase\Utility\Typo3Classes;
/***************************************************************
* Copyright notice
*
- * (c) 2007-2021 René Nitzsche
+ * (c) 2007-2025 René Nitzsche
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -132,12 +131,16 @@ public function getAll($qualifier = '')
* @param string $parameter Key (variable name) from GET or POST vars
*
* @return array|string returns the GET vars merged recursively onto the POST vars
+ *
+ * @deprecated use PSR-7 ServerRequestInterface
*/
- public static function getPostAndGetParametersMerged($parameterName)
+ public static function getPostAndGetParametersMerged($parameter)
{
- $utility = Typo3Classes::getGeneralUtilityClass();
+ $postParameter = isset($_POST[$parameter]) && is_array($_POST[$parameter]) ? $_POST[$parameter] : [];
+ $getParameter = isset($_GET[$parameter]) && is_array($_GET[$parameter]) ? $_GET[$parameter] : [];
+ $mergedParameters = $getParameter;
- return $utility::_GPmerged($parameterName);
+ return Arrays::mergeRecursiveWithOverrule($mergedParameters, $postParameter);
}
/**
@@ -146,6 +149,8 @@ public static function getPostAndGetParametersMerged($parameterName)
* @param string $parameter Key (variable name) from GET or POST vars
*
* @return array|string returns the GET vars merged recursively onto the POST vars
+ *
+ * @deprecated use PSR-7 ServerRequestInterface
*/
public static function getPostOrGetParameter($parameterName)
{
@@ -153,29 +158,26 @@ public static function getPostOrGetParameter($parameterName)
}
/**
- * @see \TYPO3\CMS\Core\Utility\GeneralUtility::_GP
- *
- * @param string $parameter Key (variable name) from GET or POST vars
+ * @param string $var Key (variable name) from GET or POST vars
*
* @return array|string returns the GET vars merged recursively onto the POST vars
+ *
+ * @deprecated use PSR-7 ServerRequestInterface
*/
- public static function _GP($parameterName)
+ public static function _GP($var)
{
- $utility = Typo3Classes::getGeneralUtilityClass();
+ if (empty($var)) {
+ return;
+ }
- return $utility::_GP($parameterName);
- }
+ $value = $_POST[$var] ?? $_GET[$var] ?? null;
- /**
- * @see \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset
- *
- * @param mixed $inputGet
- * @param string $key
- */
- public static function setGetParameter($inputGet, $key = '')
- {
- $utility = Typo3Classes::getGeneralUtilityClass();
- $utility::_GETset($inputGet, $key);
+ // This is there for backwards-compatibility, in order to avoid NULL
+ if (isset($value) && !is_array($value)) {
+ $value = (string) $value;
+ }
+
+ return $value;
}
/**
@@ -186,12 +188,20 @@ public static function setGetParameter($inputGet, $key = '')
* @see \TYPO3\CMS\Core\Utility\GeneralUtility::_GET
*
* @return mixed
+ *
+ * @deprecated use PSR-7 ServerRequestInterface
*/
public static function getGetParameters($var = null)
{
- $utility = Typo3Classes::getGeneralUtilityClass();
+ $value = null === $var
+ ? $_GET
+ : (empty($var) ? null : ($_GET[$var] ?? null));
+ // This is there for backwards-compatibility, in order to avoid NULL
+ if (isset($value) && !is_array($value)) {
+ $value = (string) $value;
+ }
- return $utility::_GET($var);
+ return $value;
}
/**
@@ -202,11 +212,17 @@ public static function getGetParameters($var = null)
* @see \TYPO3\CMS\Core\Utility\GeneralUtility::_POST
*
* @return mixed
+ *
+ * @deprecated use PSR-7 ServerRequestInterface
*/
public static function getPostParameters($var = null)
{
- $utility = Typo3Classes::getGeneralUtilityClass();
+ $value = null === $var ? $_POST : (empty($var) || !isset($_POST[$var]) ? null : $_POST[$var]);
+ // This is there for backwards-compatibility, in order to avoid NULL
+ if (isset($value) && !is_array($value)) {
+ $value = (string) $value;
+ }
- return $utility::_POST($var);
+ return $value;
}
}
diff --git a/Classes/Search/ConditionBuilder.php b/Classes/Search/ConditionBuilder.php
index 8399bc0f..4f8ed058 100644
--- a/Classes/Search/ConditionBuilder.php
+++ b/Classes/Search/ConditionBuilder.php
@@ -2,16 +2,19 @@
namespace Sys25\RnBase\Search;
+use Doctrine\DBAL\ParameterType;
use PDO;
use Sys25\RnBase\Database\Connection;
+use Sys25\RnBase\Database\QueryBuilderFacade;
use Sys25\RnBase\Utility\Misc;
use Sys25\RnBase\Utility\Strings;
+use Sys25\RnBase\Utility\TYPO3;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
/***************************************************************
* Copyright notice
*
- * (c) 2008-2023 Rene Nitzsche (rene@system25.de)
+ * (c) 2008-2025 Rene Nitzsche (rene@system25.de)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -192,13 +195,13 @@ private function buildSingleWhereField(QueryBuilder $qb, $tableAlias, $operator,
case self::OP_IN_INT:
$value = Strings::intExplode(',', $value);
$where = sprintf('%s.%s %s (%s)', $tableAlias, strtolower($col), $operator,
- $qb->createNamedParameter($value, \Doctrine\DBAL\Connection::PARAM_INT_ARRAY));
+ $qb->createNamedParameter($value, QueryBuilderFacade::getParamTypeIntArray()));
break;
case self::OP_NOTIN:
case self::OP_IN:
$value = Strings::trimExplode(',', $value);
$where = sprintf('%s.%s %s (%s)', $tableAlias, strtolower($col), $operator,
- $qb->createNamedParameter($value, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY));
+ $qb->createNamedParameter($value, QueryBuilderFacade::getParamTypeStringArray()));
break;
case self::OP_NOTIN_SQL:
case self::OP_IN_SQL:
@@ -207,32 +210,32 @@ private function buildSingleWhereField(QueryBuilder $qb, $tableAlias, $operator,
break;
case self::OP_EQ:
$where = sprintf('%s.%s = %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_NOTEQ:
$where = sprintf('%s.%s != %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_LT:
$where = sprintf('%s.%s < %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_LTEQ:
$where = sprintf('%s.%s <= %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_GT:
$where = sprintf('%s.%s > %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_GTEQ:
$where = sprintf('%s.%s >= %s', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_EQ_INT:
@@ -242,12 +245,12 @@ private function buildSingleWhereField(QueryBuilder $qb, $tableAlias, $operator,
case self::OP_GTEQ_INT:
case self::OP_LTEQ_INT:
$where = sprintf('%s.%s %s %s', $tableAlias, strtolower($col), $operator,
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::INTEGER : PDO::PARAM_STR));
break;
case self::OP_EQ_NOCASE:
$where = sprintf('lower(%s.%s) = lower(%s)', $tableAlias, strtolower($col),
- $qb->createNamedParameter($value, PDO::PARAM_STR));
+ $qb->createNamedParameter($value, TYPO3::isTYPO121OrHigher() ? ParameterType::STRING : PDO::PARAM_STR));
break;
case self::OP_INSET_INT:
diff --git a/Classes/Search/SearchBase.php b/Classes/Search/SearchBase.php
index ca7c2340..a02cb761 100644
--- a/Classes/Search/SearchBase.php
+++ b/Classes/Search/SearchBase.php
@@ -43,7 +43,7 @@ abstract class SearchBase
{
private static $instances = [];
- private $tableMapping;
+ private $tableMapping = [];
private $generic = false;
@@ -588,7 +588,7 @@ private function useQueryBuilder($tableAliases): bool
private function _initSearch(array $options)
{
$this->setGeneric($options);
- if (!is_array($this->tableMapping)) {
+ if ([] === $this->tableMapping) {
$tableMapping = $this->getTableMappings();
$tableMapping = is_array($tableMapping) ? $tableMapping : [];
if ($this->isGeneric()) {
diff --git a/Classes/Testing/BaseTestCase.php b/Classes/Testing/BaseTestCase.php
index 17c7a45e..2cf6a5f4 100644
--- a/Classes/Testing/BaseTestCase.php
+++ b/Classes/Testing/BaseTestCase.php
@@ -9,6 +9,7 @@
use ReflectionProperty;
use Sys25\RnBase\Configuration\ConfigurationInterface;
use Sys25\RnBase\Domain\Model\BaseModel;
+use Sys25\RnBase\Domain\Model\DataModel;
use Sys25\RnBase\Utility\Spyc;
use Sys25\RnBase\Utility\TYPO3;
use Sys25\RnBase\Utility\Typo3Classes;
@@ -131,8 +132,11 @@ public function getMock(
$proxyTarget = null
) {
if (method_exists($this, 'createMock')) {
- $mockBuilder = $this->getMockBuilder($originalClassName)
- ->setMethods($methods)
+ $mockBuilder = $this->getMockBuilder($originalClassName);
+
+ $defineMethods = method_exists($mockBuilder, 'onlyMethods') ? 'onlyMethods' : 'setMethods';
+
+ $mockBuilder = $mockBuilder->$defineMethods($methods)
->setConstructorArgs($arguments)
->setMockClassName($mockClassName);
if (!$callOriginalConstructor) {
@@ -195,31 +199,33 @@ protected function getModel(
throw new Exception('The model "'.$class.'" could not be loaded.');
}
+ // Der Name der Variablen ergibt keinen Sinn.
$isNewModel = (
is_subclass_of($class, BaseModel::class)
|| BaseModel::class == $class
);
-
- // create the mock
- $model = $this->getMock(
- $class,
- array_merge(
+ if (DataModel::class !== $class) {
+ $methods = array_merge(
[
$isNewModel ? 'loadRecord' : 'reset',
- 'getColumnWrapped',
],
$methods
- ),
+ );
+ }
+
+ // create the mock
+ $model = $this->getMock(
+ $class,
+ $methods,
[$record]
);
- $model
- ->expects(self::any())
- ->method($isNewModel ? 'loadRecord' : 'reset')
- ->will(self::returnSelf());
- $model
- ->expects(self::never())
- ->method('getColumnWrapped');
+ if (DataModel::class !== $class) {
+ $model
+ ->expects(self::any())
+ ->method($isNewModel ? 'loadRecord' : 'reset')
+ ->willReturnSelf();
+ }
return $model;
}
@@ -277,7 +283,7 @@ protected function loadYaml($data, $tryToLoadYamlFile = true)
$model
->expects(self::any())
->method($getter)
- ->will($this->returnValue($this->loadYaml($data[$getter], false)))
+ ->willReturn($this->loadYaml($data[$getter], false))
;
}
@@ -615,4 +621,29 @@ protected function resetIndependentEnvironmentCache()
$property->setAccessible(true);
$property->setValue(null, []);
}
+
+ /**
+ * Compat-Methode für PHPUnit < 9.3.
+ */
+ public static function assertRegExp($pattern, $subject, string $message = ''): void
+ {
+ if (!method_exists(\PHPUnit\Framework\Assert::class, 'assertMatchesRegularExpression')) {
+ // Verwende die veraltete Methode für PHPUnit < 9.3
+ \PHPUnit\Framework\Assert::assertRegExp($pattern, $subject, $message);
+ } else {
+ // Neue Methode für PHPUnit >= 9.3
+ \PHPUnit\Framework\Assert::assertMatchesRegularExpression($pattern, $subject, $message);
+ }
+ }
+
+ public static function assertNotRegExp($pattern, $subject, string $message = ''): void
+ {
+ if (!method_exists(\PHPUnit\Framework\Assert::class, 'assertDoesNotMatchRegularExpression')) {
+ // Verwende die veraltete Methode für PHPUnit < 9.3
+ \PHPUnit\Framework\Assert::assertNotRegExp($pattern, $subject, $message);
+ } else {
+ // Neue Methode für PHPUnit >= 9.3
+ \PHPUnit\Framework\Assert::assertDoesNotMatchRegularExpression($pattern, $subject, $message);
+ }
+ }
}
diff --git a/tests/Classes/ExtBaseFluid/ViewHelper/BaseViewHelperTest.php b/Classes/Testing/BaseViewHelperTest.php
similarity index 97%
rename from tests/Classes/ExtBaseFluid/ViewHelper/BaseViewHelperTest.php
rename to Classes/Testing/BaseViewHelperTest.php
index bc46aa94..66e55f89 100644
--- a/tests/Classes/ExtBaseFluid/ViewHelper/BaseViewHelperTest.php
+++ b/Classes/Testing/BaseViewHelperTest.php
@@ -1,10 +1,9 @@
+ * All rights reserved
+ *
+ * This script is part of the TYPO3 project. The TYPO3 project is
+ * free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The GNU General Public License can be found at
+ * http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This script is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This copyright notice MUST APPEAR in all copies of the script!
+ */
+
+use Sys25\RnBase\Utility\TYPO3;
+use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
+
+if (TYPO3::isTYPO121OrHigher()) {
+ abstract class CompatFormElement extends AbstractFormElement
+ {
+ public function render(): array
+ {
+ return [];
+ }
+ }
+} else {
+ abstract class CompatFormElement extends AbstractFormElement
+ {
+ public function render()
+ {
+ return [];
+ }
+ }
+}
diff --git a/Classes/Utility/Files.php b/Classes/Utility/Files.php
index af12cbf4..b676450e 100644
--- a/Classes/Utility/Files.php
+++ b/Classes/Utility/Files.php
@@ -166,7 +166,7 @@ public static function getFileAbsFileName($fName, $onlyRelative = true, $relToTY
$filepath = self::getFalFilename($fName);
if (null === $filepath) {
$utility = Typo3Classes::getGeneralUtilityClass();
- $filepath = $utility::getFileAbsFileName($fName, $onlyRelative, $relToTYPO3_mainDir);
+ $filepath = $utility::getFileAbsFileName((string) $fName, $onlyRelative, $relToTYPO3_mainDir);
}
return $filepath;
diff --git a/Classes/Utility/Language.php b/Classes/Utility/Language.php
index 85149f19..8d34ab71 100644
--- a/Classes/Utility/Language.php
+++ b/Classes/Utility/Language.php
@@ -127,13 +127,9 @@ protected function getLLKey($useAlternativeLanguage = false)
/** @var SiteLanguage|null $siteLanguage */
$siteLanguage = null;
- if (TYPO3::isTYPO104OrHigher()) {
- $siteLanguage = $frontEndController->getLanguage();
- } elseif (TYPO3::isTYPO95OrHigher()) {
- $request = $GLOBALS['TYPO3_REQUEST'] ?? null;
- if ($request instanceof ServerRequestInterface) {
- $siteLanguage = $request->getAttribute('language');
- }
+ $request = $GLOBALS['TYPO3_REQUEST'] ?? null;
+ if ($request instanceof ServerRequestInterface) {
+ $siteLanguage = $request->getAttribute('language');
}
if ($siteLanguage instanceof SiteLanguage) {
$language = $siteLanguage->getTypo3Language();
diff --git a/Classes/Utility/LanguageTool.php b/Classes/Utility/LanguageTool.php
index e2efbb0d..0d1bd4c7 100644
--- a/Classes/Utility/LanguageTool.php
+++ b/Classes/Utility/LanguageTool.php
@@ -107,7 +107,7 @@ public function getLL($key, $alt = '', $hsc = false, $labelDebug = false): strin
}
}
if (empty($result)) {
- $result = $this->getLanguageService()->getLL($key, $alt, false, $labelDebug);
+ $result = $alt;
}
} else {
$result = $this->localLangUtil->getLL($key, $alt, false, $labelDebug);
@@ -116,7 +116,7 @@ public function getLL($key, $alt = '', $hsc = false, $labelDebug = false): strin
return $hsc ? htmlspecialchars($result) : $result;
}
- private function getLanguageService(): LanguageService
+ public function getLanguageService(): LanguageService
{
if (null === $this->languageService && Environment::isBackend()) {
$this->languageService = $GLOBALS['LANG'];
diff --git a/Classes/Utility/Misc.php b/Classes/Utility/Misc.php
index 7104a88c..4ce0404d 100644
--- a/Classes/Utility/Misc.php
+++ b/Classes/Utility/Misc.php
@@ -676,13 +676,24 @@ public static function getPidList(
foreach ($pidListArr as $val) {
$val = Math::intInRange($val, 0);
if ($val) {
- $cObj = TYPO3::getContentObject();
- $list = $cObj->getTreeList(
- -1 * $val,
- $options['recursive'],
- 0,
- !empty($options['dontCheckEnableFields'])
- );
+ if (TYPO3::isTYPO130OrHigher()) {
+ $list = TYPO3::getSysPage()->getDescendantPageIdsRecursive(
+ $val,
+ $options['recursive'],
+ 0,
+ [],
+ !empty($options['dontCheckEnableFields'])
+ );
+ $pidList[] = $val;
+ } else {
+ $cObj = TYPO3::getContentObject();
+ $list = $cObj->getTreeList(
+ -1 * $val,
+ $options['recursive'],
+ 0,
+ !empty($options['dontCheckEnableFields'])
+ );
+ }
if ($list) {
$pidList[] = $list;
}
diff --git a/Classes/Utility/Strings.php b/Classes/Utility/Strings.php
index 33556b6b..ddbbf0da 100644
--- a/Classes/Utility/Strings.php
+++ b/Classes/Utility/Strings.php
@@ -88,6 +88,10 @@ public static function isFirstPartOfStr($haystack, $needle)
return '' !== (string) $needle && 0 === strncmp($haystack, $needle, strlen($needle));
}
+ if (is_null($haystack)) {
+ $haystack = '';
+ }
+
return str_starts_with($haystack, $needle);
}
diff --git a/Classes/Utility/T3General.php b/Classes/Utility/T3General.php
index 08b6a266..c93ed710 100644
--- a/Classes/Utility/T3General.php
+++ b/Classes/Utility/T3General.php
@@ -2,6 +2,8 @@
namespace Sys25\RnBase\Utility;
+use Sys25\RnBase\Frontend\Request\Parameters;
+
/***************************************************************
* Copyright notice
*
@@ -33,7 +35,6 @@
* @license http://www.gnu.org/licenses/lgpl.html
* GNU Lesser General Public License, version 3 or later
*
- * @method static mixed _GP(string $var)
* @method static string getIndpEnv(string $getEnvName)
* @method static string fixWindowsFilePath(string $theFile)
* @method static int md5int(string $str)
@@ -277,4 +278,9 @@ public static function rmFromList($element, $list)
return implode(',', $items);
}
+
+ public static function _GP($parameterName)
+ {
+ return Parameters::_GP($parameterName);
+ }
}
diff --git a/Classes/Utility/TSFAL.php b/Classes/Utility/TSFAL.php
index 0d7e881c..0c933e24 100644
--- a/Classes/Utility/TSFAL.php
+++ b/Classes/Utility/TSFAL.php
@@ -492,14 +492,27 @@ public static function getMediaTCA($ref, $options = [])
}
}
- $tca = [
- 'label' => TcaTool::buildGeneralLabel('images'),
- 'config' => Extensions::getFileFieldTCAConfig(
+ $config = [];
+ if (TYPO3::isTYPO115OrHigher()) {
+ $config = [
+ 'type' => 'file',
+ 'appearance' => $customSettingOverride['appearance'] ?? [],
+ 'behaviour' => $customSettingOverride['behaviour'] ?? [],
+ 'overrideChildTca' => $customSettingOverride['overrideChildTca'] ?? [],
+ 'allowed' => 'common-media-types',
+ ];
+ } else {
+ $config = Extensions::getFileFieldTCAConfig(
$ref,
$customSettingOverride,
$allowedFileExtensions,
$disallowedFileExtensions
- ),
+ );
+ }
+
+ $tca = [
+ 'label' => TcaTool::buildGeneralLabel('images'),
+ 'config' => $config,
];
if (!empty($tca) && is_array($options)) {
@@ -566,7 +579,9 @@ public static function addReference($tableName, $fieldName, $itemId, $mediaUid,
$data['tablenames'] = $tableName;
$data['fieldname'] = $fieldName;
$data['sorting_foreign'] = $sorting;
- $data['table_local'] = 'sys_file';
+ if (!TYPO3::isTYPO121OrHigher()) {
+ $data['table_local'] = 'sys_file';
+ }
$id = Connection::getInstance()->doInsert('sys_file_reference', $data);
diff --git a/Classes/Utility/Typo3Classes.php b/Classes/Utility/Typo3Classes.php
index 638a5409..711fee40 100644
--- a/Classes/Utility/Typo3Classes.php
+++ b/Classes/Utility/Typo3Classes.php
@@ -8,7 +8,7 @@
/***************************************************************
* Copyright notice
*
- * (c) 2006-2021 Rene Nitzsche
+ * (c) 2006-2025 Rene Nitzsche
* Contact: rene@system25.de
* All rights reserved
*
@@ -194,6 +194,8 @@ public static function getGeneralUtilityClass()
/**
* @return class-string<\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser>
+ *
+ * @deprecated TODO: implement Wrapper-Service for Parser
*/
public static function getTypoScriptParserClass()
{
diff --git a/Classes/Utility/TypoScript.php b/Classes/Utility/TypoScript.php
index 6ffafdff..3355022c 100644
--- a/Classes/Utility/TypoScript.php
+++ b/Classes/Utility/TypoScript.php
@@ -3,11 +3,12 @@
namespace Sys25\RnBase\Utility;
use tx_rnbase;
+use TYPO3\CMS\Core\TypoScript\TypoScriptStringFactory;
/***************************************************************
* Copyright notice
*
- * (c) 2013-2021 René Nitzsche
+ * (c) 2013-2025 René Nitzsche
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
@@ -36,34 +37,50 @@
*/
class TypoScript
{
- /**
- * Creates an instance of the ts parser.
- *
- * @return \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
- */
- private static function getTsParser()
+ /** @var TypoScriptStringFactory|\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser */
+ private $tsParser;
+
+ public function __construct()
{
- return tx_rnbase::makeInstance(
- Typo3Classes::getTypoScriptParserClass()
+ }
+
+ private function getParser()
+ {
+ if (isset($this->tsParser)) {
+ return $this->tsParser;
+ }
+ $this->tsParser = tx_rnbase::makeInstance(
+ TYPO3::isTYPO121OrHigher() ? TypoScriptStringFactory::class : Typo3Classes::getTypoScriptParserClass()
);
+
+ return $this->tsParser;
}
/**
- * Parse the configuration of the given models.
+ * Parse typoscript string.
*
* @param string $typoScript
+ * @param string $cacheKey used to cache parsed result
+ * @param array $existingTsConfig optional existing TypoScript configuration to merge with
*
* @return array
*/
- public static function parseTsConfig($typoScript)
+ public function parseTsConfig($typoScript, string $cacheKey, array $existingTsConfig = [])
{
- $parser = self::getTsParser();
+ $tsParser = $this->getParser();
+ if (TYPO3::isTYPO121OrHigher()) {
+ $parsedSetup = $tsParser->parseFromStringWithIncludes($cacheKey, $typoScript);
+ $parsedTsArray = $parsedSetup->toArray();
- $parser->parse(
- $parser->checkIncludeLines($typoScript)
- );
+ $currentSetup = $existingTsConfig;
+ $parsedTsArray = Arrays::mergeRecursiveWithOverrule($currentSetup, $parsedTsArray);
+ } else {
+ $tsParser->setup = $existingTsConfig;
+ $tsParser->parse($tsParser->checkIncludeLines($typoScript));
+ $parsedTsArray = $tsParser->setup;
+ }
- return $parser->setup;
+ return $parsedTsArray;
}
/**
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index c7d781e8..b2929f02 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -32,3 +32,9 @@ services:
Sys25\RnBase\Utility\LanguageTool:
public: true
+
+ Sys25\RnBase\Utility\TypoScript:
+ public: true
+
+ Sys25\RnBase\Backend\Utility\Tables:
+ public: true
\ No newline at end of file
diff --git a/Documentation/rendering_data.md b/Documentation/rendering_data.md
index 2144972f..7f74fafb 100644
--- a/Documentation/rendering_data.md
+++ b/Documentation/rendering_data.md
@@ -22,7 +22,7 @@ Für die Erstellung der Template-Marker sind sogenannte Markerklassen verantwort
* @param string $marker Name des Markers
* @return String das geparste Template
*/
- public function parseTemplate($template, &$item, &$formatter, $confId, $marker) {
+ public function parseTemplate($template, $item, $formatter, $confId, $marker) {
// Es wird das MarkerArray mit den Daten des Records gefüllt.
$ignore = self::findUnusedCols($item->getRecord(), $template, $marker);
$markerArray = $formatter->getItemMarkerArrayWrapped($item->getRecord(), $confId , $ignore, $marker.'_', $item->getColumnNames());
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/AbstractLazyCollection.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/AbstractLazyCollection.php
deleted file mode 100644
index f44a818d..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/AbstractLazyCollection.php
+++ /dev/null
@@ -1,343 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-use Closure;
-
-/**
- * Lazy collection that is backed by a concrete collection
- *
- * @author Michaël Gallego
- * @since 1.2
- */
-abstract class AbstractLazyCollection implements Collection
-{
- /**
- * The backed collection to use
- *
- * @var Collection
- */
- protected $collection;
-
- /**
- * @var boolean
- */
- protected $initialized = false;
-
- /**
- * {@inheritDoc}
- */
- public function count()
- {
- $this->initialize();
- return $this->collection->count();
- }
-
- /**
- * {@inheritDoc}
- */
- public function add($element)
- {
- $this->initialize();
- return $this->collection->add($element);
- }
-
- /**
- * {@inheritDoc}
- */
- public function clear()
- {
- $this->initialize();
- $this->collection->clear();
- }
-
- /**
- * {@inheritDoc}
- */
- public function contains($element)
- {
- $this->initialize();
- return $this->collection->contains($element);
- }
-
- /**
- * {@inheritDoc}
- */
- public function isEmpty()
- {
- $this->initialize();
- return $this->collection->isEmpty();
- }
-
- /**
- * {@inheritDoc}
- */
- public function remove($key)
- {
- $this->initialize();
- return $this->collection->remove($key);
- }
-
- /**
- * {@inheritDoc}
- */
- public function removeElement($element)
- {
- $this->initialize();
- return $this->collection->removeElement($element);
- }
-
- /**
- * {@inheritDoc}
- */
- public function containsKey($key)
- {
- $this->initialize();
- return $this->collection->containsKey($key);
- }
-
- /**
- * {@inheritDoc}
- */
- public function get($key)
- {
- $this->initialize();
- return $this->collection->get($key);
- }
-
- /**
- * {@inheritDoc}
- */
- public function getKeys()
- {
- $this->initialize();
- return $this->collection->getKeys();
- }
-
- /**
- * {@inheritDoc}
- */
- public function getValues()
- {
- $this->initialize();
- return $this->collection->getValues();
- }
-
- /**
- * {@inheritDoc}
- */
- public function set($key, $value)
- {
- $this->initialize();
- $this->collection->set($key, $value);
- }
-
- /**
- * {@inheritDoc}
- */
- public function toArray()
- {
- $this->initialize();
- return $this->collection->toArray();
- }
-
- /**
- * {@inheritDoc}
- */
- public function first()
- {
- $this->initialize();
- return $this->collection->first();
- }
-
- /**
- * {@inheritDoc}
- */
- public function last()
- {
- $this->initialize();
- return $this->collection->last();
- }
-
- /**
- * {@inheritDoc}
- */
- public function key()
- {
- $this->initialize();
- return $this->collection->key();
- }
-
- /**
- * {@inheritDoc}
- */
- public function current()
- {
- $this->initialize();
- return $this->collection->current();
- }
-
- /**
- * {@inheritDoc}
- */
- public function next()
- {
- $this->initialize();
- return $this->collection->next();
- }
-
- /**
- * {@inheritDoc}
- */
- public function exists(Closure $p)
- {
- $this->initialize();
- return $this->collection->exists($p);
- }
-
- /**
- * {@inheritDoc}
- */
- public function filter(Closure $p)
- {
- $this->initialize();
- return $this->collection->filter($p);
- }
-
- /**
- * {@inheritDoc}
- */
- public function forAll(Closure $p)
- {
- $this->initialize();
- return $this->collection->forAll($p);
- }
-
- /**
- * {@inheritDoc}
- */
- public function map(Closure $func)
- {
- $this->initialize();
- return $this->collection->map($func);
- }
-
- /**
- * {@inheritDoc}
- */
- public function partition(Closure $p)
- {
- $this->initialize();
- return $this->collection->partition($p);
- }
-
- /**
- * {@inheritDoc}
- */
- public function indexOf($element)
- {
- $this->initialize();
- return $this->collection->indexOf($element);
- }
-
- /**
- * {@inheritDoc}
- */
- public function slice($offset, $length = null)
- {
- $this->initialize();
- return $this->collection->slice($offset, $length);
- }
-
- /**
- * {@inheritDoc}
- */
- public function getIterator()
- {
- $this->initialize();
- return $this->collection->getIterator();
- }
-
- /**
- * {@inheritDoc}
- */
- public function offsetExists($offset)
- {
- $this->initialize();
- return $this->collection->offsetExists($offset);
- }
-
- /**
- * {@inheritDoc}
- */
- public function offsetGet($offset)
- {
- $this->initialize();
- return $this->collection->offsetGet($offset);
- }
-
- /**
- * {@inheritDoc}
- */
- public function offsetSet($offset, $value)
- {
- $this->initialize();
- $this->collection->offsetSet($offset, $value);
- }
-
- /**
- * {@inheritDoc}
- */
- public function offsetUnset($offset)
- {
- $this->initialize();
- $this->collection->offsetUnset($offset);
- }
-
- /**
- * Is the lazy collection already initialized?
- *
- * @return bool
- */
- public function isInitialized()
- {
- return $this->initialized;
- }
-
- /**
- * Initialize the collection
- *
- * @return void
- */
- protected function initialize()
- {
- if ( ! $this->initialized) {
- $this->doInitialize();
- $this->initialized = true;
- }
- }
-
- /**
- * Do the initialization logic
- *
- * @return void
- */
- abstract protected function doInitialize();
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ArrayCollection.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ArrayCollection.php
deleted file mode 100644
index 83bb7b61..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ArrayCollection.php
+++ /dev/null
@@ -1,387 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-use ArrayIterator;
-use Closure;
-use Contrib\Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
-
-/**
- * An ArrayCollection is a Collection implementation that wraps a regular PHP array.
- *
- * @since 2.0
- * @author Guilherme Blanco
- * @author Jonathan Wage
- * @author Roman Borschel
- */
-class ArrayCollection implements Collection, Selectable
-{
- /**
- * An array containing the entries of this collection.
- *
- * @var array
- */
- private $elements;
-
- /**
- * Initializes a new ArrayCollection.
- *
- * @param array $elements
- */
- public function __construct(array $elements = array())
- {
- $this->elements = $elements;
- }
-
- /**
- * {@inheritDoc}
- */
- public function toArray()
- {
- return $this->elements;
- }
-
- /**
- * {@inheritDoc}
- */
- public function first()
- {
- return reset($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function last()
- {
- return end($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function key()
- {
- return key($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function next()
- {
- return next($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function current()
- {
- return current($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function remove($key)
- {
- if ( ! isset($this->elements[$key]) && ! array_key_exists($key, $this->elements)) {
- return null;
- }
-
- $removed = $this->elements[$key];
- unset($this->elements[$key]);
-
- return $removed;
- }
-
- /**
- * {@inheritDoc}
- */
- public function removeElement($element)
- {
- $key = array_search($element, $this->elements, true);
-
- if ($key === false) {
- return false;
- }
-
- unset($this->elements[$key]);
-
- return true;
- }
-
- /**
- * Required by interface ArrayAccess.
- *
- * {@inheritDoc}
- */
- public function offsetExists($offset)
- {
- return $this->containsKey($offset);
- }
-
- /**
- * Required by interface ArrayAccess.
- *
- * {@inheritDoc}
- */
- public function offsetGet($offset)
- {
- return $this->get($offset);
- }
-
- /**
- * Required by interface ArrayAccess.
- *
- * {@inheritDoc}
- */
- public function offsetSet($offset, $value)
- {
- if ( ! isset($offset)) {
- return $this->add($value);
- }
-
- $this->set($offset, $value);
- }
-
- /**
- * Required by interface ArrayAccess.
- *
- * {@inheritDoc}
- */
- public function offsetUnset($offset)
- {
- return $this->remove($offset);
- }
-
- /**
- * {@inheritDoc}
- */
- public function containsKey($key)
- {
- return isset($this->elements[$key]) || array_key_exists($key, $this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function contains($element)
- {
- return in_array($element, $this->elements, true);
- }
-
- /**
- * {@inheritDoc}
- */
- public function exists(Closure $p)
- {
- foreach ($this->elements as $key => $element) {
- if ($p($key, $element)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public function indexOf($element)
- {
- return array_search($element, $this->elements, true);
- }
-
- /**
- * {@inheritDoc}
- */
- public function get($key)
- {
- return isset($this->elements[$key]) ? $this->elements[$key] : null;
- }
-
- /**
- * {@inheritDoc}
- */
- public function getKeys()
- {
- return array_keys($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function getValues()
- {
- return array_values($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function count()
- {
- return count($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function set($key, $value)
- {
- $this->elements[$key] = $value;
- }
-
- /**
- * {@inheritDoc}
- */
- public function add($value)
- {
- $this->elements[] = $value;
-
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public function isEmpty()
- {
- return empty($this->elements);
- }
-
- /**
- * Required by interface IteratorAggregate.
- *
- * {@inheritDoc}
- */
- public function getIterator()
- {
- return new ArrayIterator($this->elements);
- }
-
- /**
- * {@inheritDoc}
- */
- public function map(Closure $func)
- {
- return new static(array_map($func, $this->elements));
- }
-
- /**
- * {@inheritDoc}
- */
- public function filter(Closure $p)
- {
- return new static(array_filter($this->elements, $p));
- }
-
- /**
- * {@inheritDoc}
- */
- public function forAll(Closure $p)
- {
- foreach ($this->elements as $key => $element) {
- if ( ! $p($key, $element)) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public function partition(Closure $p)
- {
- $matches = $noMatches = array();
-
- foreach ($this->elements as $key => $element) {
- if ($p($key, $element)) {
- $matches[$key] = $element;
- } else {
- $noMatches[$key] = $element;
- }
- }
-
- return array(new static($matches), new static($noMatches));
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return string
- */
- public function __toString()
- {
- return __CLASS__ . '@' . spl_object_hash($this);
- }
-
- /**
- * {@inheritDoc}
- */
- public function clear()
- {
- $this->elements = array();
- }
-
- /**
- * {@inheritDoc}
- */
- public function slice($offset, $length = null)
- {
- return array_slice($this->elements, $offset, $length, true);
- }
-
- /**
- * {@inheritDoc}
- */
- public function matching(Criteria $criteria)
- {
- $expr = $criteria->getWhereExpression();
- $filtered = $this->elements;
-
- if ($expr) {
- $visitor = new ClosureExpressionVisitor();
- $filter = $visitor->dispatch($expr);
- $filtered = array_filter($filtered, $filter);
- }
-
- if ($orderings = $criteria->getOrderings()) {
- foreach (array_reverse($orderings) as $field => $ordering) {
- $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1);
- }
-
- uasort($filtered, $next);
- }
-
- $offset = $criteria->getFirstResult();
- $length = $criteria->getMaxResults();
-
- if ($offset || $length) {
- $filtered = array_slice($filtered, (int)$offset, $length);
- }
-
- return new static($filtered);
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Collection.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Collection.php
deleted file mode 100644
index 0e40b4a0..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Collection.php
+++ /dev/null
@@ -1,263 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-use ArrayAccess;
-use Closure;
-use Countable;
-use IteratorAggregate;
-
-/**
- * The missing (SPL) Collection/Array/OrderedMap interface.
- *
- * A Collection resembles the nature of a regular PHP array. That is,
- * it is essentially an ordered map that can also be used
- * like a list.
- *
- * A Collection has an internal iterator just like a PHP array. In addition,
- * a Collection can be iterated with external iterators, which is preferable.
- * To use an external iterator simply use the foreach language construct to
- * iterate over the collection (which calls {@link getIterator()} internally) or
- * explicitly retrieve an iterator though {@link getIterator()} which can then be
- * used to iterate over the collection.
- * You can not rely on the internal iterator of the collection being at a certain
- * position unless you explicitly positioned it before. Prefer iteration with
- * external iterators.
- *
- * @since 2.0
- * @author Guilherme Blanco
- * @author Jonathan Wage
- * @author Roman Borschel
- */
-interface Collection extends Countable, IteratorAggregate, ArrayAccess
-{
- /**
- * Adds an element at the end of the collection.
- *
- * @param mixed $element The element to add.
- *
- * @return boolean Always TRUE.
- */
- public function add($element);
-
- /**
- * Clears the collection, removing all elements.
- *
- * @return void
- */
- public function clear();
-
- /**
- * Checks whether an element is contained in the collection.
- * This is an O(n) operation, where n is the size of the collection.
- *
- * @param mixed $element The element to search for.
- *
- * @return boolean TRUE if the collection contains the element, FALSE otherwise.
- */
- public function contains($element);
-
- /**
- * Checks whether the collection is empty (contains no elements).
- *
- * @return boolean TRUE if the collection is empty, FALSE otherwise.
- */
- public function isEmpty();
-
- /**
- * Removes the element at the specified index from the collection.
- *
- * @param string|integer $key The kex/index of the element to remove.
- *
- * @return mixed The removed element or NULL, if the collection did not contain the element.
- */
- public function remove($key);
-
- /**
- * Removes the specified element from the collection, if it is found.
- *
- * @param mixed $element The element to remove.
- *
- * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
- */
- public function removeElement($element);
-
- /**
- * Checks whether the collection contains an element with the specified key/index.
- *
- * @param string|integer $key The key/index to check for.
- *
- * @return boolean TRUE if the collection contains an element with the specified key/index,
- * FALSE otherwise.
- */
- public function containsKey($key);
-
- /**
- * Gets the element at the specified key/index.
- *
- * @param string|integer $key The key/index of the element to retrieve.
- *
- * @return mixed
- */
- public function get($key);
-
- /**
- * Gets all keys/indices of the collection.
- *
- * @return array The keys/indices of the collection, in the order of the corresponding
- * elements in the collection.
- */
- public function getKeys();
-
- /**
- * Gets all values of the collection.
- *
- * @return array The values of all elements in the collection, in the order they
- * appear in the collection.
- */
- public function getValues();
-
- /**
- * Sets an element in the collection at the specified key/index.
- *
- * @param string|integer $key The key/index of the element to set.
- * @param mixed $value The element to set.
- *
- * @return void
- */
- public function set($key, $value);
-
- /**
- * Gets a native PHP array representation of the collection.
- *
- * @return array
- */
- public function toArray();
-
- /**
- * Sets the internal iterator to the first element in the collection and returns this element.
- *
- * @return mixed
- */
- public function first();
-
- /**
- * Sets the internal iterator to the last element in the collection and returns this element.
- *
- * @return mixed
- */
- public function last();
-
- /**
- * Gets the key/index of the element at the current iterator position.
- *
- * @return int|string
- */
- public function key();
-
- /**
- * Gets the element of the collection at the current iterator position.
- *
- * @return mixed
- */
- public function current();
-
- /**
- * Moves the internal iterator position to the next element and returns this element.
- *
- * @return mixed
- */
- public function next();
-
- /**
- * Tests for the existence of an element that satisfies the given predicate.
- *
- * @param Closure $p The predicate.
- *
- * @return boolean TRUE if the predicate is TRUE for at least one element, FALSE otherwise.
- */
- public function exists(Closure $p);
-
- /**
- * Returns all the elements of this collection that satisfy the predicate p.
- * The order of the elements is preserved.
- *
- * @param Closure $p The predicate used for filtering.
- *
- * @return Collection A collection with the results of the filter operation.
- */
- public function filter(Closure $p);
-
- /**
- * Tests whether the given predicate p holds for all elements of this collection.
- *
- * @param Closure $p The predicate.
- *
- * @return boolean TRUE, if the predicate yields TRUE for all elements, FALSE otherwise.
- */
- public function forAll(Closure $p);
-
- /**
- * Applies the given function to each element in the collection and returns
- * a new collection with the elements returned by the function.
- *
- * @param Closure $func
- *
- * @return Collection
- */
- public function map(Closure $func);
-
- /**
- * Partitions this collection in two collections according to a predicate.
- * Keys are preserved in the resulting collections.
- *
- * @param Closure $p The predicate on which to partition.
- *
- * @return array An array with two elements. The first element contains the collection
- * of elements where the predicate returned TRUE, the second element
- * contains the collection of elements where the predicate returned FALSE.
- */
- public function partition(Closure $p);
-
- /**
- * Gets the index/key of a given element. The comparison of two elements is strict,
- * that means not only the value but also the type must match.
- * For objects this means reference equality.
- *
- * @param mixed $element The element to search for.
- *
- * @return int|string|bool The key/index of the element or FALSE if the element was not found.
- */
- public function indexOf($element);
-
- /**
- * Extracts a slice of $length elements starting at position $offset from the Collection.
- *
- * If $length is null it returns all elements from $offset to the end of the Collection.
- * Keys have to be preserved by this method. Calling this method will only return the
- * selected slice and NOT change the elements contained in the collection slice is called on.
- *
- * @param int $offset The offset to start from.
- * @param int|null $length The maximum number of elements to return, or null for no limit.
- *
- * @return array
- */
- public function slice($offset, $length = null);
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Criteria.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Criteria.php
deleted file mode 100644
index 74341a8b..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Criteria.php
+++ /dev/null
@@ -1,259 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-use Contrib\Doctrine\Common\Collections\Expr\Expression;
-use Contrib\Doctrine\Common\Collections\Expr\CompositeExpression;
-
-/**
- * Criteria for filtering Selectable collections.
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-class Criteria
-{
- /**
- * @var string
- */
- const ASC = 'ASC';
-
- /**
- * @var string
- */
- const DESC = 'DESC';
-
- /**
- * @var \Doctrine\Common\Collections\ExpressionBuilder|null
- */
- private static $expressionBuilder;
-
- /**
- * @var \Doctrine\Common\Collections\Expr\Expression|null
- */
- private $expression;
-
- /**
- * @var string[]
- */
- private $orderings = array();
-
- /**
- * @var int|null
- */
- private $firstResult;
-
- /**
- * @var int|null
- */
- private $maxResults;
-
- /**
- * Creates an instance of the class.
- *
- * @return Criteria
- */
- public static function create()
- {
- return new static();
- }
-
- /**
- * Returns the expression builder.
- *
- * @return \Doctrine\Common\Collections\ExpressionBuilder
- */
- public static function expr()
- {
- if (self::$expressionBuilder === null) {
- self::$expressionBuilder = new ExpressionBuilder();
- }
-
- return self::$expressionBuilder;
- }
-
- /**
- * Construct a new Criteria.
- *
- * @param Expression $expression
- * @param string[]|null $orderings
- * @param int|null $firstResult
- * @param int|null $maxResults
- */
- public function __construct(Expression $expression = null, array $orderings = null, $firstResult = null, $maxResults = null)
- {
- $this->expression = $expression;
-
- $this->setFirstResult($firstResult);
- $this->setMaxResults($maxResults);
-
- if (null !== $orderings) {
- $this->orderBy($orderings);
- }
- }
-
- /**
- * Sets the where expression to evaluate when this Criteria is searched for.
- *
- * @param Expression $expression
- *
- * @return Criteria
- */
- public function where(Expression $expression)
- {
- $this->expression = $expression;
-
- return $this;
- }
-
- /**
- * Appends the where expression to evaluate when this Criteria is searched for
- * using an AND with previous expression.
- *
- * @param Expression $expression
- *
- * @return Criteria
- */
- public function andWhere(Expression $expression)
- {
- if ($this->expression === null) {
- return $this->where($expression);
- }
-
- $this->expression = new CompositeExpression(CompositeExpression::TYPE_AND, array(
- $this->expression, $expression
- ));
-
- return $this;
- }
-
- /**
- * Appends the where expression to evaluate when this Criteria is searched for
- * using an OR with previous expression.
- *
- * @param Expression $expression
- *
- * @return Criteria
- */
- public function orWhere(Expression $expression)
- {
- if ($this->expression === null) {
- return $this->where($expression);
- }
-
- $this->expression = new CompositeExpression(CompositeExpression::TYPE_OR, array(
- $this->expression, $expression
- ));
-
- return $this;
- }
-
- /**
- * Gets the expression attached to this Criteria.
- *
- * @return Expression|null
- */
- public function getWhereExpression()
- {
- return $this->expression;
- }
-
- /**
- * Gets the current orderings of this Criteria.
- *
- * @return string[]
- */
- public function getOrderings()
- {
- return $this->orderings;
- }
-
- /**
- * Sets the ordering of the result of this Criteria.
- *
- * Keys are field and values are the order, being either ASC or DESC.
- *
- * @see Criteria::ASC
- * @see Criteria::DESC
- *
- * @param string[] $orderings
- *
- * @return Criteria
- */
- public function orderBy(array $orderings)
- {
- $this->orderings = array_map(
- function ($ordering) {
- return strtoupper($ordering) === Criteria::ASC ? Criteria::ASC : Criteria::DESC;
- },
- $orderings
- );
-
- return $this;
- }
-
- /**
- * Gets the current first result option of this Criteria.
- *
- * @return int|null
- */
- public function getFirstResult()
- {
- return $this->firstResult;
- }
-
- /**
- * Set the number of first result that this Criteria should return.
- *
- * @param int|null $firstResult The value to set.
- *
- * @return Criteria
- */
- public function setFirstResult($firstResult)
- {
- $this->firstResult = null === $firstResult ? null : (int) $firstResult;
-
- return $this;
- }
-
- /**
- * Gets maxResults.
- *
- * @return int|null
- */
- public function getMaxResults()
- {
- return $this->maxResults;
- }
-
- /**
- * Sets maxResults.
- *
- * @param int|null $maxResults The value to set.
- *
- * @return Criteria
- */
- public function setMaxResults($maxResults)
- {
- $this->maxResults = null === $maxResults ? null : (int) $maxResults;
-
- return $this;
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
deleted file mode 100644
index 85629474..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
+++ /dev/null
@@ -1,227 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-/**
- * Walks an expression graph and turns it into a PHP closure.
- *
- * This closure can be used with {@Collection#filter()} and is used internally
- * by {@ArrayCollection#select()}.
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-class ClosureExpressionVisitor extends ExpressionVisitor
-{
- /**
- * Accesses the field of a given object. This field has to be public
- * directly or indirectly (through an accessor get*, is*, or a magic
- * method, __get, __call).
- *
- * @param object $object
- * @param string $field
- *
- * @return mixed
- */
- public static function getObjectFieldValue($object, $field)
- {
- if (is_array($object)) {
- return $object[$field];
- }
-
- $accessors = array('get', 'is');
-
- foreach ($accessors as $accessor) {
- $accessor .= $field;
-
- if ( ! method_exists($object, $accessor)) {
- continue;
- }
-
- return $object->$accessor();
- }
-
- // __call should be triggered for get.
- $accessor = $accessors[0] . $field;
-
- if (method_exists($object, '__call')) {
- return $object->$accessor();
- }
-
- if ($object instanceof \ArrayAccess) {
- return $object[$field];
- }
-
- return $object->$field;
- }
-
- /**
- * Helper for sorting arrays of objects based on multiple fields + orientations.
- *
- * @param string $name
- * @param int $orientation
- * @param \Closure $next
- *
- * @return \Closure
- */
- public static function sortByField($name, $orientation = 1, \Closure $next = null)
- {
- if ( ! $next) {
- $next = function() {
- return 0;
- };
- }
-
- return function ($a, $b) use ($name, $next, $orientation) {
- $aValue = ClosureExpressionVisitor::getObjectFieldValue($a, $name);
- $bValue = ClosureExpressionVisitor::getObjectFieldValue($b, $name);
-
- if ($aValue === $bValue) {
- return $next($a, $b);
- }
-
- return (($aValue > $bValue) ? 1 : -1) * $orientation;
- };
- }
-
- /**
- * {@inheritDoc}
- */
- public function walkComparison(Comparison $comparison)
- {
- $field = $comparison->getField();
- $value = $comparison->getValue()->getValue(); // shortcut for walkValue()
-
- switch ($comparison->getOperator()) {
- case Comparison::EQ:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) === $value;
- };
-
- case Comparison::NEQ:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) !== $value;
- };
-
- case Comparison::LT:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) < $value;
- };
-
- case Comparison::LTE:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) <= $value;
- };
-
- case Comparison::GT:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) > $value;
- };
-
- case Comparison::GTE:
- return function ($object) use ($field, $value) {
- return ClosureExpressionVisitor::getObjectFieldValue($object, $field) >= $value;
- };
-
- case Comparison::IN:
- return function ($object) use ($field, $value) {
- return in_array(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
- };
-
- case Comparison::NIN:
- return function ($object) use ($field, $value) {
- return ! in_array(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
- };
-
- case Comparison::CONTAINS:
- return function ($object) use ($field, $value) {
- return false !== strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
- };
-
- default:
- throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public function walkValue(Value $value)
- {
- return $value->getValue();
- }
-
- /**
- * {@inheritDoc}
- */
- public function walkCompositeExpression(CompositeExpression $expr)
- {
- $expressionList = array();
-
- foreach ($expr->getExpressionList() as $child) {
- $expressionList[] = $this->dispatch($child);
- }
-
- switch($expr->getType()) {
- case CompositeExpression::TYPE_AND:
- return $this->andExpressions($expressionList);
-
- case CompositeExpression::TYPE_OR:
- return $this->orExpressions($expressionList);
-
- default:
- throw new \RuntimeException("Unknown composite " . $expr->getType());
- }
- }
-
- /**
- * @param array $expressions
- *
- * @return callable
- */
- private function andExpressions($expressions)
- {
- return function ($object) use ($expressions) {
- foreach ($expressions as $expression) {
- if ( ! $expression($object)) {
- return false;
- }
- }
- return true;
- };
- }
-
- /**
- * @param array $expressions
- *
- * @return callable
- */
- private function orExpressions($expressions)
- {
- return function ($object) use ($expressions) {
- foreach ($expressions as $expression) {
- if ($expression($object)) {
- return true;
- }
- }
- return false;
- };
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Comparison.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Comparison.php
deleted file mode 100644
index c3e364b7..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Comparison.php
+++ /dev/null
@@ -1,103 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-/**
- * Comparison of a field with a value by the given operator.
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-class Comparison implements Expression
-{
- const EQ = '=';
- const NEQ = '<>';
- const LT = '<';
- const LTE = '<=';
- const GT = '>';
- const GTE = '>=';
- const IS = '='; // no difference with EQ
- const IN = 'IN';
- const NIN = 'NIN';
- const CONTAINS = 'CONTAINS';
-
- /**
- * @var string
- */
- private $field;
-
- /**
- * @var string
- */
- private $op;
-
- /**
- * @var Value
- */
- private $value;
-
- /**
- * @param string $field
- * @param string $operator
- * @param mixed $value
- */
- public function __construct($field, $operator, $value)
- {
- if ( ! ($value instanceof Value)) {
- $value = new Value($value);
- }
-
- $this->field = $field;
- $this->op = $operator;
- $this->value = $value;
- }
-
- /**
- * @return string
- */
- public function getField()
- {
- return $this->field;
- }
-
- /**
- * @return Value
- */
- public function getValue()
- {
- return $this->value;
- }
-
- /**
- * @return string
- */
- public function getOperator()
- {
- return $this->op;
- }
-
- /**
- * {@inheritDoc}
- */
- public function visit(ExpressionVisitor $visitor)
- {
- return $visitor->walkComparison($this);
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/CompositeExpression.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/CompositeExpression.php
deleted file mode 100644
index 038b19b9..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/CompositeExpression.php
+++ /dev/null
@@ -1,90 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-/**
- * Expression of Expressions combined by AND or OR operation.
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-class CompositeExpression implements Expression
-{
- const TYPE_AND = 'AND';
- const TYPE_OR = 'OR';
-
- /**
- * @var string
- */
- private $type;
-
- /**
- * @var Expression[]
- */
- private $expressions = array();
-
- /**
- * @param string $type
- * @param array $expressions
- *
- * @throws \RuntimeException
- */
- public function __construct($type, array $expressions)
- {
- $this->type = $type;
-
- foreach ($expressions as $expr) {
- if ($expr instanceof Value) {
- throw new \RuntimeException("Values are not supported expressions as children of and/or expressions.");
- }
- if ( ! ($expr instanceof Expression)) {
- throw new \RuntimeException("No expression given to CompositeExpression.");
- }
-
- $this->expressions[] = $expr;
- }
- }
-
- /**
- * Returns the list of expressions nested in this composite.
- *
- * @return Expression[]
- */
- public function getExpressionList()
- {
- return $this->expressions;
- }
-
- /**
- * @return string
- */
- public function getType()
- {
- return $this->type;
- }
-
- /**
- * {@inheritDoc}
- */
- public function visit(ExpressionVisitor $visitor)
- {
- return $visitor->walkCompositeExpression($this);
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Expression.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Expression.php
deleted file mode 100644
index c9a2de97..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Expression.php
+++ /dev/null
@@ -1,35 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-/**
- * Expression for the {@link Selectable} interface.
- *
- * @author Benjamin Eberlei
- */
-interface Expression
-{
- /**
- * @param ExpressionVisitor $visitor
- *
- * @return mixed
- */
- public function visit(ExpressionVisitor $visitor);
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php
deleted file mode 100644
index 69e7b6d7..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-/**
- * An Expression visitor walks a graph of expressions and turns them into a
- * query for the underlying implementation.
- *
- * @author Benjamin Eberlei
- */
-abstract class ExpressionVisitor
-{
- /**
- * Converts a comparison expression into the target query language output.
- *
- * @param Comparison $comparison
- *
- * @return mixed
- */
- abstract public function walkComparison(Comparison $comparison);
-
- /**
- * Converts a value expression into the target query language part.
- *
- * @param Value $value
- *
- * @return mixed
- */
- abstract public function walkValue(Value $value);
-
- /**
- * Converts a composite expression into the target query language output.
- *
- * @param CompositeExpression $expr
- *
- * @return mixed
- */
- abstract public function walkCompositeExpression(CompositeExpression $expr);
-
- /**
- * Dispatches walking an expression to the appropriate handler.
- *
- * @param Expression $expr
- *
- * @return mixed
- *
- * @throws \RuntimeException
- */
- public function dispatch(Expression $expr)
- {
- switch (true) {
- case ($expr instanceof Comparison):
- return $this->walkComparison($expr);
-
- case ($expr instanceof Value):
- return $this->walkValue($expr);
-
- case ($expr instanceof CompositeExpression):
- return $this->walkCompositeExpression($expr);
-
- default:
- throw new \RuntimeException("Unknown Expression " . get_class($expr));
- }
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Value.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Value.php
deleted file mode 100644
index 5f94ce12..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Expr/Value.php
+++ /dev/null
@@ -1,52 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections\Expr;
-
-class Value implements Expression
-{
- /**
- * @var mixed
- */
- private $value;
-
- /**
- * @param mixed $value
- */
- public function __construct($value)
- {
- $this->value = $value;
- }
-
- /**
- * @return mixed
- */
- public function getValue()
- {
- return $this->value;
- }
-
- /**
- * {@inheritDoc}
- */
- public function visit(ExpressionVisitor $visitor)
- {
- return $visitor->walkValue($this);
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ExpressionBuilder.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ExpressionBuilder.php
deleted file mode 100644
index 4ac17cc4..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/ExpressionBuilder.php
+++ /dev/null
@@ -1,166 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-use Contrib\Doctrine\Common\Collections\Expr\Comparison;
-use Contrib\Doctrine\Common\Collections\Expr\CompositeExpression;
-use Contrib\Doctrine\Common\Collections\Expr\Value;
-
-/**
- * Builder for Expressions in the {@link Selectable} interface.
- *
- * Important Notice for interoperable code: You have to use scalar
- * values only for comparisons, otherwise the behavior of the comparision
- * may be different between implementations (Array vs ORM vs ODM).
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-class ExpressionBuilder
-{
- /**
- * @param mixed $x
- *
- * @return CompositeExpression
- */
- public function andX($x = null)
- {
- return new CompositeExpression(CompositeExpression::TYPE_AND, func_get_args());
- }
-
- /**
- * @param mixed $x
- *
- * @return CompositeExpression
- */
- public function orX($x = null)
- {
- return new CompositeExpression(CompositeExpression::TYPE_OR, func_get_args());
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function eq($field, $value)
- {
- return new Comparison($field, Comparison::EQ, new Value($value));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function gt($field, $value)
- {
- return new Comparison($field, Comparison::GT, new Value($value));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function lt($field, $value)
- {
- return new Comparison($field, Comparison::LT, new Value($value));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function gte($field, $value)
- {
- return new Comparison($field, Comparison::GTE, new Value($value));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function lte($field, $value)
- {
- return new Comparison($field, Comparison::LTE, new Value($value));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function neq($field, $value)
- {
- return new Comparison($field, Comparison::NEQ, new Value($value));
- }
-
- /**
- * @param string $field
- *
- * @return Comparison
- */
- public function isNull($field)
- {
- return new Comparison($field, Comparison::EQ, new Value(null));
- }
-
- /**
- * @param string $field
- * @param mixed $values
- *
- * @return Comparison
- */
- public function in($field, array $values)
- {
- return new Comparison($field, Comparison::IN, new Value($values));
- }
-
- /**
- * @param string $field
- * @param mixed $values
- *
- * @return Comparison
- */
- public function notIn($field, array $values)
- {
- return new Comparison($field, Comparison::NIN, new Value($values));
- }
-
- /**
- * @param string $field
- * @param mixed $value
- *
- * @return Comparison
- */
- public function contains($field, $value)
- {
- return new Comparison($field, Comparison::CONTAINS, new Value($value));
- }
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Selectable.php b/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Selectable.php
deleted file mode 100644
index cd00e8a5..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/Common/Collections/Selectable.php
+++ /dev/null
@@ -1,48 +0,0 @@
-.
- */
-
-namespace Contrib\Doctrine\Common\Collections;
-
-/**
- * Interface for collections that allow efficient filtering with an expression API.
- *
- * Goal of this interface is a backend independent method to fetch elements
- * from a collections. {@link Expression} is crafted in a way that you can
- * implement queries from both in-memory and database-backed collections.
- *
- * For database backed collections this allows very efficient access by
- * utilizing the query APIs, for example SQL in the ORM. Applications using
- * this API can implement efficient database access without having to ask the
- * EntityManager or Repositories.
- *
- * @author Benjamin Eberlei
- * @since 2.3
- */
-interface Selectable
-{
- /**
- * Selects all elements from a selectable that match the expression and
- * returns a new collection containing these elements.
- *
- * @param Criteria $criteria
- *
- * @return Collection
- */
- public function matching(Criteria $criteria);
-}
diff --git a/Resources/Private/Php/Contrib/Doctrine/LICENSE b/Resources/Private/Php/Contrib/Doctrine/LICENSE
deleted file mode 100644
index 5e781fce..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2013 Doctrine Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Resources/Private/Php/Contrib/Doctrine/README.md b/Resources/Private/Php/Contrib/Doctrine/README.md
deleted file mode 100644
index 161cab63..00000000
--- a/Resources/Private/Php/Contrib/Doctrine/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Doctrine Collections
-
-[](https://travis-ci.org/doctrine/collections)
-
-Collections Abstraction library
-
-## Changelog
-
-### v1.3.0
-
-* [Explicit casting of first and max results in criteria API](https://github.com/doctrine/collections/pull/26)
-* [Keep keys when using `ArrayCollection#matching()` with sorting](https://github.com/doctrine/collections/pull/49)
-* [Made `AbstractLazyCollection#$initialized` protected for extensibility](https://github.com/doctrine/collections/pull/52)
-
-### v1.2.0
-
-* Add a new ``AbstractLazyCollection``
-
-### v1.1.0
-
-* Deprecated ``Comparison::IS``, because it's only there for SQL semantics.
- These are fixed in the ORM instead.
-* Add ``Comparison::CONTAINS`` to perform partial string matches:
-
- $criteria->andWhere($criteria->expr()->contains('property', 'Foo'));
diff --git a/Resources/Private/Php/install.sh b/Resources/Private/Php/install.sh
new file mode 100755
index 00000000..3ef65c9a
--- /dev/null
+++ b/Resources/Private/Php/install.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Abbruch bei Fehler
+set -e
+
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+ROOT_DIR="$(realpath "$SCRIPT_DIR/../../..")"
+EXT_COMPOSER="$ROOT_DIR/composer.json"
+PHP_LIB_DIR="$ROOT_DIR/Resources/Private/Php"
+VENDOR_DIR="$PHP_LIB_DIR/vendor"
+CONTRIB_DIR="$PHP_LIB_DIR/Contrib"
+PACKAGE_NAME="doctrine/collections"
+PACKAGE_VERSION="2.2.2"
+TARGET_AUTOLOAD_NAMESPACE="Doctrine\\Common\\Collections\\"
+TARGET_AUTOLOAD_PATH="Resources/Private/Php/Contrib/doctrine/collections/src"
+
+echo "➤ Installing to ${ROOT_DIR}..."
+
+echo "➤ Installing ${PACKAGE_NAME} (${PACKAGE_VERSION})..."
+cd "$PHP_LIB_DIR"
+composer.phar require --no-scripts --no-interaction "${PACKAGE_NAME}:${PACKAGE_VERSION}"
+
+echo "➤ Moving vendor directory to Contrib..."
+rm -rf "$CONTRIB_DIR"
+mv "$VENDOR_DIR" "$CONTRIB_DIR"
+
+echo "➤ Updating composer.json autoload section..."
+
+if jq -e --arg key "$TARGET_AUTOLOAD_NAMESPACE" '.autoload."psr-4"[$key]' "$EXT_COMPOSER" > /dev/null; then
+ echo "✔ Namespace already present in composer.json"
+else
+ ESCAPED_NAMESPACE=$(echo "$TARGET_AUTOLOAD_NAMESPACE" | sed 's/\\/\\\\/g')
+ tmpfile=$(mktemp)
+ jq ".autoload.\"psr-4\" += {\"$ESCAPED_NAMESPACE\": \"$TARGET_AUTOLOAD_PATH\"}" "$EXT_COMPOSER" > "$tmpfile" && mv "$tmpfile" "$EXT_COMPOSER"
+ echo "✔ Namespace added to composer.json"
+fi
+
+echo "➤ Done."
diff --git a/Resources/Private/Templates/ModuleTemplate/Module.html b/Resources/Private/Templates/ModuleTemplate/Module.html
new file mode 100644
index 00000000..2958852b
--- /dev/null
+++ b/Resources/Private/Templates/ModuleTemplate/Module.html
@@ -0,0 +1,35 @@
+
+
+
+ @deprecated This is the former module template HTML used as default for rn_base modules.
+
+
+
+
+
+ {formTag}
+
+
+
+
+
+
+
+
+
+
+
+
+
{content}
+
+
+
+
+
+
+