Updated tests.

laurentmuller · Dec 17, 2024 · 08aa19c · 08aa19c
1 parent cfed6e5
commit 08aa19c
Show file tree

Hide file tree

Showing 98 changed files with 230 additions and 153 deletions.
diff --git a/src/Controller/TestController.php b/src/Controller/TestController.php
@@ -26,7 +26,7 @@
 use App\Enums\Importance;
 use App\Enums\MessagePosition;
 use App\Enums\StrengthLevel;
-use App\Enums\TableView;
+use App\Form\Admin\CustomerParameterType;
 use App\Form\Type\AlphaCaptchaType;
 use App\Form\Type\CaptchaImageType;
 use App\Form\Type\ReCaptchaType;
@@ -37,7 +37,6 @@
 use App\Interfaces\UserInterface;
 use App\Model\HttpClientError;
 use App\Parameter\ApplicationParameters;
-use App\Parameter\UserParameters;
 use App\Pdf\Events\PdfLabelTextEvent;
 use App\Pdf\Interfaces\PdfLabelTextListenerInterface;
 use App\Pdf\PdfLabelDocument;
@@ -503,53 +502,19 @@ public function swiss(Request $request, SwissPostService $service): JsonResponse
         return $this->json($data);
     }
 
-    #[Get(path: '/parameter', name: 'parameter')]
-    public function testParameter(ApplicationParameters $application, UserParameters $user): Response
+    #[GetPost(path: '/parameter', name: 'parameter')]
+    public function testParameter(Request $request, ApplicationParameters $application): Response
     {
-        $application->getDate()
-            ->setUpdateCalculations()
-            ->setImport();
-
-        $application->getCustomer()
-            ->setFax('fake');
-
-        $application->getDisplay()
-            ->setDisplayMode(TableView::CUSTOM);
-
-        $application->getHomePage()
-            ->setCalculations(8);
-
-        $application->getProduct();
-        $application->getDefault();
-
-        $application->getSecurity()
-            ->setCaptcha(true)
-            ->setLevel(StrengthLevel::MEDIUM);
-
-        $user->getHomePage()
-            ->setCalculations(7);
-        $user->getOption()
-            ->setPrintAddress(true);
-
-        $applicationSaved = $application->save();
-        $userSaved = $user->save();
-
-        return $this->json([
-            'application_saved' => $applicationSaved,
-            'user_saved' => $userSaved,
-
-            'application_display' => $application->getDisplay(),
-            'user_display' => $user->getDisplay(),
-
-            'application_home_page' => $application->getHomePage(),
-            'user_home_page' => $user->getHomePage(),
-
-            'application_option' => $application->getOption(),
-            'user_option' => $user->getOption(),
+        $form = $this->createForm(CustomerParameterType::class, $application->getCustomer());
+        if ($this->handleRequestForm($request, $form)) {
+            if ($application->save()) {
+                return $this->redirectToHomePage($this->trans('parameters.success'));
+            }
+            // return $this->redirectToHomePage();
+        }
 
-            'date' => $application->getDate(),
-            'customer' => $application->getCustomer(),
-            'security' => $application->getSecurity(),
+        return $this->render('test/parameter.html.twig', [
+            'form' => $form,
         ]);
     }
 

diff --git a/src/Form/Admin/CustomerParameterType.php b/src/Form/Admin/CustomerParameterType.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Calculation package.
+ *
+ * (c) bibi.nu <bibi@bibi.nu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace App\Form\Admin;
+
+use App\Form\AbstractHelperType;
+use App\Form\FormHelper;
+
+class CustomerParameterType extends AbstractHelperType
+{
+    public function __construct()
+    {
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'customer';
+    }
+
+    protected function addFormFields(FormHelper $helper): void
+    {
+        $helper->field('name')
+            ->updateOption('prepend_icon', 'fa-solid fa-user-group')
+            ->addTextType();
+        $helper->field('address')
+            ->updateOption('prepend_icon', 'fa-solid fa-location-dot')
+            ->notRequired()
+            ->addTextType();
+        $helper->field('zipCity')
+            ->updateOption('prepend_icon', 'fa-solid fa-map-location-dot')
+            ->notRequired()
+            ->addTextType();
+        $helper->field('phone')
+            ->updateOption('prepend_title', 'parameters.fields.customer_phone_title')
+            ->notRequired()
+            ->addTelType();
+        $helper->field('fax')
+            ->notRequired()
+            ->addFaxType();
+        $helper->field('email')
+            ->updateOption('prepend_title', 'parameters.fields.customer_email_title')
+            ->notRequired()
+            ->addEmailType();
+        $helper->field('url')
+            ->updateOption('prepend_title', 'parameters.fields.customer_url_title')
+            ->notRequired()
+            ->addUrlType();
+    }
+
+    protected function getLabelPrefix(): ?string
+    {
+        return 'parameters.fields.customer_';
+    }
+}
diff --git a/src/Form/Parameters/OptionParameterType.php b/src/Form/Parameters/OptionParameterType.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Calculation package.
+ *
+ * (c) bibi.nu <bibi@bibi.nu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace App\Form\Parameters;
+
+use App\Form\AbstractHelperType;
+use App\Form\FormHelper;
+
+class OptionParameterType extends AbstractHelperType
+{
+    public function getBlockPrefix(): string
+    {
+        return 'option';
+    }
+
+    protected function addFormFields(FormHelper $helper): void
+    {
+        $helper->field('printAddress')
+            // ->updateAttribute('data-default', $this->getDefaultValue('printAddress'))
+            ->help('parameters.helps.qr_code')
+            ->addCheckboxType();
+
+        $helper->field('qrCode')
+            // ->updateAttribute('data-default', $this->getDefaultValue('qrCode'))
+            ->help('parameters.helps.print_address')
+            ->addCheckboxType();
+    }
+}
diff --git a/src/Reader/CSVReader.php b/src/Reader/CSVReader.php
@@ -58,6 +58,7 @@ protected function getNextData($stream): ?array
     {
         $data = \fgetcsv($stream, $this->length, $this->separator, $this->enclosure, $this->escape);
 
+        /** @phpstan-var list<string>|null */
         return \is_array($data) ? $data : null;
     }
 }
diff --git a/templates/test/parameter.html.twig b/templates/test/parameter.html.twig
@@ -0,0 +1,9 @@
+{% extends 'cards/card_edit.html.twig' %}
+{%- set title = 'parameters.title' -%}
+{%- set title_icon = 'cogs' -%}
+{%- set title_description = 'parameters.description' -%}
+{# javascript #}
+{% block javascripts -%}
+    {{ parent() }}
+    {{- asset_js('js/application/validation_edit.js') }}
+{% endblock %}
diff --git a/tests/Command/FontAwesomeCommandTest.php b/tests/Command/FontAwesomeCommandTest.php
@@ -22,7 +22,7 @@ class FontAwesomeCommandTest extends CommandTestCase
 
     public function testInvalidJson(): void
     {
-        $input = ['source' => 'tests/data/json/fontawesome_invalid.json'];
+        $input = ['source' => 'tests/files/json/fontawesome_invalid.json'];
         $output = $this->execute(
             name: self::COMMAND_NAME,
             input: $input,
@@ -35,7 +35,7 @@ public function testRawEmpty(): void
     {
         try {
             $input = [
-                'source' => 'tests/data/json/fontawesome_raw_empty.json',
+                'source' => 'tests/files/json/fontawesome_raw_empty.json',
                 'target' => '/tests/Command/temp',
             ];
             $output = $this->execute(
@@ -52,7 +52,7 @@ public function testSimulate(): void
     {
         try {
             $input = [
-                'source' => 'tests/data/json/fontawesome_valid.json',
+                'source' => 'tests/files/json/fontawesome_valid.json',
                 'target' => '/tests/Command/temp',
                 '--dry-run' => true,
             ];
@@ -68,7 +68,7 @@ public function testSimulate(): void
 
     public function testSourceEmpty(): void
     {
-        $input = ['source' => 'tests/data/json/fontawesome_empty.json'];
+        $input = ['source' => 'tests/files/json/fontawesome_empty.json'];
         $output = $this->execute(
             name: self::COMMAND_NAME,
             input: $input,
@@ -91,7 +91,7 @@ public function testSuccess(): void
     {
         try {
             $input = [
-                'source' => 'tests/data/json/fontawesome_valid.json',
+                'source' => 'tests/files/json/fontawesome_valid.json',
                 'target' => '/tests/Command/temp',
             ];
             $output = $this->execute(

diff --git a/tests/Command/HeaderNameCommandTest.php b/tests/Command/HeaderNameCommandTest.php
@@ -18,7 +18,7 @@
 class HeaderNameCommandTest extends CommandTestCase
 {
     private const COMMAND_NAME = 'app:header:name';
-    private const DATA_PATH = '/tests/data/css';
+    private const DATA_PATH = '/tests/files/css';
 
     protected function setUp(): void
     {
@@ -127,8 +127,8 @@ public function testSetContent(): void
             self::DATA_PATH,
             'Skipped 2',
             'Updated 2',
-            'tests/data/css/no_header.css',
-            'tests/data/css/old_header.css',
+            'tests/files/css/no_header.css',
+            'tests/files/css/old_header.css',
         ];
         $input = [
             '--pattern' => 'css',
@@ -141,11 +141,11 @@ public function testSetContent(): void
 
     private function replaceCssContents(): void
     {
-        $file = __DIR__ . '/../data/css/no_header.css';
+        $file = __DIR__ . '/../files/css/no_header.css';
         if (\file_exists($file)) {
             \file_put_contents($file, "html {\n    width: 100vw;\n}\n");
         }
-        $file = __DIR__ . '/../data/css/old_header.css';
+        $file = __DIR__ . '/../files/css/old_header.css';
         if (\file_exists($file)) {
             \file_put_contents($file, "/* old_header.css */\nhtml {\n    width: 100vw;\n}\n");
         }

diff --git a/tests/Command/WebpCommandTest.php b/tests/Command/WebpCommandTest.php
@@ -39,7 +39,7 @@ public function testExecuteDrySuccess(): void
             'Skip: 0',
         ];
         $input = [
-            'source' => '/tests/data/public/images/users',
+            'source' => '/tests/files/public/images/users',
             '--dry-run' => true,
         ];
         $output = $this->execute(self::COMMAND_NAME, $input);
@@ -51,7 +51,7 @@ public function testExecuteImageInvalid(): void
         $name = 'example_invalid.png';
         $path = FileUtils::tempDir(__DIR__);
         self::assertIsString($path);
-        $source = FileUtils::buildPath(__DIR__, '/../data/images', $name);
+        $source = FileUtils::buildPath(__DIR__, '/../files/images', $name);
         $target = FileUtils::buildPath($path, $name);
         self::assertTrue(FileUtils::copy($source, $target));
         $source = FileUtils::makePathRelative($path, __DIR__ . '/../..');
@@ -121,7 +121,7 @@ public function testExecuteSuccess(): void
         $name = 'example.png';
         $path = FileUtils::tempDir(__DIR__);
         self::assertIsString($path);
-        $source = FileUtils::buildPath(__DIR__, '/../data/images', $name);
+        $source = FileUtils::buildPath(__DIR__, '/../files/images', $name);
         $target = FileUtils::buildPath($path, $name);
         self::assertTrue(FileUtils::copy($source, $target));
         $source = FileUtils::makePathRelative($path, __DIR__ . '/../..');

diff --git a/tests/Controller/AboutSymfonyControllerTest.php b/tests/Controller/AboutSymfonyControllerTest.php
@@ -36,7 +36,7 @@ public static function getRoutes(): \Iterator
         $query = '/about/symfony/license?file=fake';
         yield [$query, self::ROLE_ADMIN, Response::HTTP_OK, Request::METHOD_GET, true];
 
-        $query = '/about/symfony/license?file=tests/data/txt/empty.txt';
+        $query = '/about/symfony/license?file=tests/files/txt/empty.txt';
         yield [$query, self::ROLE_ADMIN, Response::HTTP_OK, Request::METHOD_GET, true];
     }
 }
diff --git a/tests/Controller/HelpControllerTest.php b/tests/Controller/HelpControllerTest.php
@@ -154,7 +154,7 @@ private function checkUrl(string $url): void
 
     private function getDownloadImage(): string
     {
-        $path = __DIR__ . '/../data/images/example.png';
+        $path = __DIR__ . '/../files/images/example.png';
         $type = \mime_content_type($path);
         $data = (string) \file_get_contents($path);
         $encoded = \base64_encode($data);

diff --git a/tests/Controller/OpenWeatherControllerTest.php b/tests/Controller/OpenWeatherControllerTest.php
@@ -329,7 +329,7 @@ private function getImportFile(): string
         self::assertIsString($targetFile);
         self::assertFileExists($targetFile);
 
-        $originFile = __DIR__ . '/../data/city/list.invalid.json.gz';
+        $originFile = __DIR__ . '/../files/city/list.invalid.json.gz';
         self::assertFileExists($originFile);
 
         FileUtils::copy($originFile, $targetFile, true);

diff --git a/tests/Data/css/header.css b/tests/Data/css/header.css
diff --git a/tests/Enums/ImageExtensionTest.php b/tests/Enums/ImageExtensionTest.php
@@ -23,7 +23,7 @@ class ImageExtensionTest extends TestCase
 {
     public static function getCreateImages(): \Iterator
     {
-        $dir = \realpath(__DIR__ . '/../data/images');
+        $dir = \realpath(__DIR__ . '/../files/images');
         yield [ImageExtension::BMP, $dir . '/example.bmp'];
         yield [ImageExtension::GIF, $dir . '/example.gif'];
         yield [ImageExtension::JPEG, $dir . '/example.jpeg'];

diff --git a/tests/Fixture/Database.php b/tests/Fixture/Database.php
@@ -120,7 +120,7 @@ public function search(string $query, string $value, int $limit, int $mode = \SQ
     protected function createSchema(): void
     {
         // load script
-        $file = __DIR__ . '/../data/sql/db_test.sql';
+        $file = __DIR__ . '/../files/sql/db_test.sql';
         $sql = FileUtils::readFile($file);
         if ('' === $sql) {
             throw new \LogicException('Unable to find the schema.');

diff --git a/tests/Form/Type/SimpleEditorTypeTest.php b/tests/Form/Type/SimpleEditorTypeTest.php
@@ -38,7 +38,7 @@ public function testFormView(): void
      */
     public function testInvalidJson(): void
     {
-        $actionsPath = __DIR__ . '/../../data/json/fontawesome_invalid.json';
+        $actionsPath = __DIR__ . '/../../files/json/fontawesome_invalid.json';
 
         $resolver = new OptionsResolver();
         $view = $this->createMock(FormView::class);
@@ -70,7 +70,7 @@ public function testSubmit(): void
 
     protected function getPreloadedExtensions(): array
     {
-        $actionsPath = __DIR__ . '/../../../resources/data/simple_editor_actions.json';
+        $actionsPath = __DIR__ . '/../../../resources/files/simple_editor_actions.json';
 
         return [new SimpleEditorType($actionsPath)];
     }

diff --git a/tests/Listener/VichListenerTest.php b/tests/Listener/VichListenerTest.php
@@ -210,7 +210,7 @@ private function createUser(?UploadedFile $file = null): User
 
     private function getImagesPath(): string
     {
-        return __DIR__ . '/../data/images/';
+        return __DIR__ . '/../files/images/';
     }
 
     /**

diff --git a/tests/Model/ImageDataTest.php b/tests/Model/ImageDataTest.php
@@ -20,7 +20,7 @@ class ImageDataTest extends TestCase
 {
     public function testValidData(): void
     {
-        $path = __DIR__ . '/../data/images/example.png';
+        $path = __DIR__ . '/../files/images/example.png';
         $content = \file_get_contents($path);
         self::assertIsString($content);
         $imageData = ImageData::instance($content);
-Original file line number
+Diff line change
@@ Expand Up @@
         private function getImagesPath(): string
         {
-            return __DIR__ . '/../data/images/';
+            return __DIR__ . '/../files/images/';
         }
         /**
@@ Expand Down @@