zytzagoo / wp-google-fonts-optimizer

src/GoogleFontsOptimizerUtils.php

Spacing +33 added lines, -33 removed lines

@@ -113,7 +113,7 @@ 
             if (false !== $sort) {
                 sort($parts, (int) $sort);
             }
-            $data[$key] = $parts;
+            $data[ $key ] = $parts;
         }
 
         return $data;
@@ -132,37 +132,37 @@ 
      */
     public static 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  = isset($parts[1]) ? $parts[1] : '';
+            $name  = $parts[ 0 ];
+            $size  = isset($parts[ 1 ]) ? $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;
                 }
             }
         }
@@ -179,7 +179,7 @@ 
         // Sanitize and de-dup $fonts_to_subs mapping
         $fonts_to_subs = self::dedupValues($fonts_to_subs, false); // no sort
 
-        return [$fonts, $subsets, $fonts_to_subs];
+        return [ $fonts, $subsets, $fonts_to_subs ];
     }
 
     /**
@@ -195,8 +195,8 @@ 
         $href     = self::encodeUnencodedAmpersands($font_url);
         $markup   = '<link rel="stylesheet" type="text/css" href="' . $href . '">';
 
-        if (isset($fonts['partial']) && is_array($fonts['partial']['url'])) {
-            foreach ($fonts['partial']['url'] as $other) {
+        if (isset($fonts[ 'partial' ]) && is_array($fonts[ 'partial' ][ 'url' ])) {
+            foreach ($fonts[ 'partial' ][ 'url' ] as $other) {
                 $markup .= '<link rel="stylesheet" type="text/css"';
                 $markup .= ' href="' . self::encodeUnencodedAmpersands($other) . '">';
             }
@@ -215,24 +215,24 @@ 
      */
     public static function buildFontsMarkupScript(array $fonts)
     {
-        $families_array = [];
+        $families_array = [ ];
 
         list($names, $subsets, $mapping) = self::consolidateFontsArray($fonts);
         foreach ($names 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['partial'])) {
+        if (isset($fonts[ 'partial' ])) {
             $custom  = ",\n    custom: {\n";
-            $custom .= "        families: [ '" . implode("', '", $fonts['partial']['name']) . "' ],\n";
-            $custom .= "        urls: [ '" . implode("', '", $fonts['partial']['url']) . "' ]\n";
+            $custom .= "        families: [ '" . implode("', '", $fonts[ 'partial' ][ 'name' ]) . "' ],\n";
+            $custom .= "        urls: [ '" . implode("', '", $fonts[ 'partial' ][ 'url' ]) . "' ]\n";
             $custom .= '    }';
         }
 
@@ -287,28 +287,28 @@ 
      *
      * @return null|string
      */
-    public static function buildGoogleFontsUrl(array $fonts, $subsets = [])
+    public static function buildGoogleFontsUrl(array $fonts, $subsets = [ ])
     {
         $base_url  = 'https://fonts.googleapis.com/css';
-        $font_args = [];
-        $family    = [];
+        $font_args = [ ];
+        $family    = [ ];
 
         foreach ($fonts as $font_name => $font_weight) {
             if (is_array($font_weight)) {
                 $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);

src/GoogleFontsOptimizer.php

Spacing +49 added lines, -49 removed lines

@@ -15,9 +15,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.
@@ -35,7 +35,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:
@@ -44,7 +44,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;
         }
     }
@@ -56,7 +56,7 @@ 
      *
      * @return bool
      */
-    protected function hasEnoughElements(array $candidates = [])
+    protected function hasEnoughElements(array $candidates = [ ])
     {
         $enough = true;
 
@@ -84,7 +84,7 @@ 
         $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;
         }
 
@@ -93,20 +93,20 @@ 
 
         // Get fonts array data from candidates
         $fonts_array = $this->getFontsArray($this->getCandidates());
-        if (isset($fonts_array['complete'])) {
+        if (isset($fonts_array[ 'complete' ])) {
             $combined_font_url = Utils::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;
             }
         }
 
@@ -134,14 +134,14 @@ 
     public function findCandidateHandles(array $handles)
     {
         $handler           = /** @scrutinizer ignore-call */ \wp_styles();
-        $candidate_handles = [];
+        $candidate_handles = [ ];
 
         foreach ($handles as $handle) {
             $dep = $handler->query($handle, 'registered');
             if ($dep) {
                 $url = $dep->src;
                 if (Utils::isGoogleWebFontUrl($url)) {
-                    $candidate_handles[$handle] = $url;
+                    $candidate_handles[ $handle ] = $url;
                 }
             }
         }
@@ -169,7 +169,7 @@ 
                 \wp_dequeue_style($handle);
             }
             // @codeCoverageIgnoreEnd
-            unset($this->enqueued[$handle]);
+            unset($this->enqueued[ $handle ]);
         }
     }
 
@@ -184,7 +184,7 @@ 
      *
      * @return void
      */
-    public function enqueueStyle($handle, $url, $deps = [], $version = null)
+    public function enqueueStyle($handle, $url, $deps = [ ], $version = null)
     {
         // @codeCoverageIgnoreStart
         if (function_exists('\wp_enqueue_style')) {
@@ -193,7 +193,7 @@ 
         }
         // @codeCoverageIgnoreEnd
 
-        $this->enqueued[$handle] = $url;
+        $this->enqueued[ $handle ] = $url;
     }
 
     /**
@@ -207,8 +207,8 @@ 
     {
         $data = $this->enqueued;
 
-        if (null !== $handle && isset($this->enqueued[$handle])) {
-            $data = $this->enqueued[$handle];
+        if (null !== $handle && isset($this->enqueued[ $handle ])) {
+            $data = $this->enqueued[ $handle ];
         }
 
         return $data;
@@ -226,7 +226,7 @@ 
     public function processMarkup($markup)
     {
         $hrefs = $this->parseMarkupForHrefs($markup);
-        if (! empty($hrefs)) {
+        if (!empty($hrefs)) {
             $this->setCandidates($hrefs);
         }
 
@@ -234,14 +234,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;
     }
@@ -274,11 +274,11 @@ 
      */
     protected function filterHrefsFromCandidateLinkNodes(\DOMNodeList $nodes)
     {
-        $hrefs = [];
+        $hrefs = [ ];
 
         foreach ($nodes as $node) {
             if ($this->isCandidateLink($node)) {
-                $hrefs[] = $node->getAttribute('href');
+                $hrefs[ ] = $node->getAttribute('href');
             }
         }
 
@@ -349,7 +349,7 @@ 
              */
 
             // Start our own buffering
-            $started = ob_start([$this, 'endBuffering']);
+            $started = ob_start([ $this, 'endBuffering' ]);
         }
 
         return $started;
@@ -358,7 +358,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;
         }
 
@@ -441,13 +441,13 @@ 
         $html5 = Utils::hasHtml5Doctype($content);
         $xsl   = Utils::hasXslStylesheet($content);
 
-        return (($html || $html5) && ! $xsl);
+        return (($html || $html5) && !$xsl);
     }
 
     /**
      * @param array $urls
      */
-    public function setCandidates(array $urls = [])
+    public function setCandidates(array $urls = [ ])
     {
         $this->candidates = $urls;
     }
@@ -468,26 +468,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'][]  = Utils::httpsify($candidate);
+                $font_family                = explode(':', $params[ 'family' ]);
+                $fonts[ 'partial' ][ 'name' ][ ] = $font_family[ 0 ];
+                $fonts[ 'partial' ][ 'url' ][ ]  = Utils::httpsify($candidate);
             } else {
                 $fontstrings = $this->buildFontStringsFromQueryParams($params);
                 foreach ($fontstrings as $font) {
-                    $fonts['complete'][] = $font;
+                    $fonts[ 'complete' ][ ] = $font;
                 }
             }
         }
@@ -506,12 +506,12 @@ 
      */
     protected function buildFontStringsFromQueryParams(array $params)
     {
-        $fonts = [];
+        $fonts = [ ];
 
-        foreach (explode('|', $params['family']) as $family) {
+        foreach (explode('|', $params[ 'family' ]) as $family) {
             $font = $this->parseFontStringFamilyParam($family, $params);
-            if (! empty($font)) {
-                $fonts[] = $font;
+            if (!empty($font)) {
+                $fonts[ ] = $font;
             }
         }
 
@@ -529,12 +529,12 @@ 
         $subset = false;
         $family = explode(':', $family);
 
-        if (isset($params['subset'])) {
+        if (isset($params[ 'subset' ])) {
             // Use the found subset query parameter
-            $subset = $params['subset'];
-        } elseif (isset($family[2])) {
+            $subset = $params[ 'subset' ];
+        } elseif (isset($family[ 2 ])) {
             // Use the subset in the family string if present
-            $subset = $family[2];
+            $subset = $family[ 2 ];
         }
 
         // $family can have a lot of thing specified with separators etc.
@@ -554,19 +554,19 @@ 
      */
     protected function buildFontStringParts(array $family, $subset = false)
     {
-        $parts = [];
+        $parts = [ ];
 
         // First part is the font name, which should always be present
-        $parts[] = $family[0];
+        $parts[ ] = $family[ 0 ];
 
         // Check if sizes are specified
-        if (isset($family[1]) && strlen($family[1]) > 0) {
-            $parts[] = $family[1];
+        if (isset($family[ 1 ]) && strlen($family[ 1 ]) > 0) {
+            $parts[ ] = $family[ 1 ];
         }
 
         // Add the subset if specified
         if ($subset) {
-            $parts[] = $subset;
+            $parts[ ] = $subset;
         }
 
         return $parts;