Adds namespacing and makes function naming more consistent.

archive.php

@@ -7,6 +7,8 @@
  * @package _s
  */
 
+use function WD_S\TemplateTags\display_numeric_pagination;
+
 get_header(); ?>
 
 	<main id="main" class="container site-main">
@@ -34,7 +36,7 @@
 
 			endwhile;
 
-			_s_display_numeric_pagination();
+			display_numeric_pagination();
 
 		else :
 			get_template_part( 'template-parts/content', 'none' );

comments.php

@@ -15,6 +15,7 @@
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
  */
+
 if ( post_password_required() ) {
 	return;
 }

footer.php

@@ -9,6 +9,10 @@
  * @package _s
  */
 
+use function WD_S\TemplateTags\display_copyright_text;
+use function WD_S\TemplateTags\display_social_network_links;
+use function WD_S\TemplateTags\display_mobile_menu;
+
 ?>
 
 	<footer class="site-footer">
@@ -29,13 +33,13 @@
 		</nav><!-- #site-navigation-->
 
 		<div class="container site-info">
-			<?php _s_display_copyright_text(); ?>
-			<?php _s_display_social_network_links(); ?>
+			<?php display_copyright_text(); ?>
+			<?php display_social_network_links(); ?>
 		</div><!-- .site-info -->
 
 	</footer><!-- .site-footer container-->
 
-	<?php _s_display_mobile_menu(); ?>
+	<?php display_mobile_menu(); ?>
 	<?php wp_footer(); ?>
 
 </body>

functions.php

@@ -12,20 +12,26 @@
  *
  * @author WebDevStudios
  */
-function _s_get_theme_include_files() {
-	return [
-		'inc/setup.php', // Theme set up. Should be included first.
-		'inc/compat.php', // Backwards Compatibility.
-		'inc/customizer/customizer.php', // Customizer additions.
-		'inc/extras.php', // Custom functions that act independently of the theme templates.
-		'inc/hooks.php', // Load custom filters and hooks.
-		'inc/security.php', // WordPress hardening.
-		'inc/scaffolding.php', // Scaffolding.
-		'inc/scripts.php', // Load styles and scripts.
-		'inc/template-tags.php', // Custom template tags for this theme.
-	];
-}
+$files = [
+	'inc/customizer/customizer.php', // Customizer additions.
+	'inc/functions/', // Custom functions that act independently of the theme templates.
+	'inc/hooks/', // Load custom filters and hooks.
+	'inc/post-types/', // Load custom post types.
+	'inc/scaffolding/', // Scaffolding.
+	'inc/setup/', // Theme setup.
+	'inc/shortcodes/', // Load shortcodes.
+	'inc/template-tags/', // Custom template tags for this theme.
+];
+
+foreach ( $files as $include ) {
+	$include = trailingslashit( get_template_directory() ) . $include;
 
-foreach ( _s_get_theme_include_files() as $include ) {
-	require trailingslashit( get_template_directory() ) . $include;
+	// Allows inclusion of individual files or all .php files in a directory.
+	if ( is_dir( $include ) ) {
+		foreach ( glob( $include . '*.php' ) as $file ) {
+			require $file;
+		}
+	} else {
+		require $include;
+	}
 }

inc/README.md

@@ -0,0 +1,27 @@
+# Included `PHP` Files
+
+Use the `/inc` directory to declare any theme functionality. All files in this directory are imported inside of `functions.php`. 
+
+## Directories
+
+The `/inc` directory is organized into sub-directories based on the functionality/purpose of the code. These directories can be modified as needed, but the following structure is recommended:
+
+```text
+inc/
+└─── customizer/    (functions relating to the theme customizer)
+└─── functions/     (general functions that don't fit into any other directory)
+└─── hooks/         (theme hooks)
+└─── post-types/    (theme post type registrations & functions)
+└─── scaffolding/   (theme scaffolding functions)
+└─── setup/         (functions relating to the theme setup)
+└─── shortcodes/    (shortcode registrations)
+└─── template-tags/ (functions that render markup for use in theme templates)
+└─── README.md
+```
+
+## Filenames
+
+As a general rule, each `.php` file should contain a single function/action which should match the name of the file (replacing underscores with hyphens in the filename).
+
+For example, `function demo_function() {...}` would be declared in a file named `demo-function.php` and stored inside an appropriate `/inc` sub-directory.
+

inc/customizer/class-text-editor-custom-control.php

@@ -5,14 +5,16 @@
  * @package _s
  */
 
+namespace WD_S\Customizer;
+
 if ( ! class_exists( 'WP_Customize_Control' ) ) {
 	return;
 }
 
 /**
  * Class to create a custom text editor control
  */
-final class Text_Editor_Custom_Control extends WP_Customize_Control {
+final class Text_Editor_Custom_Control extends \WP_Customize_Control {
 
 	/**
 	 * Keep track of if scripts were added.

inc/customizer/customizer.php

@@ -5,44 +5,46 @@
  * @package _s
  */
 
+namespace WD_S\Customizer;
+
 /**
  * Removes default customizer fields that we generally don't use.
  *
  * @param object $wp_customize The default Customizer settings.
  * @author Corey Collins
  */
-function _s_remove_default_customizer_sections( $wp_customize ) {
+function remove_default_customizer_sections( $wp_customize ) {
 
 	// Remove sections.
 	$wp_customize->remove_section( 'custom_css' );
 	$wp_customize->remove_section( 'static_front_page' );
 	$wp_customize->remove_section( 'background_image' );
 	$wp_customize->remove_section( 'colors' );
 }
-add_action( 'customize_register', '_s_remove_default_customizer_sections', 15 );
+add_action( 'customize_register', __NAMESPACE__ . '\remove_default_customizer_sections', 15 );
 
 /**
  * Include other customizer files.
  *
  * @author WebDevStudios
  */
-function _s_include_custom_controls() {
+function include_custom_controls() {
 	require get_template_directory() . '/inc/customizer/panels.php';
 	require get_template_directory() . '/inc/customizer/sections.php';
 	require get_template_directory() . '/inc/customizer/settings.php';
 	require get_template_directory() . '/inc/customizer/class-text-editor-custom-control.php';
 }
-add_action( 'customize_register', '_s_include_custom_controls', -999 );
+add_action( 'customize_register', __NAMESPACE__ . '\include_custom_controls', -999 );
 
 /**
  * Enqueue customizer related scripts.
  *
  * @author WebDevStudios
  */
-function _s_customize_scripts() {
+function customize_scripts() {
 	wp_enqueue_script( '_s-customize-livepreview', get_template_directory_uri() . '/inc/customizer/assets/scripts/livepreview.js', [ 'jquery', 'customize-preview' ], '1.0.0', true );
 }
-add_action( 'customize_preview_init', '_s_customize_scripts' );
+add_action( 'customize_preview_init', __NAMESPACE__ . '\customize_scripts' );
 
 /**
  * Add support for the fancy new edit icons.
@@ -52,7 +54,7 @@ function _s_customize_scripts() {
  * @author WebDevStudios
  * @link https://make.wordpress.org/core/2016/02/16/selective-refresh-in-the-customizer/.
  */
-function _s_selective_refresh_support( $wp_customize ) {
+function selective_refresh_support( $wp_customize ) {
 
 	// The <div> classname to append edit icon too.
 	$settings = [
@@ -67,7 +69,7 @@ function _s_selective_refresh_support( $wp_customize ) {
 		$wp_customize->selective_refresh->add_partial( $setting, $args );
 	}
 }
-add_action( 'customize_register', '_s_selective_refresh_support' );
+add_action( 'customize_register', __NAMESPACE__ . '\selective_refresh_support' );
 
 /**
  * Add live preview support via postMessage.
@@ -79,7 +81,7 @@ function _s_selective_refresh_support( $wp_customize ) {
  * @param object $wp_customize Instance of WP_Customize_Class.
  * @link https://codex.wordpress.org/Theme_Customization_API#Part_3:_Configure_Live_Preview_.28Optional.29.
  */
-function _s_live_preview_support( $wp_customize ) {
+function live_preview_support( $wp_customize ) {
 
 	// Settings to apply live preview to.
 	$settings = [
@@ -105,4 +107,4 @@ function _s_live_preview_support( $wp_customize ) {
 		$setting->transport = 'postMessage';
 	}
 }
-add_action( 'customize_register', '_s_live_preview_support', 999 );
+add_action( 'customize_register', __NAMESPACE__ . '\live_preview_support', 999 );

inc/customizer/panels.php

@@ -5,14 +5,16 @@
  * @package _s
  */
 
+namespace WD_S\Customizer;
+
 /**
  * Add a custom panels to attach sections too.
  *
  * @author WebDevStudios
  *
  * @param WP_Customize_Manager $wp_customize Instance of WP_Customize_Class.
  */
-function _s_customize_panels( $wp_customize ) {
+function customize_panels( $wp_customize ) {
 	// Register a new panel.
 	$wp_customize->add_panel(
 		'site-options',
@@ -26,4 +28,4 @@ function _s_customize_panels( $wp_customize ) {
 	);
 }
 
-add_action( 'customize_register', '_s_customize_panels' );
+add_action( 'customize_register', __NAMESPACE__ . '\customize_panels' );

inc/customizer/sections.php

@@ -5,13 +5,15 @@
  * @package _s
  */
 
+namespace WD_S\Customizer;
+
 /**
  * Register the section sections.
  *
  * @author WebDevStudios
  * @param object $wp_customize Instance of WP_Customize_Class.
  */
-function _s_customize_sections( $wp_customize ) {
+function customize_sections( $wp_customize ) {
 
 	// Register additional scripts section.
 	$wp_customize->add_section(
@@ -54,4 +56,4 @@ function _s_customize_sections( $wp_customize ) {
 		]
 	);
 }
-add_action( 'customize_register', '_s_customize_sections' );
+add_action( 'customize_register', __NAMESPACE__ . '\customize_sections' );

inc/customizer/settings.php

@@ -5,14 +5,16 @@
  * @package _s
  */
 
+namespace WD_S\Customizer;
+
 /**
  * Register additional scripts.
  *
  * @author WebDevStudios
  *
  * @param WP_Customize_Manager $wp_customize Instance of WP_Customize_Manager.
  */
-function _s_customize_additional_scripts( $wp_customize ) {
+function customize_additional_scripts( $wp_customize ) {
 	// Register a setting.
 	$wp_customize->add_setting(
 		'_s_header_scripts',
@@ -54,7 +56,7 @@ function _s_customize_additional_scripts( $wp_customize ) {
 	);
 }
 
-add_action( 'customize_register', '_s_customize_additional_scripts' );
+add_action( 'customize_register', __NAMESPACE__ . '\customize_additional_scripts' );
 
 /**
  * Register a social icons setting.
@@ -63,7 +65,7 @@ function _s_customize_additional_scripts( $wp_customize ) {
  *
  * @param WP_Customize_Manager $wp_customize Instance of WP_Customize_Manager.
  */
-function _s_customize_social_icons( $wp_customize ) {
+function customize_social_icons( $wp_customize ) {
 	// Create an array of our social links for ease of setup.
 	$social_networks = [
 		'facebook',
@@ -96,7 +98,7 @@ function _s_customize_social_icons( $wp_customize ) {
 	}
 }
 
-add_action( 'customize_register', '_s_customize_social_icons' );
+add_action( 'customize_register', __NAMESPACE__ . '\customize_social_icons' );
 
 /**
  * Register copyright text setting.
@@ -105,7 +107,7 @@ function _s_customize_social_icons( $wp_customize ) {
  *
  * @param WP_Customize_Manager $wp_customize Instance of WP_Customize_Manager.
  */
-function _s_customize_copyright_text( $wp_customize ) {
+function customize_copyright_text( $wp_customize ) {
 	// Register a setting.
 	$wp_customize->add_setting(
 		'_s_copyright_text',
@@ -130,4 +132,4 @@ function _s_customize_copyright_text( $wp_customize ) {
 	);
 }
 
-add_action( 'customize_register', '_s_customize_copyright_text' );
+add_action( 'customize_register', __NAMESPACE__ . '\customize_copyright_text' );