refactor: tools to composer.json

Signed-off-by: Varun Patil <radialapps@gmail.com>

.github/workflows/static-analysis.yaml

@@ -43,4 +43,4 @@ jobs:
         run: |
           cd apps/memories
           make install-tools
-          tools/vendor/bin/psalm --output-format=github --no-cache --shepherd --stats --threads=4
+          vendor/bin/psalm --no-cache --shepherd --stats --threads=4

.gitignore

@@ -27,4 +27,3 @@ memories.tar.gz
 .cache/
 
 exiftool-bin/
-tools/

Makefile

@@ -7,15 +7,13 @@ exiftool:
 	sh scripts/get-exiftool.sh
 
 install-tools:
-	mkdir -p tools
-	composer require --dev --working-dir=tools friendsofphp/php-cs-fixer vimeo/psalm
 	composer install
 
 php-lint:
-	tools/vendor/bin/php-cs-fixer fix lib
+	vendor/bin/php-cs-fixer fix lib
 
 psalm:
-	tools/vendor/bin/psalm
+	vendor/bin/psalm
 
 npm-init:
 	npm ci

composer.json

@@ -8,6 +8,8 @@
             "name": "Varun Patil"
         }
     ],
-    "require": {},
-    "require-dev": {}
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.35",
+        "vimeo/psalm": "^5.15"
+    }
 }

psalm.xml

@@ -10,9 +10,6 @@
     <projectFiles>
         <directory name="lib" />
         <ignoreFiles>
-            <directory name="tools" />
-            <directory name="vendor" />
-
             <!-- Careful to not exclude ourselves! -->
             <directory name="../../lib" />
             <directory name="../../apps/files" />