amarkal / amarkal-taxonomy

bootstrap.php

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 /**
  * Prevent loading the library more than once
  */
-if( defined( 'AMARKAL_TAXONOMY' ) ) return;
+if( defined( 'AMARKAL_TAXONOMY' ) ) {
+    return;
+}
 define( 'AMARKAL_TAXONOMY', true );
 
 /**

Spacing +7 added lines, -7 removed lines

@@ -11,25 +11,25 @@ 
  * @link      https://github.com/askupasoftware/amarkal-taxonomy
  * @copyright 2017 Askupa Software
  */
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 /**
  * Prevent loading the library more than once
  */
-if( defined( 'AMARKAL_TAXONOMY' ) ) return;
-define( 'AMARKAL_TAXONOMY', true );
+if (defined('AMARKAL_TAXONOMY')) return;
+define('AMARKAL_TAXONOMY', true);
 
 /**
  * Load required classes if not using composer
  */
-if( !class_exists('Composer\\Autoload\\ClassLoader') )
+if (!class_exists('Composer\\Autoload\\ClassLoader'))
 {
     require_once 'form.php';
     require_once 'add-field.php';
     require_once 'edit-field.php';
 }
 
-if(!function_exists('amarkal_taxonomy_add_field'))
+if (!function_exists('amarkal_taxonomy_add_field'))
 {
     /**
      * Add a field to the add & edit forms of a given taxonomy.
@@ -39,9 +39,9 @@ 
      * amarkal-ui components or a registered custom component.
      * @param array $field_props The field's properties
      */
-    function amarkal_taxonomy_add_field( $taxonomy_name, $field_name, $field_props )
+    function amarkal_taxonomy_add_field($taxonomy_name, $field_name, $field_props)
     {
         $form = Amarkal\Taxonomy\Form::get_instance();
-        $form->add_field( $taxonomy_name, $field_name, $field_props );
+        $form->add_field($taxonomy_name, $field_name, $field_props);
     }
 }
\ No newline at end of file

Form.php

Doc Comments +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
     /**
      * Treverse the $fields array.
      * 
-     * @param collable $callback Called on each iteration
+     * @param \Closure $callback Called on each iteration
      */
     private function traverse_fields( $callback )
     {

Spacing +37 added lines, -37 removed lines

@@ -24,7 +24,7 @@ 
      */
     public static function get_instance()
     {
-        if( null === static::$instance ) 
+        if (null === static::$instance) 
         {
             static::$instance = new static();
         }
@@ -39,30 +39,30 @@ 
      * @param array $field_props
      * @throws \RuntimeException if duplicate names are registered under the same taxonomy
      */
-    public function add_field( $taxonomy_name, $field_name, $field_props )
+    public function add_field($taxonomy_name, $field_name, $field_props)
     {
-        if( !isset($this->fields[$taxonomy_name]) )
+        if (!isset($this->fields[$taxonomy_name]))
         {
             // Add fields to taxonomy add and edit forms 
-            add_action( "{$taxonomy_name}_add_form_fields", array($this, 'render_add_form') );
-            add_action( "{$taxonomy_name}_edit_form_fields", array($this, 'render_edit_form') );
+            add_action("{$taxonomy_name}_add_form_fields", array($this, 'render_add_form'));
+            add_action("{$taxonomy_name}_edit_form_fields", array($this, 'render_edit_form'));
             
             // Save the data from taxonomy add and edit forms
-            add_action( "create_{$taxonomy_name}", array($this, 'update_term') );
-            add_action( "edited_{$taxonomy_name}", array($this, 'update_term') );
+            add_action("create_{$taxonomy_name}", array($this, 'update_term'));
+            add_action("edited_{$taxonomy_name}", array($this, 'update_term'));
             
             // Modify the taxonomy term table
-            add_filter( "manage_edit-{$taxonomy_name}_columns", array($this, 'modify_table_columns') );
-            add_filter( "manage_{$taxonomy_name}_custom_column", array($this, 'modify_table_content'), 10, 3 );
-            add_filter( "manage_edit-{$taxonomy_name}_sortable_columns", array($this, 'modify_table_sortable_columns') );
-            add_filter( 'terms_clauses', array($this, 'sort_custom_column'), 10, 3 );
+            add_filter("manage_edit-{$taxonomy_name}_columns", array($this, 'modify_table_columns'));
+            add_filter("manage_{$taxonomy_name}_custom_column", array($this, 'modify_table_content'), 10, 3);
+            add_filter("manage_edit-{$taxonomy_name}_sortable_columns", array($this, 'modify_table_sortable_columns'));
+            add_filter('terms_clauses', array($this, 'sort_custom_column'), 10, 3);
             
             $this->fields[$taxonomy_name] = array();
         }
 
-        if( !isset($this->fields[$taxonomy_name][$field_name]))
+        if (!isset($this->fields[$taxonomy_name][$field_name]))
         {
-            $this->fields[$taxonomy_name][$field_name] = array_merge( $this->default_props(), $field_props );
+            $this->fields[$taxonomy_name][$field_name] = array_merge($this->default_props(), $field_props);
         }
         else throw new \RuntimeException("A field named '$field_name' has already been registered in '$taxonomy_name'");
     }
@@ -72,11 +72,11 @@ 
      * 
      * @param object $term Taxonomy term
      */
-    public function render_edit_form( $term )
+    public function render_edit_form($term)
     {
         $fields = $this->fields[$term->taxonomy];
         
-        foreach( $fields as $name => $props )
+        foreach ($fields as $name => $props)
         {
             $props['name'] = $name;
             $props['term_id'] = $term->term_id;
@@ -90,11 +90,11 @@ 
      * 
      * @param string $taxonomy Taxonomy name
      */
-    public function render_add_form( $taxonomy )
+    public function render_add_form($taxonomy)
     {
         $fields = $this->fields[$taxonomy];
         
-        foreach( $fields as $name => $props )
+        foreach ($fields as $name => $props)
         {
             $props['name'] = $name;
             $field = new AddField($props);
@@ -108,13 +108,13 @@ 
      * 
      * @param type $term_id
      */
-    function update_term( $term_id ) 
+    function update_term($term_id) 
     {
-        $term = \get_term( $term_id );
+        $term = \get_term($term_id);
         
-        foreach( $this->fields[$term->taxonomy] as $name => $props )
+        foreach ($this->fields[$term->taxonomy] as $name => $props)
         {
-            if( isset($_POST[$name]) )
+            if (isset($_POST[$name]))
             {
                 update_term_meta($term_id, $name, filter_input(INPUT_POST, $name));
             }
@@ -127,11 +127,11 @@ 
      * @param array $columns
      * @return array
      */
-    function modify_table_columns( $columns )
+    function modify_table_columns($columns)
     {   
-        $this->traverse_fields(function( $taxonomy, $name, $props ) use ( &$columns ) 
+        $this->traverse_fields(function($taxonomy, $name, $props) use (&$columns) 
         {
-            if( $props['table']['show'] )
+            if ($props['table']['show'])
             {
                 $columns[$name] = $props['label'];
             }
@@ -149,12 +149,12 @@ 
      * @param type $term_id
      * @return type
      */
-    function modify_table_content( $content, $column_name, $term_id )
+    function modify_table_content($content, $column_name, $term_id)
     {   
         $term = \get_term($term_id);
-        $this->traverse_fields(function( $taxonomy, $name, $props ) use ( &$content, $column_name, $term ) 
+        $this->traverse_fields(function($taxonomy, $name, $props) use (&$content, $column_name, $term) 
         {
-            if( $props['table']['show'] && 
+            if ($props['table']['show'] && 
                 $term->taxonomy === $taxonomy &&
                 $name === $column_name
             ) {
@@ -170,11 +170,11 @@ 
      * @param array $columns
      * @return string
      */
-    function modify_table_sortable_columns( $columns )
+    function modify_table_sortable_columns($columns)
     {
-        $this->traverse_fields(function( $taxonomy, $name, $props ) use ( &$columns ) 
+        $this->traverse_fields(function($taxonomy, $name, $props) use (&$columns) 
         {
-            if( $props['table']['show'] && 
+            if ($props['table']['show'] && 
                 $props['table']['sortable']
             ) {
                 $columns[$name] = $name;
@@ -194,11 +194,11 @@ 
      * @param type $args
      * @return string
      */
-    function sort_custom_column( $clauses, $taxonomies, $args )
+    function sort_custom_column($clauses, $taxonomies, $args)
     {
-        $this->traverse_fields(function( $taxonomy, $name, $props ) use ( &$clauses, $args ) 
+        $this->traverse_fields(function($taxonomy, $name, $props) use (&$clauses, $args) 
         {
-            if( in_array($taxonomy, $args['taxonomy']) && 
+            if (in_array($taxonomy, $args['taxonomy']) && 
                 $props['table']['show'] && 
                 $props['table']['sortable'] &&
                 $name === $args['orderby']
@@ -239,13 +239,13 @@ 
      * 
      * @param collable $callback Called on each iteration
      */
-    private function traverse_fields( $callback )
+    private function traverse_fields($callback)
     {
-        foreach( $this->fields as $taxonomy => $fields )
+        foreach ($this->fields as $taxonomy => $fields)
         {
-            foreach( $fields as $name => $props )
+            foreach ($fields as $name => $props)
             {
-                $callback( $taxonomy, $name, $props );
+                $callback($taxonomy, $name, $props);
             }
         }
     }

Braces +2 added lines, -1 removed lines

@@ -63,8 +63,9 @@
         if( !isset($this->fields[$taxonomy_name][$field_name]))
         {
             $this->fields[$taxonomy_name][$field_name] = array_merge( $this->default_props(), $field_props );
+        } else {
+            throw new \RuntimeException("A field named '$field_name' has already been registered in '$taxonomy_name'");
         }
-        else throw new \RuntimeException("A field named '$field_name' has already been registered in '$taxonomy_name'");
     }
     
     /**