nirjharlo / wp-plugin-framework

autoload.php

Indentation +21 added lines, -21 removed lines

@@ -299,28 +299,28 @@
 
 
 		 /**
- 		  * Instantiate REST API
- 		  *
- 		  * @return Void
- 		  */
+		  * Instantiate REST API
+		  *
+		  * @return Void
+		  */
 		 public function prevent_unauthorized_rest_access( $result ) {
- 		    // If a previous authentication check was applied,
- 		    // pass that result along without modification.
- 		    if ( true === $result || is_wp_error( $result ) ) {
- 		        return $result;
- 		    }
-
- 		    // No authentication has been performed yet.
- 		    // Return an error if user is not logged in.
- 		    if ( ! is_user_logged_in() ) {
- 		        return new WP_Error(
- 		            'rest_not_logged_in',
- 		            __( 'You are not currently logged in.' ),
- 		            array( 'status' => 401 )
- 		        );
- 		    }
-
- 		    return $result;
+ 			// If a previous authentication check was applied,
+ 			// pass that result along without modification.
+ 			if ( true === $result || is_wp_error( $result ) ) {
+ 				return $result;
+ 			}
+
+ 			// No authentication has been performed yet.
+ 			// Return an error if user is not logged in.
+ 			if ( ! is_user_logged_in() ) {
+ 				return new WP_Error(
+ 					'rest_not_logged_in',
+ 					__( 'You are not currently logged in.' ),
+ 					array( 'status' => 401 )
+ 				);
+ 			}
+
+ 			return $result;
  		}
 
 

Spacing +52 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Main plugin object to define the plugin
@@ -8,7 +8,7 @@ 
  * @author     Nirjhar Lo
  * @package    wp-plugin-framework
  */
-if ( ! class_exists( 'PLUGIN_BUILD' ) ) {
+if ( ! class_exists('PLUGIN_BUILD')) {
 
 	final class PLUGIN_BUILD {
 
@@ -69,7 +69,7 @@ 
 		 */
 		public static function instance() {
 
-			if ( is_null( self::$_instance ) ) {
+			if (is_null(self::$_instance)) {
 				self::$_instance = new self();
 				self::$_instance->init();
 			}
@@ -95,7 +95,7 @@ 
 			}
 
 			//If CPT exists, include taht and flush the rewrite rules
-			if ( class_exists( 'PLUGIN_CPT' ) ) new PLUGIN_CPT();
+			if (class_exists('PLUGIN_CPT')) new PLUGIN_CPT();
 			flush_rewrite_rules();
 		}
 
@@ -107,7 +107,7 @@ 
 		 */
 		public function cron_activation() {
 
-			if ( class_exists( 'PLUGIN_CRON' ) ) {
+			if (class_exists('PLUGIN_CRON')) {
 
 				$cron = new PLUGIN_CRON();
 				$schedule = $cron->schedule_task(
@@ -130,7 +130,7 @@ 
 		 */
 		public function db_install() {
 
-			if ( class_exists( 'PLUGIN_DB' ) ) {
+			if (class_exists('PLUGIN_DB')) {
 
 				$db = new PLUGIN_DB();
 				$db->table = self::$plugin_table;
@@ -140,15 +140,15 @@ 
 				$db->build();
 			}
 
-			if (get_option( '_plugin_db_exist') == '0' ) {
-				add_action( 'admin_notices', array( $this, 'db_error_msg' ) );
+			if (get_option('_plugin_db_exist') == '0') {
+				add_action('admin_notices', array($this, 'db_error_msg'));
 			}
 
 			$options = array(
-				array( 'option_name', '__value__' ),
+				array('option_name', '__value__'),
 			);
-			foreach ( $options as $value ) {
-				update_option( $value[0], $value[1] );
+			foreach ($options as $value) {
+				update_option($value[0], $value[1]);
 			}
 		}
 
@@ -161,7 +161,7 @@ 
 		public function db_error_msg() { ?>
 
 			<div class="notice notice-error is-dismissible">
-				<p><?php _e( 'Database table Not installed correctly.', 'textdomain' ); ?></p>
+				<p><?php _e('Database table Not installed correctly.', 'textdomain'); ?></p>
  			</div>
 			<?php
 		}
@@ -177,13 +177,13 @@ 
 			$table_name = self::$plugin_table;
 
 			global $wpdb;
-			$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}$table_name" );
+			$wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}$table_name");
 
 			$options = array(
 				'_plugin_db_exist'
 			);
-			foreach ( $options as $value ) {
-				delete_option( $value );
+			foreach ($options as $value) {
+				delete_option($value);
 			}
 		}
 
@@ -206,7 +206,7 @@ 
 		 */
 		public function custom_cron_hook_cb() {
 
-			add_action( 'custom_cron_hook', array( $this, 'do_cron_job_function' ) );
+			add_action('custom_cron_hook', array($this, 'do_cron_job_function'));
 		}
 
 
@@ -217,7 +217,7 @@ 
 		 */
 		public function cron_uninstall() {
 
-			wp_clear_scheduled_hook( 'custom_cron_hook' );
+			wp_clear_scheduled_hook('custom_cron_hook');
 		}
 
 
@@ -228,7 +228,7 @@ 
 		 */
 		public function cpt() {
 
-			if ( class_exists( 'PLUGIN_CPT' ) ) new PLUGIN_CPT();
+			if (class_exists('PLUGIN_CPT')) new PLUGIN_CPT();
 		}
 
 
@@ -239,7 +239,7 @@ 
 		 */
 		public function scripts() {
 
-			if ( class_exists( 'PLUGIN_SCRIPT' ) ) new PLUGIN_SCRIPT();
+			if (class_exists('PLUGIN_SCRIPT')) new PLUGIN_SCRIPT();
 		}
 
 
@@ -250,7 +250,7 @@ 
 		 */
 		public function settings() {
 
-			if ( class_exists( 'PLUGIN_SETTINGS' ) ) new PLUGIN_SETTINGS();
+			if (class_exists('PLUGIN_SETTINGS')) new PLUGIN_SETTINGS();
 		}
 
 
@@ -261,7 +261,7 @@ 
 		 */
 		public function widgets() {
 
-			if ( class_exists( 'PLUGIN_WIDGET' ) ) new PLUGIN_WIDGET();
+			if (class_exists('PLUGIN_WIDGET')) new PLUGIN_WIDGET();
 		}
 
 
@@ -272,7 +272,7 @@ 
 		 */
 		public function metabox() {
 
-			if ( class_exists( 'PLUGIN_METABOX' ) ) new PLUGIN_METABOX();
+			if (class_exists('PLUGIN_METABOX')) new PLUGIN_METABOX();
 		}
 
 
@@ -283,7 +283,7 @@ 
 		 */
 		public function shortcode() {
 
-			if ( class_exists( 'PLUGIN_SHORTCODE' ) ) new PLUGIN_SHORTCODE();
+			if (class_exists('PLUGIN_SHORTCODE')) new PLUGIN_SHORTCODE();
 		}
 
 
@@ -294,7 +294,7 @@ 
 		 */
 		 public function rest_api() {
 
-			 if ( class_exists( 'PLUGIN_CUSTOM_ROUTE' ) ) new PLUGIN_CUSTOM_ROUTE();
+			 if (class_exists('PLUGIN_CUSTOM_ROUTE')) new PLUGIN_CUSTOM_ROUTE();
 		 }
 
 
@@ -303,20 +303,20 @@ 
  		  *
  		  * @return Void
  		  */
-		 public function prevent_unauthorized_rest_access( $result ) {
+		 public function prevent_unauthorized_rest_access($result) {
  		    // If a previous authentication check was applied,
  		    // pass that result along without modification.
- 		    if ( true === $result || is_wp_error( $result ) ) {
+ 		    if (true === $result || is_wp_error($result)) {
  		        return $result;
  		    }
 
  		    // No authentication has been performed yet.
  		    // Return an error if user is not logged in.
- 		    if ( ! is_user_logged_in() ) {
+ 		    if ( ! is_user_logged_in()) {
  		        return new WP_Error(
  		            'rest_not_logged_in',
- 		            __( 'You are not currently logged in.' ),
- 		            array( 'status' => 401 )
+ 		            __('You are not currently logged in.'),
+ 		            array('status' => 401)
  		        );
  		    }
 
@@ -332,15 +332,15 @@ 
 		 */
 		public function functionality() {
 
-			require_once( 'src/class-install.php' );
-			require_once( 'src/class-db.php' );
-			require_once( 'src/class-query.php' );
-			require_once( 'src/class-settings.php' );
-			require_once( 'src/class-widget.php' );
-			require_once( 'src/class-metabox.php' );
-			require_once( 'src/class-shortcode.php' );
-			require_once( 'src/class-cpt.php' );
-			require_once( 'src/class-rest.php' );
+			require_once('src/class-install.php');
+			require_once('src/class-db.php');
+			require_once('src/class-query.php');
+			require_once('src/class-settings.php');
+			require_once('src/class-widget.php');
+			require_once('src/class-metabox.php');
+			require_once('src/class-shortcode.php');
+			require_once('src/class-cpt.php');
+			require_once('src/class-rest.php');
 		}
 
 
@@ -352,12 +352,12 @@ 
 		 */
 		public function helpers() {
 
-			require_once( 'lib/class-cron.php' );
-			require_once( 'lib/class-api.php' );
-			require_once( 'lib/class-table.php' );
-			require_once( 'lib/class-ajax.php' );
-			require_once( 'lib/class-upload.php' );
-			require_once( 'lib/class-script.php' );
+			require_once('lib/class-cron.php');
+			require_once('lib/class-api.php');
+			require_once('lib/class-table.php');
+			require_once('lib/class-ajax.php');
+			require_once('lib/class-upload.php');
+			require_once('lib/class-script.php');
 		}
 
 
@@ -371,19 +371,19 @@ 
 			$this->helpers();
 			$this->functionality();
 
-			register_activation_hook( PLUGIN_FILE, array( $this, 'db_install' ) );
-			register_activation_hook( PLUGIN_FILE, array( $this, 'cron_activation' ) );
+			register_activation_hook(PLUGIN_FILE, array($this, 'db_install'));
+			register_activation_hook(PLUGIN_FILE, array($this, 'cron_activation'));
 
 			//remove the DB and CORN upon uninstallation
 			//using $this won't work here.
-			register_uninstall_hook( PLUGIN_FILE, array( 'PLUGIN_BUILD', 'db_uninstall' ) );
-			register_uninstall_hook( PLUGIN_FILE, array( 'PLUGIN_BUILD', 'cron_uninstall' ) );
+			register_uninstall_hook(PLUGIN_FILE, array('PLUGIN_BUILD', 'db_uninstall'));
+			register_uninstall_hook(PLUGIN_FILE, array('PLUGIN_BUILD', 'cron_uninstall'));
 
-			add_filter( 'rest_authentication_errors', array( $this, 'prevent_unauthorized_rest_access' ) );
+			add_filter('rest_authentication_errors', array($this, 'prevent_unauthorized_rest_access'));
 
-			add_action( 'init', array( $this, 'installation' ) );
-			add_action( 'init', array( $this, 'custom_cron_hook_cb' ) );
-			add_action( 'init', array( $this, 'cpt' ) );
+			add_action('init', array($this, 'installation'));
+			add_action('init', array($this, 'custom_cron_hook_cb'));
+			add_action('init', array($this, 'cpt'));
 
 			$this->scripts();
 			$this->widgets();

src/class-rest.php

Indentation +13 added lines, -13 removed lines

@@ -20,16 +20,16 @@ 
 		public function register_routes() {
 
 			$version = '1';
-    		$namespace = 'vendor/v' . $version;
-    		$base = 'route';
+			$namespace = 'vendor/v' . $version;
+			$base = 'route';
 
 			//Available options for methods are CREATABLE, READABLE, EDITABLE, DELETABLE
 			register_rest_route( $namespace, '/' . $base, array(
-        		'methods'             => WP_REST_Server::READABLE,
-        		'callback'            => array( $this, 'callback' ),
-        		'permission_callback' => array( $this, 'permission' ),
-        		'args'                => array('sample', 'list', 'of', 'args')
-      		));
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'callback' ),
+				'permission_callback' => array( $this, 'permission' ),
+				'args'                => array('sample', 'list', 'of', 'args')
+	  		));
 		}
 
 
@@ -40,13 +40,13 @@ 
 		 */
 		public function callback() {
 
-    		$params = $request->get_params();
-    		$items = array();
-    		$data = $this->prepare_item_for_response( $items, $request );
+			$params = $request->get_params();
+			$items = array();
+			$data = $this->prepare_item_for_response( $items, $request );
 
-    		if ( $data ) {
-      			return new WP_REST_Response( $data, 200 );
-    		} else {
+			if ( $data ) {
+	  			return new WP_REST_Response( $data, 200 );
+			} else {
 				return new WP_Error( 'status_code', __( 'message', 'text-domain' ) );
 			}
 		}

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Extending REST API framework of WordPress
@@ -7,7 +7,7 @@ 
  * @author     Nirjhar Lo
  * @package    wp-plugin-framework
  */
-if ( ! class_exists( 'PLUGIN_CUSTOM_ROUTE' ) ) {
+if ( ! class_exists('PLUGIN_CUSTOM_ROUTE')) {
 
 	class PLUGIN_CUSTOM_ROUTE extends WP_REST_Controller {
 
@@ -24,10 +24,10 @@ 
     		$base = 'route';
 
 			//Available options for methods are CREATABLE, READABLE, EDITABLE, DELETABLE
-			register_rest_route( $namespace, '/' . $base, array(
+			register_rest_route($namespace, '/' . $base, array(
         		'methods'             => WP_REST_Server::READABLE,
-        		'callback'            => array( $this, 'callback' ),
-        		'permission_callback' => array( $this, 'permission' ),
+        		'callback'            => array($this, 'callback'),
+        		'permission_callback' => array($this, 'permission'),
         		'args'                => array('sample', 'list', 'of', 'args')
       		));
 		}
@@ -42,12 +42,12 @@ 
 
     		$params = $request->get_params();
     		$items = array();
-    		$data = $this->prepare_item_for_response( $items, $request );
+    		$data = $this->prepare_item_for_response($items, $request);
 
-    		if ( $data ) {
-      			return new WP_REST_Response( $data, 200 );
+    		if ($data) {
+      			return new WP_REST_Response($data, 200);
     		} else {
-				return new WP_Error( 'status_code', __( 'message', 'text-domain' ) );
+				return new WP_Error('status_code', __('message', 'text-domain'));
 			}
 		}
 
@@ -59,7 +59,7 @@ 
 		 */
 		public function permission() {
 
-			return current_user_can( 'manage_options' );
+			return current_user_can('manage_options');
 		}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Extending REST API framework of WordPress

src/class-cpt.php

Indentation +79 added lines, -79 removed lines

@@ -54,24 +54,24 @@ 
 		 */
 		public function labels() {
 
-	      $labels = array(
-	        'name'                => _x( '', 'Post Type General Name', 'textdomain' ),
-	        'singular_name'       => _x( '', 'Post Type Singular Name', 'textdomain' ),
-	        'menu_name'           => __( '', 'textdomain' ),
-	        'parent_item_colon'   => __( '', 'textdomain' ),
-	        'all_items'           => __( '', 'textdomain' ),
-	        'view_item'           => __( '', 'textdomain' ),
-	        'add_new_item'        => __( '', 'textdomain' ),
-	        'add_new'             => __( '', 'textdomain' ),
-	        'edit_item'           => __( '', 'textdomain' ),
-	        'update_item'         => __( '', 'textdomain' ),
-	        'search_items'        => __( '', 'textdomain' ),
-	        'not_found'           => __( '', 'textdomain' ),
-	        'not_found_in_trash'  => __( '', 'textdomain' ),
-	      );
-
-	      return $labels;
-	    }
+		  $labels = array(
+			'name'                => _x( '', 'Post Type General Name', 'textdomain' ),
+			'singular_name'       => _x( '', 'Post Type Singular Name', 'textdomain' ),
+			'menu_name'           => __( '', 'textdomain' ),
+			'parent_item_colon'   => __( '', 'textdomain' ),
+			'all_items'           => __( '', 'textdomain' ),
+			'view_item'           => __( '', 'textdomain' ),
+			'add_new_item'        => __( '', 'textdomain' ),
+			'add_new'             => __( '', 'textdomain' ),
+			'edit_item'           => __( '', 'textdomain' ),
+			'update_item'         => __( '', 'textdomain' ),
+			'search_items'        => __( '', 'textdomain' ),
+			'not_found'           => __( '', 'textdomain' ),
+			'not_found_in_trash'  => __( '', 'textdomain' ),
+		  );
+
+		  return $labels;
+		}
 
 
 		/**
@@ -81,44 +81,44 @@ 
 		 *
 		 * @return Array
 		 */
-	    public function args( $labels ) {
-
-	      $args = array(
-	          'label'               => __( '', 'textdomain' ),
-	          'description'         => __( '', 'textdomain' ),
-	          'labels'              => $labels,
-	          'supports'            => array( 'title', 'editor', 'thumbnail' ),
-	          'taxonomies'          => array( 'custom_tax', 'post_tag' ),
-	          'hierarchical'        => true,
-	          'public'              => true,
+		public function args( $labels ) {
+
+		  $args = array(
+			  'label'               => __( '', 'textdomain' ),
+			  'description'         => __( '', 'textdomain' ),
+			  'labels'              => $labels,
+			  'supports'            => array( 'title', 'editor', 'thumbnail' ),
+			  'taxonomies'          => array( 'custom_tax', 'post_tag' ),
+			  'hierarchical'        => true,
+			  'public'              => true,
 			  'rewrite'			  	=> array( 'slug' => 'slug_name' ),
-	          'show_ui'             => true,
-	          'show_in_menu'        => true,
+			  'show_ui'             => true,
+			  'show_in_menu'        => true,
 			  'menu_icon' 			=> 'data:image/svg+xml;base64,' . self::$menu_svg,
-	          'show_in_nav_menus'   => true,
-	          'show_in_admin_bar'   => true,
-	          'menu_position'       => 5,
-	          'can_export'          => true,
-	          'has_archive'         => true,
-	          'exclude_from_search' => false,
-	          'publicly_queryable'  => true,
-	          'capability_type'     => 'post',
-	          'show_in_rest'        => true,
+			  'show_in_nav_menus'   => true,
+			  'show_in_admin_bar'   => true,
+			  'menu_position'       => 5,
+			  'can_export'          => true,
+			  'has_archive'         => true,
+			  'exclude_from_search' => false,
+			  'publicly_queryable'  => true,
+			  'capability_type'     => 'post',
+			  'show_in_rest'        => true,
 			  //Controls WP REST API behaviour
 			  'rest_controller_class' => 'WP_REST_Posts_Controller',
-	      );
+		  );
 
-	      return $args;
-	    }
+		  return $args;
+		}
 
 
 		/**
-	 	 * Modify the cpt messages
+		 * Modify the cpt messages
 		 *
 		 * @param Array $messages
 		 *
 		 * @return Array
-	 	 */
+		 */
 		 public function cpt_updated_messages( $messages ) {
 
 			 global $post, $post_ID;
@@ -142,24 +142,24 @@ 
 
 
 		 /**
- 	 	  * Taxonomy labels
- 		  *
- 		  * @return Array
- 	 	  */
+		  * Taxonomy labels
+		  *
+		  * @return Array
+		  */
 		 public function taxonomy_labels() {
 
 			 $labels = array(
-			     'name'              => _x( 'Taxonomy', 'taxonomy general name', 'textdomain' ),
-			     'singular_name'     => _x( 'Taxonomy', 'taxonomy singular name', 'textdomain' ),
-			     'search_items'      => __( 'Search Taxonomy', 'textdomain' ),
-			     'all_items'         => __( 'All Taxonomies', 'textdomain' ),
-			     'parent_item'       => __( 'Parent Taxonomy', 'textdomain' ),
-			     'parent_item_colon' => __( 'Parent Taxonomy:', 'textdomain' ),
-			     'edit_item'         => __( 'Edit Taxonomy', 'textdomain' ),
-			     'update_item'       => __( 'Update Taxonomy', 'textdomain' ),
-			     'add_new_item'      => __( 'Add New Taxonomy', 'textdomain' ),
-			     'new_item_name'     => __( 'New Taxonomy Name', 'textdomain' ),
-			     'menu_name'         => __( 'Taxonomy', 'textdomain' ),
+				 'name'              => _x( 'Taxonomy', 'taxonomy general name', 'textdomain' ),
+				 'singular_name'     => _x( 'Taxonomy', 'taxonomy singular name', 'textdomain' ),
+				 'search_items'      => __( 'Search Taxonomy', 'textdomain' ),
+				 'all_items'         => __( 'All Taxonomies', 'textdomain' ),
+				 'parent_item'       => __( 'Parent Taxonomy', 'textdomain' ),
+				 'parent_item_colon' => __( 'Parent Taxonomy:', 'textdomain' ),
+				 'edit_item'         => __( 'Edit Taxonomy', 'textdomain' ),
+				 'update_item'       => __( 'Update Taxonomy', 'textdomain' ),
+				 'add_new_item'      => __( 'Add New Taxonomy', 'textdomain' ),
+				 'new_item_name'     => __( 'New Taxonomy Name', 'textdomain' ),
+				 'menu_name'         => __( 'Taxonomy', 'textdomain' ),
 			);
 
 			return $labels;
@@ -167,28 +167,28 @@ 
 
 
 		 /**
- 		 * Define the arguments for custom taxonomy
- 		 *
- 		 * @param Array $labels
- 		 *
- 		 * @return Array
- 		 */
- 	    public function taxonomy_args( $labels ) {
-
- 	      $args = array(
+		  * Define the arguments for custom taxonomy
+		  *
+		  * @param Array $labels
+		  *
+		  * @return Array
+		  */
+ 		public function taxonomy_args( $labels ) {
+
+ 		  $args = array(
 			  	'hierarchical'          => true,
-    			'labels'                => $labels,
-    			'show_ui'               => true,
-    			'show_admin_column'     => true,
-    			'query_var'             => true,
-    			'rewrite'               => array( 'slug' => 'custom_tax' ),
-    			'show_in_rest'          => true,
-    			'rest_base'             => 'custom_tax',
+				'labels'                => $labels,
+				'show_ui'               => true,
+				'show_admin_column'     => true,
+				'query_var'             => true,
+				'rewrite'               => array( 'slug' => 'custom_tax' ),
+				'show_in_rest'          => true,
+				'rest_base'             => 'custom_tax',
 				//Controls WP REST API behaviour
-    			'rest_controller_class' => 'WP_REST_Terms_Controller',
- 	      );
+				'rest_controller_class' => 'WP_REST_Terms_Controller',
+ 		  );
 
- 	      return $args;
- 	    }
+ 		  return $args;
+ 		}
 	}
 }

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Custom post type class
@@ -7,7 +7,7 @@ 
  * @author     Nirjhar Lo
  * @package    wp-plugin-framework
  */
-if ( ! class_exists( 'PLUGIN_CPT' ) ) {
+if ( ! class_exists('PLUGIN_CPT')) {
 
 	class PLUGIN_CPT {
 
@@ -35,10 +35,10 @@ 
 		public function __construct() {
 
 			$this->labels = $this->labels();
-			$this->args = $this->args( $this->labels );
+			$this->args = $this->args($this->labels);
 
 			$this->taxonomy_labels = $this->taxonomy_labels();
-			$this->taxonomy_args = $this->taxonomy_args( $this->taxonomy_labels );
+			$this->taxonomy_args = $this->taxonomy_args($this->taxonomy_labels);
 
 			//register_post_type( 'cpt_name', $this->args );
 			//add_filter( 'post_updated_messages', array( $this, 'group_updated_messages' ) );
@@ -55,19 +55,19 @@ 
 		public function labels() {
 
 	      $labels = array(
-	        'name'                => _x( '', 'Post Type General Name', 'textdomain' ),
-	        'singular_name'       => _x( '', 'Post Type Singular Name', 'textdomain' ),
-	        'menu_name'           => __( '', 'textdomain' ),
-	        'parent_item_colon'   => __( '', 'textdomain' ),
-	        'all_items'           => __( '', 'textdomain' ),
-	        'view_item'           => __( '', 'textdomain' ),
-	        'add_new_item'        => __( '', 'textdomain' ),
-	        'add_new'             => __( '', 'textdomain' ),
-	        'edit_item'           => __( '', 'textdomain' ),
-	        'update_item'         => __( '', 'textdomain' ),
-	        'search_items'        => __( '', 'textdomain' ),
-	        'not_found'           => __( '', 'textdomain' ),
-	        'not_found_in_trash'  => __( '', 'textdomain' ),
+	        'name'                => _x('', 'Post Type General Name', 'textdomain'),
+	        'singular_name'       => _x('', 'Post Type Singular Name', 'textdomain'),
+	        'menu_name'           => __('', 'textdomain'),
+	        'parent_item_colon'   => __('', 'textdomain'),
+	        'all_items'           => __('', 'textdomain'),
+	        'view_item'           => __('', 'textdomain'),
+	        'add_new_item'        => __('', 'textdomain'),
+	        'add_new'             => __('', 'textdomain'),
+	        'edit_item'           => __('', 'textdomain'),
+	        'update_item'         => __('', 'textdomain'),
+	        'search_items'        => __('', 'textdomain'),
+	        'not_found'           => __('', 'textdomain'),
+	        'not_found_in_trash'  => __('', 'textdomain'),
 	      );
 
 	      return $labels;
@@ -81,17 +81,17 @@ 
 		 *
 		 * @return Array
 		 */
-	    public function args( $labels ) {
+	    public function args($labels) {
 
 	      $args = array(
-	          'label'               => __( '', 'textdomain' ),
-	          'description'         => __( '', 'textdomain' ),
+	          'label'               => __('', 'textdomain'),
+	          'description'         => __('', 'textdomain'),
 	          'labels'              => $labels,
-	          'supports'            => array( 'title', 'editor', 'thumbnail' ),
-	          'taxonomies'          => array( 'custom_tax', 'post_tag' ),
+	          'supports'            => array('title', 'editor', 'thumbnail'),
+	          'taxonomies'          => array('custom_tax', 'post_tag'),
 	          'hierarchical'        => true,
 	          'public'              => true,
-			  'rewrite'			  	=> array( 'slug' => 'slug_name' ),
+			  'rewrite'			  	=> array('slug' => 'slug_name'),
 	          'show_ui'             => true,
 	          'show_in_menu'        => true,
 			  'menu_icon' 			=> 'data:image/svg+xml;base64,' . self::$menu_svg,
@@ -119,22 +119,22 @@ 
 		 *
 		 * @return Array
 	 	 */
-		 public function cpt_updated_messages( $messages ) {
+		 public function cpt_updated_messages($messages) {
 
 			 global $post, $post_ID;
 
 			 $messages['cpt_name'] = array(
 				 0 => '',
-				 1 => sprintf( __( 'CPT updated. <a href="%s">View CPT</a>', 'textdomain' ), esc_url( get_permalink( $post_ID ) ) ),
-				 2 => __( 'field updated.', 'textdomain' ),
-				 3 => __( 'field deleted.', 'textdomain' ),
-				 4 => __( 'CPT updated.', 'textdomain' ),
-				 5 => ( isset( $_GET['revision'] ) ? sprintf( __( 'CPT restored to revision from %s', 'textdomain' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false ),
-				 6 => sprintf( __( 'CPT published. <a href="%s">View Cpt</a>', 'textdomain' ), esc_url( get_permalink( $post_ID ) ) ),
-				 7 => __( 'CPT saved.', 'textdomain' ),
-				 8 => sprintf( __( 'CPT submitted. <a target="_blank" href="%s">Preview cpt</a>', 'textdomain' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
-				 9 => sprintf( __( 'CPT scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview cpt</a>', 'textdomain' ), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ) ),
-				 10 => sprintf( __( 'CPT draft updated. <a target="_blank" href="%s">Preview cpt</a>', 'textdomain' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
+				 1 => sprintf(__('CPT updated. <a href="%s">View CPT</a>', 'textdomain'), esc_url(get_permalink($post_ID))),
+				 2 => __('field updated.', 'textdomain'),
+				 3 => __('field deleted.', 'textdomain'),
+				 4 => __('CPT updated.', 'textdomain'),
+				 5 => (isset($_GET['revision']) ? sprintf(__('CPT restored to revision from %s', 'textdomain'), wp_post_revision_title((int) $_GET['revision'], false)) : false),
+				 6 => sprintf(__('CPT published. <a href="%s">View Cpt</a>', 'textdomain'), esc_url(get_permalink($post_ID))),
+				 7 => __('CPT saved.', 'textdomain'),
+				 8 => sprintf(__('CPT submitted. <a target="_blank" href="%s">Preview cpt</a>', 'textdomain'), esc_url(add_query_arg('preview', 'true', get_permalink($post_ID)))),
+				 9 => sprintf(__('CPT scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview cpt</a>', 'textdomain'), date_i18n(__('M j, Y @ G:i'), strtotime($post->post_date)), esc_url(get_permalink($post_ID))),
+				 10 => sprintf(__('CPT draft updated. <a target="_blank" href="%s">Preview cpt</a>', 'textdomain'), esc_url(add_query_arg('preview', 'true', get_permalink($post_ID)))),
 			 );
 
 			 return $messages;
@@ -149,17 +149,17 @@ 
 		 public function taxonomy_labels() {
 
 			 $labels = array(
-			     'name'              => _x( 'Taxonomy', 'taxonomy general name', 'textdomain' ),
-			     'singular_name'     => _x( 'Taxonomy', 'taxonomy singular name', 'textdomain' ),
-			     'search_items'      => __( 'Search Taxonomy', 'textdomain' ),
-			     'all_items'         => __( 'All Taxonomies', 'textdomain' ),
-			     'parent_item'       => __( 'Parent Taxonomy', 'textdomain' ),
-			     'parent_item_colon' => __( 'Parent Taxonomy:', 'textdomain' ),
-			     'edit_item'         => __( 'Edit Taxonomy', 'textdomain' ),
-			     'update_item'       => __( 'Update Taxonomy', 'textdomain' ),
-			     'add_new_item'      => __( 'Add New Taxonomy', 'textdomain' ),
-			     'new_item_name'     => __( 'New Taxonomy Name', 'textdomain' ),
-			     'menu_name'         => __( 'Taxonomy', 'textdomain' ),
+			     'name'              => _x('Taxonomy', 'taxonomy general name', 'textdomain'),
+			     'singular_name'     => _x('Taxonomy', 'taxonomy singular name', 'textdomain'),
+			     'search_items'      => __('Search Taxonomy', 'textdomain'),
+			     'all_items'         => __('All Taxonomies', 'textdomain'),
+			     'parent_item'       => __('Parent Taxonomy', 'textdomain'),
+			     'parent_item_colon' => __('Parent Taxonomy:', 'textdomain'),
+			     'edit_item'         => __('Edit Taxonomy', 'textdomain'),
+			     'update_item'       => __('Update Taxonomy', 'textdomain'),
+			     'add_new_item'      => __('Add New Taxonomy', 'textdomain'),
+			     'new_item_name'     => __('New Taxonomy Name', 'textdomain'),
+			     'menu_name'         => __('Taxonomy', 'textdomain'),
 			);
 
 			return $labels;
@@ -173,7 +173,7 @@ 
  		 *
  		 * @return Array
  		 */
- 	    public function taxonomy_args( $labels ) {
+ 	    public function taxonomy_args($labels) {
 
  	      $args = array(
 			  	'hierarchical'          => true,
@@ -181,7 +181,7 @@ 
     			'show_ui'               => true,
     			'show_admin_column'     => true,
     			'query_var'             => true,
-    			'rewrite'               => array( 'slug' => 'custom_tax' ),
+    			'rewrite'               => array('slug' => 'custom_tax'),
     			'show_in_rest'          => true,
     			'rest_base'             => 'custom_tax',
 				//Controls WP REST API behaviour