Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #22 from kronostechnologies/dev/QCTECH-250
Browse files Browse the repository at this point in the history
QCTECH-250 & QCTECH-259: run checks according to compliance doc
  • Loading branch information
meriouma committed Jan 19, 2023
2 parents 5380776 + 99da458 commit 32fc0a4
Show file tree
Hide file tree
Showing 7 changed files with 4,310 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"github>kronostechnologies/standards:renovate-base"
],

reviewers: ["team:crm"],
reviewers: ["team:connect"],
rebaseWhen: "conflicted",

php: {
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/php-security.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
name: PHP Security

on:
pull_request: {}
push:
branches:
- master
tags:
- v*.*.*

jobs:
psalm-taint-analysis:
php-security:
uses: equisoft-actions/php-workflows/.github/workflows/php-security.yml@v3
with:
publish-reports: true
php-version: '7.4'
php-version: '8.1'
extensions: pcov
secrets:
GPR_KEY: ${{ secrets.GPR_KEY }}
11 changes: 1 addition & 10 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@ jobs:
php-library:
uses: equisoft-actions/php-workflows/.github/workflows/php-library.yml@v3
with:
checks: phpunit,psalm
php-version: '7.4'
extensions: pcov
secrets:
GPR_KEY: ${{ secrets.GPR_KEY }}

php-library-8-1:
uses: equisoft-actions/php-workflows/.github/workflows/php-library.yml@v3
with:
checks: phpunit,psalm,qodana
checks: phpcs,phpunit,psalm,qodana
php-version: '8.1'
extensions: pcov
secrets:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
composer.lock
vendor/
.idea/
.phpunit.result.cache
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@
}
],
"require": {
"php" : "^7.4 || ^8.1"
"php": "^8.1"
},
"require-dev": {
"vimeo/psalm": "4.27.0",
"phpunit/phpunit": "9.5.25",
"cyclonedx/cyclonedx-php-composer": "3.10.2"
"cyclonedx/cyclonedx-php-composer": "3.10.2",
"squizlabs/php_codesniffer": "3.7.1",
"dealerdirect/phpcodesniffer-composer-installer": "1.0.0",
"kronostechnologies/php-coding-standard": "2.0.0"
},
"repositories": [
{"type": "git", "url": "https://github.com/kronostechnologies/rrule"}
{ "type": "git", "url": "https://github.com/kronostechnologies/rrule" }
],
"autoload": {
"psr-4": {
Expand All @@ -31,12 +34,10 @@
}
},
"config": {
"platform": {
"php": "7.4"
},
"allow-plugins": {
"composer/package-versions-deprecated": true,
"cyclonedx/cyclonedx-php-composer": true
"cyclonedx/cyclonedx-php-composer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}

0 comments on commit 32fc0a4

Please sign in to comment.