amarkal / amarkal-shortcode

composer.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  */
 
 // Prevent direct file access
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 // Load module functions
 require_once 'functions.php';
\ No newline at end of file

functions.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 /**
  * Prevent loading the library more than once
  */
-if( defined( 'AMARKAL_SHORTCODE' ) ) return false;
+if( defined( 'AMARKAL_SHORTCODE' ) ) {
+    return false;
+}
 define( 'AMARKAL_SHORTCODE', true );
 
 if(!function_exists('amarkal_register_shortcode'))

Spacing +5 added lines, -5 removed lines

@@ -12,17 +12,17 @@
  */
 
 // Prevent direct file access
-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_SHORTCODE' ) ) return false;
-define( 'AMARKAL_SHORTCODE', true );
+if (defined('AMARKAL_SHORTCODE')) return false;
+define('AMARKAL_SHORTCODE', true);
 
-if(!function_exists('amarkal_register_shortcode'))
+if (!function_exists('amarkal_register_shortcode'))
 {
-    function amarkal_register_shortcode( $args )
+    function amarkal_register_shortcode($args)
     {
         $manager = Amarkal\Shortcode\Manager::get_instance();
         $manager->register_shortcode($args);

Manager.php

Braces +3 added lines, -3 removed lines

@@ -184,15 +184,15 @@
             if('content' !== $name)
             {
                 $template .= " $name=\"{{{$name}}}\"";
+            } else {
+                $self_enclosing = false;
             }
-            else $self_enclosing = false;
         }
 
         if($self_enclosing)
         {
             $template .= "/]";
-        }
-        else {
+        } else {
             $template .= "]{{content}}[/$tag]";
         }
         

Spacing +26 added lines, -26 removed lines

@@ -23,7 +23,7 @@ 
      */
     public static function get_instance()
     {
-        if( null === static::$instance ) 
+        if (null === static::$instance) 
         {
             static::$instance = new static();
         }
@@ -36,21 +36,21 @@ 
      * @param [array] $args
      * @return void
      */
-    public function register_shortcode( $args )
+    public function register_shortcode($args)
     {
         $config = $this->prepare_config($args);
 
-        if($this->shortcode_exists($args['id']))
+        if ($this->shortcode_exists($args['id']))
         {
             throw new \RuntimeException("A shortcode with id '{$args['id']}' has already been registered");
         }
 
         $this->shortcodes[$args['id']] = $config;
 
-        if($config['is_shortcode'])
+        if ($config['is_shortcode'])
         {
             $self = $this; // Needed for backward compatibility
-            \add_shortcode( $args['id'], function($atts, $content = null) use ($args, $self) {
+            \add_shortcode($args['id'], function($atts, $content = null) use ($args, $self) {
                 // TODO: merge $atts with defaults using shortcode_atts()
                 $atts['content'] = $content;
                 return call_user_func_array($args['render'], array($self->decode_atts($atts)));
@@ -84,7 +84,7 @@ 
      */
     public function enqueue_popup_style()
     {
-        \wp_enqueue_style('amarkal-shortcode',\Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/css/dist/amarkal-shortcode-popup.min.css'));
+        \wp_enqueue_style('amarkal-shortcode', \Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/css/dist/amarkal-shortcode-popup.min.css'));
     }
 
     /**
@@ -103,7 +103,7 @@ 
         
         // Attributes are JSON encoded and then URL encoded in the shortcode editor, so
         // we need to reverse that
-        foreach($atts as $name => $value)
+        foreach ($atts as $name => $value)
         {
             $decoded_atts[$name] = $this->decode_att($value);
         }
@@ -116,7 +116,7 @@ 
         
         // If the value is null, it is most likely because the attribute is not JSON encoded.
         // We return the uncoded value for backward compatibility, where attributes are not JSON encoded.
-        if(null === $decoded) {
+        if (null === $decoded) {
             $decoded = $this->decode_non_json_encodede_att($value);
         }
 
@@ -125,7 +125,7 @@ 
 
     private function decode_non_json_encodede_att($value)
     {
-        if(false !== \strpos($value, ',')) {
+        if (false !== \strpos($value, ',')) {
             return \explode(',', $value);
         }
         return $value;
@@ -138,7 +138,7 @@ 
     private function prepare_json_object()
     {
         $json = array();
-        foreach($this->shortcodes as $id => $shortcode)
+        foreach ($this->shortcodes as $id => $shortcode)
         {
             $popup = new Popup($shortcode);
             $json[$id] = $shortcode;
@@ -159,7 +159,7 @@ 
             'cmd'               => '',
             'width'             => 550,
             'height'            => 450,
-            'render'            => function(){},
+            'render'            => function() {},
             'fields'            => array(),
             'is_shortcode'      => true,
             'show_placeholder'  => true,
@@ -172,7 +172,7 @@ 
     /**
      * Check if a shortcode with the given ID has already been registered
      */
-    private function shortcode_exists( $id )
+    private function shortcode_exists($id)
     {
         return array_key_exists($id, $this->shortcodes);
     }
@@ -181,11 +181,11 @@ 
      * Validate that the provided arguments have the required arguments as
      * specified in self::required_args()
      */
-    private function validate_args( $args )
+    private function validate_args($args)
     {
-        foreach($this->required_args() as $arg)
+        foreach ($this->required_args() as $arg)
         {
-            if(!array_key_exists($arg, $args))
+            if (!array_key_exists($arg, $args))
             {
                 throw new \RuntimeException("Missing required argument '$arg'");
             }
@@ -198,14 +198,14 @@ 
      * @param [array] $args
      * @return array
      */
-    private function prepare_config( $args )
+    private function prepare_config($args)
     {
         $this->validate_args($args);
         $config = array_merge($this->default_args(), $args);
 
-        if($config['template'] === null)
+        if ($config['template'] === null)
         {
-            $config['template'] = $this->generate_template($config['id'],$config['fields']);
+            $config['template'] = $this->generate_template($config['id'], $config['fields']);
         }
 
         return $config;
@@ -224,17 +224,17 @@ 
         $template = "[$tag";
         $self_enclosing = true;
 
-        foreach($fields as $field)
+        foreach ($fields as $field)
         {
             $name = $field['name'];
-            if('content' !== $name)
+            if ('content' !== $name)
             {
                 $template .= " $name=\"{{{$name}}}\"";
             }
             else $self_enclosing = false;
         }
 
-        if($self_enclosing)
+        if ($self_enclosing)
         {
             $template .= "/]";
         }
@@ -250,7 +250,7 @@ 
      */
     private function required_args()
     {
-        return array('id','title','fields');
+        return array('id', 'title', 'fields');
     }
 
     /**
@@ -258,9 +258,9 @@ 
      */
     private function __construct() 
     {
-        \add_filter('mce_external_plugins',array($this,'enqueue_script'));
-        \add_action('admin_init', array($this,'enqueue_editor_style'));
-        \add_action('admin_enqueue_scripts', array($this,'enqueue_popup_style'));
-        \add_action('wp_enqueue_scripts', array($this,'enqueue_popup_style'));
+        \add_filter('mce_external_plugins', array($this, 'enqueue_script'));
+        \add_action('admin_init', array($this, 'enqueue_editor_style'));
+        \add_action('admin_enqueue_scripts', array($this, 'enqueue_popup_style'));
+        \add_action('wp_enqueue_scripts', array($this, 'enqueue_popup_style'));
     }
 }
\ No newline at end of file

bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
  */
 
 // Prevent direct file access
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 /**
  * Load module functions. If this amarkal module has not been loaded, 
  * functions.php will not return false.
  */
-if(false !== (require_once 'functions.php'))
+if (false !== (require_once 'functions.php'))
 {
     // Load required classes if not using composer
     require_once 'Manager.php';

Popup.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /**
      * Render the popup
      *
-     * @return void
+     * @return string
      */
     public function render()
     {