zytzagoo / wp-google-fonts-optimizer

src/GoogleFontsOptimizerUtils.php

Spacing +14 added lines, -14 removed lines

@@ -124,7 +124,7 @@ 
             }
 
             // Store back
-            $data[$key] = $parts;
+            $data[ $key ] = $parts;
         }
 
         return $data;
@@ -160,16 +160,16 @@ 
      */
     public static function buildFontsMarkupScript(Collection $collection)
     {
-        $families_array = [];
+        $families_array = [ ];
 
         list($names, $mapping) = $collection->getScriptData();
 
         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) . "'";
 
@@ -233,28 +233,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);
@@ -271,7 +271,7 @@ 
      */
     public static function arrayFlattenIterative(array $arr)
     {
-        $flat  = [];
+        $flat  = [ ];
         $stack = array_values($arr);
 
         while ($stack) {
@@ -279,7 +279,7 @@ 
             if (is_array($value)) {
                 $stack = array_merge(array_values($value), $stack);
             } else {
-                $flat[] = $value;
+                $flat[ ] = $value;
             }
         }
 

src/GoogleFontsOptimizer.php

Spacing +23 added lines, -23 removed lines

@@ -16,14 +16,14 @@ 
     const FILTER_OB_CLEANER  = 'zwf_gfo_clean_ob';
     const DEFAULT_OB_CLEANER = false;
 
-    protected $candidates = [];
+    protected $candidates = [ ];
 
-    protected $enqueued = [];
+    protected $enqueued = [ ];
 
     /**
      * @param array $urls
      */
-    public function setCandidates(array $urls = [])
+    public function setCandidates(array $urls = [ ])
     {
         $this->candidates = $urls;
     }
@@ -52,7 +52,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:
@@ -61,7 +61,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;
         }
     }
@@ -83,7 +83,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;
         }
 
@@ -97,14 +97,14 @@ 
         $font_url    = $collection->getCombinedUrl();
         $handle_name = 'zwf-gfo-combined';
         $this->enqueueStyle($handle_name, $font_url);
-        $handles[] = $handle_name;
+        $handles[ ] = $handle_name;
 
         // Process 'text-only' requests if there are any...
         $texts = $collection->getTextUrls();
         foreach ($texts as $k => $url) {
             $handle_name = 'zwf-gfo-combined-txt-' . ($k + 1);
             $this->enqueueStyle($handle_name, $url);
-            $handles[] = $handle_name;
+            $handles[ ] = $handle_name;
         }
 
         // Remove/dequeue the ones we just combined above
@@ -131,14 +131,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;
                 }
             }
         }
@@ -153,7 +153,7 @@ 
      *
      * @return bool
      */
-    protected function hasEnoughElements(array $candidates = [])
+    protected function hasEnoughElements(array $candidates = [ ])
     {
         $enough = true;
 
@@ -184,7 +184,7 @@ 
                 \wp_dequeue_style($handle);
             }
             // @codeCoverageIgnoreEnd
-            unset($this->enqueued[$handle]);
+            unset($this->enqueued[ $handle ]);
         }
     }
 
@@ -199,7 +199,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')) {
@@ -208,7 +208,7 @@ 
         }
         // @codeCoverageIgnoreEnd
 
-        $this->enqueued[$handle] = $url;
+        $this->enqueued[ $handle ] = $url;
     }
 
     /**
@@ -222,8 +222,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;
@@ -241,7 +241,7 @@ 
     public function processMarkup($markup)
     {
         $hrefs = $this->parseMarkupForHrefs($markup);
-        if (! empty($hrefs)) {
+        if (!empty($hrefs)) {
             $this->setCandidates($hrefs);
         }
 
@@ -249,7 +249,7 @@ 
         $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;
         }
 
@@ -289,11 +289,11 @@ 
      */
     protected function filterHrefsFromCandidateLinkNodes(\DOMNodeList $nodes)
     {
-        $hrefs = [];
+        $hrefs = [ ];
 
         foreach ($nodes as $node) {
             if ($this->isCandidateLink($node)) {
-                $hrefs[] = $node->getAttribute('href');
+                $hrefs[ ] = $node->getAttribute('href');
             }
         }
 
@@ -364,7 +364,7 @@ 
              */
 
             // Start our own buffering
-            $started = ob_start([$this, 'endBuffering']);
+            $started = ob_start([ $this, 'endBuffering' ]);
         }
 
         return $started;
@@ -373,7 +373,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;
         }
 
@@ -456,7 +456,7 @@ 
         $html5 = Utils::hasHtml5Doctype($content);
         $xsl   = Utils::hasXslStylesheet($content);
 
-        return (($html || $html5) && ! $xsl);
+        return (($html || $html5) && !$xsl);
     }
 
     /**

src/GoogleFontsCollection.php

Spacing +45 added lines, -45 removed lines

@@ -7,19 +7,19 @@ 
 class GoogleFontsCollection
 {
 
-    protected $links = [];
+    protected $links = [ ];
 
-    protected $texts = [];
+    protected $texts = [ ];
 
-    protected $complete = [];
+    protected $complete = [ ];
 
-    protected $subsetsMap = [];
+    protected $subsetsMap = [ ];
 
-    protected $namedSizes = [];
+    protected $namedSizes = [ ];
 
-    public function __construct(array $urls = [])
+    public function __construct(array $urls = [ ])
     {
-        if (! empty($urls)) {
+        if (!empty($urls)) {
             foreach ($urls as $url) {
                 $this->add($url);
             }
@@ -30,17 +30,17 @@ 
     {
         $this->addLink($url);
 
-        $params = [];
+        $params = [ ];
         parse_str(parse_url($url, PHP_URL_QUERY), $params);
 
-        $bucket = isset($params['text']) ? 'text' : 'complete';
+        $bucket = isset($params[ 'text' ]) ? 'text' : 'complete';
 
         $fontstrings = $this->buildFontStringsFromQueryParams($params);
         foreach ($fontstrings as $font) {
             $this->addFontFromString($font, $bucket);
             if ('text' === $bucket) {
                 $font_family = explode(':', $font);
-                $this->addTextFont($font_family[0], Utils::httpsify($url));
+                $this->addTextFont($font_family[ 0 ], Utils::httpsify($url));
             } else {
                 $this->addComplete($font);
             }
@@ -67,19 +67,19 @@ 
         $subsets = $font->getSubsetsString();
 
         // Add to bucket list
-        $this->fonts[$bucket][] = $font;
+        $this->fonts[ $bucket ][ ] = $font;
 
         // Keeping a separate map of names => subsets for webfontloader purposes
-        if (! array_key_exists($name, $this->subsetsMap)) {
+        if (!array_key_exists($name, $this->subsetsMap)) {
             // Nothing found yet, create a new key
-            $this->subsetsMap[$name] = $subsets;
+            $this->subsetsMap[ $name ] = $subsets;
         } else {
             // Something is in there already, append to that.
             // Existing subsetsMap[$name] might not be an array
-            if (! is_array($this->subsetsMap[$name])) {
-                $this->subsetsMap[$name] = (array) $this->subsetsMap[$name];
+            if (!is_array($this->subsetsMap[ $name ])) {
+                $this->subsetsMap[ $name ] = (array) $this->subsetsMap[ $name ];
             }
-            $this->subsetsMap[$name] = array_merge($this->subsetsMap[$name], (array) $subsets);
+            $this->subsetsMap[ $name ] = array_merge($this->subsetsMap[ $name ], (array) $subsets);
         }
 
         // Deduplicate values and don't sort the subsets map
@@ -99,18 +99,18 @@ 
 
     protected function addTextFont($name, $url)
     {
-        $this->texts['name'][] = $name;
-        $this->texts['url'][]  = $url;
+        $this->texts[ 'name' ][ ] = $name;
+        $this->texts[ 'url' ][ ]  = $url;
     }
 
     protected function addComplete($fontstring)
     {
-        $this->complete[] = $fontstring;
+        $this->complete[ ] = $fontstring;
     }
 
     protected function addLink($url)
     {
-        $this->links[] = $url;
+        $this->links[ ] = $url;
     }
 
     public function getOriginalLinks()
@@ -120,7 +120,7 @@ 
 
     public function hasText()
     {
-        return (! empty($this->texts));
+        return (!empty($this->texts));
     }
 
     /**
@@ -128,10 +128,10 @@ 
      */
     public function getTextUrls()
     {
-        $urls = [];
+        $urls = [ ];
 
         if ($this->hasText()) {
-            $urls = $this->texts['url'];
+            $urls = $this->texts[ 'url' ];
         }
 
         return $urls;
@@ -142,17 +142,17 @@ 
      */
     public function getTextNames()
     {
-        return $this->texts['name'];
+        return $this->texts[ 'name' ];
     }
 
     public function getFonts()
     {
-        return $this->fonts['complete'];
+        return $this->fonts[ 'complete' ];
     }
 
     public function getFontsText()
     {
-        return $this->fonts['text'];
+        return $this->fonts[ 'text' ];
     }
 
     public function getCombinedUrl()
@@ -167,11 +167,11 @@ 
 
     public function getSubsets()
     {
-        $subsets = [];
+        $subsets = [ ];
 
         $fonts = $this->getFonts();
         foreach ($fonts as $font) {
-            $subsets[] = $font->getSubsets();
+            $subsets[ ] = $font->getSubsets();
         }
 
         $subsets = Utils::arrayFlattenIterative($subsets);
@@ -184,14 +184,14 @@ 
      */
     protected function buildNamedsizesMap()
     {
-        $fonts = [];
+        $fonts = [ ];
 
         foreach ($this->getFonts() as $font) {
             $name = $font->getName();
-            if (! array_key_exists($name, $fonts)) {
-                $fonts[$name] = $font->getSizes();
+            if (!array_key_exists($name, $fonts)) {
+                $fonts[ $name ] = $font->getSizes();
             } else {
-                $fonts[$name] = array_merge($fonts[$name], $font->getSizes());
+                $fonts[ $name ] = array_merge($fonts[ $name ], $font->getSizes());
             }
         }
 
@@ -215,12 +215,12 @@ 
      */
     protected function buildFontStringsFromQueryParams(array $params)
     {
-        $fonts = [];
+        $fonts = [ ];
 
-        foreach (explode('|', $params['family']) as $family) {
+        foreach (explode('|', $params[ 'family' ]) as $family) {
             $font = $this->parseFontStringName($family, $params);
-            if (! empty($font)) {
-                $fonts[] = $font;
+            if (!empty($font)) {
+                $fonts[ ] = $font;
             }
         }
 
@@ -238,12 +238,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.
@@ -263,19 +263,19 @@ 
      */
     protected function validateFontStringParts(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;

src/GoogleFont.php

Spacing +8 added lines, -8 removed lines

@@ -7,11 +7,11 @@ 
 
     protected $name = '';
 
-    protected $sizes = [];
+    protected $sizes = [ ];
 
-    protected $subsets = [];
+    protected $subsets = [ ];
 
-    public function __construct($name, array $sizes = [], array $subsets = [])
+    public function __construct($name, array $sizes = [ ], array $subsets = [ ])
     {
         $this->setName($name);
         $this->setSizes($sizes);
@@ -99,14 +99,14 @@ 
     public static function fromString($fontstring)
     {
         $parts = explode(':', $fontstring);
-        $font  = new self($parts[0]);
+        $font  = new self($parts[ 0 ]);
 
-        if (isset($parts[1])) {
-            $font->setSizes($parts[1]);
+        if (isset($parts[ 1 ])) {
+            $font->setSizes($parts[ 1 ]);
         }
 
-        if (isset($parts[2])) {
-            $font->setSubsets($parts[2]);
+        if (isset($parts[ 2 ])) {
+            $font->setSubsets($parts[ 2 ]);
         }
 
         return $font;