Skip to content
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

Remove zend dependencies + GitHub CI #41

Merged
merged 4 commits into from
Sep 25, 2022
Merged

Remove zend dependencies + GitHub CI #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e3a69
Removed unused zendframework/zend-authentication and zendframework/ze…
UndefinedOffset Sep 22, 2022
5bc35e6
Added github ci
UndefinedOffset Sep 22, 2022
95c244d
Fixed PHPCS config
UndefinedOffset Sep 22, 2022
3d2a488
Bump onelogin/php-saml dependency
UndefinedOffset Sep 23, 2022
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
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: CI

on:
push:
pull_request:
workflow_dispatch:
# Every Thursday at 11:30am UTC
schedule:
- cron: '30 11 * * 4'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
31 changes: 0 additions & 31 deletions .travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SilverStripe SAML module

[![Build Status](https://travis-ci.org/silverstripe/silverstripe-saml.svg)](https://travis-ci.org/silverstripe/silverstripe-saml)
[![Build Status](https://github.com/silverstripe/silverstripe-saml/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-saml/actions/workflows/ci.yml)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-saml/badges/quality-score.png)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-saml/)
[![codecov](https://codecov.io/gh/silverstripe/silverstripe-saml/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-saml)

Expand Down
8 changes: 3 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
}
],
"require": {
"php": ">=5.6",
"php": ">=7.4",
"silverstripe/framework": "^4@dev",
"silverstripe/cms": "^4@dev",
"zendframework/zend-authentication": "^2.5.1",
"zendframework/zend-session": "^2.5.1",
"onelogin/php-saml": "^3.0.0"
"onelogin/php-saml": "^4.1.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0"
},
"extra": {
Expand Down
12 changes: 9 additions & 3 deletions phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
<ruleset name="SilverStripe">
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>

<!-- base rules are PSR-12 -->
<rule ref="PSR12" >
<file>src</file>
<file>tests</file>

<!-- base rules are PSR-2 -->
<rule ref="PSR2">
<!-- Current exclusions -->
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
<exclude name="PSR1.Methods.CamelCapsMethodName" />
<exclude name="PSR2.Classes.PropertyDeclaration" />
<exclude name="Generic.Files.LineLength.TooLong" />
</rule>
</ruleset>

2 changes: 1 addition & 1 deletion src/Services/SAMLConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SAMLConfiguration
* @var bool Decide if GUID should be exposed as an attribute mappable using `GUID` as the claim. This is a feature
* that is found in other SAML libraries but in an ideal world should not be utilised in favour of the IdP offering
* the nameid data as another "more stable" attribute.
*
*
* Note that this data will be effected by:
* - The expect_binary_nameid configuration value
* - The extension point `updateGuid` on SAMLController
Expand Down