From 2df64fdea2135cc60e2e0ed374cc70f31b120c78 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Thu, 2 Feb 2023 17:17:59 +0330 Subject: [PATCH 1/4] chore: replace deprecated `COMPOSER_TOKEN` with `GITHUB_TOKEN` --- .github/workflows/deptrac.yml | 2 +- .github/workflows/phpcsfixer.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit.yml | 2 +- .github/workflows/psalm.yml | 2 +- .github/workflows/rector.yml | 2 +- .github/workflows/unused.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index c077f72..9042772 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -36,7 +36,7 @@ jobs: extensions: intl, json, mbstring, xml coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 3b1265e..302e3ae 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -31,7 +31,7 @@ jobs: extensions: json, tokenizer coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 6bdd00f..55c2bd9 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -40,7 +40,7 @@ jobs: extensions: intl, json, mbstring, xml coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c875e33..cd165a5 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -39,7 +39,7 @@ jobs: extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3 coverage: xdebug env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 5e6ccf6..aabe1f2 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -36,7 +36,7 @@ jobs: extensions: intl, json, mbstring, xml coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index e102b9f..d8bd7b0 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -40,7 +40,7 @@ jobs: extensions: intl, json, mbstring, xml coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index b83ccb9..0506531 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -34,7 +34,7 @@ jobs: extensions: intl, json, mbstring, xml coverage: none env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get composer cache directory id: composer-cache From 0b0ae36623f0aca48ef047bc8db83dd1259624d8 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Thu, 2 Feb 2023 18:56:19 +0330 Subject: [PATCH 2/4] chore: fix psalm error --- psalm-baseline.xml | 8 ++++++++ psalm.xml | 1 + 2 files changed, 9 insertions(+) create mode 100644 psalm-baseline.xml diff --git a/psalm-baseline.xml b/psalm-baseline.xml new file mode 100644 index 0000000..dc57fc2 --- /dev/null +++ b/psalm-baseline.xml @@ -0,0 +1,8 @@ + + + + + $query->get() + + + \ No newline at end of file diff --git a/psalm.xml b/psalm.xml index 386f4dc..34d358b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -7,6 +7,7 @@ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" autoloader="psalm_autoload.php" cacheDirectory="build/psalm/" + errorBaseline="psalm-baseline.xml" > From 1eba240de864164f9ab223d66bb37dfba7498333 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Thu, 2 Feb 2023 19:12:32 +0330 Subject: [PATCH 3/4] update: psalm_autoload.php file and new line fix --- psalm_autoload.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/psalm_autoload.php b/psalm_autoload.php index d9b911f..046a273 100644 --- a/psalm_autoload.php +++ b/psalm_autoload.php @@ -23,3 +23,5 @@ require_once $filePath; } } + +chdir(__DIR__); From 1afdf4e136326c7c7f9db2094e1a309885b3c96b Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Thu, 2 Feb 2023 19:27:21 +0330 Subject: [PATCH 4/4] fix new line --- psalm-baseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index dc57fc2..d5494fe 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -5,4 +5,4 @@ $query->get() - \ No newline at end of file +