From e0be02c492d57ebe6fb8c0af421e0670676a8b20 Mon Sep 17 00:00:00 2001
From: bdolor <brad@bradpayne.ca>
Date: Thu, 20 Dec 2018 12:18:10 -0800
Subject: [PATCH] apply coding standards

---
 admin/views/admin-settings.php                |  10 +-
 admin/views/api-search.php                    |  40 +++----
 admin/views/download-textbooks.php            |   7 +-
 autoloader.php                                |  37 +++---
 composer.json                                 |   2 +-
 composer.lock                                 |  24 ++--
 .../namespace.php}                            |   0
 phpcs.ruleset.xml                             |   2 +
 pressbooks-textbook.php                       |   2 +-
 .../tinymce-spellcheck/includes/atd-l10n.php  |  42 +++----
 .../includes/config-options.php               | 112 ++++++++++--------
 .../includes/config-unignore.php              |   4 +-
 .../tinymce-spellcheck/includes/proxy.php     |  20 ++--
 .../tinymce-spellcheck/tinymce-spellcheck.php |  26 ++--
 themes-book/opentextbook/functions.php        |   2 +-
 .../opentextbook/inc/tab-functions.php        |  24 ++--
 themes-book/opentextbook/tabs-content.php     |   4 +-
 17 files changed, 189 insertions(+), 169 deletions(-)
 rename inc/{pbt-settings.php => settings/namespace.php} (100%)

diff --git a/admin/views/admin-settings.php b/admin/views/admin-settings.php
index e6163ba..e461bf8 100644
--- a/admin/views/admin-settings.php
+++ b/admin/views/admin-settings.php
@@ -18,17 +18,15 @@
 	get_settings_errors();
 
 	// message about functionality being tied to theme
-	if ( false == \PBT\Textbook::isTextbookTheme() ) {
+	if ( false === \PBT\Textbook::isTextbookTheme() ) {
 		echo "<div class='updated'><p>To access many features of this plugin, first <a href='themes.php'>activate one of our themes</a>, such as the Open Textbook theme.</p></div>";
 	}
 	?>
-	<?php $active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'remix'; ?>
+	<?php $active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'remix'; //@codingStandardsIgnoreLine ?>
 
 	<div id="icon-options-general" class="icon32"></div>
 	<h2 class="nav-tab-wrapper">
-		<a href="?page=pressbooks-textbook-settings&tab=remix"
-		   class="nav-tab <?php echo $active_tab == 'remix' ? 'nav-tab-active' : ''; ?>">Search
-			and Import</a>
+		<a href="?page=pressbooks-textbook-settings&tab=remix" class="nav-tab <?php echo $active_tab === 'remix' ? 'nav-tab-active' : ''; ?>">Search and Import</a>
 	</h2>
 	<!-- Create the form that will be used to modify display options -->
 	<form method="post" action="options.php" name="pbt_settings">
@@ -53,7 +51,7 @@ class="nav-tab <?php echo $active_tab == 'remix' ? 'nav-tab-active' : ''; ?>">Se
 				break;
 
 		}
-		if ( ! in_array( $active_tab, [ 'revise' ] ) ) {
+		if ( ! in_array( $active_tab, [ 'revise' ], true ) ) {
 			submit_button();
 		}
 		?>
diff --git a/admin/views/api-search.php b/admin/views/api-search.php
index b265f87..a1f7344 100644
--- a/admin/views/api-search.php
+++ b/admin/views/api-search.php
@@ -20,11 +20,11 @@
 	<h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
 
 	<?php
-	$pbt_import_url = wp_nonce_url( get_bloginfo( 'url' ) . '/wp-admin/options-general.php?page=api_search_import&import=1', 'pbt-import' );
-	$pbt_revoke_url = wp_nonce_url( get_bloginfo( 'url' ) . '/wp-admin/options-general.php?page=api_search_import&revoke=1', 'pbt-revoke-import' );
+	$pbt_import_url     = wp_nonce_url( get_bloginfo( 'url' ) . '/wp-admin/options-general.php?page=api_search_import&import=1', 'pbt-import' );
+	$pbt_revoke_url     = wp_nonce_url( get_bloginfo( 'url' ) . '/wp-admin/options-general.php?page=api_search_import&revoke=1', 'pbt-revoke-import' );
 	$pbt_current_import = get_option( 'pbt_current_import' );
-	$not_found = get_option( 'pbt_terms_not_found' );
-	$remix = get_option( 'pbt_remix_settings' );
+	$not_found          = get_option( 'pbt_terms_not_found' );
+	$remix              = get_option( 'pbt_remix_settings' );
 
 	// IMPORT show only if there is an import in progress
 	if ( is_array( $pbt_current_import ) ) {
@@ -87,10 +87,10 @@ function () {
 
 					foreach ( $pbt_current_import as $book_id => $book ) {
 						// set book title, author, license
-						$book_title = $book['title'];
+						$book_title   = $book['title'];
 						$book_license = $book['license'];
-						$book_author = $book['author'];
-						$book_domain = $book['domain'];
+						$book_author  = $book['author'];
+						$book_domain  = $book['domain'];
 
 						// do chapters
 						if ( isset( $book['chapters'] ) ) {
@@ -109,8 +109,8 @@ function () {
 								<?php
 								if ( $i % 2 ) {
 									echo 'class="alt"';}
-?>
- >
+								?>
+								>
 
 									<td><input type='checkbox' id='selective_import_<?php echo $i; ?>' name='chapters[<?php echo $key; ?>][import]' value='1'></td>
 							<input type='hidden' name='chapters[<?php echo $key; ?>][book]' value='<?php echo $book_id; ?>'>
@@ -125,34 +125,32 @@ function () {
 							<td><input type='radio' name='chapters[<?php echo $key; ?>][type]' value='chapter' checked='checked'></td>
 							<td><input type='radio' name='chapters[<?php echo $key; ?>][type]' value='back-matter'></td>
 							</tr>
-							<?php
-							++ $i;
+								<?php
+								++ $i;
 							}
 							// do books
 						} else {
-						?>
+							?>
 								<tr 
 								<?php
 								if ( $i % 2 ) {
 									echo 'class="alt"';}
-?>
- >
-							
-								<td><input type="radio" id="selective_import_<?php echo $i; ?>" name="book" value="<?php echo $book_id ; ?>" /></td>
+								?>
+								>
+								<td><input type="radio" id="selective_import_<?php echo $i; ?>" name="book" value="<?php echo $book_id; ?>" /></td>
 								<input type='hidden' name='domain' value='<?php echo $book_domain; ?>'>
 								<td><label>-----</label></td>
-								<td><label for="selective_import_<?php echo $i ; ?>"><?php echo $book_title . ', by ' . $book_author ; ?></label>
+								<td><label for="selective_import_<?php echo $i; ?>"><?php echo $book_title . ', by ' . $book_author; ?></label>
 								<td><label><?php echo $book_license; ?></label></td>
 								<td><label>-----</label></td>
 								<td><label>-----</label></td>
 								<td><label>-----</label></td>
 								</tr>
-						
 							<?php
 							$i++;
 						}
 					}
-				?>
+					?>
 				</tbody>
 			</table>
 
@@ -161,7 +159,7 @@ function () {
 			submit_button( __( 'Start', 'pressbooks-textbook' ), 'primary', 'submit', false );
 			echo ' &nbsp; '; // Space
 			submit_button( __( 'Cancel', 'pressbooks-textbook' ), 'delete', 'abort_button', false );
-				?>
+			?>
 				</p>
 
 		</form>
@@ -169,7 +167,7 @@ function () {
 		<?php
 	} else {
 
-		if ( false != $not_found ) {
+		if ( false !== $not_found ) {
 			?>
 
 			<div class="error">
diff --git a/admin/views/download-textbooks.php b/admin/views/download-textbooks.php
index 4bb1c4b..d98fbb1 100644
--- a/admin/views/download-textbooks.php
+++ b/admin/views/download-textbooks.php
@@ -16,7 +16,6 @@
 
 <div class="wrap">
 	<h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
-	
 	<?php
 	require( PBT_PLUGIN_DIR . 'inc/modules/catalogue/class-equellafetch.php' );
 	require( PBT_PLUGIN_DIR . 'inc/modules/catalogue/class-filter.php' );
@@ -31,9 +30,9 @@
 		echo $textbooks;
 	} else {
 		try {
-			$equellaFetch = new \PBT\Modules\Catalogue\EquellaFetch();
-			$filter = new \PBT\Modules\Catalogue\Filter( $equellaFetch );
-			$textbooks = $filter->displayBySubject();
+			$equella_fetch = new \PBT\Modules\Catalogue\EquellaFetch();
+			$filter        = new \PBT\Modules\Catalogue\Filter( $equella_fetch );
+			$textbooks     = $filter->displayBySubject();
 
 		} catch ( Exception $exc ) {
 			echo $exc->getMessage();
diff --git a/autoloader.php b/autoloader.php
index 01a560f..8c50623 100644
--- a/autoloader.php
+++ b/autoloader.php
@@ -11,35 +11,36 @@
 \spl_autoload_register(
 	function ( $class ) {
 
-			// project-specific namespace prefix
-			$prefix = 'PBT';
+		// project-specific namespace prefix
+		$prefix = 'PBT';
 
-			// base directory for the namespace prefix
-			$base_dir = __DIR__ . '/inc';
+		// base directory for the namespace prefix
+		$base_dir = __DIR__ . '/inc';
 
-			// does the class use the namespace prefix?
-			$len = \strlen( $prefix );
+		// does the class use the namespace prefix?
+		$len = \strlen( $prefix );
 
 		if ( \strncmp( $prefix, $class, $len ) !== 0 ) {
-			  // no, move to the next registered autoloader
-			  return;
+			// no, move to the next registered autoloader
+			return;
 		}
 
-			// get the relative class name
-			$relative_class = \substr( $class, $len );
+		// get the relative class name
+		$relative_class = \substr( $class, $len );
+		$last_ns_pos    = strripos( $relative_class, '\\' );
 
-		if ( false !== ( $last_ns_pos = strripos( $relative_class, '\\' ) ) ) {
-			  $namespace = substr( $relative_class, 0, $last_ns_pos );
-			  $class     = substr( $relative_class, $last_ns_pos + 1 );
-			  $file      = str_replace( '\\', DIRECTORY_SEPARATOR, $namespace ) . DIRECTORY_SEPARATOR;
+		if ( false !== $last_ns_pos ) {
+			$namespace = substr( $relative_class, 0, $last_ns_pos );
+			$class     = substr( $relative_class, $last_ns_pos + 1 );
+			$file      = str_replace( '\\', DIRECTORY_SEPARATOR, $namespace ) . DIRECTORY_SEPARATOR;
 		}
-			$file .= 'class-' . str_replace( '_', '-', $class ) . '.php';
+		$file .= 'class-' . str_replace( '_', '-', $class ) . '.php';
 
-			$path = $base_dir . strtolower( $file );
+		$path = $base_dir . strtolower( $file );
 
-			// if the file exists, require it
+		// if the file exists, require it
 		if ( \file_exists( $path ) ) {
-			  require $path;
+			require $path;
 		}
 	}
 );
diff --git a/composer.json b/composer.json
index f2dbaa7..c45f004 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
       "@standards"
     ],
     "standards": [
-      "vendor/bin/phpcs --standard=phpcs.ruleset.xml *.php inc/"
+      "vendor/bin/phpcs --standard=phpcs.ruleset.xml ."
     ]
   }
 }
diff --git a/composer.lock b/composer.lock
index 0e085a7..3e85663 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "81d6621ec351f88a8252d8a831116096",
+    "content-hash": "997ff79e746f776bd0338e1f31b74bf9",
     "packages": [],
     "packages-dev": [
         {
@@ -1305,16 +1305,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.3.2",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e"
+                "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e",
-                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
+                "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
                 "shasum": ""
             },
             "require": {
@@ -1352,7 +1352,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2018-09-23T23:08:17+00:00"
+            "time": "2018-12-19T23:57:18+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1414,16 +1414,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.18",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f"
+                "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
+                "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
                 "shasum": ""
             },
             "require": {
@@ -1469,7 +1469,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2018-11-11T19:48:54+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/inc/pbt-settings.php b/inc/settings/namespace.php
similarity index 100%
rename from inc/pbt-settings.php
rename to inc/settings/namespace.php
diff --git a/phpcs.ruleset.xml b/phpcs.ruleset.xml
index 8cf35ba..8226ed1 100644
--- a/phpcs.ruleset.xml
+++ b/phpcs.ruleset.xml
@@ -38,5 +38,7 @@
     </rule>
 
     <exclude-pattern>/vendor/*</exclude-pattern>
+    <exclude-pattern>/tests/*</exclude-pattern>
+    <exclude-pattern>/symbionts/*</exclude-pattern>
 
 </ruleset>
diff --git a/pressbooks-textbook.php b/pressbooks-textbook.php
index fde9e1c..062e353 100644
--- a/pressbooks-textbook.php
+++ b/pressbooks-textbook.php
@@ -133,7 +133,7 @@ function pb_compatibility() {
 |
 |
 */
-require PBT_PLUGIN_DIR . 'inc/pbt-settings.php';
+require PBT_PLUGIN_DIR . 'inc/settings/namespace.php';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/symbionts/tinymce-spellcheck/includes/atd-l10n.php b/symbionts/tinymce-spellcheck/includes/atd-l10n.php
index 5841bbf..3b5fe44 100644
--- a/symbionts/tinymce-spellcheck/includes/atd-l10n.php
+++ b/symbionts/tinymce-spellcheck/includes/atd-l10n.php
@@ -8,33 +8,35 @@ function TSpell_init_l10n_js() {
 	}
 
 	// load localized strings for AtD
-	wp_localize_script( 'TSpell_settings', 'TSpell_l10n_r0ar', array(
-		'menu_title_spelling'         => __( 'Spelling', 'tinymce-spellcheck' ),
-		'menu_title_repeated_word'    => __( 'Repeated Word', 'tinymce-spellcheck' ),
+	wp_localize_script(
+		'TSpell_settings', 'TSpell_l10n_r0ar', [
+			'menu_title_spelling'         => __( 'Spelling', 'tinymce-spellcheck' ),
+			'menu_title_repeated_word'    => __( 'Repeated Word', 'tinymce-spellcheck' ),
 
-		'menu_title_no_suggestions'   => __( 'No suggestions', 'tinymce-spellcheck' ),
+			'menu_title_no_suggestions'   => __( 'No suggestions', 'tinymce-spellcheck' ),
 
-		'menu_option_explain'         => __( 'Explain...', 'tinymce-spellcheck' ),
-		'menu_option_ignore_once'     => __( 'Ignore suggestion', 'tinymce-spellcheck' ),
-		'menu_option_ignore_always'   => __( 'Ignore always', 'tinymce-spellcheck' ),
-		'menu_option_ignore_all'      => __( 'Ignore all', 'tinymce-spellcheck' ),
+			'menu_option_explain'         => __( 'Explain...', 'tinymce-spellcheck' ),
+			'menu_option_ignore_once'     => __( 'Ignore suggestion', 'tinymce-spellcheck' ),
+			'menu_option_ignore_always'   => __( 'Ignore always', 'tinymce-spellcheck' ),
+			'menu_option_ignore_all'      => __( 'Ignore all', 'tinymce-spellcheck' ),
 
-		'menu_option_edit_selection'  => __( 'Edit Selection...', 'tinymce-spellcheck' ),
+			'menu_option_edit_selection'  => __( 'Edit Selection...', 'tinymce-spellcheck' ),
 
-		'button_proofread'            => __( 'proofread', 'tinymce-spellcheck' ),
-		'button_edit_text'            => __( 'edit text', 'tinymce-spellcheck' ),
-		'button_proofread_tooltip'    => __( 'Proofread Writing', 'tinymce-spellcheck' ),
+			'button_proofread'            => __( 'proofread', 'tinymce-spellcheck' ),
+			'button_edit_text'            => __( 'edit text', 'tinymce-spellcheck' ),
+			'button_proofread_tooltip'    => __( 'Proofread Writing', 'tinymce-spellcheck' ),
 
-		'message_no_errors_found'     => __( 'No writing errors were found.', 'tinymce-spellcheck' ),
-		'message_server_error'        => __( 'There was a problem communicating with the Proofreading service. Try again in one minute.', 'tinymce-spellcheck' ),
-		'message_server_error_short'  => __( 'There was an error communicating with the proofreading service.', 'tinymce-spellcheck' ),
+			'message_no_errors_found'     => __( 'No writing errors were found.', 'tinymce-spellcheck' ),
+			'message_server_error'        => __( 'There was a problem communicating with the Proofreading service. Try again in one minute.', 'tinymce-spellcheck' ),
+			'message_server_error_short'  => __( 'There was an error communicating with the proofreading service.', 'tinymce-spellcheck' ),
 
-		'dialog_replace_selection'    => __( 'Replace selection with:', 'tinymce-spellcheck' ),
-		'dialog_confirm_post_publish' => __( "The proofreader has suggestions for this post. Are you sure you want to publish it?\n\nPress OK to publish your post, or Cancel to view the suggestions and edit your post.", 'tinymce-spellcheck' ),
-		'dialog_confirm_post_update'  => __( "The proofreader has suggestions for this post. Are you sure you want to update it?\n\nPress OK to update your post, or Cancel to view the suggestions and edit your post.", 'tinymce-spellcheck' ),
-	) );
+			'dialog_replace_selection'    => __( 'Replace selection with:', 'tinymce-spellcheck' ),
+			'dialog_confirm_post_publish' => __( "The proofreader has suggestions for this post. Are you sure you want to publish it?\n\nPress OK to publish your post, or Cancel to view the suggestions and edit your post.", 'tinymce-spellcheck' ),
+			'dialog_confirm_post_update'  => __( "The proofreader has suggestions for this post. Are you sure you want to update it?\n\nPress OK to update your post, or Cancel to view the suggestions and edit your post.", 'tinymce-spellcheck' ),
+		]
+	);
 
-	wp_enqueue_script( 'TSpell_l10n', plugins_url( '/js/install_atd_l10n.js', dirname( __FILE__ ) ), array( 'TSpell_settings', 'jquery' ), TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_l10n', plugins_url( '/js/install_atd_l10n.js', dirname( __FILE__ ) ), [ 'TSpell_settings', 'jquery' ], TSPELL_VERSION );
 }
 
 add_action( 'admin_print_scripts', 'TSpell_init_l10n_js' );
diff --git a/symbionts/tinymce-spellcheck/includes/config-options.php b/symbionts/tinymce-spellcheck/includes/config-options.php
index 469f184..2ddde57 100644
--- a/symbionts/tinymce-spellcheck/includes/config-options.php
+++ b/symbionts/tinymce-spellcheck/includes/config-options.php
@@ -8,10 +8,10 @@
  */
 function TSpell_print_option( $name, $value, $options ) {
 	// Attribute-safe version of $name
-	$attr_name = sanitize_title($name); // Using sanitize_title since there's no comparable function for attributes
-?>
-   <input type="checkbox" id="atd_<?php echo ($attr_name) ?>" name="<?php echo $options['name'] ?>[<?php echo $name; ?>]" value="1" <?php checked( '1', isset( $options[$name] ) ? $options[$name] : false ); ?>> <label for="atd_<?php echo $attr_name ?>"><?php echo $value; ?></label>
-<?php
+	$attr_name = sanitize_title( $name ); // Using sanitize_title since there's no comparable function for attributes
+	?>
+   <input type="checkbox" id="atd_<?php echo ( $attr_name ) ?>" name="<?php echo $options['name'] ?>[<?php echo $name; ?>]" value="1" <?php checked( '1', isset( $options[ $name ] ) ? $options[ $name ] : false ); ?>> <label for="atd_<?php echo $attr_name ?>"><?php echo $value; ?></label>
+	<?php
 }
 
 /*
@@ -21,8 +21,9 @@ function TSpell_process_options_update() {
 
 	$user = wp_get_current_user();
 
-	if ( ! $user || $user->ID == 0 )
+	if ( ! $user || $user->ID == 0 ) {
 		return;
+	}
 
 	TSpell_update_options( $user->ID, 'TSpell_options' );
 	TSpell_update_options( $user->ID, 'TSpell_check_when' );
@@ -36,66 +37,79 @@ function TSpell_display_options_form() {
 
 	// grab our user and validate their existence
 	$user = wp_get_current_user();
-	if ( ! $user || $user->ID == 0 )
+	if ( ! $user || $user->ID == 0 ) {
 		return;
+	}
 
 	$options_show_types = TSpell_get_options( $user->ID, 'TSpell_options' );
 	$options_check_when = TSpell_get_options( $user->ID, 'TSpell_check_when' );
 	$options_guess_lang = TSpell_get_options( $user->ID, 'TSpell_guess_lang' );
-?>
+	?>
    <table class="form-table">
-      <tr valign="top">
-         <th scope="row"> <a id="atd"></a> <?php _e( 'Proofreading', 'tinymce-spellcheck' ); ?></th>
+	  <tr valign="top">
+		 <th scope="row"> <a id="atd"></a> <?php _e( 'Proofreading', 'tinymce-spellcheck' ); ?></th>
 		 <td>
    <p><?php _e( 'Automatically proofread content when:', 'tinymce-spellcheck' ); ?>
 
-   <p><?php
-		TSpell_print_option( 'onpublish', __('a post or page is first published', 'tinymce-spellcheck'), $options_check_when );
+   <p>
+	<?php
+		TSpell_print_option( 'onpublish', __( 'a post or page is first published', 'tinymce-spellcheck' ), $options_check_when );
 		echo '<br />';
-		TSpell_print_option( 'onupdate', __('a post or page is updated', 'tinymce-spellcheck'), $options_check_when );
-   ?></p>
+		TSpell_print_option( 'onupdate', __( 'a post or page is updated', 'tinymce-spellcheck' ), $options_check_when );
+	?>
+   </p>
 
-   <p style="font-weight: bold"><?php _e('English Options', 'tinymce-spellcheck'); ?></font>
+   <p style="font-weight: bold"><?php _e( 'English Options', 'tinymce-spellcheck' ); ?></font>
 
-   <p><?php _e('Enable proofreading for the following grammar and style rules when writing posts and pages:', 'tinymce-spellcheck'); ?></p>
+   <p><?php _e( 'Enable proofreading for the following grammar and style rules when writing posts and pages:', 'tinymce-spellcheck' ); ?></p>
 
-   <p><?php
-		TSpell_print_option( 'Bias Language', __('Bias Language', 'tinymce-spellcheck'), $options_show_types );
+   <p>
+	<?php
+		TSpell_print_option( 'Bias Language', __( 'Bias Language', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Cliches', __('Clich&eacute;s', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Cliches', __( 'Clich&eacute;s', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Complex Expression', __('Complex Phrases', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Complex Expression', __( 'Complex Phrases', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Diacritical Marks', __('Diacritical Marks', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Diacritical Marks', __( 'Diacritical Marks', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Double Negative', __('Double Negatives', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Double Negative', __( 'Double Negatives', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Hidden Verbs', __('Hidden Verbs', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Hidden Verbs', __( 'Hidden Verbs', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Jargon Language', __('Jargon', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Jargon Language', __( 'Jargon', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Passive voice', __('Passive Voice', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Passive voice', __( 'Passive Voice', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Phrases to Avoid', __('Phrases to Avoid', 'tinymce-spellcheck'), $options_show_types );
+		TSpell_print_option( 'Phrases to Avoid', __( 'Phrases to Avoid', 'tinymce-spellcheck' ), $options_show_types );
 		echo '<br />';
-		TSpell_print_option( 'Redundant Expression', __('Redundant Phrases', 'tinymce-spellcheck'), $options_show_types );
-   ?></p>
-   <p><?php printf( __( '<a href="%s">Learn more</a> about these options.', 'tinymce-spellcheck' ), 'http://support.wordpress.com/proofreading/' );
-?></p>
+		TSpell_print_option( 'Redundant Expression', __( 'Redundant Phrases', 'tinymce-spellcheck' ), $options_show_types );
+	?>
+   </p>
+   <p>
+	<?php
+	printf( __( '<a href="%s">Learn more</a> about these options.', 'tinymce-spellcheck' ), 'http://support.wordpress.com/proofreading/' );
+	?>
+	</p>
 
    <p style="font-weight: bold"><?php _e( 'Language', 'tinymce-spellcheck' ); ?></font>
-
-   <p><?php printf(
-	_x( 'The proofreader supports English, French, German, Portuguese, and Spanish. Your <a href="%1$s">%2$s</a> value is the default proofreading language.', '%1$s = http://codex.wordpress.org/Installing_WordPress_in_Your_Language, %2$s = WPLANG', 'tinymce-spellcheck' ),
-	'http://codex.wordpress.org/Installing_WordPress_in_Your_Language',
-	'WPLANG'
-   ); ?></p>
-
-   <p><?php
-	TSpell_print_option( 'true', __('Use automatically detected language to proofread posts and pages', 'tinymce-spellcheck' ), $options_guess_lang );
-   ?></p>
-
-<?php
+   <p>
+	<?php
+	printf(
+		_x( 'The proofreader supports English, French, German, Portuguese, and Spanish. Your <a href="%1$s">%2$s</a> value is the default proofreading language.', '%1$s = http://codex.wordpress.org/Installing_WordPress_in_Your_Language, %2$s = WPLANG', 'tinymce-spellcheck' ),
+		'http://codex.wordpress.org/Installing_WordPress_in_Your_Language',
+		'WPLANG'
+	);
+	?>
+   </p>
+
+   <p>
+	<?php
+	TSpell_print_option( 'true', __( 'Use automatically detected language to proofread posts and pages', 'tinymce-spellcheck' ), $options_guess_lang );
+	?>
+   </p>
+
+	<?php
 }
 
 /*
@@ -104,12 +118,14 @@ function TSpell_display_options_form() {
 function TSpell_get_options( $user_id, $name ) {
 	$options_raw = TSpell_get_setting( $user_id, $name, 'single' );
 
-	$options = array();
+	$options         = [];
 	$options['name'] = $name;
 
-	if ( $options_raw )
-		foreach ( explode( ',', $options_raw ) as $option )
+	if ( $options_raw ) {
+		foreach ( explode( ',', $options_raw ) as $option ) {
 			$options[ $option ] = 1;
+		}
+	}
 
 	return $options;
 }
@@ -119,11 +135,11 @@ function TSpell_get_options( $user_id, $name ) {
  */
 function TSpell_update_options( $user_id, $name ) {
 	// We should probably run $_POST[name] through an esc_*() function...
-	if ( isset( $_POST[$name] ) && is_array( $_POST[$name] ) ) {
-		$copy = array_map( 'strip_tags', array_keys( $_POST[$name] ) );
-		TSpell_update_setting( $user_id, TSpell_sanitize( $name ), implode( ',', $copy )  );
+	if ( isset( $_POST[ $name ] ) && is_array( $_POST[ $name ] ) ) {
+		$copy = array_map( 'strip_tags', array_keys( $_POST[ $name ] ) );
+		TSpell_update_setting( $user_id, TSpell_sanitize( $name ), implode( ',', $copy ) );
 	} else {
-		TSpell_update_setting( $user_id, TSpell_sanitize( $name ), '');
+		TSpell_update_setting( $user_id, TSpell_sanitize( $name ), '' );
 	}
 
 	return;
diff --git a/symbionts/tinymce-spellcheck/includes/config-unignore.php b/symbionts/tinymce-spellcheck/includes/config-unignore.php
index 1066639..e396a74 100644
--- a/symbionts/tinymce-spellcheck/includes/config-unignore.php
+++ b/symbionts/tinymce-spellcheck/includes/config-unignore.php
@@ -67,7 +67,7 @@ function TSpell_display_unignore_form() {
 	}
 
 	$ignores = TSpell_get_setting( $user->ID, 'TSpell_ignored_phrases' );
-?>
+	?>
 <script>
 function atd_show_phrases( ignored )
 {
@@ -151,5 +151,5 @@ function atd_ignore_init() {
 	  </tr>
    </table>
 
-<?php
+	<?php
 }
diff --git a/symbionts/tinymce-spellcheck/includes/proxy.php b/symbionts/tinymce-spellcheck/includes/proxy.php
index 08c726f..f8cb041 100644
--- a/symbionts/tinymce-spellcheck/includes/proxy.php
+++ b/symbionts/tinymce-spellcheck/includes/proxy.php
@@ -8,31 +8,31 @@
  * Based on a function from Akismet
  */
 function TSpell_http_post( $request, $host, $path, $port = 80 ) {
-	$http_args = array(
+	$http_args  = [
 		'body'                 => $request,
-		'headers'              => array(
+		'headers'              => [
 			'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' ),
 			'Host'         => $host,
 			'User-Agent'   => 'AtD/0.1',
-		),
+		],
 		'httpversion'          => '1.0',
 		'timeout'              => apply_filters( 'atd_http_post_timeout', 15 ),
-	);
+	];
 	$TSpell_url = "http://{$host}{$path}";
-	$response = wp_remote_post( $TSpell_url, $http_args );
-	$code = (int) wp_remote_retrieve_response_code( $response );
+	$response   = wp_remote_post( $TSpell_url, $http_args );
+	$code       = (int) wp_remote_retrieve_response_code( $response );
 
 	if ( is_wp_error( $response ) ) {
 		do_action( 'atd_http_post_error', 'http-error' );
-		return array();
+		return [];
 	} elseif ( 200 != $code ) {
 		do_action( 'atd_http_post_error', $code );
 	}
 
-	return array(
+	return [
 		wp_remote_retrieve_headers( $response ),
 		wp_remote_retrieve_body( $response ),
-	);
+	];
 }
 
 /*
@@ -57,7 +57,7 @@ function TSpell_redirect_call() {
 			$service = 'fr.service.afterthedeadline.com';
 		}
 	}
-	$user = wp_get_current_user();
+	$user  = wp_get_current_user();
 	$guess = strcmp( TSpell_get_setting( $user->ID, 'TSpell_guess_lang' ), 'true' ) == 0 ? 'true' : 'false';
 
 	$data = TSpell_http_post( $postText . "&guess=$guess", defined( 'ATD_HOST' ) ? ATD_HOST : $service, $url, defined( 'ATD_PORT' ) ? ATD_PORT : 80 );
diff --git a/symbionts/tinymce-spellcheck/tinymce-spellcheck.php b/symbionts/tinymce-spellcheck/tinymce-spellcheck.php
index 5637c70..46fa695 100644
--- a/symbionts/tinymce-spellcheck/tinymce-spellcheck.php
+++ b/symbionts/tinymce-spellcheck/tinymce-spellcheck.php
@@ -132,10 +132,10 @@ function TSpell_change_mce_settings( $init_array ) {
 	$init_array['atd_rpc_url']        = admin_url( 'admin-ajax.php?action=proxy_atd&_wpnonce=' . wp_create_nonce( 'proxy_atd' ) . '&url=' );
 	$init_array['atd_ignore_rpc_url'] = admin_url( 'admin-ajax.php?action=atd_ignore&_wpnonce=' . wp_create_nonce( 'tspell_ignore' ) . '&phrase=' );
 	$init_array['atd_rpc_id']         = 'WPORG-' . md5( get_bloginfo( 'wpurl' ) );
-	$init_array['atd_theme']          = 'wordpress';
+	$init_array['atd_theme']          = 'WordPress';
 	$init_array['atd_ignore_enable']  = 'true';
 	$init_array['atd_strip_on_get']   = 'true';
-	$init_array['atd_ignore_strings'] = json_encode( explode( ',',  TSpell_get_setting( $user->ID, 'TSpell_ignored_phrases' ) ) );
+	$init_array['atd_ignore_strings'] = json_encode( explode( ',', TSpell_get_setting( $user->ID, 'TSpell_ignored_phrases' ) ) );
 	$init_array['atd_show_types']     = TSpell_get_setting( $user->ID, 'TSpell_options' );
 	$init_array['gecko_spellcheck']   = 'false';
 
@@ -181,11 +181,11 @@ function TSpell_load_javascripts() {
 		return;
 	}
 
-	wp_enqueue_script( 'TSpell_core', plugins_url( '/js/atd.core.js', __FILE__ ), array(), TSPELL_VERSION );
-	wp_enqueue_script( 'TSpell_quicktags', plugins_url( '/js/atd-nonvis-editor-plugin.js', __FILE__ ), array( 'quicktags' ), TSPELL_VERSION );
-	wp_enqueue_script( 'TSpell_jquery', plugins_url( '/js/jquery.atd.js', __FILE__ ), array( 'jquery' ), TSPELL_VERSION );
-	wp_enqueue_script( 'TSpell_settings', admin_url() . 'admin-ajax.php?action=atd_settings', array( 'TSpell_jquery' ), TSPELL_VERSION );
-	wp_enqueue_script( 'TSpell_autoproofread', plugins_url( '/js/atd-autoproofread.js', __FILE__ ), array( 'TSpell_jquery' ), TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_core', plugins_url( '/js/atd.core.js', __FILE__ ), [], TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_quicktags', plugins_url( '/js/atd-nonvis-editor-plugin.js', __FILE__ ), [ 'quicktags' ], TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_jquery', plugins_url( '/js/jquery.atd.js', __FILE__ ), [ 'jquery' ], TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_settings', admin_url() . 'admin-ajax.php?action=atd_settings', [ 'TSpell_jquery' ], TSPELL_VERSION );
+	wp_enqueue_script( 'TSpell_autoproofread', plugins_url( '/js/atd-autoproofread.js', __FILE__ ), [ 'TSpell_jquery' ], TSPELL_VERSION );
 }
 
 /* Spits out user options for auto-proofreading on publish/update */
@@ -201,7 +201,7 @@ function TSpell_load_submit_check_javascripts() {
 		$atd_check_when = TSpell_get_setting( $user->ID, 'TSpell_check_when' );
 
 		if ( ! empty( $atd_check_when ) ) {
-			$check_when = array();
+			$check_when = [];
 			/* Set up the options in json */
 			foreach ( explode( ',', $atd_check_when ) as $option ) {
 				$check_when[ $option ] = true;
@@ -239,7 +239,7 @@ function TSpell_load_css() {
 function TSpell_should_load_on_page() {
 	global $pagenow, $current_screen;
 
-	$pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'admin.php', 'profile.php' );
+	$pages = [ 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'admin.php', 'profile.php' ];
 
 	if ( in_array( $pagenow, $pages ) ) {
 		if ( isset( $current_screen->post_type ) && $current_screen->post_type ) {
@@ -254,7 +254,11 @@ function TSpell_should_load_on_page() {
 // add button to DFW
 add_filter( 'wp_fullscreen_buttons', 'TSpell_fullscreen' );
 function TSpell_fullscreen( $buttons ) {
-	$buttons['spellchecker'] = array( 'title' => __( 'Proofread Writing', 'tinymce-spellcheck' ), 'onclick' => "tinyMCE.execCommand('mceWritingImprovementTool');", 'both' => false );
+	$buttons['spellchecker'] = [
+		'title' => __( 'Proofread Writing', 'tinymce-spellcheck' ),
+		'onclick' => "tinyMCE.execCommand('mceWritingImprovementTool');",
+		'both' => false,
+	];
 	return $buttons;
 }
 
@@ -280,5 +284,5 @@ function TSpell_fullscreen( $buttons ) {
 // Load i18n
 add_action( 'plugins_loaded', 'TSpell_languages' );
 function TSpell_languages() {
-	load_plugin_textdomain( 'tinymce-spellcheck', false , dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+	load_plugin_textdomain( 'tinymce-spellcheck', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 }
diff --git a/themes-book/opentextbook/functions.php b/themes-book/opentextbook/functions.php
index ae80cdf..8377f4e 100644
--- a/themes-book/opentextbook/functions.php
+++ b/themes-book/opentextbook/functions.php
@@ -151,7 +151,7 @@ function pbt_fix_img_relative( $content ) {
 	static $searches = [
 		'#<(?:img) .*?src=[\'"]\Khttp://[^\'"]+#i',
 	];
-	$content = preg_replace_callback( $searches, 'pbt_fix_img_relative_callback', $content );
+	$content         = preg_replace_callback( $searches, 'pbt_fix_img_relative_callback', $content );
 
 	return $content;
 }
diff --git a/themes-book/opentextbook/inc/tab-functions.php b/themes-book/opentextbook/inc/tab-functions.php
index 6bb5f11..6eae5e1 100644
--- a/themes-book/opentextbook/inc/tab-functions.php
+++ b/themes-book/opentextbook/inc/tab-functions.php
@@ -20,7 +20,7 @@ function pbt_enqueue_scripts() {
 
 	// scripts only required if on a single page and user has configured theme options
 	if ( is_single() && ! empty( pbt_get_web_options_tab() ) ) {
-		wp_enqueue_script( 'pb-tabs', get_stylesheet_directory_uri() . '/assets/js/tabs.js', array( 'jquery' ), null, false );
+		wp_enqueue_script( 'pb-tabs', get_stylesheet_directory_uri() . '/assets/js/tabs.js', [ 'jquery' ], null, false );
 		wp_enqueue_script( 'jquery-ui-tabs' );
 		wp_enqueue_style( 'revisions', ABSPATH . '/wp-admin/css/revisions.css' );
 	}
@@ -44,11 +44,11 @@ function pbt_enqueue_scripts() {
  */
 function pbt_tab_revision_history( $post ) {
 	$html    = '';
-	$args    = array(
+	$args    = [
 		'order'         => 'DESC',
 		'orderby'       => 'date ID',
 		'check_enabled' => false,
-	);
+	];
 	$enabled = wp_revisions_enabled( $post );
 	$limit   = 3;
 	$i       = 0;
@@ -94,7 +94,7 @@ function pbt_tab_revision_history( $post ) {
 
 		if ( ! empty( $diff ) ) {
 			$human_readable_date = date( 'M j, Y', strtotime( $revision->post_date_gmt ) );
-			$html                .= "<b>{$human_readable_date}</b>{$diff}";
+			$html               .= "<b>{$human_readable_date}</b>{$diff}";
 		}
 
 		$i ++;
@@ -114,7 +114,7 @@ function pbt_tab_revision_history( $post ) {
 function pbt_tab_book_info() {
 	$html      = '';
 	$book_meta = \Pressbooks\Book::getBookInformation();
-	$expected  = array(
+	$expected  = [
 		'pb_title',
 		'pb_authors',
 		'pb_contributors',
@@ -128,16 +128,16 @@ function pbt_tab_book_info() {
 		'pb_book_licence',
 		'pb_keywords_tags',
 		'pb_bisac_subject',
-	);
-	$html      .= '<dl class="dl-horizontal">';
+	];
+	$html     .= '<dl class="dl-horizontal">';
 	foreach ( $book_meta as $key => $val ) {
 		// skip stuff we don't want
 		if ( ! in_array( $key, $expected ) ) {
 			continue;
 		}
 		$title = pbt_explode_on_underscores( $key, 'first' );
-		$html  .= "<dt>{$title}</dt>";
-		$html  .= "<dd>{$val}</dd>";
+		$html .= "<dt>{$title}</dt>";
+		$html .= "<dd>{$val}</dd>";
 	}
 	$html .= '</dl>';
 
@@ -202,12 +202,12 @@ function pbt_tabbed_content_callback() {
 	if ( ! isset( $options['tab_book_info'] ) ) {
 		$options['tab_book_info'] = 0;
 	}
-	if ( ! isset( $options['tab_attributions'] ) ||  ! class_exists( 'Candela\Citation' ) ) {
+	if ( ! isset( $options['tab_attributions'] ) || ! class_exists( 'Candela\Citation' ) ) {
 		$options['tab_attributions'] = 0;
 	}
 
 	// revision history
-	$html = '<input type="checkbox" id="tab_revision_history" name="pressbooks_theme_options_web[tab_revision_history]" value="1" ' . checked( 1, $options['tab_revision_history'], false ) . '/>';
+	$html  = '<input type="checkbox" id="tab_revision_history" name="pressbooks_theme_options_web[tab_revision_history]" value="1" ' . checked( 1, $options['tab_revision_history'], false ) . '/>';
 	$html .= '<label for="tab_revision_history"> ' . __( 'Display revision history for each chapter with everyone.', 'opentextbooks' ) . '</label><br/>';
 
 	// book info
@@ -275,7 +275,7 @@ function pbt_get_web_options_tab() {
 	$web_option_keys = array_keys( $options );
 	$prefix          = 'tab_';
 	$length          = strlen( $prefix );
-	$tabs            = array();
+	$tabs            = [];
 
 	// compare first four characters and check tab option is true
 	foreach ( $web_option_keys as $key ) {
diff --git a/themes-book/opentextbook/tabs-content.php b/themes-book/opentextbook/tabs-content.php
index 2ca81e4..d82e188 100644
--- a/themes-book/opentextbook/tabs-content.php
+++ b/themes-book/opentextbook/tabs-content.php
@@ -11,8 +11,8 @@
 	$panels = '';
 
 	foreach ( $tabs as $key => $tab ) {
-		$title  = pbt_explode_on_underscores( $key, 'first' );
-		$method = 'pbt_' . $key;
+		$title   = pbt_explode_on_underscores( $key, 'first' );
+		$method  = 'pbt_' . $key;
 		$labels .= "<li><a href='#tabs-{$i}'>{$title} <span class='dashicons'></span></a></li>";
 		$panels .= "<div id='tabs-{$i}'>";
 		$panels .= $method( $post );