Skip to content

Commit

Permalink
Merge pull request #94 from jrchamp/fix/wpcs-v3-method-complexity
Browse files Browse the repository at this point in the history
wpcs: align with WPCS v3.0
  • Loading branch information
jrchamp authored Aug 25, 2023
2 parents 012fdcc + ed5802b commit 76ab250
Show file tree
Hide file tree
Showing 7 changed files with 810 additions and 747 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wp-plugin-ci-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:

- name: Run PHPCS on all files
run: |
vendor/bin/phpcs -q -n --ignore=vendor --runtime-set installed_paths vendor/wp-coding-standards/wpcs --standard=WordPress --report=checkstyle $GITHUB_WORKSPACE | cs2pr
vendor/bin/phpcs -q -n --ignore=vendor --standard=WordPress --report=checkstyle $GITHUB_WORKSPACE | cs2pr
2 changes: 1 addition & 1 deletion .github/workflows/wp-plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
run: |
touch $GITHUB_WORKSPACE/tmp.php
export CHANGED_FILES=$(git diff --name-only --diff-filter=AM remotes/origin/${{ github.base_ref }} | tr '\n' ' ')
vendor/bin/phpcs -q -n --ignore=vendor --runtime-set installed_paths vendor/wp-coding-standards/wpcs --standard=WordPress --report=checkstyle $GITHUB_WORKSPACE/tmp.php $(echo $CHANGED_FILES) | cs2pr
vendor/bin/phpcs -q -n --ignore=vendor --standard=WordPress --report=checkstyle $GITHUB_WORKSPACE/tmp.php $(echo $CHANGED_FILES) | cs2pr
2 changes: 1 addition & 1 deletion assets/js/shibboleth_login_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

jQuery( document ).ready(
function( $ ) {
function ( $ ) {
var body = $( 'body' ),
userLogin = $( '#user_login' ),
ssoWrap = $( '#shibboleth-wrap' ),
Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@
"require": {},
"require-dev" : {
"wp-coding-standards/wpcs": "@stable"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
1,539 changes: 797 additions & 742 deletions options-admin.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion options-user.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function shibboleth_disable_managed_fields() {
$selectors = join(
',',
array_map(
function( $a ) {
function ( $a ) {
return "#$a";
},
$managed_fields
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Contributors: michaelryanmcneill, willnorris, mitchoyoshitaka, jrchamp, dericcrago, bshelton229, Alhrath, dandalpiaz
Tags: shibboleth, authentication, login, saml
Requires at least: 4.0
Tested up to: 6.2
Tested up to: 6.3
Requires PHP: 5.6
Stable tag: 2.4.2

Expand Down Expand Up @@ -197,6 +197,9 @@ This update brings with it a major change to the way Shibboleth attributes are a
This update brings with it a major change to the way Shibboleth attributes are accessed. For most users, no additional configuration will be necessary. If you are using a specialized server configuration, such as a Shibboleth Service Provider on a reverse proxy or a server configuration that results in environment variables being sent with the prefix REDIRECT_, you should see the changelog for additional details: https://wordpress.org/plugins/shibboleth/#developers

== Changelog ==
= version 2.4.3 (not yet released) =
- CI: Update GitHub Action workflows and code for WordPress coding standard v3 [#94](https://github.com/michaelryanmcneill/shibboleth/pull/94)

= version 2.4.2 (2023-04-07) =
- Documentation: Updated Shibboleth documentation external links [#92](https://github.com/michaelryanmcneill/shibboleth/pull/92)
- Accessibility: Improve labels and heading structure on admin pages [#92](https://github.com/michaelryanmcneill/shibboleth/pull/92)
Expand Down

0 comments on commit 76ab250

Please sign in to comment.