adjust test (#357)

solverat · web-flow · commit 9f7aae53810c · 2022-11-19T12:19:05.000+01:00
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -18,7 +18,7 @@ jobs:
             PIMCORE_CODECEPTION_VERSION: "2.0"
 
             APP_ENV: test
-            PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
+            PIMCORE_TEST_DB_DSN: "mysql://test:test@127.0.0.1:3306/dachcom_bundle_test"
             PIMCORE_TEST_URL: "http://localhost"
             PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/lib/test-bundle/tests/_output/var/classes/DataObject"
 
@@ -40,16 +40,8 @@ jobs:
             matrix:
                 php: [ 8.0 ]
                 symfony: [ ^5.4 ]
-                pimcore: [ ~10.1.0, ~10.2.0, ~10.3.0, ~10.4.0, ~10.5.0 ]
+                pimcore: [ ~10.5.0 ]
                 include:
-                    -   pimcore: ~10.1.0
-                        template_tag: v10.1.0
-                    -   pimcore: ~10.2.0
-                        template_tag: v10.1.4
-                    -   pimcore: ~10.3.0
-                        template_tag: v10.1.9
-                    -   pimcore: ~10.4.0
-                        template_tag: v10.1.13
                     -   pimcore: ~10.5.0
                         template_tag: v10.2.0
         steps:
@@ -90,9 +82,19 @@ jobs:
                 run: php -v
 
             -   name: Setup MySql
-                run: |
-                    sudo systemctl start mysql
-                    mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
+                uses: shogo82148/actions-setup-mysql@v1
+                with:
+                    mysql-version: '8.0'
+                    user: test
+                    password: test
+                    root-password: root
+                    auto-start: true
+                    my-cnf: |
+                        max_allowed_packet=32505856
+                        max_connections=1000
+
+            -   name: Initial Database
+                run: mysql -utest -ptest -h127.0.0.1 -e 'CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;'
 
             -   name: Setup Chromium
                 run: |
diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -39,16 +39,8 @@ jobs:
             matrix:
                 php: [ 8.0 ]
                 symfony: [ ^5.4 ]
-                pimcore: [ ~10.1.0, ~10.2.0, ~10.3.0, ~10.4.0, ~10.5.0 ]
+                pimcore: [ ~10.5.0 ]
                 include:
-                    -   pimcore: ~10.1.0
-                        template_tag: v10.1.0
-                    -   pimcore: ~10.2.0
-                        template_tag: v10.1.4
-                    -   pimcore: ~10.3.0
-                        template_tag: v10.1.9
-                    -   pimcore: ~10.4.0
-                        template_tag: v10.1.13
                     -   pimcore: ~10.5.0
                         template_tag: v10.2.0
         steps:
diff --git a/composer.json b/composer.json
@@ -38,8 +38,8 @@
         "codeception/codeception": "^4.1",
         "codeception/module-webdriver": "^1.4",
         "codeception/module-symfony": "^1.6",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-symfony": "^0.12",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
         "symplify/easy-coding-standard": "^9.0"
     }
 }
diff --git a/src/FormBuilderBundle/Stream/AttachmentStream.php b/src/FormBuilderBundle/Stream/AttachmentStream.php
@@ -128,9 +128,9 @@ public function createAttachmentAsset($data, $fieldName, $formName): ?Asset
             $asset = Asset::create($formDataFolder->getId(), $assetData, false);
             $asset->setProperty(self::PACKAGE_IDENTIFIER, 'text', $packageIdentifier, false, false);
             $asset->save();
-            if (file_exists($zipPath)) {
-                unlink($zipPath);
-            }
+
+            unlink($zipPath);
+
         } catch (\Exception $e) {
             Logger::error(sprintf('Error while storing asset in pimcore (%s): %s', $zipPath, $e->getMessage()));
 
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php b/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
@@ -139,6 +139,6 @@ public function getFlashMessage(?string $locale): ?string
             return null;
         }
 
-        return $this->hasFlashMessage() ? $this->translator->trans((string) $this->data['flashMessage'], [], null, $locale) : null;
+        return $this->translator->trans((string) $this->data['flashMessage'], [], null, $locale);
     }
 }
diff --git a/tests/_etc/config/app/config.yml b/tests/_etc/config/app/config.yml
@@ -14,14 +14,23 @@ doctrine:
     dbal:
         connections:
             default:
-                options:
-                    1002: 'SET SESSION wait_timeout=30;'
                 mapping_types:
                     enum: string
                     bit: boolean
 
+pimcore_admin:
+    admin_csp_header:
+        enabled: false
+
+pimcore:
+    targeting:
+        enabled: false
+
 framework:
 
+    session:
+        storage_factory_id: session.storage.factory.native
+
     profiler:
         enabled: true
         collect: false
diff --git a/tests/_etc/config/app/views/dynamic-multi-file.html.twig b/tests/_etc/config/app/views/dynamic-multi-file.html.twig
@@ -13,7 +13,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
 <script type="text/javascript" src="https://rawcdn.githack.com/dachcom-digital/jquery-pimcore-formbuilder/v1.0.0/dist/jquery.fb.core.js"></script>
 <script type="text/javascript" src="https://rawcdn.githack.com/dachcom-digital/jquery-pimcore-formbuilder/v1.0.0/dist/jquery.fb.ext.repeater.js"></script>
-<script type="text/javascript" src="http://yourjavascript.com/011911157125/dependson-min.js"></script>
+<script type="text/javascript" src="https://gistcdn.githack.com/solverat/5a70ea1b21eaff050460294094ec052d/raw/96d9e93f2f7beae8e6828ab46c8ec859d24f3bc8/dependsOn.min.js"></script>
 <script>
     $(function () {
         var $ajaxForms = $('form.formbuilder.ajax-form');
diff --git a/tests/_etc/config/app/views/javascript.html.twig b/tests/_etc/config/app/views/javascript.html.twig
@@ -14,7 +14,7 @@
 <script type="text/javascript" src="https://rawcdn.githack.com/dachcom-digital/jquery-pimcore-formbuilder/v1.0.0/dist/jquery.fb.core.js"></script>
 <script type="text/javascript" src="https://rawcdn.githack.com/dachcom-digital/jquery-pimcore-formbuilder/v1.0.0/dist/jquery.fb.ext.conditional-logic.js"></script>
 <script type="text/javascript" src="https://rawcdn.githack.com/dachcom-digital/jquery-pimcore-formbuilder/v1.0.0/dist/jquery.fb.ext.repeater.js"></script>
-<script type="text/javascript" src="http://yourjavascript.com/011911157125/dependson-min.js"></script>
+<script type="text/javascript" src="https://gistcdn.githack.com/solverat/5a70ea1b21eaff050460294094ec052d/raw/96d9e93f2f7beae8e6828ab46c8ec859d24f3bc8/dependsOn.min.js"></script>
 <style>
     .fb-cl-hide-element {
         display: none;
diff --git a/tests/functional.suite.dist.yml b/tests/functional.suite.dist.yml
@@ -3,8 +3,8 @@ error_level: 'getenv("PIMCORE_PHP_ERROR_REPORTING")'
 modules:
     enabled:
         - \Dachcom\Codeception\Helper\PimcoreCore:
-            connect_db: true
-            rebootable_client: true
+              connect_db: true
+              rebootable_client: true
         - \Dachcom\Codeception\Helper\PimcoreBundleCore:
             run_installer: true
         - \Dachcom\Codeception\Helper\Browser\PhpBrowser:

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@`
`38`	`38`	`"codeception/codeception": "^4.1",`
`39`	`39`	`"codeception/module-webdriver": "^1.4",`
`40`	`40`	`"codeception/module-symfony": "^1.6",`
`41`		`- "phpstan/phpstan": "^0.12",`
`42`		`- "phpstan/phpstan-symfony": "^0.12",`
	`41`	`+ "phpstan/phpstan": "^1.0",`
	`42`	`+ "phpstan/phpstan-symfony": "^1.0",`
`43`	`43`	`"symplify/easy-coding-standard": "^9.0"`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,6 @@ public function getFlashMessage(?string $locale): ?string`
`139`	`139`	`return null;`
`140`	`140`	`}`
`141`	`141`
`142`		`- return $this->hasFlashMessage() ? $this->translator->trans((string) $this->data['flashMessage'], [], null, $locale) : null;`
	`142`	`+ return $this->translator->trans((string) $this->data['flashMessage'], [], null, $locale);`
`143`	`143`	`}`
`144`	`144`	`}`