Minor syntax changes

dmhendricks · dmhendricks · commit 071a9a0b90ec · 2017-08-11T14:39:51.000-05:00
diff --git a/app/CPT.php b/app/CPT.php
@@ -12,8 +12,8 @@ function __construct() {
     $this->add_post_type_client();
 
     // Hide unnecessary publishing options like Draft, visibility, etc.
-    add_action( 'admin_head-post.php', array(&$this, 'hide_publishing_actions') );
-    add_action( 'admin_head-post-new.php', array(&$this, 'hide_publishing_actions') );
+    add_action( 'admin_head-post.php', array( $this, 'hide_publishing_actions' ) );
+    add_action( 'admin_head-post-new.php', array( $this, 'hide_publishing_actions' ) );
 
   }
 
@@ -47,17 +47,17 @@ private function add_post_type_client() {
     Container::make('post_meta', 'Client Details')
       ->show_on_post_type($cpt->postTypeName)
       ->add_fields(array(
-        Field::make('text', self::$prefix.'name', 'Name'),
-        Field::make('text', self::$prefix.'company', 'Company'),
+        Field::make('text', $this->prefix( 'name' ), 'Name'),
+        Field::make('text', $this->prefix( 'company' ), 'Company'),
       )
     );
 
     Container::make('post_meta', 'Contact Info')
       ->show_on_post_type($cpt->postTypeName)
       ->add_fields(array(
-        Field::make('text', self::$prefix.'url', 'Web Site'),
-        Field::make('text', self::$prefix.'phone', 'Phone Number'),
-        Field::make('textarea', self::$prefix.'address', "Services")->set_rows(4)
+        Field::make('text', $this->prefix( 'url' ), 'Web Site'),
+        Field::make('text', $this->prefix( 'phone' ), 'Phone Number'),
+        Field::make('textarea', $this->prefix( 'address' ), 'Services')->set_rows(4)
       )
     );
 
diff --git a/app/Core.php b/app/Core.php
@@ -6,7 +6,7 @@ class Core extends Plugin {
   function __construct() {
 
     // Add page, post type and parent classes to <body> tag for selector targeting
-    add_filter( 'body_class', array(&$this, 'add_body_classes') );
+    add_filter( 'body_class', array( &$this, 'add_body_classes' ) );
 
     // Remove Emoji code from header
     if( $this->get_plugin_option( 'remove_header_emojicons' ) ) {
@@ -23,19 +23,20 @@ function __construct() {
     *
     * @param array $classes An array of *current* body_class classes
     * @return array Modified array of body classes including new ones
+    * @since 0.1.0
     */
   public function add_body_classes($classes) {
     $parent_slug = Utils::get_parent_slug(true);
     $categories = is_single() ? Utils::get_post_categories(true) : array();
 
     // Add page, parent and post-type classes, if available
-    $classes[] = 'page-'.Utils::get_page_slug();
-    if($parent_slug) $classes[] = 'parent-'.$parent_slug;
-    $classes[] = 'post-type-'.get_post_type();
+    $classes[] = 'page-' . Utils::get_page_slug();
+    if($parent_slug) $classes[] = 'parent-' . $parent_slug;
+    $classes[] = 'post-type-' . get_post_type();
 
     // Add category slugs
     foreach($categories as $cat) {
-      $classes[] = 'category-'.$cat;
+      $classes[] = 'category-' . $cat;
     }
 
     return $classes;
diff --git a/app/Shortcodes.php b/app/Shortcodes.php
@@ -6,21 +6,23 @@ class Shortcodes extends Plugin {
   function __construct() {
 
     // Usage: [hello name="Daniel"]
-    if(!shortcode_exists('hello')) {
-      add_shortcode('hello', array(&$this, 'hello_world'));
+    if( !shortcode_exists( 'hello' ) ) {
+      add_shortcode( 'hello', array( $this, 'hello_world' ) );
     }
 
   }
 
   /**
     * A short code the returns "Hello {$name}!", if provided
+    *
+    * @since 0.1.0
     */
-  private static function hello_world( $atts ) {
+  public static function hello_world( $atts ) {
 		$atts = shortcode_atts(array(
 			'name' => 'world'
 		), $atts, 'hello');
 
-		return 'Hello '.$atts['name'].'!';
+		return 'Hello ' . $atts['name'] . '!';
   }
 
 }
diff --git a/app/WidgetLoader.php b/app/WidgetLoader.php
@@ -5,8 +5,12 @@
 
 class WidgetLoader extends Plugin {
 
+  public static $prefix;
+
   function __construct() {
 
+    self::$prefix = $this->prefix();
+
     // Register widgets
     add_action( 'widgets_init', function() {
       register_widget( new My_Widget_Class() );

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,23 @@ class Shortcodes extends Plugin {`
`6`	`6`	`function __construct() {`
`7`	`7`
`8`	`8`	`// Usage: [hello name="Daniel"]`
`9`		`- if(!shortcode_exists('hello')) {`
`10`		`- add_shortcode('hello', array(&$this, 'hello_world'));`
	`9`	`+ if( !shortcode_exists( 'hello' ) ) {`
	`10`	`+ add_shortcode( 'hello', array( $this, 'hello_world' ) );`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* A short code the returns "Hello {$name}!", if provided`
	`17`	`+ *`
	`18`	`+ * @since 0.1.0`
`17`	`19`	`*/`
`18`		`- private static function hello_world( $atts ) {`
	`20`	`+ public static function hello_world( $atts ) {`
`19`	`21`	`$atts = shortcode_atts(array(`
`20`	`22`	`'name' => 'world'`
`21`	`23`	`), $atts, 'hello');`
`22`	`24`
`23`		`- return 'Hello '.$atts['name'].'!';`
	`25`	`+ return 'Hello ' . $atts['name'] . '!';`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`}`