Fixes

2025-03-02 20:26:54 +01:00 · 2025-03-02 20:26:54 +01:00 · 08cf96cfb6
commit 08cf96cfb6
parent 30deb9bb8f
4 changed files with 90 additions and 70 deletions
--- a/.make/04-docker.mk
+++ b/.make/04-docker.mk
@ -32,7 +32,7 @@ ifeq ($(ENV),prod)
 else ifeq ($(ENV),ci)
 	DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL)
 else ifeq ($(ENV),local)
-	DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL)
+	DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL)
 endif

 # We need a couple of environment variables for docker compose so we define a make variable that we can
--- a/src/new/fixtures/install.yml
+++ b/src/new/fixtures/install.yml
@ -2,3 +2,5 @@ PSC\Shop\EntityBundle\Entity\Install:
  install_1:
    # uid: 1
    color_db: "TEST"
+    calc_template: ""
+    calc_template_test: ""
--- a/src/new/importmap.php
+++ b/src/new/importmap.php
@ -40,7 +40,7 @@ return [
        'version' => '1.1.2',
    ],
    'chart.js' => [
-        'version' => '4.4.7',
+        'version' => '4.4.8',
    ],
    'alpinejs' => [
        'version' => '3.14.8',
@ -97,184 +97,184 @@ return [
        'version' => '0.3.4',
    ],
    'tom-select' => [
-        'version' => '2.4.1',
+        'version' => '2.4.3',
    ],
    'david-ai' => [
        'version' => '1.0.6',
    ],
    'ckeditor5' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-adapter-ckfinder/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-alignment/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-autoformat/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-autosave/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-basic-styles/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-block-quote/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-bookmark/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-ckbox/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-ckfinder/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-clipboard/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-cloud-services/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-code-block/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-core/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-easy-image/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-editor-balloon/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-editor-classic/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-editor-decoupled/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-editor-inline/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-editor-multi-root/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-engine/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-enter/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-essentials/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-find-and-replace/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-font/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-heading/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-highlight/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-horizontal-line/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-html-embed/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-html-support/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-image/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-indent/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-language/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-link/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-list/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-markdown-gfm/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-media-embed/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-mention/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-minimap/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-page-break/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-paragraph/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-paste-from-office/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-remove-format/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-restricted-editing/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-select-all/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-show-blocks/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-source-editing/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-special-characters/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-style/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-table/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-typing/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-ui/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-undo/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-upload/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-utils/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-watchdog/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-widget/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    '@ckeditor/ckeditor5-word-count/dist/index.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
    ],
    'lodash-es' => [
        'version' => '4.17.21',
@ -283,7 +283,7 @@ return [
        'version' => '2.0.5',
    ],
    'marked' => [
-        'version' => '4.0.12',
+        'version' => '15.0.7',
    ],
    'turndown' => [
        'version' => '7.2.0',
@ -292,22 +292,36 @@ return [
        'version' => '1.0.2',
    ],
    'color-parse' => [
-        'version' => '1.4.2',
+        'version' => '2.0.2',
    ],
    'color-convert' => [
-        'version' => '2.0.1',
+        'version' => '3.0.1',
    ],
    'vanilla-colorful/lib/entrypoints/hex' => [
        'version' => '0.7.2',
    ],
    'color-name' => [
-        'version' => '1.1.4',
+        'version' => '2.0.0',
    ],
    'ckeditor5/dist/ckeditor5.min.css' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
        'type' => 'css',
    ],
    'ckeditor5/translations/de.js' => [
-        'version' => '44.1.0',
+        'version' => '44.2.1',
+    ],
+    '@ckeditor/ckeditor5-emoji/dist/index.js' => [
+        'version' => '44.2.1',
+    ],
+    'tom-select/dist/css/tom-select.default.min.css' => [
+        'version' => '2.4.3',
+        'type' => 'css',
+    ],
+    'fuzzysort' => [
+        'version' => '3.1.0',
+    ],
+    'tom-select/dist/css/tom-select.bootstrap5.css' => [
+        'version' => '2.4.3',
+        'type' => 'css',
    ],
 ];
--- a/src/new/tests/RefreshDatabaseTrait.php
+++ b/src/new/tests/RefreshDatabaseTrait.php
@ -36,10 +36,14 @@ trait RefreshDatabaseTrait

        $container = static::$kernel->getContainer();

-        /** @var EntityManagerInterface $doc */
+        /**
+ * @var EntityManagerInterface $doc 
+*/
        $em = $container->get('doctrine.orm.entity_manager');

-        /** @var DocumentManager $doc */
+        /**
+ * @var DocumentManager $doc 
+*/
        $doc = $container->get('doctrine_mongodb.odm.document_manager');

        $doc->getSchemaManager()->dropDocumentCollection(Media::class);
@ -109,7 +113,7 @@ trait RefreshDatabaseTrait
            $shop->setCancelationNumberPattern('SST-{{ "now"|date("Ym") }}-{{number}}');
            $shop->setParcelCancelationNumberPattern('STS-{{ "now"|date("Ym") }}-{{number}}');
            $shop->setParcelInvoiceNumberPattern('STR-{{ "now"|date("Ym") }}-{{number}}');
-
+            $shop->setCalcTemplate("");
            $shop->setSenderZip(12345);
            $shop->setSenderCity("ShopMusterOrt");
            $shop->setSenderCompany("ShopMusterCompany");