From 24ba29e713e52b0fd2dbecc0b1f7b0f15de863a9 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 11 Oct 2022 15:12:55 +0200
Subject: [PATCH] Update phpactor

---
 home/files/phpactor/phpactor.yml                |  5 +++--
 home/packages/custom/build-phpactor/default.nix | 11 ++++++-----
 home/programs/neovim/nix-plugins/phpactor.nix   |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/home/files/phpactor/phpactor.yml b/home/files/phpactor/phpactor.yml
index b9d947f..d22a320 100644
--- a/home/files/phpactor/phpactor.yml
+++ b/home/files/phpactor/phpactor.yml
@@ -2,11 +2,12 @@
 "code_transform.refactor.generate_accessor.upper_case_first": true
 "language_server_completion.trim_leading_dollar": true
 "language_server_phpstan.enabled": true
+"indexer.follow_symlinks": true
 "indexer.exclude_patterns":
   - "**\/var\/**\/*"
   - "**\/typo3temp\/**\/*"
-  - "\/vendor\/**\/node_modules\/**\/*"
-  - "\/vendor\/**\/stubs-rector\/**\/*"
+  - "**\/node_modules\/**\/*"
+  - "**\/stubs-rector\/**\/*"
   - "\/vendor\/**\/Tests\/**\/*"
   - "\/vendor\/**\/tests\/**\/*"
   - "\/vendor\/composer\/**\/*"
diff --git a/home/packages/custom/build-phpactor/default.nix b/home/packages/custom/build-phpactor/default.nix
index 55a852c..ba8cff1 100644
--- a/home/packages/custom/build-phpactor/default.nix
+++ b/home/packages/custom/build-phpactor/default.nix
@@ -16,16 +16,17 @@ writeShellApplication {
 
   # TODO: Use nix build environment?!
   text = ''
-    rm -rf /tmp/phpactor-build
-    mkdir /tmp/phpactor-build
-    cd /tmp/phpactor-build
+    rm -rf /tmp/phpactor
+    mkdir /tmp/phpactor
+    cd /tmp/phpactor
     git clone --depth 1 https://github.com/phpactor/phpactor.git .
     composer install -o --no-dev
     version=$(git show -s --format=%H)
     rm -rf .git/
     cd /tmp
-    tar -czf "phpactor-$version.tar.gz" /tmp/phpactor-build/*
+    tar -czf "phpactor-$version.tar.gz" phpactor
     rsync -vaz "phpactor-$version.tar.gz" daniel-siepmann.de:webs/daniel-siepmann.de/htdocs/public/fileadmin/
-    rm -rf /tmp/phpactor-build "phpactor-$version.tar.gz"
+    cd /tmp
+    rm -rf /tmp/phpactor "phpactor-$version.tar.gz"
   '';
 }
diff --git a/home/programs/neovim/nix-plugins/phpactor.nix b/home/programs/neovim/nix-plugins/phpactor.nix
index 3aa1c76..347b1fc 100644
--- a/home/programs/neovim/nix-plugins/phpactor.nix
+++ b/home/programs/neovim/nix-plugins/phpactor.nix
@@ -10,10 +10,10 @@
 
 vimUtils.buildVimPluginFrom2Nix rec {
   pname = "phpactor";
-  version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1";
+  version = "382bac189528b216715e9bc750f8160ac69b6d10";
   src = fetchurl {
     url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz";
-    sha256 = "sha256-JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY=";
+    sha256 = "sha256-/L76wrSKZFfHfYyrOX9yj4SjmF19a0S/Hu2+HDMlh20=";
   };
 
   nativeBuildInputs = [