diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a23001c..521b6803 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: @@ -38,8 +31,6 @@ jobs: 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 echo Build completed! - name: Upload uses: actions/upload-artifact@v3.1.0 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..fbd7b488 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,8 @@ "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", 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