Merge pull request #83 from rtCamp/fix/incorrect-namespace-and-classnames

Author: RahiDroid

composer.json

@@ -16,7 +16,10 @@
 	},
 	"config": {
 	  "discard-changes": true,
-	  "sort-packages": true
+	  "sort-packages": true,
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

functions.php

@@ -25,10 +25,10 @@
 /**
  * Get blank theme instance.
  *
- * @return object \BLANK_THEME\Inc\BLANK_THEME
+ * @return object \Blank_Theme\Inc\Blank_Theme
  */
 function blank_theme_get_theme_instance() {
-	return BLANK_THEME\Inc\BLANK_THEME::get_instance();
+	return Blank_Theme\Inc\Blank_Theme::get_instance();
 }
 
 blank_theme_get_theme_instance();

inc/classes/class-assets.php

@@ -5,7 +5,7 @@
  * @package Blank-Theme
  */
 
-namespace BLANK_THEME\Inc;
+namespace Blank_Theme\Inc;
 
 use Blank_Theme\Inc\Traits\Singleton;
 

inc/classes/class-blank-theme.php

@@ -5,14 +5,14 @@
  * @package Blank-Theme
  */
 
-namespace BLANK_THEME\Inc;
+namespace Blank_Theme\Inc;
 
-use BLANK_THEME\Inc\Traits\Singleton;
+use Blank_Theme\Inc\Traits\Singleton;
 
 /**
  * Main theme bootstrap file.
  */
-class BLANK_THEME {
+class Blank_Theme {
 
 	use Singleton;
 

inc/classes/class-widgets.php

@@ -5,9 +5,9 @@
  * @package Blank-Theme
  */
 
-namespace BLANK_THEME\Inc;
+namespace Blank_Theme\Inc;
 
-use BLANK_THEME\Inc\Traits\Singleton;
+use Blank_Theme\Inc\Traits\Singleton;
 
 /**
  * Class Assets

inc/helpers/autoloader.php

@@ -5,7 +5,7 @@
  * @package Blank-Theme
  */
 
-namespace BLANK_THEME\Inc\Helpers;
+namespace Blank_Theme\Inc\Helpers;
 
 /**
  * Auto loader function.
@@ -16,7 +16,7 @@
  */
 function autoloader( $resource = '' ) {
 	$resource_path  = false;
-	$namespace_root = 'BLANK_THEME\\';
+	$namespace_root = 'Blank_Theme\\';
 	$resource       = trim( $resource, '\\' );
 
 	if ( empty( $resource ) || strpos( $resource, '\\' ) === false || strpos( $resource, $namespace_root ) !== 0 ) {
@@ -81,4 +81,4 @@ function autoloader( $resource = '' ) {
 
 }
 
-spl_autoload_register( '\BLANK_THEME\Inc\Helpers\autoloader' );
+spl_autoload_register( '\Blank_Theme\Inc\Helpers\autoloader' );

inc/traits/trait-singleton.php

@@ -25,7 +25,7 @@
  * @package Blank-Theme
  */
 
-namespace BLANK_THEME\Inc\Traits;
+namespace Blank_Theme\Inc\Traits;
 
 trait Singleton {
 

phpcs.xml

@@ -79,7 +79,7 @@
 		 Multiple valid prefixes can be provided as a comma-delimited list. -->
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<properties>
-			<property name="prefixes" type="array" value="blank_theme, BLANK_THEME" />
+			<property name="prefixes" type="array" value="blank_theme, Blank_Theme" />
 		</properties>
 	</rule>