zytzagoo / wp-google-fonts-optimizer

index.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
 namespace ZWF;
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bootstraps the plugin.
@@ -24,13 +24,13 @@ 
  * @return void
  */
 function bootstrap() {
-    if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+    if (file_exists(__DIR__ . '/vendor/autoload.php')) {
         // Composer-generated autoload file.
         include_once __DIR__ . '/vendor/autoload.php';
     }
 
     $combiner = new GoogleFontsOptimizer();
-    add_action( 'wp', [ $combiner, 'run' ] );
+    add_action('wp', [ $combiner, 'run' ]);
 }
 
-add_action( 'plugins_loaded', __NAMESPACE__ . '\\bootstrap', 0 );
+add_action('plugins_loaded', __NAMESPACE__ . '\\bootstrap', 0);

src/GoogleFontsOptimizer.php

Spacing +60 added lines, -60 removed lines

@@ -13,9 +13,9 @@ 
     const FILTER_OB_CLEANER  = 'zwf_gfo_clean_ob';
     const DEFAULT_OB_CLEANER = false;
 
-    protected $candidates = [];
+    protected $candidates = [ ];
 
-    public function __construct(array $candidates = [])
+    public function __construct(array $candidates = [ ])
     {
         if (!empty($candidates)) {
             $this->setCandidates($candidates);
@@ -29,13 +29,13 @@ 
         switch ($mode) {
             case 'markup':
                 // Scan and optimize the entire page markup (uses more memory and requires DOM, but works on [almost] any theme)
-                add_action('template_redirect', [$this, 'startBuffering'], 11);
+                add_action('template_redirect', [ $this, 'startBuffering' ], 11);
                 break;
 
             case self::DEFAULT_OPERATION_MODE:
             default:
                 // Scan only things added via wp_enqueue_style (uses slightly less memory usually, but requires a decently coded theme)
-                add_filter('print_styles_array', [$this, 'processStylesHandles']);
+                add_filter('print_styles_array', [ $this, 'processStylesHandles' ]);
                 break;
         }
     }
@@ -47,7 +47,7 @@ 
      *
      * @return bool
      */
-    protected function hasEnoughElements(array $candidates = [])
+    protected function hasEnoughElements(array $candidates = [ ])
     {
         $has = true;
 
@@ -82,20 +82,20 @@ 
         // Weee...
         $fonts_array = $this->getFontsArray($this->getCandidates());
         if (!empty($fonts_array)) {
-            if (isset($fonts_array['complete'])) {
+            if (isset($fonts_array[ 'complete' ])) {
                 $combined_font_url = $this->buildGoogleFontsUrlFromFontsArray($fonts_array);
                 $handle_name = 'zwf-gfo-combined';
                 $this->enqueueStyle($handle_name, $combined_font_url);
-                $handles[] = $handle_name;
+                $handles[ ] = $handle_name;
             }
 
-            if (isset($fonts_array['partial'])) {
+            if (isset($fonts_array[ 'partial' ])) {
                 $cnt = 0;
-                foreach ($fonts_array['partial']['url'] as $url) {
+                foreach ($fonts_array[ 'partial' ][ 'url' ] as $url) {
                     $cnt++;
                     $handle_name = 'zwf-gfo-combined-txt-' . $cnt;
                     $this->enqueueStyle($handle_name, $url);
-                    $handles[] = $handle_name;
+                    $handles[ ] = $handle_name;
                 }
             }
 
@@ -122,7 +122,7 @@ 
     public function findCandidateHandles(array $handles)
     {
         $handler = \wp_styles();
-        $candidate_handles = [];
+        $candidate_handles = [ ];
 
         foreach ($handles as $handle) {
             // $url = $handler->registered[ $handle ]->src;
@@ -131,7 +131,7 @@ 
                 $url = $dep->src;
                 if ($this->isGoogleWebFontUrl($url)) {
                     $this->addCandidate($url);
-                    $candidate_handles[$handle] = $url;
+                    $candidate_handles[ $handle ] = $url;
                 }
             }
         }
@@ -164,7 +164,7 @@ 
      *
      * @return void
      */
-    public function enqueueStyle($handle, $url, $deps = [], $version = null)
+    public function enqueueStyle($handle, $url, $deps = [ ], $version = null)
     {
         //\wp_register_style($handle, $url, $deps, $version);
         \wp_enqueue_style($handle, $url, $deps, $version);
@@ -192,7 +192,7 @@ 
             $rel  = null;
             $type = null;
             $href = null;
-            $find = ['rel', 'type', 'href'];
+            $find = [ 'rel', 'type', 'href' ];
             foreach ($find as $attr) {
                 if ($link_node->hasAttribute($attr)) {
                     $$attr = $link_node->getAttribute($attr);
@@ -215,7 +215,7 @@ 
         // Process what we found and modify original markup with our replacement
         $fonts_array = $this->getFontsArray($candidates);
         $font_markup = $this->buildFontsMarkup($fonts_array);
-        $markup      = $this->modifyMarkup($markup, $font_markup, $fonts_array['links']);
+        $markup      = $this->modifyMarkup($markup, $font_markup, $fonts_array[ 'links' ]);
 
         return $markup;
     }
@@ -265,7 +265,7 @@ 
             }*/
 
             // Start our own buffering
-            ob_start([$this, 'endBuffering']);
+            ob_start([ $this, 'endBuffering' ]);
         }
     }
 
@@ -314,14 +314,14 @@ 
         }
 
         // Check w3tc UA
-        if ($buffer && defined('W3TC_POWERED_BY') && isset($_SERVER['HTTP_USER_AGENT'])) {
-            if (false !== stristr($_SERVER['HTTP_USER_AGENT'], W3TC_POWERED_BY)) {
+        if ($buffer && defined('W3TC_POWERED_BY') && isset($_SERVER[ 'HTTP_USER_AGENT' ])) {
+            if (false !== stristr($_SERVER[ 'HTTP_USER_AGENT' ], W3TC_POWERED_BY)) {
                 $buffer = false;
             }
         }
 
         // Check for Disqus actions
-        if ($buffer && isset($_GET['cf_action']) && !empty($_GET['cf_action'])) {
+        if ($buffer && isset($_GET[ 'cf_action' ]) && !empty($_GET[ 'cf_action' ])) {
             $buffer = false;
         }
 
@@ -363,7 +363,7 @@ 
         */
 
         // if ($has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) {
-        if ($has_no_html_tag && ! $has_html5_doctype || $has_xsl_stylesheet) {
+        if ($has_no_html_tag && !$has_html5_doctype || $has_xsl_stylesheet) {
             $doable = false;
         }
 
@@ -396,7 +396,7 @@ 
     /**
      * @param array $urls
      */
-    public function setCandidates(array $urls = [])
+    public function setCandidates(array $urls = [ ])
     {
         $this->candidates = $urls;
     }
@@ -406,7 +406,7 @@ 
      */
     public function addCandidate($url)
     {
-        $this->candidates[] = $url;
+        $this->candidates[ ] = $url;
     }
 
     /**
@@ -447,11 +447,11 @@ 
      *
      * @return null|string
      */
-    public function buildGoogleFontsUrl(array $fonts, $subsets = [])
+    public function buildGoogleFontsUrl(array $fonts, $subsets = [ ])
     {
         $base_url    = '//fonts.googleapis.com/css';
-        $font_args   = [];
-        $family      = [];
+        $font_args   = [ ];
+        $family      = [ ];
         $url         = null;
 
         foreach ($fonts as $font_name => $font_weight) {
@@ -459,21 +459,21 @@ 
                 if (is_array($font_weight)) {
                     $font_weight = implode(',', $font_weight);
                 }
-                $family[] = trim($font_name . ':' . trim($font_weight));
+                $family[ ] = trim($font_name . ':' . trim($font_weight));
             } else {
-                $family[] = trim($font_name);
+                $family[ ] = trim($font_name);
             }
         }
 
         if (!empty($family)) {
             $family = implode('|', $family);
-            $font_args['family'] = $family; // spaces in font names must be encoded as '+'
+            $font_args[ 'family' ] = $family; // spaces in font names must be encoded as '+'
             if (!empty($subsets)) {
                 if (is_array($subsets)) {
                     $subsets = array_unique($subsets);
                     $subsets = implode(',', $subsets);
                 }
-                $font_args['subset'] = trim($subsets);
+                $font_args[ 'subset' ] = trim($subsets);
             }
 
             $url = $base_url . '?' . http_build_query($font_args);
@@ -490,42 +490,42 @@ 
      *
      * @return array
      */
-    protected function getFontsArray(array $candidates = [])
+    protected function getFontsArray(array $candidates = [ ])
     {
-        $fonts = [];
+        $fonts = [ ];
 
         if (!empty($candidates)) {
             foreach ($candidates as $candidate) {
-                $fonts['links'][] = $candidate;
+                $fonts[ 'links' ][ ] = $candidate;
 
-                $query_params = [];
+                $query_params = [ ];
                 parse_str(parse_url($candidate, PHP_URL_QUERY), $query_params);
 
-                if (isset($query_params['text'])) {
+                if (isset($query_params[ 'text' ])) {
                     // Fonts with character limitations are segregated into
                     // under 'partial' (when `text` query param is used)
-                    $font_family = explode(':', $query_params['family']);
-                    $fonts['partial']['name'][] = $font_family[0];
-                    $fonts['partial']['url'][] = $candidate;
+                    $font_family = explode(':', $query_params[ 'family' ]);
+                    $fonts[ 'partial' ][ 'name' ][ ] = $font_family[ 0 ];
+                    $fonts[ 'partial' ][ 'url' ][ ] = $candidate;
                 } else {
-                    foreach (explode('|', $query_params['family']) as $families) {
+                    foreach (explode('|', $query_params[ 'family' ]) as $families) {
                         $font_family = explode(':', $families);
                         $subset      = false;
-                        if (isset($query_params['subset'])) {
+                        if (isset($query_params[ 'subset' ])) {
                             // Use the found subset parameter
-                            $subset = $query_params['subset'];
-                        } elseif (isset($font_family[2])) {
+                            $subset = $query_params[ 'subset' ];
+                        } elseif (isset($font_family[ 2 ])) {
                             // Use the subset in the family string
-                            $subset = $font_family[2];
+                            $subset = $font_family[ 2 ];
                         }
 
-                        if (strlen($font_family[0]) > 0 && strlen($font_family[1]) > 0) {
-                            $font_string = $font_family[0] . ':' . $font_family[1];
+                        if (strlen($font_family[ 0 ]) > 0 && strlen($font_family[ 1 ]) > 0) {
+                            $font_string = $font_family[ 0 ] . ':' . $font_family[ 1 ];
                             if ($subset) {
                                 $font_string .= ':' . $subset;
                             }
 
-                            $fonts['complete'][] = $font_string;
+                            $fonts[ 'complete' ][ ] = $font_string;
                         }
                     }
                 }
@@ -544,20 +544,20 @@ 
      */
     protected function buildGoogleFontsUrlFromFontsArray(array $fonts_array)
     {
-        $fonts   = [];
-        $subsets = [];
+        $fonts   = [ ];
+        $subsets = [ ];
 
-        foreach ($fonts_array['complete'] as $font_string) {
+        foreach ($fonts_array[ 'complete' ] as $font_string) {
             $parts = explode(':', $font_string);
-            $fonts[ $parts[0] ] = $parts[1];
-            if (isset($parts[2])) {
-                $elements = explode(',', $parts[2]);
+            $fonts[ $parts[ 0 ] ] = $parts[ 1 ];
+            if (isset($parts[ 2 ])) {
+                $elements = explode(',', $parts[ 2 ]);
                 if (!empty($elements)) {
                     foreach ($elements as $subset) {
-                        $subsets[] = $subset;
+                        $subsets[ ] = $subset;
                     }
                 } else {
-                    $subsets[] = $parts[2];
+                    $subsets[ ] = $parts[ 2 ];
                 }
             }
         }
@@ -596,22 +596,22 @@ 
             $font_url = $this->buildGoogleFontsUrlFromFontsArray($fonts_array);
             $markup   = '<link rel="stylesheet" type="text/css" href="' . $this->encodeUnencodedAmpersands($font_url) . '">';
 
-            if (isset($fonts_array['partial'])) {
-                if (is_array($fonts_array['partial']['url'])) {
-                    foreach ($fonts_array['partial']['url'] as $other) {
+            if (isset($fonts_array[ 'partial' ])) {
+                if (is_array($fonts_array[ 'partial' ][ 'url' ])) {
+                    foreach ($fonts_array[ 'partial' ][ 'url' ] as $other) {
                         $markup .= '<link rel="stylesheet" type="text/css" href="' . $this->encodeUnencodedAmpersands($other) . '">';
                     }
                 }
             }
         } else {
             // Bulding WebFont script loader
-            $families = "'" . implode("', '", $fonts_array['complete']) . "'";
+            $families = "'" . implode("', '", $fonts_array[ 'complete' ]) . "'";
 
             // Check "other"
-            if (isset($fonts_array['partial'])) {
+            if (isset($fonts_array[ 'partial' ])) {
                 $other = ",
-                    custom: { families: [ '" . implode("', '", $fonts_array['partial']['name']) . "' ],
-                    urls: [ '" . implode("', '", $fonts_array['partial']['url']) . "' ] }
+                    custom: { families: [ '" . implode("', '", $fonts_array[ 'partial' ][ 'name' ]) . "' ],
+                    urls: [ '" . implode("', '", $fonts_array[ 'partial' ][ 'url' ]) . "' ] }
                 ";
             } else {
                 $other = '';