Skip to content

Commit

Permalink
Merge pull request #91 from mimmi20/updates
Browse files Browse the repository at this point in the history
update pipeline
  • Loading branch information
mimmi20 committed Mar 5, 2024
2 parents 219a4dc + faf5903 commit cd69aa4
Show file tree
Hide file tree
Showing 5 changed files with 161 additions and 94 deletions.
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.{js,ts,cjs,cts,mjs,mts,json,json5,yml}]
[*.{js,ts,cjs,cts,mjs,mts,json,json5,yaml,yml}]
indent_size = 2

[composer.json]
indent_size = 4

[*.md]
indent_size = 2
trim_trailing_whitespace = false
65 changes: 56 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,47 +1,89 @@
# file-version: 2.0
# Declare files that will always have LF line endings on checkout.

# file-version: 3.0

# text files
* text=auto
*.markdown text eol=lf
*.md text eol=lf

# Javascript & Typescript
*.js text eol=lf
*.ts text eol=lf
*.cjs text eol=lf
*.cts text eol=lf
*.mjs text eol=lf
*.mts text eol=lf

# CSS & SCSS
*.css text eol=lf
*.scss text eol=lf

# Json
*.json text eol=lf
*.json5 text eol=lf
*.lock text eol=lf
*.html text eol=lf
*.php text eol=lf

# Markdown
*.markdown text eol=lf
*.md text eol=lf

# Yaml
*.yml text eol=lf
*.yaml text eol=lf

# other
*.xml text eol=lf
*.dist text eol=lf
*.lock text eol=lf
*.txt text eol=lf
*.ini text eol=lf
*.sh text eol=lf
*.stub text eol=lf
*.tmp text eol=lf
*.dist text eol=lf
*.lock text eol=lf
*.html text eol=lf
*.phtml text eol=lf
*.php text eol=lf

# binary files
# Denote all files that are truly binary and should not be modified.
*.gpg -text binary
*.gpg~ -text binary
*.asc -text binary
*.png -text binary
*.jpg -text binary
*.gif -text binary
*.pdf -text binary
*.ico -text binary
*.odt -text binary
*.eot -text binary
*.ttf -text binary
*.woff -text binary
*.woff2 -text binary
*.swf -text binary
*.mp4 -text binary
*.ogv -text binary
*.webm -text binary
*.exe -text binary
*.zip -text binary

# files/folders to ignore
/.* export-ignore
.github/CODEOWNERS export-ignore text eol=lf
.browserslistrc export-ignore text eol=lf
.codeclimate.yml export-ignore text eol=lf
.editorconfig export-ignore text eol=lf
.eslintignore export-ignore text eol=lf
.eslintrc.json export-ignore text eol=lf
.gitattributes export-ignore text eol=lf
.gitignore export-ignore text eol=lf
.jshintrc export-ignore text eol=lf
.markdown-link-check.json export-ignore text eol=lf
.markdownlint.yaml export-ignore text eol=lf
.mega-linter.yml export-ignore text eol=lf
.noai export-ignore text eol=lf
.npmrc export-ignore text eol=lf
.php-cs-fixer.php export-ignore text eol=lf
.phplint.yml export-ignore text eol=lf
.prettierignore export-ignore text eol=lf
.prettierrc.json export-ignore text eol=lf
.stylelintrc.json export-ignore text eol=lf
.yamllint.yml export-ignore text eol=lf
codecov.yml export-ignore text eol=lf
infection.json export-ignore text eol=lf
Expand All @@ -51,8 +93,13 @@ phpmd.ruleset.xml export-ignore text eol=lf
phpstan.neon export-ignore text eol=lf
phpunit.xml export-ignore text eol=lf
phpunit-integration.xml export-ignore text eol=lf
postcss.config.cjs export-ignore text eol=lf
postcss.config.json export-ignore text eol=lf
psalm.xml export-ignore text eol=lf
rector.php export-ignore text eol=lf
tsconfig.json export-ignore text eol=lf
tsconfig.node.json export-ignore text eol=lf
vite.config.ts export-ignore text eol=lf
/cache export-ignore
/examples export-ignore
/resources export-ignore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
cleanup:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
steps:
- name: "Checkout"
uses: "actions/checkout@v4"
Expand Down
27 changes: 25 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:

matrix:
operating-system:
- "ubuntu-20.04"
- "ubuntu-22.04"

php-version:
- "8.1"
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

matrix:
operating-system:
- "ubuntu-20.04"
- "ubuntu-22.04"

php-version:
- "8.1"
Expand Down Expand Up @@ -192,6 +192,29 @@ jobs:
coverageLocations: ".build/coverage/clover.xml:clover"
debug: false

- name: "Upload coverage to Coveralls"
uses: "coverallsapp/github-action@v2"
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
flag-name: "php ${{ matrix.php-version }} on ${{ matrix.operating-system }}"
parallel: true
file: ".build/coverage/clover.xml"
format: "clover"
debug: false

finish-code-coverage:
runs-on: "ubuntu-22.04"

needs: "code-coverage"

if: always()

steps:
- name: "Coveralls Finished"
uses: "coverallsapp/github-action@v2"
with:
parallel-finished: true

# This is a meta job to avoid to have to constantly change the protection rules
# whenever we touch the matrix.
tests-status:
Expand Down
156 changes: 78 additions & 78 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
{
"name": "mimmi20/navigation-helper-acceptpage",
"description": "Provides a accept-page helper for Laminas- and Mezzio Navigation",
"license": "MIT",
"type": "library",
"authors": [
{
"name": "Thomas Müller",
"homepage": "https://github.com/mimmi20",
"role": "Developer"
}
],
"homepage": "https://github.com/mimmi20/navigation-helper-acceptpage",
"support": {
"issues": "https://github.com/mimmi20/navigation-helper-acceptpage/issues",
"source": "https://github.com/mimmi20/navigation-helper-acceptpage"
},
"require": {
"php": "^8.1.0"
},
"require-dev": {
"ext-ctype": "*",
"ext-dom": "*",
"ext-intl": "*",
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"infection/infection": "^0.27.10",
"laminas/laminas-modulemanager": "^2.15.0",
"laminas/laminas-navigation": "^2.19.1",
"laminas/laminas-permissions-acl": "^2.16.0",
"laminas/laminas-servicemanager": "^3.22.1",
"mimmi20/coding-standard": "^5.2.16",
"mimmi20/mezzio-generic-authorization": "^3.0.4",
"mimmi20/mezzio-navigation": "^3.0.4",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan": "^1.10.59",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^10.5.11",
"rector/rector": "^1.0.1"
},
"suggest": {
"ext-intl": "required to use the Translator",
"laminas/laminas-config": "to provide page configuration (optional, as arrays and Traversables are also allowed)",
"laminas/laminas-i18n": "Required to use the Translator",
"laminas/laminas-navigation": "Required to use with Laminas",
"laminas/laminas-permissions-acl": "Required to use authrization roles or privileges with Laminas",
"laminas/laminas-servicemanager": "Required to use the navigation factories",
"mimmi20/mezzio-generic-authorization": "Required to use authrization roles or privileges with Mezzio",
"mimmi20/mezzio-navigation": "Required to use with Mezzio"
},
"autoload": {
"psr-4": {
"Mimmi20\\NavigationHelper\\Accept\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Mimmi20Test\\NavigationHelper\\Accept\\": "tests/"
}
},
"config": {
"preferred-install": "dist",
"lock": false,
"sort-packages": true,
"allow-plugins": {
"laminas/laminas-dependency-plugin": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true,
"infection/extension-installer": true
}
},
"extra": {
"laminas": {
"component": "Mimmi20\\NavigationHelper\\Accept",
"config-provider": "Mimmi20\\NavigationHelper\\Accept\\ConfigProvider"
}
"name": "mimmi20/navigation-helper-acceptpage",
"description": "Provides a accept-page helper for Laminas- and Mezzio Navigation",
"license": "MIT",
"type": "library",
"authors": [
{
"name": "Thomas Müller",
"homepage": "https://github.com/mimmi20",
"role": "Developer"
}
],
"homepage": "https://github.com/mimmi20/navigation-helper-acceptpage",
"support": {
"issues": "https://github.com/mimmi20/navigation-helper-acceptpage/issues",
"source": "https://github.com/mimmi20/navigation-helper-acceptpage"
},
"require": {
"php": "^8.1.0"
},
"require-dev": {
"ext-ctype": "*",
"ext-dom": "*",
"ext-intl": "*",
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"infection/infection": "^0.27.10",
"laminas/laminas-modulemanager": "^2.15.0",
"laminas/laminas-navigation": "^2.19.1",
"laminas/laminas-permissions-acl": "^2.16.0",
"laminas/laminas-servicemanager": "^3.22.1",
"mimmi20/coding-standard": "^5.2.16",
"mimmi20/mezzio-generic-authorization": "^3.0.4",
"mimmi20/mezzio-navigation": "^3.0.4",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan": "^1.10.59",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^10.5.11",
"rector/rector": "^1.0.1"
},
"suggest": {
"ext-intl": "required to use the Translator",
"laminas/laminas-config": "to provide page configuration (optional, as arrays and Traversables are also allowed)",
"laminas/laminas-i18n": "Required to use the Translator",
"laminas/laminas-navigation": "Required to use with Laminas",
"laminas/laminas-permissions-acl": "Required to use authrization roles or privileges with Laminas",
"laminas/laminas-servicemanager": "Required to use the navigation factories",
"mimmi20/mezzio-generic-authorization": "Required to use authrization roles or privileges with Mezzio",
"mimmi20/mezzio-navigation": "Required to use with Mezzio"
},
"autoload": {
"psr-4": {
"Mimmi20\\NavigationHelper\\Accept\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Mimmi20Test\\NavigationHelper\\Accept\\": "tests/"
}
},
"config": {
"preferred-install": "dist",
"lock": false,
"sort-packages": true,
"allow-plugins": {
"laminas/laminas-dependency-plugin": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true,
"infection/extension-installer": true
}
},
"extra": {
"laminas": {
"component": "Mimmi20\\NavigationHelper\\Accept",
"config-provider": "Mimmi20\\NavigationHelper\\Accept\\ConfigProvider"
}
}
}

0 comments on commit cd69aa4

Please sign in to comment.