Merge pull request #41 from charcoalphp/develop

Pulling develop into main
charcoalphp · Jun 23, 2022 · 8a4a9b1 · 8a4a9b1
2 parents 13936a0 + 9f1777a
commit 8a4a9b1
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -75,8 +75,7 @@
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/yaml": "^3.0",
         "symplify/monorepo-builder": "^10.2",
-        "twig/twig": "^1.31",
-        "ext-json": "*"
+        "twig/twig": "^1.31"
     },
     "autoload": {
         "psr-4": {
@@ -141,7 +140,24 @@
         "charcoal/translator": "2.2.2",
         "charcoal/ui": "2.2.2",
         "charcoal/user": "2.2.2",
-        "charcoal/view": "2.2.2"
+        "charcoal/view": "2.2.2",
+        "locomotivemtl/charcoal-admin": "*",
+        "locomotivemtl/charcoal-app": "*",
+        "locomotivemtl/charcoal-attachment": "*",
+        "locomotivemtl/charcoal-cache": "*",
+        "locomotivemtl/charcoal-cms": "*",
+        "locomotivemtl/charcoal-config": "*",
+        "locomotivemtl/charcoal-core": "*",
+        "locomotivemtl/charcoal-email": "*",
+        "locomotivemtl/charcoal-factory": "*",
+        "locomotivemtl/charcoal-image": "*",
+        "locomotivemtl/charcoal-object": "*",
+        "locomotivemtl/charcoal-property": "*",
+        "locomotivemtl/charcoal-queue": "*",
+        "locomotivemtl/charcoal-translator": "*",
+        "locomotivemtl/charcoal-ui": "*",
+        "locomotivemtl/charcoal-user": "*",
+        "locomotivemtl/charcoal-view": "*"
     },
     "bin": [
         "bin/charcoal"

diff --git a/packages/admin/composer.json b/packages/admin/composer.json
@@ -69,6 +69,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-admin": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/app/composer.json b/packages/app/composer.json
@@ -61,6 +61,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-app": "*"
+    },
     "bin": [
         "bin/charcoal"
     ],

diff --git a/packages/attachment/composer.json b/packages/attachment/composer.json
@@ -46,6 +46,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-attachment": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/cache/composer.json b/packages/cache/composer.json
@@ -44,6 +44,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-cache": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/cms/composer.json b/packages/cms/composer.json
@@ -52,6 +52,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-cms": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/config/composer.json b/packages/config/composer.json
@@ -45,6 +45,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-config": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/core/composer.json b/packages/core/composer.json
@@ -52,6 +52,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-core": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/email/composer.json b/packages/email/composer.json
@@ -44,6 +44,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-email": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/factory/composer.json b/packages/factory/composer.json
@@ -38,6 +38,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-factory": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/image/composer.json b/packages/image/composer.json
@@ -37,6 +37,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-image": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/object/composer.json b/packages/object/composer.json
@@ -41,6 +41,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-object": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/property/composer.json b/packages/property/composer.json
@@ -52,6 +52,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-property": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/queue/composer.json b/packages/queue/composer.json
@@ -41,6 +41,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-queue": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/translator/composer.json b/packages/translator/composer.json
@@ -46,6 +46,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-translator": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/ui/composer.json b/packages/ui/composer.json
@@ -50,6 +50,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-ui": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/user/composer.json b/packages/user/composer.json
@@ -42,6 +42,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal/"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-user": "*"
+    },
     "scripts": {
         "test": [
             "@tests"

diff --git a/packages/view/composer.json b/packages/view/composer.json
@@ -48,6 +48,9 @@
             "Charcoal\\Tests\\": "tests/Charcoal"
         }
     },
+    "replace":{
+        "locomotivemtl/charcoal-view": "*"
+    },
     "scripts": {
         "test": [
             "@tests"