Merge branch 'develop' into seo-update

# Conflicts: # composer.lock
statikbe · Feb 1, 2024 · 1a2fa08 · 1a2fa08
2 parents b248780 + 58806e6
commit 1a2fa08
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "php": ">=8.2",
     "ext-json": "*",
     "craftcms/ckeditor": "3.4.0",
-    "craftcms/cms": "4.5.11.1",
+    "craftcms/cms": "4.7.0",
     "craftcms/postmark": "3.0.0",
     "hybridinteractive/craft-position-fieldtype": "4.0.0",
     "hybridinteractive/craft-width-fieldtype": "^4.0",
@@ -51,6 +51,9 @@
     }
   },
   "scripts": {
+    "check-cs": "ecs check --ansi",
+    "fix-cs": "ecs check --ansi --fix",
+    "phpstan": "phpstan --memory-limit=1G",
     "post-create-project-cmd": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
       "@php -r \"copy('.gitignore.example', '.gitignore');\"",

diff --git a/composer.lock b/composer.lock