From d4f920c2d820954b55aae43c5994d16b9d00458a Mon Sep 17 00:00:00 2001 From: Propaganistas Date: Mon, 8 Apr 2024 08:50:58 +0200 Subject: [PATCH 1/2] Remove conflict definition --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index e0a4bbe6..ea066a64 100644 --- a/composer.json +++ b/composer.json @@ -76,9 +76,6 @@ "phpunit/phpunit": "^9.5.26", "symfony/console": "^6.0" }, - "conflict": { - "giggsey/libphonenumber-for-php": "*" - }, "suggest": { "giggsey/libphonenumber-for-php": "Use libphonenumber-for-php for geocoding, carriers, timezones and matching" }, From 447869c560c80dd3eae0dbf36a68d0c53bc75143 Mon Sep 17 00:00:00 2001 From: Propaganistas Date: Tue, 9 Apr 2024 14:00:06 +0200 Subject: [PATCH 2/2] Update sast.yml --- .github/workflows/sast.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml index 5e878b33..88aa8229 100644 --- a/.github/workflows/sast.yml +++ b/.github/workflows/sast.yml @@ -15,10 +15,6 @@ jobs: name: "PHPStan" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref }} - - name: Checkout uses: actions/checkout@v4