Fix found warnings and deprecations

Those were found by test coverage.

Author: d-s-codappix

.github/workflows/ci.yaml

@@ -127,7 +127,7 @@ jobs:
         run: composer require --no-progress --no-interaction --optimize-autoloader "typo3/cms-core:${{ matrix.typo3-version }}"
 
       - name: PHPUnit Tests
-        run: ./vendor/bin/phpunit --testdox --coverage-cobertura coverage/coverage.cobertura.xml
+        run: ./vendor/bin/phpunit --testdox --display-all-issues --coverage-cobertura coverage/coverage.cobertura.xml
 
       - name: Code Coverage Report
         uses: irongut/CodeCoverageSummary@v1.3.0

Classes/DataProvider/AbstractDataProvider.php

@@ -32,13 +32,9 @@
  */
 abstract class AbstractDataProvider implements DataProviderInterface
 {
-    /**
-     * @var array
-     */
-    protected $settings;
+    protected array $settings;
 
-
-    public function __construct($settings)
+    public function __construct(array $settings)
     {
         $this->settings = $settings;
     }

Classes/DataProvider/TyposcriptDataProvider.php

@@ -29,13 +29,15 @@
 
 class TyposcriptDataProvider extends AbstractDataProvider
 {
-    /**
-     * Entry point
-     *
-     * @return array
-     */
     public function provide()
     {
-        return is_array($this->settings['variables']) ? $this->settings['variables'] : [];
+        if (
+            array_key_exists('variables', $this->settings)
+            && is_array($this->settings['variables'])
+        ) {
+            return $this->settings['variables'];
+        }
+
+        return [];
     }
 }

Classes/Engine/HandlebarsEngine.php

@@ -71,7 +71,7 @@ public function __construct(array $settings)
         $this->template = $settings['template'] ?? $settings['templatePath'] ?? null;
         $this->dataProviders = $settings['dataProviders'] ?? [];
         $this->additionalData = $settings['additionalData'] ?? [];
-        $this->tempPath = Environment::getProjectPath() . '/' . $settings['tempPath'];
+        $this->tempPath = Environment::getProjectPath() . '/' . ($settings['tempPath'] ?? '');
     }
 
     /**
@@ -179,7 +179,7 @@ protected function getPartialCode($cx, $name): string
     {
         $partialContent = '';
         $partialFileNameAndPath = $this->getPartialPathAndFileName($name);
-        if (file_exists($partialFileNameAndPath)) {
+        if (is_string($partialFileNameAndPath) && file_exists($partialFileNameAndPath)) {
             return file_get_contents($partialFileNameAndPath);
         }
         return $partialContent;

Classes/View/HandlebarsView.php

@@ -57,9 +57,9 @@ public function render(?string $templateFileName = null): string
     protected function getContextVariables(): array
     {
         return [
-            'extensionKey' => strtolower($this->renderingContext->getExtensionKey()),
-            'controllerName' => strtolower($this->renderingContext->getControllerName()),
-            'actionName' => strtolower($this->renderingContext->getActionName()),
+            'extensionKey' => strtolower($this->renderingContext->getExtensionKey() ?? ''),
+            'controllerName' => strtolower($this->renderingContext->getControllerName() ?? ''),
+            'actionName' => strtolower($this->renderingContext->getActionName() ?? ''),
         ];
     }
 

Classes/ViewHelpers/RenderViewHelper.php

@@ -2,6 +2,7 @@
 
 namespace Visol\Handlebars\ViewHelpers;
 
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use Visol\Handlebars\Rendering\HandlebarsContext;
@@ -70,17 +71,17 @@ public function initializeArguments(): void
         $this->registerArgument('settings', 'array', '', false, []);
         $this->registerArgument('data', 'array', '', false, []);
     }
-    
+
     public function render(): string
     {
         $template = $this->arguments['template'];
         $settings = $this->arguments['settings'];
         $data = $this->arguments['data'];
-        
+
         $handlebarsView = GeneralUtility::makeInstance(HandlebarsView::class);
         $handlebarsRenderingContext = GeneralUtility::makeInstance(
             HandlebarsContext::class,
-            $this->renderingContext->getRequest()
+            $this->renderingContext->getAttribute(ServerRequestInterface::class)
         );
         $handlebarsView->setRenderingContext($handlebarsRenderingContext);
 
@@ -89,9 +90,9 @@ public function render(): string
         } else {
             $settings = [];
         }
- 
+
         $settings = array_replace_recursive($settings, [
-            'templatesRootPath' => $settings['templatesRootPath'],
+            'templatesRootPath' => $settings['templatesRootPath'] ?? null,
             'template' => $template,
             'additionalData' => $data
         ]);