iqltechnologies / brighty

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/vendor/ParsedownModern.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 +72 added lines, -72 removed lines

@@ -152,7 +152,7 @@ 
 
             while (isset($line[$indent]) and $line[$indent] === ' ')
             {
-                $indent ++;
+                $indent++;
             }
 
             $text = $indent > 0 ? substr($line, $indent) : $line;
@@ -165,7 +165,7 @@ 
 
             if (isset($CurrentBlock['continuable']))
             {
-                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
+                $Block = $this->{'block' . $CurrentBlock['type'] . 'Continue'}($Line, $CurrentBlock);
 
                 if (isset($Block))
                 {
@@ -177,7 +177,7 @@ 
                 {
                     if ($this->isBlockCompletable($CurrentBlock['type']))
                     {
-                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+                        $CurrentBlock = $this->{'block' . $CurrentBlock['type'] . 'Complete'}($CurrentBlock);
                     }
                 }
             }
@@ -194,7 +194,7 @@ 
             {
                 foreach ($this->BlockTypes[$marker] as $blockType)
                 {
-                    $blockTypes []= $blockType;
+                    $blockTypes [] = $blockType;
                 }
             }
 
@@ -203,15 +203,15 @@ 
 
             foreach ($blockTypes as $blockType)
             {
-                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
+                $Block = $this->{'block' . $blockType}($Line, $CurrentBlock);
 
                 if (isset($Block))
                 {
                     $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;
+                $CurrentBlock['element']['text'] .= "\n" . $text;
             }
             else
             {
-                $Blocks []= $CurrentBlock;
+                $Blocks [] = $CurrentBlock;
 
                 $CurrentBlock = $this->paragraph($Line);
 
@@ -247,12 +247,12 @@ 
 
         if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
         {
-            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+            $CurrentBlock = $this->{'block' . $CurrentBlock['type'] . 'Complete'}($CurrentBlock);
         }
 
         # ~
 
-        $Blocks []= $CurrentBlock;
+        $Blocks [] = $CurrentBlock;
 
         unset($Blocks[0]);
 
@@ -280,12 +280,12 @@ 
 
     protected function isBlockContinuable($Type)
     {
-        return method_exists($this, 'block'.$Type.'Continue');
+        return method_exists($this, 'block' . $Type . 'Continue');
     }
 
     protected function isBlockCompletable($Type)
     {
-        return method_exists($this, 'block'.$Type.'Complete');
+        return method_exists($this, 'block' . $Type . 'Complete');
     }
 
     #
@@ -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;
         }
@@ -396,7 +396,7 @@ 
 
     protected function blockFencedCode($Line)
     {
-        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
+        if (preg_match('/^[' . $Line['text'][0] . ']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
         {
             $Element = array(
                 'name' => 'code',
@@ -405,7 +405,7 @@ 
 
             if (isset($matches[1]))
             {
-                $class = 'language-'.$matches[1];
+                $class = 'language-' . $matches[1];
 
                 $Element['attributes'] = array(
                     'class' => $class,
@@ -439,7 +439,7 @@ 
             unset($Block['interrupted']);
         }
 
-        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+        if (preg_match('/^' . $Block['char'] . '{3,}[ ]*$/', $Line['text']))
         {
             $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
 
@@ -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)
@@ -504,7 +504,7 @@ 
     {
         list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
 
-        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+        if (preg_match('/^(' . $pattern . '[ ]+)(.*)/', $Line['text'], $matches))
         {
             $Block = array(
                 'indent' => $Line['indent'],
@@ -523,7 +523,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -531,11 +531,11 @@ 
 
     protected function blockListContinue($Line, array $Block)
     {
-        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
+        if ($Block['indent'] === $Line['indent'] and preg_match('/^' . $Block['pattern'] . '(?:[ ]+(.*)|$)/', $Line['text'], $matches))
         {
             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;
         }
@@ -633,7 +633,7 @@ 
 
     protected function blockRule($Line)
     {
-        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
+        if (preg_match('/^([' . $Line['text'][0] . '])([ ]*\1){2,}[ ]*$/', $Line['text']))
         {
             $Block = array(
                 'element' => array(
@@ -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;
         }
@@ -673,7 +673,7 @@ 
             return;
         }
 
-        if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+        if (preg_match('/^<(\w*)(?:[ ]*' . $this->regexHtmlAttribute . ')*[ ]*(\/)?>/', $Line['text'], $matches))
         {
             $element = strtolower($matches[1]);
 
@@ -708,7 +708,7 @@ 
                     return;
                 }
 
-                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+                if (preg_match('/<\/' . $matches[1] . '>[ ]*$/i', $remainder))
                 {
                     $Block['closed'] = true;
                 }
@@ -725,16 +725,16 @@ 
             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'] ++;
+            $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'] --;
+                $Block['depth']--;
             }
             else
             {
@@ -749,7 +749,7 @@ 
             unset($Block['interrupted']);
         }
 
-        $Block['markup'] .= "\n".$Line['body'];
+        $Block['markup'] .= "\n" . $Line['body'];
 
         return $Block;
     }
@@ -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;
             }
 
             # ~
@@ -854,11 +854,11 @@ 
                     $alignment = $alignments[$index];
 
                     $HeaderElement['attributes'] = array(
-                        'style' => 'text-align: '.$alignment.';',
+                        'style' => 'text-align: ' . $alignment . ';',
                     );
                 }
 
-                $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,
@@ -924,11 +924,11 @@ 
                 if (isset($Block['alignments'][$index]))
                 {
                     $Element['attributes'] = array(
-                        'style' => 'text-align: '.$Block['alignments'][$index].';',
+                        'style' => 'text-align: ' . $Block['alignments'][$index] . ';',
                     );
                 }
 
-                $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;
         }
@@ -1003,9 +1003,9 @@ 
 
             foreach ($this->InlineTypes[$marker] as $inlineType)
             {
-                $Inline = $this->{'inline'.$inlineType}($Excerpt);
+                $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;
                 }
@@ -1061,7 +1061,7 @@ 
     {
         $marker = $Excerpt['text'][0];
 
-        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+        if (preg_match('/^(' . $marker . '+)[ ]*(.+?)[ ]*(?<!' . $marker . ')\1(?!' . $marker . ')/s', $Excerpt['text'], $matches))
         {
             $text = $matches[2];
             $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
@@ -1083,7 +1083,7 @@ 
         {
             $url = $matches[1];
 
-            if ( ! isset($matches[2]))
+            if (!isset($matches[2]))
             {
                 $url = 'mailto:' . $url;
             }
@@ -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;
             }
@@ -1274,7 +1274,7 @@ 
             );
         }
 
-        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*' . $this->regexHtmlAttribute . ')*[ ]*\/?>/s', $Excerpt['text'], $matches))
         {
             return array(
                 'markup' => $matches[0],
@@ -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;',
@@ -1298,7 +1298,7 @@ 
         if (isset($SpecialCharacter[$Excerpt['text'][0]]))
         {
             return array(
-                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
+                'markup' => '&' . $SpecialCharacter[$Excerpt['text'][0]] . ';',
                 'extent' => 1,
             );
         }
@@ -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;
         }
@@ -1391,7 +1391,7 @@ 
 
     protected function element(array $Element)
     {
-        $markup = '<'.$Element['name'];
+        $markup = '<' . $Element['name'];
 
         if (isset($Element['attributes']))
         {
@@ -1402,7 +1402,7 @@ 
                     continue;
                 }
 
-                $markup .= ' '.$name.'="'.$value.'"';
+                $markup .= ' ' . $name . '="' . $value . '"';
             }
         }
 
@@ -1419,7 +1419,7 @@ 
                 $markup .= $Element['text'];
             }
 
-            $markup .= '</'.$Element['name'].'>';
+            $markup .= '</' . $Element['name'] . '>';
         }
         else
         {
@@ -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 .= ' />';
         }

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/vendor/PucReadmeParser.php

Indentation +332 added lines, -332 removed lines

@@ -9,339 +9,339 @@
 
 class PucReadmeParser {
 
-	function __construct() {
-		// This space intentionally blank
-	}
-
-	function parse_readme( $file ) {
-		$file_contents = @implode('', @file($file));
-		return $this->parse_readme_contents( $file_contents );
-	}
-
-	function parse_readme_contents( $file_contents ) {
-		$file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
-		$file_contents = trim($file_contents);
-		if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
-			$file_contents = substr( $file_contents, 3 );
-
-		// Markdown transformations
-		$file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
-		$file_contents = preg_replace( "|^##([^#]+)#*?\s*?\n|im",  '==$1=='."\n",   $file_contents );
-		$file_contents = preg_replace( "|^#([^#]+)#*?\s*?\n|im",   '===$1==='."\n", $file_contents );
-
-		// === Plugin Name ===
-		// Must be the very first thing.
-		if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
-			return array(); // require a name
-		$name = trim($_name[1], '=');
-		$name = $this->sanitize_text( $name );
-
-		$file_contents = $this->chop_string( $file_contents, $_name[0] );
-
-
-		// Requires at least: 1.5
-		if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
-			$requires_at_least = $this->sanitize_text($_requires_at_least[1]);
-		else
-			$requires_at_least = NULL;
-
-
-		// Tested up to: 2.1
-		if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
-			$tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
-		else
-			$tested_up_to = NULL;
-
-		// Requires PHP: 5.2.4
-		if ( preg_match('|Requires PHP:(.*)|i', $file_contents, $_requires_php) ) {
-			$requires_php = $this->sanitize_text( $_requires_php[1] );
-		} else {
-			$requires_php = null;
-		}
-
-		// Stable tag: 10.4-ride-the-fire-eagle-danger-day
-		if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
-			$stable_tag = $this->sanitize_text( $_stable_tag[1] );
-		else
-			$stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
-
-
-		// Tags: some tag, another tag, we like tags
-		if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
-			$tags = preg_split('|,[\s]*?|', trim($_tags[1]));
-			foreach ( array_keys($tags) as $t )
-				$tags[$t] = $this->sanitize_text( $tags[$t] );
-		} else {
-			$tags = array();
-		}
-
-
-		// Contributors: markjaquith, mdawaffe, zefrank
-		$contributors = array();
-		if ( preg_match('|Contributors:(.*)|i', $file_contents, $_contributors) ) {
-			$temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
-			foreach ( array_keys($temp_contributors) as $c ) {
-				$tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
-				if ( strlen(trim($tmp_sanitized)) > 0 )
-					$contributors[$c] = $tmp_sanitized;
-				unset($tmp_sanitized);
-			}
-		}
-
-
-		// Donate Link: URL
-		if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
-			$donate_link = esc_url( $_donate_link[1] );
-		else
-			$donate_link = NULL;
-
-
-		// togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
-		foreach ( array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop ) {
-			if ( $$chop ) {
-				$_chop = '_' . $chop;
-				$file_contents = $this->chop_string( $file_contents, ${$_chop}[0] );
-			}
-		}
-
-		$file_contents = trim($file_contents);
-
-
-		// short-description fu
-		if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
-			$_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
-		$short_desc_filtered = $this->sanitize_text( $_short_description[2] );
-		$short_desc_length = strlen($short_desc_filtered);
-		$short_description = substr($short_desc_filtered, 0, 150);
-		if ( $short_desc_length > strlen($short_description) )
-			$truncated = true;
-		else
-			$truncated = false;
-		if ( $_short_description[1] )
-			$file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
-
-		// == Section ==
-		// Break into sections
-		// $_sections[0] will be the title of the first section, $_sections[1] will be the content of the first section
-		// the array alternates from there:  title2, content2, title3, content3... and so forth
-		$_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-
-		$sections = array();
-		for ( $i=0; $i < count($_sections); $i +=2 ) {
-			$title = $this->sanitize_text( $_sections[$i] );
-			if ( isset($_sections[$i+1]) ) {
-				$content = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i+1]);
-				$content = $this->filter_text( $content, true );
-			} else {
-				$content = '';
-			}
-			$sections[str_replace(' ', '_', strtolower($title))] = array('title' => $title, 'content' => $content);
-		}
-
-
-		// Special sections
-		// This is where we nab our special sections, so we can enforce their order and treat them differently, if needed
-		// upgrade_notice is not a section, but parse it like it is for now
-		$final_sections = array();
-		foreach ( array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section ) {
-			if ( isset($sections[$special_section]) ) {
-				$final_sections[$special_section] = $sections[$special_section]['content'];
-				unset($sections[$special_section]);
-			}
-		}
-		if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
-			$final_sections['changelog'] = $final_sections['change_log'];
-
-
-		$final_screenshots = array();
-		if ( isset($final_sections['screenshots']) ) {
-			preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
-			if ( $screenshots ) {
-				foreach ( (array) $screenshots as $ss )
-					$final_screenshots[] = $ss[1];
-			}
-		}
-
-		// Parse the upgrade_notice section specially:
-		// 1.0 => blah, 1.1 => fnord
-		$upgrade_notice = array();
-		if ( isset($final_sections['upgrade_notice']) ) {
-			$split = preg_split( '#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-			if ( count($split) >= 2 ) {
-				for ( $i = 0; $i < count( $split ); $i += 2 ) {
-					$upgrade_notice[$this->sanitize_text( $split[$i] )] = substr( $this->sanitize_text( $split[$i + 1] ), 0, 300 );
-				}
-			}
-			unset( $final_sections['upgrade_notice'] );
-		}
-
-		// No description?
-		// No problem... we'll just fall back to the old style of description
-		// We'll even let you use markup this time!
-		$excerpt = false;
-		if ( !isset($final_sections['description']) ) {
-			$final_sections = array_merge(array('description' => $this->filter_text( $_short_description[2], true )), $final_sections);
-			$excerpt = true;
-		}
-
-
-		// dump the non-special sections into $remaining_content
-		// their order will be determined by their original order in the readme.txt
-		$remaining_content = '';
-		foreach ( $sections as $s_name => $s_data ) {
-			$remaining_content .= "\n<h3>{$s_data['title']}</h3>\n{$s_data['content']}";
-		}
-		$remaining_content = trim($remaining_content);
-
-
-		// All done!
-		// $r['tags'] and $r['contributors'] are simple arrays
-		// $r['sections'] is an array with named elements
-		$r = array(
-			'name' => $name,
-			'tags' => $tags,
-			'requires_at_least' => $requires_at_least,
-			'tested_up_to' => $tested_up_to,
-			'requires_php' => $requires_php,
-			'stable_tag' => $stable_tag,
-			'contributors' => $contributors,
-			'donate_link' => $donate_link,
-			'short_description' => $short_description,
-			'screenshots' => $final_screenshots,
-			'is_excerpt' => $excerpt,
-			'is_truncated' => $truncated,
-			'sections' => $final_sections,
-			'remaining_content' => $remaining_content,
-			'upgrade_notice' => $upgrade_notice
-		);
-
-		return $r;
-	}
-
-	function chop_string( $string, $chop ) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
-		if ( $_string = strstr($string, $chop) ) {
-			$_string = substr($_string, strlen($chop));
-			return trim($_string);
-		} else {
-			return trim($string);
-		}
-	}
-
-	function user_sanitize( $text, $strict = false ) { // whitelisted chars
-		if ( function_exists('user_sanitize') ) // bbPress native
-			return user_sanitize( $text, $strict );
-
-		if ( $strict ) {
-			$text = preg_replace('/[^a-z0-9-]/i', '', $text);
-			$text = preg_replace('|-+|', '-', $text);
-		} else {
-			$text = preg_replace('/[^a-z0-9_-]/i', '', $text);
-		}
-		return $text;
-	}
-
-	function sanitize_text( $text ) { // not fancy
-		$text = strip_tags($text);
-		$text = esc_html($text);
-		$text = trim($text);
-		return $text;
-	}
-
-	function filter_text( $text, $markdown = false ) { // fancy, Markdown
-		$text = trim($text);
-
-		$text = call_user_func( array( __CLASS__, 'code_trick' ), $text, $markdown ); // A better parser than Markdown's for: backticks -> CODE
-
-		if ( $markdown ) { // Parse markdown.
-			if ( !class_exists('Parsedown', false) ) {
-				/** @noinspection PhpIncludeInspection */
-				require_once(dirname(__FILE__) . '/Parsedown' . (version_compare(PHP_VERSION, '5.3.0', '>=') ? '' : 'Legacy') . '.php');
-			}
-			$instance = Parsedown::instance();
-			$text = $instance->text($text);
-		}
-
-		$allowed = array(
-			'a' => array(
-				'href' => array(),
-				'title' => array(),
-				'rel' => array()),
-			'blockquote' => array('cite' => array()),
-			'br' => array(),
-			'p' => array(),
-			'code' => array(),
-			'pre' => array(),
-			'em' => array(),
-			'strong' => array(),
-			'ul' => array(),
-			'ol' => array(),
-			'li' => array(),
-			'h3' => array(),
-			'h4' => array()
-		);
-
-		$text = balanceTags($text);
+    function __construct() {
+        // This space intentionally blank
+    }
+
+    function parse_readme( $file ) {
+        $file_contents = @implode('', @file($file));
+        return $this->parse_readme_contents( $file_contents );
+    }
+
+    function parse_readme_contents( $file_contents ) {
+        $file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
+        $file_contents = trim($file_contents);
+        if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
+            $file_contents = substr( $file_contents, 3 );
+
+        // Markdown transformations
+        $file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
+        $file_contents = preg_replace( "|^##([^#]+)#*?\s*?\n|im",  '==$1=='."\n",   $file_contents );
+        $file_contents = preg_replace( "|^#([^#]+)#*?\s*?\n|im",   '===$1==='."\n", $file_contents );
+
+        // === Plugin Name ===
+        // Must be the very first thing.
+        if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
+            return array(); // require a name
+        $name = trim($_name[1], '=');
+        $name = $this->sanitize_text( $name );
+
+        $file_contents = $this->chop_string( $file_contents, $_name[0] );
+
+
+        // Requires at least: 1.5
+        if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
+            $requires_at_least = $this->sanitize_text($_requires_at_least[1]);
+        else
+            $requires_at_least = NULL;
+
+
+        // Tested up to: 2.1
+        if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
+            $tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
+        else
+            $tested_up_to = NULL;
+
+        // Requires PHP: 5.2.4
+        if ( preg_match('|Requires PHP:(.*)|i', $file_contents, $_requires_php) ) {
+            $requires_php = $this->sanitize_text( $_requires_php[1] );
+        } else {
+            $requires_php = null;
+        }
+
+        // Stable tag: 10.4-ride-the-fire-eagle-danger-day
+        if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
+            $stable_tag = $this->sanitize_text( $_stable_tag[1] );
+        else
+            $stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
+
+
+        // Tags: some tag, another tag, we like tags
+        if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
+            $tags = preg_split('|,[\s]*?|', trim($_tags[1]));
+            foreach ( array_keys($tags) as $t )
+                $tags[$t] = $this->sanitize_text( $tags[$t] );
+        } else {
+            $tags = array();
+        }
+
+
+        // Contributors: markjaquith, mdawaffe, zefrank
+        $contributors = array();
+        if ( preg_match('|Contributors:(.*)|i', $file_contents, $_contributors) ) {
+            $temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
+            foreach ( array_keys($temp_contributors) as $c ) {
+                $tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
+                if ( strlen(trim($tmp_sanitized)) > 0 )
+                    $contributors[$c] = $tmp_sanitized;
+                unset($tmp_sanitized);
+            }
+        }
+
+
+        // Donate Link: URL
+        if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
+            $donate_link = esc_url( $_donate_link[1] );
+        else
+            $donate_link = NULL;
+
+
+        // togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
+        foreach ( array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop ) {
+            if ( $$chop ) {
+                $_chop = '_' . $chop;
+                $file_contents = $this->chop_string( $file_contents, ${$_chop}[0] );
+            }
+        }
+
+        $file_contents = trim($file_contents);
+
+
+        // short-description fu
+        if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
+            $_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
+        $short_desc_filtered = $this->sanitize_text( $_short_description[2] );
+        $short_desc_length = strlen($short_desc_filtered);
+        $short_description = substr($short_desc_filtered, 0, 150);
+        if ( $short_desc_length > strlen($short_description) )
+            $truncated = true;
+        else
+            $truncated = false;
+        if ( $_short_description[1] )
+            $file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
+
+        // == Section ==
+        // Break into sections
+        // $_sections[0] will be the title of the first section, $_sections[1] will be the content of the first section
+        // the array alternates from there:  title2, content2, title3, content3... and so forth
+        $_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+        $sections = array();
+        for ( $i=0; $i < count($_sections); $i +=2 ) {
+            $title = $this->sanitize_text( $_sections[$i] );
+            if ( isset($_sections[$i+1]) ) {
+                $content = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i+1]);
+                $content = $this->filter_text( $content, true );
+            } else {
+                $content = '';
+            }
+            $sections[str_replace(' ', '_', strtolower($title))] = array('title' => $title, 'content' => $content);
+        }
+
+
+        // Special sections
+        // This is where we nab our special sections, so we can enforce their order and treat them differently, if needed
+        // upgrade_notice is not a section, but parse it like it is for now
+        $final_sections = array();
+        foreach ( array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section ) {
+            if ( isset($sections[$special_section]) ) {
+                $final_sections[$special_section] = $sections[$special_section]['content'];
+                unset($sections[$special_section]);
+            }
+        }
+        if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
+            $final_sections['changelog'] = $final_sections['change_log'];
+
+
+        $final_screenshots = array();
+        if ( isset($final_sections['screenshots']) ) {
+            preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
+            if ( $screenshots ) {
+                foreach ( (array) $screenshots as $ss )
+                    $final_screenshots[] = $ss[1];
+            }
+        }
+
+        // Parse the upgrade_notice section specially:
+        // 1.0 => blah, 1.1 => fnord
+        $upgrade_notice = array();
+        if ( isset($final_sections['upgrade_notice']) ) {
+            $split = preg_split( '#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+            if ( count($split) >= 2 ) {
+                for ( $i = 0; $i < count( $split ); $i += 2 ) {
+                    $upgrade_notice[$this->sanitize_text( $split[$i] )] = substr( $this->sanitize_text( $split[$i + 1] ), 0, 300 );
+                }
+            }
+            unset( $final_sections['upgrade_notice'] );
+        }
+
+        // No description?
+        // No problem... we'll just fall back to the old style of description
+        // We'll even let you use markup this time!
+        $excerpt = false;
+        if ( !isset($final_sections['description']) ) {
+            $final_sections = array_merge(array('description' => $this->filter_text( $_short_description[2], true )), $final_sections);
+            $excerpt = true;
+        }
+
+
+        // dump the non-special sections into $remaining_content
+        // their order will be determined by their original order in the readme.txt
+        $remaining_content = '';
+        foreach ( $sections as $s_name => $s_data ) {
+            $remaining_content .= "\n<h3>{$s_data['title']}</h3>\n{$s_data['content']}";
+        }
+        $remaining_content = trim($remaining_content);
+
+
+        // All done!
+        // $r['tags'] and $r['contributors'] are simple arrays
+        // $r['sections'] is an array with named elements
+        $r = array(
+            'name' => $name,
+            'tags' => $tags,
+            'requires_at_least' => $requires_at_least,
+            'tested_up_to' => $tested_up_to,
+            'requires_php' => $requires_php,
+            'stable_tag' => $stable_tag,
+            'contributors' => $contributors,
+            'donate_link' => $donate_link,
+            'short_description' => $short_description,
+            'screenshots' => $final_screenshots,
+            'is_excerpt' => $excerpt,
+            'is_truncated' => $truncated,
+            'sections' => $final_sections,
+            'remaining_content' => $remaining_content,
+            'upgrade_notice' => $upgrade_notice
+        );
+
+        return $r;
+    }
+
+    function chop_string( $string, $chop ) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
+        if ( $_string = strstr($string, $chop) ) {
+            $_string = substr($_string, strlen($chop));
+            return trim($_string);
+        } else {
+            return trim($string);
+        }
+    }
+
+    function user_sanitize( $text, $strict = false ) { // whitelisted chars
+        if ( function_exists('user_sanitize') ) // bbPress native
+            return user_sanitize( $text, $strict );
+
+        if ( $strict ) {
+            $text = preg_replace('/[^a-z0-9-]/i', '', $text);
+            $text = preg_replace('|-+|', '-', $text);
+        } else {
+            $text = preg_replace('/[^a-z0-9_-]/i', '', $text);
+        }
+        return $text;
+    }
+
+    function sanitize_text( $text ) { // not fancy
+        $text = strip_tags($text);
+        $text = esc_html($text);
+        $text = trim($text);
+        return $text;
+    }
+
+    function filter_text( $text, $markdown = false ) { // fancy, Markdown
+        $text = trim($text);
+
+        $text = call_user_func( array( __CLASS__, 'code_trick' ), $text, $markdown ); // A better parser than Markdown's for: backticks -> CODE
+
+        if ( $markdown ) { // Parse markdown.
+            if ( !class_exists('Parsedown', false) ) {
+                /** @noinspection PhpIncludeInspection */
+                require_once(dirname(__FILE__) . '/Parsedown' . (version_compare(PHP_VERSION, '5.3.0', '>=') ? '' : 'Legacy') . '.php');
+            }
+            $instance = Parsedown::instance();
+            $text = $instance->text($text);
+        }
+
+        $allowed = array(
+            'a' => array(
+                'href' => array(),
+                'title' => array(),
+                'rel' => array()),
+            'blockquote' => array('cite' => array()),
+            'br' => array(),
+            'p' => array(),
+            'code' => array(),
+            'pre' => array(),
+            'em' => array(),
+            'strong' => array(),
+            'ul' => array(),
+            'ol' => array(),
+            'li' => array(),
+            'h3' => array(),
+            'h4' => array()
+        );
+
+        $text = balanceTags($text);
 		
-		$text = wp_kses( $text, $allowed );
-		$text = trim($text);
-		return $text;
-	}
-
-	function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
-		// If doing markdown, first take any user formatted code blocks and turn them into backticks so that
-		// markdown will preserve things like underscores in code blocks
-		if ( $markdown )
-			$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
-
-		$text = str_replace(array("\r\n", "\r"), "\n", $text);
-		if ( !$markdown ) {
-			// This gets the "inline" code blocks, but can't be used with Markdown.
-			$text = preg_replace_callback("|(`)(.*?)`|", array( __CLASS__, 'encodeit'), $text);
-			// This gets the "block level" code blocks and converts them to PRE CODE
-			$text = preg_replace_callback("!(^|\n)`(.*?)`!s", array( __CLASS__, 'encodeit'), $text);
-		} else {
-			// Markdown can do inline code, we convert bbPress style block level code to Markdown style
-			$text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent'), $text);
-		}
-		return $text;
-	}
-
-	function indent( $matches ) {
-		$text = $matches[3];
-		$text = preg_replace('|^|m', $matches[2] . '    ', $text);
-		return $matches[1] . $text;
-	}
-
-	function encodeit( $matches ) {
-		if ( function_exists('encodeit') ) // bbPress native
-			return encodeit( $matches );
-
-		$text = trim($matches[2]);
-		$text = htmlspecialchars($text, ENT_QUOTES);
-		$text = str_replace(array("\r\n", "\r"), "\n", $text);
-		$text = preg_replace("|\n\n\n+|", "\n\n", $text);
-		$text = str_replace('&amp;lt;', '&lt;', $text);
-		$text = str_replace('&amp;gt;', '&gt;', $text);
-		$text = "<code>$text</code>";
-		if ( "`" != $matches[1] )
-			$text = "<pre>$text</pre>";
-		return $text;
-	}
-
-	function decodeit( $matches ) {
-		if ( function_exists('decodeit') ) // bbPress native
-			return decodeit( $matches );
-
-		$text = $matches[2];
-		$trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
-		$text = strtr($text, $trans_table);
-		$text = str_replace('<br />', '', $text);
-		$text = str_replace('&#38;', '&', $text);
-		$text = str_replace('&#39;', "'", $text);
-		if ( '<pre><code>' == $matches[1] )
-			$text = "\n$text\n";
-		return "`$text`";
-	}
+        $text = wp_kses( $text, $allowed );
+        $text = trim($text);
+        return $text;
+    }
+
+    function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
+        // If doing markdown, first take any user formatted code blocks and turn them into backticks so that
+        // markdown will preserve things like underscores in code blocks
+        if ( $markdown )
+            $text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
+
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+        if ( !$markdown ) {
+            // This gets the "inline" code blocks, but can't be used with Markdown.
+            $text = preg_replace_callback("|(`)(.*?)`|", array( __CLASS__, 'encodeit'), $text);
+            // This gets the "block level" code blocks and converts them to PRE CODE
+            $text = preg_replace_callback("!(^|\n)`(.*?)`!s", array( __CLASS__, 'encodeit'), $text);
+        } else {
+            // Markdown can do inline code, we convert bbPress style block level code to Markdown style
+            $text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent'), $text);
+        }
+        return $text;
+    }
+
+    function indent( $matches ) {
+        $text = $matches[3];
+        $text = preg_replace('|^|m', $matches[2] . '    ', $text);
+        return $matches[1] . $text;
+    }
+
+    function encodeit( $matches ) {
+        if ( function_exists('encodeit') ) // bbPress native
+            return encodeit( $matches );
+
+        $text = trim($matches[2]);
+        $text = htmlspecialchars($text, ENT_QUOTES);
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+        $text = preg_replace("|\n\n\n+|", "\n\n", $text);
+        $text = str_replace('&amp;lt;', '&lt;', $text);
+        $text = str_replace('&amp;gt;', '&gt;', $text);
+        $text = "<code>$text</code>";
+        if ( "`" != $matches[1] )
+            $text = "<pre>$text</pre>";
+        return $text;
+    }
+
+    function decodeit( $matches ) {
+        if ( function_exists('decodeit') ) // bbPress native
+            return decodeit( $matches );
+
+        $text = $matches[2];
+        $trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
+        $text = strtr($text, $trans_table);
+        $text = str_replace('<br />', '', $text);
+        $text = str_replace('&#38;', '&', $text);
+        $text = str_replace('&#39;', "'", $text);
+        if ( '<pre><code>' == $matches[1] )
+            $text = "\n$text\n";
+        return "`$text`";
+    }
 
 } // end class
 

Spacing +86 added lines, -86 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('PucReadmeParser', false) ):
+if (!class_exists('PucReadmeParser', false)):
 
 /**
  * This is a slightly modified version of github.com/markjaquith/WordPress-Plugin-Readme-Parser
@@ -13,64 +13,64 @@ 
 		// This space intentionally blank
 	}
 
-	function parse_readme( $file ) {
+	function parse_readme($file) {
 		$file_contents = @implode('', @file($file));
-		return $this->parse_readme_contents( $file_contents );
+		return $this->parse_readme_contents($file_contents);
 	}
 
-	function parse_readme_contents( $file_contents ) {
+	function parse_readme_contents($file_contents) {
 		$file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
 		$file_contents = trim($file_contents);
-		if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
-			$file_contents = substr( $file_contents, 3 );
+		if (0 === strpos($file_contents, "\xEF\xBB\xBF"))
+			$file_contents = substr($file_contents, 3);
 
 		// Markdown transformations
-		$file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
-		$file_contents = preg_replace( "|^##([^#]+)#*?\s*?\n|im",  '==$1=='."\n",   $file_contents );
-		$file_contents = preg_replace( "|^#([^#]+)#*?\s*?\n|im",   '===$1==='."\n", $file_contents );
+		$file_contents = preg_replace("|^###([^#]+)#*?\s*?\n|im", '=$1=' . "\n", $file_contents);
+		$file_contents = preg_replace("|^##([^#]+)#*?\s*?\n|im", '==$1==' . "\n", $file_contents);
+		$file_contents = preg_replace("|^#([^#]+)#*?\s*?\n|im", '===$1===' . "\n", $file_contents);
 
 		// === Plugin Name ===
 		// Must be the very first thing.
-		if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
+		if (!preg_match('|^===(.*)===|', $file_contents, $_name))
 			return array(); // require a name
 		$name = trim($_name[1], '=');
-		$name = $this->sanitize_text( $name );
+		$name = $this->sanitize_text($name);
 
-		$file_contents = $this->chop_string( $file_contents, $_name[0] );
+		$file_contents = $this->chop_string($file_contents, $_name[0]);
 
 
 		// Requires at least: 1.5
-		if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
+		if (preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least))
 			$requires_at_least = $this->sanitize_text($_requires_at_least[1]);
 		else
 			$requires_at_least = NULL;
 
 
 		// Tested up to: 2.1
-		if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
-			$tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
+		if (preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to))
+			$tested_up_to = $this->sanitize_text($_tested_up_to[1]);
 		else
 			$tested_up_to = NULL;
 
 		// Requires PHP: 5.2.4
-		if ( preg_match('|Requires PHP:(.*)|i', $file_contents, $_requires_php) ) {
-			$requires_php = $this->sanitize_text( $_requires_php[1] );
+		if (preg_match('|Requires PHP:(.*)|i', $file_contents, $_requires_php)) {
+			$requires_php = $this->sanitize_text($_requires_php[1]);
 		} else {
 			$requires_php = null;
 		}
 
 		// Stable tag: 10.4-ride-the-fire-eagle-danger-day
-		if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
-			$stable_tag = $this->sanitize_text( $_stable_tag[1] );
+		if (preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag))
+			$stable_tag = $this->sanitize_text($_stable_tag[1]);
 		else
 			$stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
 
 
 		// Tags: some tag, another tag, we like tags
-		if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
+		if (preg_match('|Tags:(.*)|i', $file_contents, $_tags)) {
 			$tags = preg_split('|,[\s]*?|', trim($_tags[1]));
-			foreach ( array_keys($tags) as $t )
-				$tags[$t] = $this->sanitize_text( $tags[$t] );
+			foreach (array_keys($tags) as $t)
+				$tags[$t] = $this->sanitize_text($tags[$t]);
 		} else {
 			$tags = array();
 		}
@@ -78,11 +78,11 @@ 
 
 		// Contributors: markjaquith, mdawaffe, zefrank
 		$contributors = array();
-		if ( preg_match('|Contributors:(.*)|i', $file_contents, $_contributors) ) {
+		if (preg_match('|Contributors:(.*)|i', $file_contents, $_contributors)) {
 			$temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
-			foreach ( array_keys($temp_contributors) as $c ) {
-				$tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
-				if ( strlen(trim($tmp_sanitized)) > 0 )
+			foreach (array_keys($temp_contributors) as $c) {
+				$tmp_sanitized = $this->user_sanitize($temp_contributors[$c]);
+				if (strlen(trim($tmp_sanitized)) > 0)
 					$contributors[$c] = $tmp_sanitized;
 				unset($tmp_sanitized);
 			}
@@ -90,17 +90,17 @@ 
 
 
 		// Donate Link: URL
-		if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
-			$donate_link = esc_url( $_donate_link[1] );
+		if (preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link))
+			$donate_link = esc_url($_donate_link[1]);
 		else
 			$donate_link = NULL;
 
 
 		// togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
-		foreach ( array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop ) {
-			if ( $$chop ) {
+		foreach (array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop) {
+			if ($$chop) {
 				$_chop = '_' . $chop;
-				$file_contents = $this->chop_string( $file_contents, ${$_chop}[0] );
+				$file_contents = $this->chop_string($file_contents, ${$_chop}[0]);
 			}
 		}
 
@@ -108,30 +108,30 @@ 
 
 
 		// short-description fu
-		if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
-			$_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
-		$short_desc_filtered = $this->sanitize_text( $_short_description[2] );
+		if (!preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description))
+			$_short_description = array(1 => &$file_contents, 2 => &$file_contents);
+		$short_desc_filtered = $this->sanitize_text($_short_description[2]);
 		$short_desc_length = strlen($short_desc_filtered);
 		$short_description = substr($short_desc_filtered, 0, 150);
-		if ( $short_desc_length > strlen($short_description) )
+		if ($short_desc_length > strlen($short_description))
 			$truncated = true;
 		else
 			$truncated = false;
-		if ( $_short_description[1] )
-			$file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
+		if ($_short_description[1])
+			$file_contents = $this->chop_string($file_contents, $_short_description[1]); // yes, the [1] is intentional
 
 		// == Section ==
 		// Break into sections
 		// $_sections[0] will be the title of the first section, $_sections[1] will be the content of the first section
 		// the array alternates from there:  title2, content2, title3, content3... and so forth
-		$_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+		$_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$sections = array();
-		for ( $i=0; $i < count($_sections); $i +=2 ) {
-			$title = $this->sanitize_text( $_sections[$i] );
-			if ( isset($_sections[$i+1]) ) {
-				$content = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i+1]);
-				$content = $this->filter_text( $content, true );
+		for ($i = 0; $i < count($_sections); $i += 2) {
+			$title = $this->sanitize_text($_sections[$i]);
+			if (isset($_sections[$i + 1])) {
+				$content = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i + 1]);
+				$content = $this->filter_text($content, true);
 			} else {
 				$content = '';
 			}
@@ -143,21 +143,21 @@ 
 		// This is where we nab our special sections, so we can enforce their order and treat them differently, if needed
 		// upgrade_notice is not a section, but parse it like it is for now
 		$final_sections = array();
-		foreach ( array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section ) {
-			if ( isset($sections[$special_section]) ) {
+		foreach (array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section) {
+			if (isset($sections[$special_section])) {
 				$final_sections[$special_section] = $sections[$special_section]['content'];
 				unset($sections[$special_section]);
 			}
 		}
-		if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
+		if (isset($final_sections['change_log']) && empty($final_sections['changelog']))
 			$final_sections['changelog'] = $final_sections['change_log'];
 
 
 		$final_screenshots = array();
-		if ( isset($final_sections['screenshots']) ) {
+		if (isset($final_sections['screenshots'])) {
 			preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
-			if ( $screenshots ) {
-				foreach ( (array) $screenshots as $ss )
+			if ($screenshots) {
+				foreach ((array) $screenshots as $ss)
 					$final_screenshots[] = $ss[1];
 			}
 		}
@@ -165,22 +165,22 @@ 
 		// Parse the upgrade_notice section specially:
 		// 1.0 => blah, 1.1 => fnord
 		$upgrade_notice = array();
-		if ( isset($final_sections['upgrade_notice']) ) {
-			$split = preg_split( '#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-			if ( count($split) >= 2 ) {
-				for ( $i = 0; $i < count( $split ); $i += 2 ) {
-					$upgrade_notice[$this->sanitize_text( $split[$i] )] = substr( $this->sanitize_text( $split[$i + 1] ), 0, 300 );
+		if (isset($final_sections['upgrade_notice'])) {
+			$split = preg_split('#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+			if (count($split) >= 2) {
+				for ($i = 0; $i < count($split); $i += 2) {
+					$upgrade_notice[$this->sanitize_text($split[$i])] = substr($this->sanitize_text($split[$i + 1]), 0, 300);
 				}
 			}
-			unset( $final_sections['upgrade_notice'] );
+			unset($final_sections['upgrade_notice']);
 		}
 
 		// No description?
 		// No problem... we'll just fall back to the old style of description
 		// We'll even let you use markup this time!
 		$excerpt = false;
-		if ( !isset($final_sections['description']) ) {
-			$final_sections = array_merge(array('description' => $this->filter_text( $_short_description[2], true )), $final_sections);
+		if (!isset($final_sections['description'])) {
+			$final_sections = array_merge(array('description' => $this->filter_text($_short_description[2], true)), $final_sections);
 			$excerpt = true;
 		}
 
@@ -188,7 +188,7 @@ 
 		// dump the non-special sections into $remaining_content
 		// their order will be determined by their original order in the readme.txt
 		$remaining_content = '';
-		foreach ( $sections as $s_name => $s_data ) {
+		foreach ($sections as $s_name => $s_data) {
 			$remaining_content .= "\n<h3>{$s_data['title']}</h3>\n{$s_data['content']}";
 		}
 		$remaining_content = trim($remaining_content);
@@ -218,8 +218,8 @@ 
 		return $r;
 	}
 
-	function chop_string( $string, $chop ) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
-		if ( $_string = strstr($string, $chop) ) {
+	function chop_string($string, $chop) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
+		if ($_string = strstr($string, $chop)) {
 			$_string = substr($_string, strlen($chop));
 			return trim($_string);
 		} else {
@@ -227,11 +227,11 @@ 
 		}
 	}
 
-	function user_sanitize( $text, $strict = false ) { // whitelisted chars
-		if ( function_exists('user_sanitize') ) // bbPress native
-			return user_sanitize( $text, $strict );
+	function user_sanitize($text, $strict = false) { // whitelisted chars
+		if (function_exists('user_sanitize')) // bbPress native
+			return user_sanitize($text, $strict);
 
-		if ( $strict ) {
+		if ($strict) {
 			$text = preg_replace('/[^a-z0-9-]/i', '', $text);
 			$text = preg_replace('|-+|', '-', $text);
 		} else {
@@ -240,20 +240,20 @@ 
 		return $text;
 	}
 
-	function sanitize_text( $text ) { // not fancy
+	function sanitize_text($text) { // not fancy
 		$text = strip_tags($text);
 		$text = esc_html($text);
 		$text = trim($text);
 		return $text;
 	}
 
-	function filter_text( $text, $markdown = false ) { // fancy, Markdown
+	function filter_text($text, $markdown = false) { // fancy, Markdown
 		$text = trim($text);
 
-		$text = call_user_func( array( __CLASS__, 'code_trick' ), $text, $markdown ); // A better parser than Markdown's for: backticks -> CODE
+		$text = call_user_func(array(__CLASS__, 'code_trick'), $text, $markdown); // A better parser than Markdown's for: backticks -> CODE
 
-		if ( $markdown ) { // Parse markdown.
-			if ( !class_exists('Parsedown', false) ) {
+		if ($markdown) { // Parse markdown.
+			if (!class_exists('Parsedown', false)) {
 				/** @noinspection PhpIncludeInspection */
 				require_once(dirname(__FILE__) . '/Parsedown' . (version_compare(PHP_VERSION, '5.3.0', '>=') ? '' : 'Legacy') . '.php');
 			}
@@ -282,39 +282,39 @@ 
 
 		$text = balanceTags($text);
 		
-		$text = wp_kses( $text, $allowed );
+		$text = wp_kses($text, $allowed);
 		$text = trim($text);
 		return $text;
 	}
 
-	function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
+	function code_trick($text, $markdown) { // Don't use bbPress native function - it's incompatible with Markdown
 		// If doing markdown, first take any user formatted code blocks and turn them into backticks so that
 		// markdown will preserve things like underscores in code blocks
-		if ( $markdown )
-			$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
+		if ($markdown)
+			$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array(__CLASS__, 'decodeit'), $text);
 
 		$text = str_replace(array("\r\n", "\r"), "\n", $text);
-		if ( !$markdown ) {
+		if (!$markdown) {
 			// This gets the "inline" code blocks, but can't be used with Markdown.
-			$text = preg_replace_callback("|(`)(.*?)`|", array( __CLASS__, 'encodeit'), $text);
+			$text = preg_replace_callback("|(`)(.*?)`|", array(__CLASS__, 'encodeit'), $text);
 			// This gets the "block level" code blocks and converts them to PRE CODE
-			$text = preg_replace_callback("!(^|\n)`(.*?)`!s", array( __CLASS__, 'encodeit'), $text);
+			$text = preg_replace_callback("!(^|\n)`(.*?)`!s", array(__CLASS__, 'encodeit'), $text);
 		} else {
 			// Markdown can do inline code, we convert bbPress style block level code to Markdown style
-			$text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent'), $text);
+			$text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array(__CLASS__, 'indent'), $text);
 		}
 		return $text;
 	}
 
-	function indent( $matches ) {
+	function indent($matches) {
 		$text = $matches[3];
 		$text = preg_replace('|^|m', $matches[2] . '    ', $text);
 		return $matches[1] . $text;
 	}
 
-	function encodeit( $matches ) {
-		if ( function_exists('encodeit') ) // bbPress native
-			return encodeit( $matches );
+	function encodeit($matches) {
+		if (function_exists('encodeit')) // bbPress native
+			return encodeit($matches);
 
 		$text = trim($matches[2]);
 		$text = htmlspecialchars($text, ENT_QUOTES);
@@ -323,14 +323,14 @@ 
 		$text = str_replace('&amp;lt;', '&lt;', $text);
 		$text = str_replace('&amp;gt;', '&gt;', $text);
 		$text = "<code>$text</code>";
-		if ( "`" != $matches[1] )
+		if ("`" != $matches[1])
 			$text = "<pre>$text</pre>";
 		return $text;
 	}
 
-	function decodeit( $matches ) {
-		if ( function_exists('decodeit') ) // bbPress native
-			return decodeit( $matches );
+	function decodeit($matches) {
+		if (function_exists('decodeit')) // bbPress native
+			return decodeit($matches);
 
 		$text = $matches[2];
 		$trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
@@ -338,7 +338,7 @@ 
 		$text = str_replace('<br />', '', $text);
 		$text = str_replace('&#38;', '&', $text);
 		$text = str_replace('&#39;', "'", $text);
-		if ( '<pre><code>' == $matches[1] )
+		if ('<pre><code>' == $matches[1])
 			$text = "\n$text\n";
 		return "`$text`";
 	}

Braces +70 added lines, -45 removed lines

@@ -21,8 +21,9 @@ 
 	function parse_readme_contents( $file_contents ) {
 		$file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
 		$file_contents = trim($file_contents);
-		if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
-			$file_contents = substr( $file_contents, 3 );
+		if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) ) {
+					$file_contents = substr( $file_contents, 3 );
+		}
 
 		// Markdown transformations
 		$file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
@@ -31,8 +32,10 @@ 
 
 		// === Plugin Name ===
 		// Must be the very first thing.
-		if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
-			return array(); // require a name
+		if ( !preg_match('|^===(.*)===|', $file_contents, $_name) ) {
+					return array();
+		}
+		// require a name
 		$name = trim($_name[1], '=');
 		$name = $this->sanitize_text( $name );
 
@@ -40,17 +43,19 @@ 
 
 
 		// Requires at least: 1.5
-		if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
-			$requires_at_least = $this->sanitize_text($_requires_at_least[1]);
-		else
-			$requires_at_least = NULL;
+		if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) ) {
+					$requires_at_least = $this->sanitize_text($_requires_at_least[1]);
+		} else {
+					$requires_at_least = NULL;
+		}
 
 
 		// Tested up to: 2.1
-		if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
-			$tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
-		else
-			$tested_up_to = NULL;
+		if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) ) {
+					$tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
+		} else {
+					$tested_up_to = NULL;
+		}
 
 		// Requires PHP: 5.2.4
 		if ( preg_match('|Requires PHP:(.*)|i', $file_contents, $_requires_php) ) {
@@ -60,17 +65,20 @@ 
 		}
 
 		// Stable tag: 10.4-ride-the-fire-eagle-danger-day
-		if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
-			$stable_tag = $this->sanitize_text( $_stable_tag[1] );
-		else
-			$stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
+		if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) ) {
+					$stable_tag = $this->sanitize_text( $_stable_tag[1] );
+		} else {
+					$stable_tag = NULL;
+		}
+		// we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
 
 
 		// Tags: some tag, another tag, we like tags
 		if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
 			$tags = preg_split('|,[\s]*?|', trim($_tags[1]));
-			foreach ( array_keys($tags) as $t )
-				$tags[$t] = $this->sanitize_text( $tags[$t] );
+			foreach ( array_keys($tags) as $t ) {
+							$tags[$t] = $this->sanitize_text( $tags[$t] );
+			}
 		} else {
 			$tags = array();
 		}
@@ -82,18 +90,20 @@ 
 			$temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
 			foreach ( array_keys($temp_contributors) as $c ) {
 				$tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
-				if ( strlen(trim($tmp_sanitized)) > 0 )
-					$contributors[$c] = $tmp_sanitized;
+				if ( strlen(trim($tmp_sanitized)) > 0 ) {
+									$contributors[$c] = $tmp_sanitized;
+				}
 				unset($tmp_sanitized);
 			}
 		}
 
 
 		// Donate Link: URL
-		if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
-			$donate_link = esc_url( $_donate_link[1] );
-		else
-			$donate_link = NULL;
+		if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) ) {
+					$donate_link = esc_url( $_donate_link[1] );
+		} else {
+					$donate_link = NULL;
+		}
 
 
 		// togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
@@ -108,17 +118,21 @@ 
 
 
 		// short-description fu
-		if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
-			$_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
+		if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) ) {
+					$_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
+		}
 		$short_desc_filtered = $this->sanitize_text( $_short_description[2] );
 		$short_desc_length = strlen($short_desc_filtered);
 		$short_description = substr($short_desc_filtered, 0, 150);
-		if ( $short_desc_length > strlen($short_description) )
-			$truncated = true;
-		else
-			$truncated = false;
-		if ( $_short_description[1] )
-			$file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
+		if ( $short_desc_length > strlen($short_description) ) {
+					$truncated = true;
+		} else {
+					$truncated = false;
+		}
+		if ( $_short_description[1] ) {
+					$file_contents = $this->chop_string( $file_contents, $_short_description[1] );
+		}
+		// yes, the [1] is intentional
 
 		// == Section ==
 		// Break into sections
@@ -149,16 +163,18 @@ 
 				unset($sections[$special_section]);
 			}
 		}
-		if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
-			$final_sections['changelog'] = $final_sections['change_log'];
+		if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) ) {
+					$final_sections['changelog'] = $final_sections['change_log'];
+		}
 
 
 		$final_screenshots = array();
 		if ( isset($final_sections['screenshots']) ) {
 			preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
 			if ( $screenshots ) {
-				foreach ( (array) $screenshots as $ss )
-					$final_screenshots[] = $ss[1];
+				foreach ( (array) $screenshots as $ss ) {
+									$final_screenshots[] = $ss[1];
+				}
 			}
 		}
 
@@ -228,8 +244,10 @@ 
 	}
 
 	function user_sanitize( $text, $strict = false ) { // whitelisted chars
-		if ( function_exists('user_sanitize') ) // bbPress native
+		if ( function_exists('user_sanitize') ) {
+		    // bbPress native
 			return user_sanitize( $text, $strict );
+		}
 
 		if ( $strict ) {
 			$text = preg_replace('/[^a-z0-9-]/i', '', $text);
@@ -290,8 +308,9 @@ 
 	function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
 		// If doing markdown, first take any user formatted code blocks and turn them into backticks so that
 		// markdown will preserve things like underscores in code blocks
-		if ( $markdown )
-			$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
+		if ( $markdown ) {
+					$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
+		}
 
 		$text = str_replace(array("\r\n", "\r"), "\n", $text);
 		if ( !$markdown ) {
@@ -313,8 +332,10 @@ 
 	}
 
 	function encodeit( $matches ) {
-		if ( function_exists('encodeit') ) // bbPress native
+		if ( function_exists('encodeit') ) {
+		    // bbPress native
 			return encodeit( $matches );
+		}
 
 		$text = trim($matches[2]);
 		$text = htmlspecialchars($text, ENT_QUOTES);
@@ -323,14 +344,17 @@ 
 		$text = str_replace('&amp;lt;', '&lt;', $text);
 		$text = str_replace('&amp;gt;', '&gt;', $text);
 		$text = "<code>$text</code>";
-		if ( "`" != $matches[1] )
-			$text = "<pre>$text</pre>";
+		if ( "`" != $matches[1] ) {
+					$text = "<pre>$text</pre>";
+		}
 		return $text;
 	}
 
 	function decodeit( $matches ) {
-		if ( function_exists('decodeit') ) // bbPress native
+		if ( function_exists('decodeit') ) {
+		    // bbPress native
 			return decodeit( $matches );
+		}
 
 		$text = $matches[2];
 		$trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
@@ -338,8 +362,9 @@ 
 		$text = str_replace('<br />', '', $text);
 		$text = str_replace('&#38;', '&', $text);
 		$text = str_replace('&#39;', "'", $text);
-		if ( '<pre><code>' == $matches[1] )
-			$text = "\n$text\n";
+		if ( '<pre><code>' == $matches[1] ) {
+					$text = "\n$text\n";
+		}
 		return "`$text`";
 	}
 

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/vendor/Parsedown.php

Indentation +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 if ( !class_exists('Parsedown', false) ) {
-	require __DIR__ . '/ParsedownModern.php';
+    require __DIR__ . '/ParsedownModern.php';
 }

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
-if ( !class_exists('Parsedown', false) ) {
+if (!class_exists('Parsedown', false)) {
 	require __DIR__ . '/ParsedownModern.php';
 }

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/load-v5p0.php

Indentation +16 added lines, -16 removed lines

@@ -13,22 +13,22 @@
 
 //Register classes defined in this version with the factory.
 foreach (
-	array(
-		'Plugin\\UpdateChecker' => Plugin\UpdateChecker::class,
-		'Theme\\UpdateChecker'  => Theme\UpdateChecker::class,
-
-		'Vcs\\PluginUpdateChecker' => Vcs\PluginUpdateChecker::class,
-		'Vcs\\ThemeUpdateChecker'  => Vcs\ThemeUpdateChecker::class,
-
-		'GitHubApi'    => Vcs\GitHubApi::class,
-		'BitBucketApi' => Vcs\BitBucketApi::class,
-		'GitLabApi'    => Vcs\GitLabApi::class,
-	)
-	as $pucGeneralClass => $pucVersionedClass
+    array(
+        'Plugin\\UpdateChecker' => Plugin\UpdateChecker::class,
+        'Theme\\UpdateChecker'  => Theme\UpdateChecker::class,
+
+        'Vcs\\PluginUpdateChecker' => Vcs\PluginUpdateChecker::class,
+        'Vcs\\ThemeUpdateChecker'  => Vcs\ThemeUpdateChecker::class,
+
+        'GitHubApi'    => Vcs\GitHubApi::class,
+        'BitBucketApi' => Vcs\BitBucketApi::class,
+        'GitLabApi'    => Vcs\GitLabApi::class,
+    )
+    as $pucGeneralClass => $pucVersionedClass
 ) {
-	MajorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.0');
-	//Also add it to the minor-version factory in case the major-version factory
-	//was already defined by another, older version of the update checker.
-	MinorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.0');
+    MajorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.0');
+    //Also add it to the minor-version factory in case the major-version factory
+    //was already defined by another, older version of the update checker.
+    MinorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.0');
 }
 

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/Puc/v5p0/UpdateChecker.php

Indentation +968 added lines, -968 removed lines

@@ -6,998 +6,998 @@
 
 if ( !class_exists(UpdateChecker::class, false) ):
 
-	abstract class UpdateChecker {
-		protected $filterSuffix = '';
-		protected $updateTransient = '';
-		protected $translationType = ''; //"plugin" or "theme".
-
-		/**
-		 * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
-		 * and should be logged to the standard PHP error log.
-		 * @var bool
-		 */
-		public $debugMode = null;
-
-		/**
-		 * @var string Where to store the update info.
-		 */
-		public $optionName = '';
-
-		/**
-		 * @var string The URL of the metadata file.
-		 */
-		public $metadataUrl = '';
-
-		/**
-		 * @var string Plugin or theme directory name.
-		 */
-		public $directoryName = '';
-
-		/**
-		 * @var string The slug that will be used in update checker hooks and remote API requests.
-		 * Usually matches the directory name unless the plugin/theme directory has been renamed.
-		 */
-		public $slug = '';
-
-		/**
-		 * @var InstalledPackage
-		 */
-		protected $package;
-
-		/**
-		 * @var Scheduler
-		 */
-		public $scheduler;
-
-		/**
-		 * @var UpgraderStatus
-		 */
-		protected $upgraderStatus;
-
-		/**
-		 * @var StateStore
-		 */
-		protected $updateState;
-
-		/**
-		 * @var array List of API errors triggered during the last checkForUpdates() call.
-		 */
-		protected $lastRequestApiErrors = array();
-
-		/**
-		 * @var string|mixed The default is 0 because parse_url() can return NULL or FALSE.
-		 */
-		protected $cachedMetadataHost = 0;
-
-		/**
-		 * @var DebugBar\Extension|null
-		 */
-		protected $debugBarExtension = null;
-
-		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
-			$this->metadataUrl = $metadataUrl;
-			$this->directoryName = $directoryName;
-			$this->slug = !empty($slug) ? $slug : $this->directoryName;
-
-			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
-				//BC: Initially the library only supported plugin updates and didn't use type prefixes
-				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
-					$this->optionName = 'external_updates-' . $this->slug;
-				} else {
-					$this->optionName = $this->getUniqueName('external_updates');
-				}
-			}
-
-			$this->package = $this->createInstalledPackage();
-			$this->scheduler = $this->createScheduler($checkPeriod);
-			$this->upgraderStatus = new UpgraderStatus();
-			$this->updateState = new StateStore($this->optionName);
-
-			if ( did_action('init') ) {
-				$this->loadTextDomain();
-			} else {
-				add_action('init', array($this, 'loadTextDomain'));
-			}
-
-			$this->installHooks();
-		}
-
-		/**
-		 * @internal
-		 */
-		public function loadTextDomain() {
-			//We're not using load_plugin_textdomain() or its siblings because figuring out where
-			//the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
-			$domain = 'plugin-update-checker';
-			$locale = apply_filters(
-				'plugin_locale',
-				(is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
-				$domain
-			);
-
-			$moFile = $domain . '-' . $locale . '.mo';
-			$path = realpath(dirname(__FILE__) . '/../../languages');
-
-			if ($path && file_exists($path)) {
-				load_textdomain($domain, $path . '/' . $moFile);
-			}
-		}
-
-		protected function installHooks() {
-			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-
-			//Insert translation updates into the update list.
-			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-
-			//Clear translation updates when WP clears the update cache.
-			//This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
-			//it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
-			add_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
-				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
-			}
-
-			//Allow HTTP requests to the metadata URL even if it's on a local host.
-			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
-
-			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
-				$this->maybeInitDebugBar();
-			} else {
-				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-			}
-		}
-
-		/**
-		 * Remove hooks that were added by this update checker instance.
-		 */
-		public function removeHooks() {
-			remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-			remove_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
-			remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
-			remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-
-			remove_action('init', array($this, 'loadTextDomain'));
-
-			if ( $this->scheduler ) {
-				$this->scheduler->removeHooks();
-			}
-
-			if ( $this->debugBarExtension ) {
-				$this->debugBarExtension->removeHooks();
-			}
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		abstract public function userCanInstallUpdates();
-
-		/**
-		 * Explicitly allow HTTP requests to the metadata URL.
-		 *
-		 * WordPress has a security feature where the HTTP API will reject all requests that are sent to
-		 * another site hosted on the same server as the current site (IP match), a local host, or a local
-		 * IP, unless the host exactly matches the current site.
-		 *
-		 * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
-		 *
-		 * That can be a problem when you're developing your plugin and you decide to host the update information
-		 * on the same server as your test site. Update requests will mysteriously fail.
-		 *
-		 * We fix that by adding an exception for the metadata host.
-		 *
-		 * @param bool $allow
-		 * @param string $host
-		 * @return bool
-		 */
-		public function allowMetadataHost($allow, $host) {
-			if ( $this->cachedMetadataHost === 0 ) {
-				$this->cachedMetadataHost = wp_parse_url($this->metadataUrl, PHP_URL_HOST);
-			}
-
-			if ( is_string($this->cachedMetadataHost) && (strtolower($host) === strtolower($this->cachedMetadataHost)) ) {
-				return true;
-			}
-			return $allow;
-		}
-
-		/**
-		 * Create a package instance that represents this plugin or theme.
-		 *
-		 * @return InstalledPackage
-		 */
-		abstract protected function createInstalledPackage();
-
-		/**
-		 * @return InstalledPackage
-		 */
-		public function getInstalledPackage() {
-			return $this->package;
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * This is implemented as a method to make it possible for plugins to subclass the update checker
-		 * and substitute their own scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Scheduler
-		 */
-		abstract protected function createScheduler($checkPeriod);
-
-		/**
-		 * Check for updates. The results are stored in the DB option specified in $optionName.
-		 *
-		 * @return Update|null
-		 */
-		public function checkForUpdates() {
-			$installedVersion = $this->getInstalledVersion();
-			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
-				$this->triggerError(
-					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
-					E_USER_WARNING
-				);
-				return null;
-			}
-
-			//Start collecting API errors.
-			$this->lastRequestApiErrors = array();
-			add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
-
-			$state = $this->updateState;
-			$state->setLastCheckToNow()
-				->setCheckedVersion($installedVersion)
-				->save(); //Save before checking in case something goes wrong
-
-			$state->setUpdate($this->requestUpdate());
-			$state->save();
-
-			//Stop collecting API errors.
-			remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
-
-			return $this->getUpdate();
-		}
-
-		/**
-		 * Load the update checker state from the DB.
-		 *
-		 * @return StateStore
-		 */
-		public function getUpdateState() {
-			return $this->updateState->lazyLoad();
-		}
-
-		/**
-		 * Reset update checker state - i.e. last check time, cached update data and so on.
-		 *
-		 * Call this when your plugin is being uninstalled, or if you want to
-		 * clear the update cache.
-		 */
-		public function resetUpdateState() {
-			$this->updateState->delete();
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Update|null
-		 */
-		public function getUpdate() {
-			$update = $this->updateState->getUpdate();
-
-			//Is there an update available?
-			if ( isset($update) ) {
-				//Check if the update is actually newer than the currently installed version.
-				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
-					return $update;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * Subclasses should run the update through filterUpdateResult before returning it.
-		 *
-		 * @return Update An instance of Update, or NULL when no updates are available.
-		 */
-		abstract public function requestUpdate();
-
-		/**
-		 * Filter the result of a requestUpdate() call.
-		 *
-		 * @template T of Update
-		 * @param T|null $update
-		 * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
-		 * @return T
-		 */
-		protected function filterUpdateResult($update, $httpResult = null) {
-			//Let plugins/themes modify the update.
-			$update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
-
-			$this->fixSupportedWordpressVersion($update);
-
-			if ( isset($update, $update->translations) ) {
-				//Keep only those translation updates that apply to this site.
-				$update->translations = $this->filterApplicableTranslations($update->translations);
-			}
-
-			return $update;
-		}
-
-		/**
-		 * The "Tested up to" field in the plugin metadata is supposed to be in the form of "major.minor",
-		 * while WordPress core's list_plugin_updates() expects the $update->tested field to be an exact
-		 * version, e.g. "major.minor.patch", to say it's compatible. In other case it shows
-		 * "Compatibility: Unknown".
-		 * The function mimics how wordpress.org API crafts the "tested" field out of "Tested up to".
-		 *
-		 * @param Metadata|null $update
-		 */
-		protected function fixSupportedWordpressVersion(Metadata $update = null) {
-			if ( !isset($update->tested) || !preg_match('/^\d++\.\d++$/', $update->tested) ) {
-				return;
-			}
-
-			$actualWpVersions = array();
-
-			$wpVersion = $GLOBALS['wp_version'];
-
-			if ( function_exists('get_core_updates') ) {
-				$coreUpdates = get_core_updates();
-				if ( is_array($coreUpdates) ) {
-					foreach ($coreUpdates as $coreUpdate) {
-						if ( isset($coreUpdate->current) ) {
-							$actualWpVersions[] = $coreUpdate->current;
-						}
-					}
-				}
-			}
-
-			$actualWpVersions[] = $wpVersion;
-
-			$actualWpPatchNumber = null;
-			foreach ($actualWpVersions as $version) {
-				if ( preg_match('/^(?P<majorMinor>\d++\.\d++)(?:\.(?P<patch>\d++))?/', $version, $versionParts) ) {
-					if ( $versionParts['majorMinor'] === $update->tested ) {
-						$patch = isset($versionParts['patch']) ? intval($versionParts['patch']) : 0;
-						if ( $actualWpPatchNumber === null ) {
-							$actualWpPatchNumber = $patch;
-						} else {
-							$actualWpPatchNumber = max($actualWpPatchNumber, $patch);
-						}
-					}
-				}
-			}
-			if ( $actualWpPatchNumber === null ) {
-				$actualWpPatchNumber = 999;
-			}
-
-			if ( $actualWpPatchNumber > 0 ) {
-				$update->tested .= '.' . $actualWpPatchNumber;
-			}
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string|null Version number.
-		 */
-		public function getInstalledVersion() {
-			return $this->package->getInstalledVersion();
-		}
-
-		/**
-		 * Get the full path of the plugin or theme directory.
-		 *
-		 * @return string
-		 */
-		public function getAbsoluteDirectoryPath() {
-			return $this->package->getAbsoluteDirectoryPath();
-		}
-
-		/**
-		 * Trigger a PHP error, but only when $debugMode is enabled.
-		 *
-		 * @param string $message
-		 * @param int $errorType
-		 */
-		public function triggerError($message, $errorType) {
-			if ( $this->isDebugModeEnabled() ) {
-				//phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error -- Only happens in debug mode.
-				trigger_error(esc_html($message), $errorType);
-			}
-		}
-
-		/**
-		 * @return bool
-		 */
-		protected function isDebugModeEnabled() {
-			if ( $this->debugMode === null ) {
-				$this->debugMode = (bool)(constant('WP_DEBUG'));
-			}
-			return $this->debugMode;
-		}
-
-		/**
-		 * Get the full name of an update checker filter, action or DB entry.
-		 *
-		 * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
-		 * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
-		 *
-		 * @param string $baseTag
-		 * @return string
-		 */
-		public function getUniqueName($baseTag) {
-			$name = 'puc_' . $baseTag;
-			if ( $this->filterSuffix !== '' ) {
-				$name .= '_' . $this->filterSuffix;
-			}
-			return $name . '-' . $this->slug;
-		}
-
-		/**
-		 * Store API errors that are generated when checking for updates.
-		 *
-		 * @internal
-		 * @param \WP_Error $error
-		 * @param array|null $httpResponse
-		 * @param string|null $url
-		 * @param string|null $slug
-		 */
-		public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
-			if ( isset($slug) && ($slug !== $this->slug) ) {
-				return;
-			}
-
-			$this->lastRequestApiErrors[] = array(
-				'error'        => $error,
-				'httpResponse' => $httpResponse,
-				'url'          => $url,
-			);
-		}
-
-		/**
-		 * @return array
-		 */
-		public function getLastRequestApiErrors() {
-			return $this->lastRequestApiErrors;
-		}
-
-		/* -------------------------------------------------------------------
+    abstract class UpdateChecker {
+        protected $filterSuffix = '';
+        protected $updateTransient = '';
+        protected $translationType = ''; //"plugin" or "theme".
+
+        /**
+         * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
+         * and should be logged to the standard PHP error log.
+         * @var bool
+         */
+        public $debugMode = null;
+
+        /**
+         * @var string Where to store the update info.
+         */
+        public $optionName = '';
+
+        /**
+         * @var string The URL of the metadata file.
+         */
+        public $metadataUrl = '';
+
+        /**
+         * @var string Plugin or theme directory name.
+         */
+        public $directoryName = '';
+
+        /**
+         * @var string The slug that will be used in update checker hooks and remote API requests.
+         * Usually matches the directory name unless the plugin/theme directory has been renamed.
+         */
+        public $slug = '';
+
+        /**
+         * @var InstalledPackage
+         */
+        protected $package;
+
+        /**
+         * @var Scheduler
+         */
+        public $scheduler;
+
+        /**
+         * @var UpgraderStatus
+         */
+        protected $upgraderStatus;
+
+        /**
+         * @var StateStore
+         */
+        protected $updateState;
+
+        /**
+         * @var array List of API errors triggered during the last checkForUpdates() call.
+         */
+        protected $lastRequestApiErrors = array();
+
+        /**
+         * @var string|mixed The default is 0 because parse_url() can return NULL or FALSE.
+         */
+        protected $cachedMetadataHost = 0;
+
+        /**
+         * @var DebugBar\Extension|null
+         */
+        protected $debugBarExtension = null;
+
+        public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
+            $this->debugMode = (bool)(constant('WP_DEBUG'));
+            $this->metadataUrl = $metadataUrl;
+            $this->directoryName = $directoryName;
+            $this->slug = !empty($slug) ? $slug : $this->directoryName;
+
+            $this->optionName = $optionName;
+            if ( empty($this->optionName) ) {
+                //BC: Initially the library only supported plugin updates and didn't use type prefixes
+                //in the option name. Lets use the same prefix-less name when possible.
+                if ( $this->filterSuffix === '' ) {
+                    $this->optionName = 'external_updates-' . $this->slug;
+                } else {
+                    $this->optionName = $this->getUniqueName('external_updates');
+                }
+            }
+
+            $this->package = $this->createInstalledPackage();
+            $this->scheduler = $this->createScheduler($checkPeriod);
+            $this->upgraderStatus = new UpgraderStatus();
+            $this->updateState = new StateStore($this->optionName);
+
+            if ( did_action('init') ) {
+                $this->loadTextDomain();
+            } else {
+                add_action('init', array($this, 'loadTextDomain'));
+            }
+
+            $this->installHooks();
+        }
+
+        /**
+         * @internal
+         */
+        public function loadTextDomain() {
+            //We're not using load_plugin_textdomain() or its siblings because figuring out where
+            //the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
+            $domain = 'plugin-update-checker';
+            $locale = apply_filters(
+                'plugin_locale',
+                (is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
+                $domain
+            );
+
+            $moFile = $domain . '-' . $locale . '.mo';
+            $path = realpath(dirname(__FILE__) . '/../../languages');
+
+            if ($path && file_exists($path)) {
+                load_textdomain($domain, $path . '/' . $moFile);
+            }
+        }
+
+        protected function installHooks() {
+            //Insert our update info into the update array maintained by WP.
+            add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+
+            //Insert translation updates into the update list.
+            add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+
+            //Clear translation updates when WP clears the update cache.
+            //This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
+            //it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
+            add_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            //Rename the update directory to be the same as the existing directory.
+            if ( $this->directoryName !== '.' ) {
+                add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
+            }
+
+            //Allow HTTP requests to the metadata URL even if it's on a local host.
+            add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
+
+            //DebugBar integration.
+            if ( did_action('plugins_loaded') ) {
+                $this->maybeInitDebugBar();
+            } else {
+                add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+            }
+        }
+
+        /**
+         * Remove hooks that were added by this update checker instance.
+         */
+        public function removeHooks() {
+            remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+            remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+            remove_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
+            remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
+            remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+
+            remove_action('init', array($this, 'loadTextDomain'));
+
+            if ( $this->scheduler ) {
+                $this->scheduler->removeHooks();
+            }
+
+            if ( $this->debugBarExtension ) {
+                $this->debugBarExtension->removeHooks();
+            }
+        }
+
+        /**
+         * Check if the current user has the required permissions to install updates.
+         *
+         * @return bool
+         */
+        abstract public function userCanInstallUpdates();
+
+        /**
+         * Explicitly allow HTTP requests to the metadata URL.
+         *
+         * WordPress has a security feature where the HTTP API will reject all requests that are sent to
+         * another site hosted on the same server as the current site (IP match), a local host, or a local
+         * IP, unless the host exactly matches the current site.
+         *
+         * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
+         *
+         * That can be a problem when you're developing your plugin and you decide to host the update information
+         * on the same server as your test site. Update requests will mysteriously fail.
+         *
+         * We fix that by adding an exception for the metadata host.
+         *
+         * @param bool $allow
+         * @param string $host
+         * @return bool
+         */
+        public function allowMetadataHost($allow, $host) {
+            if ( $this->cachedMetadataHost === 0 ) {
+                $this->cachedMetadataHost = wp_parse_url($this->metadataUrl, PHP_URL_HOST);
+            }
+
+            if ( is_string($this->cachedMetadataHost) && (strtolower($host) === strtolower($this->cachedMetadataHost)) ) {
+                return true;
+            }
+            return $allow;
+        }
+
+        /**
+         * Create a package instance that represents this plugin or theme.
+         *
+         * @return InstalledPackage
+         */
+        abstract protected function createInstalledPackage();
+
+        /**
+         * @return InstalledPackage
+         */
+        public function getInstalledPackage() {
+            return $this->package;
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * This is implemented as a method to make it possible for plugins to subclass the update checker
+         * and substitute their own scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Scheduler
+         */
+        abstract protected function createScheduler($checkPeriod);
+
+        /**
+         * Check for updates. The results are stored in the DB option specified in $optionName.
+         *
+         * @return Update|null
+         */
+        public function checkForUpdates() {
+            $installedVersion = $this->getInstalledVersion();
+            //Fail silently if we can't find the plugin/theme or read its header.
+            if ( $installedVersion === null ) {
+                $this->triggerError(
+                    sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
+                    E_USER_WARNING
+                );
+                return null;
+            }
+
+            //Start collecting API errors.
+            $this->lastRequestApiErrors = array();
+            add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
+
+            $state = $this->updateState;
+            $state->setLastCheckToNow()
+                ->setCheckedVersion($installedVersion)
+                ->save(); //Save before checking in case something goes wrong
+
+            $state->setUpdate($this->requestUpdate());
+            $state->save();
+
+            //Stop collecting API errors.
+            remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
+
+            return $this->getUpdate();
+        }
+
+        /**
+         * Load the update checker state from the DB.
+         *
+         * @return StateStore
+         */
+        public function getUpdateState() {
+            return $this->updateState->lazyLoad();
+        }
+
+        /**
+         * Reset update checker state - i.e. last check time, cached update data and so on.
+         *
+         * Call this when your plugin is being uninstalled, or if you want to
+         * clear the update cache.
+         */
+        public function resetUpdateState() {
+            $this->updateState->delete();
+        }
+
+        /**
+         * Get the details of the currently available update, if any.
+         *
+         * If no updates are available, or if the last known update version is below or equal
+         * to the currently installed version, this method will return NULL.
+         *
+         * Uses cached update data. To retrieve update information straight from
+         * the metadata URL, call requestUpdate() instead.
+         *
+         * @return Update|null
+         */
+        public function getUpdate() {
+            $update = $this->updateState->getUpdate();
+
+            //Is there an update available?
+            if ( isset($update) ) {
+                //Check if the update is actually newer than the currently installed version.
+                $installedVersion = $this->getInstalledVersion();
+                if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
+                    return $update;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * Subclasses should run the update through filterUpdateResult before returning it.
+         *
+         * @return Update An instance of Update, or NULL when no updates are available.
+         */
+        abstract public function requestUpdate();
+
+        /**
+         * Filter the result of a requestUpdate() call.
+         *
+         * @template T of Update
+         * @param T|null $update
+         * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
+         * @return T
+         */
+        protected function filterUpdateResult($update, $httpResult = null) {
+            //Let plugins/themes modify the update.
+            $update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
+
+            $this->fixSupportedWordpressVersion($update);
+
+            if ( isset($update, $update->translations) ) {
+                //Keep only those translation updates that apply to this site.
+                $update->translations = $this->filterApplicableTranslations($update->translations);
+            }
+
+            return $update;
+        }
+
+        /**
+         * The "Tested up to" field in the plugin metadata is supposed to be in the form of "major.minor",
+         * while WordPress core's list_plugin_updates() expects the $update->tested field to be an exact
+         * version, e.g. "major.minor.patch", to say it's compatible. In other case it shows
+         * "Compatibility: Unknown".
+         * The function mimics how wordpress.org API crafts the "tested" field out of "Tested up to".
+         *
+         * @param Metadata|null $update
+         */
+        protected function fixSupportedWordpressVersion(Metadata $update = null) {
+            if ( !isset($update->tested) || !preg_match('/^\d++\.\d++$/', $update->tested) ) {
+                return;
+            }
+
+            $actualWpVersions = array();
+
+            $wpVersion = $GLOBALS['wp_version'];
+
+            if ( function_exists('get_core_updates') ) {
+                $coreUpdates = get_core_updates();
+                if ( is_array($coreUpdates) ) {
+                    foreach ($coreUpdates as $coreUpdate) {
+                        if ( isset($coreUpdate->current) ) {
+                            $actualWpVersions[] = $coreUpdate->current;
+                        }
+                    }
+                }
+            }
+
+            $actualWpVersions[] = $wpVersion;
+
+            $actualWpPatchNumber = null;
+            foreach ($actualWpVersions as $version) {
+                if ( preg_match('/^(?P<majorMinor>\d++\.\d++)(?:\.(?P<patch>\d++))?/', $version, $versionParts) ) {
+                    if ( $versionParts['majorMinor'] === $update->tested ) {
+                        $patch = isset($versionParts['patch']) ? intval($versionParts['patch']) : 0;
+                        if ( $actualWpPatchNumber === null ) {
+                            $actualWpPatchNumber = $patch;
+                        } else {
+                            $actualWpPatchNumber = max($actualWpPatchNumber, $patch);
+                        }
+                    }
+                }
+            }
+            if ( $actualWpPatchNumber === null ) {
+                $actualWpPatchNumber = 999;
+            }
+
+            if ( $actualWpPatchNumber > 0 ) {
+                $update->tested .= '.' . $actualWpPatchNumber;
+            }
+        }
+
+        /**
+         * Get the currently installed version of the plugin or theme.
+         *
+         * @return string|null Version number.
+         */
+        public function getInstalledVersion() {
+            return $this->package->getInstalledVersion();
+        }
+
+        /**
+         * Get the full path of the plugin or theme directory.
+         *
+         * @return string
+         */
+        public function getAbsoluteDirectoryPath() {
+            return $this->package->getAbsoluteDirectoryPath();
+        }
+
+        /**
+         * Trigger a PHP error, but only when $debugMode is enabled.
+         *
+         * @param string $message
+         * @param int $errorType
+         */
+        public function triggerError($message, $errorType) {
+            if ( $this->isDebugModeEnabled() ) {
+                //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error -- Only happens in debug mode.
+                trigger_error(esc_html($message), $errorType);
+            }
+        }
+
+        /**
+         * @return bool
+         */
+        protected function isDebugModeEnabled() {
+            if ( $this->debugMode === null ) {
+                $this->debugMode = (bool)(constant('WP_DEBUG'));
+            }
+            return $this->debugMode;
+        }
+
+        /**
+         * Get the full name of an update checker filter, action or DB entry.
+         *
+         * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
+         * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
+         *
+         * @param string $baseTag
+         * @return string
+         */
+        public function getUniqueName($baseTag) {
+            $name = 'puc_' . $baseTag;
+            if ( $this->filterSuffix !== '' ) {
+                $name .= '_' . $this->filterSuffix;
+            }
+            return $name . '-' . $this->slug;
+        }
+
+        /**
+         * Store API errors that are generated when checking for updates.
+         *
+         * @internal
+         * @param \WP_Error $error
+         * @param array|null $httpResponse
+         * @param string|null $url
+         * @param string|null $slug
+         */
+        public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
+            if ( isset($slug) && ($slug !== $this->slug) ) {
+                return;
+            }
+
+            $this->lastRequestApiErrors[] = array(
+                'error'        => $error,
+                'httpResponse' => $httpResponse,
+                'url'          => $url,
+            );
+        }
+
+        /**
+         * @return array
+         */
+        public function getLastRequestApiErrors() {
+            return $this->lastRequestApiErrors;
+        }
+
+        /* -------------------------------------------------------------------
 		 * PUC filters and filter utilities
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Register a callback for one of the update checker filters.
-		 *
-		 * Identical to add_filter(), except it automatically adds the "puc_" prefix
-		 * and the "-$slug" suffix to the filter name. For example, "request_info_result"
-		 * becomes "puc_request_info_result-your_plugin_slug".
-		 *
-		 * @param string $tag
-		 * @param callable $callback
-		 * @param int $priority
-		 * @param int $acceptedArgs
-		 */
-		public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
-			add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Register a callback for one of the update checker filters.
+         *
+         * Identical to add_filter(), except it automatically adds the "puc_" prefix
+         * and the "-$slug" suffix to the filter name. For example, "request_info_result"
+         * becomes "puc_request_info_result-your_plugin_slug".
+         *
+         * @param string $tag
+         * @param callable $callback
+         * @param int $priority
+         * @param int $acceptedArgs
+         */
+        public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
+            add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
+        }
+
+        /* -------------------------------------------------------------------
 		 * Inject updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Insert the latest update (if any) into the update list maintained by WP.
-		 *
-		 * @param \stdClass $updates Update list.
-		 * @return \stdClass Modified update list.
-		 */
-		public function injectUpdate($updates) {
-			//Is there an update to insert?
-			$update = $this->getUpdate();
-
-			if ( !$this->shouldShowUpdates() ) {
-				$update = null;
-			}
-
-			if ( !empty($update) ) {
-				//Let plugins filter the update info before it's passed on to WordPress.
-				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
-				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
-			} else {
-				//Clean up any stale update info.
-				$updates = $this->removeUpdateFromList($updates);
-				//Add a placeholder item to the "no_update" list to enable auto-update support.
-				//If we don't do this, the option to enable automatic updates will only show up
-				//when an update is available.
-				$updates = $this->addNoUpdateItem($updates);
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * @param \stdClass|null $updates
-		 * @param \stdClass|array $updateToAdd
-		 * @return \stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-				$updates->response = array();
-			}
-
-			$updates->response[$this->getUpdateListKey()] = $updateToAdd;
-			return $updates;
-		}
-
-		/**
-		 * @param \stdClass|null $updates
-		 * @return \stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
-				unset($updates->response[$this->getUpdateListKey()]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * See this post for more information:
-		 * @link https://make.wordpress.org/core/2020/07/30/recommended-usage-of-the-updates-api-to-support-the-auto-updates-ui-for-plugins-and-themes-in-wordpress-5-5/
-		 *
-		 * @param \stdClass|null $updates
-		 * @return \stdClass
-		 */
-		protected function addNoUpdateItem($updates) {
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-				$updates->response = array();
-				$updates->no_update = array();
-			} else if ( !isset($updates->no_update) ) {
-				$updates->no_update = array();
-			}
-
-			$updates->no_update[$this->getUpdateListKey()] = (object) $this->getNoUpdateItemFields();
-
-			return $updates;
-		}
-
-		/**
-		 * Subclasses should override this method to add fields that are specific to plugins or themes.
-		 * @return array
-		 */
-		protected function getNoUpdateItemFields() {
-			return array(
-				'new_version'   => $this->getInstalledVersion(),
-				'url'           => '',
-				'package'       => '',
-				'requires_php'  => '',
-			);
-		}
-
-		/**
-		 * Get the key that will be used when adding updates to the update list that's maintained
-		 * by the WordPress core. The list is always an associative array, but the key is different
-		 * for plugins and themes.
-		 *
-		 * @return string
-		 */
-		abstract protected function getUpdateListKey();
-
-		/**
-		 * Should we show available updates?
-		 *
-		 * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
-		 * support automatic updates installation for mu-plugins, so PUC usually won't show update
-		 * notifications in that case. See the plugin-specific subclass for details.
-		 *
-		 * Note: This method only applies to updates that are displayed (or not) in the WordPress
-		 * admin. It doesn't affect APIs like requestUpdate and getUpdate.
-		 *
-		 * @return bool
-		 */
-		protected function shouldShowUpdates() {
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Insert the latest update (if any) into the update list maintained by WP.
+         *
+         * @param \stdClass $updates Update list.
+         * @return \stdClass Modified update list.
+         */
+        public function injectUpdate($updates) {
+            //Is there an update to insert?
+            $update = $this->getUpdate();
+
+            if ( !$this->shouldShowUpdates() ) {
+                $update = null;
+            }
+
+            if ( !empty($update) ) {
+                //Let plugins filter the update info before it's passed on to WordPress.
+                $update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
+                $updates = $this->addUpdateToList($updates, $update->toWpFormat());
+            } else {
+                //Clean up any stale update info.
+                $updates = $this->removeUpdateFromList($updates);
+                //Add a placeholder item to the "no_update" list to enable auto-update support.
+                //If we don't do this, the option to enable automatic updates will only show up
+                //when an update is available.
+                $updates = $this->addNoUpdateItem($updates);
+            }
+
+            return $updates;
+        }
+
+        /**
+         * @param \stdClass|null $updates
+         * @param \stdClass|array $updateToAdd
+         * @return \stdClass
+         */
+        protected function addUpdateToList($updates, $updateToAdd) {
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+                $updates->response = array();
+            }
+
+            $updates->response[$this->getUpdateListKey()] = $updateToAdd;
+            return $updates;
+        }
+
+        /**
+         * @param \stdClass|null $updates
+         * @return \stdClass|null
+         */
+        protected function removeUpdateFromList($updates) {
+            if ( isset($updates, $updates->response) ) {
+                unset($updates->response[$this->getUpdateListKey()]);
+            }
+            return $updates;
+        }
+
+        /**
+         * See this post for more information:
+         * @link https://make.wordpress.org/core/2020/07/30/recommended-usage-of-the-updates-api-to-support-the-auto-updates-ui-for-plugins-and-themes-in-wordpress-5-5/
+         *
+         * @param \stdClass|null $updates
+         * @return \stdClass
+         */
+        protected function addNoUpdateItem($updates) {
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+                $updates->response = array();
+                $updates->no_update = array();
+            } else if ( !isset($updates->no_update) ) {
+                $updates->no_update = array();
+            }
+
+            $updates->no_update[$this->getUpdateListKey()] = (object) $this->getNoUpdateItemFields();
+
+            return $updates;
+        }
+
+        /**
+         * Subclasses should override this method to add fields that are specific to plugins or themes.
+         * @return array
+         */
+        protected function getNoUpdateItemFields() {
+            return array(
+                'new_version'   => $this->getInstalledVersion(),
+                'url'           => '',
+                'package'       => '',
+                'requires_php'  => '',
+            );
+        }
+
+        /**
+         * Get the key that will be used when adding updates to the update list that's maintained
+         * by the WordPress core. The list is always an associative array, but the key is different
+         * for plugins and themes.
+         *
+         * @return string
+         */
+        abstract protected function getUpdateListKey();
+
+        /**
+         * Should we show available updates?
+         *
+         * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
+         * support automatic updates installation for mu-plugins, so PUC usually won't show update
+         * notifications in that case. See the plugin-specific subclass for details.
+         *
+         * Note: This method only applies to updates that are displayed (or not) in the WordPress
+         * admin. It doesn't affect APIs like requestUpdate and getUpdate.
+         *
+         * @return bool
+         */
+        protected function shouldShowUpdates() {
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * JSON-based update API
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
-		 *
-		 * @param class-string<Update> $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
-		 * @param string $filterRoot
-		 * @param array $queryArgs Additional query arguments.
-		 * @return array<Metadata|null, array|WP_Error> A metadata instance and the value returned by wp_remote_get().
-		 */
-		protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
-			//Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
-			$queryArgs = array_merge(
-				array(
-					'installed_version' => strval($this->getInstalledVersion()),
-					'php' => phpversion(),
-					'locale' => get_locale(),
-				),
-				$queryArgs
-			);
-			$queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
-
-			//Various options for the wp_remote_get() call. Plugins can filter these, too.
-			$options = array(
-				'timeout' => 10, //seconds
-				'headers' => array(
-					'Accept' => 'application/json',
-				),
-			);
-			$options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
-
-			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
-			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
-				$url = add_query_arg($queryArgs, $url);
-			}
-
-			$result = wp_remote_get($url, $options);
-
-			$result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
+        /**
+         * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
+         *
+         * @param class-string<Update> $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
+         * @param string $filterRoot
+         * @param array $queryArgs Additional query arguments.
+         * @return array<Metadata|null, array|WP_Error> A metadata instance and the value returned by wp_remote_get().
+         */
+        protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
+            //Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
+            $queryArgs = array_merge(
+                array(
+                    'installed_version' => strval($this->getInstalledVersion()),
+                    'php' => phpversion(),
+                    'locale' => get_locale(),
+                ),
+                $queryArgs
+            );
+            $queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
+
+            //Various options for the wp_remote_get() call. Plugins can filter these, too.
+            $options = array(
+                'timeout' => 10, //seconds
+                'headers' => array(
+                    'Accept' => 'application/json',
+                ),
+            );
+            $options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
+
+            //The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
+            $url = $this->metadataUrl;
+            if ( !empty($queryArgs) ){
+                $url = add_query_arg($queryArgs, $url);
+            }
+
+            $result = wp_remote_get($url, $options);
+
+            $result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
 			
-			//Try to parse the response
-			$status = $this->validateApiResponse($result);
-			$metadata = null;
-			if ( !is_wp_error($status) ){
-				if ( (strpos($metaClass, '\\') === false) ) {
-					$metaClass = __NAMESPACE__ . '\\' . $metaClass;
-				}
-				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
-			} else {
-				do_action('puc_api_error', $status, $result, $url, $this->slug);
-				$this->triggerError(
-					sprintf('The URL %s does not point to a valid metadata file. ', $url)
-					. $status->get_error_message(),
-					E_USER_WARNING
-				);
-			}
-
-			return array($metadata, $result);
-		}
-
-		/**
-		 * Check if $result is a successful update API response.
-		 *
-		 * @param array|WP_Error $result
-		 * @return true|WP_Error
-		 */
-		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
-				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
-			}
-
-			if ( !isset($result['response']['code']) ) {
-				return new WP_Error(
-					'puc_no_response_code',
-					'wp_remote_get() returned an unexpected result.'
-				);
-			}
-
-			if ( $result['response']['code'] !== 200 ) {
-				return new WP_Error(
-					'puc_unexpected_response_code',
-					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
-				);
-			}
-
-			if ( empty($result['body']) ) {
-				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
-			}
-
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+            //Try to parse the response
+            $status = $this->validateApiResponse($result);
+            $metadata = null;
+            if ( !is_wp_error($status) ){
+                if ( (strpos($metaClass, '\\') === false) ) {
+                    $metaClass = __NAMESPACE__ . '\\' . $metaClass;
+                }
+                $metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
+            } else {
+                do_action('puc_api_error', $status, $result, $url, $this->slug);
+                $this->triggerError(
+                    sprintf('The URL %s does not point to a valid metadata file. ', $url)
+                    . $status->get_error_message(),
+                    E_USER_WARNING
+                );
+            }
+
+            return array($metadata, $result);
+        }
+
+        /**
+         * Check if $result is a successful update API response.
+         *
+         * @param array|WP_Error $result
+         * @return true|WP_Error
+         */
+        protected function validateApiResponse($result) {
+            if ( is_wp_error($result) ) { /** @var WP_Error $result */
+                return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
+            }
+
+            if ( !isset($result['response']['code']) ) {
+                return new WP_Error(
+                    'puc_no_response_code',
+                    'wp_remote_get() returned an unexpected result.'
+                );
+            }
+
+            if ( $result['response']['code'] !== 200 ) {
+                return new WP_Error(
+                    'puc_unexpected_response_code',
+                    'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
+                );
+            }
+
+            if ( empty($result['body']) ) {
+                return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
+            }
+
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Language packs / Translation updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Filter a list of translation updates and return a new list that contains only updates
-		 * that apply to the current site.
-		 *
-		 * @param array $translations
-		 * @return array
-		 */
-		protected function filterApplicableTranslations($translations) {
-			$languages = array_flip(array_values(get_available_languages()));
-			$installedTranslations = $this->getInstalledTranslations();
-
-			$applicableTranslations = array();
-			foreach ($translations as $translation) {
-				//Does it match one of the available core languages?
-				$isApplicable = array_key_exists($translation->language, $languages);
-				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
-					$updateTimestamp = strtotime($translation->updated);
-					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
-					$isApplicable = $updateTimestamp > $installedTimestamp;
-				}
-
-				if ( $isApplicable ) {
-					$applicableTranslations[] = $translation;
-				}
-			}
-
-			return $applicableTranslations;
-		}
-
-		/**
-		 * Get a list of installed translations for this plugin or theme.
-		 *
-		 * @return array
-		 */
-		protected function getInstalledTranslations() {
-			if ( !function_exists('wp_get_installed_translations') ) {
-				return array();
-			}
-			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
-				$installedTranslations = $installedTranslations[$this->directoryName];
-			} else {
-				$installedTranslations = array();
-			}
-			return $installedTranslations;
-		}
-
-		/**
-		 * Insert translation updates into the list maintained by WordPress.
-		 *
-		 * @param stdClass $updates
-		 * @return stdClass
-		 */
-		public function injectTranslationUpdates($updates) {
-			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
-				return $updates;
-			}
-
-			//Being defensive.
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-			}
-			if ( !isset($updates->translations) ) {
-				$updates->translations = array();
-			}
-
-			//In case there's a name collision with a plugin or theme hosted on wordpress.org,
-			//remove any preexisting updates that match our thing.
-			$updates->translations = array_values(array_filter(
-				$updates->translations,
-				array($this, 'isNotMyTranslation')
-			));
-
-			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
-				$convertedUpdate = array_merge(
-					array(
-						'type' => $this->translationType,
-						'slug' => $this->directoryName,
-						'autoupdate' => 0,
-						//AFAICT, WordPress doesn't actually use the "version" field for anything.
-						//But lets make sure it's there, just in case.
-						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
-					),
-					(array)$update
-				);
-
-				$updates->translations[] = $convertedUpdate;
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * Get a list of available translation updates.
-		 *
-		 * This method will return an empty array if there are no updates.
-		 * Uses cached update data.
-		 *
-		 * @return array
-		 */
-		public function getTranslationUpdates() {
-			return $this->updateState->getTranslations();
-		}
-
-		/**
-		 * Remove all cached translation updates.
-		 *
-		 * @see wp_clean_update_cache
-		 */
-		public function clearCachedTranslationUpdates() {
-			$this->updateState->setTranslations(array());
-		}
-
-		/**
-		 * Filter callback. Keeps only translations that *don't* match this plugin or theme.
-		 *
-		 * @param array $translation
-		 * @return bool
-		 */
-		protected function isNotMyTranslation($translation) {
-			$isMatch = isset($translation['type'], $translation['slug'])
-				&& ($translation['type'] === $this->translationType)
-				&& ($translation['slug'] === $this->directoryName);
-
-			return !$isMatch;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Filter a list of translation updates and return a new list that contains only updates
+         * that apply to the current site.
+         *
+         * @param array $translations
+         * @return array
+         */
+        protected function filterApplicableTranslations($translations) {
+            $languages = array_flip(array_values(get_available_languages()));
+            $installedTranslations = $this->getInstalledTranslations();
+
+            $applicableTranslations = array();
+            foreach ($translations as $translation) {
+                //Does it match one of the available core languages?
+                $isApplicable = array_key_exists($translation->language, $languages);
+                //Is it more recent than an already-installed translation?
+                if ( isset($installedTranslations[$translation->language]) ) {
+                    $updateTimestamp = strtotime($translation->updated);
+                    $installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
+                    $isApplicable = $updateTimestamp > $installedTimestamp;
+                }
+
+                if ( $isApplicable ) {
+                    $applicableTranslations[] = $translation;
+                }
+            }
+
+            return $applicableTranslations;
+        }
+
+        /**
+         * Get a list of installed translations for this plugin or theme.
+         *
+         * @return array
+         */
+        protected function getInstalledTranslations() {
+            if ( !function_exists('wp_get_installed_translations') ) {
+                return array();
+            }
+            $installedTranslations = wp_get_installed_translations($this->translationType . 's');
+            if ( isset($installedTranslations[$this->directoryName]) ) {
+                $installedTranslations = $installedTranslations[$this->directoryName];
+            } else {
+                $installedTranslations = array();
+            }
+            return $installedTranslations;
+        }
+
+        /**
+         * Insert translation updates into the list maintained by WordPress.
+         *
+         * @param stdClass $updates
+         * @return stdClass
+         */
+        public function injectTranslationUpdates($updates) {
+            $translationUpdates = $this->getTranslationUpdates();
+            if ( empty($translationUpdates) ) {
+                return $updates;
+            }
+
+            //Being defensive.
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+            }
+            if ( !isset($updates->translations) ) {
+                $updates->translations = array();
+            }
+
+            //In case there's a name collision with a plugin or theme hosted on wordpress.org,
+            //remove any preexisting updates that match our thing.
+            $updates->translations = array_values(array_filter(
+                $updates->translations,
+                array($this, 'isNotMyTranslation')
+            ));
+
+            //Add our updates to the list.
+            foreach($translationUpdates as $update) {
+                $convertedUpdate = array_merge(
+                    array(
+                        'type' => $this->translationType,
+                        'slug' => $this->directoryName,
+                        'autoupdate' => 0,
+                        //AFAICT, WordPress doesn't actually use the "version" field for anything.
+                        //But lets make sure it's there, just in case.
+                        'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
+                    ),
+                    (array)$update
+                );
+
+                $updates->translations[] = $convertedUpdate;
+            }
+
+            return $updates;
+        }
+
+        /**
+         * Get a list of available translation updates.
+         *
+         * This method will return an empty array if there are no updates.
+         * Uses cached update data.
+         *
+         * @return array
+         */
+        public function getTranslationUpdates() {
+            return $this->updateState->getTranslations();
+        }
+
+        /**
+         * Remove all cached translation updates.
+         *
+         * @see wp_clean_update_cache
+         */
+        public function clearCachedTranslationUpdates() {
+            $this->updateState->setTranslations(array());
+        }
+
+        /**
+         * Filter callback. Keeps only translations that *don't* match this plugin or theme.
+         *
+         * @param array $translation
+         * @return bool
+         */
+        protected function isNotMyTranslation($translation) {
+            $isMatch = isset($translation['type'], $translation['slug'])
+                && ($translation['type'] === $this->translationType)
+                && ($translation['slug'] === $this->directoryName);
+
+            return !$isMatch;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Fix directory name when installing updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Rename the update directory to match the existing plugin/theme directory.
-		 *
-		 * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
-		 * exactly one directory, and that the directory name will be the same as the directory where
-		 * the plugin or theme is currently installed.
-		 *
-		 * GitHub and other repositories provide ZIP downloads, but they often use directory names like
-		 * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
-		 *
-		 * This is a hook callback. Don't call it from a plugin.
-		 *
-		 * @access protected
-		 *
-		 * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
-		 * @param string $remoteSource WordPress has extracted the update to this directory.
-		 * @param \WP_Upgrader $upgrader
-		 * @return string|WP_Error
-		 */
-		public function fixDirectoryName($source, $remoteSource, $upgrader) {
-			global $wp_filesystem;
-			/** @var \WP_Filesystem_Base $wp_filesystem */
-
-			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
-				return $source;
-			}
-
-			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
-				return $source;
-			}
-
-			//Rename the source to match the existing directory.
-			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
-				//The update archive should contain a single directory that contains the rest of plugin/theme files.
-				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
-				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
-				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
-					return new WP_Error(
-						'puc-incorrect-directory-structure',
-						sprintf(
-							'The directory structure of the update is incorrect. All files should be inside ' .
-							'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
-							htmlentities($this->slug)
-						)
-					);
-				}
-
-				/** @var \WP_Upgrader_Skin $upgrader ->skin */
-				$upgrader->skin->feedback(sprintf(
-					'Renaming %s to %s&#8230;',
-					'<span class="code">' . basename($source) . '</span>',
-					'<span class="code">' . $this->directoryName . '</span>'
-				));
-
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
-					$upgrader->skin->feedback('Directory successfully renamed.');
-					return $correctedSource;
-				} else {
-					return new WP_Error(
-						'puc-rename-failed',
-						'Unable to rename the update to match the existing directory.'
-					);
-				}
-			}
-
-			return $source;
-		}
-
-		/**
-		 * Is there an update being installed right now, for this plugin or theme?
-		 *
-		 * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		abstract public function isBeingUpgraded($upgrader = null);
-
-		/**
-		 * Check for incorrect update directory structure. An update must contain a single directory,
-		 * all other files should be inside that directory.
-		 *
-		 * @param string $remoteSource Directory path.
-		 * @return bool
-		 */
-		protected function isBadDirectoryStructure($remoteSource) {
-			global $wp_filesystem;
-			/** @var \WP_Filesystem_Base $wp_filesystem */
-
-			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
-				$sourceFiles = array_keys($sourceFiles);
-				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
-				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
-			}
-
-			//Assume it's fine.
-			return false;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Rename the update directory to match the existing plugin/theme directory.
+         *
+         * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
+         * exactly one directory, and that the directory name will be the same as the directory where
+         * the plugin or theme is currently installed.
+         *
+         * GitHub and other repositories provide ZIP downloads, but they often use directory names like
+         * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
+         *
+         * This is a hook callback. Don't call it from a plugin.
+         *
+         * @access protected
+         *
+         * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
+         * @param string $remoteSource WordPress has extracted the update to this directory.
+         * @param \WP_Upgrader $upgrader
+         * @return string|WP_Error
+         */
+        public function fixDirectoryName($source, $remoteSource, $upgrader) {
+            global $wp_filesystem;
+            /** @var \WP_Filesystem_Base $wp_filesystem */
+
+            //Basic sanity checks.
+            if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
+                return $source;
+            }
+
+            //If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
+            if ( !$this->isBeingUpgraded($upgrader) ) {
+                return $source;
+            }
+
+            //Rename the source to match the existing directory.
+            $correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
+            if ( $source !== $correctedSource ) {
+                //The update archive should contain a single directory that contains the rest of plugin/theme files.
+                //Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
+                //We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
+                //after update.
+                if ( $this->isBadDirectoryStructure($remoteSource) ) {
+                    return new WP_Error(
+                        'puc-incorrect-directory-structure',
+                        sprintf(
+                            'The directory structure of the update is incorrect. All files should be inside ' .
+                            'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
+                            htmlentities($this->slug)
+                        )
+                    );
+                }
+
+                /** @var \WP_Upgrader_Skin $upgrader ->skin */
+                $upgrader->skin->feedback(sprintf(
+                    'Renaming %s to %s&#8230;',
+                    '<span class="code">' . basename($source) . '</span>',
+                    '<span class="code">' . $this->directoryName . '</span>'
+                ));
+
+                if ( $wp_filesystem->move($source, $correctedSource, true) ) {
+                    $upgrader->skin->feedback('Directory successfully renamed.');
+                    return $correctedSource;
+                } else {
+                    return new WP_Error(
+                        'puc-rename-failed',
+                        'Unable to rename the update to match the existing directory.'
+                    );
+                }
+            }
+
+            return $source;
+        }
+
+        /**
+         * Is there an update being installed right now, for this plugin or theme?
+         *
+         * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        abstract public function isBeingUpgraded($upgrader = null);
+
+        /**
+         * Check for incorrect update directory structure. An update must contain a single directory,
+         * all other files should be inside that directory.
+         *
+         * @param string $remoteSource Directory path.
+         * @return bool
+         */
+        protected function isBadDirectoryStructure($remoteSource) {
+            global $wp_filesystem;
+            /** @var \WP_Filesystem_Base $wp_filesystem */
+
+            $sourceFiles = $wp_filesystem->dirlist($remoteSource);
+            if ( is_array($sourceFiles) ) {
+                $sourceFiles = array_keys($sourceFiles);
+                $firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
+                return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
+            }
+
+            //Assume it's fine.
+            return false;
+        }
+
+        /* -------------------------------------------------------------------
 		 * DebugBar integration
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Initialize the update checker Debug Bar plugin/add-on thingy.
-		 */
-		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__) . '/DebugBar') ) {
-				$this->debugBarExtension = $this->createDebugBarExtension();
-			}
-		}
-
-		protected function createDebugBarExtension() {
-			return new DebugBar\Extension($this);
-		}
-
-		/**
-		 * Display additional configuration details in the Debug Bar panel.
-		 *
-		 * @param DebugBar\Panel $panel
-		 */
-		public function onDisplayConfiguration($panel) {
-			//Do nothing. Subclasses can use this to add additional info to the panel.
-		}
-
-	}
+        /**
+         * Initialize the update checker Debug Bar plugin/add-on thingy.
+         */
+        public function maybeInitDebugBar() {
+            if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__) . '/DebugBar') ) {
+                $this->debugBarExtension = $this->createDebugBarExtension();
+            }
+        }
+
+        protected function createDebugBarExtension() {
+            return new DebugBar\Extension($this);
+        }
+
+        /**
+         * Display additional configuration details in the Debug Bar panel.
+         *
+         * @param DebugBar\Panel $panel
+         */
+        public function onDisplayConfiguration($panel) {
+            //Do nothing. Subclasses can use this to add additional info to the panel.
+        }
+
+    }
 
 endif;

Spacing +60 added lines, -60 removed lines

@@ -4,7 +4,7 @@ 
 use stdClass;
 use WP_Error;
 
-if ( !class_exists(UpdateChecker::class, false) ):
+if (!class_exists(UpdateChecker::class, false)):
 
 	abstract class UpdateChecker {
 		protected $filterSuffix = '';
@@ -75,16 +75,16 @@ 
 		protected $debugBarExtension = null;
 
 		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
+			$this->debugMode = (bool) (constant('WP_DEBUG'));
 			$this->metadataUrl = $metadataUrl;
 			$this->directoryName = $directoryName;
 			$this->slug = !empty($slug) ? $slug : $this->directoryName;
 
 			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
+			if (empty($this->optionName)) {
 				//BC: Initially the library only supported plugin updates and didn't use type prefixes
 				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
+				if ($this->filterSuffix === '') {
 					$this->optionName = 'external_updates-' . $this->slug;
 				} else {
 					$this->optionName = $this->getUniqueName('external_updates');
@@ -96,7 +96,7 @@ 
 			$this->upgraderStatus = new UpgraderStatus();
 			$this->updateState = new StateStore($this->optionName);
 
-			if ( did_action('init') ) {
+			if (did_action('init')) {
 				$this->loadTextDomain();
 			} else {
 				add_action('init', array($this, 'loadTextDomain'));
@@ -128,7 +128,7 @@ 
 
 		protected function installHooks() {
 			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectUpdate'));
 
 			//Insert translation updates into the update list.
 			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
@@ -142,7 +142,7 @@ 
 			);
 
 			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
+			if ($this->directoryName !== '.') {
 				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
 			}
 
@@ -150,7 +150,7 @@ 
 			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
 
 			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
+			if (did_action('plugins_loaded')) {
 				$this->maybeInitDebugBar();
 			} else {
 				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
@@ -161,7 +161,7 @@ 
 		 * Remove hooks that were added by this update checker instance.
 		 */
 		public function removeHooks() {
-			remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectUpdate'));
 			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
 			remove_action(
 				'delete_site_transient_' . $this->updateTransient,
@@ -174,11 +174,11 @@ 
 
 			remove_action('init', array($this, 'loadTextDomain'));
 
-			if ( $this->scheduler ) {
+			if ($this->scheduler) {
 				$this->scheduler->removeHooks();
 			}
 
-			if ( $this->debugBarExtension ) {
+			if ($this->debugBarExtension) {
 				$this->debugBarExtension->removeHooks();
 			}
 		}
@@ -209,11 +209,11 @@ 
 		 * @return bool
 		 */
 		public function allowMetadataHost($allow, $host) {
-			if ( $this->cachedMetadataHost === 0 ) {
+			if ($this->cachedMetadataHost === 0) {
 				$this->cachedMetadataHost = wp_parse_url($this->metadataUrl, PHP_URL_HOST);
 			}
 
-			if ( is_string($this->cachedMetadataHost) && (strtolower($host) === strtolower($this->cachedMetadataHost)) ) {
+			if (is_string($this->cachedMetadataHost) && (strtolower($host) === strtolower($this->cachedMetadataHost))) {
 				return true;
 			}
 			return $allow;
@@ -252,7 +252,7 @@ 
 		public function checkForUpdates() {
 			$installedVersion = $this->getInstalledVersion();
 			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
+			if ($installedVersion === null) {
 				$this->triggerError(
 					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
 					E_USER_WARNING
@@ -312,10 +312,10 @@ 
 			$update = $this->updateState->getUpdate();
 
 			//Is there an update available?
-			if ( isset($update) ) {
+			if (isset($update)) {
 				//Check if the update is actually newer than the currently installed version.
 				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
+				if (($installedVersion !== null) && version_compare($update->version, $installedVersion, '>')) {
 					return $update;
 				}
 			}
@@ -345,7 +345,7 @@ 
 
 			$this->fixSupportedWordpressVersion($update);
 
-			if ( isset($update, $update->translations) ) {
+			if (isset($update, $update->translations)) {
 				//Keep only those translation updates that apply to this site.
 				$update->translations = $this->filterApplicableTranslations($update->translations);
 			}
@@ -363,7 +363,7 @@ 
 		 * @param Metadata|null $update
 		 */
 		protected function fixSupportedWordpressVersion(Metadata $update = null) {
-			if ( !isset($update->tested) || !preg_match('/^\d++\.\d++$/', $update->tested) ) {
+			if (!isset($update->tested) || !preg_match('/^\d++\.\d++$/', $update->tested)) {
 				return;
 			}
 
@@ -371,11 +371,11 @@ 
 
 			$wpVersion = $GLOBALS['wp_version'];
 
-			if ( function_exists('get_core_updates') ) {
+			if (function_exists('get_core_updates')) {
 				$coreUpdates = get_core_updates();
-				if ( is_array($coreUpdates) ) {
+				if (is_array($coreUpdates)) {
 					foreach ($coreUpdates as $coreUpdate) {
-						if ( isset($coreUpdate->current) ) {
+						if (isset($coreUpdate->current)) {
 							$actualWpVersions[] = $coreUpdate->current;
 						}
 					}
@@ -386,10 +386,10 @@ 
 
 			$actualWpPatchNumber = null;
 			foreach ($actualWpVersions as $version) {
-				if ( preg_match('/^(?P<majorMinor>\d++\.\d++)(?:\.(?P<patch>\d++))?/', $version, $versionParts) ) {
-					if ( $versionParts['majorMinor'] === $update->tested ) {
+				if (preg_match('/^(?P<majorMinor>\d++\.\d++)(?:\.(?P<patch>\d++))?/', $version, $versionParts)) {
+					if ($versionParts['majorMinor'] === $update->tested) {
 						$patch = isset($versionParts['patch']) ? intval($versionParts['patch']) : 0;
-						if ( $actualWpPatchNumber === null ) {
+						if ($actualWpPatchNumber === null) {
 							$actualWpPatchNumber = $patch;
 						} else {
 							$actualWpPatchNumber = max($actualWpPatchNumber, $patch);
@@ -397,11 +397,11 @@ 
 					}
 				}
 			}
-			if ( $actualWpPatchNumber === null ) {
+			if ($actualWpPatchNumber === null) {
 				$actualWpPatchNumber = 999;
 			}
 
-			if ( $actualWpPatchNumber > 0 ) {
+			if ($actualWpPatchNumber > 0) {
 				$update->tested .= '.' . $actualWpPatchNumber;
 			}
 		}
@@ -431,7 +431,7 @@ 
 		 * @param int $errorType
 		 */
 		public function triggerError($message, $errorType) {
-			if ( $this->isDebugModeEnabled() ) {
+			if ($this->isDebugModeEnabled()) {
 				//phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error -- Only happens in debug mode.
 				trigger_error(esc_html($message), $errorType);
 			}
@@ -441,8 +441,8 @@ 
 		 * @return bool
 		 */
 		protected function isDebugModeEnabled() {
-			if ( $this->debugMode === null ) {
-				$this->debugMode = (bool)(constant('WP_DEBUG'));
+			if ($this->debugMode === null) {
+				$this->debugMode = (bool) (constant('WP_DEBUG'));
 			}
 			return $this->debugMode;
 		}
@@ -458,7 +458,7 @@ 
 		 */
 		public function getUniqueName($baseTag) {
 			$name = 'puc_' . $baseTag;
-			if ( $this->filterSuffix !== '' ) {
+			if ($this->filterSuffix !== '') {
 				$name .= '_' . $this->filterSuffix;
 			}
 			return $name . '-' . $this->slug;
@@ -474,7 +474,7 @@ 
 		 * @param string|null $slug
 		 */
 		public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
-			if ( isset($slug) && ($slug !== $this->slug) ) {
+			if (isset($slug) && ($slug !== $this->slug)) {
 				return;
 			}
 
@@ -528,11 +528,11 @@ 
 			//Is there an update to insert?
 			$update = $this->getUpdate();
 
-			if ( !$this->shouldShowUpdates() ) {
+			if (!$this->shouldShowUpdates()) {
 				$update = null;
 			}
 
-			if ( !empty($update) ) {
+			if (!empty($update)) {
 				//Let plugins filter the update info before it's passed on to WordPress.
 				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
 				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
@@ -554,7 +554,7 @@ 
 		 * @return \stdClass
 		 */
 		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
+			if (!is_object($updates)) {
 				$updates = new stdClass();
 				$updates->response = array();
 			}
@@ -568,7 +568,7 @@ 
 		 * @return \stdClass|null
 		 */
 		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
+			if (isset($updates, $updates->response)) {
 				unset($updates->response[$this->getUpdateListKey()]);
 			}
 			return $updates;
@@ -582,11 +582,11 @@ 
 		 * @return \stdClass
 		 */
 		protected function addNoUpdateItem($updates) {
-			if ( !is_object($updates) ) {
+			if (!is_object($updates)) {
 				$updates = new stdClass();
 				$updates->response = array();
 				$updates->no_update = array();
-			} else if ( !isset($updates->no_update) ) {
+			} else if (!isset($updates->no_update)) {
 				$updates->no_update = array();
 			}
 
@@ -669,7 +669,7 @@ 
 
 			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
 			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
+			if (!empty($queryArgs)) {
 				$url = add_query_arg($queryArgs, $url);
 			}
 
@@ -680,8 +680,8 @@ 
 			//Try to parse the response
 			$status = $this->validateApiResponse($result);
 			$metadata = null;
-			if ( !is_wp_error($status) ){
-				if ( (strpos($metaClass, '\\') === false) ) {
+			if (!is_wp_error($status)) {
+				if ((strpos($metaClass, '\\') === false)) {
 					$metaClass = __NAMESPACE__ . '\\' . $metaClass;
 				}
 				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
@@ -704,25 +704,25 @@ 
 		 * @return true|WP_Error
 		 */
 		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
+			if (is_wp_error($result)) { /** @var WP_Error $result */
 				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
 			}
 
-			if ( !isset($result['response']['code']) ) {
+			if (!isset($result['response']['code'])) {
 				return new WP_Error(
 					'puc_no_response_code',
 					'wp_remote_get() returned an unexpected result.'
 				);
 			}
 
-			if ( $result['response']['code'] !== 200 ) {
+			if ($result['response']['code'] !== 200) {
 				return new WP_Error(
 					'puc_unexpected_response_code',
 					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
 				);
 			}
 
-			if ( empty($result['body']) ) {
+			if (empty($result['body'])) {
 				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
 			}
 
@@ -750,13 +750,13 @@ 
 				//Does it match one of the available core languages?
 				$isApplicable = array_key_exists($translation->language, $languages);
 				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
+				if (isset($installedTranslations[$translation->language])) {
 					$updateTimestamp = strtotime($translation->updated);
 					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
 					$isApplicable = $updateTimestamp > $installedTimestamp;
 				}
 
-				if ( $isApplicable ) {
+				if ($isApplicable) {
 					$applicableTranslations[] = $translation;
 				}
 			}
@@ -770,11 +770,11 @@ 
 		 * @return array
 		 */
 		protected function getInstalledTranslations() {
-			if ( !function_exists('wp_get_installed_translations') ) {
+			if (!function_exists('wp_get_installed_translations')) {
 				return array();
 			}
 			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
+			if (isset($installedTranslations[$this->directoryName])) {
 				$installedTranslations = $installedTranslations[$this->directoryName];
 			} else {
 				$installedTranslations = array();
@@ -790,15 +790,15 @@ 
 		 */
 		public function injectTranslationUpdates($updates) {
 			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
+			if (empty($translationUpdates)) {
 				return $updates;
 			}
 
 			//Being defensive.
-			if ( !is_object($updates) ) {
+			if (!is_object($updates)) {
 				$updates = new stdClass();
 			}
-			if ( !isset($updates->translations) ) {
+			if (!isset($updates->translations)) {
 				$updates->translations = array();
 			}
 
@@ -810,7 +810,7 @@ 
 			));
 
 			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
+			foreach ($translationUpdates as $update) {
 				$convertedUpdate = array_merge(
 					array(
 						'type' => $this->translationType,
@@ -820,7 +820,7 @@ 
 						//But lets make sure it's there, just in case.
 						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
 					),
-					(array)$update
+					(array) $update
 				);
 
 				$updates->translations[] = $convertedUpdate;
@@ -893,23 +893,23 @@ 
 			/** @var \WP_Filesystem_Base $wp_filesystem */
 
 			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
+			if (!isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem)) {
 				return $source;
 			}
 
 			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
+			if (!$this->isBeingUpgraded($upgrader)) {
 				return $source;
 			}
 
 			//Rename the source to match the existing directory.
 			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
+			if ($source !== $correctedSource) {
 				//The update archive should contain a single directory that contains the rest of plugin/theme files.
 				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
 				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
 				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
+				if ($this->isBadDirectoryStructure($remoteSource)) {
 					return new WP_Error(
 						'puc-incorrect-directory-structure',
 						sprintf(
@@ -927,7 +927,7 @@ 
 					'<span class="code">' . $this->directoryName . '</span>'
 				));
 
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
+				if ($wp_filesystem->move($source, $correctedSource, true)) {
 					$upgrader->skin->feedback('Directory successfully renamed.');
 					return $correctedSource;
 				} else {
@@ -961,7 +961,7 @@ 
 			/** @var \WP_Filesystem_Base $wp_filesystem */
 
 			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
+			if (is_array($sourceFiles)) {
 				$sourceFiles = array_keys($sourceFiles);
 				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
 				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
@@ -980,7 +980,7 @@ 
 		 * Initialize the update checker Debug Bar plugin/add-on thingy.
 		 */
 		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__) . '/DebugBar') ) {
+			if (class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__) . '/DebugBar')) {
 				$this->debugBarExtension = $this->createDebugBarExtension();
 			}
 		}

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/Puc/v5p0/Plugin/UpdateChecker.php

Indentation +413 added lines, -413 removed lines

@@ -8,418 +8,418 @@
 
 if ( !class_exists(UpdateChecker::class, false) ):
 
-	/**
-	 * A custom plugin update checker.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2018
-	 * @access public
-	 */
-	class UpdateChecker extends BaseUpdateChecker {
-		protected $updateTransient = 'update_plugins';
-		protected $translationType = 'plugin';
-
-		public $pluginAbsolutePath = ''; //Full path of the main plugin file.
-		public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
-		public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
-
-		/**
-		 * @var Package
-		 */
-		protected $package;
-
-		private $extraUi = null;
-
-		/**
-		 * Class constructor.
-		 *
-		 * @param string $metadataUrl The URL of the plugin's metadata file.
-		 * @param string $pluginFile Fully qualified path to the main plugin file.
-		 * @param string $slug The plugin's 'slug'. If not specified, the filename part of $pluginFile sans '.php' will be used as the slug.
-		 * @param integer $checkPeriod How often to check for updates (in hours). Defaults to checking every 12 hours. Set to 0 to disable automatic update checks.
-		 * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
-		 * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
-		 */
-		public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
-			$this->pluginAbsolutePath = $pluginFile;
-			$this->pluginFile = plugin_basename($this->pluginAbsolutePath);
-			$this->muPluginFile = $muPluginFile;
-
-			//If no slug is specified, use the name of the main plugin file as the slug.
-			//For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
-			if ( empty($slug) ){
-				$slug = basename($this->pluginFile, '.php');
-			}
-
-			//Plugin slugs must be unique.
-			$slugCheckFilter = 'puc_is_slug_in_use-' . $slug;
-			$slugUsedBy = apply_filters($slugCheckFilter, false);
-			if ( $slugUsedBy ) {
-				$this->triggerError(sprintf(
-					'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
-					$slug,
-					$slugUsedBy
-				), E_USER_ERROR);
-			}
-			add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
-
-			parent::__construct($metadataUrl, dirname($this->pluginFile), $slug, $checkPeriod, $optionName);
-
-			//Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
-			//it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
-			if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
-				$this->muPluginFile = $this->pluginFile;
-			}
-
-			//To prevent a crash during plugin uninstallation, remove updater hooks when the user removes the plugin.
-			//Details: https://github.com/YahnisElsts/plugin-update-checker/issues/138#issuecomment-335590964
-			add_action('uninstall_' . $this->pluginFile, array($this, 'removeHooks'));
-
-			$this->extraUi = new Ui($this);
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Scheduler
-		 */
-		protected function createScheduler($checkPeriod) {
-			$scheduler = new Scheduler($this, $checkPeriod, array('load-plugins.php'));
-			register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
-			return $scheduler;
-		}
-
-		/**
-		 * Install the hooks required to run periodic update checks and inject update info
-		 * into WP data structures.
-		 *
-		 * @return void
-		 */
-		protected function installHooks(){
-			//Override requests for plugin information
-			add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
-
-			parent::installHooks();
-		}
-
-		/**
-		 * Remove update checker hooks.
-		 *
-		 * The intent is to prevent a fatal error that can happen if the plugin has an uninstall
-		 * hook. During uninstallation, WP includes the main plugin file (which creates a PUC instance),
-		 * the uninstall hook runs, WP deletes the plugin files and then updates some transients.
-		 * If PUC hooks are still around at this time, they could throw an error while trying to
-		 * autoload classes from files that no longer exist.
-		 *
-		 * The "site_transient_{$transient}" filter is the main problem here, but let's also remove
-		 * most other PUC hooks to be safe.
-		 *
-		 * @internal
-		 */
-		public function removeHooks() {
-			parent::removeHooks();
-			$this->extraUi->removeHooks();
-			$this->package->removeHooks();
-
-			remove_filter('plugins_api', array($this, 'injectInfo'), 20);
-		}
-
-		/**
-		 * Retrieve plugin info from the configured API endpoint.
-		 *
-		 * @uses wp_remote_get()
-		 *
-		 * @param array $queryArgs Additional query arguments to append to the request. Optional.
-		 * @return PluginInfo
-		 */
-		public function requestInfo($queryArgs = array()) {
-			list($pluginInfo, $result) = $this->requestMetadata(
-				PluginInfo::class,
-				'request_info',
-				$queryArgs
-			);
-
-			if ( $pluginInfo !== null ) {
-				/** @var PluginInfo $pluginInfo */
-				$pluginInfo->filename = $this->pluginFile;
-				$pluginInfo->slug = $this->slug;
-			}
-
-			$pluginInfo = apply_filters($this->getUniqueName('request_info_result'), $pluginInfo, $result);
-			return $pluginInfo;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * @uses UpdateChecker::requestInfo()
-		 *
-		 * @return Update|null An instance of Plugin Update, or NULL when no updates are available.
-		 */
-		public function requestUpdate() {
-			//For the sake of simplicity, this function just calls requestInfo()
-			//and transforms the result accordingly.
-			$pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
-			if ( $pluginInfo === null ){
-				return null;
-			}
-			$update = Update::fromPluginInfo($pluginInfo);
-
-			$update = $this->filterUpdateResult($update);
-
-			return $update;
-		}
-
-		/**
-		 * Intercept plugins_api() calls that request information about our plugin and
-		 * use the configured API endpoint to satisfy them.
-		 *
-		 * @see plugins_api()
-		 *
-		 * @param mixed $result
-		 * @param string $action
-		 * @param array|object $args
-		 * @return mixed
-		 */
-		public function injectInfo($result, $action = null, $args = null){
-			$relevant = ($action == 'plugin_information') && isset($args->slug) && (
-					($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
-				);
-			if ( !$relevant ) {
-				return $result;
-			}
-
-			$pluginInfo = $this->requestInfo();
-			$this->fixSupportedWordpressVersion($pluginInfo);
-
-			$pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
-			if ( $pluginInfo ) {
-				return $pluginInfo->toWpFormat();
-			}
-
-			return $result;
-		}
-
-		protected function shouldShowUpdates() {
-			//No update notifications for mu-plugins unless explicitly enabled. The MU plugin file
-			//is usually different from the main plugin file so the update wouldn't show up properly anyway.
-			return !$this->isUnknownMuPlugin();
-		}
-
-		/**
-		 * @param \stdClass|null $updates
-		 * @param \stdClass $updateToAdd
-		 * @return \stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( $this->package->isMuPlugin() ) {
-				//WP does not support automatic update installation for mu-plugins, but we can
-				//still display a notice.
-				$updateToAdd->package = null;
-			}
-			return parent::addUpdateToList($updates, $updateToAdd);
-		}
-
-		/**
-		 * @param \stdClass|null $updates
-		 * @return \stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			$updates = parent::removeUpdateFromList($updates);
-			if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
-				unset($updates->response[$this->muPluginFile]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * For plugins, the update array is indexed by the plugin filename relative to the "plugins"
-		 * directory. Example: "plugin-name/plugin.php".
-		 *
-		 * @return string
-		 */
-		protected function getUpdateListKey() {
-			if ( $this->package->isMuPlugin() ) {
-				return $this->muPluginFile;
-			}
-			return $this->pluginFile;
-		}
-
-		protected function getNoUpdateItemFields() {
-			return array_merge(
-				parent::getNoUpdateItemFields(),
-				array(
-					'id'            => $this->pluginFile,
-					'slug'          => $this->slug,
-					'plugin'        => $this->pluginFile,
-					'icons'         => array(),
-					'banners'       => array(),
-					'banners_rtl'   => array(),
-					'tested'        => '',
-					'compatibility' => new \stdClass(),
-				)
-			);
-		}
-
-		/**
-		 * Alias for isBeingUpgraded().
-		 *
-		 * @deprecated
-		 * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isPluginBeingUpgraded($upgrader = null) {
-			return $this->isBeingUpgraded($upgrader);
-		}
-
-		/**
-		 * Is there an update being installed for this plugin, right now?
-		 *
-		 * @param \WP_Upgrader|null $upgrader
-		 * @return bool
-		 */
-		public function isBeingUpgraded($upgrader = null) {
-			return $this->upgraderStatus->isPluginBeingUpgraded($this->pluginFile, $upgrader);
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Update|null
-		 */
-		public function getUpdate() {
-			$update = parent::getUpdate();
-			if ( isset($update) ) {
-				/** @var Update $update */
-				$update->filename = $this->pluginFile;
-			}
-			return $update;
-		}
-
-		/**
-		 * Get the translated plugin title.
-		 *
-		 * @deprecated
-		 * @return string
-		 */
-		public function getPluginTitle() {
-			return $this->package->getPluginTitle();
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		public function userCanInstallUpdates() {
-			return current_user_can('update_plugins');
-		}
-
-		/**
-		 * Check if the plugin file is inside the mu-plugins directory.
-		 *
-		 * @deprecated
-		 * @return bool
-		 */
-		protected function isMuPlugin() {
-			return $this->package->isMuPlugin();
-		}
-
-		/**
-		 * MU plugins are partially supported, but only when we know which file in mu-plugins
-		 * corresponds to this plugin.
-		 *
-		 * @return bool
-		 */
-		protected function isUnknownMuPlugin() {
-			return empty($this->muPluginFile) && $this->package->isMuPlugin();
-		}
-
-		/**
-		 * Get absolute path to the main plugin file.
-		 *
-		 * @return string
-		 */
-		public function getAbsolutePath() {
-			return $this->pluginAbsolutePath;
-		}
-
-		/**
-		 * Register a callback for filtering query arguments.
-		 *
-		 * The callback function should take one argument - an associative array of query arguments.
-		 * It should return a modified array of query arguments.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addQueryArgFilter($callback){
-			$this->addFilter('request_info_query_args', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering arguments passed to wp_remote_get().
-		 *
-		 * The callback function should take one argument - an associative array of arguments -
-		 * and return a modified array or arguments. See the WP documentation on wp_remote_get()
-		 * for details on what arguments are available and how they work.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addHttpRequestArgFilter($callback) {
-			$this->addFilter('request_info_options', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering the plugin info retrieved from the external API.
-		 *
-		 * The callback function should take two arguments. If the plugin info was retrieved
-		 * successfully, the first argument passed will be an instance of  PluginInfo. Otherwise,
-		 * it will be NULL. The second argument will be the corresponding return value of
-		 * wp_remote_get (see WP docs for details).
-		 *
-		 * The callback function should return a new or modified instance of PluginInfo or NULL.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addResultFilter($callback) {
-			$this->addFilter('request_info_result', $callback, 10, 2);
-		}
-
-		protected function createDebugBarExtension() {
-			return new DebugBar\PluginExtension($this);
-		}
-
-		/**
-		 * Create a package instance that represents this plugin or theme.
-		 *
-		 * @return InstalledPackage
-		 */
-		protected function createInstalledPackage() {
-			return new Package($this->pluginAbsolutePath, $this);
-		}
-
-		/**
-		 * @return Package
-		 */
-		public function getInstalledPackage() {
-			return $this->package;
-		}
-	}
+    /**
+     * A custom plugin update checker.
+     *
+     * @author Janis Elsts
+     * @copyright 2018
+     * @access public
+     */
+    class UpdateChecker extends BaseUpdateChecker {
+        protected $updateTransient = 'update_plugins';
+        protected $translationType = 'plugin';
+
+        public $pluginAbsolutePath = ''; //Full path of the main plugin file.
+        public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
+        public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
+
+        /**
+         * @var Package
+         */
+        protected $package;
+
+        private $extraUi = null;
+
+        /**
+         * Class constructor.
+         *
+         * @param string $metadataUrl The URL of the plugin's metadata file.
+         * @param string $pluginFile Fully qualified path to the main plugin file.
+         * @param string $slug The plugin's 'slug'. If not specified, the filename part of $pluginFile sans '.php' will be used as the slug.
+         * @param integer $checkPeriod How often to check for updates (in hours). Defaults to checking every 12 hours. Set to 0 to disable automatic update checks.
+         * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
+         * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
+         */
+        public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
+            $this->pluginAbsolutePath = $pluginFile;
+            $this->pluginFile = plugin_basename($this->pluginAbsolutePath);
+            $this->muPluginFile = $muPluginFile;
+
+            //If no slug is specified, use the name of the main plugin file as the slug.
+            //For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
+            if ( empty($slug) ){
+                $slug = basename($this->pluginFile, '.php');
+            }
+
+            //Plugin slugs must be unique.
+            $slugCheckFilter = 'puc_is_slug_in_use-' . $slug;
+            $slugUsedBy = apply_filters($slugCheckFilter, false);
+            if ( $slugUsedBy ) {
+                $this->triggerError(sprintf(
+                    'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
+                    $slug,
+                    $slugUsedBy
+                ), E_USER_ERROR);
+            }
+            add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
+
+            parent::__construct($metadataUrl, dirname($this->pluginFile), $slug, $checkPeriod, $optionName);
+
+            //Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
+            //it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
+            if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
+                $this->muPluginFile = $this->pluginFile;
+            }
+
+            //To prevent a crash during plugin uninstallation, remove updater hooks when the user removes the plugin.
+            //Details: https://github.com/YahnisElsts/plugin-update-checker/issues/138#issuecomment-335590964
+            add_action('uninstall_' . $this->pluginFile, array($this, 'removeHooks'));
+
+            $this->extraUi = new Ui($this);
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Scheduler
+         */
+        protected function createScheduler($checkPeriod) {
+            $scheduler = new Scheduler($this, $checkPeriod, array('load-plugins.php'));
+            register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
+            return $scheduler;
+        }
+
+        /**
+         * Install the hooks required to run periodic update checks and inject update info
+         * into WP data structures.
+         *
+         * @return void
+         */
+        protected function installHooks(){
+            //Override requests for plugin information
+            add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
+
+            parent::installHooks();
+        }
+
+        /**
+         * Remove update checker hooks.
+         *
+         * The intent is to prevent a fatal error that can happen if the plugin has an uninstall
+         * hook. During uninstallation, WP includes the main plugin file (which creates a PUC instance),
+         * the uninstall hook runs, WP deletes the plugin files and then updates some transients.
+         * If PUC hooks are still around at this time, they could throw an error while trying to
+         * autoload classes from files that no longer exist.
+         *
+         * The "site_transient_{$transient}" filter is the main problem here, but let's also remove
+         * most other PUC hooks to be safe.
+         *
+         * @internal
+         */
+        public function removeHooks() {
+            parent::removeHooks();
+            $this->extraUi->removeHooks();
+            $this->package->removeHooks();
+
+            remove_filter('plugins_api', array($this, 'injectInfo'), 20);
+        }
+
+        /**
+         * Retrieve plugin info from the configured API endpoint.
+         *
+         * @uses wp_remote_get()
+         *
+         * @param array $queryArgs Additional query arguments to append to the request. Optional.
+         * @return PluginInfo
+         */
+        public function requestInfo($queryArgs = array()) {
+            list($pluginInfo, $result) = $this->requestMetadata(
+                PluginInfo::class,
+                'request_info',
+                $queryArgs
+            );
+
+            if ( $pluginInfo !== null ) {
+                /** @var PluginInfo $pluginInfo */
+                $pluginInfo->filename = $this->pluginFile;
+                $pluginInfo->slug = $this->slug;
+            }
+
+            $pluginInfo = apply_filters($this->getUniqueName('request_info_result'), $pluginInfo, $result);
+            return $pluginInfo;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * @uses UpdateChecker::requestInfo()
+         *
+         * @return Update|null An instance of Plugin Update, or NULL when no updates are available.
+         */
+        public function requestUpdate() {
+            //For the sake of simplicity, this function just calls requestInfo()
+            //and transforms the result accordingly.
+            $pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
+            if ( $pluginInfo === null ){
+                return null;
+            }
+            $update = Update::fromPluginInfo($pluginInfo);
+
+            $update = $this->filterUpdateResult($update);
+
+            return $update;
+        }
+
+        /**
+         * Intercept plugins_api() calls that request information about our plugin and
+         * use the configured API endpoint to satisfy them.
+         *
+         * @see plugins_api()
+         *
+         * @param mixed $result
+         * @param string $action
+         * @param array|object $args
+         * @return mixed
+         */
+        public function injectInfo($result, $action = null, $args = null){
+            $relevant = ($action == 'plugin_information') && isset($args->slug) && (
+                    ($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
+                );
+            if ( !$relevant ) {
+                return $result;
+            }
+
+            $pluginInfo = $this->requestInfo();
+            $this->fixSupportedWordpressVersion($pluginInfo);
+
+            $pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
+            if ( $pluginInfo ) {
+                return $pluginInfo->toWpFormat();
+            }
+
+            return $result;
+        }
+
+        protected function shouldShowUpdates() {
+            //No update notifications for mu-plugins unless explicitly enabled. The MU plugin file
+            //is usually different from the main plugin file so the update wouldn't show up properly anyway.
+            return !$this->isUnknownMuPlugin();
+        }
+
+        /**
+         * @param \stdClass|null $updates
+         * @param \stdClass $updateToAdd
+         * @return \stdClass
+         */
+        protected function addUpdateToList($updates, $updateToAdd) {
+            if ( $this->package->isMuPlugin() ) {
+                //WP does not support automatic update installation for mu-plugins, but we can
+                //still display a notice.
+                $updateToAdd->package = null;
+            }
+            return parent::addUpdateToList($updates, $updateToAdd);
+        }
+
+        /**
+         * @param \stdClass|null $updates
+         * @return \stdClass|null
+         */
+        protected function removeUpdateFromList($updates) {
+            $updates = parent::removeUpdateFromList($updates);
+            if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
+                unset($updates->response[$this->muPluginFile]);
+            }
+            return $updates;
+        }
+
+        /**
+         * For plugins, the update array is indexed by the plugin filename relative to the "plugins"
+         * directory. Example: "plugin-name/plugin.php".
+         *
+         * @return string
+         */
+        protected function getUpdateListKey() {
+            if ( $this->package->isMuPlugin() ) {
+                return $this->muPluginFile;
+            }
+            return $this->pluginFile;
+        }
+
+        protected function getNoUpdateItemFields() {
+            return array_merge(
+                parent::getNoUpdateItemFields(),
+                array(
+                    'id'            => $this->pluginFile,
+                    'slug'          => $this->slug,
+                    'plugin'        => $this->pluginFile,
+                    'icons'         => array(),
+                    'banners'       => array(),
+                    'banners_rtl'   => array(),
+                    'tested'        => '',
+                    'compatibility' => new \stdClass(),
+                )
+            );
+        }
+
+        /**
+         * Alias for isBeingUpgraded().
+         *
+         * @deprecated
+         * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        public function isPluginBeingUpgraded($upgrader = null) {
+            return $this->isBeingUpgraded($upgrader);
+        }
+
+        /**
+         * Is there an update being installed for this plugin, right now?
+         *
+         * @param \WP_Upgrader|null $upgrader
+         * @return bool
+         */
+        public function isBeingUpgraded($upgrader = null) {
+            return $this->upgraderStatus->isPluginBeingUpgraded($this->pluginFile, $upgrader);
+        }
+
+        /**
+         * Get the details of the currently available update, if any.
+         *
+         * If no updates are available, or if the last known update version is below or equal
+         * to the currently installed version, this method will return NULL.
+         *
+         * Uses cached update data. To retrieve update information straight from
+         * the metadata URL, call requestUpdate() instead.
+         *
+         * @return Update|null
+         */
+        public function getUpdate() {
+            $update = parent::getUpdate();
+            if ( isset($update) ) {
+                /** @var Update $update */
+                $update->filename = $this->pluginFile;
+            }
+            return $update;
+        }
+
+        /**
+         * Get the translated plugin title.
+         *
+         * @deprecated
+         * @return string
+         */
+        public function getPluginTitle() {
+            return $this->package->getPluginTitle();
+        }
+
+        /**
+         * Check if the current user has the required permissions to install updates.
+         *
+         * @return bool
+         */
+        public function userCanInstallUpdates() {
+            return current_user_can('update_plugins');
+        }
+
+        /**
+         * Check if the plugin file is inside the mu-plugins directory.
+         *
+         * @deprecated
+         * @return bool
+         */
+        protected function isMuPlugin() {
+            return $this->package->isMuPlugin();
+        }
+
+        /**
+         * MU plugins are partially supported, but only when we know which file in mu-plugins
+         * corresponds to this plugin.
+         *
+         * @return bool
+         */
+        protected function isUnknownMuPlugin() {
+            return empty($this->muPluginFile) && $this->package->isMuPlugin();
+        }
+
+        /**
+         * Get absolute path to the main plugin file.
+         *
+         * @return string
+         */
+        public function getAbsolutePath() {
+            return $this->pluginAbsolutePath;
+        }
+
+        /**
+         * Register a callback for filtering query arguments.
+         *
+         * The callback function should take one argument - an associative array of query arguments.
+         * It should return a modified array of query arguments.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addQueryArgFilter($callback){
+            $this->addFilter('request_info_query_args', $callback);
+        }
+
+        /**
+         * Register a callback for filtering arguments passed to wp_remote_get().
+         *
+         * The callback function should take one argument - an associative array of arguments -
+         * and return a modified array or arguments. See the WP documentation on wp_remote_get()
+         * for details on what arguments are available and how they work.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addHttpRequestArgFilter($callback) {
+            $this->addFilter('request_info_options', $callback);
+        }
+
+        /**
+         * Register a callback for filtering the plugin info retrieved from the external API.
+         *
+         * The callback function should take two arguments. If the plugin info was retrieved
+         * successfully, the first argument passed will be an instance of  PluginInfo. Otherwise,
+         * it will be NULL. The second argument will be the corresponding return value of
+         * wp_remote_get (see WP docs for details).
+         *
+         * The callback function should return a new or modified instance of PluginInfo or NULL.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addResultFilter($callback) {
+            $this->addFilter('request_info_result', $callback, 10, 2);
+        }
+
+        protected function createDebugBarExtension() {
+            return new DebugBar\PluginExtension($this);
+        }
+
+        /**
+         * Create a package instance that represents this plugin or theme.
+         *
+         * @return InstalledPackage
+         */
+        protected function createInstalledPackage() {
+            return new Package($this->pluginAbsolutePath, $this);
+        }
+
+        /**
+         * @return Package
+         */
+        public function getInstalledPackage() {
+            return $this->package;
+        }
+    }
 
 endif;

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
 use YahnisElsts\PluginUpdateChecker\v5p0\Scheduler;
 use YahnisElsts\PluginUpdateChecker\v5p0\DebugBar;
 
-if ( !class_exists(UpdateChecker::class, false) ):
+if (!class_exists(UpdateChecker::class, false)):
 
 	/**
 	 * A custom plugin update checker.
@@ -20,7 +20,7 @@ 
 		protected $translationType = 'plugin';
 
 		public $pluginAbsolutePath = ''; //Full path of the main plugin file.
-		public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
+		public $pluginFile = ''; //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
 		public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
 
 		/**
@@ -40,21 +40,21 @@ 
 		 * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
 		 * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
 		 */
-		public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
+		public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
 			$this->pluginAbsolutePath = $pluginFile;
 			$this->pluginFile = plugin_basename($this->pluginAbsolutePath);
 			$this->muPluginFile = $muPluginFile;
 
 			//If no slug is specified, use the name of the main plugin file as the slug.
 			//For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
-			if ( empty($slug) ){
+			if (empty($slug)) {
 				$slug = basename($this->pluginFile, '.php');
 			}
 
 			//Plugin slugs must be unique.
 			$slugCheckFilter = 'puc_is_slug_in_use-' . $slug;
 			$slugUsedBy = apply_filters($slugCheckFilter, false);
-			if ( $slugUsedBy ) {
+			if ($slugUsedBy) {
 				$this->triggerError(sprintf(
 					'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
 					$slug,
@@ -67,7 +67,7 @@ 
 
 			//Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
 			//it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
-			if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
+			if ((strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin()) {
 				$this->muPluginFile = $this->pluginFile;
 			}
 
@@ -96,7 +96,7 @@ 
 		 *
 		 * @return void
 		 */
-		protected function installHooks(){
+		protected function installHooks() {
 			//Override requests for plugin information
 			add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
 
@@ -140,7 +140,7 @@ 
 				$queryArgs
 			);
 
-			if ( $pluginInfo !== null ) {
+			if ($pluginInfo !== null) {
 				/** @var PluginInfo $pluginInfo */
 				$pluginInfo->filename = $this->pluginFile;
 				$pluginInfo->slug = $this->slug;
@@ -161,7 +161,7 @@ 
 			//For the sake of simplicity, this function just calls requestInfo()
 			//and transforms the result accordingly.
 			$pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
-			if ( $pluginInfo === null ){
+			if ($pluginInfo === null) {
 				return null;
 			}
 			$update = Update::fromPluginInfo($pluginInfo);
@@ -182,11 +182,11 @@ 
 		 * @param array|object $args
 		 * @return mixed
 		 */
-		public function injectInfo($result, $action = null, $args = null){
+		public function injectInfo($result, $action = null, $args = null) {
 			$relevant = ($action == 'plugin_information') && isset($args->slug) && (
 					($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
 				);
-			if ( !$relevant ) {
+			if (!$relevant) {
 				return $result;
 			}
 
@@ -194,7 +194,7 @@ 
 			$this->fixSupportedWordpressVersion($pluginInfo);
 
 			$pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
-			if ( $pluginInfo ) {
+			if ($pluginInfo) {
 				return $pluginInfo->toWpFormat();
 			}
 
@@ -213,7 +213,7 @@ 
 		 * @return \stdClass
 		 */
 		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( $this->package->isMuPlugin() ) {
+			if ($this->package->isMuPlugin()) {
 				//WP does not support automatic update installation for mu-plugins, but we can
 				//still display a notice.
 				$updateToAdd->package = null;
@@ -227,7 +227,7 @@ 
 		 */
 		protected function removeUpdateFromList($updates) {
 			$updates = parent::removeUpdateFromList($updates);
-			if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
+			if (!empty($this->muPluginFile) && isset($updates, $updates->response)) {
 				unset($updates->response[$this->muPluginFile]);
 			}
 			return $updates;
@@ -240,7 +240,7 @@ 
 		 * @return string
 		 */
 		protected function getUpdateListKey() {
-			if ( $this->package->isMuPlugin() ) {
+			if ($this->package->isMuPlugin()) {
 				return $this->muPluginFile;
 			}
 			return $this->pluginFile;
@@ -296,7 +296,7 @@ 
 		 */
 		public function getUpdate() {
 			$update = parent::getUpdate();
-			if ( isset($update) ) {
+			if (isset($update)) {
 				/** @var Update $update */
 				$update->filename = $this->pluginFile;
 			}
@@ -362,7 +362,7 @@ 
 		 * @param callable $callback
 		 * @return void
 		 */
-		public function addQueryArgFilter($callback){
+		public function addQueryArgFilter($callback) {
 			$this->addFilter('request_info_query_args', $callback);
 		}
 

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/Puc/v5p0/Plugin/Update.php

Indentation +96 added lines, -96 removed lines

@@ -5,112 +5,112 @@
 
 if ( !class_exists(Update::class, false) ):
 
-	/**
-	 * A simple container class for holding information about an available update.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Update extends BaseUpdate {
-		public $id = 0;
-		public $homepage;
-		public $upgrade_notice;
-		public $tested;
-		public $requires_php = false;
-		public $icons = array();
-		public $filename; //Plugin filename relative to the plugins directory.
+    /**
+     * A simple container class for holding information about an available update.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    class Update extends BaseUpdate {
+        public $id = 0;
+        public $homepage;
+        public $upgrade_notice;
+        public $tested;
+        public $requires_php = false;
+        public $icons = array();
+        public $filename; //Plugin filename relative to the plugins directory.
 
-		protected static $extraFields = array(
-			'id', 'homepage', 'tested', 'requires_php', 'upgrade_notice', 'icons', 'filename',
-		);
+        protected static $extraFields = array(
+            'id', 'homepage', 'tested', 'requires_php', 'upgrade_notice', 'icons', 'filename',
+        );
 
-		/**
-		 * Create a new instance of PluginUpdate from its JSON-encoded representation.
-		 *
-		 * @param string $json
-		 * @return self|null
-		 */
-		public static function fromJson($json){
-			//Since update-related information is simply a subset of the full plugin info,
-			//we can parse the update JSON as if it was a plugin info string, then copy over
-			//the parts that we care about.
-			$pluginInfo = PluginInfo::fromJson($json);
-			if ( $pluginInfo !== null ) {
-				return self::fromPluginInfo($pluginInfo);
-			} else {
-				return null;
-			}
-		}
+        /**
+         * Create a new instance of PluginUpdate from its JSON-encoded representation.
+         *
+         * @param string $json
+         * @return self|null
+         */
+        public static function fromJson($json){
+            //Since update-related information is simply a subset of the full plugin info,
+            //we can parse the update JSON as if it was a plugin info string, then copy over
+            //the parts that we care about.
+            $pluginInfo = PluginInfo::fromJson($json);
+            if ( $pluginInfo !== null ) {
+                return self::fromPluginInfo($pluginInfo);
+            } else {
+                return null;
+            }
+        }
 
-		/**
-		 * Create a new instance of PluginUpdate based on an instance of PluginInfo.
-		 * Basically, this just copies a subset of fields from one object to another.
-		 *
-		 * @param PluginInfo $info
-		 * @return static
-		 */
-		public static function fromPluginInfo($info){
-			return static::fromObject($info);
-		}
+        /**
+         * Create a new instance of PluginUpdate based on an instance of PluginInfo.
+         * Basically, this just copies a subset of fields from one object to another.
+         *
+         * @param PluginInfo $info
+         * @return static
+         */
+        public static function fromPluginInfo($info){
+            return static::fromObject($info);
+        }
 
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @param \StdClass|PluginInfo|self $object The source object.
-		 * @return self The new copy.
-		 */
-		public static function fromObject($object) {
-			$update = new self();
-			$update->copyFields($object, $update);
-			return $update;
-		}
+        /**
+         * Create a new instance by copying the necessary fields from another object.
+         *
+         * @param \StdClass|PluginInfo|self $object The source object.
+         * @return self The new copy.
+         */
+        public static function fromObject($object) {
+            $update = new self();
+            $update->copyFields($object, $update);
+            return $update;
+        }
 
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array_merge(parent::getFieldNames(), self::$extraFields);
-		}
+        /**
+         * @return string[]
+         */
+        protected function getFieldNames() {
+            return array_merge(parent::getFieldNames(), self::$extraFields);
+        }
 
-		/**
-		 * Transform the update into the format used by WordPress native plugin API.
-		 *
-		 * @return object
-		 */
-		public function toWpFormat() {
-			$update = parent::toWpFormat();
+        /**
+         * Transform the update into the format used by WordPress native plugin API.
+         *
+         * @return object
+         */
+        public function toWpFormat() {
+            $update = parent::toWpFormat();
 
-			$update->id = $this->id;
-			$update->url = $this->homepage;
-			$update->tested = $this->tested;
-			$update->requires_php = $this->requires_php;
-			$update->plugin = $this->filename;
+            $update->id = $this->id;
+            $update->url = $this->homepage;
+            $update->tested = $this->tested;
+            $update->requires_php = $this->requires_php;
+            $update->plugin = $this->filename;
 
-			if ( !empty($this->upgrade_notice) ) {
-				$update->upgrade_notice = $this->upgrade_notice;
-			}
+            if ( !empty($this->upgrade_notice) ) {
+                $update->upgrade_notice = $this->upgrade_notice;
+            }
 
-			if ( !empty($this->icons) && is_array($this->icons) ) {
-				//This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
-				//Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
-				$icons = array_intersect_key(
-					$this->icons,
-					array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
-				);
-				if ( !empty($icons) ) {
-					$update->icons = $icons;
+            if ( !empty($this->icons) && is_array($this->icons) ) {
+                //This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
+                //Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
+                $icons = array_intersect_key(
+                    $this->icons,
+                    array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
+                );
+                if ( !empty($icons) ) {
+                    $update->icons = $icons;
 
-					//It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
-					//but lets set it just in case a future release needs it.
-					if ( !isset($update->icons['default']) ) {
-						$update->icons['default'] = current($update->icons);
-					}
-				}
-			}
+                    //It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
+                    //but lets set it just in case a future release needs it.
+                    if ( !isset($update->icons['default']) ) {
+                        $update->icons['default'] = current($update->icons);
+                    }
+                }
+            }
 
-			return $update;
-		}
-	}
+            return $update;
+        }
+    }
 
 endif;

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 
 use YahnisElsts\PluginUpdateChecker\v5p0\Update as BaseUpdate;
 
-if ( !class_exists(Update::class, false) ):
+if (!class_exists(Update::class, false)):
 
 	/**
 	 * A simple container class for holding information about an available update.
@@ -31,12 +31,12 @@ 
 		 * @param string $json
 		 * @return self|null
 		 */
-		public static function fromJson($json){
+		public static function fromJson($json) {
 			//Since update-related information is simply a subset of the full plugin info,
 			//we can parse the update JSON as if it was a plugin info string, then copy over
 			//the parts that we care about.
 			$pluginInfo = PluginInfo::fromJson($json);
-			if ( $pluginInfo !== null ) {
+			if ($pluginInfo !== null) {
 				return self::fromPluginInfo($pluginInfo);
 			} else {
 				return null;
@@ -50,7 +50,7 @@ 
 		 * @param PluginInfo $info
 		 * @return static
 		 */
-		public static function fromPluginInfo($info){
+		public static function fromPluginInfo($info) {
 			return static::fromObject($info);
 		}
 
@@ -87,23 +87,23 @@ 
 			$update->requires_php = $this->requires_php;
 			$update->plugin = $this->filename;
 
-			if ( !empty($this->upgrade_notice) ) {
+			if (!empty($this->upgrade_notice)) {
 				$update->upgrade_notice = $this->upgrade_notice;
 			}
 
-			if ( !empty($this->icons) && is_array($this->icons) ) {
+			if (!empty($this->icons) && is_array($this->icons)) {
 				//This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
 				//Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
 				$icons = array_intersect_key(
 					$this->icons,
 					array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
 				);
-				if ( !empty($icons) ) {
+				if (!empty($icons)) {
 					$update->icons = $icons;
 
 					//It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
 					//but lets set it just in case a future release needs it.
-					if ( !isset($update->icons['default']) ) {
+					if (!isset($update->icons['default'])) {
 						$update->icons['default'] = current($update->icons);
 					}
 				}

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/Puc/v5p0/Plugin/Package.php

Indentation +178 added lines, -178 removed lines

@@ -6,183 +6,183 @@
 
 if ( !class_exists(Package::class, false) ):
 
-	class Package extends InstalledPackage {
-		/**
-		 * @var UpdateChecker
-		 */
-		protected $updateChecker;
-
-		/**
-		 * @var string Full path of the main plugin file.
-		 */
-		protected $pluginAbsolutePath = '';
-
-		/**
-		 * @var string Plugin basename.
-		 */
-		private $pluginFile;
-
-		/**
-		 * @var string|null
-		 */
-		private $cachedInstalledVersion = null;
-
-		public function __construct($pluginAbsolutePath, $updateChecker) {
-			$this->pluginAbsolutePath = $pluginAbsolutePath;
-			$this->pluginFile = plugin_basename($this->pluginAbsolutePath);
-
-			parent::__construct($updateChecker);
-
-			//Clear the version number cache when something - anything - is upgraded or WP clears the update cache.
-			add_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
-			add_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
-		}
-
-		public function getInstalledVersion() {
-			if ( isset($this->cachedInstalledVersion) ) {
-				return $this->cachedInstalledVersion;
-			}
-
-			$pluginHeader = $this->getPluginHeader();
-			if ( isset($pluginHeader['Version']) ) {
-				$this->cachedInstalledVersion = $pluginHeader['Version'];
-				return $pluginHeader['Version'];
-			} else {
-				//This can happen if the filename points to something that is not a plugin.
-				$this->updateChecker->triggerError(
-					sprintf(
-						"Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
-						$this->updateChecker->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return null;
-			}
-		}
-
-		/**
-		 * Clear the cached plugin version. This method can be set up as a filter (hook) and will
-		 * return the filter argument unmodified.
-		 *
-		 * @param mixed $filterArgument
-		 * @return mixed
-		 */
-		public function clearCachedVersion($filterArgument = null) {
-			$this->cachedInstalledVersion = null;
-			return $filterArgument;
-		}
-
-		public function getAbsoluteDirectoryPath() {
-			return dirname($this->pluginAbsolutePath);
-		}
-
-		/**
-		 * Get the value of a specific plugin or theme header.
-		 *
-		 * @param string $headerName
-		 * @param string $defaultValue
-		 * @return string Either the value of the header, or $defaultValue if the header doesn't exist or is empty.
-		 */
-		public function getHeaderValue($headerName, $defaultValue = '') {
-			$headers = $this->getPluginHeader();
-			if ( isset($headers[$headerName]) && ($headers[$headerName] !== '') ) {
-				return $headers[$headerName];
-			}
-			return $defaultValue;
-		}
-
-		protected function getHeaderNames() {
-			return array(
-				'Name'              => 'Plugin Name',
-				'PluginURI'         => 'Plugin URI',
-				'Version'           => 'Version',
-				'Description'       => 'Description',
-				'Author'            => 'Author',
-				'AuthorURI'         => 'Author URI',
-				'TextDomain'        => 'Text Domain',
-				'DomainPath'        => 'Domain Path',
-				'Network'           => 'Network',
-
-				//The newest WordPress version that this plugin requires or has been tested with.
-				//We support several different formats for compatibility with other libraries.
-				'Tested WP'         => 'Tested WP',
-				'Requires WP'       => 'Requires WP',
-				'Tested up to'      => 'Tested up to',
-				'Requires at least' => 'Requires at least',
-			);
-		}
-
-		/**
-		 * Get the translated plugin title.
-		 *
-		 * @return string
-		 */
-		public function getPluginTitle() {
-			$title = '';
-			$header = $this->getPluginHeader();
-			if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
-				$title = translate($header['Name'], $header['TextDomain']);
-			}
-			return $title;
-		}
-
-		/**
-		 * Get plugin's metadata from its file header.
-		 *
-		 * @return array
-		 */
-		public function getPluginHeader() {
-			if ( !is_file($this->pluginAbsolutePath) ) {
-				//This can happen if the plugin filename is wrong.
-				$this->updateChecker->triggerError(
-					sprintf(
-						"Can't to read the plugin header for '%s'. The file does not exist.",
-						$this->updateChecker->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return array();
-			}
-
-			if ( !function_exists('get_plugin_data') ) {
-				require_once(ABSPATH . '/wp-admin/includes/plugin.php');
-			}
-			return get_plugin_data($this->pluginAbsolutePath, false, false);
-		}
-
-		public function removeHooks() {
-			remove_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
-			remove_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
-		}
-
-		/**
-		 * Check if the plugin file is inside the mu-plugins directory.
-		 *
-		 * @return bool
-		 */
-		public function isMuPlugin() {
-			static $cachedResult = null;
-
-			if ( $cachedResult === null ) {
-				if ( !defined('WPMU_PLUGIN_DIR') || !is_string(WPMU_PLUGIN_DIR) ) {
-					$cachedResult = false;
-					return $cachedResult;
-				}
-
-				//Convert both paths to the canonical form before comparison.
-				$muPluginDir = realpath(WPMU_PLUGIN_DIR);
-				$pluginPath  = realpath($this->pluginAbsolutePath);
-				//If realpath() fails, just normalize the syntax instead.
-				if (($muPluginDir === false) || ($pluginPath === false)) {
-					$muPluginDir = PucFactory::normalizePath(WPMU_PLUGIN_DIR);
-					$pluginPath  = PucFactory::normalizePath($this->pluginAbsolutePath);
-				}
-
-				$cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
-			}
-
-			return $cachedResult;
-		}
-	}
+    class Package extends InstalledPackage {
+        /**
+         * @var UpdateChecker
+         */
+        protected $updateChecker;
+
+        /**
+         * @var string Full path of the main plugin file.
+         */
+        protected $pluginAbsolutePath = '';
+
+        /**
+         * @var string Plugin basename.
+         */
+        private $pluginFile;
+
+        /**
+         * @var string|null
+         */
+        private $cachedInstalledVersion = null;
+
+        public function __construct($pluginAbsolutePath, $updateChecker) {
+            $this->pluginAbsolutePath = $pluginAbsolutePath;
+            $this->pluginFile = plugin_basename($this->pluginAbsolutePath);
+
+            parent::__construct($updateChecker);
+
+            //Clear the version number cache when something - anything - is upgraded or WP clears the update cache.
+            add_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
+            add_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
+        }
+
+        public function getInstalledVersion() {
+            if ( isset($this->cachedInstalledVersion) ) {
+                return $this->cachedInstalledVersion;
+            }
+
+            $pluginHeader = $this->getPluginHeader();
+            if ( isset($pluginHeader['Version']) ) {
+                $this->cachedInstalledVersion = $pluginHeader['Version'];
+                return $pluginHeader['Version'];
+            } else {
+                //This can happen if the filename points to something that is not a plugin.
+                $this->updateChecker->triggerError(
+                    sprintf(
+                        "Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
+                        $this->updateChecker->pluginFile
+                    ),
+                    E_USER_WARNING
+                );
+                return null;
+            }
+        }
+
+        /**
+         * Clear the cached plugin version. This method can be set up as a filter (hook) and will
+         * return the filter argument unmodified.
+         *
+         * @param mixed $filterArgument
+         * @return mixed
+         */
+        public function clearCachedVersion($filterArgument = null) {
+            $this->cachedInstalledVersion = null;
+            return $filterArgument;
+        }
+
+        public function getAbsoluteDirectoryPath() {
+            return dirname($this->pluginAbsolutePath);
+        }
+
+        /**
+         * Get the value of a specific plugin or theme header.
+         *
+         * @param string $headerName
+         * @param string $defaultValue
+         * @return string Either the value of the header, or $defaultValue if the header doesn't exist or is empty.
+         */
+        public function getHeaderValue($headerName, $defaultValue = '') {
+            $headers = $this->getPluginHeader();
+            if ( isset($headers[$headerName]) && ($headers[$headerName] !== '') ) {
+                return $headers[$headerName];
+            }
+            return $defaultValue;
+        }
+
+        protected function getHeaderNames() {
+            return array(
+                'Name'              => 'Plugin Name',
+                'PluginURI'         => 'Plugin URI',
+                'Version'           => 'Version',
+                'Description'       => 'Description',
+                'Author'            => 'Author',
+                'AuthorURI'         => 'Author URI',
+                'TextDomain'        => 'Text Domain',
+                'DomainPath'        => 'Domain Path',
+                'Network'           => 'Network',
+
+                //The newest WordPress version that this plugin requires or has been tested with.
+                //We support several different formats for compatibility with other libraries.
+                'Tested WP'         => 'Tested WP',
+                'Requires WP'       => 'Requires WP',
+                'Tested up to'      => 'Tested up to',
+                'Requires at least' => 'Requires at least',
+            );
+        }
+
+        /**
+         * Get the translated plugin title.
+         *
+         * @return string
+         */
+        public function getPluginTitle() {
+            $title = '';
+            $header = $this->getPluginHeader();
+            if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
+                $title = translate($header['Name'], $header['TextDomain']);
+            }
+            return $title;
+        }
+
+        /**
+         * Get plugin's metadata from its file header.
+         *
+         * @return array
+         */
+        public function getPluginHeader() {
+            if ( !is_file($this->pluginAbsolutePath) ) {
+                //This can happen if the plugin filename is wrong.
+                $this->updateChecker->triggerError(
+                    sprintf(
+                        "Can't to read the plugin header for '%s'. The file does not exist.",
+                        $this->updateChecker->pluginFile
+                    ),
+                    E_USER_WARNING
+                );
+                return array();
+            }
+
+            if ( !function_exists('get_plugin_data') ) {
+                require_once(ABSPATH . '/wp-admin/includes/plugin.php');
+            }
+            return get_plugin_data($this->pluginAbsolutePath, false, false);
+        }
+
+        public function removeHooks() {
+            remove_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
+            remove_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
+        }
+
+        /**
+         * Check if the plugin file is inside the mu-plugins directory.
+         *
+         * @return bool
+         */
+        public function isMuPlugin() {
+            static $cachedResult = null;
+
+            if ( $cachedResult === null ) {
+                if ( !defined('WPMU_PLUGIN_DIR') || !is_string(WPMU_PLUGIN_DIR) ) {
+                    $cachedResult = false;
+                    return $cachedResult;
+                }
+
+                //Convert both paths to the canonical form before comparison.
+                $muPluginDir = realpath(WPMU_PLUGIN_DIR);
+                $pluginPath  = realpath($this->pluginAbsolutePath);
+                //If realpath() fails, just normalize the syntax instead.
+                if (($muPluginDir === false) || ($pluginPath === false)) {
+                    $muPluginDir = PucFactory::normalizePath(WPMU_PLUGIN_DIR);
+                    $pluginPath  = PucFactory::normalizePath($this->pluginAbsolutePath);
+                }
+
+                $cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
+            }
+
+            return $cachedResult;
+        }
+    }
 
 endif;

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 use YahnisElsts\PluginUpdateChecker\v5p0\InstalledPackage;
 use YahnisElsts\PluginUpdateChecker\v5p0\PucFactory;
 
-if ( !class_exists(Package::class, false) ):
+if (!class_exists(Package::class, false)):
 
 	class Package extends InstalledPackage {
 		/**
@@ -39,12 +39,12 @@ 
 		}
 
 		public function getInstalledVersion() {
-			if ( isset($this->cachedInstalledVersion) ) {
+			if (isset($this->cachedInstalledVersion)) {
 				return $this->cachedInstalledVersion;
 			}
 
 			$pluginHeader = $this->getPluginHeader();
-			if ( isset($pluginHeader['Version']) ) {
+			if (isset($pluginHeader['Version'])) {
 				$this->cachedInstalledVersion = $pluginHeader['Version'];
 				return $pluginHeader['Version'];
 			} else {
@@ -85,7 +85,7 @@ 
 		 */
 		public function getHeaderValue($headerName, $defaultValue = '') {
 			$headers = $this->getPluginHeader();
-			if ( isset($headers[$headerName]) && ($headers[$headerName] !== '') ) {
+			if (isset($headers[$headerName]) && ($headers[$headerName] !== '')) {
 				return $headers[$headerName];
 			}
 			return $defaultValue;
@@ -120,7 +120,7 @@ 
 		public function getPluginTitle() {
 			$title = '';
 			$header = $this->getPluginHeader();
-			if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
+			if ($header && !empty($header['Name']) && isset($header['TextDomain'])) {
 				$title = translate($header['Name'], $header['TextDomain']);
 			}
 			return $title;
@@ -132,7 +132,7 @@ 
 		 * @return array
 		 */
 		public function getPluginHeader() {
-			if ( !is_file($this->pluginAbsolutePath) ) {
+			if (!is_file($this->pluginAbsolutePath)) {
 				//This can happen if the plugin filename is wrong.
 				$this->updateChecker->triggerError(
 					sprintf(
@@ -144,7 +144,7 @@ 
 				return array();
 			}
 
-			if ( !function_exists('get_plugin_data') ) {
+			if (!function_exists('get_plugin_data')) {
 				require_once(ABSPATH . '/wp-admin/includes/plugin.php');
 			}
 			return get_plugin_data($this->pluginAbsolutePath, false, false);
@@ -163,8 +163,8 @@ 
 		public function isMuPlugin() {
 			static $cachedResult = null;
 
-			if ( $cachedResult === null ) {
-				if ( !defined('WPMU_PLUGIN_DIR') || !is_string(WPMU_PLUGIN_DIR) ) {
+			if ($cachedResult === null) {
+				if (!defined('WPMU_PLUGIN_DIR') || !is_string(WPMU_PLUGIN_DIR)) {
 					$cachedResult = false;
 					return $cachedResult;
 				}

brighty/wp-content/plugins/brighty-core/includes/plugin-update-checker-5-1.0/Puc/v5p0/Plugin/PluginInfo.php

Indentation +127 added lines, -127 removed lines

@@ -5,132 +5,132 @@
 
 if ( !class_exists(PluginInfo::class, false) ):
 
-	/**
-	 * A container class for holding and transforming various plugin metadata.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class PluginInfo extends Metadata {
-		//Most fields map directly to the contents of the plugin's info.json file.
-		//See the relevant docs for a description of their meaning.
-		public $name;
-		public $slug;
-		public $version;
-		public $homepage;
-		public $sections = array();
-		public $download_url;
-
-		public $banners;
-		public $icons = array();
-		public $translations = array();
-
-		public $author;
-		public $author_homepage;
-
-		public $requires;
-		public $tested;
-		public $requires_php;
-		public $upgrade_notice;
-
-		public $rating;
-		public $num_ratings;
-		public $downloaded;
-		public $active_installs;
-		public $last_updated;
-
-		public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
-
-		public $filename; //Plugin filename relative to the plugins directory.
-
-		/**
-		 * Create a new instance of Plugin Info from JSON-encoded plugin info
-		 * returned by an external update API.
-		 *
-		 * @param string $json Valid JSON string representing plugin info.
-		 * @return self|null New instance of Plugin Info, or NULL on error.
-		 */
-		public static function fromJson($json){
-			$instance = new self();
-
-			if ( !parent::createFromJson($json, $instance) ) {
-				return null;
-			}
-
-			//json_decode decodes assoc. arrays as objects. We want them as arrays.
-			$instance->sections = (array)$instance->sections;
-			$instance->icons = (array)$instance->icons;
-
-			return $instance;
-		}
-
-		/**
-		 * Very, very basic validation.
-		 *
-		 * @param \StdClass $apiResponse
-		 * @return bool|\WP_Error
-		 */
-		protected function validateMetadata($apiResponse) {
-			if (
-				!isset($apiResponse->name, $apiResponse->version)
-				|| empty($apiResponse->name)
-				|| empty($apiResponse->version)
-			) {
-				return new \WP_Error(
-					'puc-invalid-metadata',
-					"The plugin metadata file does not contain the required 'name' and/or 'version' keys."
-				);
-			}
-			return true;
-		}
-
-
-		/**
-		 * Transform plugin info into the format used by the native WordPress.org API
-		 *
-		 * @return object
-		 */
-		public function toWpFormat(){
-			$info = new \stdClass;
-
-			//The custom update API is built so that many fields have the same name and format
-			//as those returned by the native WordPress.org API. These can be assigned directly.
-			$sameFormat = array(
-				'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
-				'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
-				'requires_php',
-			);
-			foreach($sameFormat as $field){
-				if ( isset($this->$field) ) {
-					$info->$field = $this->$field;
-				} else {
-					$info->$field = null;
-				}
-			}
-
-			//Other fields need to be renamed and/or transformed.
-			$info->download_link = $this->download_url;
-			$info->author = $this->getFormattedAuthor();
-			$info->sections = array_merge(array('description' => ''), $this->sections);
-
-			if ( !empty($this->banners) ) {
-				//WP expects an array with two keys: "high" and "low". Both are optional.
-				//Docs: https://wordpress.org/plugins/about/faq/#banners
-				$info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
-				$info->banners = array_intersect_key($info->banners, array('high' => true, 'low' => true));
-			}
-
-			return $info;
-		}
-
-		protected function getFormattedAuthor() {
-			if ( !empty($this->author_homepage) ){
-				/** @noinspection HtmlUnknownTarget */
-				return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
-			}
-			return $this->author;
-		}
-	}
+    /**
+     * A container class for holding and transforming various plugin metadata.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    class PluginInfo extends Metadata {
+        //Most fields map directly to the contents of the plugin's info.json file.
+        //See the relevant docs for a description of their meaning.
+        public $name;
+        public $slug;
+        public $version;
+        public $homepage;
+        public $sections = array();
+        public $download_url;
+
+        public $banners;
+        public $icons = array();
+        public $translations = array();
+
+        public $author;
+        public $author_homepage;
+
+        public $requires;
+        public $tested;
+        public $requires_php;
+        public $upgrade_notice;
+
+        public $rating;
+        public $num_ratings;
+        public $downloaded;
+        public $active_installs;
+        public $last_updated;
+
+        public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
+
+        public $filename; //Plugin filename relative to the plugins directory.
+
+        /**
+         * Create a new instance of Plugin Info from JSON-encoded plugin info
+         * returned by an external update API.
+         *
+         * @param string $json Valid JSON string representing plugin info.
+         * @return self|null New instance of Plugin Info, or NULL on error.
+         */
+        public static function fromJson($json){
+            $instance = new self();
+
+            if ( !parent::createFromJson($json, $instance) ) {
+                return null;
+            }
+
+            //json_decode decodes assoc. arrays as objects. We want them as arrays.
+            $instance->sections = (array)$instance->sections;
+            $instance->icons = (array)$instance->icons;
+
+            return $instance;
+        }
+
+        /**
+         * Very, very basic validation.
+         *
+         * @param \StdClass $apiResponse
+         * @return bool|\WP_Error
+         */
+        protected function validateMetadata($apiResponse) {
+            if (
+                !isset($apiResponse->name, $apiResponse->version)
+                || empty($apiResponse->name)
+                || empty($apiResponse->version)
+            ) {
+                return new \WP_Error(
+                    'puc-invalid-metadata',
+                    "The plugin metadata file does not contain the required 'name' and/or 'version' keys."
+                );
+            }
+            return true;
+        }
+
+
+        /**
+         * Transform plugin info into the format used by the native WordPress.org API
+         *
+         * @return object
+         */
+        public function toWpFormat(){
+            $info = new \stdClass;
+
+            //The custom update API is built so that many fields have the same name and format
+            //as those returned by the native WordPress.org API. These can be assigned directly.
+            $sameFormat = array(
+                'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
+                'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
+                'requires_php',
+            );
+            foreach($sameFormat as $field){
+                if ( isset($this->$field) ) {
+                    $info->$field = $this->$field;
+                } else {
+                    $info->$field = null;
+                }
+            }
+
+            //Other fields need to be renamed and/or transformed.
+            $info->download_link = $this->download_url;
+            $info->author = $this->getFormattedAuthor();
+            $info->sections = array_merge(array('description' => ''), $this->sections);
+
+            if ( !empty($this->banners) ) {
+                //WP expects an array with two keys: "high" and "low". Both are optional.
+                //Docs: https://wordpress.org/plugins/about/faq/#banners
+                $info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
+                $info->banners = array_intersect_key($info->banners, array('high' => true, 'low' => true));
+            }
+
+            return $info;
+        }
+
+        protected function getFormattedAuthor() {
+            if ( !empty($this->author_homepage) ){
+                /** @noinspection HtmlUnknownTarget */
+                return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
+            }
+            return $this->author;
+        }
+    }
 
 endif;

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 
 use YahnisElsts\PluginUpdateChecker\v5p0\Metadata;
 
-if ( !class_exists(PluginInfo::class, false) ):
+if (!class_exists(PluginInfo::class, false)):
 
 	/**
 	 * A container class for holding and transforming various plugin metadata.
@@ -51,16 +51,16 @@ 
 		 * @param string $json Valid JSON string representing plugin info.
 		 * @return self|null New instance of Plugin Info, or NULL on error.
 		 */
-		public static function fromJson($json){
+		public static function fromJson($json) {
 			$instance = new self();
 
-			if ( !parent::createFromJson($json, $instance) ) {
+			if (!parent::createFromJson($json, $instance)) {
 				return null;
 			}
 
 			//json_decode decodes assoc. arrays as objects. We want them as arrays.
-			$instance->sections = (array)$instance->sections;
-			$instance->icons = (array)$instance->icons;
+			$instance->sections = (array) $instance->sections;
+			$instance->icons = (array) $instance->icons;
 
 			return $instance;
 		}
@@ -91,7 +91,7 @@ 
 		 *
 		 * @return object
 		 */
-		public function toWpFormat(){
+		public function toWpFormat() {
 			$info = new \stdClass;
 
 			//The custom update API is built so that many fields have the same name and format
@@ -101,8 +101,8 @@ 
 				'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
 				'requires_php',
 			);
-			foreach($sameFormat as $field){
-				if ( isset($this->$field) ) {
+			foreach ($sameFormat as $field) {
+				if (isset($this->$field)) {
 					$info->$field = $this->$field;
 				} else {
 					$info->$field = null;
@@ -114,7 +114,7 @@ 
 			$info->author = $this->getFormattedAuthor();
 			$info->sections = array_merge(array('description' => ''), $this->sections);
 
-			if ( !empty($this->banners) ) {
+			if (!empty($this->banners)) {
 				//WP expects an array with two keys: "high" and "low". Both are optional.
 				//Docs: https://wordpress.org/plugins/about/faq/#banners
 				$info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
@@ -125,7 +125,7 @@ 
 		}
 
 		protected function getFormattedAuthor() {
-			if ( !empty($this->author_homepage) ){
+			if (!empty($this->author_homepage)) {
 				/** @noinspection HtmlUnknownTarget */
 				return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
 			}