Require rn_base >= 1.15.0

DMKEBUSINESSGMBH · Jan 11, 2022 · 9d943c4 · 9d943c4
1 parent f1dab9f
commit 9d943c4
Show file tree

Hide file tree

Showing 22 changed files with 125 additions and 83 deletions.
diff --git a/.github/workflows/phpci.yml b/.github/workflows/phpci.yml
@@ -65,6 +65,7 @@ jobs:
             matrix:
                 command:
                     - "test:phpcs"
+                    - "test:phpstan"
                 php-version:
                     - "7.4"
 

diff --git a/Classes/ContentObject/TwigContentObject.php b/Classes/ContentObject/TwigContentObject.php
@@ -27,6 +27,7 @@
 
 use DMK\T3twig\Twig\RendererTwig as Renderer;
 use DMK\T3twig\Twig\T3TwigException;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\AbstractContentObject;
 
 /**
@@ -96,14 +97,14 @@ public function render(
      *
      * @param array $conf
      *
-     * @return \Tx_Rnbase_Configuration_Processor
+     * @return \Sys25\RnBase\Configuration\Processor
      */
     private function buildConfigurations(
         array $conf
     ) {
-        /* @var $configurations \Tx_Rnbase_Configuration_ProcessorInterface */
-        $configurations = \tx_rnbase::makeInstance(
-            'Tx_Rnbase_Configuration_Processor'
+        /* @var $configurations \Sys25\RnBase\Configuration\ConfigurationInterface */
+        $configurations = GeneralUtility::makeInstance(
+            \Sys25\RnBase\Configuration\Processor::class
         );
         $configurations->init(
             $conf,
@@ -118,7 +119,7 @@ private function buildConfigurations(
     /**
      * Compile rendered content objects in variables array ready to assign to the view.
      *
-     * @param \Tx_Rnbase_Configuration_Processor $configurations
+     * @param \Sys25\RnBase\Configuration\Processor $configurations
      *
      * @return array the variables to be assigned
      *

diff --git a/Classes/Twig/EnvironmentTwig.php b/Classes/Twig/EnvironmentTwig.php
@@ -63,7 +63,7 @@ public function setRenderer(
     /**
      * The current configurations.
      *
-     * @return \Tx_Rnbase_Configuration_ProcessorInterface
+     * @return \Sys25\RnBase\Configuration\ConfigurationInterface
      */
     public function getConfigurations()
     {
@@ -91,7 +91,7 @@ public function getConfId()
     }
 
     /**
-     * @return \tx_rnbase_parameters
+     * @return \Sys25\RnBase\Frontend\Request\Parameters
      */
     public function getParameters()
     {

diff --git a/Classes/Twig/Extension/AbstractExtension.php b/Classes/Twig/Extension/AbstractExtension.php
@@ -88,16 +88,16 @@ protected function performCommand(
     /**
      * Creates a new data instance.
      *
-     * @param array|\Tx_Rnbase_Domain_Model_Data $arguments
+     * @param array|\Sys25\RnBase\Domain\Model\DataModel $arguments
      * @param EnvironmentTwig                    $env
      *
-     * @return \Tx_Rnbase_Domain_Model_Data
+     * @return \Sys25\RnBase\Domain\Model\DataModel
      */
     protected function initiateArguments(
         $arguments = null,
         EnvironmentTwig $env = null
     ) {
-        $arguments = \Tx_Rnbase_Domain_Model_Data::getInstance($arguments);
+        $arguments = \Sys25\RnBase\Domain\Model\DataModel::getInstance($arguments);
 
         if ($env instanceof EnvironmentTwig) {
             $this->setContentObjectData(
@@ -110,7 +110,7 @@ protected function initiateArguments(
         // convert ts config from  array to ts array
         if ($arguments->hasTsConfig()) {
             $arguments->setTsConfig(
-                \Tx_Rnbase_Utility_TypoScript::convertPlainArrayToTypoScriptArray(
+                \Sys25\RnBase\Utility\TypoScript::convertPlainArrayToTypoScriptArray(
                     $arguments->getTsConfig()->toArray()
                 )
             );
@@ -138,7 +138,7 @@ protected function setContentObjectData(
         } elseif (is_scalar($data)) {
             $currentValue = $currentValue ?: (string) $data;
             $data = [$data];
-        } elseif ($data instanceof \Tx_Rnbase_Domain_Model_Data) {
+        } elseif ($data instanceof \Sys25\RnBase\Domain\Model\DataModel) {
             $data = $data->toArray();
         }
 

diff --git a/Classes/Twig/Extension/DBRelationExtension.php b/Classes/Twig/Extension/DBRelationExtension.php
@@ -27,6 +27,7 @@
  * *************************************************************
  */
 use DMK\T3twig\Twig\EnvironmentTwig;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Class TSParserExtension.
@@ -62,8 +63,11 @@ public function getFunctions()
      *
      * @return mixed|null
      */
-    public function lookupRelation(EnvironmentTwig $env, \Tx_Rnbase_Domain_Model_Base $entity, array $arguments = [])
-    {
+    public function lookupRelation(
+        EnvironmentTwig $env,
+        \Sys25\RnBase\Domain\Model\BaseModel $entity,
+        array $arguments = []
+    ) {
         $confId = sprintf('%srelations.%s.', $env->getConfId(), htmlspecialchars($arguments['relation']));
 
         $alias = $env->getConfigurations()->get($confId.'join.alias');
@@ -75,18 +79,18 @@ public function lookupRelation(EnvironmentTwig $env, \Tx_Rnbase_Domain_Model_Bas
         $fields = $options = [];
         $fields[$alias.'.'.$field][OP_EQ_INT] = $entity->getUid();
 
-        \tx_rnbase_util_SearchBase::setConfigFields($fields, $env->getConfigurations(), $confId.'fields.');
-        \tx_rnbase_util_SearchBase::setConfigOptions($options, $env->getConfigurations(), $confId.'options.');
+        \Sys25\RnBase\Search\SearchBase::setConfigFields($fields, $env->getConfigurations(), $confId.'fields.');
+        \Sys25\RnBase\Search\SearchBase::setConfigOptions($options, $env->getConfigurations(), $confId.'options.');
 
         if ($otherOptions = isset($arguments['options']) ? $arguments['options'] : []) {
-            $options = \tx_rnbase_util_Arrays::mergeRecursiveWithOverrule($options, $otherOptions);
+            $options = \Sys25\RnBase\Utility\Arrays::mergeRecursiveWithOverrule($options, $otherOptions);
         }
 
         if ($otherFields = isset($arguments['fields']) ? $arguments['fields'] : []) {
-            $fields = \tx_rnbase_util_Arrays::mergeRecursiveWithOverrule($fields, $otherFields);
+            $fields = \Sys25\RnBase\Utility\Arrays::mergeRecursiveWithOverrule($fields, $otherFields);
         }
 
-        $searcher = \tx_rnbase::makeInstance($env->getConfigurations()->get($confId.'callback.class'));
+        $searcher = GeneralUtility::makeInstance($env->getConfigurations()->get($confId.'callback.class'));
         $method = $env->getConfigurations()->get($confId.'callback.method');
 
         return $searcher->$method($fields, $options);

diff --git a/Classes/Twig/Extension/DateExtension.php b/Classes/Twig/Extension/DateExtension.php
@@ -72,10 +72,10 @@ public function renderStrfTime(
     ) {
         if (null === $format) {
             $formats = $env->getExtension('Twig_Extension_Core')->getDateFormat();
-            $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
+            $format = $date instanceof \DateInterval ? $formats[1] : $formats[0];
         }
 
-        if (!$date instanceof DateInterval) {
+        if (!$date instanceof \DateInterval) {
             $date = twig_date_converter($env, $date);
         }
 

diff --git a/Classes/Twig/Extension/ImageExtension.php b/Classes/Twig/Extension/ImageExtension.php
@@ -92,7 +92,7 @@ public function renderImage(
         }
 
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $image) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $image) {
                 return $env->getContentObject()->cImage(
                     $image,
                     $arguments->getTsConfig()
@@ -114,7 +114,7 @@ function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $image) {
      */
     public function fetchReferences($table, $uid, $refField = 'images')
     {
-        return \tx_rnbase_util_TSFAL::fetchReferences($table, $uid, $refField);
+        return \Sys25\RnBase\Utility\TSFAL::fetchReferences($table, $uid, $refField);
     }
 
     /**

diff --git a/Classes/Twig/Extension/LinkExtension.php b/Classes/Twig/Extension/LinkExtension.php
@@ -26,6 +26,7 @@
  ***************************************************************/
 
 use DMK\T3twig\Twig\EnvironmentTwig;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Class LinkExtension.
@@ -77,7 +78,7 @@ public function renderLink(EnvironmentTwig $env, $label, array $arguments = [])
         $arguments['label'] = $label;
 
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env) {
                 return $this->makeRnbaseLink($env, $arguments)->makeTag();
             },
             $env,
@@ -94,7 +95,7 @@ function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env) {
     public function renderUrl(EnvironmentTwig $env, array $arguments = [])
     {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env) {
                 return $this->makeRnbaseLink($env, $arguments)->makeUrl(false);
             },
             $env,
@@ -114,13 +115,13 @@ public function getName()
 
     /**
      * @param EnvironmentTwig              $env
-     * @param \Tx_Rnbase_Domain_Model_Data $arguments
+     * @param \Sys25\RnBase\Domain\Model\DataModel $arguments
      *
-     * @return \tx_rnbase_util_Link
+     * @return \Sys25\RnBase\Utility\Link
      */
     private function makeRnbaseLink(
         EnvironmentTwig $env,
-        \Tx_Rnbase_Domain_Model_Data $arguments
+        \Sys25\RnBase\Domain\Model\DataModel $arguments
     ) {
         $params = $arguments->getParams() ? $arguments->getParams()->toArray() : [];
         $tsPath = $arguments->getTsPath();
@@ -134,15 +135,15 @@ private function makeRnbaseLink(
         if ($arguments->hasTsConfig()) {
             $primeval = $env->getConfigurations();
             /**
-             * @var \Tx_Rnbase_Configuration_Processor
+             * @var \Sys25\RnBase\Configuration\Processor
              */
-            $configurations = \tx_rnbase::makeInstance(
-                'Tx_Rnbase_Configuration_Processor'
+            $configurations = GeneralUtility::makeInstance(
+                \Sys25\RnBase\Configuration\Processor::class
             );
             $config = $arguments->getTsConfig();
             $primevalConf = $primeval->get($confId.$tsPath);
             if (is_array($primevalConf)) {
-                $config = \tx_rnbase_util_Arrays::mergeRecursiveWithOverrule(
+                $config = \Sys25\RnBase\Utility\Arrays::mergeRecursiveWithOverrule(
                     $primevalConf,
                     $config
                 );

diff --git a/Classes/Twig/Extension/RequestExtension.php b/Classes/Twig/Extension/RequestExtension.php
@@ -66,12 +66,12 @@ public function renderGetPost(
         array $arguments = []
     ) {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $paramName) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $paramName) {
                 $paths = explode('|', $paramName);
                 $segment = array_shift($paths);
 
                 if ($arguments->getGlobal()) {
-                    $param = \tx_rnbase_parameters::getPostOrGetParameter($segment);
+                    $param = \Sys25\RnBase\Frontend\Request\Parameters::getPostOrGetParameter($segment);
                 } else {
                     $param = $env->getParameters()->get($segment);
                 }

diff --git a/Classes/Twig/Extension/TSParserExtension.php b/Classes/Twig/Extension/TSParserExtension.php
@@ -114,7 +114,7 @@ public function applyTs(
         }
 
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $value, $confId) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $value, $confId) {
                 // dont throw exception, if ts path does not exists
                 $arguments->setSkipTsNotFoundException(true);
 
@@ -169,7 +169,7 @@ public function renderParseFunc(
         array $arguments = []
     ) {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $confId) {
                 list($tsPath, $setup) = $this->findSetup($env, $confId, $arguments);
                 $conf = empty($setup[$tsPath.'.']) ? [] : $setup[$tsPath.'.'];
 
@@ -197,7 +197,7 @@ public function renderContentObject(
         array $arguments = []
     ) {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $confId) {
                 list($tsPath, $setup) = $this->findSetup($env, $confId, $arguments);
 
                 return $env->getContentObject()->cObjGetSingle(
@@ -227,7 +227,7 @@ public function renderStdWrap(
         array $arguments = []
     ) {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $confId) {
                 list($tsPath, $setup) = $this->findSetup($env, $confId, $arguments);
 
                 return $env->getContentObject()->stdWrap(
@@ -257,7 +257,7 @@ public function renderTsRaw(
         array $arguments = []
     ) {
         return $this->performCommand(
-            function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
+            function (\Sys25\RnBase\Domain\Model\DataModel $arguments) use ($env, $confId) {
                 list($tsPath, $setup) = $this->findSetup($env, $confId, $arguments);
 
                 if (empty($confId) && $arguments->hasTsPath()) {
@@ -280,7 +280,7 @@ function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
      *
      * @param EnvironmentTwig              $env
      * @param string                       $typoscriptObjectPath
-     * @param \Tx_Rnbase_Domain_Model_Data $arguments
+     * @param \Sys25\RnBase\Domain\Model\DataModel $arguments
      *
      * @throws \Exception
      *
@@ -289,7 +289,7 @@ function (\Tx_Rnbase_Domain_Model_Data $arguments) use ($env, $confId) {
     protected function findSetup(
         EnvironmentTwig $env,
         $typoscriptObjectPath,
-        \Tx_Rnbase_Domain_Model_Data $arguments
+        \Sys25\RnBase\Domain\Model\DataModel $arguments
     ) {
         if (empty($typoscriptObjectPath) && $arguments->hasTsPath()) {
             $typoscriptObjectPath = $arguments->getTsPath();
@@ -299,9 +299,9 @@ protected function findSetup(
             throw new \Exception('No TypoScript path given. arguments = {"ts_path" : "lib.testlink"}', 1489658526);
         }
 
-        $setup = \tx_rnbase_util_TYPO3::getTSFE()->tmpl->setup;
+        $setup = \Sys25\RnBase\Utility\TYPO3::getTSFE()->tmpl->setup;
 
-        $pathSegments = \Tx_Rnbase_Utility_Strings::trimExplode(
+        $pathSegments = \Sys25\RnBase\Utility\Strings::trimExplode(
             '.',
             $typoscriptObjectPath
         );

diff --git a/Classes/Twig/Extension/TsFeExtension.php b/Classes/Twig/Extension/TsFeExtension.php
@@ -62,7 +62,7 @@ public function getGlobals()
     {
         return [
             'tsfe' => $GLOBALS['TSFE'],
-            'pageRenderer' => \tx_rnbase_util_TYPO3::getPageRenderer(),
+            'pageRenderer' => \Sys25\RnBase\Utility\TYPO3::getPageRenderer(),
         ];
     }
 

diff --git a/Classes/Twig/Loader/T3FileSystem.php b/Classes/Twig/Loader/T3FileSystem.php
@@ -95,13 +95,13 @@ public function __construct($paths = [], $rootPath = null)
     protected function addT3Namespaces()
     {
         $extKeys = array_filter(
-            \tx_rnbase_util_Extensions::getLoadedExtensionListArray(),
+            \Sys25\RnBase\Utility\Extensions::getLoadedExtensionListArray(),
             function ($v) {
                 return !in_array($v, self::$sysExtKeys);
             }
         );
         foreach ($extKeys as $extKey) {
-            $path = \tx_rnbase_util_Extensions::extPath($extKey);
+            $path = \Sys25\RnBase\Utility\Extensions::extPath($extKey);
             $path .= 'Resources/Private/Templates/';
             if (is_dir($path)) {
                 $this->addPath($path, 'EXT:'.$extKey);