From 8dbcf3f2ffb13891899a14a95149d94eb7363bec Mon Sep 17 00:00:00 2001
From: Dries C <coenendries3@gmail.com>
Date: Wed, 27 Mar 2024 23:21:45 +0100
Subject: [PATCH] [Build] get rid of virions

---
 .github/workflows/build.yml   | 13 ++-----------
 .github/workflows/phpstan.yml |  7 -------
 composer.json                 |  7 ++++---
 phpstan.neon.dist             |  9 +--------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a23001c..be9e366b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,13 +11,6 @@ jobs:
     steps:
       - name: Startup
         uses: actions/checkout@v3
-      - name: Checkout PharBuilder
-        uses: actions/checkout@v3
-        with:
-          repository: NetherGamesMC/PharBuilder
-          token: ${{ secrets.ng_token }}
-          path: PharBuilder
-          ref: pm5
       - name: Download PHP Release
         uses: dsaltares/fetch-gh-release-asset@1.1.1
         with:
@@ -37,12 +30,10 @@ jobs:
         run: |
           echo Building...
           chmod +x pharbuilder
-          ./pharbuilder -i . -o PharBuilder/NGPlots.phar
-          echo Injecting Virions...
-          ./bin/php7/bin/php -dphar.readonly=0 PharBuilder/libasynql.phar PharBuilder/NGPlots.phar
+          ./pharbuilder -i . -o ./NGPlots.phar
           echo Build completed!
       - name: Upload
         uses: actions/upload-artifact@v3.1.0
         with:
           name: NGPlots
-          path: PharBuilder/NGPlots.phar
+          path: NGPlots.phar
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index d442d7e1..40d93382 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -20,13 +20,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Unpack PHP Release
         run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz
-      - name: Checkout PharBuilder
-        uses: actions/checkout@v3
-        with:
-          repository: NetherGamesMC/PharBuilder
-          token: ${{ secrets.ng_token }}
-          path: PharBuilder
-          ref: pm5
       - name: Download Composer
         run: curl -o composer.phar "https://getcomposer.org/composer-stable.phar"
       - name: Add Composer GitHub access token
diff --git a/composer.json b/composer.json
index f9967994..edac94c0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,19 +5,20 @@
     "type": "project",
     "require": {
         "php": "^8.0",
-        "sof3/await-generator": "^3.6"
+        "nethergamesmc/libasynql": "dev-pm5",
+        "sof3/await-generator": "3.6.1"
     },
     "require-dev": {
         "phpstan/phpstan": "1.2.0",
+        "nethergamesmc/pocketmine-mp": "dev-stable",
         "nethergamesmc/ngessentials": "dev-pm5"
     },
     "repositories": [
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/InvMenu.git" },
-        { "type": "vcs", "url": "git@github.com:NetherGamesMC/Lobby.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/NGEssentials.git" },
+        { "type": "vcs", "url": "git@github.com:NetherGamesMC/PocketMine-MP.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/libAnticheat.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/libDiscord.git" },
-        { "type": "vcs", "url": "git@github.com:NetherGamesMC/libMMO.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/libMatchmake.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/libPhysX.git" },
         { "type": "vcs", "url": "git@github.com:NetherGamesMC/libReplay.git" },
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 79742bfd..565b5b9b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,12 +3,5 @@ parameters:
     checkMissingIterableValueType: false
     paths:
         - src
-    bootstrapFiles:
-        - phar://PharBuilder/PocketMine-MP.phar/vendor/autoload.php
     scanDirectories:
-        - vendor/nethergamesmc/ngessentials
-        - phar://PharBuilder/PocketMine-MP.phar
-        - phar://PharBuilder/libasynql.phar
-    excludePaths:
-        analyse:
-            - src/MyPlot/provider
\ No newline at end of file
+        - vendor
\ No newline at end of file