zytzagoo / wp-google-fonts-optimizer

src/GoogleFontsOptimizerUtils.php

Spacing +15 added lines, -15 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,15 +271,15 @@ 
      */
     public static function arrayFlattenIterative(array $arr)
     {
-        $flat  = [];
+        $flat  = [ ];
         $stack = array_values($arr);
 
-        while (! empty($stack)) {
+        while (!empty($stack)) {
             $value = array_shift($stack);
             if (is_array($value)) {
                 $stack = array_merge(array_values($value), $stack);
             } else {
-                $flat[] = $value;
+                $flat[ ] = $value;
             }
         }
 

src/GoogleFontsCollection.php

Spacing +46 added lines, -46 removed lines

@@ -7,21 +7,21 @@ 
 class GoogleFontsCollection
 {
 
-    protected $links = [];
+    protected $links = [ ];
 
-    protected $texts = [];
+    protected $texts = [ ];
 
-    protected $complete = [];
+    protected $complete = [ ];
 
-    protected $fonts = [];
+    protected $fonts = [ ];
 
-    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);
             }
@@ -32,17 +32,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);
             }
@@ -69,19 +69,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
@@ -101,18 +101,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()
@@ -122,7 +122,7 @@ 
 
     public function hasText()
     {
-        return (! empty($this->texts));
+        return (!empty($this->texts));
     }
 
     /**
@@ -130,10 +130,10 @@ 
      */
     public function getTextUrls()
     {
-        $urls = [];
+        $urls = [ ];
 
         if ($this->hasText()) {
-            $urls = $this->texts['url'];
+            $urls = $this->texts[ 'url' ];
         }
 
         return $urls;
@@ -144,17 +144,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()
@@ -169,11 +169,11 @@ 
 
     public function getSubsets()
     {
-        $subsets = [];
+        $subsets = [ ];
 
         $fonts = $this->getFonts();
         foreach ($fonts as $font) {
-            $subsets[] = $font->getSubsets();
+            $subsets[ ] = $font->getSubsets();
         }
 
         $subsets = Utils::arrayFlattenIterative($subsets);
@@ -186,14 +186,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());
             }
         }
 
@@ -217,12 +217,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;
             }
         }
 
@@ -240,12 +240,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.
@@ -265,19 +265,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;