Merge pull request #40 from it-at-m/mix-1498-1629

Mix 1498 1629
it-at-m · Dec 4, 2023 · 9c54bd2 · 9c54bd2
2 parents 55ef196 + 518ffe6
commit 9c54bd2
Show file tree

Hide file tree

Showing 64 changed files with 1,602 additions and 1,399 deletions.
diff --git a/README.md b/README.md
@@ -6,4 +6,4 @@
 
 ## Import Database
 - `ddev import-db --file=.resources/zms.sql`
-- `ddev exec zmsapi/vendor/bin/migrate --update`
+- `ddev exec zmsapi/vendor/bin/migrate --update`
diff --git a/mellon/composer.json b/mellon/composer.json
@@ -11,7 +11,8 @@
     "require-dev": {
         "phpmd/phpmd": "^2.8.0",
         "squizlabs/php_codesniffer": "*",
-        "phpunit/phpunit": "^9.5.4"
+        "phpunit/phpunit": "^9.5.4",
+        "roave/security-advisories": "dev-latest"
     },
     "require": {
         "php": ">=7.0.0",
@@ -36,4 +37,4 @@
             }
         }
     ]
-}
+}
diff --git a/zmsadmin/composer.json b/zmsadmin/composer.json
@@ -22,7 +22,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "8.0"
         },
         "allow-plugins": {
             "php-http/discovery": true
@@ -45,7 +45,8 @@
         "psr/http-message": "^1.0",
         "container-interop/container-interop": "^1.2",
         "twig/intl-extra": "^3.4",
-        "twig/twig": "3.*"
+        "twig/twig": "3.*",
+        "symfony/polyfill-intl-icu": "^1.21"
     },
     "bin": [],
     "autoload": {
@@ -54,4 +55,4 @@
             "BO\\Zmsadmin\\Tests\\": "tests/Zmsadmin/"
         }
     }
-}
+}