askupasoftware / wp-dynamic-css

bootstrap.php

Braces +3 added lines, -1 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -20,14 +20,14 @@ 
  * Domain Path:     /languages
  */
 
-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( 'WP_DYNAMIC_CSS' ) ) return;
-define( 'WP_DYNAMIC_CSS', true );
+if (defined('WP_DYNAMIC_CSS')) return;
+define('WP_DYNAMIC_CSS', true);
 
 /**
  * Load required files
@@ -43,7 +43,7 @@ 
  * styles.
  */
 $dcss = DynamicCSSCompiler::get_instance();
-add_action( 'wp_print_styles', array( $dcss, 'print_styles' ), 100 );
-add_action( 'wp_enqueue_scripts', array( $dcss, 'enqueue_styles' ), 100 );
-add_action( 'wp_ajax_wp_dynamic_css', array( $dcss, 'ajax_callback' ) );
-add_action( 'wp_ajax_nopriv_wp_dynamic_css', array( $dcss, 'ajax_callback' ) );
\ No newline at end of file
+add_action('wp_print_styles', array($dcss, 'print_styles'), 100);
+add_action('wp_enqueue_scripts', array($dcss, 'enqueue_styles'), 100);
+add_action('wp_ajax_wp_dynamic_css', array($dcss, 'ajax_callback'));
+add_action('wp_ajax_nopriv_wp_dynamic_css', array($dcss, 'ajax_callback'));
\ No newline at end of file

cache.php

Spacing +5 added lines, -5 removed lines

@@ -44,9 +44,9 @@ 
      * @param string $handle The handle of the stylesheet
      * @return boolean|string
      */
-    public function get( $handle )
+    public function get($handle)
     {
-        if( array_key_exists( $handle, self::$cache ) )
+        if (array_key_exists($handle, self::$cache))
         {
             return self::$cache[$handle];
         }
@@ -59,7 +59,7 @@ 
      * @param string $handle The handle of the stylesheet
      * @param type $compiled_css
      */
-    public function update( $handle, $compiled_css )
+    public function update($handle, $compiled_css)
     {
         self::$cache[$handle] = $compiled_css;
         $this->update_option();
@@ -70,7 +70,7 @@ 
      * 
      * @param string $handle The handle of the stylesheet
      */
-    public function clear( $handle )
+    public function clear($handle)
     {
         unset(self::$cache[$handle]);
         $this->update_option();
@@ -84,7 +84,7 @@ 
     {
         self::$cache = get_option('wp-dynamic-css-cache');
         
-        if( false === self::$cache )
+        if (false === self::$cache)
         {
             self::$cache = array();
         }

tests.php

Spacing +7 added lines, -7 removed lines

@@ -90,7 +90,7 @@ 
 /**
  * Value retrieval function
  */
-function callback( $varname, $subscripts )
+function callback($varname, $subscripts)
 {
     $values = array(
         'var1'  => 'value1',
@@ -106,9 +106,9 @@ 
     );
     
     $val = $values[$varname];
-    if( null !== $subscripts )
+    if (null !== $subscripts)
     {
-        foreach( $subscripts as $subscript )
+        foreach ($subscripts as $subscript)
         {
             $val = $val[$subscript];
         }
@@ -120,7 +120,7 @@ 
 /**
  * Simple string concat filter
  */
-function simple_filter_callback( $foo )
+function simple_filter_callback($foo)
 {
     return $foo.'bar';
 }
@@ -128,7 +128,7 @@ 
 /**
  * String concat filter with parameters
  */
-function complex_filter_callback( $value, $arg1 = '', $arg2 = '')
+function complex_filter_callback($value, $arg1 = '', $arg2 = '')
 {
     return $value.$arg1.$arg2;
 }
@@ -136,7 +136,7 @@ 
 /**
  * Number adding filter
  */
-function add_filter_callback( $value, $a, $b )
+function add_filter_callback($value, $a, $b)
 {
-    return $value.($a+$b);
+    return $value.($a + $b);
 }
\ No newline at end of file

functions.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
  * @copyright 2016 Askupa Software
  */
 
-if( !function_exists('wp_dynamic_css_enqueue') )
+if (!function_exists('wp_dynamic_css_enqueue'))
 {
     /**
      * Enqueue a dynamic stylesheet
@@ -24,14 +24,14 @@ 
      * @param boolean $cache Whether to store the compiled version of this 
      * stylesheet in cache to avoid compilation on every page load.
      */
-    function wp_dynamic_css_enqueue( $handle, $path, $print = true, $minify = false, $cache = false )
+    function wp_dynamic_css_enqueue($handle, $path, $print = true, $minify = false, $cache = false)
     {
         $dcss = DynamicCSSCompiler::get_instance();
-        $dcss->enqueue_style( $handle, $path, $print, $minify, $cache );
+        $dcss->enqueue_style($handle, $path, $print, $minify, $cache);
     }
 }
 
-if( !function_exists('wp_dynamic_css_set_callback') )
+if (!function_exists('wp_dynamic_css_set_callback'))
 {
     /**
      * Set the value retrieval callback function
@@ -46,14 +46,14 @@ 
      * can either be a reference to a function name or method within an 
      * class/object.
      */
-    function wp_dynamic_css_set_callback( $handle, $callback )
+    function wp_dynamic_css_set_callback($handle, $callback)
     {
         $dcss = DynamicCSSCompiler::get_instance();
-        $dcss->register_callback( $handle, $callback );
+        $dcss->register_callback($handle, $callback);
     }
 }
 
-if( !function_exists('wp_dynamic_css_clear_cache') )
+if (!function_exists('wp_dynamic_css_clear_cache'))
 {
     /**
      * Clear the cached compiled CSS for the given handle.
@@ -65,14 +65,14 @@ 
      * 
      * @param string $handle The name of the stylesheet to be cleared from cache
      */
-    function wp_dynamic_css_clear_cache( $handle )
+    function wp_dynamic_css_clear_cache($handle)
     {
         $cache = DynamicCSSCache::get_instance();
-        $cache->clear( $handle );
+        $cache->clear($handle);
     }
 }
 
-if( !function_exists('wp_dynamic_css_register_filter') )
+if (!function_exists('wp_dynamic_css_register_filter'))
 {
     /**
      * Register a filter function for a given stylesheet handle.
@@ -109,9 +109,9 @@ 
      * @param Callable $callback The actual filter function. Accepts the $value
      * as an argument. Should return the filtered value.
      */
-    function wp_dynamic_css_register_filter( $handle, $filter_name, $callback )
+    function wp_dynamic_css_register_filter($handle, $filter_name, $callback)
     {
         $dcss = DynamicCSSCompiler::get_instance();
-        $dcss->register_filter( $handle, $filter_name, $callback );
+        $dcss->register_filter($handle, $filter_name, $callback);
     }
 }

compiler.php

Spacing +58 added lines, -58 removed lines

@@ -62,16 +62,16 @@ 
      */
     public function enqueue_styles()
     {
-        foreach( $this->stylesheets as $stylesheet )
+        foreach ($this->stylesheets as $stylesheet)
         {
-            if( !$stylesheet['print'] && $this->callback_exists( $stylesheet['handle'] ) )
+            if (!$stylesheet['print'] && $this->callback_exists($stylesheet['handle']))
             {
                 wp_enqueue_style( 
                     'wp-dynamic-css-'.$stylesheet['handle'],
-                    esc_url_raw( add_query_arg(array(
+                    esc_url_raw(add_query_arg(array(
                         'action' => 'wp_dynamic_css',
                         'handle' => $stylesheet['handle']
-                    ), admin_url( 'admin-ajax.php')))
+                    ), admin_url('admin-ajax.php')))
                 );
             }
         }
@@ -82,11 +82,11 @@ 
      */
     public function print_styles()
     {        
-        foreach( $this->stylesheets as $stylesheet )
+        foreach ($this->stylesheets as $stylesheet)
         {
-            if( $stylesheet['print'] && $this->callback_exists( $stylesheet['handle'] ) )
+            if ($stylesheet['print'] && $this->callback_exists($stylesheet['handle']))
             {
-                $compiled_css = $this->get_compiled_style( $stylesheet );
+                $compiled_css = $this->get_compiled_style($stylesheet);
         
                 echo "<style id=\"wp-dynamic-css-".$stylesheet['handle']."\">\n";
                 include 'style.phtml';
@@ -101,14 +101,14 @@ 
      */
     public function ajax_callback()
     {
-        header( "Content-type: text/css; charset: UTF-8" );
-        $handle = filter_input( INPUT_GET, 'handle' );
+        header("Content-type: text/css; charset: UTF-8");
+        $handle = filter_input(INPUT_GET, 'handle');
         
-        foreach( $this->stylesheets as $stylesheet )
+        foreach ($this->stylesheets as $stylesheet)
         {
-            if( $handle === $stylesheet['handle'] )
+            if ($handle === $stylesheet['handle'])
             {
-                $compiled_css = $this->get_compiled_style( $stylesheet );
+                $compiled_css = $this->get_compiled_style($stylesheet);
                 include 'style.phtml';
             }
         }
@@ -127,7 +127,7 @@ 
      * @param boolean $cache Whether to store the compiled version of this 
      * stylesheet in cache to avoid compilation on every page load.
      */
-    public function enqueue_style( $handle, $path, $print, $minify, $cache )
+    public function enqueue_style($handle, $path, $print, $minify, $cache)
     {
         $this->stylesheets[] = array(
             'handle'=> $handle,
@@ -144,7 +144,7 @@ 
      * @param type $handle The stylesheet's name/id
      * @param type $callback
      */
-    public function register_callback( $handle, $callback )
+    public function register_callback($handle, $callback)
     {
         $this->callbacks[$handle] = $callback;
     }
@@ -152,9 +152,9 @@ 
     /**
      * Register a filter function for a given stylesheet handle.
      */
-    public function register_filter( $handle, $filter_name, $callback )
+    public function register_filter($handle, $filter_name, $callback)
     {
-        if( !array_key_exists( $handle, $this->filters ) )
+        if (!array_key_exists($handle, $this->filters))
         {
             $this->filters[$handle] = array();
         }
@@ -169,31 +169,31 @@ 
      * stored in $this->stylesheets
      * @return type
      */
-    protected function get_compiled_style( $style )
+    protected function get_compiled_style($style)
     {
         $cache = DynamicCSSCache::get_instance();
         
         // Use cached compiled CSS if applicable
-        if( $style['cache'] )
+        if ($style['cache'])
         {
-            $cached_css = $cache->get( $style['handle'] );
-            if( false !== $cached_css )
+            $cached_css = $cache->get($style['handle']);
+            if (false !== $cached_css)
             {
                 return $cached_css;
             }
         }
 
-        $css = file_get_contents( $style['path'] );
-        if( $style['minify'] ) $css = $this->minify_css( $css );
+        $css = file_get_contents($style['path']);
+        if ($style['minify']) $css = $this->minify_css($css);
         
         // Compile the dynamic CSS
         $compiled_css = $this->compile_css( 
             $css, 
             $this->callbacks[$style['handle']], 
-            key_exists( $style['handle'], $this->filters ) ? $this->filters[$style['handle']] : array()
+            key_exists($style['handle'], $this->filters) ? $this->filters[$style['handle']] : array()
         );
         
-        $cache->update( $style['handle'], $compiled_css );
+        $cache->update($style['handle'], $compiled_css);
         return $compiled_css;
     }
     
@@ -204,9 +204,9 @@ 
      * @param string $css CSS style to minify
      * @return string Minified CSS
      */
-    protected function minify_css( $css )
+    protected function minify_css($css)
     {
-        return preg_replace( '@({)\s+|(\;)\s+|/\*.+?\*\/|\R@is', '$1$2 ', $css );
+        return preg_replace('@({)\s+|(\;)\s+|/\*.+?\*\/|\R@is', '$1$2 ', $css);
     }
     
     /**
@@ -215,9 +215,9 @@ 
      * @param string $handle 
      * @return boolean
      */
-    protected function callback_exists( $handle )
+    protected function callback_exists($handle)
     {
-        if( array_key_exists( $handle, $this->callbacks ) )
+        if (array_key_exists($handle, $this->callbacks))
         {
             return true;
         }
@@ -239,33 +239,33 @@ 
      * @return string The compiled CSS after converting the variables to their 
      * corresponding values
      */
-    protected function compile_css( $css, $callback, $filters )
+    protected function compile_css($css, $callback, $filters)
     {
         return preg_replace_callback( 
                 
-            "#".                        // Begin
-            "\\$".                      // Must start with $
-            "([\\w-]+)".                // Match alphanumeric characters and dashes
-            "((?:\\['?[\\w-]+'?\\])*)". // Optionally match array subscripts i.e. $myVar['index']
-            "((?:".                     // Optionally match pipe filters i.e. $myVar|myFilter
-                "\\|[\\w-]+".           // Starting with the | character
-                "(\([\w\.,']+\))?".     // Filters can have strings and numbers i.e myFilter('string',1,2.5)
-            ")*)".                      // Allow for 0 or more piped filters
-            "#",                        // End
+            "#".// Begin
+            "\\$".// Must start with $
+            "([\\w-]+)".// Match alphanumeric characters and dashes
+            "((?:\\['?[\\w-]+'?\\])*)".// Optionally match array subscripts i.e. $myVar['index']
+            "((?:".// Optionally match pipe filters i.e. $myVar|myFilter
+                "\\|[\\w-]+".// Starting with the | character
+                "(\([\w\.,']+\))?".// Filters can have strings and numbers i.e myFilter('string',1,2.5)
+            ")*)".// Allow for 0 or more piped filters
+            "#", // End
             
-            function( $matches ) use ( $callback, $filters ) {
+            function($matches) use ($callback, $filters) {
                 // If this variable is an array, get the subscripts
-                if( '' !== $matches[2] )
+                if ('' !== $matches[2])
                 {
                     preg_match_all('/[\w-]+/i', $matches[2], $subscripts);
                 }
                 
-                $val = call_user_func_array( $callback, array($matches[1],@$subscripts[0]) );
+                $val = call_user_func_array($callback, array($matches[1], @$subscripts[0]));
                 
                 // Apply custom filters
-                if( '' !== $matches[3] )
+                if ('' !== $matches[3])
                 {
-                    $val = $this->apply_filters( substr($matches[3], 1), $val, $filters );
+                    $val = $this->apply_filters(substr($matches[3], 1), $val, $filters);
                 }
                 
                 return $val;
@@ -280,24 +280,24 @@ 
      * @param array $filters Array of callback functions
      * @return string The value after all filters have been applied
      */
-    protected function apply_filters( $filters_string, $value, $filters )
+    protected function apply_filters($filters_string, $value, $filters)
     {
-        foreach( explode( '|', $filters_string) as $filter )
+        foreach (explode('|', $filters_string) as $filter)
         {
-            $args = array( $value );
+            $args = array($value);
             
-            if( false !== strrpos( $filters_string, "(" ) )
+            if (false !== strrpos($filters_string, "("))
             {
-                $pieces = explode( '(', $filter );
+                $pieces = explode('(', $filter);
                 $filter = $pieces[0];
-                $params = explode( ',', str_replace( ')', '', $pieces[1] ) );
-                array_walk( $params, array( $this, 'strtoval' ) ); // Convert string values to actual values
-                $args = array_merge( $args, $params );
+                $params = explode(',', str_replace(')', '', $pieces[1]));
+                array_walk($params, array($this, 'strtoval')); // Convert string values to actual values
+                $args = array_merge($args, $params);
             }
             
-            if( key_exists( $filter, $filters ) )
+            if (key_exists($filter, $filters))
             {
-                $value = call_user_func_array( $filters[$filter], $args );
+                $value = call_user_func_array($filters[$filter], $args);
             }
         }
         return $value;
@@ -308,11 +308,11 @@ 
      * 
      * @param string $str The string to be converted (passed by reference)
      */
-    protected function strtoval( &$str )
+    protected function strtoval(&$str)
     {
-        if( 'false' === strtolower($str) ) $str = false;
-        if( 'true' === strtolower($str) ) $str = true;
-        if( false !== strrpos( $str, "'" ) ) $str = str_replace ( "'", "", $str );
-        if( is_numeric( $str ) ) $str = floatval( $str );
+        if ('false' === strtolower($str)) $str = false;
+        if ('true' === strtolower($str)) $str = true;
+        if (false !== strrpos($str, "'")) $str = str_replace("'", "", $str);
+        if (is_numeric($str)) $str = floatval($str);
     }
 }

Braces +15 added lines, -5 removed lines

@@ -184,7 +184,9 @@ 
         }
 
         $css = file_get_contents( $style['path'] );
-        if( $style['minify'] ) $css = $this->minify_css( $css );
+        if( $style['minify'] ) {
+            $css = $this->minify_css( $css );
+        }
         
         // Compile the dynamic CSS
         $compiled_css = $this->compile_css( 
@@ -310,9 +312,17 @@ 
      */
     protected function strtoval( &$str )
     {
-        if( 'false' === strtolower($str) ) $str = false;
-        if( 'true' === strtolower($str) ) $str = true;
-        if( false !== strrpos( $str, "'" ) ) $str = str_replace ( "'", "", $str );
-        if( is_numeric( $str ) ) $str = floatval( $str );
+        if( 'false' === strtolower($str) ) {
+            $str = false;
+        }
+        if( 'true' === strtolower($str) ) {
+            $str = true;
+        }
+        if( false !== strrpos( $str, "'" ) ) {
+            $str = str_replace ( "'", "", $str );
+        }
+        if( is_numeric( $str ) ) {
+            $str = floatval( $str );
+        }
     }
 }