Merge branch 'develop'

.github/workflows/lint.yml

@@ -0,0 +1,52 @@
+name: Linting
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+  push:
+    branches:
+      - master
+      - develop
+jobs:
+  stylelint:
+    name: stylelint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: stylelint
+        uses: reviewdog/action-stylelint@v1
+        with:
+          reporter: github-pr-review
+          stylelint_input: '**/*.css'
+          stylelint_config: 'stylelint.config.js'
+          fail_on_error: true
+  eslint:
+    name: eslint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+      - name: eslint
+        uses: reviewdog/action-eslint@v1
+        with:
+          reporter: github-pr-review
+          fail_on_error: true
+  phpcs:
+    name: phpcs
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.3'
+        coverage: none
+        tools: composer:v2
+    - name: composer install
+      run: composer install
+    - name: PHPCS check
+      run: ./vendor/bin/phpcs .

.nvmrc

@@ -0,0 +1 @@
+16

10up-experience.php

@@ -3,7 +3,7 @@
  * Plugin Name:       10up Experience
  * Plugin URI:        https://github.com/10up/10up-experience
  * Description:       The 10up Experience plugin configures WordPress to better protect and inform clients, aligned to 10up’s best practices.
- * Version:           1.10.1
+ * Version:           1.10.2
  * Author:            10up
  * Author URI:        https://10up.com
  * License:           GPLv2 or later
@@ -17,9 +17,9 @@
 
 namespace TenUpExperience;
 
-use Puc_v4_Factory;
+use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
 
-define( 'TENUP_EXPERIENCE_VERSION', '1.10.1' );
+define( 'TENUP_EXPERIENCE_VERSION', '1.10.2' );
 define( 'TENUP_EXPERIENCE_DIR', __DIR__ );
 define( 'TENUP_EXPERIENCE_FILE', __FILE__ );
 
@@ -49,7 +49,7 @@ function( $class_name ) {
 	}
 );
 
-$tenup_plugin_updater = Puc_v4_Factory::buildUpdateChecker(
+$tenup_plugin_updater = PucFactory::buildUpdateChecker(
 	'https://github.com/10up/10up-experience/',
 	__FILE__,
 	'10up-experience'
@@ -59,16 +59,6 @@ function( $class_name ) {
 	$tenup_plugin_updater->setAuthentication( TENUP_EXPERIENCE_GITHUB_KEY );
 }
 
-$tenup_plugin_updater->addResultFilter(
-	function( $plugin_info, $http_response = null ) {
-		$plugin_info->icons = array(
-			'svg' => plugins_url( '/assets/img/tenup.svg', __FILE__ ),
-		);
-
-		return $plugin_info;
-	}
-);
-
 // Define a constant if we're network activated to allow plugin to respond accordingly.
 $network_activated = Utils\is_network_activated( plugin_basename( __FILE__ ) );
 

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
+## [1.10.2] - 2023-07-11
+
+* Remove WP Acceptance
+* Upgrade build process to 10up Toolkit
+* Upgrade Plugin Update Checker
+* Allow SSO to be turned off in the admin
+
 ## [1.10.1] - 2022-09-13
 ### Fixed
 * Fix bug allowing admin username user to authenticate

README.md

@@ -6,7 +6,7 @@
 
 ## Requirements
 
-* PHP 5.4+
+* PHP 7.2+
 * [WordPress](http://wordpress.org) 4.7+
 
 ## Installation
@@ -95,9 +95,9 @@ There are 2 filters available here:
 
 ### SSO
 
-10up Experience includes 10up SSO functionality. There are some useful constants related to this functionality:
+10up Experience includes 10up SSO functionality. This feature can be enabled or disabled in `Settings > General`. It is enabled by default. There are some useful constants related to this functionality:
 
-- `TENUPSSO_DISABLE` - Define this as `true` to disable SSO.
+- `TENUPSSO_DISABLE` - Define this as `true` to force disable SSO.
 - `TENUPSSO_DISALLOW_ALL_DIRECT_LOGIN` - Define this as `true` to disable username/password log ins completely.
 
 ### Activity Log

assets/js/notices.js

@@ -1,6 +1,7 @@
-import { tenupWelcome, ajaxurl } from 'window'; /* eslint-disable-line import/no-unresolved */
 import jQuery from 'jquery'; /* eslint-disable-line import/no-unresolved */
 
+const { tenupWelcome, ajaxurl } = window;
+
 const dismiss = document.querySelector('.notice-10up-experience-welcome');
 
 if (dismiss) {

assets/js/passwords.js

@@ -1,4 +1,4 @@
-import { tenupPasswords } from 'window'; /* eslint-disable-line import/no-unresolved */
+const { tenupPasswords } = window;
 
 const passwordWrapper = document.querySelectorAll('#your-profile .wp-pwd, #resetpassform .wp-pwd');
 

composer.json

@@ -8,7 +8,9 @@
     "10up"
   ],
   "homepage": "https://github.com/10up/10up-experience",
-  "license": ["GPL-2.0-or-later"],
+  "license": [
+    "GPL-2.0-or-later"
+  ],
   "authors": [
     {
       "name": "10up",
@@ -25,16 +27,15 @@
     "source": "https://github.com/10up/10up-experience"
   },
   "require": {
-    "yahnis-elsts/plugin-update-checker": "4.13",
+    "yahnis-elsts/plugin-update-checker": "5.1",
     "bjeavons/zxcvbn-php": "^1.0"
   },
   "require-dev": {
     "10up/phpcs-composer": "dev-master",
-    "10up/wpacceptance": "dev-master",
     "squizlabs/php_codesniffer": "3.*"
   },
   "scripts": {
     "lint": "phpcs .",
     "lint-fix": "phpcbf ."
   }
-}
+}