amarkal / amarkal-shortcode

Manager.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
      */
     public static function get_instance()
     {
-        if( null === static::$instance ) 
+        if (null === static::$instance) 
         {
             static::$instance = new static();
         }
@@ -36,11 +36,11 @@ 
      * @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");
         }
@@ -74,7 +74,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'));
     }
 
     /**
@@ -94,7 +94,7 @@ 
     private function prepare_json_object()
     {
         $json = array();
-        foreach($this->shortcodes as $id => $shortcode)
+        foreach ($this->shortcodes as $id => $shortcode)
         {
             $popup = new Popup($shortcode['fields']);
             $json[$id] = $shortcode;
@@ -126,7 +126,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);
     }
@@ -135,11 +135,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'");
             }
@@ -152,14 +152,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;
@@ -178,17 +178,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 .= "/]";
         }
@@ -204,7 +204,7 @@ 
      */
     private function required_args()
     {
-        return array('id','title','fields');
+        return array('id', 'title', 'fields');
     }
 
     /**
@@ -212,9 +212,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

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]";
         }