3 files changed, 52 insertions, 4 deletions
diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua
index 3f689f6..ddc5fa3 100644
--- a/lua/plugins/laravel.lua
+++ b/lua/plugins/laravel.lua
@@ -4,14 +4,14 @@ return {
     "rcarriga/nvim-notify",
     "nvim-telescope/telescope.nvim",
   },
-  cmd = { "Sail", "Artisan", "Composer", "Npm", "Laravel" },
+  cmd = { "Sail", "Artisan", "Composer", "Npm", "Laravel", "LaraTest" },
   keys = {
     { "<leader>la", ":Laravel artisan<cr>", desc = "Laravel Application Commands" },
     { "<leader>lr", ":Laravel routes<cr>", desc = "Laravel Application Routes" },
     {
       "<leader>lt",
       function()
-        require("laravel").app.sendToTinker()
+        require("laravel.tinker").send_to_tinker()
       end,
       mode = "v",
       desc = "Laravel Application Routes",
diff --git a/lua/plugins/phpactor.lua b/lua/plugins/phpactor.lua
index 8dec3ec..23311fc 100644
--- a/lua/plugins/phpactor.lua
+++ b/lua/plugins/phpactor.lua
@@ -1,15 +1,58 @@
+local phpactor = function ()
+  vim.ui.select({
+    "class_inflect",
+    "context_menu",
+    "expand_class",
+    "generate_accessor",
+    "change_visibility",
+    "copy_class",
+    "import_class",
+    "import_missing_classes",
+    "move_class",
+    "navigate",
+    "new_class",
+    "transform",
+    "update",
+    "config",
+    "status",
+    "cache_clear",
+  }, {
+    prompt = "Phpactor Action",
+  }, function(choice)
+    if choice == nil or choice == "" then
+      return
+    end
+
+    -- TODO: add option for new class in same directory
+    if choice == "new_class" then
+      return vim.ui.input({
+        prompt = "New Class",
+      }, function(value)
+        if value == nil then
+          return
+        end
+        -- TODO: check filename generation to validate the path
+        require("phpactor").rpc("new_class", { text_value = vim.fn.getcwd() .. '/' .. value .. ".php" })
+      end)
+    end
+
+    require("phpactor").rpc(choice, {})
+  end)
+end
+
 return {
   "adalessa/phpactor.nvim",
   cmd = { "PhpActor" },
   keys = {
-    { "<leader>pa", ":PhpActor context_menu<cr>", desc = "PhpActor context menu" },
+    { "<leader>pa", phpactor, desc = "PhpActor options" },
+    { "<leader>pc", ":PhpActor context_menu<cr>", desc = "PhpActor context menu" },
   },
   dependencies = {
     "nvim-lua/plenary.nvim",
   },
   opts = {
     install = {
-      bin = vim.fn.stdpath "data" .. "/mason/bin/phpactor",
+      bin = vim.fn.exepath "phpactor",
     },
     lspconfig = {
       enabled = false,
diff --git a/lua/plugins/twilight.lua b/lua/plugins/twilight.lua
new file mode 100644
index 0000000..144111f
--- /dev/null
+++ b/lua/plugins/twilight.lua
@@ -0,0 +1,5 @@
+return {
+  "folke/twilight.nvim",
+  cmd = { "Twilight" },
+  config = true,
+}