Skip to content

Fix CI configuration and update Psalm for development #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 13, 2021
Merged

Fix CI configuration and update Psalm for development #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4e2742
composer require --dev vimeo/psalm:^4.6
zonuexe Mar 13, 2021
0ce240e
psalm --update-baseline
zonuexe Mar 13, 2021
5d44c08
Add type for return value of preg_split()
zonuexe Mar 13, 2021
381866f
Apply changes in composer.json to GitHub Actions cache
zonuexe Mar 13, 2021
bc7fa7c
Revert "Add type for return value of preg_split()"
zonuexe Mar 13, 2021
0f54308
Follows actions/cache best practice
zonuexe Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ jobs:
- name: Validate composer.json and composer.lock
run: composer validate

- name: Cache Composer packages
Copy link
Contributor

@staabm staabm Mar 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should just use https://github.com/ramsey/composer-install - this would simplify your action and you don't need to work with this ugly github/action cache key things

Copy link
Contributor Author

@zonuexe zonuexe Mar 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That point is correct, but adding dependency on non-official action requires trust in the action developer. Leave the decision to the administrator of this package.

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache Composer packages
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
${{ runner.os }}-composer-

- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/psalm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Cache Composer packages
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache Composer packages
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
${{ runner.os }}-composer-

- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
},
"require-dev": {
"vimeo/psalm": "^4.3",
"vimeo/psalm": "^4.6",
"squizlabs/php_codesniffer": "^3.5",
"phpunit/phpunit": "^9.5"
}
Expand Down
3 changes: 1 addition & 2 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,9 +704,8 @@
</MixedOperand>
</file>
<file src="src/Schema/TableDefinition.php">
<MixedPropertyTypeCoercion occurrences="2">
<MixedPropertyTypeCoercion occurrences="1">
<code>$autoIncrementOffsets</code>
<code>$columns</code>
</MixedPropertyTypeCoercion>
</file>
</files>