futtta / autoptimize

classes/external/php/plugin-update-checker/plugin-update-checker.php

Spacing +3 added lines, -3 removed lines

@@ -7,9 +7,9 @@
  * Released under the MIT license. See license.txt for details.
  */
 
-require dirname(__FILE__) . '/Puc/v4p4/Factory.php';
-require dirname(__FILE__) . '/Puc/v4/Factory.php';
-require dirname(__FILE__) . '/Puc/v4p4/Autoloader.php';
+require dirname(__FILE__).'/Puc/v4p4/Factory.php';
+require dirname(__FILE__).'/Puc/v4/Factory.php';
+require dirname(__FILE__).'/Puc/v4p4/Autoloader.php';
 new Puc_v4p4_Autoloader();
 
 //Register classes defined in this file with the factory.

classes/external/php/plugin-update-checker/vendor/ParsedownLegacy.php

Indentation +3 added lines, -3 removed lines

@@ -1528,8 +1528,8 @@
         'q', 'rt', 'ins', 'font',          'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
-                   'var', 'ruby',
-                   'wbr', 'span',
-                          'time',
+                    'var', 'ruby',
+                    'wbr', 'span',
+                            'time',
     );
 }

Spacing +51 added lines, -51 removed lines

@@ -147,7 +147,7 @@ 
 
                 foreach ($parts as $part)
                 {
-                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
+                    $shortage = 4 - mb_strlen($line, 'utf-8')%4;
 
                     $line .= str_repeat(' ', $shortage);
                     $line .= $part;
@@ -158,7 +158,7 @@ 
 
             while (isset($line[$indent]) and $line[$indent] === ' ')
             {
-                $indent ++;
+                $indent++;
             }
 
             $text = $indent > 0 ? substr($line, $indent) : $line;
@@ -202,7 +202,7 @@ 
             {
                 foreach ($this->BlockTypes[$marker] as $blockType)
                 {
-                    $blockTypes []= $blockType;
+                    $blockTypes [] = $blockType;
                 }
             }
 
@@ -217,9 +217,9 @@ 
                 {
                     $Block['type'] = $blockType;
 
-                    if ( ! isset($Block['identified']))
+                    if (!isset($Block['identified']))
                     {
-                        $Blocks []= $CurrentBlock;
+                        $Blocks [] = $CurrentBlock;
 
                         $Block['identified'] = true;
                     }
@@ -237,13 +237,13 @@ 
 
             # ~
 
-            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+            if (isset($CurrentBlock) and !isset($CurrentBlock['type']) and !isset($CurrentBlock['interrupted']))
             {
                 $CurrentBlock['element']['text'] .= "\n".$text;
             }
             else
             {
-                $Blocks []= $CurrentBlock;
+                $Blocks [] = $CurrentBlock;
 
                 $CurrentBlock = $this->paragraph($Line);
 
@@ -260,7 +260,7 @@ 
 
         # ~
 
-        $Blocks []= $CurrentBlock;
+        $Blocks [] = $CurrentBlock;
 
         unset($Blocks[0]);
 
@@ -291,7 +291,7 @@ 
 
     protected function blockCode($Line, $Block = null)
     {
-        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+        if (isset($Block) and !isset($Block['type']) and !isset($Block['interrupted']))
         {
             return;
         }
@@ -379,7 +379,7 @@ 
             return;
         }
 
-        $Block['markup'] .= "\n" . $Line['body'];
+        $Block['markup'] .= "\n".$Line['body'];
 
         if (preg_match('/-->$/', $Line['text']))
         {
@@ -446,7 +446,7 @@ 
             return $Block;
         }
 
-        $Block['element']['text']['text'] .= "\n".$Line['body'];;
+        $Block['element']['text']['text'] .= "\n".$Line['body']; ;
 
         return $Block;
     }
@@ -473,7 +473,7 @@ 
 
             while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
             {
-                $level ++;
+                $level++;
             }
 
             if ($level > 6)
@@ -485,7 +485,7 @@ 
 
             $Block = array(
                 'element' => array(
-                    'name' => 'h' . min(6, $level),
+                    'name' => 'h'.min(6, $level),
                     'text' => $text,
                     'handler' => 'line',
                 ),
@@ -521,7 +521,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -533,7 +533,7 @@ 
         {
             if (isset($Block['interrupted']))
             {
-                $Block['li']['text'] []= '';
+                $Block['li']['text'] [] = '';
 
                 unset($Block['interrupted']);
             }
@@ -550,7 +550,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -560,22 +560,22 @@ 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             return $Block;
         }
 
         if ($Line['indent'] > 0)
         {
-            $Block['li']['text'] []= '';
+            $Block['li']['text'] [] = '';
 
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             unset($Block['interrupted']);
 
@@ -608,19 +608,19 @@ 
         {
             if (isset($Block['interrupted']))
             {
-                $Block['element']['text'] []= '';
+                $Block['element']['text'] [] = '';
 
                 unset($Block['interrupted']);
             }
 
-            $Block['element']['text'] []= $matches[1];
+            $Block['element']['text'] [] = $matches[1];
 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
-            $Block['element']['text'] []= $Line['text'];
+            $Block['element']['text'] [] = $Line['text'];
 
             return $Block;
         }
@@ -648,7 +648,7 @@ 
 
     protected function blockSetextHeader($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -723,14 +723,14 @@ 
 
         if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
         {
-            $Block['depth'] ++;
+            $Block['depth']++;
         }
 
         if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
         {
             if ($Block['depth'] > 0)
             {
-                $Block['depth'] --;
+                $Block['depth']--;
             }
             else
             {
@@ -786,7 +786,7 @@ 
 
     protected function blockTable($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -823,7 +823,7 @@ 
                     $alignment = $alignment === 'left' ? 'center' : 'right';
                 }
 
-                $alignments []= $alignment;
+                $alignments [] = $alignment;
             }
 
             # ~
@@ -856,7 +856,7 @@ 
                     );
                 }
 
-                $HeaderElements []= $HeaderElement;
+                $HeaderElements [] = $HeaderElement;
             }
 
             # ~
@@ -870,18 +870,18 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'thead',
                 'handler' => 'elements',
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'tbody',
                 'handler' => 'elements',
                 'text' => array(),
             );
 
-            $Block['element']['text'][0]['text'] []= array(
+            $Block['element']['text'][0]['text'] [] = array(
                 'name' => 'tr',
                 'handler' => 'elements',
                 'text' => $HeaderElements,
@@ -926,7 +926,7 @@ 
                     );
                 }
 
-                $Elements []= $Element;
+                $Elements [] = $Element;
             }
 
             $Element = array(
@@ -935,7 +935,7 @@ 
                 'text' => $Elements,
             );
 
-            $Block['element']['text'][1]['text'] []= $Element;
+            $Block['element']['text'][1]['text'] [] = $Element;
 
             return $Block;
         }
@@ -1005,7 +1005,7 @@ 
             {
                 $Inline = $this->{'inline'.$inlineType}($Excerpt);
 
-                if ( ! isset($Inline))
+                if (!isset($Inline))
                 {
                     continue;
                 }
@@ -1015,7 +1015,7 @@ 
                     continue;
                 }
 
-                if ( ! isset($Inline['position']))
+                if (!isset($Inline['position']))
                 {
                     $Inline['position'] = $markerPosition;
                 }
@@ -1037,7 +1037,7 @@ 
 
             $unexaminedText = substr($excerpt, 1);
 
-            $markerPosition ++;
+            $markerPosition++;
         }
 
         $markup .= $this->unmarkedText($text);
@@ -1075,9 +1075,9 @@ 
         {
             $url = $matches[1];
 
-            if ( ! isset($matches[2]))
+            if (!isset($matches[2]))
             {
-                $url = 'mailto:' . $url;
+                $url = 'mailto:'.$url;
             }
 
             return array(
@@ -1095,7 +1095,7 @@ 
 
     protected function inlineEmphasis($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1138,12 +1138,12 @@ 
 
     protected function inlineImage($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
         {
             return;
         }
 
-        $Excerpt['text']= substr($Excerpt['text'], 1);
+        $Excerpt['text'] = substr($Excerpt['text'], 1);
 
         $Link = $this->inlineLink($Excerpt);
 
@@ -1224,7 +1224,7 @@ 
                 $definition = strtolower($Element['text']);
             }
 
-            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            if (!isset($this->DefinitionData['Reference'][$definition]))
             {
                 return;
             }
@@ -1277,7 +1277,7 @@ 
 
     protected function inlineSpecialCharacter($Excerpt)
     {
-        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+        if ($Excerpt['text'][0] === '&' and !preg_match('/^&#?\w+;/', $Excerpt['text']))
         {
             return array(
                 'markup' => '&amp;',
@@ -1298,7 +1298,7 @@ 
 
     protected function inlineStrikethrough($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1318,7 +1318,7 @@ 
 
     protected function inlineUrl($Excerpt)
     {
-        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
         {
             return;
         }
@@ -1432,7 +1432,7 @@ 
 
         foreach ($Elements as $Element)
         {
-            $markup .= "\n" . $this->element($Element);
+            $markup .= "\n".$this->element($Element);
         }
 
         $markup .= "\n";
@@ -1448,7 +1448,7 @@ 
 
         $trimmedMarkup = trim($markup);
 
-        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+        if (!in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
         {
             $markup = $trimmedMarkup;
             $markup = substr($markup, 3);
@@ -1524,8 +1524,8 @@ 
     protected $textLevelElements = array(
         'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
         'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'ins', 'font',          'strong',
+        'i', 'rp', 'del', 'code', 'strike', 'marquee',
+        'q', 'rt', 'ins', 'font', 'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
                    'var', 'ruby',

Braces +21 added lines, -27 removed lines

@@ -178,8 +178,7 @@ 
                     $CurrentBlock = $Block;
 
                     continue;
-                }
-                else
+                } else
                 {
                     if (method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
                     {
@@ -240,8 +239,7 @@ 
             if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
             {
                 $CurrentBlock['element']['text'] .= "\n".$text;
-            }
-            else
+            } else
             {
                 $Blocks []= $CurrentBlock;
 
@@ -696,8 +694,7 @@ 
 
                     $Block['void'] = true;
                 }
-            }
-            else
+            } else
             {
                 if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
                 {
@@ -721,18 +718,21 @@ 
             return;
         }
 
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) {
+            # open
         {
             $Block['depth'] ++;
         }
+        }
 
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) {
+            # close
         {
             if ($Block['depth'] > 0)
             {
                 $Block['depth'] --;
-            }
-            else
+        }
+            } else
             {
                 $Block['closed'] = true;
             }
@@ -1010,10 +1010,12 @@ 
                     continue;
                 }
 
-                if (isset($Inline['position']) and $Inline['position'] > $markerPosition) # position is ahead of marker
+                if (isset($Inline['position']) and $Inline['position'] > $markerPosition) {
+                    # position is ahead of marker
                 {
                     continue;
                 }
+                }
 
                 if ( ! isset($Inline['position']))
                 {
@@ -1105,12 +1107,10 @@ 
         if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'strong';
-        }
-        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'em';
-        }
-        else
+        } else
         {
             return;
         }
@@ -1193,8 +1193,7 @@ 
             $extent += strlen($matches[0]);
 
             $remainder = substr($remainder, $extent);
-        }
-        else
+        } else
         {
             return;
         }
@@ -1209,8 +1208,7 @@ 
             }
 
             $extent += strlen($matches[0]);
-        }
-        else
+        } else
         {
             if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
             {
@@ -1218,8 +1216,7 @@ 
                 $definition = strtolower($definition);
 
                 $extent += strlen($matches[0]);
-            }
-            else
+            } else
             {
                 $definition = strtolower($Element['text']);
             }
@@ -1372,8 +1369,7 @@ 
         if ($this->breaksEnabled)
         {
             $text = preg_replace('/[ ]*\n/', "<br />\n", $text);
-        }
-        else
+        } else
         {
             $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
             $text = str_replace(" \n", "\n", $text);
@@ -1410,15 +1406,13 @@ 
             if (isset($Element['handler']))
             {
                 $markup .= $this->{$Element['handler']}($Element['text']);
-            }
-            else
+            } else
             {
                 $markup .= $Element['text'];
             }
 
             $markup .= '</'.$Element['name'].'>';
-        }
-        else
+        } else
         {
             $markup .= ' />';
         }

classes/external/php/plugin-update-checker/vendor/Parsedown.php

Indentation +3 added lines, -3 removed lines

@@ -1531,8 +1531,8 @@
         'q', 'rt', 'ins', 'font',          'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
-                   'var', 'ruby',
-                   'wbr', 'span',
-                          'time',
+                    'var', 'ruby',
+                    'wbr', 'span',
+                            'time',
     );
 }
\ No newline at end of file

Spacing +50 added lines, -50 removed lines

@@ -141,7 +141,7 @@ 
 
                 foreach ($parts as $part)
                 {
-                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
+                    $shortage = 4 - mb_strlen($line, 'utf-8')%4;
 
                     $line .= str_repeat(' ', $shortage);
                     $line .= $part;
@@ -152,7 +152,7 @@ 
 
             while (isset($line[$indent]) and $line[$indent] === ' ')
             {
-                $indent ++;
+                $indent++;
             }
 
             $text = $indent > 0 ? substr($line, $indent) : $line;
@@ -194,7 +194,7 @@ 
             {
                 foreach ($this->BlockTypes[$marker] as $blockType)
                 {
-                    $blockTypes []= $blockType;
+                    $blockTypes [] = $blockType;
                 }
             }
 
@@ -209,9 +209,9 @@ 
                 {
                     $Block['type'] = $blockType;
 
-                    if ( ! isset($Block['identified']))
+                    if (!isset($Block['identified']))
                     {
-                        $Blocks []= $CurrentBlock;
+                        $Blocks [] = $CurrentBlock;
 
                         $Block['identified'] = true;
                     }
@@ -229,13 +229,13 @@ 
 
             # ~
 
-            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+            if (isset($CurrentBlock) and !isset($CurrentBlock['type']) and !isset($CurrentBlock['interrupted']))
             {
                 $CurrentBlock['element']['text'] .= "\n".$text;
             }
             else
             {
-                $Blocks []= $CurrentBlock;
+                $Blocks [] = $CurrentBlock;
 
                 $CurrentBlock = $this->paragraph($Line);
 
@@ -252,7 +252,7 @@ 
 
         # ~
 
-        $Blocks []= $CurrentBlock;
+        $Blocks [] = $CurrentBlock;
 
         unset($Blocks[0]);
 
@@ -293,7 +293,7 @@ 
 
     protected function blockCode($Line, $Block = null)
     {
-        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+        if (isset($Block) and !isset($Block['type']) and !isset($Block['interrupted']))
         {
             return;
         }
@@ -381,7 +381,7 @@ 
             return;
         }
 
-        $Block['markup'] .= "\n" . $Line['body'];
+        $Block['markup'] .= "\n".$Line['body'];
 
         if (preg_match('/-->$/', $Line['text']))
         {
@@ -448,7 +448,7 @@ 
             return $Block;
         }
 
-        $Block['element']['text']['text'] .= "\n".$Line['body'];;
+        $Block['element']['text']['text'] .= "\n".$Line['body']; ;
 
         return $Block;
     }
@@ -475,7 +475,7 @@ 
 
             while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
             {
-                $level ++;
+                $level++;
             }
 
             if ($level > 6)
@@ -487,7 +487,7 @@ 
 
             $Block = array(
                 'element' => array(
-                    'name' => 'h' . min(6, $level),
+                    'name' => 'h'.min(6, $level),
                     'text' => $text,
                     'handler' => 'line',
                 ),
@@ -523,7 +523,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -535,7 +535,7 @@ 
         {
             if (isset($Block['interrupted']))
             {
-                $Block['li']['text'] []= '';
+                $Block['li']['text'] [] = '';
 
                 unset($Block['interrupted']);
             }
@@ -552,7 +552,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -562,22 +562,22 @@ 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             return $Block;
         }
 
         if ($Line['indent'] > 0)
         {
-            $Block['li']['text'] []= '';
+            $Block['li']['text'] [] = '';
 
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             unset($Block['interrupted']);
 
@@ -610,19 +610,19 @@ 
         {
             if (isset($Block['interrupted']))
             {
-                $Block['element']['text'] []= '';
+                $Block['element']['text'] [] = '';
 
                 unset($Block['interrupted']);
             }
 
-            $Block['element']['text'] []= $matches[1];
+            $Block['element']['text'] [] = $matches[1];
 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
-            $Block['element']['text'] []= $Line['text'];
+            $Block['element']['text'] [] = $Line['text'];
 
             return $Block;
         }
@@ -650,7 +650,7 @@ 
 
     protected function blockSetextHeader($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -727,14 +727,14 @@ 
 
         if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
         {
-            $Block['depth'] ++;
+            $Block['depth']++;
         }
 
         if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
         {
             if ($Block['depth'] > 0)
             {
-                $Block['depth'] --;
+                $Block['depth']--;
             }
             else
             {
@@ -788,7 +788,7 @@ 
 
     protected function blockTable($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -825,7 +825,7 @@ 
                     $alignment = $alignment === 'left' ? 'center' : 'right';
                 }
 
-                $alignments []= $alignment;
+                $alignments [] = $alignment;
             }
 
             # ~
@@ -858,7 +858,7 @@ 
                     );
                 }
 
-                $HeaderElements []= $HeaderElement;
+                $HeaderElements [] = $HeaderElement;
             }
 
             # ~
@@ -872,18 +872,18 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'thead',
                 'handler' => 'elements',
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'tbody',
                 'handler' => 'elements',
                 'text' => array(),
             );
 
-            $Block['element']['text'][0]['text'] []= array(
+            $Block['element']['text'][0]['text'] [] = array(
                 'name' => 'tr',
                 'handler' => 'elements',
                 'text' => $HeaderElements,
@@ -928,7 +928,7 @@ 
                     );
                 }
 
-                $Elements []= $Element;
+                $Elements [] = $Element;
             }
 
             $Element = array(
@@ -937,7 +937,7 @@ 
                 'text' => $Elements,
             );
 
-            $Block['element']['text'][1]['text'] []= $Element;
+            $Block['element']['text'][1]['text'] [] = $Element;
 
             return $Block;
         }
@@ -1005,7 +1005,7 @@ 
             {
                 $Inline = $this->{'inline'.$inlineType}($Excerpt);
 
-                if ( ! isset($Inline))
+                if (!isset($Inline))
                 {
                     continue;
                 }
@@ -1019,7 +1019,7 @@ 
 
                 # sets a default inline position
 
-                if ( ! isset($Inline['position']))
+                if (!isset($Inline['position']))
                 {
                     $Inline['position'] = $markerPosition;
                 }
@@ -1083,9 +1083,9 @@ 
         {
             $url = $matches[1];
 
-            if ( ! isset($matches[2]))
+            if (!isset($matches[2]))
             {
-                $url = 'mailto:' . $url;
+                $url = 'mailto:'.$url;
             }
 
             return array(
@@ -1103,7 +1103,7 @@ 
 
     protected function inlineEmphasis($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1146,12 +1146,12 @@ 
 
     protected function inlineImage($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
         {
             return;
         }
 
-        $Excerpt['text']= substr($Excerpt['text'], 1);
+        $Excerpt['text'] = substr($Excerpt['text'], 1);
 
         $Link = $this->inlineLink($Excerpt);
 
@@ -1232,7 +1232,7 @@ 
                 $definition = strtolower($Element['text']);
             }
 
-            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            if (!isset($this->DefinitionData['Reference'][$definition]))
             {
                 return;
             }
@@ -1285,7 +1285,7 @@ 
 
     protected function inlineSpecialCharacter($Excerpt)
     {
-        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+        if ($Excerpt['text'][0] === '&' and !preg_match('/^&#?\w+;/', $Excerpt['text']))
         {
             return array(
                 'markup' => '&amp;',
@@ -1306,7 +1306,7 @@ 
 
     protected function inlineStrikethrough($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1326,7 +1326,7 @@ 
 
     protected function inlineUrl($Excerpt)
     {
-        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
         {
             return;
         }
@@ -1435,7 +1435,7 @@ 
 
         foreach ($Elements as $Element)
         {
-            $markup .= "\n" . $this->element($Element);
+            $markup .= "\n".$this->element($Element);
         }
 
         $markup .= "\n";
@@ -1451,7 +1451,7 @@ 
 
         $trimmedMarkup = trim($markup);
 
-        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+        if (!in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
         {
             $markup = $trimmedMarkup;
             $markup = substr($markup, 3);
@@ -1527,8 +1527,8 @@ 
     protected $textLevelElements = array(
         'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
         'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'ins', 'font',          'strong',
+        'i', 'rp', 'del', 'code', 'strike', 'marquee',
+        'q', 'rt', 'ins', 'font', 'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
                    'var', 'ruby',

Braces +18 added lines, -26 removed lines

@@ -172,8 +172,7 @@ 
                     $CurrentBlock = $Block;
 
                     continue;
-                }
-                else
+                } else
                 {
                     if ($this->isBlockCompletable($CurrentBlock['type']))
                     {
@@ -232,8 +231,7 @@ 
             if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
             {
                 $CurrentBlock['element']['text'] .= "\n".$text;
-            }
-            else
+            } else
             {
                 $Blocks []= $CurrentBlock;
 
@@ -700,8 +698,7 @@ 
 
                     $Block['void'] = true;
                 }
-            }
-            else
+            } else
             {
                 if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
                 {
@@ -725,18 +722,21 @@ 
             return;
         }
 
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) {
+            # open
         {
             $Block['depth'] ++;
         }
+        }
 
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) {
+            # close
         {
             if ($Block['depth'] > 0)
             {
                 $Block['depth'] --;
-            }
-            else
+        }
+            } else
             {
                 $Block['closed'] = true;
             }
@@ -1113,12 +1113,10 @@ 
         if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'strong';
-        }
-        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'em';
-        }
-        else
+        } else
         {
             return;
         }
@@ -1201,8 +1199,7 @@ 
             $extent += strlen($matches[0]);
 
             $remainder = substr($remainder, $extent);
-        }
-        else
+        } else
         {
             return;
         }
@@ -1217,8 +1214,7 @@ 
             }
 
             $extent += strlen($matches[0]);
-        }
-        else
+        } else
         {
             if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
             {
@@ -1226,8 +1222,7 @@ 
                 $definition = strtolower($definition);
 
                 $extent += strlen($matches[0]);
-            }
-            else
+            } else
             {
                 $definition = strtolower($Element['text']);
             }
@@ -1375,8 +1370,7 @@ 
         if ($this->breaksEnabled)
         {
             $text = preg_replace('/[ ]*\n/', "<br />\n", $text);
-        }
-        else
+        } else
         {
             $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
             $text = str_replace(" \n", "\n", $text);
@@ -1413,15 +1407,13 @@ 
             if (isset($Element['handler']))
             {
                 $markup .= $this->{$Element['handler']}($Element['text']);
-            }
-            else
+            } else
             {
                 $markup .= $Element['text'];
             }
 
             $markup .= '</'.$Element['name'].'>';
-        }
-        else
+        } else
         {
             $markup .= ' />';
         }

classes/external/php/plugin-update-checker/Puc/v4p4/Utils.php

Indentation +57 added lines, -57 removed lines

@@ -2,68 +2,68 @@
 
 if ( !class_exists('Puc_v4p4_Utils', false) ):
 
-	class Puc_v4p4_Utils {
-		/**
-		 * Get a value from a nested array or object based on a path.
-		 *
-		 * @param array|object|null $collection Get an entry from this array.
-		 * @param array|string $path A list of array keys in hierarchy order, or a string path like "foo.bar.baz".
-		 * @param mixed $default The value to return if the specified path is not found.
-		 * @param string $separator Path element separator. Only applies to string paths.
-		 * @return mixed
-		 */
-		public static function get($collection, $path, $default = null, $separator = '.') {
-			if ( is_string($path) ) {
-				$path = explode($separator, $path);
-			}
+    class Puc_v4p4_Utils {
+        /**
+         * Get a value from a nested array or object based on a path.
+         *
+         * @param array|object|null $collection Get an entry from this array.
+         * @param array|string $path A list of array keys in hierarchy order, or a string path like "foo.bar.baz".
+         * @param mixed $default The value to return if the specified path is not found.
+         * @param string $separator Path element separator. Only applies to string paths.
+         * @return mixed
+         */
+        public static function get($collection, $path, $default = null, $separator = '.') {
+            if ( is_string($path) ) {
+                $path = explode($separator, $path);
+            }
 
-			//Follow the $path into $input as far as possible.
-			$currentValue = $collection;
-			foreach ($path as $node) {
-				if ( is_array($currentValue) && isset($currentValue[$node]) ) {
-					$currentValue = $currentValue[$node];
-				} else if ( is_object($currentValue) && isset($currentValue->$node) ) {
-					$currentValue = $currentValue->$node;
-				} else {
-					return $default;
-				}
-			}
+            //Follow the $path into $input as far as possible.
+            $currentValue = $collection;
+            foreach ($path as $node) {
+                if ( is_array($currentValue) && isset($currentValue[$node]) ) {
+                    $currentValue = $currentValue[$node];
+                } else if ( is_object($currentValue) && isset($currentValue->$node) ) {
+                    $currentValue = $currentValue->$node;
+                } else {
+                    return $default;
+                }
+            }
 
-			return $currentValue;
-		}
+            return $currentValue;
+        }
 
-		/**
-		 * Get the first array element that is not empty.
-		 *
-		 * @param array $values
-		 * @param mixed|null $default Returns this value if there are no non-empty elements.
-		 * @return mixed|null
-		 */
-		public static function findNotEmpty($values, $default = null) {
-			if ( empty($values) ) {
-				return $default;
-			}
+        /**
+         * Get the first array element that is not empty.
+         *
+         * @param array $values
+         * @param mixed|null $default Returns this value if there are no non-empty elements.
+         * @return mixed|null
+         */
+        public static function findNotEmpty($values, $default = null) {
+            if ( empty($values) ) {
+                return $default;
+            }
 
-			foreach ($values as $value) {
-				if ( !empty($value) ) {
-					return $value;
-				}
-			}
+            foreach ($values as $value) {
+                if ( !empty($value) ) {
+                    return $value;
+                }
+            }
 
-			return $default;
-		}
+            return $default;
+        }
 
-		/**
-		 * Check if the input string starts with the specified prefix.
-		 *
-		 * @param string $input
-		 * @param string $prefix
-		 * @return bool
-		 */
-		public static function startsWith($input, $prefix) {
-			$length = strlen($prefix);
-			return (substr($input, 0, $length) === $prefix);
-		}
-	}
+        /**
+         * Check if the input string starts with the specified prefix.
+         *
+         * @param string $input
+         * @param string $prefix
+         * @return bool
+         */
+        public static function startsWith($input, $prefix) {
+            $length = strlen($prefix);
+            return (substr($input, 0, $length) === $prefix);
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Utils', false) ):
+if (!class_exists('Puc_v4p4_Utils', false)):
 
 	class Puc_v4p4_Utils {
 		/**
@@ -13,16 +13,16 @@ 
 		 * @return mixed
 		 */
 		public static function get($collection, $path, $default = null, $separator = '.') {
-			if ( is_string($path) ) {
+			if (is_string($path)) {
 				$path = explode($separator, $path);
 			}
 
 			//Follow the $path into $input as far as possible.
 			$currentValue = $collection;
 			foreach ($path as $node) {
-				if ( is_array($currentValue) && isset($currentValue[$node]) ) {
+				if (is_array($currentValue) && isset($currentValue[$node])) {
 					$currentValue = $currentValue[$node];
-				} else if ( is_object($currentValue) && isset($currentValue->$node) ) {
+				} else if (is_object($currentValue) && isset($currentValue->$node)) {
 					$currentValue = $currentValue->$node;
 				} else {
 					return $default;
@@ -40,12 +40,12 @@ 
 		 * @return mixed|null
 		 */
 		public static function findNotEmpty($values, $default = null) {
-			if ( empty($values) ) {
+			if (empty($values)) {
 				return $default;
 			}
 
 			foreach ($values as $value) {
-				if ( !empty($value) ) {
+				if (!empty($value)) {
 					return $value;
 				}
 			}

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/BaseChecker.php

Indentation +20 added lines, -20 removed lines

@@ -1,27 +1,27 @@
 <?php
 if ( !interface_exists('Puc_v4p4_Vcs_BaseChecker', false) ):
 
-	interface Puc_v4p4_Vcs_BaseChecker {
-		/**
-		 * Set the repository branch to use for updates. Defaults to 'master'.
-		 *
-		 * @param string $branch
-		 * @return $this
-		 */
-		public function setBranch($branch);
+    interface Puc_v4p4_Vcs_BaseChecker {
+        /**
+         * Set the repository branch to use for updates. Defaults to 'master'.
+         *
+         * @param string $branch
+         * @return $this
+         */
+        public function setBranch($branch);
 
-		/**
-		 * Set authentication credentials.
-		 *
-		 * @param array|string $credentials
-		 * @return $this
-		 */
-		public function setAuthentication($credentials);
+        /**
+         * Set authentication credentials.
+         *
+         * @param array|string $credentials
+         * @return $this
+         */
+        public function setAuthentication($credentials);
 
-		/**
-		 * @return Puc_v4p4_Vcs_Api
-		 */
-		public function getVcsApi();
-	}
+        /**
+         * @return Puc_v4p4_Vcs_Api
+         */
+        public function getVcsApi();
+    }
 
 endif;
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( !interface_exists('Puc_v4p4_Vcs_BaseChecker', false) ):
+if (!interface_exists('Puc_v4p4_Vcs_BaseChecker', false)):
 
 	interface Puc_v4p4_Vcs_BaseChecker {
 		/**

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/ThemeUpdateChecker.php

Indentation +112 added lines, -112 removed lines

@@ -2,117 +2,117 @@
 
 if ( !class_exists('Puc_v4p4_Vcs_ThemeUpdateChecker', false) ):
 
-	class Puc_v4p4_Vcs_ThemeUpdateChecker extends Puc_v4p4_Theme_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
-		/**
-		 * @var string The branch where to look for updates. Defaults to "master".
-		 */
-		protected $branch = 'master';
-
-		/**
-		 * @var Puc_v4p4_Vcs_Api Repository API client.
-		 */
-		protected $api = null;
-
-		/**
-		 * Puc_v4p4_Vcs_ThemeUpdateChecker constructor.
-		 *
-		 * @param Puc_v4p4_Vcs_Api $api
-		 * @param null $stylesheet
-		 * @param null $customSlug
-		 * @param int $checkPeriod
-		 * @param string $optionName
-		 */
-		public function __construct($api, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			$this->api = $api;
-			$this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
-
-			parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
-
-			$this->api->setSlug($this->slug);
-		}
-
-		public function requestUpdate() {
-			$api = $this->api;
-			$api->setLocalDirectory($this->getAbsoluteDirectoryPath());
-
-			$update = new Puc_v4p4_Theme_Update();
-			$update->slug = $this->slug;
-
-			//Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
-			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
-				$ref = $updateSource->name;
-				$update->download_url = $updateSource->downloadUrl;
-			} else {
-				do_action(
-					'puc_api_error',
-					new WP_Error(
-						'puc-no-update-source',
-						'Could not retrieve version information from the repository. '
-						. 'This usually means that the update checker either can\'t connect '
-						. 'to the repository or it\'s configured incorrectly.'
-					),
-					null, null, $this->slug
-				);
-				$ref = $this->branch;
-			}
-
-			//Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
-			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
-			$remoteHeader = $this->getFileHeader($api->getRemoteFile('style.css', $ref));
-			$update->version = Puc_v4p4_Utils::findNotEmpty(array(
-				$remoteHeader['Version'],
-				Puc_v4p4_Utils::get($updateSource, 'version'),
-			));
-
-			//The details URL defaults to the Theme URI header or the repository URL.
-			$update->details_url = Puc_v4p4_Utils::findNotEmpty(array(
-				$remoteHeader['ThemeURI'],
-				$this->theme->get('ThemeURI'),
-				$this->metadataUrl,
-			));
-
-			if ( empty($update->version) ) {
-				//It looks like we didn't find a valid update after all.
-				$update = null;
-			}
-
-			$update = $this->filterUpdateResult($update);
-			return $update;
-		}
-
-		//FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
-
-		public function setBranch($branch) {
-			$this->branch = $branch;
-			return $this;
-		}
-
-		public function setAuthentication($credentials) {
-			$this->api->setAuthentication($credentials);
-			return $this;
-		}
-
-		public function getVcsApi() {
-			return $this->api;
-		}
-
-		public function getUpdate() {
-			$update = parent::getUpdate();
-
-			if ( isset($update) && !empty($update->download_url) ) {
-				$update->download_url = $this->api->signDownloadUrl($update->download_url);
-			}
-
-			return $update;
-		}
-
-		public function onDisplayConfiguration($panel) {
-			parent::onDisplayConfiguration($panel);
-			$panel->row('Branch', $this->branch);
-			$panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
-			$panel->row('API client', get_class($this->api));
-		}
-	}
+    class Puc_v4p4_Vcs_ThemeUpdateChecker extends Puc_v4p4_Theme_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
+        /**
+         * @var string The branch where to look for updates. Defaults to "master".
+         */
+        protected $branch = 'master';
+
+        /**
+         * @var Puc_v4p4_Vcs_Api Repository API client.
+         */
+        protected $api = null;
+
+        /**
+         * Puc_v4p4_Vcs_ThemeUpdateChecker constructor.
+         *
+         * @param Puc_v4p4_Vcs_Api $api
+         * @param null $stylesheet
+         * @param null $customSlug
+         * @param int $checkPeriod
+         * @param string $optionName
+         */
+        public function __construct($api, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
+            $this->api = $api;
+            $this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
+
+            parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
+
+            $this->api->setSlug($this->slug);
+        }
+
+        public function requestUpdate() {
+            $api = $this->api;
+            $api->setLocalDirectory($this->getAbsoluteDirectoryPath());
+
+            $update = new Puc_v4p4_Theme_Update();
+            $update->slug = $this->slug;
+
+            //Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
+            $updateSource = $api->chooseReference($this->branch);
+            if ( $updateSource ) {
+                $ref = $updateSource->name;
+                $update->download_url = $updateSource->downloadUrl;
+            } else {
+                do_action(
+                    'puc_api_error',
+                    new WP_Error(
+                        'puc-no-update-source',
+                        'Could not retrieve version information from the repository. '
+                        . 'This usually means that the update checker either can\'t connect '
+                        . 'to the repository or it\'s configured incorrectly.'
+                    ),
+                    null, null, $this->slug
+                );
+                $ref = $this->branch;
+            }
+
+            //Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
+            //are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
+            $remoteHeader = $this->getFileHeader($api->getRemoteFile('style.css', $ref));
+            $update->version = Puc_v4p4_Utils::findNotEmpty(array(
+                $remoteHeader['Version'],
+                Puc_v4p4_Utils::get($updateSource, 'version'),
+            ));
+
+            //The details URL defaults to the Theme URI header or the repository URL.
+            $update->details_url = Puc_v4p4_Utils::findNotEmpty(array(
+                $remoteHeader['ThemeURI'],
+                $this->theme->get('ThemeURI'),
+                $this->metadataUrl,
+            ));
+
+            if ( empty($update->version) ) {
+                //It looks like we didn't find a valid update after all.
+                $update = null;
+            }
+
+            $update = $this->filterUpdateResult($update);
+            return $update;
+        }
+
+        //FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
+
+        public function setBranch($branch) {
+            $this->branch = $branch;
+            return $this;
+        }
+
+        public function setAuthentication($credentials) {
+            $this->api->setAuthentication($credentials);
+            return $this;
+        }
+
+        public function getVcsApi() {
+            return $this->api;
+        }
+
+        public function getUpdate() {
+            $update = parent::getUpdate();
+
+            if ( isset($update) && !empty($update->download_url) ) {
+                $update->download_url = $this->api->signDownloadUrl($update->download_url);
+            }
+
+            return $update;
+        }
+
+        public function onDisplayConfiguration($panel) {
+            parent::onDisplayConfiguration($panel);
+            $panel->row('Branch', $this->branch);
+            $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
+            $panel->row('API client', get_class($this->api));
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Vcs_ThemeUpdateChecker', false) ):
+if (!class_exists('Puc_v4p4_Vcs_ThemeUpdateChecker', false)):
 
 	class Puc_v4p4_Vcs_ThemeUpdateChecker extends Puc_v4p4_Theme_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
 		/**
@@ -40,7 +40,7 @@ 
 
 			//Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
 			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
+			if ($updateSource) {
 				$ref = $updateSource->name;
 				$update->download_url = $updateSource->downloadUrl;
 			} else {
@@ -72,7 +72,7 @@ 
 				$this->metadataUrl,
 			));
 
-			if ( empty($update->version) ) {
+			if (empty($update->version)) {
 				//It looks like we didn't find a valid update after all.
 				$update = null;
 			}
@@ -100,7 +100,7 @@ 
 		public function getUpdate() {
 			$update = parent::getUpdate();
 
-			if ( isset($update) && !empty($update->download_url) ) {
+			if (isset($update) && !empty($update->download_url)) {
 				$update->download_url = $this->api->signDownloadUrl($update->download_url);
 			}
 

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/Reference.php

Indentation +39 added lines, -39 removed lines

@@ -1,49 +1,49 @@
 <?php
 if ( !class_exists('Puc_v4p4_Vcs_Reference', false) ):
 
-	/**
-	 * This class represents a VCS branch or tag. It's intended as a read only, short-lived container
-	 * that only exists to provide a limited degree of type checking.
-	 *
-	 * @property string $name
-	 * @property string|null version
-	 * @property string $downloadUrl
-	 * @property string $updated
-	 *
-	 * @property string|null $changelog
-	 * @property int|null $downloadCount
-	 */
-	class Puc_v4p4_Vcs_Reference {
-		private $properties = array();
+    /**
+     * This class represents a VCS branch or tag. It's intended as a read only, short-lived container
+     * that only exists to provide a limited degree of type checking.
+     *
+     * @property string $name
+     * @property string|null version
+     * @property string $downloadUrl
+     * @property string $updated
+     *
+     * @property string|null $changelog
+     * @property int|null $downloadCount
+     */
+    class Puc_v4p4_Vcs_Reference {
+        private $properties = array();
 
-		public function __construct($properties = array()) {
-			$this->properties = $properties;
-		}
+        public function __construct($properties = array()) {
+            $this->properties = $properties;
+        }
 
-		/**
-		 * @param string $name
-		 * @return mixed|null
-		 */
-		public function __get($name) {
-			return array_key_exists($name, $this->properties) ? $this->properties[$name] : null;
-		}
+        /**
+         * @param string $name
+         * @return mixed|null
+         */
+        public function __get($name) {
+            return array_key_exists($name, $this->properties) ? $this->properties[$name] : null;
+        }
 
-		/**
-		 * @param string $name
-		 * @param mixed $value
-		 */
-		public function __set($name, $value) {
-			$this->properties[$name] = $value;
-		}
+        /**
+         * @param string $name
+         * @param mixed $value
+         */
+        public function __set($name, $value) {
+            $this->properties[$name] = $value;
+        }
 
-		/**
-		 * @param string $name
-		 * @return bool
-		 */
-		public function __isset($name) {
-			return isset($this->properties[$name]);
-		}
+        /**
+         * @param string $name
+         * @return bool
+         */
+        public function __isset($name) {
+            return isset($this->properties[$name]);
+        }
 
-	}
+    }
 
 endif;
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( !class_exists('Puc_v4p4_Vcs_Reference', false) ):
+if (!class_exists('Puc_v4p4_Vcs_Reference', false)):
 
 	/**
 	 * This class represents a VCS branch or tag. It's intended as a read only, short-lived container

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/GitLabApi.php

Indentation +267 added lines, -267 removed lines

@@ -2,273 +2,273 @@
 
 if ( !class_exists('Puc_v4p4_Vcs_GitLabApi', false) ):
 
-	class Puc_v4p4_Vcs_GitLabApi extends Puc_v4p4_Vcs_Api {
-		/**
-		 * @var string GitLab username.
-		 */
-		protected $userName;
-
-		/**
-		 * @var string GitLab server host.
-		 */
-		private $repositoryHost;
-
-		/**
-		 * @var string GitLab repository name.
-		 */
-		protected $repositoryName;
-
-		/**
-		 * @var string GitLab authentication token. Optional.
-		 */
-		protected $accessToken;
-
-		public function __construct($repositoryUrl, $accessToken = null) {
-			//Parse the repository host to support custom hosts.
-			$this->repositoryHost = @parse_url($repositoryUrl, PHP_URL_HOST);
-
-			//Find the repository information
-			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
-				$this->userName = $matches['username'];
-				$this->repositoryName = $matches['repository'];
-			} else {
-				//This is not a traditional url, it could be gitlab is in a deeper subdirectory.
-				//Get the path segments.
-				$segments = explode('/', untrailingslashit(ltrim($path, '/')));
-
-				//We need at least /user-name/repository-name/
-				if ( count($segments) < 2 ) {
-					throw new InvalidArgumentException('Invalid GitLab repository URL: "' . $repositoryUrl . '"');
-				}
-
-				//Get the username and repository name.
-				$usernameRepo = array_splice($segments, -2, 2);
-				$this->userName = $usernameRepo[0];
-				$this->repositoryName = $usernameRepo[1];
-
-				//Append the remaining segments to the host.
-				$this->repositoryHost = trailingslashit($this->repositoryHost) . implode('/', $segments);
-			}
-
-			parent::__construct($repositoryUrl, $accessToken);
-		}
-
-		/**
-		 * Get the latest release from GitLab.
-		 *
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getLatestRelease() {
-			return $this->getLatestTag();
-		}
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 *
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getLatestTag() {
-			$tags = $this->api('/:user/:repo/repository/tags');
-			if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
-				return null;
-			}
-
-			$versionTags = $this->sortTagsByVersion($tags);
-			if ( empty($versionTags) ) {
-				return null;
-			}
-
-			$tag = $versionTags[0];
-			return new Puc_v4p4_Vcs_Reference(array(
-				'name' => $tag->name,
-				'version' => ltrim($tag->name, 'v'),
-				'downloadUrl' => $this->buildArchiveDownloadUrl($tag->name),
-				'apiResponse' => $tag
-			));
-		}
-
-		/**
-		 * Get a branch by name.
-		 *
-		 * @param string $branchName
-		 * @return null|Puc_v4p4_Vcs_Reference
-		 */
-		public function getBranch($branchName) {
-			$branch = $this->api('/:user/:repo/repository/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
-				return null;
-			}
-
-			$reference = new Puc_v4p4_Vcs_Reference(array(
-				'name' => $branch->name,
-				'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
-				'apiResponse' => $branch,
-			));
-
-			if ( isset($branch->commit, $branch->commit->committed_date) ) {
-				$reference->updated = $branch->commit->committed_date;
-			}
-
-			return $reference;
-		}
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		public function getLatestCommitTime($ref) {
-			$commits = $this->api('/:user/:repo/repository/commits/', array('ref_name' => $ref));
-			if ( is_wp_error($commits) || !is_array($commits) || !isset($commits[0]) ) {
-				return null;
-			}
-
-			return $commits[0]->committed_date;
-		}
-
-		/**
-		 * Perform a GitLab API request.
-		 *
-		 * @param string $url
-		 * @param array $queryParams
-		 * @return mixed|WP_Error
-		 */
-		protected function api($url, $queryParams = array()) {
-			$baseUrl = $url;
-			$url = $this->buildApiUrl($url, $queryParams);
-
-			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
-				$options = apply_filters($this->httpFilterName, $options);
-			}
+    class Puc_v4p4_Vcs_GitLabApi extends Puc_v4p4_Vcs_Api {
+        /**
+         * @var string GitLab username.
+         */
+        protected $userName;
+
+        /**
+         * @var string GitLab server host.
+         */
+        private $repositoryHost;
+
+        /**
+         * @var string GitLab repository name.
+         */
+        protected $repositoryName;
+
+        /**
+         * @var string GitLab authentication token. Optional.
+         */
+        protected $accessToken;
+
+        public function __construct($repositoryUrl, $accessToken = null) {
+            //Parse the repository host to support custom hosts.
+            $this->repositoryHost = @parse_url($repositoryUrl, PHP_URL_HOST);
+
+            //Find the repository information
+            $path = @parse_url($repositoryUrl, PHP_URL_PATH);
+            if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
+                $this->userName = $matches['username'];
+                $this->repositoryName = $matches['repository'];
+            } else {
+                //This is not a traditional url, it could be gitlab is in a deeper subdirectory.
+                //Get the path segments.
+                $segments = explode('/', untrailingslashit(ltrim($path, '/')));
+
+                //We need at least /user-name/repository-name/
+                if ( count($segments) < 2 ) {
+                    throw new InvalidArgumentException('Invalid GitLab repository URL: "' . $repositoryUrl . '"');
+                }
+
+                //Get the username and repository name.
+                $usernameRepo = array_splice($segments, -2, 2);
+                $this->userName = $usernameRepo[0];
+                $this->repositoryName = $usernameRepo[1];
+
+                //Append the remaining segments to the host.
+                $this->repositoryHost = trailingslashit($this->repositoryHost) . implode('/', $segments);
+            }
+
+            parent::__construct($repositoryUrl, $accessToken);
+        }
+
+        /**
+         * Get the latest release from GitLab.
+         *
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getLatestRelease() {
+            return $this->getLatestTag();
+        }
+
+        /**
+         * Get the tag that looks like the highest version number.
+         *
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getLatestTag() {
+            $tags = $this->api('/:user/:repo/repository/tags');
+            if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
+                return null;
+            }
+
+            $versionTags = $this->sortTagsByVersion($tags);
+            if ( empty($versionTags) ) {
+                return null;
+            }
+
+            $tag = $versionTags[0];
+            return new Puc_v4p4_Vcs_Reference(array(
+                'name' => $tag->name,
+                'version' => ltrim($tag->name, 'v'),
+                'downloadUrl' => $this->buildArchiveDownloadUrl($tag->name),
+                'apiResponse' => $tag
+            ));
+        }
+
+        /**
+         * Get a branch by name.
+         *
+         * @param string $branchName
+         * @return null|Puc_v4p4_Vcs_Reference
+         */
+        public function getBranch($branchName) {
+            $branch = $this->api('/:user/:repo/repository/branches/' . $branchName);
+            if ( is_wp_error($branch) || empty($branch) ) {
+                return null;
+            }
+
+            $reference = new Puc_v4p4_Vcs_Reference(array(
+                'name' => $branch->name,
+                'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
+                'apiResponse' => $branch,
+            ));
+
+            if ( isset($branch->commit, $branch->commit->committed_date) ) {
+                $reference->updated = $branch->commit->committed_date;
+            }
+
+            return $reference;
+        }
+
+        /**
+         * Get the timestamp of the latest commit that changed the specified branch or tag.
+         *
+         * @param string $ref Reference name (e.g. branch or tag).
+         * @return string|null
+         */
+        public function getLatestCommitTime($ref) {
+            $commits = $this->api('/:user/:repo/repository/commits/', array('ref_name' => $ref));
+            if ( is_wp_error($commits) || !is_array($commits) || !isset($commits[0]) ) {
+                return null;
+            }
+
+            return $commits[0]->committed_date;
+        }
+
+        /**
+         * Perform a GitLab API request.
+         *
+         * @param string $url
+         * @param array $queryParams
+         * @return mixed|WP_Error
+         */
+        protected function api($url, $queryParams = array()) {
+            $baseUrl = $url;
+            $url = $this->buildApiUrl($url, $queryParams);
+
+            $options = array('timeout' => 10);
+            if ( !empty($this->httpFilterName) ) {
+                $options = apply_filters($this->httpFilterName, $options);
+            }
 			
-			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
-				do_action('puc_api_error', $response, null, $url, $this->slug);
-				return $response;
-			}
-
-			$code = wp_remote_retrieve_response_code($response);
-			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
-				return json_decode($body);
-			}
-
-			$error = new WP_Error(
-				'puc-gitlab-http-error',
-				sprintf('GitLab API error. URL: "%s",  HTTP status code: %d.', $baseUrl, $code)
-			);
-			do_action('puc_api_error', $error, $response, $url, $this->slug);
-
-			return $error;
-		}
-
-		/**
-		 * Build a fully qualified URL for an API request.
-		 *
-		 * @param string $url
-		 * @param array $queryParams
-		 * @return string
-		 */
-		protected function buildApiUrl($url, $queryParams) {
-			$variables = array(
-				'user' => $this->userName,
-				'repo' => $this->repositoryName
-			);
-
-			foreach ($variables as $name => $value) {
-				$url = str_replace("/:{$name}", urlencode('/' . $value), $url);
-			}
-
-			$url = substr($url, 3);
-			$url = sprintf('https://%1$s/api/v4/projects/%2$s', $this->repositoryHost, $url);
-
-			if ( !empty($this->accessToken) ) {
-				$queryParams['private_token'] = $this->accessToken;
-			}
-
-			if ( !empty($queryParams) ) {
-				$url = add_query_arg($queryParams, $url);
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		public function getRemoteFile($path, $ref = 'master') {
-			$response = $this->api('/:user/:repo/repository/files/' . $path, array('ref' => $ref));
-			if ( is_wp_error($response) || !isset($response->content) || $response->encoding !== 'base64' ) {
-				return null;
-			}
-
-			return base64_decode($response->content);
-		}
-
-		/**
-		 * Generate a URL to download a ZIP archive of the specified branch/tag/etc.
-		 *
-		 * @param string $ref
-		 * @return string
-		 */
-		public function buildArchiveDownloadUrl($ref = 'master') {
-			$url = sprintf(
-				'https://%1$s/%2$s/%3$s/repository/%4$s/archive.zip',
-				$this->repositoryHost,
-				urlencode($this->userName),
-				urlencode($this->repositoryName),
-				urlencode($ref)
-			);
-
-			if ( !empty($this->accessToken) ) {
-				$url = add_query_arg('private_token', $this->accessToken, $url);
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getTag($tagName) {
-			throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p4_Vcs_Reference
-		 */
-		public function chooseReference($configBranch) {
-			$updateSource = null;
-
-			// GitLab doesn't handle releases the same as GitHub so just use the latest tag
-			if ( $configBranch === 'master' ) {
-				$updateSource = $this->getLatestTag();
-			}
-
-			if ( empty($updateSource) ) {
-				$updateSource = $this->getBranch($configBranch);
-			}
-
-			return $updateSource;
-		}
-
-		public function setAuthentication($credentials) {
-			parent::setAuthentication($credentials);
-			$this->accessToken = is_string($credentials) ? $credentials : null;
-		}
-	}
+            $response = wp_remote_get($url, $options);
+            if ( is_wp_error($response) ) {
+                do_action('puc_api_error', $response, null, $url, $this->slug);
+                return $response;
+            }
+
+            $code = wp_remote_retrieve_response_code($response);
+            $body = wp_remote_retrieve_body($response);
+            if ( $code === 200 ) {
+                return json_decode($body);
+            }
+
+            $error = new WP_Error(
+                'puc-gitlab-http-error',
+                sprintf('GitLab API error. URL: "%s",  HTTP status code: %d.', $baseUrl, $code)
+            );
+            do_action('puc_api_error', $error, $response, $url, $this->slug);
+
+            return $error;
+        }
+
+        /**
+         * Build a fully qualified URL for an API request.
+         *
+         * @param string $url
+         * @param array $queryParams
+         * @return string
+         */
+        protected function buildApiUrl($url, $queryParams) {
+            $variables = array(
+                'user' => $this->userName,
+                'repo' => $this->repositoryName
+            );
+
+            foreach ($variables as $name => $value) {
+                $url = str_replace("/:{$name}", urlencode('/' . $value), $url);
+            }
+
+            $url = substr($url, 3);
+            $url = sprintf('https://%1$s/api/v4/projects/%2$s', $this->repositoryHost, $url);
+
+            if ( !empty($this->accessToken) ) {
+                $queryParams['private_token'] = $this->accessToken;
+            }
+
+            if ( !empty($queryParams) ) {
+                $url = add_query_arg($queryParams, $url);
+            }
+
+            return $url;
+        }
+
+        /**
+         * Get the contents of a file from a specific branch or tag.
+         *
+         * @param string $path File name.
+         * @param string $ref
+         * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
+         */
+        public function getRemoteFile($path, $ref = 'master') {
+            $response = $this->api('/:user/:repo/repository/files/' . $path, array('ref' => $ref));
+            if ( is_wp_error($response) || !isset($response->content) || $response->encoding !== 'base64' ) {
+                return null;
+            }
+
+            return base64_decode($response->content);
+        }
+
+        /**
+         * Generate a URL to download a ZIP archive of the specified branch/tag/etc.
+         *
+         * @param string $ref
+         * @return string
+         */
+        public function buildArchiveDownloadUrl($ref = 'master') {
+            $url = sprintf(
+                'https://%1$s/%2$s/%3$s/repository/%4$s/archive.zip',
+                $this->repositoryHost,
+                urlencode($this->userName),
+                urlencode($this->repositoryName),
+                urlencode($ref)
+            );
+
+            if ( !empty($this->accessToken) ) {
+                $url = add_query_arg('private_token', $this->accessToken, $url);
+            }
+
+            return $url;
+        }
+
+        /**
+         * Get a specific tag.
+         *
+         * @param string $tagName
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getTag($tagName) {
+            throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+        }
+
+        /**
+         * Figure out which reference (i.e tag or branch) contains the latest version.
+         *
+         * @param string $configBranch Start looking in this branch.
+         * @return null|Puc_v4p4_Vcs_Reference
+         */
+        public function chooseReference($configBranch) {
+            $updateSource = null;
+
+            // GitLab doesn't handle releases the same as GitHub so just use the latest tag
+            if ( $configBranch === 'master' ) {
+                $updateSource = $this->getLatestTag();
+            }
+
+            if ( empty($updateSource) ) {
+                $updateSource = $this->getBranch($configBranch);
+            }
+
+            return $updateSource;
+        }
+
+        public function setAuthentication($credentials) {
+            parent::setAuthentication($credentials);
+            $this->accessToken = is_string($credentials) ? $credentials : null;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Vcs_GitLabApi', false) ):
+if (!class_exists('Puc_v4p4_Vcs_GitLabApi', false)):
 
 	class Puc_v4p4_Vcs_GitLabApi extends Puc_v4p4_Vcs_Api {
 		/**
@@ -29,7 +29,7 @@ 
 
 			//Find the repository information
 			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
+			if (preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches)) {
 				$this->userName = $matches['username'];
 				$this->repositoryName = $matches['repository'];
 			} else {
@@ -38,8 +38,8 @@ 
 				$segments = explode('/', untrailingslashit(ltrim($path, '/')));
 
 				//We need at least /user-name/repository-name/
-				if ( count($segments) < 2 ) {
-					throw new InvalidArgumentException('Invalid GitLab repository URL: "' . $repositoryUrl . '"');
+				if (count($segments) < 2) {
+					throw new InvalidArgumentException('Invalid GitLab repository URL: "'.$repositoryUrl.'"');
 				}
 
 				//Get the username and repository name.
@@ -48,7 +48,7 @@ 
 				$this->repositoryName = $usernameRepo[1];
 
 				//Append the remaining segments to the host.
-				$this->repositoryHost = trailingslashit($this->repositoryHost) . implode('/', $segments);
+				$this->repositoryHost = trailingslashit($this->repositoryHost).implode('/', $segments);
 			}
 
 			parent::__construct($repositoryUrl, $accessToken);
@@ -70,12 +70,12 @@ 
 		 */
 		public function getLatestTag() {
 			$tags = $this->api('/:user/:repo/repository/tags');
-			if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
+			if (is_wp_error($tags) || empty($tags) || !is_array($tags)) {
 				return null;
 			}
 
 			$versionTags = $this->sortTagsByVersion($tags);
-			if ( empty($versionTags) ) {
+			if (empty($versionTags)) {
 				return null;
 			}
 
@@ -95,8 +95,8 @@ 
 		 * @return null|Puc_v4p4_Vcs_Reference
 		 */
 		public function getBranch($branchName) {
-			$branch = $this->api('/:user/:repo/repository/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
+			$branch = $this->api('/:user/:repo/repository/branches/'.$branchName);
+			if (is_wp_error($branch) || empty($branch)) {
 				return null;
 			}
 
@@ -106,7 +106,7 @@ 
 				'apiResponse' => $branch,
 			));
 
-			if ( isset($branch->commit, $branch->commit->committed_date) ) {
+			if (isset($branch->commit, $branch->commit->committed_date)) {
 				$reference->updated = $branch->commit->committed_date;
 			}
 
@@ -121,7 +121,7 @@ 
 		 */
 		public function getLatestCommitTime($ref) {
 			$commits = $this->api('/:user/:repo/repository/commits/', array('ref_name' => $ref));
-			if ( is_wp_error($commits) || !is_array($commits) || !isset($commits[0]) ) {
+			if (is_wp_error($commits) || !is_array($commits) || !isset($commits[0])) {
 				return null;
 			}
 
@@ -140,19 +140,19 @@ 
 			$url = $this->buildApiUrl($url, $queryParams);
 
 			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
+			if (!empty($this->httpFilterName)) {
 				$options = apply_filters($this->httpFilterName, $options);
 			}
 			
 			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
+			if (is_wp_error($response)) {
 				do_action('puc_api_error', $response, null, $url, $this->slug);
 				return $response;
 			}
 
 			$code = wp_remote_retrieve_response_code($response);
 			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
+			if ($code === 200) {
 				return json_decode($body);
 			}
 
@@ -179,17 +179,17 @@ 
 			);
 
 			foreach ($variables as $name => $value) {
-				$url = str_replace("/:{$name}", urlencode('/' . $value), $url);
+				$url = str_replace("/:{$name}", urlencode('/'.$value), $url);
 			}
 
 			$url = substr($url, 3);
 			$url = sprintf('https://%1$s/api/v4/projects/%2$s', $this->repositoryHost, $url);
 
-			if ( !empty($this->accessToken) ) {
+			if (!empty($this->accessToken)) {
 				$queryParams['private_token'] = $this->accessToken;
 			}
 
-			if ( !empty($queryParams) ) {
+			if (!empty($queryParams)) {
 				$url = add_query_arg($queryParams, $url);
 			}
 
@@ -204,8 +204,8 @@ 
 		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
 		 */
 		public function getRemoteFile($path, $ref = 'master') {
-			$response = $this->api('/:user/:repo/repository/files/' . $path, array('ref' => $ref));
-			if ( is_wp_error($response) || !isset($response->content) || $response->encoding !== 'base64' ) {
+			$response = $this->api('/:user/:repo/repository/files/'.$path, array('ref' => $ref));
+			if (is_wp_error($response) || !isset($response->content) || $response->encoding !== 'base64') {
 				return null;
 			}
 
@@ -227,7 +227,7 @@ 
 				urlencode($ref)
 			);
 
-			if ( !empty($this->accessToken) ) {
+			if (!empty($this->accessToken)) {
 				$url = add_query_arg('private_token', $this->accessToken, $url);
 			}
 
@@ -241,7 +241,7 @@ 
 		 * @return Puc_v4p4_Vcs_Reference|null
 		 */
 		public function getTag($tagName) {
-			throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+			throw new LogicException('The '.__METHOD__.' method is not implemented and should not be used.');
 		}
 
 		/**
@@ -254,11 +254,11 @@ 
 			$updateSource = null;
 
 			// GitLab doesn't handle releases the same as GitHub so just use the latest tag
-			if ( $configBranch === 'master' ) {
+			if ($configBranch === 'master') {
 				$updateSource = $this->getLatestTag();
 			}
 
-			if ( empty($updateSource) ) {
+			if (empty($updateSource)) {
 				$updateSource = $this->getBranch($configBranch);
 			}
 

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/Api.php

Indentation +297 added lines, -297 removed lines

@@ -1,302 +1,302 @@
 <?php
 if ( !class_exists('Puc_v4p4_Vcs_Api') ):
 
-	abstract class Puc_v4p4_Vcs_Api {
-		protected $tagNameProperty = 'name';
-		protected $slug = '';
-
-		/**
-		 * @var string
-		 */
-		protected $repositoryUrl = '';
-
-		/**
-		 * @var mixed Authentication details for private repositories. Format depends on service.
-		 */
-		protected $credentials = null;
-
-		/**
-		 * @var string The filter tag that's used to filter options passed to wp_remote_get.
-		 * For example, "puc_request_info_options-slug" or "puc_request_update_options_theme-slug".
-		 */
-		protected $httpFilterName = '';
-
-		/**
-		 * @var string|null
-		 */
-		protected $localDirectory = null;
-
-		/**
-		 * Puc_v4p4_Vcs_Api constructor.
-		 *
-		 * @param string $repositoryUrl
-		 * @param array|string|null $credentials
-		 */
-		public function __construct($repositoryUrl, $credentials = null) {
-			$this->repositoryUrl = $repositoryUrl;
-			$this->setAuthentication($credentials);
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getRepositoryUrl() {
-			return $this->repositoryUrl;
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p4_Vcs_Reference
-		 */
-		abstract public function chooseReference($configBranch);
-
-		/**
-		 * Get the readme.txt file from the remote repository and parse it
-		 * according to the plugin readme standard.
-		 *
-		 * @param string $ref Tag or branch name.
-		 * @return array Parsed readme.
-		 */
-		public function getRemoteReadme($ref = 'master') {
-			$fileContents = $this->getRemoteFile($this->getLocalReadmeName(), $ref);
-			if ( empty($fileContents) ) {
-				return array();
-			}
-
-			$parser = new PucReadmeParser();
-			return $parser->parse_readme_contents($fileContents);
-		}
-
-		/**
-		 * Get the case-sensitive name of the local readme.txt file.
-		 *
-		 * In most cases it should just be called "readme.txt", but some plugins call it "README.txt",
-		 * "README.TXT", or even "Readme.txt". Most VCS are case-sensitive so we need to know the correct
-		 * capitalization.
-		 *
-		 * Defaults to "readme.txt" (all lowercase).
-		 *
-		 * @return string
-		 */
-		public function getLocalReadmeName() {
-			static $fileName = null;
-			if ( $fileName !== null ) {
-				return $fileName;
-			}
-
-			$fileName = 'readme.txt';
-			if ( isset($this->localDirectory) ) {
-				$files = scandir($this->localDirectory);
-				if ( !empty($files) ) {
-					foreach ($files as $possibleFileName) {
-						if ( strcasecmp($possibleFileName, 'readme.txt') === 0 ) {
-							$fileName = $possibleFileName;
-							break;
-						}
-					}
-				}
-			}
-			return $fileName;
-		}
-
-		/**
-		 * Get a branch.
-		 *
-		 * @param string $branchName
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		abstract public function getBranch($branchName);
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		abstract public function getTag($tagName);
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 * (Implementations should skip pre-release versions if possible.)
-		 *
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		abstract public function getLatestTag();
-
-		/**
-		 * Check if a tag name string looks like a version number.
-		 *
-		 * @param string $name
-		 * @return bool
-		 */
-		protected function looksLikeVersion($name) {
-			//Tag names may be prefixed with "v", e.g. "v1.2.3".
-			$name = ltrim($name, 'v');
-
-			//The version string must start with a number.
-			if ( !is_numeric(substr($name, 0, 1)) ) {
-				return false;
-			}
-
-			//The goal is to accept any SemVer-compatible or "PHP-standardized" version number.
-			return (preg_match('@^(\d{1,5}?)(\.\d{1,10}?){0,4}?($|[abrdp+_\-]|\s)@i', $name) === 1);
-		}
-
-		/**
-		 * Check if a tag appears to be named like a version number.
-		 *
-		 * @param stdClass $tag
-		 * @return bool
-		 */
-		protected function isVersionTag($tag) {
-			$property = $this->tagNameProperty;
-			return isset($tag->$property) && $this->looksLikeVersion($tag->$property);
-		}
-
-		/**
-		 * Sort a list of tags as if they were version numbers.
-		 * Tags that don't look like version number will be removed.
-		 *
-		 * @param stdClass[] $tags Array of tag objects.
-		 * @return stdClass[] Filtered array of tags sorted in descending order.
-		 */
-		protected function sortTagsByVersion($tags) {
-			//Keep only those tags that look like version numbers.
-			$versionTags = array_filter($tags, array($this, 'isVersionTag'));
-			//Sort them in descending order.
-			usort($versionTags, array($this, 'compareTagNames'));
-
-			return $versionTags;
-		}
-
-		/**
-		 * Compare two tags as if they were version number.
-		 *
-		 * @param stdClass $tag1 Tag object.
-		 * @param stdClass $tag2 Another tag object.
-		 * @return int
-		 */
-		protected function compareTagNames($tag1, $tag2) {
-			$property = $this->tagNameProperty;
-			if ( !isset($tag1->$property) ) {
-				return 1;
-			}
-			if ( !isset($tag2->$property) ) {
-				return -1;
-			}
-			return -version_compare(ltrim($tag1->$property, 'v'), ltrim($tag2->$property, 'v'));
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		abstract public function getRemoteFile($path, $ref = 'master');
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		abstract public function getLatestCommitTime($ref);
-
-		/**
-		 * Get the contents of the changelog file from the repository.
-		 *
-		 * @param string $ref
-		 * @param string $localDirectory Full path to the local plugin or theme directory.
-		 * @return null|string The HTML contents of the changelog.
-		 */
-		public function getRemoteChangelog($ref, $localDirectory) {
-			$filename = $this->findChangelogName($localDirectory);
-			if ( empty($filename) ) {
-				return null;
-			}
-
-			$changelog = $this->getRemoteFile($filename, $ref);
-			if ( $changelog === null ) {
-				return null;
-			}
-
-			/** @noinspection PhpUndefinedClassInspection */
-			return Parsedown::instance()->text($changelog);
-		}
-
-		/**
-		 * Guess the name of the changelog file.
-		 *
-		 * @param string $directory
-		 * @return string|null
-		 */
-		protected function findChangelogName($directory = null) {
-			if ( !isset($directory) ) {
-				$directory = $this->localDirectory;
-			}
-			if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
-				return null;
-			}
-
-			$possibleNames = array('CHANGES.md', 'CHANGELOG.md', 'changes.md', 'changelog.md');
-			$files = scandir($directory);
-			$foundNames = array_intersect($possibleNames, $files);
-
-			if ( !empty($foundNames) ) {
-				return reset($foundNames);
-			}
-			return null;
-		}
-
-		/**
-		 * Set authentication credentials.
-		 *
-		 * @param $credentials
-		 */
-		public function setAuthentication($credentials) {
-			$this->credentials = $credentials;
-		}
-
-		public function isAuthenticationEnabled() {
-			return !empty($this->credentials);
-		}
-
-		/**
-		 * @param string $url
-		 * @return string
-		 */
-		public function signDownloadUrl($url) {
-			return $url;
-		}
-
-		/**
-		 * @param string $filterName
-		 */
-		public function setHttpFilterName($filterName) {
-			$this->httpFilterName = $filterName;
-		}
-
-		/**
-		 * @param string $directory
-		 */
-		public function setLocalDirectory($directory) {
-			if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
-				$this->localDirectory = null;
-			} else {
-				$this->localDirectory = $directory;
-			}
-		}
-
-		/**
-		 * @param string $slug
-		 */
-		public function setSlug($slug) {
-			$this->slug = $slug;
-		}
-	}
+    abstract class Puc_v4p4_Vcs_Api {
+        protected $tagNameProperty = 'name';
+        protected $slug = '';
+
+        /**
+         * @var string
+         */
+        protected $repositoryUrl = '';
+
+        /**
+         * @var mixed Authentication details for private repositories. Format depends on service.
+         */
+        protected $credentials = null;
+
+        /**
+         * @var string The filter tag that's used to filter options passed to wp_remote_get.
+         * For example, "puc_request_info_options-slug" or "puc_request_update_options_theme-slug".
+         */
+        protected $httpFilterName = '';
+
+        /**
+         * @var string|null
+         */
+        protected $localDirectory = null;
+
+        /**
+         * Puc_v4p4_Vcs_Api constructor.
+         *
+         * @param string $repositoryUrl
+         * @param array|string|null $credentials
+         */
+        public function __construct($repositoryUrl, $credentials = null) {
+            $this->repositoryUrl = $repositoryUrl;
+            $this->setAuthentication($credentials);
+        }
+
+        /**
+         * @return string
+         */
+        public function getRepositoryUrl() {
+            return $this->repositoryUrl;
+        }
+
+        /**
+         * Figure out which reference (i.e tag or branch) contains the latest version.
+         *
+         * @param string $configBranch Start looking in this branch.
+         * @return null|Puc_v4p4_Vcs_Reference
+         */
+        abstract public function chooseReference($configBranch);
+
+        /**
+         * Get the readme.txt file from the remote repository and parse it
+         * according to the plugin readme standard.
+         *
+         * @param string $ref Tag or branch name.
+         * @return array Parsed readme.
+         */
+        public function getRemoteReadme($ref = 'master') {
+            $fileContents = $this->getRemoteFile($this->getLocalReadmeName(), $ref);
+            if ( empty($fileContents) ) {
+                return array();
+            }
+
+            $parser = new PucReadmeParser();
+            return $parser->parse_readme_contents($fileContents);
+        }
+
+        /**
+         * Get the case-sensitive name of the local readme.txt file.
+         *
+         * In most cases it should just be called "readme.txt", but some plugins call it "README.txt",
+         * "README.TXT", or even "Readme.txt". Most VCS are case-sensitive so we need to know the correct
+         * capitalization.
+         *
+         * Defaults to "readme.txt" (all lowercase).
+         *
+         * @return string
+         */
+        public function getLocalReadmeName() {
+            static $fileName = null;
+            if ( $fileName !== null ) {
+                return $fileName;
+            }
+
+            $fileName = 'readme.txt';
+            if ( isset($this->localDirectory) ) {
+                $files = scandir($this->localDirectory);
+                if ( !empty($files) ) {
+                    foreach ($files as $possibleFileName) {
+                        if ( strcasecmp($possibleFileName, 'readme.txt') === 0 ) {
+                            $fileName = $possibleFileName;
+                            break;
+                        }
+                    }
+                }
+            }
+            return $fileName;
+        }
+
+        /**
+         * Get a branch.
+         *
+         * @param string $branchName
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        abstract public function getBranch($branchName);
+
+        /**
+         * Get a specific tag.
+         *
+         * @param string $tagName
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        abstract public function getTag($tagName);
+
+        /**
+         * Get the tag that looks like the highest version number.
+         * (Implementations should skip pre-release versions if possible.)
+         *
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        abstract public function getLatestTag();
+
+        /**
+         * Check if a tag name string looks like a version number.
+         *
+         * @param string $name
+         * @return bool
+         */
+        protected function looksLikeVersion($name) {
+            //Tag names may be prefixed with "v", e.g. "v1.2.3".
+            $name = ltrim($name, 'v');
+
+            //The version string must start with a number.
+            if ( !is_numeric(substr($name, 0, 1)) ) {
+                return false;
+            }
+
+            //The goal is to accept any SemVer-compatible or "PHP-standardized" version number.
+            return (preg_match('@^(\d{1,5}?)(\.\d{1,10}?){0,4}?($|[abrdp+_\-]|\s)@i', $name) === 1);
+        }
+
+        /**
+         * Check if a tag appears to be named like a version number.
+         *
+         * @param stdClass $tag
+         * @return bool
+         */
+        protected function isVersionTag($tag) {
+            $property = $this->tagNameProperty;
+            return isset($tag->$property) && $this->looksLikeVersion($tag->$property);
+        }
+
+        /**
+         * Sort a list of tags as if they were version numbers.
+         * Tags that don't look like version number will be removed.
+         *
+         * @param stdClass[] $tags Array of tag objects.
+         * @return stdClass[] Filtered array of tags sorted in descending order.
+         */
+        protected function sortTagsByVersion($tags) {
+            //Keep only those tags that look like version numbers.
+            $versionTags = array_filter($tags, array($this, 'isVersionTag'));
+            //Sort them in descending order.
+            usort($versionTags, array($this, 'compareTagNames'));
+
+            return $versionTags;
+        }
+
+        /**
+         * Compare two tags as if they were version number.
+         *
+         * @param stdClass $tag1 Tag object.
+         * @param stdClass $tag2 Another tag object.
+         * @return int
+         */
+        protected function compareTagNames($tag1, $tag2) {
+            $property = $this->tagNameProperty;
+            if ( !isset($tag1->$property) ) {
+                return 1;
+            }
+            if ( !isset($tag2->$property) ) {
+                return -1;
+            }
+            return -version_compare(ltrim($tag1->$property, 'v'), ltrim($tag2->$property, 'v'));
+        }
+
+        /**
+         * Get the contents of a file from a specific branch or tag.
+         *
+         * @param string $path File name.
+         * @param string $ref
+         * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
+         */
+        abstract public function getRemoteFile($path, $ref = 'master');
+
+        /**
+         * Get the timestamp of the latest commit that changed the specified branch or tag.
+         *
+         * @param string $ref Reference name (e.g. branch or tag).
+         * @return string|null
+         */
+        abstract public function getLatestCommitTime($ref);
+
+        /**
+         * Get the contents of the changelog file from the repository.
+         *
+         * @param string $ref
+         * @param string $localDirectory Full path to the local plugin or theme directory.
+         * @return null|string The HTML contents of the changelog.
+         */
+        public function getRemoteChangelog($ref, $localDirectory) {
+            $filename = $this->findChangelogName($localDirectory);
+            if ( empty($filename) ) {
+                return null;
+            }
+
+            $changelog = $this->getRemoteFile($filename, $ref);
+            if ( $changelog === null ) {
+                return null;
+            }
+
+            /** @noinspection PhpUndefinedClassInspection */
+            return Parsedown::instance()->text($changelog);
+        }
+
+        /**
+         * Guess the name of the changelog file.
+         *
+         * @param string $directory
+         * @return string|null
+         */
+        protected function findChangelogName($directory = null) {
+            if ( !isset($directory) ) {
+                $directory = $this->localDirectory;
+            }
+            if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
+                return null;
+            }
+
+            $possibleNames = array('CHANGES.md', 'CHANGELOG.md', 'changes.md', 'changelog.md');
+            $files = scandir($directory);
+            $foundNames = array_intersect($possibleNames, $files);
+
+            if ( !empty($foundNames) ) {
+                return reset($foundNames);
+            }
+            return null;
+        }
+
+        /**
+         * Set authentication credentials.
+         *
+         * @param $credentials
+         */
+        public function setAuthentication($credentials) {
+            $this->credentials = $credentials;
+        }
+
+        public function isAuthenticationEnabled() {
+            return !empty($this->credentials);
+        }
+
+        /**
+         * @param string $url
+         * @return string
+         */
+        public function signDownloadUrl($url) {
+            return $url;
+        }
+
+        /**
+         * @param string $filterName
+         */
+        public function setHttpFilterName($filterName) {
+            $this->httpFilterName = $filterName;
+        }
+
+        /**
+         * @param string $directory
+         */
+        public function setLocalDirectory($directory) {
+            if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
+                $this->localDirectory = null;
+            } else {
+                $this->localDirectory = $directory;
+            }
+        }
+
+        /**
+         * @param string $slug
+         */
+        public function setSlug($slug) {
+            $this->slug = $slug;
+        }
+    }
 
 endif;

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Vcs_Api') ):
+if (!class_exists('Puc_v4p4_Vcs_Api')):
 
 	abstract class Puc_v4p4_Vcs_Api {
 		protected $tagNameProperty = 'name';
@@ -61,7 +61,7 @@ 
 		 */
 		public function getRemoteReadme($ref = 'master') {
 			$fileContents = $this->getRemoteFile($this->getLocalReadmeName(), $ref);
-			if ( empty($fileContents) ) {
+			if (empty($fileContents)) {
 				return array();
 			}
 
@@ -82,16 +82,16 @@ 
 		 */
 		public function getLocalReadmeName() {
 			static $fileName = null;
-			if ( $fileName !== null ) {
+			if ($fileName !== null) {
 				return $fileName;
 			}
 
 			$fileName = 'readme.txt';
-			if ( isset($this->localDirectory) ) {
+			if (isset($this->localDirectory)) {
 				$files = scandir($this->localDirectory);
-				if ( !empty($files) ) {
+				if (!empty($files)) {
 					foreach ($files as $possibleFileName) {
-						if ( strcasecmp($possibleFileName, 'readme.txt') === 0 ) {
+						if (strcasecmp($possibleFileName, 'readme.txt') === 0) {
 							$fileName = $possibleFileName;
 							break;
 						}
@@ -136,7 +136,7 @@ 
 			$name = ltrim($name, 'v');
 
 			//The version string must start with a number.
-			if ( !is_numeric(substr($name, 0, 1)) ) {
+			if (!is_numeric(substr($name, 0, 1))) {
 				return false;
 			}
 
@@ -180,10 +180,10 @@ 
 		 */
 		protected function compareTagNames($tag1, $tag2) {
 			$property = $this->tagNameProperty;
-			if ( !isset($tag1->$property) ) {
+			if (!isset($tag1->$property)) {
 				return 1;
 			}
-			if ( !isset($tag2->$property) ) {
+			if (!isset($tag2->$property)) {
 				return -1;
 			}
 			return -version_compare(ltrim($tag1->$property, 'v'), ltrim($tag2->$property, 'v'));
@@ -215,12 +215,12 @@ 
 		 */
 		public function getRemoteChangelog($ref, $localDirectory) {
 			$filename = $this->findChangelogName($localDirectory);
-			if ( empty($filename) ) {
+			if (empty($filename)) {
 				return null;
 			}
 
 			$changelog = $this->getRemoteFile($filename, $ref);
-			if ( $changelog === null ) {
+			if ($changelog === null) {
 				return null;
 			}
 
@@ -235,10 +235,10 @@ 
 		 * @return string|null
 		 */
 		protected function findChangelogName($directory = null) {
-			if ( !isset($directory) ) {
+			if (!isset($directory)) {
 				$directory = $this->localDirectory;
 			}
-			if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
+			if (empty($directory) || !is_dir($directory) || ($directory === '.')) {
 				return null;
 			}
 
@@ -246,7 +246,7 @@ 
 			$files = scandir($directory);
 			$foundNames = array_intersect($possibleNames, $files);
 
-			if ( !empty($foundNames) ) {
+			if (!empty($foundNames)) {
 				return reset($foundNames);
 			}
 			return null;
@@ -284,7 +284,7 @@ 
 		 * @param string $directory
 		 */
 		public function setLocalDirectory($directory) {
-			if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
+			if (empty($directory) || !is_dir($directory) || ($directory === '.')) {
 				$this->localDirectory = null;
 			} else {
 				$this->localDirectory = $directory;