Merge branch '7.x' into develop

orchestral · Oct 24, 2023 · b4a308b · b4a308b
2 parents 2fa4e87 + 7a4f522
commit b4a308b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/bin/sync b/bin/sync
@@ -23,6 +23,8 @@ Illuminate\Support\Collection::make([
 $files->copy("{$workingPath}/core/testbench.yaml", "{$workingPath}/testbench.yaml");
 
 Illuminate\Support\Collection::make([
+    ...$files->glob("{$workingPath}/core/workbench/config/*"),
+    ...$files->glob("{$workingPath}/core/workbench/lang/en/*"),
     ...$files->glob("{$workingPath}/core/workbench/routes/*"),
     ...$files->glob("{$workingPath}/core/workbench/resources/views/components/*"),
     ...$files->glob("{$workingPath}/core/workbench/resources/views/*"),

diff --git a/workbench/config/workbench.php b/workbench/config/workbench.php
@@ -0,0 +1,7 @@
+<?php
+
+use Composer\InstalledVersions;
+
+return [
+    'installed' => InstalledVersions::isInstalled('orchestra/workbench'),
+];
diff --git a/workbench/lang/en/welcome.php b/workbench/lang/en/welcome.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'morning' => 'Good Morning',
+];