composer update

Author: scarstens

lib/wordpress-phoenix/abstract-plugin-base/.circleci/codesniffer.ruleset.xml

@@ -4,6 +4,7 @@
     <exclude-pattern>tests/*</exclude-pattern>
     <exclude-pattern>vendor/*</exclude-pattern>
     <exclude-pattern>assets/*</exclude-pattern>
-    <rule ref="WordPress-VIP">
-    </rule>
+    <rule ref="WordPress-VIP"></rule>
+    <rule ref="WordPress-Core"></rule>
+    <rule ref="WordPress"></rule>
 </ruleset>

lib/wordpress-phoenix/abstract-plugin-base/CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 2.6.2
+* Codesniffer recommended changes
+
 #### 2.6.1
 * Hotfix namespace version to match minor version number update.
 * Added $wp_hook_pre for better action prefixes

lib/wordpress-phoenix/abstract-plugin-base/README.md

@@ -1,7 +1,7 @@
 # Abstract Plugin Base
 Used as a base class to help standardize the way we build WordPress plugins.
 
-CircleCI Build: [![CircleCI](https://circleci.com/gh/WordPress-Phoenix/wordpress-options-builder-class.svg?style=svg)](https://circleci.com/gh/WordPress-Phoenix/wordpress-options-builder-class)
+CircleCI Build: [![CircleCI](https://circleci.com/gh/WordPress-Phoenix/abstract-plugin-base.svg?style=svg)](https://circleci.com/gh/WordPress-Phoenix/abstract-plugin-base)
 
 # WordPress Options Builder Class Library
 

lib/wordpress-phoenix/abstract-plugin-base/src/abstract-plugin.php

@@ -4,7 +4,7 @@
  *
  * @author  Seth Carstens
  * @package abtract-plugin-base
- * @version 2.6.0
+ * @version 2.6.2
  * @license GPL 2.0 - please retain comments that express original build of this file by the author.
  */
 
@@ -122,7 +122,7 @@ abstract class Abstract_Plugin {
 	 *
 	 * @var array $plugin_data Array of meta data representing meta from main plugin file
 	 */
-	public $plugin_data = array();
+	public $plugin_data = [];
 
 	/**
 	 * If plugin_data is built, this represents the version number defined the the main plugin file meta
@@ -155,6 +155,7 @@ abstract class Abstract_Plugin {
 
 	/**
 	 * First thing setup by class with provided namespace for use as prefix in WordPress hooks & actions
+	 *
 	 * @var string
 	 */
 	public $wp_hook_pre = '';
@@ -165,31 +166,31 @@ abstract class Abstract_Plugin {
 	 */
 	public function __construct() {
 
-		// setup hook prefix used to create unique actions/filters unique to this plugin
+		// Setup hook prefix used to create unique actions/filters unique to this plugin.
 		$this->wp_hook_pre = trim( strtolower( str_ireplace( '\\', '_', get_called_class() ) ) ) . '_';
 
 		// Hook can be used by mu plugins to modify plugin behavior after plugin is setup.
 		do_action( $this->wp_hook_pre . '_preface', $this );
 
-		// configure and setup the plugin class variables.
+		// Configure and setup the plugin class variables.
 		$this->configure_defaults();
 
 		// Define globals used by the plugin including bloginfo.
 		$this->defines_and_globals();
 
 		// If enabled, register auto-loading to include any files in the $autoload_dir.
 		if ( ! empty( static::$autoload_type ) ) {
-			spl_autoload_register( array( $this, 'autoload' ) );
+			spl_autoload_register( [ $this, 'autoload' ] );
 		}
 
 		// Onload to do things during plugin construction.
 		$this->onload( $this );
 
 		// Most actions go into init which loads after WordPress core sets up all the defaults.
-		add_action( 'init', array( $this, 'init' ) );
+		add_action( 'init', [ $this, 'init' ] );
 
 		// Init for use with logged in users, see this::authenticated_init for more details.
-		add_action( 'init', array( $this, 'authenticated_init' ) );
+		add_action( 'init', [ $this, 'authenticated_init' ] );
 
 		// Hook can be used by mu plugins to modify plugin behavior after plugin is setup.
 		do_action( $this->wp_hook_pre . '_setup', $this );
@@ -227,7 +228,7 @@ public function autoload( $class ) {
 		$intersect            = array_intersect_assoc( $parent, $class_array );
 		$intersect_depth      = count( $intersect );
 		$autoload_match_depth = static::$autoload_ns_match_depth;
-		// Confirm $class is in same namespace as this autoloader
+		// Confirm $class is in same namespace as this autoloader.
 		if ( $intersect_depth >= $autoload_match_depth ) {
 			$file = $this->get_file_name_from_class( $class );
 			if ( 'classmap' === static::$autoload_type && is_array( $this->autoload_dir ) ) {
@@ -259,7 +260,7 @@ protected function configure_defaults() {
 
 		if ( file_exists( $this->plugin_file ) ) {
 			$this->installed_url = plugins_url( '/', $this->plugin_file );
-			// Ensure get_plugin_data is available
+			// Ensure get_plugin_data is available.
 			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 			$this->plugin_data = get_plugin_data( $this->plugin_file, $markup = true, $translate = true );
 			if ( is_array( $this->plugin_data ) && isset( $this->plugin_data['Version'] ) ) {
@@ -295,8 +296,8 @@ abstract protected function defines_and_globals();
 	/**
 	 * Dirname function that mimics PHP7 dirname() enhancements so that we can enable PHP5.6 support.
 	 *
-	 * @param     $path
-	 * @param int $count
+	 * @param string $path Path to this specific plugins directory.
+	 * @param int    $count How many directories to look upwards.
 	 *
 	 * @return string
 	 */
@@ -325,8 +326,8 @@ public static function filepath_to_classname( $file, $installed_dir, $namespace
 		$path_info        = pathinfo( $path_info );
 		$converted_dir    = str_replace( '/', '\\', $path_info['dirname'] );
 		$converted_dir    = ucwords( $converted_dir, '_\\' );
-		$filename_search  = array( static::$filename_prefix, '-' );
-		$filename_replace = array( '', '_' );
+		$filename_search  = [ static::$filename_prefix, '-' ];
+		$filename_replace = [ '', '_' ];
 		$class            = str_ireplace( $filename_search, $filename_replace, $path_info['filename'] );
 		$class_name       = $namespace . $converted_dir . '\\' . ucwords( $class, '_' );
 
@@ -407,19 +408,19 @@ private function load_file( $path ) {
 	/**
 	 * Take a namespaced class name and turn it into a file name.
 	 *
-	 * @param  string $class
+	 * @param  string $class The name of the class to load.
 	 *
 	 * @return string
 	 */
 	private function psr4_get_file_name_from_class( $class ) {
 		$class = strtolower( $class );
 		if ( stristr( $class, '\\' ) ) {
 
-			// if the first item is == the collection name, trim it off
+			// If the first item is == the collection name, trim it off.
 			$class = str_ireplace( static::$autoload_class_prefix, '', $class );
 
 			// Maybe fix formatting underscores to dashes and double to single slashes.
-			$class     = str_replace( array( '_', '\\' ), array( '-', '/' ), $class );
+			$class     = str_replace( [ '_', '\\' ], [ '-', '/' ], $class );
 			$class     = explode( '/', $class );
 			$file_name = &$class[ count( $class ) - 1 ];
 			$file_name = static::$filename_prefix . $file_name . '.php';
@@ -434,19 +435,19 @@ private function psr4_get_file_name_from_class( $class ) {
 	/**
 	 * Setup special hooks that don't run after plugins_loaded action
 	 *
-	 * @param $file
+	 * @param string $file File location on the server, passed in and used to build other paths.
 	 */
 	public static function run( $file ) {
 		// Logic required for WordPress VIP plugins to load during themes function file initialization.
 		if ( did_action( 'plugins_loaded' ) ) {
-			add_action( 'init', array( get_called_class(), 'load' ), 1 );
+			add_action( 'init', [ get_called_class(), 'load' ], 1 );
 		} else {
-			add_action( 'plugins_loaded', array( get_called_class(), 'load' ) );
+			add_action( 'plugins_loaded', [ get_called_class(), 'load' ] );
 		}
 		// Installation and un-installation hooks.
-		register_activation_hook( $file, array( get_called_class(), 'activate' ) );
-		register_deactivation_hook( $file, array( get_called_class(), 'deactivate' ) );
-		register_uninstall_hook( $file, array( get_called_class(), 'uninstall' ) );
+		register_activation_hook( $file, [ get_called_class(), 'activate' ] );
+		register_deactivation_hook( $file, [ get_called_class(), 'deactivate' ] );
+		register_uninstall_hook( $file, [ get_called_class(), 'uninstall' ] );
 	}
 
 	/**