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);

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
  *
  * @return void
  */
-function bootstrap() {
+function bootstrap()
+{
     if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
         // Composer-generated autoload file.
         include_once __DIR__ . '/vendor/autoload.php';

src/GoogleFontsOptimizer.php

Spacing +80 added lines, -80 removed lines

@@ -13,9 +13,9 @@ 
     const FILTER_OB_CLEANER  = 'zwf_gfo_clean_ob';
     const DEFAULT_OB_CLEANER = false;
 
-    protected $candidates = [];
+    protected $candidates = [ ];
 
-    protected $enqueued = [];
+    protected $enqueued = [ ];
 
     /**
      * Like the wind.
@@ -33,7 +33,7 @@ 
                  * Scan and optimize requests found in the markup (uses more
                  * memory 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:
@@ -42,7 +42,7 @@ 
                  * 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;
         }
     }
@@ -54,7 +54,7 @@ 
      *
      * @return bool
      */
-    protected function hasEnoughElements(array $candidates = [])
+    protected function hasEnoughElements(array $candidates = [ ])
     {
         $enough = true;
 
@@ -82,25 +82,25 @@ 
         $candidate_handles = $this->findCandidateHandles($handles);
 
         // Bail if we don't have anything that makes sense for us to continue
-        if (! $this->hasEnoughElements($candidate_handles)) {
+        if (!$this->hasEnoughElements($candidate_handles)) {
             return $handles;
         }
 
         $fonts_array = $this->getFontsArray($this->getCandidates());
-        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;
             }
         }
 
@@ -128,7 +128,7 @@ 
     public function findCandidateHandles(array $handles)
     {
         $handler           = \wp_styles();
-        $candidate_handles = [];
+        $candidate_handles = [ ];
 
         foreach ($handles as $handle) {
             // $url = $handler->registered[ $handle ]->src;
@@ -137,7 +137,7 @@ 
                 $url = $dep->src;
                 if ($this->isGoogleWebFontUrl($url)) {
                     $this->addCandidate($url);
-                    $candidate_handles[$handle] = $url;
+                    $candidate_handles[ $handle ] = $url;
                 }
             }
         }
@@ -163,7 +163,7 @@ 
                 \wp_dequeue_style($handle);
             }
             // @codeCoverageIgnoreEnd
-            unset($this->enqueued[$handle]);
+            unset($this->enqueued[ $handle ]);
         }
     }
 
@@ -178,7 +178,7 @@ 
      *
      * @return void
      */
-    public function enqueueStyle($handle, $url, $deps = [], $version = null)
+    public function enqueueStyle($handle, $url, $deps = [ ], $version = null)
     {
         // @codeCoverageIgnoreStart
         // \wp_register_style($handle, $url, $deps, $version);
@@ -187,7 +187,7 @@ 
         }
         // @codeCoverageIgnoreEnd
 
-        $this->enqueued[$handle] = $url;
+        $this->enqueued[ $handle ] = $url;
     }
 
     /**
@@ -201,8 +201,8 @@ 
     {
         $data = $this->enqueued;
 
-        if ($handle && isset($this->enqueued[$handle])) {
-            $data = $this->enqueued[$handle];
+        if ($handle && isset($this->enqueued[ $handle ])) {
+            $data = $this->enqueued[ $handle ];
         }
 
         return $data;
@@ -230,7 +230,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);
@@ -246,14 +246,14 @@ 
         $candidates = $this->getCandidates();
 
         // Bail and return original markup unmodified if we don't have things to do
-        if (! $this->hasEnoughElements($candidates)) {
+        if (!$this->hasEnoughElements($candidates)) {
             return $markup;
         }
 
         // 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;
     }
@@ -305,7 +305,7 @@ 
             }*/
 
             // Start our own buffering
-            $started = ob_start([$this, 'endBuffering']);
+            $started = ob_start([ $this, 'endBuffering' ]);
         }
 
         return $started;
@@ -314,7 +314,7 @@ 
     public function endBuffering($markup)
     {
         // Bail early on things we don't want to parse
-        if (! $this->isMarkupDoable($markup)) {
+        if (!$this->isMarkupDoable($markup)) {
             return $markup;
         }
 
@@ -399,7 +399,7 @@ 
             $is_amp_markup = $this->isAmpMarkup($content);
         }
 
-        if ($has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) {
+        if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) {
             $doable = false;
         }
 
@@ -432,7 +432,7 @@ 
     /**
      * @param array $urls
      */
-    public function setCandidates(array $urls = [])
+    public function setCandidates(array $urls = [ ])
     {
         $this->candidates = $urls;
     }
@@ -442,7 +442,7 @@ 
      */
     public function addCandidate($url)
     {
-        $this->candidates[] = $url;
+        $this->candidates[ ] = $url;
     }
 
     /**
@@ -484,11 +484,11 @@ 
      *
      * @return null|string
      */
-    public function buildGoogleFontsUrl(array $fonts, $subsets = [])
+    public function buildGoogleFontsUrl(array $fonts, $subsets = [ ])
     {
         $base_url  = 'https://fonts.googleapis.com/css';
-        $font_args = [];
-        $family    = [];
+        $font_args = [ ];
+        $family    = [ ];
         $url       = null;
 
         foreach ($fonts as $font_name => $font_weight) {
@@ -496,17 +496,17 @@ 
                 $font_weight = implode(',', $font_weight);
             }
             // Trimming end colon handles edge case of being given an empty $font_weight
-            $family[] = trim(trim($font_name) . ':' . trim($font_weight), ':');
+            $family[ ] = trim(trim($font_name) . ':' . trim($font_weight), ':');
         }
 
-        $font_args['family'] = implode('|', $family);
+        $font_args[ 'family' ] = implode('|', $family);
 
-        if (! empty($subsets)) {
+        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);
@@ -522,26 +522,26 @@ 
      *
      * @return array
      */
-    protected function getFontsArray(array $candidates = [])
+    protected function getFontsArray(array $candidates = [ ])
     {
-        $fonts = [];
+        $fonts = [ ];
 
         foreach ($candidates as $candidate) {
-            $fonts['links'][] = $candidate;
+            $fonts[ 'links' ][ ] = $candidate;
 
-            $params = [];
+            $params = [ ];
             parse_str(parse_url($candidate, PHP_URL_QUERY), $params);
 
-            if (isset($params['text'])) {
+            if (isset($params[ 'text' ])) {
                 // Fonts with character limitations are segregated into
                 // under 'partial' (when `text` query param is used)
-                $font_family                = explode(':', $params['family']);
-                $fonts['partial']['name'][] = $font_family[0];
-                $fonts['partial']['url'][]  = $this->httpsify($candidate);
+                $font_family                = explode(':', $params[ 'family' ]);
+                $fonts[ 'partial' ][ 'name' ][ ] = $font_family[ 0 ];
+                $fonts[ 'partial' ][ 'url' ][ ]  = $this->httpsify($candidate);
             } else {
                 $fontstrings = $this->buildFontStringsFromQueryParams($params);
                 foreach ($fontstrings as $font) {
-                    $fonts['complete'][] = $font;
+                    $fonts[ 'complete' ][ ] = $font;
                 }
             }
         }
@@ -560,29 +560,29 @@ 
      */
     protected function buildFontStringsFromQueryParams(array $params)
     {
-        $fonts = [];
+        $fonts = [ ];
 
-        foreach (explode('|', $params['family']) as $families) {
+        foreach (explode('|', $params[ 'family' ]) as $families) {
             $font_family = explode(':', $families);
             $subset      = false;
-            if (isset($params['subset'])) {
+            if (isset($params[ 'subset' ])) {
                 // Use the found subset parameter
-                $subset = $params['subset'];
-            } elseif (isset($font_family[2])) {
+                $subset = $params[ 'subset' ];
+            } elseif (isset($font_family[ 2 ])) {
                 // Use the subset in the family string
-                $subset = $font_family[2];
+                $subset = $font_family[ 2 ];
             }
 
             // We need to have a name and a size
-            if (strlen($font_family[0]) > 0 && strlen($font_family[1]) > 0) {
+            if (strlen($font_family[ 0 ]) > 0 && strlen($font_family[ 1 ]) > 0) {
                 $parts = [
-                    $font_family[0],
-                    $font_family[1]
+                    $font_family[ 0 ],
+                    $font_family[ 1 ]
                 ];
                 if ($subset) {
-                    $parts[] = $subset;
+                    $parts[ ] = $subset;
                 }
-                $fonts[] = implode(':', $parts);
+                $fonts[ ] = implode(':', $parts);
             }
         }
 
@@ -616,37 +616,37 @@ 
      */
     protected function consolidateFontsArray(array $fonts_array)
     {
-        $fonts         = [];
-        $subsets       = [];
-        $fonts_to_subs = [];
+        $fonts         = [ ];
+        $subsets       = [ ];
+        $fonts_to_subs = [ ];
 
-        foreach ($fonts_array['complete'] as $font_string) {
+        foreach ($fonts_array[ 'complete' ] as $font_string) {
             $parts = explode(':', $font_string);
-            $name  = $parts[0];
-            $size  = $parts[1];
+            $name  = $parts[ 0 ];
+            $size  = $parts[ 1 ];
 
-            if (isset($fonts[$name])) {
+            if (isset($fonts[ $name ])) {
                 // If a name already exists, append the new size
-                $fonts[$name] .= ',' . $size;
+                $fonts[ $name ] .= ',' . $size;
             } else {
                 // Create a new key for the name and size
-                $fonts[$name] = $size;
+                $fonts[ $name ] = $size;
             }
 
             // Check if subset is specified as the third element
-            if (isset($parts[2])) {
-                $subset = $parts[2];
+            if (isset($parts[ 2 ])) {
+                $subset = $parts[ 2 ];
                 // Collect all the subsets defined into a single array
                 $elements = explode(',', $subset);
                 foreach ($elements as $sub) {
-                    $subsets[] = $sub;
+                    $subsets[ ] = $sub;
                 }
                 // Keeping a separate map of names => requested subsets for
                 // webfontloader purposes
-                if (isset($fonts_to_subs[$name])) {
-                    $fonts_to_subs[$name] .= ',' . $subset;
+                if (isset($fonts_to_subs[ $name ])) {
+                    $fonts_to_subs[ $name ] .= ',' . $subset;
                 } else {
-                    $fonts_to_subs[$name] = $subset;
+                    $fonts_to_subs[ $name ] = $subset;
                 }
             }
         }
@@ -663,7 +663,7 @@ 
         // Sanitize and de-dup $fonts_to_subs mapping
         $fonts_to_subs = $this->dedupValues($fonts_to_subs, false); // no sort
 
-        return [$fonts, $subsets, $fonts_to_subs];
+        return [ $fonts, $subsets, $fonts_to_subs ];
     }
 
     /**
@@ -688,7 +688,7 @@ 
             if (false !== $sort) {
                 sort($parts, $sort);
             }
-            $data[$key] = $parts;
+            $data[ $key ] = $parts;
         }
 
         return $data;
@@ -750,9 +750,9 @@ 
             $href     = $this->encodeUnencodedAmpersands($font_url);
             $markup   = '<link rel="stylesheet" type="text/css" href="' . $href . '">';
 
-            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"';
                         $markup .= ' href="' . $this->encodeUnencodedAmpersands($other) . '">';
                     }
@@ -760,24 +760,24 @@ 
             }
         } else {
             // Bulding WebFont script loader
-            $families_array = [];
+            $families_array = [ ];
 
             list($fonts, $subsets, $mapping) = $this->consolidateFontsArray($fonts_array);
             foreach ($fonts as $name => $sizes) {
                 $family = $name . ':' . implode(',', $sizes);
-                if (isset($mapping[$name])) {
-                    $family .= ':' . implode(',', $mapping[$name]);
+                if (isset($mapping[ $name ])) {
+                    $family .= ':' . implode(',', $mapping[ $name ]);
                 }
-                $families_array[] = $family;
+                $families_array[ ] = $family;
             }
             $families = "'" . implode("', '", $families_array) . "'";
 
             // Load 'text' requests with the "custom" module
             $custom = '';
-            if (isset($fonts_array['partial'])) {
+            if (isset($fonts_array[ 'partial' ])) {
                 $custom  = ",\n    custom: {\n";
-                $custom .= "        families: [ '" . implode("', '", $fonts_array['partial']['name']) . "' ],\n";
-                $custom .= "        urls: [ '" . implode("', '", $fonts_array['partial']['url']) . "' ]\n";
+                $custom .= "        families: [ '" . implode("', '", $fonts_array[ 'partial' ][ 'name' ]) . "' ],\n";
+                $custom .= "        urls: [ '" . implode("', '", $fonts_array[ 'partial' ][ 'url' ]) . "' ]\n";
                 $custom .= '    }';
             }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -796,7 +796,7 @@
     s.parentNode.insertBefore(wf, s);
 })();
 </script>
-HTML;
+html;
         }
 
         return $markup;