Skip to content

Commit

Permalink
phpstan: Streamline vendor file location with local dev-env
Browse files Browse the repository at this point in the history
- Remove superfluous dir and composer requires
  • Loading branch information
sukhwinder33445 committed Dec 1, 2023
1 parent aa31b37 commit 2aa4a21
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ jobs:

- name: Setup dependencies
run: |
composer require -n --no-progress overtrue/phplint phpunit/phpunit ipl/stdlib:@dev ipl/html:@dev
git clone --depth 1 https://github.com/Icinga/icingaweb2.git vendor/icingaweb2
git clone --depth 1 -b snapshot/nightly https://github.com/Icinga/icinga-php-thirdparty.git vendor/icinga-php-thirdparty
git clone --depth 1 https://github.com/Icinga/icingaweb2-module-cube.git vendor/cube
composer require -n --no-progress overtrue/phplint phpunit/phpunit phpstan/phpstan
sudo git clone --depth 1 https://github.com/Icinga/icingaweb2.git /icingaweb2
sudo git clone --depth 1 -b snapshot/nightly https://github.com/Icinga/icinga-php-thirdparty.git /usr/share/icinga-php/vendor
sudo git clone --depth 1 -b snapshot/nightly https://github.com/Icinga/icinga-php-library.git /usr/share/icinga-php/ipl
sudo git clone --depth 1 https://github.com/Icinga/icingaweb2-module-cube.git /usr/share/icingaweb2-modules/cube
- name: Setup Incubator
run: |
git clone --depth 1 https://github.com/Icinga/icingaweb2-module-incubator vendor/incubator
cd vendor/incubator
sudo git clone --depth 1 https://github.com/Icinga/icingaweb2-module-incubator /usr/share/icingaweb2-modules/incubator
cd /usr/share/icingaweb2-modules/incubator
composer require --no-update \
"gipfl/calendar": "dev-master as 99.x-dev" \
"gipfl/cli": "dev-master as 99.x-dev" \
Expand Down Expand Up @@ -82,7 +83,7 @@ jobs:

- name: PHPStan
if: ${{ ! cancelled() }}
uses: php-actions/phpstan@v3
run: ./vendor/bin/phpstan analyse

test:
name: Unit tests with php ${{ matrix.php }} on ${{ matrix.os }}
Expand Down
7 changes: 5 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ parameters:
- '#. but return statement is missing#'

scanDirectories:
- vendor
- library/Director/Test
- /icingaweb2
- /usr/share/icinga-php
- /usr/share/icingaweb2-modules/incubator
- /usr/share/icingaweb2-modules/cube

excludePaths:
- library/Director/CoreBeta

Expand Down

0 comments on commit 2aa4a21

Please sign in to comment.