Skip to content

Commit 8205f8e

Browse files
authored
Merge pull request #1665 from simplesamlphp/feature/trigger-docs-build
Add job to trigger docs build
2 parents e756c02 + a71779d commit 8205f8e

75 files changed

Lines changed: 3568 additions & 3589 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Documentation
2+
3+
on:
4+
push:
5+
branches: [ master, release-* ]
6+
paths:
7+
- '**.md'
8+
pull_request:
9+
branches: [ master, release-* ]
10+
paths:
11+
- '**.md'
12+
13+
jobs:
14+
quality:
15+
name: Quality checks
16+
runs-on: [ubuntu-latest]
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
21+
- name: Lint markdown files
22+
uses: nosborn/github-action-markdown-cli@v3.1.0
23+
with:
24+
files: .
25+
ignore_path: .markdownlintignore
26+
27+
- name: Perform spell check
28+
uses: codespell-project/actions-codespell@master
29+
with:
30+
path: '**/*.md'
31+
check_filenames: true
32+
ignore_words_list: tekst
33+
34+
build:
35+
name: Build documentation
36+
needs: quality
37+
runs-on: [ubuntu-latest]
38+
39+
steps:
40+
- name: Run docs build if any of markdown-files have changed
41+
if: steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name != 'pull_request'
42+
uses: actions/github-script@v6
43+
with:
44+
# Token has to be generated on a user account that controls the docs-repository.
45+
# The _only_ scope to select is "Access public repositories", nothing more.
46+
github-token: ${{ secrets.PAT_TOKEN }}
47+
script: |
48+
await github.rest.actions.createWorkflowDispatch({
49+
owner: 'simplesamlphp',
50+
repo: 'docs',
51+
workflow_id: 'mk_docs.yml',
52+
ref: 'main'
53+
})

.github/workflows/php.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
git config --global core.autocrlf false
3838
git config --global core.eol lf
3939
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141

4242
- name: Get composer cache directory
4343
id: composer-cache
@@ -91,7 +91,7 @@ jobs:
9191
- name: Setup problem matchers for PHP
9292
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
9393

94-
- uses: actions/checkout@v2
94+
- uses: actions/checkout@v3
9595

9696
- name: Get composer cache directory
9797
id: composer-cache
@@ -132,7 +132,7 @@ jobs:
132132
- name: Setup problem matchers for PHP
133133
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
134134

135-
- uses: actions/checkout@v2
135+
- uses: actions/checkout@v3
136136

137137
- name: Get composer cache directory
138138
id: composer-cache
@@ -170,7 +170,7 @@ jobs:
170170
- name: Setup problem matchers for PHP
171171
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
172172

173-
- uses: actions/checkout@v2
173+
- uses: actions/checkout@v3
174174

175175
- name: Get composer cache directory
176176
id: composer-cache

.markdownlintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vendor/*

CONTRIBUTING.md

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# Contribution guidelines
2+
23
**SimpleSAMLphp welcomes all contributions**. It is impossible to make a product like this without the efforts of many people, so please don't be shy and share your help with us. Even the tiniest contribution can make a difference!
34

45
These guidelines briefly explain how to contribute to SimpleSAMLphp effectively and consistently, making sure to keep high quality standards and making it easier for you to contribute.
56

67
[TOC]
78

89
## Team members
10+
911
Currently, the core team members are:
1012

1113
* Jaime Pérez Crespo, *maintainer and main developer*, UNINETT <jaime.perez@uninett.no>
@@ -22,6 +24,7 @@ We have been lucky enough to have so many people help us through the years. Simp
2224
***Big thanks to you all!***
2325

2426
## First things first
27+
2528
Before embarking yourself in a contribution, please make sure you are familiar with the way SimpleSAMLphp is written, the way it works, and what is required or not.
2629

2730
* Make sure to read [the documentation](https://simplesamlphp.org/docs/stable/). If you use the search engine in the website, please verify that you are reading the latest stable version. If you want to make a change, check [the development branch of the documentation](https://simplesamlphp.org/docs/development/).
@@ -30,39 +33,45 @@ Before embarking yourself in a contribution, please make sure you are familiar w
3033
* If you think you have discovered a bug, please check the [issue tracker](https://github.com/simplesamlphp/simplesamlphp/issues) and the [pull requests](https://github.com/simplesamlphp/simplesamlphp/pulls) to verify it hasn't been reported already.
3134

3235
## Contributing code
36+
3337
New features are always welcome, provided they will be useful to someone apart from yourself. Please take a look at the [list of issues](https://github.com/simplesamlphp/simplesamlphp/issues) to see what people are asking for. Our [roadmap](https://simplesamlphp.org/releaseplan) might also be a good place to start if you do not know exactly how you can contribute.
3438

3539
When submitting a pull request, please make sure to account for:
3640

3741
### Coding standards
42+
3843
* Respect the coding standards. We try to comply with PHP's [PSR-12](http://www.php-fig.org/psr/psr-12/). Pay special attention to the rules below:
39-
* Lines should not be longer than 80 characters.
40-
* Use **4 spaces** instead of tabs.
41-
* Keep the keywords in **lowercase**, including `true`, `false` and `null`.
42-
* Make sure your classes work with *autoloading*.
43-
* Never include a trailing `?>` in your files.
44-
* The first line of every file must be `<?php`.
45-
* Use namespaces if you are adding new files.
44+
* Lines should not be longer than 80 characters.
45+
* Use **4 spaces** instead of tabs.
46+
* Keep the keywords in **lowercase**, including `true`, `false` and `null`.
47+
* Make sure your classes work with *autoloading*.
48+
* Never include a trailing `?>` in your files.
49+
* The first line of every file must be `<?php`.
50+
* Use namespaces if you are adding new files.
4651
* Do not include too many changes in every commit. Commits should be focused and address one single problem or feature. By having **multiple, small commits** instead of fewer large ones, it is easier to track what you are doing, revert changes in case of an error and help you make changes if needed.
4752
* Try to write clean **commit messages**, largely based on the [seven rules](http://chris.beams.io/posts/git-commit/):
48-
* Write a **short** subject line, followed by a blank line and a longer explanation.
49-
* Prefix the subject line with the component(s) changed, e.g. "docs: Update foo", or "SAML: Don't log bar twice", or "tests: Add tests for quux".
50-
* Explain **what and why** in the commit message, not just _how_. Things that seem obvious now might become quite confusing when rediscovered years later.
53+
* Write a **short** subject line, followed by a blank line and a longer explanation.
54+
* Prefix the subject line with the component(s) changed, e.g. "docs: Update foo", or "SAML: Don't log bar twice", or "tests: Add tests for quux".
55+
* Explain **what and why** in the commit message, not just **how**. Things that seem obvious now might become quite confusing when rediscovered years later.
5156

5257
### Comments, comparisons, and simplicity
58+
5359
* Add comments that describe why/how your code works.
5460
* Include complete **phpdoc** documentation for every property and method you add. If you change a method or property, make sure to update the existing *phpdoc* accordingly. Do not forget to document all parameters, returned values and exceptions thrown.
5561
* Use strict comparison operators like `===` and check for specific values when writing tests.
5662
* Avoid big functions, long nested loops or `if` statements.
5763
* Try to keep **backwards-compatibility**. Code that breaks current configurations and installations is difficult to deploy, and therefore we try to avoid that as much as possible.
5864

5965
### Unit tests
66+
6067
Add **unit tests** to verify that your code not only works but also keeps working over time. When adding tests, keep the same directory structure used for regular classes. Try to cover **all your code** with tests. The bigger the test coverage, the more reliable and better our library is. Read our [guidelines](TESTING.md) to learn more about tests.
6168

6269
### Documentation
70+
6371
In order to keep this library user-friendly, we ask that you add proper **documentation** explaining how to use your new feature or how your code changes things.
6472

6573
### Pull requests
74+
6675
Please follow all instructions below:
6776

6877
1. Submit your code as a **pull request** in github from a branch with a descriptive name in your own fork of the repository.
@@ -72,6 +81,7 @@ Please follow all instructions below:
7281
Sometimes it can take a long time before we are able to process your pull requests. Do not get discouraged, we will eventually reach your change. Remember that by following these guidelines, you are making it easier for us to analyze your request so the process will be smooth and fast. We really appreciate you helping us out, not only with your code, but also by following these guidelines.
7382

7483
## Reporting bugs
84+
7585
Before reporting a bug, please make sure it is indeed a bug. Check [the documentation](https://simplesamlphp.org/docs/stable/) to verify what the intended behaviour is. Review the [issue tracker](https://github.com/simplesamlphp/simplesamlphp/issues) and the [pull requests](https://github.com/simplesamlphp/simplesamlphp/pulls) to see if someone has already reported the same issue.
7686

7787
If you are able, a pull request is much more appreciated than just a new issue. If not, please do not hesitate to open one. It is better to have just an issue report than nothing!
@@ -86,6 +96,7 @@ You can help us diagnose and fix bugs by asking and providing answers to the fol
8696
* Is this a security issue? If so, how severe is it? How can an attacker exploit it? Read more about security issues in the next section.
8797

8898
## Reporting vulnerabilities
99+
89100
In case you find a vulnerability in SimpleSAMLphp, or you want to confirm a possible security issue in the software, please get in touch with us through [UNINETT's CERT team](https://www.uninett.no/cert). Please use our PGP public key to encrypt any possibly sensitive data that you may need to submit. We will get back to you as soon as possible according to our working hours in Central European Time.
90101

91102
When reporting a security issue, please add as much information as possible to help us identify, confirm, replicate and fix the problem. In particular, remember to include the following information in your report:
@@ -107,16 +118,19 @@ Finally, be reasonable. We'll do our best to resolve the issue according to our
107118
You can find the list of security advisories we have published [here](https://simplesamlphp.org/security).
108119

109120
## Translations
121+
110122
SimpleSAMLphp is translated to many languages, though it needs constant updates from translators, as well as new translations to other languages. For the moment, translations can be contributed as **pull requests**. We are looking at better ways to translate the software that would make your life easier, so stay tuned! You can also join the [translators mailing list](http://groups.google.com/group/simplesamlphp-translation) to keep up to date on the latest news.
111123

112124
Before starting a new translation, decide what style you want to use, whether you want to address the user in a polite manner or not, etc. Be coherent and keep that style through all your translations. If there is already a translation and you want to complete it, make sure to keep the same style used by your fellow translators.
113125

114-
## Documentation
126+
## Documentation improvements
127+
115128
Did you find a typo in the documentation? Does something make no sense? Did we use poor english? Tell us!
116129

117130
Documentation is included in our own repository in *markdown* format. You can submit pull requests with fixes. If you encounter some feature that is not documented, or the documentation does not reflect the real behaviour of the library, please do not hesitate to open an issue.
118131

119132
Good documentation is key to make things easier for our users!
120133

121134
## Community
135+
122136
You do not feel capable of contributing with your code, but are using SimpleSAMLphp and can share your knowledge and experience? Please, do so! Join our [users mailing list](http://groups.google.com/group/simplesamlphp) and help other users when you can. Your experience might be valuable for many!

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
SimpleSAMLphp
2-
=============
1+
# SimpleSAMLphp
2+
33
![Build Status](https://github.com/simplesamlphp/simplesamlphp/workflows/CI/badge.svg?branch=master)
44
[![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp)
55
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp/?branch=master)
66
[![Type coverage](https://shepherd.dev/github/simplesamlphp/simplesamlphp/coverage.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp)
77
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=LzlCL29sZEVDRXJpdGtxZUdITFA3YjYyUFBBYkVVZDVDcG1YZXRaN2pvTT0tLVhCNzkwVUNGVFVjVFVicUg0R1BNR0E9PQ==--f9efb6f330bd98dd6e3c7b816ac2f0982275a872)](https://automate.browserstack.com/public-build/LzlCL29sZEVDRXJpdGtxZUdITFA3YjYyUFBBYkVVZDVDcG1YZXRaN2pvTT0tLVhCNzkwVUNGVFVjVFVicUg0R1BNR0E9PQ==--f9efb6f330bd98dd6e3c7b816ac2f0982275a872)
88

9-
109
This is the official repository of the SimpleSAMLphp software.
1110

1211
* [SimpleSAMLphp homepage](https://simplesamlphp.org)

docs/index.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
SimpleSAMLphp Documentation
2-
===========================
1+
# SimpleSAMLphp Documentation
32

4-
* Installation and upgrading
3+
* Installation and upgrading
54
* [Installing SimpleSAMLphp](simplesamlphp-install)
65
* [Upgrade notes](simplesamlphp-upgrade-notes)
76
* [Installation from the repository](simplesamlphp-install-repo)
87
* [Changelog](simplesamlphp-changelog)
9-
* Using SimpleSAMLphp as a SAML Service Provider
8+
* Using SimpleSAMLphp as a SAML Service Provider
109
* [Service Provider Quickstart](simplesamlphp-sp)
1110
* [Hosted SP Configuration Reference](./saml:sp)
1211
* [IdP remote reference](simplesamlphp-reference-idp-remote)
1312
* [Configuring HTTP-Artifact](./simplesamlphp-artifact-sp)
1413
* [Using scoping](./simplesamlphp-scoping)
1514
* [Holder-of-Key profile](simplesamlphp-hok-sp)
16-
* Using SimpleSAMLphp as a SAML Identity Provider
15+
* Using SimpleSAMLphp as a SAML Identity Provider
1716
* [Identity Provider QuickStart](simplesamlphp-idp)
1817
* [IdP hosted reference](simplesamlphp-reference-idp-hosted)
1918
* [SP remote reference](simplesamlphp-reference-sp-remote)
2019
* [Use case: Setting up an IdP for Google Workspace (G Suite / Google Apps)](simplesamlphp-googleapps)
2120
* [Configuring HTTP-Artifact](./simplesamlphp-artifact-idp)
2221
* [Identity Provider Advanced Topics](simplesamlphp-idp-more)
2322
* [Holder-of-Key profile](simplesamlphp-hok-idp)
24-
* Further topics
23+
* Further topics
2524
* [Maintenance and configuration](simplesamlphp-maintenance) - covers session handling, php configuration etc.
2625
* [Automated Metadata Management](/docs/contrib_modules/metarefresh/simplesamlphp-automated_metadata)
2726
* [Key rollover](./saml:keyrollover)
2827
* [Authentication Processing Filters](simplesamlphp-authproc) - attribute filtering, attribute mapping, consent, group generation etc.
2928
* [State Information Lost](simplesamlphp-nostate) - more about this common error message
3029
* [Advanced features](simplesamlphp-advancedfeatures) - covers bridging protocols, attribute filtering, etc.
31-
* SimpleSAMLphp Modules
30+
* SimpleSAMLphp Modules
3231
* [Documentation for specific modules](/docs/contributed_modules.html)
3332
* [Theming SimpleSAMLphp](simplesamlphp-theming)
3433
* [Creating authentication sources](./simplesamlphp-authsource)

0 commit comments

Comments
 (0)