TASK: Move require database to Helper Class

codappix · Apr 24, 2024 · 1aff255 · 1aff255
1 parent 2e23ed6
commit 1aff255
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 42 deletions.
diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colImageFixWidthDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colImageFixWidthDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_imagefixedwidth';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colFullWidthDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colFullWidthDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_image';
 

diff --git a/...ontainer_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerMultiplierDatabase.php b/...ontainer_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerMultiplierDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_image';
 

diff --git a/...ures/container_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerSizeDatabase.php b/...ures/container_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerSizeDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colFullWidthDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colFullWidthDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col2colDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col2colDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_50_50_Database.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_50_50_Database.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/.../Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageLeft_Database.php b/.../Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageLeft_Database.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/...Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageRight_Database.php b/...Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageRight_Database.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][1]['CType'] = 'codappix_image';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colImageFixWidthDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colImageFixWidthDatabase.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-$pathinfo = pathinfo(__FILE__);
-$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
-$configuration = include $path;
+use Codappix\ContainerExample\Tests\Fixtures\RequireDatabase;
+
+$configuration = RequireDatabase::getConfiguration(pathinfo(__FILE__));
 
 $configuration['tt_content'][2]['CType'] = 'codappix_imagefixedwidth';
 

diff --git a/Tests/Fixtures/container_example/Test/Fixtures/RequireDatabase.php b/Tests/Fixtures/container_example/Test/Fixtures/RequireDatabase.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Codappix\ContainerExample\Tests\Fixtures;
+
+class RequireDatabase
+{
+    public static function getConfiguration(array $pathinfo): array
+    {
+        $path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+        return require $path;
+    }
+}
diff --git a/Tests/Fixtures/container_example/composer.json b/Tests/Fixtures/container_example/composer.json
@@ -3,6 +3,11 @@
     "description": "Add a container example for frontend tests",
     "type": "typo3-cms-extension",
     "license": "GPL-2.0-or-later",
+    "autoload-dev": {
+        "psr-4": {
+            "Codappix\\ContainerExample\\Tests\\": "Tests/"
+        }
+    },
     "require": {
         "typo3/cms-core": "*",
         "b13/container": "*",