futtta / autoptimize

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

Indentation +407 added lines, -407 removed lines

@@ -2,412 +2,412 @@
 
 if ( !class_exists('Puc_v4p4_Vcs_GitHubApi', false) ):
 
-	class Puc_v4p4_Vcs_GitHubApi extends Puc_v4p4_Vcs_Api {
-		/**
-		 * @var string GitHub username.
-		 */
-		protected $userName;
-		/**
-		 * @var string GitHub repository name.
-		 */
-		protected $repositoryName;
-
-		/**
-		 * @var string Either a fully qualified repository URL, or just "user/repo-name".
-		 */
-		protected $repositoryUrl;
-
-		/**
-		 * @var string GitHub authentication token. Optional.
-		 */
-		protected $accessToken;
-
-		/**
-		 * @var bool Whether to download release assets instead of the auto-generated source code archives.
-		 */
-		protected $releaseAssetsEnabled = false;
-
-		/**
-		 * @var string|null Regular expression that's used to filter release assets by name. Optional.
-		 */
-		protected $assetFilterRegex = null;
-
-		/**
-		 * @var string|null The unchanging part of a release asset URL. Used to identify download attempts.
-		 */
-		protected $assetApiBaseUrl = null;
-
-		public function __construct($repositoryUrl, $accessToken = null) {
-			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
-				$this->userName = $matches['username'];
-				$this->repositoryName = $matches['repository'];
-			} else {
-				throw new InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
-			}
-
-			parent::__construct($repositoryUrl, $accessToken);
-		}
-
-		/**
-		 * Get the latest release from GitHub.
-		 *
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getLatestRelease() {
-			$release = $this->api('/repos/:user/:repo/releases/latest');
-			if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
-				return null;
-			}
-
-			$reference = new Puc_v4p4_Vcs_Reference(array(
-				'name'        => $release->tag_name,
-				'version'     => ltrim($release->tag_name, 'v'), //Remove the "v" prefix from "v1.2.3".
-				'downloadUrl' => $this->signDownloadUrl($release->zipball_url),
-				'updated'     => $release->created_at,
-				'apiResponse' => $release,
-			));
-
-			if ( isset($release->assets[0]) ) {
-				$reference->downloadCount = $release->assets[0]->download_count;
-			}
-
-			if ( $this->releaseAssetsEnabled && isset($release->assets, $release->assets[0]) ) {
-				//Use the first release asset that matches the specified regular expression.
-				$matchingAssets = array_filter($release->assets, array($this, 'matchesAssetFilter'));
-				if ( !empty($matchingAssets) ) {
-					if ( $this->isAuthenticationEnabled() ) {
-						/**
-						 * Keep in mind that we'll need to add an "Accept" header to download this asset.
-						 * @see setReleaseDownloadHeader()
-						 */
-						$reference->downloadUrl = $this->signDownloadUrl($matchingAssets[0]->url);
-					} else {
-						//It seems that browser_download_url only works for public repositories.
-						//Using an access_token doesn't help. Maybe OAuth would work?
-						$reference->downloadUrl = $matchingAssets[0]->browser_download_url;
-					}
-
-					$reference->downloadCount = $matchingAssets[0]->download_count;
-				}
-			}
-
-			if ( !empty($release->body) ) {
-				/** @noinspection PhpUndefinedClassInspection */
-				$reference->changelog = Parsedown::instance()->text($release->body);
-			}
-
-			return $reference;
-		}
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 *
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getLatestTag() {
-			$tags = $this->api('/repos/:user/:repo/tags');
-
-			if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
-				return null;
-			}
-
-			$versionTags = $this->sortTagsByVersion($tags);
-			if ( empty($versionTags) ) {
-				return null;
-			}
-
-			$tag = $versionTags[0];
-			return new Puc_v4p4_Vcs_Reference(array(
-				'name'        => $tag->name,
-				'version'     => ltrim($tag->name, 'v'),
-				'downloadUrl' => $this->signDownloadUrl($tag->zipball_url),
-				'apiResponse' => $tag,
-			));
-		}
-
-		/**
-		 * Get a branch by name.
-		 *
-		 * @param string $branchName
-		 * @return null|Puc_v4p4_Vcs_Reference
-		 */
-		public function getBranch($branchName) {
-			$branch = $this->api('/repos/:user/:repo/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
-				return null;
-			}
-
-			$reference = new Puc_v4p4_Vcs_Reference(array(
-				'name'        => $branch->name,
-				'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
-				'apiResponse' => $branch,
-			));
-
-			if ( isset($branch->commit, $branch->commit->commit, $branch->commit->commit->author->date) ) {
-				$reference->updated = $branch->commit->commit->author->date;
-			}
-
-			return $reference;
-		}
-
-		/**
-		 * Get the latest commit that changed the specified file.
-		 *
-		 * @param string $filename
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return StdClass|null
-		 */
-		public function getLatestCommit($filename, $ref = 'master') {
-			$commits = $this->api(
-				'/repos/:user/:repo/commits',
-				array(
-					'path' => $filename,
-					'sha'  => $ref,
-				)
-			);
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
-				return $commits[0];
-			}
-			return null;
-		}
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		public function getLatestCommitTime($ref) {
-			$commits = $this->api('/repos/:user/:repo/commits', array('sha' => $ref));
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
-				return $commits[0]->commit->author->date;
-			}
-			return null;
-		}
-
-		/**
-		 * Perform a GitHub API request.
-		 *
-		 * @param string $url
-		 * @param array $queryParams
-		 * @return mixed|WP_Error
-		 */
-		protected function api($url, $queryParams = array()) {
-			$baseUrl = $url;
-			$url = $this->buildApiUrl($url, $queryParams);
-
-			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
-				$options = apply_filters($this->httpFilterName, $options);
-			}
-			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
-				do_action('puc_api_error', $response, null, $url, $this->slug);
-				return $response;
-			}
-
-			$code = wp_remote_retrieve_response_code($response);
-			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
-				$document = json_decode($body);
-				return $document;
-			}
-
-			$error = new WP_Error(
-				'puc-github-http-error',
-				sprintf('GitHub API error. Base URL: "%s",  HTTP status code: %d.', $baseUrl, $code)
-			);
-			do_action('puc_api_error', $error, $response, $url, $this->slug);
-
-			return $error;
-		}
-
-		/**
-		 * Build a fully qualified URL for an API request.
-		 *
-		 * @param string $url
-		 * @param array $queryParams
-		 * @return string
-		 */
-		protected function buildApiUrl($url, $queryParams) {
-			$variables = array(
-				'user' => $this->userName,
-				'repo' => $this->repositoryName,
-			);
-			foreach ($variables as $name => $value) {
-				$url = str_replace('/:' . $name, '/' . urlencode($value), $url);
-			}
-			$url = 'https://api.github.com' . $url;
-
-			if ( !empty($this->accessToken) ) {
-				$queryParams['access_token'] = $this->accessToken;
-			}
-			if ( !empty($queryParams) ) {
-				$url = add_query_arg($queryParams, $url);
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		public function getRemoteFile($path, $ref = 'master') {
-			$apiUrl = '/repos/:user/:repo/contents/' . $path;
-			$response = $this->api($apiUrl, array('ref' => $ref));
-
-			if ( is_wp_error($response) || !isset($response->content) || ($response->encoding !== 'base64') ) {
-				return null;
-			}
-			return base64_decode($response->content);
-		}
-
-		/**
-		 * Generate a URL to download a ZIP archive of the specified branch/tag/etc.
-		 *
-		 * @param string $ref
-		 * @return string
-		 */
-		public function buildArchiveDownloadUrl($ref = 'master') {
-			$url = sprintf(
-				'https://api.github.com/repos/%1$s/%2$s/zipball/%3$s',
-				urlencode($this->userName),
-				urlencode($this->repositoryName),
-				urlencode($ref)
-			);
-			if ( !empty($this->accessToken) ) {
-				$url = $this->signDownloadUrl($url);
-			}
-			return $url;
-		}
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p4_Vcs_Reference|null
-		 */
-		public function getTag($tagName) {
-			//The current GitHub update checker doesn't use getTag, so I didn't bother to implement it.
-			throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
-		}
-
-		public function setAuthentication($credentials) {
-			parent::setAuthentication($credentials);
-			$this->accessToken = is_string($credentials) ? $credentials : null;
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p4_Vcs_Reference
-		 */
-		public function chooseReference($configBranch) {
-			$updateSource = null;
-
-			if ( $configBranch === 'master' ) {
-				//Use the latest release.
-				$updateSource = $this->getLatestRelease();
-				if ( $updateSource === null ) {
-					//Failing that, use the tag with the highest version number.
-					$updateSource = $this->getLatestTag();
-				}
-			}
-			//Alternatively, just use the branch itself.
-			if ( empty($updateSource) ) {
-				$updateSource = $this->getBranch($configBranch);
-			}
-
-			return $updateSource;
-		}
-
-		/**
-		 * @param string $url
-		 * @return string
-		 */
-		public function signDownloadUrl($url) {
-			if ( empty($this->credentials) ) {
-				return $url;
-			}
-			return add_query_arg('access_token', $this->credentials, $url);
-		}
-
-		/**
-		 * Enable updating via release assets.
-		 *
-		 * If the latest release contains no usable assets, the update checker
-		 * will fall back to using the automatically generated ZIP archive.
-		 *
-		 * Private repositories will only work with WordPress 3.7 or later.
-		 *
-		 * @param string|null $fileNameRegex Optional. Use only those assets where the file name matches this regex.
-		 */
-		public function enableReleaseAssets($fileNameRegex = null) {
-			$this->releaseAssetsEnabled = true;
-			$this->assetFilterRegex = $fileNameRegex;
-			$this->assetApiBaseUrl = sprintf(
-				'//api.github.com/repos/%1$s/%2$s/releases/assets/',
-				$this->userName,
-				$this->repositoryName
-			);
-
-			//Optimization: Instead of filtering all HTTP requests, let's do it only when
-			//WordPress is about to download an update.
-			add_filter('upgrader_pre_download', array($this, 'addHttpRequestFilter'), 10, 1); //WP 3.7+
-		}
-
-		/**
-		 * Does this asset match the file name regex?
-		 *
-		 * @param stdClass $releaseAsset
-		 * @return bool
-		 */
-		protected function matchesAssetFilter($releaseAsset) {
-			if ( $this->assetFilterRegex === null ) {
-				//The default is to accept all assets.
-				return true;
-			}
-			return isset($releaseAsset->name) && preg_match($this->assetFilterRegex, $releaseAsset->name);
-		}
-
-		/**
-		 * @internal
-		 * @param bool $result
-		 * @return bool
-		 */
-		public function addHttpRequestFilter($result) {
-			static $filterAdded = false;
-			if ( $this->releaseAssetsEnabled && !$filterAdded && $this->isAuthenticationEnabled() ) {
-				add_filter('http_request_args', array($this, 'setReleaseDownloadHeader'), 10, 2);
-				$filterAdded = true;
-			}
-			return $result;
-		}
-
-		/**
-		 * Set the HTTP header that's necessary to download private release assets.
-		 *
-		 * See GitHub docs:
-		 * @link https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
-		 *
-		 * @internal
-		 * @param array $requestArgs
-		 * @param string $url
-		 * @return array
-		 */
-		public function setReleaseDownloadHeader($requestArgs, $url = '') {
-			//Is WordPress trying to download one of our assets?
-			if ( strpos($url, $this->assetApiBaseUrl) !== false ) {
-				$requestArgs['headers']['accept'] = 'application/octet-stream';
-			}
-			return $requestArgs;
-		}
-	}
+    class Puc_v4p4_Vcs_GitHubApi extends Puc_v4p4_Vcs_Api {
+        /**
+         * @var string GitHub username.
+         */
+        protected $userName;
+        /**
+         * @var string GitHub repository name.
+         */
+        protected $repositoryName;
+
+        /**
+         * @var string Either a fully qualified repository URL, or just "user/repo-name".
+         */
+        protected $repositoryUrl;
+
+        /**
+         * @var string GitHub authentication token. Optional.
+         */
+        protected $accessToken;
+
+        /**
+         * @var bool Whether to download release assets instead of the auto-generated source code archives.
+         */
+        protected $releaseAssetsEnabled = false;
+
+        /**
+         * @var string|null Regular expression that's used to filter release assets by name. Optional.
+         */
+        protected $assetFilterRegex = null;
+
+        /**
+         * @var string|null The unchanging part of a release asset URL. Used to identify download attempts.
+         */
+        protected $assetApiBaseUrl = null;
+
+        public function __construct($repositoryUrl, $accessToken = null) {
+            $path = @parse_url($repositoryUrl, PHP_URL_PATH);
+            if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
+                $this->userName = $matches['username'];
+                $this->repositoryName = $matches['repository'];
+            } else {
+                throw new InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
+            }
+
+            parent::__construct($repositoryUrl, $accessToken);
+        }
+
+        /**
+         * Get the latest release from GitHub.
+         *
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getLatestRelease() {
+            $release = $this->api('/repos/:user/:repo/releases/latest');
+            if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
+                return null;
+            }
+
+            $reference = new Puc_v4p4_Vcs_Reference(array(
+                'name'        => $release->tag_name,
+                'version'     => ltrim($release->tag_name, 'v'), //Remove the "v" prefix from "v1.2.3".
+                'downloadUrl' => $this->signDownloadUrl($release->zipball_url),
+                'updated'     => $release->created_at,
+                'apiResponse' => $release,
+            ));
+
+            if ( isset($release->assets[0]) ) {
+                $reference->downloadCount = $release->assets[0]->download_count;
+            }
+
+            if ( $this->releaseAssetsEnabled && isset($release->assets, $release->assets[0]) ) {
+                //Use the first release asset that matches the specified regular expression.
+                $matchingAssets = array_filter($release->assets, array($this, 'matchesAssetFilter'));
+                if ( !empty($matchingAssets) ) {
+                    if ( $this->isAuthenticationEnabled() ) {
+                        /**
+                         * Keep in mind that we'll need to add an "Accept" header to download this asset.
+                         * @see setReleaseDownloadHeader()
+                         */
+                        $reference->downloadUrl = $this->signDownloadUrl($matchingAssets[0]->url);
+                    } else {
+                        //It seems that browser_download_url only works for public repositories.
+                        //Using an access_token doesn't help. Maybe OAuth would work?
+                        $reference->downloadUrl = $matchingAssets[0]->browser_download_url;
+                    }
+
+                    $reference->downloadCount = $matchingAssets[0]->download_count;
+                }
+            }
+
+            if ( !empty($release->body) ) {
+                /** @noinspection PhpUndefinedClassInspection */
+                $reference->changelog = Parsedown::instance()->text($release->body);
+            }
+
+            return $reference;
+        }
+
+        /**
+         * Get the tag that looks like the highest version number.
+         *
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getLatestTag() {
+            $tags = $this->api('/repos/:user/:repo/tags');
+
+            if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
+                return null;
+            }
+
+            $versionTags = $this->sortTagsByVersion($tags);
+            if ( empty($versionTags) ) {
+                return null;
+            }
+
+            $tag = $versionTags[0];
+            return new Puc_v4p4_Vcs_Reference(array(
+                'name'        => $tag->name,
+                'version'     => ltrim($tag->name, 'v'),
+                'downloadUrl' => $this->signDownloadUrl($tag->zipball_url),
+                'apiResponse' => $tag,
+            ));
+        }
+
+        /**
+         * Get a branch by name.
+         *
+         * @param string $branchName
+         * @return null|Puc_v4p4_Vcs_Reference
+         */
+        public function getBranch($branchName) {
+            $branch = $this->api('/repos/:user/:repo/branches/' . $branchName);
+            if ( is_wp_error($branch) || empty($branch) ) {
+                return null;
+            }
+
+            $reference = new Puc_v4p4_Vcs_Reference(array(
+                'name'        => $branch->name,
+                'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
+                'apiResponse' => $branch,
+            ));
+
+            if ( isset($branch->commit, $branch->commit->commit, $branch->commit->commit->author->date) ) {
+                $reference->updated = $branch->commit->commit->author->date;
+            }
+
+            return $reference;
+        }
+
+        /**
+         * Get the latest commit that changed the specified file.
+         *
+         * @param string $filename
+         * @param string $ref Reference name (e.g. branch or tag).
+         * @return StdClass|null
+         */
+        public function getLatestCommit($filename, $ref = 'master') {
+            $commits = $this->api(
+                '/repos/:user/:repo/commits',
+                array(
+                    'path' => $filename,
+                    'sha'  => $ref,
+                )
+            );
+            if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
+                return $commits[0];
+            }
+            return null;
+        }
+
+        /**
+         * Get the timestamp of the latest commit that changed the specified branch or tag.
+         *
+         * @param string $ref Reference name (e.g. branch or tag).
+         * @return string|null
+         */
+        public function getLatestCommitTime($ref) {
+            $commits = $this->api('/repos/:user/:repo/commits', array('sha' => $ref));
+            if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
+                return $commits[0]->commit->author->date;
+            }
+            return null;
+        }
+
+        /**
+         * Perform a GitHub API request.
+         *
+         * @param string $url
+         * @param array $queryParams
+         * @return mixed|WP_Error
+         */
+        protected function api($url, $queryParams = array()) {
+            $baseUrl = $url;
+            $url = $this->buildApiUrl($url, $queryParams);
+
+            $options = array('timeout' => 10);
+            if ( !empty($this->httpFilterName) ) {
+                $options = apply_filters($this->httpFilterName, $options);
+            }
+            $response = wp_remote_get($url, $options);
+            if ( is_wp_error($response) ) {
+                do_action('puc_api_error', $response, null, $url, $this->slug);
+                return $response;
+            }
+
+            $code = wp_remote_retrieve_response_code($response);
+            $body = wp_remote_retrieve_body($response);
+            if ( $code === 200 ) {
+                $document = json_decode($body);
+                return $document;
+            }
+
+            $error = new WP_Error(
+                'puc-github-http-error',
+                sprintf('GitHub API error. Base URL: "%s",  HTTP status code: %d.', $baseUrl, $code)
+            );
+            do_action('puc_api_error', $error, $response, $url, $this->slug);
+
+            return $error;
+        }
+
+        /**
+         * Build a fully qualified URL for an API request.
+         *
+         * @param string $url
+         * @param array $queryParams
+         * @return string
+         */
+        protected function buildApiUrl($url, $queryParams) {
+            $variables = array(
+                'user' => $this->userName,
+                'repo' => $this->repositoryName,
+            );
+            foreach ($variables as $name => $value) {
+                $url = str_replace('/:' . $name, '/' . urlencode($value), $url);
+            }
+            $url = 'https://api.github.com' . $url;
+
+            if ( !empty($this->accessToken) ) {
+                $queryParams['access_token'] = $this->accessToken;
+            }
+            if ( !empty($queryParams) ) {
+                $url = add_query_arg($queryParams, $url);
+            }
+
+            return $url;
+        }
+
+        /**
+         * Get the contents of a file from a specific branch or tag.
+         *
+         * @param string $path File name.
+         * @param string $ref
+         * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
+         */
+        public function getRemoteFile($path, $ref = 'master') {
+            $apiUrl = '/repos/:user/:repo/contents/' . $path;
+            $response = $this->api($apiUrl, array('ref' => $ref));
+
+            if ( is_wp_error($response) || !isset($response->content) || ($response->encoding !== 'base64') ) {
+                return null;
+            }
+            return base64_decode($response->content);
+        }
+
+        /**
+         * Generate a URL to download a ZIP archive of the specified branch/tag/etc.
+         *
+         * @param string $ref
+         * @return string
+         */
+        public function buildArchiveDownloadUrl($ref = 'master') {
+            $url = sprintf(
+                'https://api.github.com/repos/%1$s/%2$s/zipball/%3$s',
+                urlencode($this->userName),
+                urlencode($this->repositoryName),
+                urlencode($ref)
+            );
+            if ( !empty($this->accessToken) ) {
+                $url = $this->signDownloadUrl($url);
+            }
+            return $url;
+        }
+
+        /**
+         * Get a specific tag.
+         *
+         * @param string $tagName
+         * @return Puc_v4p4_Vcs_Reference|null
+         */
+        public function getTag($tagName) {
+            //The current GitHub update checker doesn't use getTag, so I didn't bother to implement it.
+            throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+        }
+
+        public function setAuthentication($credentials) {
+            parent::setAuthentication($credentials);
+            $this->accessToken = is_string($credentials) ? $credentials : null;
+        }
+
+        /**
+         * Figure out which reference (i.e tag or branch) contains the latest version.
+         *
+         * @param string $configBranch Start looking in this branch.
+         * @return null|Puc_v4p4_Vcs_Reference
+         */
+        public function chooseReference($configBranch) {
+            $updateSource = null;
+
+            if ( $configBranch === 'master' ) {
+                //Use the latest release.
+                $updateSource = $this->getLatestRelease();
+                if ( $updateSource === null ) {
+                    //Failing that, use the tag with the highest version number.
+                    $updateSource = $this->getLatestTag();
+                }
+            }
+            //Alternatively, just use the branch itself.
+            if ( empty($updateSource) ) {
+                $updateSource = $this->getBranch($configBranch);
+            }
+
+            return $updateSource;
+        }
+
+        /**
+         * @param string $url
+         * @return string
+         */
+        public function signDownloadUrl($url) {
+            if ( empty($this->credentials) ) {
+                return $url;
+            }
+            return add_query_arg('access_token', $this->credentials, $url);
+        }
+
+        /**
+         * Enable updating via release assets.
+         *
+         * If the latest release contains no usable assets, the update checker
+         * will fall back to using the automatically generated ZIP archive.
+         *
+         * Private repositories will only work with WordPress 3.7 or later.
+         *
+         * @param string|null $fileNameRegex Optional. Use only those assets where the file name matches this regex.
+         */
+        public function enableReleaseAssets($fileNameRegex = null) {
+            $this->releaseAssetsEnabled = true;
+            $this->assetFilterRegex = $fileNameRegex;
+            $this->assetApiBaseUrl = sprintf(
+                '//api.github.com/repos/%1$s/%2$s/releases/assets/',
+                $this->userName,
+                $this->repositoryName
+            );
+
+            //Optimization: Instead of filtering all HTTP requests, let's do it only when
+            //WordPress is about to download an update.
+            add_filter('upgrader_pre_download', array($this, 'addHttpRequestFilter'), 10, 1); //WP 3.7+
+        }
+
+        /**
+         * Does this asset match the file name regex?
+         *
+         * @param stdClass $releaseAsset
+         * @return bool
+         */
+        protected function matchesAssetFilter($releaseAsset) {
+            if ( $this->assetFilterRegex === null ) {
+                //The default is to accept all assets.
+                return true;
+            }
+            return isset($releaseAsset->name) && preg_match($this->assetFilterRegex, $releaseAsset->name);
+        }
+
+        /**
+         * @internal
+         * @param bool $result
+         * @return bool
+         */
+        public function addHttpRequestFilter($result) {
+            static $filterAdded = false;
+            if ( $this->releaseAssetsEnabled && !$filterAdded && $this->isAuthenticationEnabled() ) {
+                add_filter('http_request_args', array($this, 'setReleaseDownloadHeader'), 10, 2);
+                $filterAdded = true;
+            }
+            return $result;
+        }
+
+        /**
+         * Set the HTTP header that's necessary to download private release assets.
+         *
+         * See GitHub docs:
+         * @link https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
+         *
+         * @internal
+         * @param array $requestArgs
+         * @param string $url
+         * @return array
+         */
+        public function setReleaseDownloadHeader($requestArgs, $url = '') {
+            //Is WordPress trying to download one of our assets?
+            if ( strpos($url, $this->assetApiBaseUrl) !== false ) {
+                $requestArgs['headers']['accept'] = 'application/octet-stream';
+            }
+            return $requestArgs;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +34 added lines, -34 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Vcs_GitHubApi', false) ):
+if (!class_exists('Puc_v4p4_Vcs_GitHubApi', false)):
 
 	class Puc_v4p4_Vcs_GitHubApi extends Puc_v4p4_Vcs_Api {
 		/**
@@ -39,11 +39,11 @@ 
 
 		public function __construct($repositoryUrl, $accessToken = null) {
 			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
+			if (preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches)) {
 				$this->userName = $matches['username'];
 				$this->repositoryName = $matches['repository'];
 			} else {
-				throw new InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
+				throw new InvalidArgumentException('Invalid GitHub repository URL: "'.$repositoryUrl.'"');
 			}
 
 			parent::__construct($repositoryUrl, $accessToken);
@@ -56,7 +56,7 @@ 
 		 */
 		public function getLatestRelease() {
 			$release = $this->api('/repos/:user/:repo/releases/latest');
-			if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
+			if (is_wp_error($release) || !is_object($release) || !isset($release->tag_name)) {
 				return null;
 			}
 
@@ -68,15 +68,15 @@ 
 				'apiResponse' => $release,
 			));
 
-			if ( isset($release->assets[0]) ) {
+			if (isset($release->assets[0])) {
 				$reference->downloadCount = $release->assets[0]->download_count;
 			}
 
-			if ( $this->releaseAssetsEnabled && isset($release->assets, $release->assets[0]) ) {
+			if ($this->releaseAssetsEnabled && isset($release->assets, $release->assets[0])) {
 				//Use the first release asset that matches the specified regular expression.
 				$matchingAssets = array_filter($release->assets, array($this, 'matchesAssetFilter'));
-				if ( !empty($matchingAssets) ) {
-					if ( $this->isAuthenticationEnabled() ) {
+				if (!empty($matchingAssets)) {
+					if ($this->isAuthenticationEnabled()) {
 						/**
 						 * Keep in mind that we'll need to add an "Accept" header to download this asset.
 						 * @see setReleaseDownloadHeader()
@@ -92,7 +92,7 @@ 
 				}
 			}
 
-			if ( !empty($release->body) ) {
+			if (!empty($release->body)) {
 				/** @noinspection PhpUndefinedClassInspection */
 				$reference->changelog = Parsedown::instance()->text($release->body);
 			}
@@ -108,12 +108,12 @@ 
 		public function getLatestTag() {
 			$tags = $this->api('/repos/:user/:repo/tags');
 
-			if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
+			if (is_wp_error($tags) || empty($tags) || !is_array($tags)) {
 				return null;
 			}
 
 			$versionTags = $this->sortTagsByVersion($tags);
-			if ( empty($versionTags) ) {
+			if (empty($versionTags)) {
 				return null;
 			}
 
@@ -133,8 +133,8 @@ 
 		 * @return null|Puc_v4p4_Vcs_Reference
 		 */
 		public function getBranch($branchName) {
-			$branch = $this->api('/repos/:user/:repo/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
+			$branch = $this->api('/repos/:user/:repo/branches/'.$branchName);
+			if (is_wp_error($branch) || empty($branch)) {
 				return null;
 			}
 
@@ -144,7 +144,7 @@ 
 				'apiResponse' => $branch,
 			));
 
-			if ( isset($branch->commit, $branch->commit->commit, $branch->commit->commit->author->date) ) {
+			if (isset($branch->commit, $branch->commit->commit, $branch->commit->commit->author->date)) {
 				$reference->updated = $branch->commit->commit->author->date;
 			}
 
@@ -166,7 +166,7 @@ 
 					'sha'  => $ref,
 				)
 			);
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
+			if (!is_wp_error($commits) && is_array($commits) && isset($commits[0])) {
 				return $commits[0];
 			}
 			return null;
@@ -180,7 +180,7 @@ 
 		 */
 		public function getLatestCommitTime($ref) {
 			$commits = $this->api('/repos/:user/:repo/commits', array('sha' => $ref));
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
+			if (!is_wp_error($commits) && is_array($commits) && isset($commits[0])) {
 				return $commits[0]->commit->author->date;
 			}
 			return null;
@@ -198,18 +198,18 @@ 
 			$url = $this->buildApiUrl($url, $queryParams);
 
 			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
+			if (!empty($this->httpFilterName)) {
 				$options = apply_filters($this->httpFilterName, $options);
 			}
 			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
+			if (is_wp_error($response)) {
 				do_action('puc_api_error', $response, null, $url, $this->slug);
 				return $response;
 			}
 
 			$code = wp_remote_retrieve_response_code($response);
 			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
+			if ($code === 200) {
 				$document = json_decode($body);
 				return $document;
 			}
@@ -236,14 +236,14 @@ 
 				'repo' => $this->repositoryName,
 			);
 			foreach ($variables as $name => $value) {
-				$url = str_replace('/:' . $name, '/' . urlencode($value), $url);
+				$url = str_replace('/:'.$name, '/'.urlencode($value), $url);
 			}
-			$url = 'https://api.github.com' . $url;
+			$url = 'https://api.github.com'.$url;
 
-			if ( !empty($this->accessToken) ) {
+			if (!empty($this->accessToken)) {
 				$queryParams['access_token'] = $this->accessToken;
 			}
-			if ( !empty($queryParams) ) {
+			if (!empty($queryParams)) {
 				$url = add_query_arg($queryParams, $url);
 			}
 
@@ -258,10 +258,10 @@ 
 		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
 		 */
 		public function getRemoteFile($path, $ref = 'master') {
-			$apiUrl = '/repos/:user/:repo/contents/' . $path;
+			$apiUrl = '/repos/:user/:repo/contents/'.$path;
 			$response = $this->api($apiUrl, array('ref' => $ref));
 
-			if ( is_wp_error($response) || !isset($response->content) || ($response->encoding !== 'base64') ) {
+			if (is_wp_error($response) || !isset($response->content) || ($response->encoding !== 'base64')) {
 				return null;
 			}
 			return base64_decode($response->content);
@@ -280,7 +280,7 @@ 
 				urlencode($this->repositoryName),
 				urlencode($ref)
 			);
-			if ( !empty($this->accessToken) ) {
+			if (!empty($this->accessToken)) {
 				$url = $this->signDownloadUrl($url);
 			}
 			return $url;
@@ -294,7 +294,7 @@ 
 		 */
 		public function getTag($tagName) {
 			//The current GitHub update checker doesn't use getTag, so I didn't bother to implement it.
-			throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+			throw new LogicException('The '.__METHOD__.' method is not implemented and should not be used.');
 		}
 
 		public function setAuthentication($credentials) {
@@ -311,16 +311,16 @@ 
 		public function chooseReference($configBranch) {
 			$updateSource = null;
 
-			if ( $configBranch === 'master' ) {
+			if ($configBranch === 'master') {
 				//Use the latest release.
 				$updateSource = $this->getLatestRelease();
-				if ( $updateSource === null ) {
+				if ($updateSource === null) {
 					//Failing that, use the tag with the highest version number.
 					$updateSource = $this->getLatestTag();
 				}
 			}
 			//Alternatively, just use the branch itself.
-			if ( empty($updateSource) ) {
+			if (empty($updateSource)) {
 				$updateSource = $this->getBranch($configBranch);
 			}
 
@@ -332,7 +332,7 @@ 
 		 * @return string
 		 */
 		public function signDownloadUrl($url) {
-			if ( empty($this->credentials) ) {
+			if (empty($this->credentials)) {
 				return $url;
 			}
 			return add_query_arg('access_token', $this->credentials, $url);
@@ -369,7 +369,7 @@ 
 		 * @return bool
 		 */
 		protected function matchesAssetFilter($releaseAsset) {
-			if ( $this->assetFilterRegex === null ) {
+			if ($this->assetFilterRegex === null) {
 				//The default is to accept all assets.
 				return true;
 			}
@@ -383,7 +383,7 @@ 
 		 */
 		public function addHttpRequestFilter($result) {
 			static $filterAdded = false;
-			if ( $this->releaseAssetsEnabled && !$filterAdded && $this->isAuthenticationEnabled() ) {
+			if ($this->releaseAssetsEnabled && !$filterAdded && $this->isAuthenticationEnabled()) {
 				add_filter('http_request_args', array($this, 'setReleaseDownloadHeader'), 10, 2);
 				$filterAdded = true;
 			}
@@ -403,7 +403,7 @@ 
 		 */
 		public function setReleaseDownloadHeader($requestArgs, $url = '') {
 			//Is WordPress trying to download one of our assets?
-			if ( strpos($url, $this->assetApiBaseUrl) !== false ) {
+			if (strpos($url, $this->assetApiBaseUrl) !== false) {
 				$requestArgs['headers']['accept'] = 'application/octet-stream';
 			}
 			return $requestArgs;

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

Indentation +212 added lines, -212 removed lines

@@ -1,217 +1,217 @@
 <?php
 if ( !class_exists('Puc_v4p4_Vcs_PluginUpdateChecker') ):
 
-	class Puc_v4p4_Vcs_PluginUpdateChecker extends Puc_v4p4_Plugin_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
-		/**
-		 * @var string The branch where to look for updates. Defaults to "master".
-		 */
-		protected $branch = 'master';
-
-		/**
-		 * @var Puc_v4p4_Vcs_Api Repository API client.
-		 */
-		protected $api = null;
-
-		/**
-		 * Puc_v4p4_Vcs_PluginUpdateChecker constructor.
-		 *
-		 * @param Puc_v4p4_Vcs_Api $api
-		 * @param string $pluginFile
-		 * @param string $slug
-		 * @param int $checkPeriod
-		 * @param string $optionName
-		 * @param string $muPluginFile
-		 */
-		public function __construct($api, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
-			$this->api = $api;
-			$this->api->setHttpFilterName($this->getUniqueName('request_info_options'));
-
-			parent::__construct($api->getRepositoryUrl(), $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
-
-			$this->api->setSlug($this->slug);
-		}
-
-		public function requestInfo($unusedParameter = null) {
-			//We have to make several remote API requests to gather all the necessary info
-			//which can take a while on slow networks.
-			if ( function_exists('set_time_limit') ) {
-				@set_time_limit(60);
-			}
-
-			$api = $this->api;
-			$api->setLocalDirectory($this->getAbsoluteDirectoryPath());
-
-			$info = new Puc_v4p4_Plugin_Info();
-			$info->filename = $this->pluginFile;
-			$info->slug = $this->slug;
-
-			$this->setInfoFromHeader($this->getPluginHeader(), $info);
-
-			//Pick a branch or tag.
-			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
-				$ref = $updateSource->name;
-				$info->version = $updateSource->version;
-				$info->last_updated = $updateSource->updated;
-				$info->download_url = $updateSource->downloadUrl;
-
-				if ( !empty($updateSource->changelog) ) {
-					$info->sections['changelog'] = $updateSource->changelog;
-				}
-				if ( isset($updateSource->downloadCount) ) {
-					$info->downloaded = $updateSource->downloadCount;
-				}
-			} else {
-				//There's probably a network problem or an authentication error.
-				do_action(
-					'puc_api_error',
-					new WP_Error(
-						'puc-no-update-source',
-						'Could not retrieve version information from the repository. '
-						. 'This usually means that the update checker either can\'t connect '
-						. 'to the repository or it\'s configured incorrectly.'
-					),
-					null, null, $this->slug
-				);
-				return null;
-			}
-
-			//Get headers from the main plugin file in this branch/tag. Its "Version" header and other metadata
-			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
-			$mainPluginFile = basename($this->pluginFile);
-			$remotePlugin = $api->getRemoteFile($mainPluginFile, $ref);
-			if ( !empty($remotePlugin) ) {
-				$remoteHeader = $this->getFileHeader($remotePlugin);
-				$this->setInfoFromHeader($remoteHeader, $info);
-			}
-
-			//Try parsing readme.txt. If it's formatted according to WordPress.org standards, it will contain
-			//a lot of useful information like the required/tested WP version, changelog, and so on.
-			if ( $this->readmeTxtExistsLocally() ) {
-				$this->setInfoFromRemoteReadme($ref, $info);
-			}
-
-			//The changelog might be in a separate file.
-			if ( empty($info->sections['changelog']) ) {
-				$info->sections['changelog'] = $api->getRemoteChangelog($ref, dirname($this->getAbsolutePath()));
-				if ( empty($info->sections['changelog']) ) {
-					$info->sections['changelog'] = __('There is no changelog available.', 'plugin-update-checker');
-				}
-			}
-
-			if ( empty($info->last_updated) ) {
-				//Fetch the latest commit that changed the tag or branch and use it as the "last_updated" date.
-				$latestCommitTime = $api->getLatestCommitTime($ref);
-				if ( $latestCommitTime !== null ) {
-					$info->last_updated = $latestCommitTime;
-				}
-			}
-
-			$info = apply_filters($this->getUniqueName('request_info_result'), $info, null);
-			return $info;
-		}
-
-		/**
-		 * Check if the currently installed version has a readme.txt file.
-		 *
-		 * @return bool
-		 */
-		protected function readmeTxtExistsLocally() {
-			$pluginDirectory = $this->getAbsoluteDirectoryPath();
-			if ( empty($pluginDirectory) || !is_dir($pluginDirectory) || ($pluginDirectory === '.') ) {
-				return false;
-			}
-			return is_file($pluginDirectory . '/' . $this->api->getLocalReadmeName());
-		}
-
-		/**
-		 * Copy plugin metadata from a file header to a Plugin Info object.
-		 *
-		 * @param array $fileHeader
-		 * @param Puc_v4p4_Plugin_Info $pluginInfo
-		 */
-		protected function setInfoFromHeader($fileHeader, $pluginInfo) {
-			$headerToPropertyMap = array(
-				'Version' => 'version',
-				'Name' => 'name',
-				'PluginURI' => 'homepage',
-				'Author' => 'author',
-				'AuthorName' => 'author',
-				'AuthorURI' => 'author_homepage',
-
-				'Requires WP' => 'requires',
-				'Tested WP' => 'tested',
-				'Requires at least' => 'requires',
-				'Tested up to' => 'tested',
-			);
-			foreach ($headerToPropertyMap as $headerName => $property) {
-				if ( isset($fileHeader[$headerName]) && !empty($fileHeader[$headerName]) ) {
-					$pluginInfo->$property = $fileHeader[$headerName];
-				}
-			}
-
-			if ( !empty($fileHeader['Description']) ) {
-				$pluginInfo->sections['description'] = $fileHeader['Description'];
-			}
-		}
-
-		/**
-		 * Copy plugin metadata from the remote readme.txt file.
-		 *
-		 * @param string $ref GitHub tag or branch where to look for the readme.
-		 * @param Puc_v4p4_Plugin_Info $pluginInfo
-		 */
-		protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
-			$readme = $this->api->getRemoteReadme($ref);
-			if ( empty($readme) ) {
-				return;
-			}
-
-			if ( isset($readme['sections']) ) {
-				$pluginInfo->sections = array_merge($pluginInfo->sections, $readme['sections']);
-			}
-			if ( !empty($readme['tested_up_to']) ) {
-				$pluginInfo->tested = $readme['tested_up_to'];
-			}
-			if ( !empty($readme['requires_at_least']) ) {
-				$pluginInfo->requires = $readme['requires_at_least'];
-			}
-
-			if ( isset($readme['upgrade_notice'], $readme['upgrade_notice'][$pluginInfo->version]) ) {
-				$pluginInfo->upgrade_notice = $readme['upgrade_notice'][$pluginInfo->version];
-			}
-		}
-
-		public function setBranch($branch) {
-			$this->branch = $branch;
-			return $this;
-		}
-
-		public function setAuthentication($credentials) {
-			$this->api->setAuthentication($credentials);
-			return $this;
-		}
-
-		public function getVcsApi() {
-			return $this->api;
-		}
-
-		public function getUpdate() {
-			$update = parent::getUpdate();
-
-			if ( isset($update) && !empty($update->download_url) ) {
-				$update->download_url = $this->api->signDownloadUrl($update->download_url);
-			}
-
-			return $update;
-		}
-
-		public function onDisplayConfiguration($panel) {
-			parent::onDisplayConfiguration($panel);
-			$panel->row('Branch', $this->branch);
-			$panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
-			$panel->row('API client', get_class($this->api));
-		}
-	}
+    class Puc_v4p4_Vcs_PluginUpdateChecker extends Puc_v4p4_Plugin_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
+        /**
+         * @var string The branch where to look for updates. Defaults to "master".
+         */
+        protected $branch = 'master';
+
+        /**
+         * @var Puc_v4p4_Vcs_Api Repository API client.
+         */
+        protected $api = null;
+
+        /**
+         * Puc_v4p4_Vcs_PluginUpdateChecker constructor.
+         *
+         * @param Puc_v4p4_Vcs_Api $api
+         * @param string $pluginFile
+         * @param string $slug
+         * @param int $checkPeriod
+         * @param string $optionName
+         * @param string $muPluginFile
+         */
+        public function __construct($api, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
+            $this->api = $api;
+            $this->api->setHttpFilterName($this->getUniqueName('request_info_options'));
+
+            parent::__construct($api->getRepositoryUrl(), $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
+
+            $this->api->setSlug($this->slug);
+        }
+
+        public function requestInfo($unusedParameter = null) {
+            //We have to make several remote API requests to gather all the necessary info
+            //which can take a while on slow networks.
+            if ( function_exists('set_time_limit') ) {
+                @set_time_limit(60);
+            }
+
+            $api = $this->api;
+            $api->setLocalDirectory($this->getAbsoluteDirectoryPath());
+
+            $info = new Puc_v4p4_Plugin_Info();
+            $info->filename = $this->pluginFile;
+            $info->slug = $this->slug;
+
+            $this->setInfoFromHeader($this->getPluginHeader(), $info);
+
+            //Pick a branch or tag.
+            $updateSource = $api->chooseReference($this->branch);
+            if ( $updateSource ) {
+                $ref = $updateSource->name;
+                $info->version = $updateSource->version;
+                $info->last_updated = $updateSource->updated;
+                $info->download_url = $updateSource->downloadUrl;
+
+                if ( !empty($updateSource->changelog) ) {
+                    $info->sections['changelog'] = $updateSource->changelog;
+                }
+                if ( isset($updateSource->downloadCount) ) {
+                    $info->downloaded = $updateSource->downloadCount;
+                }
+            } else {
+                //There's probably a network problem or an authentication error.
+                do_action(
+                    'puc_api_error',
+                    new WP_Error(
+                        'puc-no-update-source',
+                        'Could not retrieve version information from the repository. '
+                        . 'This usually means that the update checker either can\'t connect '
+                        . 'to the repository or it\'s configured incorrectly.'
+                    ),
+                    null, null, $this->slug
+                );
+                return null;
+            }
+
+            //Get headers from the main plugin file in this branch/tag. Its "Version" header and other metadata
+            //are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
+            $mainPluginFile = basename($this->pluginFile);
+            $remotePlugin = $api->getRemoteFile($mainPluginFile, $ref);
+            if ( !empty($remotePlugin) ) {
+                $remoteHeader = $this->getFileHeader($remotePlugin);
+                $this->setInfoFromHeader($remoteHeader, $info);
+            }
+
+            //Try parsing readme.txt. If it's formatted according to WordPress.org standards, it will contain
+            //a lot of useful information like the required/tested WP version, changelog, and so on.
+            if ( $this->readmeTxtExistsLocally() ) {
+                $this->setInfoFromRemoteReadme($ref, $info);
+            }
+
+            //The changelog might be in a separate file.
+            if ( empty($info->sections['changelog']) ) {
+                $info->sections['changelog'] = $api->getRemoteChangelog($ref, dirname($this->getAbsolutePath()));
+                if ( empty($info->sections['changelog']) ) {
+                    $info->sections['changelog'] = __('There is no changelog available.', 'plugin-update-checker');
+                }
+            }
+
+            if ( empty($info->last_updated) ) {
+                //Fetch the latest commit that changed the tag or branch and use it as the "last_updated" date.
+                $latestCommitTime = $api->getLatestCommitTime($ref);
+                if ( $latestCommitTime !== null ) {
+                    $info->last_updated = $latestCommitTime;
+                }
+            }
+
+            $info = apply_filters($this->getUniqueName('request_info_result'), $info, null);
+            return $info;
+        }
+
+        /**
+         * Check if the currently installed version has a readme.txt file.
+         *
+         * @return bool
+         */
+        protected function readmeTxtExistsLocally() {
+            $pluginDirectory = $this->getAbsoluteDirectoryPath();
+            if ( empty($pluginDirectory) || !is_dir($pluginDirectory) || ($pluginDirectory === '.') ) {
+                return false;
+            }
+            return is_file($pluginDirectory . '/' . $this->api->getLocalReadmeName());
+        }
+
+        /**
+         * Copy plugin metadata from a file header to a Plugin Info object.
+         *
+         * @param array $fileHeader
+         * @param Puc_v4p4_Plugin_Info $pluginInfo
+         */
+        protected function setInfoFromHeader($fileHeader, $pluginInfo) {
+            $headerToPropertyMap = array(
+                'Version' => 'version',
+                'Name' => 'name',
+                'PluginURI' => 'homepage',
+                'Author' => 'author',
+                'AuthorName' => 'author',
+                'AuthorURI' => 'author_homepage',
+
+                'Requires WP' => 'requires',
+                'Tested WP' => 'tested',
+                'Requires at least' => 'requires',
+                'Tested up to' => 'tested',
+            );
+            foreach ($headerToPropertyMap as $headerName => $property) {
+                if ( isset($fileHeader[$headerName]) && !empty($fileHeader[$headerName]) ) {
+                    $pluginInfo->$property = $fileHeader[$headerName];
+                }
+            }
+
+            if ( !empty($fileHeader['Description']) ) {
+                $pluginInfo->sections['description'] = $fileHeader['Description'];
+            }
+        }
+
+        /**
+         * Copy plugin metadata from the remote readme.txt file.
+         *
+         * @param string $ref GitHub tag or branch where to look for the readme.
+         * @param Puc_v4p4_Plugin_Info $pluginInfo
+         */
+        protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
+            $readme = $this->api->getRemoteReadme($ref);
+            if ( empty($readme) ) {
+                return;
+            }
+
+            if ( isset($readme['sections']) ) {
+                $pluginInfo->sections = array_merge($pluginInfo->sections, $readme['sections']);
+            }
+            if ( !empty($readme['tested_up_to']) ) {
+                $pluginInfo->tested = $readme['tested_up_to'];
+            }
+            if ( !empty($readme['requires_at_least']) ) {
+                $pluginInfo->requires = $readme['requires_at_least'];
+            }
+
+            if ( isset($readme['upgrade_notice'], $readme['upgrade_notice'][$pluginInfo->version]) ) {
+                $pluginInfo->upgrade_notice = $readme['upgrade_notice'][$pluginInfo->version];
+            }
+        }
+
+        public function setBranch($branch) {
+            $this->branch = $branch;
+            return $this;
+        }
+
+        public function setAuthentication($credentials) {
+            $this->api->setAuthentication($credentials);
+            return $this;
+        }
+
+        public function getVcsApi() {
+            return $this->api;
+        }
+
+        public function getUpdate() {
+            $update = parent::getUpdate();
+
+            if ( isset($update) && !empty($update->download_url) ) {
+                $update->download_url = $this->api->signDownloadUrl($update->download_url);
+            }
+
+            return $update;
+        }
+
+        public function onDisplayConfiguration($panel) {
+            parent::onDisplayConfiguration($panel);
+            $panel->row('Branch', $this->branch);
+            $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
+            $panel->row('API client', get_class($this->api));
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Vcs_PluginUpdateChecker') ):
+if (!class_exists('Puc_v4p4_Vcs_PluginUpdateChecker')):
 
 	class Puc_v4p4_Vcs_PluginUpdateChecker extends Puc_v4p4_Plugin_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
 		/**
@@ -34,7 +34,7 @@ 
 		public function requestInfo($unusedParameter = null) {
 			//We have to make several remote API requests to gather all the necessary info
 			//which can take a while on slow networks.
-			if ( function_exists('set_time_limit') ) {
+			if (function_exists('set_time_limit')) {
 				@set_time_limit(60);
 			}
 
@@ -49,16 +49,16 @@ 
 
 			//Pick a branch or tag.
 			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
+			if ($updateSource) {
 				$ref = $updateSource->name;
 				$info->version = $updateSource->version;
 				$info->last_updated = $updateSource->updated;
 				$info->download_url = $updateSource->downloadUrl;
 
-				if ( !empty($updateSource->changelog) ) {
+				if (!empty($updateSource->changelog)) {
 					$info->sections['changelog'] = $updateSource->changelog;
 				}
-				if ( isset($updateSource->downloadCount) ) {
+				if (isset($updateSource->downloadCount)) {
 					$info->downloaded = $updateSource->downloadCount;
 				}
 			} else {
@@ -80,29 +80,29 @@ 
 			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
 			$mainPluginFile = basename($this->pluginFile);
 			$remotePlugin = $api->getRemoteFile($mainPluginFile, $ref);
-			if ( !empty($remotePlugin) ) {
+			if (!empty($remotePlugin)) {
 				$remoteHeader = $this->getFileHeader($remotePlugin);
 				$this->setInfoFromHeader($remoteHeader, $info);
 			}
 
 			//Try parsing readme.txt. If it's formatted according to WordPress.org standards, it will contain
 			//a lot of useful information like the required/tested WP version, changelog, and so on.
-			if ( $this->readmeTxtExistsLocally() ) {
+			if ($this->readmeTxtExistsLocally()) {
 				$this->setInfoFromRemoteReadme($ref, $info);
 			}
 
 			//The changelog might be in a separate file.
-			if ( empty($info->sections['changelog']) ) {
+			if (empty($info->sections['changelog'])) {
 				$info->sections['changelog'] = $api->getRemoteChangelog($ref, dirname($this->getAbsolutePath()));
-				if ( empty($info->sections['changelog']) ) {
+				if (empty($info->sections['changelog'])) {
 					$info->sections['changelog'] = __('There is no changelog available.', 'plugin-update-checker');
 				}
 			}
 
-			if ( empty($info->last_updated) ) {
+			if (empty($info->last_updated)) {
 				//Fetch the latest commit that changed the tag or branch and use it as the "last_updated" date.
 				$latestCommitTime = $api->getLatestCommitTime($ref);
-				if ( $latestCommitTime !== null ) {
+				if ($latestCommitTime !== null) {
 					$info->last_updated = $latestCommitTime;
 				}
 			}
@@ -118,10 +118,10 @@ 
 		 */
 		protected function readmeTxtExistsLocally() {
 			$pluginDirectory = $this->getAbsoluteDirectoryPath();
-			if ( empty($pluginDirectory) || !is_dir($pluginDirectory) || ($pluginDirectory === '.') ) {
+			if (empty($pluginDirectory) || !is_dir($pluginDirectory) || ($pluginDirectory === '.')) {
 				return false;
 			}
-			return is_file($pluginDirectory . '/' . $this->api->getLocalReadmeName());
+			return is_file($pluginDirectory.'/'.$this->api->getLocalReadmeName());
 		}
 
 		/**
@@ -145,12 +145,12 @@ 
 				'Tested up to' => 'tested',
 			);
 			foreach ($headerToPropertyMap as $headerName => $property) {
-				if ( isset($fileHeader[$headerName]) && !empty($fileHeader[$headerName]) ) {
+				if (isset($fileHeader[$headerName]) && !empty($fileHeader[$headerName])) {
 					$pluginInfo->$property = $fileHeader[$headerName];
 				}
 			}
 
-			if ( !empty($fileHeader['Description']) ) {
+			if (!empty($fileHeader['Description'])) {
 				$pluginInfo->sections['description'] = $fileHeader['Description'];
 			}
 		}
@@ -163,21 +163,21 @@ 
 		 */
 		protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
 			$readme = $this->api->getRemoteReadme($ref);
-			if ( empty($readme) ) {
+			if (empty($readme)) {
 				return;
 			}
 
-			if ( isset($readme['sections']) ) {
+			if (isset($readme['sections'])) {
 				$pluginInfo->sections = array_merge($pluginInfo->sections, $readme['sections']);
 			}
-			if ( !empty($readme['tested_up_to']) ) {
+			if (!empty($readme['tested_up_to'])) {
 				$pluginInfo->tested = $readme['tested_up_to'];
 			}
-			if ( !empty($readme['requires_at_least']) ) {
+			if (!empty($readme['requires_at_least'])) {
 				$pluginInfo->requires = $readme['requires_at_least'];
 			}
 
-			if ( isset($readme['upgrade_notice'], $readme['upgrade_notice'][$pluginInfo->version]) ) {
+			if (isset($readme['upgrade_notice'], $readme['upgrade_notice'][$pluginInfo->version])) {
 				$pluginInfo->upgrade_notice = $readme['upgrade_notice'][$pluginInfo->version];
 			}
 		}
@@ -199,7 +199,7 @@ 
 		public function getUpdate() {
 			$update = parent::getUpdate();
 
-			if ( isset($update) && !empty($update->download_url) ) {
+			if (isset($update) && !empty($update->download_url)) {
 				$update->download_url = $this->api->signDownloadUrl($update->download_url);
 			}
 

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

Indentation +201 added lines, -201 removed lines

@@ -2,206 +2,206 @@
 
 if ( !class_exists('Puc_v4p4_StateStore', false) ):
 
-	class Puc_v4p4_StateStore {
-		/**
-		 * @var int Last update check timestamp.
-		 */
-		protected $lastCheck = 0;
-
-		/**
-		 * @var string Version number.
-		 */
-		protected $checkedVersion = '';
-
-		/**
-		 * @var Puc_v4p4_Update|null Cached update.
-		 */
-		protected $update = null;
-
-		/**
-		 * @var string Site option name.
-		 */
-		private $optionName = '';
-
-		/**
-		 * @var bool Whether we've already tried to load the state from the database.
-		 */
-		private $isLoaded = false;
-
-		public function __construct($optionName) {
-			$this->optionName = $optionName;
-		}
-
-		/**
-		 * Get time elapsed since the last update check.
-		 *
-		 * If there are no recorded update checks, this method returns a large arbitrary number
-		 * (i.e. time since the Unix epoch).
-		 *
-		 * @return int Elapsed time in seconds.
-		 */
-		public function timeSinceLastCheck() {
-			$this->lazyLoad();
-			return time() - $this->lastCheck;
-		}
-
-		/**
-		 * @return int
-		 */
-		public function getLastCheck() {
-			$this->lazyLoad();
-			return $this->lastCheck;
-		}
-
-		/**
-		 * Set the time of the last update check to the current timestamp.
-		 *
-		 * @return $this
-		 */
-		public function setLastCheckToNow() {
-			$this->lazyLoad();
-			$this->lastCheck = time();
-			return $this;
-		}
-
-		/**
-		 * @return null|Puc_v4p4_Update
-		 */
-		public function getUpdate() {
-			$this->lazyLoad();
-			return $this->update;
-		}
-
-		/**
-		 * @param Puc_v4p4_Update|null $update
-		 * @return $this
-		 */
-		public function setUpdate(Puc_v4p4_Update $update = null) {
-			$this->lazyLoad();
-			$this->update = $update;
-			return $this;
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getCheckedVersion() {
-			$this->lazyLoad();
-			return $this->checkedVersion;
-		}
-
-		/**
-		 * @param string $version
-		 * @return $this
-		 */
-		public function setCheckedVersion($version) {
-			$this->lazyLoad();
-			$this->checkedVersion = strval($version);
-			return $this;
-		}
-
-		/**
-		 * Get translation updates.
-		 *
-		 * @return array
-		 */
-		public function getTranslations() {
-			$this->lazyLoad();
-			if ( isset($this->update, $this->update->translations) ) {
-				return $this->update->translations;
-			}
-			return array();
-		}
-
-		/**
-		 * Set translation updates.
-		 *
-		 * @param array $translationUpdates
-		 */
-		public function setTranslations($translationUpdates) {
-			$this->lazyLoad();
-			if ( isset($this->update) ) {
-				$this->update->translations = $translationUpdates;
-				$this->save();
-			}
-		}
-
-		public function save() {
-			$state = new stdClass();
-
-			$state->lastCheck = $this->lastCheck;
-			$state->checkedVersion = $this->checkedVersion;
-
-			if ( isset($this->update)) {
-				$state->update = $this->update->toStdClass();
-
-				$updateClass = get_class($this->update);
-				$state->updateClass = $updateClass;
-				$prefix = $this->getLibPrefix();
-				if ( Puc_v4p4_Utils::startsWith($updateClass, $prefix) ) {
-					$state->updateBaseClass = substr($updateClass, strlen($prefix));
-				}
-			}
-
-			update_site_option($this->optionName, $state);
-			$this->isLoaded = true;
-		}
-
-		/**
-		 * @return $this
-		 */
-		public function lazyLoad() {
-			if ( !$this->isLoaded ) {
-				$this->load();
-			}
-			return $this;
-		}
-
-		protected function load() {
-			$this->isLoaded = true;
-
-			$state = get_site_option($this->optionName, null);
-
-			if ( !is_object($state) ) {
-				$this->lastCheck = 0;
-				$this->checkedVersion = '';
-				$this->update = null;
-				return;
-			}
-
-			$this->lastCheck = intval(Puc_v4p4_Utils::get($state, 'lastCheck', 0));
-			$this->checkedVersion = Puc_v4p4_Utils::get($state, 'checkedVersion', '');
-			$this->update = null;
-
-			if ( isset($state->update) ) {
-				//This mess is due to the fact that the want the update class from this version
-				//of the library, not the version that saved the update.
-
-				$updateClass = null;
-				if ( isset($state->updateBaseClass) ) {
-					$updateClass = $this->getLibPrefix() . $state->updateBaseClass;
-				} else if ( isset($state->updateClass) && class_exists($state->updateClass) ) {
-					$updateClass = $state->updateClass;
-				}
-
-				if ( $updateClass !== null ) {
-					$this->update = call_user_func(array($updateClass, 'fromObject'), $state->update);
-				}
-			}
-		}
-
-		public function delete() {
-			delete_site_option($this->optionName);
-
-			$this->lastCheck = 0;
-			$this->checkedVersion = '';
-			$this->update = null;
-		}
-
-		private function getLibPrefix() {
-			$parts = explode('_', __CLASS__, 3);
-			return $parts[0] . '_' . $parts[1] . '_';
-		}
-	}
+    class Puc_v4p4_StateStore {
+        /**
+         * @var int Last update check timestamp.
+         */
+        protected $lastCheck = 0;
+
+        /**
+         * @var string Version number.
+         */
+        protected $checkedVersion = '';
+
+        /**
+         * @var Puc_v4p4_Update|null Cached update.
+         */
+        protected $update = null;
+
+        /**
+         * @var string Site option name.
+         */
+        private $optionName = '';
+
+        /**
+         * @var bool Whether we've already tried to load the state from the database.
+         */
+        private $isLoaded = false;
+
+        public function __construct($optionName) {
+            $this->optionName = $optionName;
+        }
+
+        /**
+         * Get time elapsed since the last update check.
+         *
+         * If there are no recorded update checks, this method returns a large arbitrary number
+         * (i.e. time since the Unix epoch).
+         *
+         * @return int Elapsed time in seconds.
+         */
+        public function timeSinceLastCheck() {
+            $this->lazyLoad();
+            return time() - $this->lastCheck;
+        }
+
+        /**
+         * @return int
+         */
+        public function getLastCheck() {
+            $this->lazyLoad();
+            return $this->lastCheck;
+        }
+
+        /**
+         * Set the time of the last update check to the current timestamp.
+         *
+         * @return $this
+         */
+        public function setLastCheckToNow() {
+            $this->lazyLoad();
+            $this->lastCheck = time();
+            return $this;
+        }
+
+        /**
+         * @return null|Puc_v4p4_Update
+         */
+        public function getUpdate() {
+            $this->lazyLoad();
+            return $this->update;
+        }
+
+        /**
+         * @param Puc_v4p4_Update|null $update
+         * @return $this
+         */
+        public function setUpdate(Puc_v4p4_Update $update = null) {
+            $this->lazyLoad();
+            $this->update = $update;
+            return $this;
+        }
+
+        /**
+         * @return string
+         */
+        public function getCheckedVersion() {
+            $this->lazyLoad();
+            return $this->checkedVersion;
+        }
+
+        /**
+         * @param string $version
+         * @return $this
+         */
+        public function setCheckedVersion($version) {
+            $this->lazyLoad();
+            $this->checkedVersion = strval($version);
+            return $this;
+        }
+
+        /**
+         * Get translation updates.
+         *
+         * @return array
+         */
+        public function getTranslations() {
+            $this->lazyLoad();
+            if ( isset($this->update, $this->update->translations) ) {
+                return $this->update->translations;
+            }
+            return array();
+        }
+
+        /**
+         * Set translation updates.
+         *
+         * @param array $translationUpdates
+         */
+        public function setTranslations($translationUpdates) {
+            $this->lazyLoad();
+            if ( isset($this->update) ) {
+                $this->update->translations = $translationUpdates;
+                $this->save();
+            }
+        }
+
+        public function save() {
+            $state = new stdClass();
+
+            $state->lastCheck = $this->lastCheck;
+            $state->checkedVersion = $this->checkedVersion;
+
+            if ( isset($this->update)) {
+                $state->update = $this->update->toStdClass();
+
+                $updateClass = get_class($this->update);
+                $state->updateClass = $updateClass;
+                $prefix = $this->getLibPrefix();
+                if ( Puc_v4p4_Utils::startsWith($updateClass, $prefix) ) {
+                    $state->updateBaseClass = substr($updateClass, strlen($prefix));
+                }
+            }
+
+            update_site_option($this->optionName, $state);
+            $this->isLoaded = true;
+        }
+
+        /**
+         * @return $this
+         */
+        public function lazyLoad() {
+            if ( !$this->isLoaded ) {
+                $this->load();
+            }
+            return $this;
+        }
+
+        protected function load() {
+            $this->isLoaded = true;
+
+            $state = get_site_option($this->optionName, null);
+
+            if ( !is_object($state) ) {
+                $this->lastCheck = 0;
+                $this->checkedVersion = '';
+                $this->update = null;
+                return;
+            }
+
+            $this->lastCheck = intval(Puc_v4p4_Utils::get($state, 'lastCheck', 0));
+            $this->checkedVersion = Puc_v4p4_Utils::get($state, 'checkedVersion', '');
+            $this->update = null;
+
+            if ( isset($state->update) ) {
+                //This mess is due to the fact that the want the update class from this version
+                //of the library, not the version that saved the update.
+
+                $updateClass = null;
+                if ( isset($state->updateBaseClass) ) {
+                    $updateClass = $this->getLibPrefix() . $state->updateBaseClass;
+                } else if ( isset($state->updateClass) && class_exists($state->updateClass) ) {
+                    $updateClass = $state->updateClass;
+                }
+
+                if ( $updateClass !== null ) {
+                    $this->update = call_user_func(array($updateClass, 'fromObject'), $state->update);
+                }
+            }
+        }
+
+        public function delete() {
+            delete_site_option($this->optionName);
+
+            $this->lastCheck = 0;
+            $this->checkedVersion = '';
+            $this->update = null;
+        }
+
+        private function getLibPrefix() {
+            $parts = explode('_', __CLASS__, 3);
+            return $parts[0] . '_' . $parts[1] . '_';
+        }
+    }
 
 endif;

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_StateStore', false) ):
+if (!class_exists('Puc_v4p4_StateStore', false)):
 
 	class Puc_v4p4_StateStore {
 		/**
@@ -107,7 +107,7 @@ 
 		 */
 		public function getTranslations() {
 			$this->lazyLoad();
-			if ( isset($this->update, $this->update->translations) ) {
+			if (isset($this->update, $this->update->translations)) {
 				return $this->update->translations;
 			}
 			return array();
@@ -120,7 +120,7 @@ 
 		 */
 		public function setTranslations($translationUpdates) {
 			$this->lazyLoad();
-			if ( isset($this->update) ) {
+			if (isset($this->update)) {
 				$this->update->translations = $translationUpdates;
 				$this->save();
 			}
@@ -132,13 +132,13 @@ 
 			$state->lastCheck = $this->lastCheck;
 			$state->checkedVersion = $this->checkedVersion;
 
-			if ( isset($this->update)) {
+			if (isset($this->update)) {
 				$state->update = $this->update->toStdClass();
 
 				$updateClass = get_class($this->update);
 				$state->updateClass = $updateClass;
 				$prefix = $this->getLibPrefix();
-				if ( Puc_v4p4_Utils::startsWith($updateClass, $prefix) ) {
+				if (Puc_v4p4_Utils::startsWith($updateClass, $prefix)) {
 					$state->updateBaseClass = substr($updateClass, strlen($prefix));
 				}
 			}
@@ -151,7 +151,7 @@ 
 		 * @return $this
 		 */
 		public function lazyLoad() {
-			if ( !$this->isLoaded ) {
+			if (!$this->isLoaded) {
 				$this->load();
 			}
 			return $this;
@@ -162,7 +162,7 @@ 
 
 			$state = get_site_option($this->optionName, null);
 
-			if ( !is_object($state) ) {
+			if (!is_object($state)) {
 				$this->lastCheck = 0;
 				$this->checkedVersion = '';
 				$this->update = null;
@@ -173,18 +173,18 @@ 
 			$this->checkedVersion = Puc_v4p4_Utils::get($state, 'checkedVersion', '');
 			$this->update = null;
 
-			if ( isset($state->update) ) {
+			if (isset($state->update)) {
 				//This mess is due to the fact that the want the update class from this version
 				//of the library, not the version that saved the update.
 
 				$updateClass = null;
-				if ( isset($state->updateBaseClass) ) {
-					$updateClass = $this->getLibPrefix() . $state->updateBaseClass;
-				} else if ( isset($state->updateClass) && class_exists($state->updateClass) ) {
+				if (isset($state->updateBaseClass)) {
+					$updateClass = $this->getLibPrefix().$state->updateBaseClass;
+				} else if (isset($state->updateClass) && class_exists($state->updateClass)) {
 					$updateClass = $state->updateClass;
 				}
 
-				if ( $updateClass !== null ) {
+				if ($updateClass !== null) {
 					$this->update = call_user_func(array($updateClass, 'fromObject'), $state->update);
 				}
 			}
@@ -200,7 +200,7 @@ 
 
 		private function getLibPrefix() {
 			$parts = explode('_', __CLASS__, 3);
-			return $parts[0] . '_' . $parts[1] . '_';
+			return $parts[0].'_'.$parts[1].'_';
 		}
 	}
 

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

Indentation +71 added lines, -71 removed lines

@@ -2,87 +2,87 @@
 
 if ( !class_exists('Puc_v4p4_OAuthSignature', false) ):
 
-	/**
-	 * A basic signature generator for zero-legged OAuth 1.0.
-	 */
-	class Puc_v4p4_OAuthSignature {
-		private $consumerKey = '';
-		private $consumerSecret = '';
+    /**
+     * A basic signature generator for zero-legged OAuth 1.0.
+     */
+    class Puc_v4p4_OAuthSignature {
+        private $consumerKey = '';
+        private $consumerSecret = '';
 
-		public function __construct($consumerKey, $consumerSecret) {
-			$this->consumerKey = $consumerKey;
-			$this->consumerSecret = $consumerSecret;
-		}
+        public function __construct($consumerKey, $consumerSecret) {
+            $this->consumerKey = $consumerKey;
+            $this->consumerSecret = $consumerSecret;
+        }
 
-		/**
-		 * Sign a URL using OAuth 1.0.
-		 *
-		 * @param string $url The URL to be signed. It may contain query parameters.
-		 * @param string $method HTTP method such as "GET", "POST" and so on.
-		 * @return string The signed URL.
-		 */
-		public function sign($url, $method = 'GET') {
-			$parameters = array();
+        /**
+         * Sign a URL using OAuth 1.0.
+         *
+         * @param string $url The URL to be signed. It may contain query parameters.
+         * @param string $method HTTP method such as "GET", "POST" and so on.
+         * @return string The signed URL.
+         */
+        public function sign($url, $method = 'GET') {
+            $parameters = array();
 
-			//Parse query parameters.
-			$query = @parse_url($url, PHP_URL_QUERY);
-			if ( !empty($query) ) {
-				parse_str($query, $parsedParams);
-				if ( is_array($parameters) ) {
-					$parameters = $parsedParams;
-				}
-				//Remove the query string from the URL. We'll replace it later.
-				$url = substr($url, 0, strpos($url, '?'));
-			}
+            //Parse query parameters.
+            $query = @parse_url($url, PHP_URL_QUERY);
+            if ( !empty($query) ) {
+                parse_str($query, $parsedParams);
+                if ( is_array($parameters) ) {
+                    $parameters = $parsedParams;
+                }
+                //Remove the query string from the URL. We'll replace it later.
+                $url = substr($url, 0, strpos($url, '?'));
+            }
 
-			$parameters = array_merge(
-				$parameters,
-				array(
-					'oauth_consumer_key' => $this->consumerKey,
-					'oauth_nonce' => $this->nonce(),
-					'oauth_signature_method' => 'HMAC-SHA1',
-					'oauth_timestamp' => time(),
-					'oauth_version' => '1.0',
-				)
-			);
-			unset($parameters['oauth_signature']);
+            $parameters = array_merge(
+                $parameters,
+                array(
+                    'oauth_consumer_key' => $this->consumerKey,
+                    'oauth_nonce' => $this->nonce(),
+                    'oauth_signature_method' => 'HMAC-SHA1',
+                    'oauth_timestamp' => time(),
+                    'oauth_version' => '1.0',
+                )
+            );
+            unset($parameters['oauth_signature']);
 
-			//Parameters must be sorted alphabetically before signing.
-			ksort($parameters);
+            //Parameters must be sorted alphabetically before signing.
+            ksort($parameters);
 
-			//The most complicated part of the request - generating the signature.
-			//The string to sign contains the HTTP method, the URL path, and all of
-			//our query parameters. Everything is URL encoded. Then we concatenate
-			//them with ampersands into a single string to hash.
-			$encodedVerb = urlencode($method);
-			$encodedUrl = urlencode($url);
-			$encodedParams = urlencode(http_build_query($parameters, '', '&'));
+            //The most complicated part of the request - generating the signature.
+            //The string to sign contains the HTTP method, the URL path, and all of
+            //our query parameters. Everything is URL encoded. Then we concatenate
+            //them with ampersands into a single string to hash.
+            $encodedVerb = urlencode($method);
+            $encodedUrl = urlencode($url);
+            $encodedParams = urlencode(http_build_query($parameters, '', '&'));
 
-			$stringToSign = $encodedVerb . '&' . $encodedUrl . '&' . $encodedParams;
+            $stringToSign = $encodedVerb . '&' . $encodedUrl . '&' . $encodedParams;
 
-			//Since we only have one OAuth token (the consumer secret) we only have
-			//to use it as our HMAC key. However, we still have to append an & to it
-			//as if we were using it with additional tokens.
-			$secret = urlencode($this->consumerSecret) . '&';
+            //Since we only have one OAuth token (the consumer secret) we only have
+            //to use it as our HMAC key. However, we still have to append an & to it
+            //as if we were using it with additional tokens.
+            $secret = urlencode($this->consumerSecret) . '&';
 
-			//The signature is a hash of the consumer key and the base string. Note
-			//that we have to get the raw output from hash_hmac and base64 encode
-			//the binary data result.
-			$parameters['oauth_signature'] = base64_encode(hash_hmac('sha1', $stringToSign, $secret, true));
+            //The signature is a hash of the consumer key and the base string. Note
+            //that we have to get the raw output from hash_hmac and base64 encode
+            //the binary data result.
+            $parameters['oauth_signature'] = base64_encode(hash_hmac('sha1', $stringToSign, $secret, true));
 
-			return ($url . '?' . http_build_query($parameters));
-		}
+            return ($url . '?' . http_build_query($parameters));
+        }
 
-		/**
-		 * Generate a random nonce.
-		 *
-		 * @return string
-		 */
-		private function nonce() {
-			$mt = microtime();
-			$rand = mt_rand();
-			return md5($mt . '_' . $rand);
-		}
-	}
+        /**
+         * Generate a random nonce.
+         *
+         * @return string
+         */
+        private function nonce() {
+            $mt = microtime();
+            $rand = mt_rand();
+            return md5($mt . '_' . $rand);
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_OAuthSignature', false) ):
+if (!class_exists('Puc_v4p4_OAuthSignature', false)):
 
 	/**
 	 * A basic signature generator for zero-legged OAuth 1.0.
@@ -26,9 +26,9 @@ 
 
 			//Parse query parameters.
 			$query = @parse_url($url, PHP_URL_QUERY);
-			if ( !empty($query) ) {
+			if (!empty($query)) {
 				parse_str($query, $parsedParams);
-				if ( is_array($parameters) ) {
+				if (is_array($parameters)) {
 					$parameters = $parsedParams;
 				}
 				//Remove the query string from the URL. We'll replace it later.
@@ -58,19 +58,19 @@ 
 			$encodedUrl = urlencode($url);
 			$encodedParams = urlencode(http_build_query($parameters, '', '&'));
 
-			$stringToSign = $encodedVerb . '&' . $encodedUrl . '&' . $encodedParams;
+			$stringToSign = $encodedVerb.'&'.$encodedUrl.'&'.$encodedParams;
 
 			//Since we only have one OAuth token (the consumer secret) we only have
 			//to use it as our HMAC key. However, we still have to append an & to it
 			//as if we were using it with additional tokens.
-			$secret = urlencode($this->consumerSecret) . '&';
+			$secret = urlencode($this->consumerSecret).'&';
 
 			//The signature is a hash of the consumer key and the base string. Note
 			//that we have to get the raw output from hash_hmac and base64 encode
 			//the binary data result.
 			$parameters['oauth_signature'] = base64_encode(hash_hmac('sha1', $stringToSign, $secret, true));
 
-			return ($url . '?' . http_build_query($parameters));
+			return ($url.'?'.http_build_query($parameters));
 		}
 
 		/**
@@ -81,7 +81,7 @@ 
 		private function nonce() {
 			$mt = microtime();
 			$rand = mt_rand();
-			return md5($mt . '_' . $rand);
+			return md5($mt.'_'.$rand);
 		}
 	}
 

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

Indentation +127 added lines, -127 removed lines

@@ -1,132 +1,132 @@
 <?php
 if ( !class_exists('Puc_v4p4_Metadata', false) ):
 
-	/**
-	 * A base container for holding information about updates and plugin metadata.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	abstract class Puc_v4p4_Metadata {
-
-		/**
-		 * Create an instance of this class from a JSON document.
-		 *
-		 * @abstract
-		 * @param string $json
-		 * @return self
-		 */
-		public static function fromJson(/** @noinspection PhpUnusedParameterInspection */ $json) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
-		}
-
-		/**
-		 * @param string $json
-		 * @param self $target
-		 * @return bool
-		 */
-		protected static function createFromJson($json, $target) {
-			/** @var StdClass $apiResponse */
-			$apiResponse = json_decode($json);
-			if ( empty($apiResponse) || !is_object($apiResponse) ){
-				$errorMessage = "Failed to parse update metadata. Try validating your .json file with http://jsonlint.com/";
-				do_action('puc_api_error', new WP_Error('puc-invalid-json', $errorMessage));
-				trigger_error($errorMessage, E_USER_NOTICE);
-				return false;
-			}
-
-			$valid = $target->validateMetadata($apiResponse);
-			if ( is_wp_error($valid) ){
-				do_action('puc_api_error', $valid);
-				trigger_error($valid->get_error_message(), E_USER_NOTICE);
-				return false;
-			}
-
-			foreach(get_object_vars($apiResponse) as $key => $value){
-				$target->$key = $value;
-			}
-
-			return true;
-		}
-
-		/**
-		 * No validation by default! Subclasses should check that the required fields are present.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata(/** @noinspection PhpUnusedParameterInspection */ $apiResponse) {
-			return true;
-		}
-
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @abstract
-		 * @param StdClass|self $object The source object.
-		 * @return self The new copy.
-		 */
-		public static function fromObject(/** @noinspection PhpUnusedParameterInspection */ $object) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
-		}
-
-		/**
-		 * Create an instance of StdClass that can later be converted back to an
-		 * update or info container. Useful for serialization and caching, as it
-		 * avoids the "incomplete object" problem if the cached value is loaded
-		 * before this class.
-		 *
-		 * @return StdClass
-		 */
-		public function toStdClass() {
-			$object = new stdClass();
-			$this->copyFields($this, $object);
-			return $object;
-		}
-
-		/**
-		 * Transform the metadata into the format used by WordPress core.
-		 *
-		 * @return object
-		 */
-		abstract public function toWpFormat();
-
-		/**
-		 * Copy known fields from one object to another.
-		 *
-		 * @param StdClass|self $from
-		 * @param StdClass|self $to
-		 */
-		protected function copyFields($from, $to) {
-			$fields = $this->getFieldNames();
-
-			if ( property_exists($from, 'slug') && !empty($from->slug) ) {
-				//Let plugins add extra fields without having to create subclasses.
-				$fields = apply_filters($this->getPrefixedFilter('retain_fields') . '-' . $from->slug, $fields);
-			}
-
-			foreach ($fields as $field) {
-				if ( property_exists($from, $field) ) {
-					$to->$field = $from->$field;
-				}
-			}
-		}
-
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array();
-		}
-
-		/**
-		 * @param string $tag
-		 * @return string
-		 */
-		protected function getPrefixedFilter($tag) {
-			return 'puc_' . $tag;
-		}
-	}
+    /**
+     * A base container for holding information about updates and plugin metadata.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    abstract class Puc_v4p4_Metadata {
+
+        /**
+         * Create an instance of this class from a JSON document.
+         *
+         * @abstract
+         * @param string $json
+         * @return self
+         */
+        public static function fromJson(/** @noinspection PhpUnusedParameterInspection */ $json) {
+            throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
+        }
+
+        /**
+         * @param string $json
+         * @param self $target
+         * @return bool
+         */
+        protected static function createFromJson($json, $target) {
+            /** @var StdClass $apiResponse */
+            $apiResponse = json_decode($json);
+            if ( empty($apiResponse) || !is_object($apiResponse) ){
+                $errorMessage = "Failed to parse update metadata. Try validating your .json file with http://jsonlint.com/";
+                do_action('puc_api_error', new WP_Error('puc-invalid-json', $errorMessage));
+                trigger_error($errorMessage, E_USER_NOTICE);
+                return false;
+            }
+
+            $valid = $target->validateMetadata($apiResponse);
+            if ( is_wp_error($valid) ){
+                do_action('puc_api_error', $valid);
+                trigger_error($valid->get_error_message(), E_USER_NOTICE);
+                return false;
+            }
+
+            foreach(get_object_vars($apiResponse) as $key => $value){
+                $target->$key = $value;
+            }
+
+            return true;
+        }
+
+        /**
+         * No validation by default! Subclasses should check that the required fields are present.
+         *
+         * @param StdClass $apiResponse
+         * @return bool|WP_Error
+         */
+        protected function validateMetadata(/** @noinspection PhpUnusedParameterInspection */ $apiResponse) {
+            return true;
+        }
+
+        /**
+         * Create a new instance by copying the necessary fields from another object.
+         *
+         * @abstract
+         * @param StdClass|self $object The source object.
+         * @return self The new copy.
+         */
+        public static function fromObject(/** @noinspection PhpUnusedParameterInspection */ $object) {
+            throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
+        }
+
+        /**
+         * Create an instance of StdClass that can later be converted back to an
+         * update or info container. Useful for serialization and caching, as it
+         * avoids the "incomplete object" problem if the cached value is loaded
+         * before this class.
+         *
+         * @return StdClass
+         */
+        public function toStdClass() {
+            $object = new stdClass();
+            $this->copyFields($this, $object);
+            return $object;
+        }
+
+        /**
+         * Transform the metadata into the format used by WordPress core.
+         *
+         * @return object
+         */
+        abstract public function toWpFormat();
+
+        /**
+         * Copy known fields from one object to another.
+         *
+         * @param StdClass|self $from
+         * @param StdClass|self $to
+         */
+        protected function copyFields($from, $to) {
+            $fields = $this->getFieldNames();
+
+            if ( property_exists($from, 'slug') && !empty($from->slug) ) {
+                //Let plugins add extra fields without having to create subclasses.
+                $fields = apply_filters($this->getPrefixedFilter('retain_fields') . '-' . $from->slug, $fields);
+            }
+
+            foreach ($fields as $field) {
+                if ( property_exists($from, $field) ) {
+                    $to->$field = $from->$field;
+                }
+            }
+        }
+
+        /**
+         * @return string[]
+         */
+        protected function getFieldNames() {
+            return array();
+        }
+
+        /**
+         * @param string $tag
+         * @return string
+         */
+        protected function getPrefixedFilter($tag) {
+            return 'puc_' . $tag;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Metadata', false) ):
+if (!class_exists('Puc_v4p4_Metadata', false)):
 
 	/**
 	 * A base container for holding information about updates and plugin metadata.
@@ -18,7 +18,7 @@ 
 		 * @return self
 		 */
 		public static function fromJson(/** @noinspection PhpUnusedParameterInspection */ $json) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
+			throw new LogicException('The '.__METHOD__.' method must be implemented by subclasses');
 		}
 
 		/**
@@ -29,7 +29,7 @@ 
 		protected static function createFromJson($json, $target) {
 			/** @var StdClass $apiResponse */
 			$apiResponse = json_decode($json);
-			if ( empty($apiResponse) || !is_object($apiResponse) ){
+			if (empty($apiResponse) || !is_object($apiResponse)) {
 				$errorMessage = "Failed to parse update metadata. Try validating your .json file with http://jsonlint.com/";
 				do_action('puc_api_error', new WP_Error('puc-invalid-json', $errorMessage));
 				trigger_error($errorMessage, E_USER_NOTICE);
@@ -37,13 +37,13 @@ 
 			}
 
 			$valid = $target->validateMetadata($apiResponse);
-			if ( is_wp_error($valid) ){
+			if (is_wp_error($valid)) {
 				do_action('puc_api_error', $valid);
 				trigger_error($valid->get_error_message(), E_USER_NOTICE);
 				return false;
 			}
 
-			foreach(get_object_vars($apiResponse) as $key => $value){
+			foreach (get_object_vars($apiResponse) as $key => $value) {
 				$target->$key = $value;
 			}
 
@@ -68,7 +68,7 @@ 
 		 * @return self The new copy.
 		 */
 		public static function fromObject(/** @noinspection PhpUnusedParameterInspection */ $object) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
+			throw new LogicException('The '.__METHOD__.' method must be implemented by subclasses');
 		}
 
 		/**
@@ -101,13 +101,13 @@ 
 		protected function copyFields($from, $to) {
 			$fields = $this->getFieldNames();
 
-			if ( property_exists($from, 'slug') && !empty($from->slug) ) {
+			if (property_exists($from, 'slug') && !empty($from->slug)) {
 				//Let plugins add extra fields without having to create subclasses.
-				$fields = apply_filters($this->getPrefixedFilter('retain_fields') . '-' . $from->slug, $fields);
+				$fields = apply_filters($this->getPrefixedFilter('retain_fields').'-'.$from->slug, $fields);
 			}
 
 			foreach ($fields as $field) {
-				if ( property_exists($from, $field) ) {
+				if (property_exists($from, $field)) {
 					$to->$field = $from->$field;
 				}
 			}
@@ -125,7 +125,7 @@ 
 		 * @return string
 		 */
 		protected function getPrefixedFilter($tag) {
-			return 'puc_' . $tag;
+			return 'puc_'.$tag;
 		}
 	}
 

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

Indentation +25 added lines, -25 removed lines

@@ -1,34 +1,34 @@
 <?php
 if ( !class_exists('Puc_v4p4_Update', false) ):
 
-	/**
-	 * A simple container class for holding information about an available update.
-	 *
-	 * @author Janis Elsts
-	 * @access public
-	 */
-	abstract class Puc_v4p4_Update extends Puc_v4p4_Metadata {
-		public $slug;
-		public $version;
-		public $download_url;
-		public $translations = array();
+    /**
+     * A simple container class for holding information about an available update.
+     *
+     * @author Janis Elsts
+     * @access public
+     */
+    abstract class Puc_v4p4_Update extends Puc_v4p4_Metadata {
+        public $slug;
+        public $version;
+        public $download_url;
+        public $translations = array();
 
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array('slug', 'version', 'download_url', 'translations');
-		}
+        /**
+         * @return string[]
+         */
+        protected function getFieldNames() {
+            return array('slug', 'version', 'download_url', 'translations');
+        }
 
-		public function toWpFormat() {
-			$update = new stdClass();
+        public function toWpFormat() {
+            $update = new stdClass();
 
-			$update->slug = $this->slug;
-			$update->new_version = $this->version;
-			$update->package = $this->download_url;
+            $update->slug = $this->slug;
+            $update->new_version = $this->version;
+            $update->package = $this->download_url;
 
-			return $update;
-		}
-	}
+            return $update;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( !class_exists('Puc_v4p4_Update', false) ):
+if (!class_exists('Puc_v4p4_Update', false)):
 
 	/**
 	 * A simple container class for holding information about an available update.

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

Indentation +259 added lines, -259 removed lines

@@ -1,292 +1,292 @@
 <?php
 if ( !class_exists('Puc_v4p4_Factory', false) ):
 
-	/**
-	 * A factory that builds update checker instances.
-	 *
-	 * When multiple versions of the same class have been loaded (e.g. PluginUpdateChecker 4.0
-	 * and 4.1), this factory will always use the latest available minor version. Register class
-	 * versions by calling {@link PucFactory::addVersion()}.
-	 *
-	 * At the moment it can only build instances of the UpdateChecker class. Other classes are
-	 * intended mainly for internal use and refer directly to specific implementations.
-	 */
-	class Puc_v4p4_Factory {
-		protected static $classVersions = array();
-		protected static $sorted = false;
+    /**
+     * A factory that builds update checker instances.
+     *
+     * When multiple versions of the same class have been loaded (e.g. PluginUpdateChecker 4.0
+     * and 4.1), this factory will always use the latest available minor version. Register class
+     * versions by calling {@link PucFactory::addVersion()}.
+     *
+     * At the moment it can only build instances of the UpdateChecker class. Other classes are
+     * intended mainly for internal use and refer directly to specific implementations.
+     */
+    class Puc_v4p4_Factory {
+        protected static $classVersions = array();
+        protected static $sorted = false;
 
-		protected static $myMajorVersion = '';
-		protected static $latestCompatibleVersion = '';
+        protected static $myMajorVersion = '';
+        protected static $latestCompatibleVersion = '';
 
-		/**
-		 * Create a new instance of the update checker.
-		 *
-		 * This method automatically detects if you're using it for a plugin or a theme and chooses
-		 * the appropriate implementation for your update source (JSON file, GitHub, BitBucket, etc).
-		 *
-		 * @see Puc_v4p4_UpdateChecker::__construct
-		 *
-		 * @param string $metadataUrl The URL of the metadata file, a GitHub repository, or another supported update source.
-		 * @param string $fullPath Full path to the main plugin file or to the theme directory.
-		 * @param string $slug Custom slug. Defaults to the name of the main plugin file or the theme directory.
-		 * @param int $checkPeriod How often to check for updates (in hours).
-		 * @param string $optionName Where to store book-keeping info about update checks.
-		 * @param string $muPluginFile The plugin filename relative to the mu-plugins directory.
-		 * @return Puc_v4p4_Plugin_UpdateChecker|Puc_v4p4_Theme_UpdateChecker|Puc_v4p4_Vcs_BaseChecker
-		 */
-		public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
-			$fullPath = self::normalizePath($fullPath);
-			$id = null;
+        /**
+         * Create a new instance of the update checker.
+         *
+         * This method automatically detects if you're using it for a plugin or a theme and chooses
+         * the appropriate implementation for your update source (JSON file, GitHub, BitBucket, etc).
+         *
+         * @see Puc_v4p4_UpdateChecker::__construct
+         *
+         * @param string $metadataUrl The URL of the metadata file, a GitHub repository, or another supported update source.
+         * @param string $fullPath Full path to the main plugin file or to the theme directory.
+         * @param string $slug Custom slug. Defaults to the name of the main plugin file or the theme directory.
+         * @param int $checkPeriod How often to check for updates (in hours).
+         * @param string $optionName Where to store book-keeping info about update checks.
+         * @param string $muPluginFile The plugin filename relative to the mu-plugins directory.
+         * @return Puc_v4p4_Plugin_UpdateChecker|Puc_v4p4_Theme_UpdateChecker|Puc_v4p4_Vcs_BaseChecker
+         */
+        public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
+            $fullPath = self::normalizePath($fullPath);
+            $id = null;
 
-			//Plugin or theme?
-			$themeDirectory = self::getThemeDirectoryName($fullPath);
-			if ( self::isPluginFile($fullPath) ) {
-				$type = 'Plugin';
-				$id = $fullPath;
-			} else if ( $themeDirectory !== null ) {
-				$type = 'Theme';
-				$id = $themeDirectory;
-			} else {
-				throw new RuntimeException(sprintf(
-					'The update checker cannot determine if "%s" is a plugin or a theme. ' .
-					'This is a bug. Please contact the PUC developer.',
-					htmlentities($fullPath)
-				));
-			}
+            //Plugin or theme?
+            $themeDirectory = self::getThemeDirectoryName($fullPath);
+            if ( self::isPluginFile($fullPath) ) {
+                $type = 'Plugin';
+                $id = $fullPath;
+            } else if ( $themeDirectory !== null ) {
+                $type = 'Theme';
+                $id = $themeDirectory;
+            } else {
+                throw new RuntimeException(sprintf(
+                    'The update checker cannot determine if "%s" is a plugin or a theme. ' .
+                    'This is a bug. Please contact the PUC developer.',
+                    htmlentities($fullPath)
+                ));
+            }
 
-			//Which hosting service does the URL point to?
-			$service = self::getVcsService($metadataUrl);
+            //Which hosting service does the URL point to?
+            $service = self::getVcsService($metadataUrl);
 
-			$apiClass = null;
-			if ( empty($service) ) {
-				//The default is to get update information from a remote JSON file.
-				$checkerClass = $type . '_UpdateChecker';
-			} else {
-				//You can also use a VCS repository like GitHub.
-				$checkerClass = 'Vcs_' . $type . 'UpdateChecker';
-				$apiClass = $service . 'Api';
-			}
+            $apiClass = null;
+            if ( empty($service) ) {
+                //The default is to get update information from a remote JSON file.
+                $checkerClass = $type . '_UpdateChecker';
+            } else {
+                //You can also use a VCS repository like GitHub.
+                $checkerClass = 'Vcs_' . $type . 'UpdateChecker';
+                $apiClass = $service . 'Api';
+            }
 
-			$checkerClass = self::getCompatibleClassVersion($checkerClass);
-			if ( $checkerClass === null ) {
-				trigger_error(
-					sprintf(
-						'PUC %s does not support updates for %ss %s',
-						htmlentities(self::$latestCompatibleVersion),
-						strtolower($type),
-						$service ? ('hosted on ' . htmlentities($service)) : 'using JSON metadata'
-					),
-					E_USER_ERROR
-				);
-				return null;
-			}
+            $checkerClass = self::getCompatibleClassVersion($checkerClass);
+            if ( $checkerClass === null ) {
+                trigger_error(
+                    sprintf(
+                        'PUC %s does not support updates for %ss %s',
+                        htmlentities(self::$latestCompatibleVersion),
+                        strtolower($type),
+                        $service ? ('hosted on ' . htmlentities($service)) : 'using JSON metadata'
+                    ),
+                    E_USER_ERROR
+                );
+                return null;
+            }
       
-			if ( !isset($apiClass) ) {
-				//Plain old update checker.
-				return new $checkerClass($metadataUrl, $id, $slug, $checkPeriod, $optionName, $muPluginFile);
-			} else {
-				//VCS checker + an API client.
-				$apiClass = self::getCompatibleClassVersion($apiClass);
-				if ( $apiClass === null ) {
-					trigger_error(sprintf(
-						'PUC %s does not support %s',
-						htmlentities(self::$latestCompatibleVersion),
-						htmlentities($service)
-					), E_USER_ERROR);
-					return null;
-				}
+            if ( !isset($apiClass) ) {
+                //Plain old update checker.
+                return new $checkerClass($metadataUrl, $id, $slug, $checkPeriod, $optionName, $muPluginFile);
+            } else {
+                //VCS checker + an API client.
+                $apiClass = self::getCompatibleClassVersion($apiClass);
+                if ( $apiClass === null ) {
+                    trigger_error(sprintf(
+                        'PUC %s does not support %s',
+                        htmlentities(self::$latestCompatibleVersion),
+                        htmlentities($service)
+                    ), E_USER_ERROR);
+                    return null;
+                }
 
-				return new $checkerClass(
-					new $apiClass($metadataUrl),
-					$id,
-					$slug,
-					$checkPeriod,
-					$optionName,
-					$muPluginFile
-				);
-			}
-		}
+                return new $checkerClass(
+                    new $apiClass($metadataUrl),
+                    $id,
+                    $slug,
+                    $checkPeriod,
+                    $optionName,
+                    $muPluginFile
+                );
+            }
+        }
 
-		/**
-		 *
-		 * Normalize a filesystem path. Introduced in WP 3.9.
-		 * Copying here allows use of the class on earlier versions.
-		 * This version adapted from WP 4.8.2 (unchanged since 4.5.0)
-		 *
-		 * @param string $path Path to normalize.
-		 * @return string Normalized path.
-		 */
-		public static function normalizePath($path) {
-			if ( function_exists('wp_normalize_path') ) {
-				return wp_normalize_path($path);
-			}
-			$path = str_replace('\\', '/', $path);
-			$path = preg_replace('|(?<=.)/+|', '/', $path);
-			if ( substr($path, 1, 1) === ':' ) {
-				$path = ucfirst($path);
-			}
-			return $path;
-		}
+        /**
+         *
+         * Normalize a filesystem path. Introduced in WP 3.9.
+         * Copying here allows use of the class on earlier versions.
+         * This version adapted from WP 4.8.2 (unchanged since 4.5.0)
+         *
+         * @param string $path Path to normalize.
+         * @return string Normalized path.
+         */
+        public static function normalizePath($path) {
+            if ( function_exists('wp_normalize_path') ) {
+                return wp_normalize_path($path);
+            }
+            $path = str_replace('\\', '/', $path);
+            $path = preg_replace('|(?<=.)/+|', '/', $path);
+            if ( substr($path, 1, 1) === ':' ) {
+                $path = ucfirst($path);
+            }
+            return $path;
+        }
 		
-		/**
-		 * Check if the path points to a plugin file.
-		 *
-		 * @param string $absolutePath Normalized path.
-		 * @return bool
-		 */
-		protected static function isPluginFile($absolutePath) {
-			//Is the file inside the "plugins" or "mu-plugins" directory?
-			$pluginDir = self::normalizePath(WP_PLUGIN_DIR);
-			$muPluginDir = self::normalizePath(WPMU_PLUGIN_DIR);
-			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
-				return true;
-			}
+        /**
+         * Check if the path points to a plugin file.
+         *
+         * @param string $absolutePath Normalized path.
+         * @return bool
+         */
+        protected static function isPluginFile($absolutePath) {
+            //Is the file inside the "plugins" or "mu-plugins" directory?
+            $pluginDir = self::normalizePath(WP_PLUGIN_DIR);
+            $muPluginDir = self::normalizePath(WPMU_PLUGIN_DIR);
+            if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
+                return true;
+            }
 
-			//Is it a file at all? Caution: is_file() can fail if the parent dir. doesn't have the +x permission set.
-			if ( !is_file($absolutePath) ) {
-				return false;
-			}
+            //Is it a file at all? Caution: is_file() can fail if the parent dir. doesn't have the +x permission set.
+            if ( !is_file($absolutePath) ) {
+                return false;
+            }
 
-			//Does it have a valid plugin header?
-			//This is a last-ditch check for plugins symlinked from outside the WP root.
-			if ( function_exists('get_file_data') ) {
-				$headers = get_file_data($absolutePath, array('Name' => 'Plugin Name'), 'plugin');
-				return !empty($headers['Name']);
-			}
+            //Does it have a valid plugin header?
+            //This is a last-ditch check for plugins symlinked from outside the WP root.
+            if ( function_exists('get_file_data') ) {
+                $headers = get_file_data($absolutePath, array('Name' => 'Plugin Name'), 'plugin');
+                return !empty($headers['Name']);
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		/**
-		 * Get the name of the theme's directory from a full path to a file inside that directory.
-		 * E.g. "/abc/public_html/wp-content/themes/foo/whatever.php" => "foo".
-		 *
-		 * Note that subdirectories are currently not supported. For example,
-		 * "/xyz/wp-content/themes/my-theme/includes/whatever.php" => NULL.
-		 *
-		 * @param string $absolutePath Normalized path.
-		 * @return string|null Directory name, or NULL if the path doesn't point to a theme.
-		 */
-		protected static function getThemeDirectoryName($absolutePath) {
-			if ( is_file($absolutePath) ) {
-				$absolutePath = dirname($absolutePath);
-			}
+        /**
+         * Get the name of the theme's directory from a full path to a file inside that directory.
+         * E.g. "/abc/public_html/wp-content/themes/foo/whatever.php" => "foo".
+         *
+         * Note that subdirectories are currently not supported. For example,
+         * "/xyz/wp-content/themes/my-theme/includes/whatever.php" => NULL.
+         *
+         * @param string $absolutePath Normalized path.
+         * @return string|null Directory name, or NULL if the path doesn't point to a theme.
+         */
+        protected static function getThemeDirectoryName($absolutePath) {
+            if ( is_file($absolutePath) ) {
+                $absolutePath = dirname($absolutePath);
+            }
 
-			if ( file_exists($absolutePath . '/style.css') ) {
-				return basename($absolutePath);
-			}
-			return null;
-		}
+            if ( file_exists($absolutePath . '/style.css') ) {
+                return basename($absolutePath);
+            }
+            return null;
+        }
 
-		/**
-		 * Get the name of the hosting service that the URL points to.
-		 *
-		 * @param string $metadataUrl
-		 * @return string|null
-		 */
-		private static function getVcsService($metadataUrl) {
-			$service = null;
+        /**
+         * Get the name of the hosting service that the URL points to.
+         *
+         * @param string $metadataUrl
+         * @return string|null
+         */
+        private static function getVcsService($metadataUrl) {
+            $service = null;
 
-			//Which hosting service does the URL point to?
-			$host = @parse_url($metadataUrl, PHP_URL_HOST);
-			$path = @parse_url($metadataUrl, PHP_URL_PATH);
-			//Check if the path looks like "/user-name/repository".
-			$usernameRepoRegex = '@^/?([^/]+?)/([^/#?&]+?)/?$@';
-			if ( preg_match($usernameRepoRegex, $path) ) {
-				$knownServices = array(
-					'github.com' => 'GitHub',
-					'bitbucket.org' => 'BitBucket',
-					'gitlab.com' => 'GitLab',
-				);
-				if ( isset($knownServices[$host]) ) {
-					$service = $knownServices[$host];
-				}
-			}
+            //Which hosting service does the URL point to?
+            $host = @parse_url($metadataUrl, PHP_URL_HOST);
+            $path = @parse_url($metadataUrl, PHP_URL_PATH);
+            //Check if the path looks like "/user-name/repository".
+            $usernameRepoRegex = '@^/?([^/]+?)/([^/#?&]+?)/?$@';
+            if ( preg_match($usernameRepoRegex, $path) ) {
+                $knownServices = array(
+                    'github.com' => 'GitHub',
+                    'bitbucket.org' => 'BitBucket',
+                    'gitlab.com' => 'GitLab',
+                );
+                if ( isset($knownServices[$host]) ) {
+                    $service = $knownServices[$host];
+                }
+            }
       
-			return $service;
-		}
+            return $service;
+        }
 
-		/**
-		 * Get the latest version of the specified class that has the same major version number
-		 * as this factory class.
-		 *
-		 * @param string $class Partial class name.
-		 * @return string|null Full class name.
-		 */
-		protected static function getCompatibleClassVersion($class) {
-			if ( isset(self::$classVersions[$class][self::$latestCompatibleVersion]) ) {
-				return self::$classVersions[$class][self::$latestCompatibleVersion];
-			}
-			return null;
-		}
+        /**
+         * Get the latest version of the specified class that has the same major version number
+         * as this factory class.
+         *
+         * @param string $class Partial class name.
+         * @return string|null Full class name.
+         */
+        protected static function getCompatibleClassVersion($class) {
+            if ( isset(self::$classVersions[$class][self::$latestCompatibleVersion]) ) {
+                return self::$classVersions[$class][self::$latestCompatibleVersion];
+            }
+            return null;
+        }
 
-		/**
-		 * Get the specific class name for the latest available version of a class.
-		 *
-		 * @param string $class
-		 * @return null|string
-		 */
-		public static function getLatestClassVersion($class) {
-			if ( !self::$sorted ) {
-				self::sortVersions();
-			}
+        /**
+         * Get the specific class name for the latest available version of a class.
+         *
+         * @param string $class
+         * @return null|string
+         */
+        public static function getLatestClassVersion($class) {
+            if ( !self::$sorted ) {
+                self::sortVersions();
+            }
 
-			if ( isset(self::$classVersions[$class]) ) {
-				return reset(self::$classVersions[$class]);
-			} else {
-				return null;
-			}
-		}
+            if ( isset(self::$classVersions[$class]) ) {
+                return reset(self::$classVersions[$class]);
+            } else {
+                return null;
+            }
+        }
 
-		/**
-		 * Sort available class versions in descending order (i.e. newest first).
-		 */
-		protected static function sortVersions() {
-			foreach ( self::$classVersions as $class => $versions ) {
-				uksort($versions, array(__CLASS__, 'compareVersions'));
-				self::$classVersions[$class] = $versions;
-			}
-			self::$sorted = true;
-		}
+        /**
+         * Sort available class versions in descending order (i.e. newest first).
+         */
+        protected static function sortVersions() {
+            foreach ( self::$classVersions as $class => $versions ) {
+                uksort($versions, array(__CLASS__, 'compareVersions'));
+                self::$classVersions[$class] = $versions;
+            }
+            self::$sorted = true;
+        }
 
-		protected static function compareVersions($a, $b) {
-			return -version_compare($a, $b);
-		}
+        protected static function compareVersions($a, $b) {
+            return -version_compare($a, $b);
+        }
 
-		/**
-		 * Register a version of a class.
-		 *
-		 * @access private This method is only for internal use by the library.
-		 *
-		 * @param string $generalClass Class name without version numbers, e.g. 'PluginUpdateChecker'.
-		 * @param string $versionedClass Actual class name, e.g. 'PluginUpdateChecker_1_2'.
-		 * @param string $version Version number, e.g. '1.2'.
-		 */
-		public static function addVersion($generalClass, $versionedClass, $version) {
-			if ( empty(self::$myMajorVersion) ) {
-				$nameParts = explode('_', __CLASS__, 3);
-				self::$myMajorVersion = substr(ltrim($nameParts[1], 'v'), 0, 1);
-			}
+        /**
+         * Register a version of a class.
+         *
+         * @access private This method is only for internal use by the library.
+         *
+         * @param string $generalClass Class name without version numbers, e.g. 'PluginUpdateChecker'.
+         * @param string $versionedClass Actual class name, e.g. 'PluginUpdateChecker_1_2'.
+         * @param string $version Version number, e.g. '1.2'.
+         */
+        public static function addVersion($generalClass, $versionedClass, $version) {
+            if ( empty(self::$myMajorVersion) ) {
+                $nameParts = explode('_', __CLASS__, 3);
+                self::$myMajorVersion = substr(ltrim($nameParts[1], 'v'), 0, 1);
+            }
 
-			//Store the greatest version number that matches our major version.
-			$components = explode('.', $version);
-			if ( $components[0] === self::$myMajorVersion ) {
+            //Store the greatest version number that matches our major version.
+            $components = explode('.', $version);
+            if ( $components[0] === self::$myMajorVersion ) {
 
-				if (
-					empty(self::$latestCompatibleVersion)
-					|| version_compare($version, self::$latestCompatibleVersion, '>')
-				) {
-					self::$latestCompatibleVersion = $version;
-				}
+                if (
+                    empty(self::$latestCompatibleVersion)
+                    || version_compare($version, self::$latestCompatibleVersion, '>')
+                ) {
+                    self::$latestCompatibleVersion = $version;
+                }
 
-			}
+            }
 
-			if ( !isset(self::$classVersions[$generalClass]) ) {
-				self::$classVersions[$generalClass] = array();
-			}
-			self::$classVersions[$generalClass][$version] = $versionedClass;
-			self::$sorted = false;
-		}
-	}
+            if ( !isset(self::$classVersions[$generalClass]) ) {
+                self::$classVersions[$generalClass] = array();
+            }
+            self::$classVersions[$generalClass][$version] = $versionedClass;
+            self::$sorted = false;
+        }
+    }
 
 endif;

Spacing +28 added lines, -28 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Factory', false) ):
+if (!class_exists('Puc_v4p4_Factory', false)):
 
 	/**
 	 * A factory that builds update checker instances.
@@ -40,15 +40,15 @@ 
 
 			//Plugin or theme?
 			$themeDirectory = self::getThemeDirectoryName($fullPath);
-			if ( self::isPluginFile($fullPath) ) {
+			if (self::isPluginFile($fullPath)) {
 				$type = 'Plugin';
 				$id = $fullPath;
-			} else if ( $themeDirectory !== null ) {
+			} else if ($themeDirectory !== null) {
 				$type = 'Theme';
 				$id = $themeDirectory;
 			} else {
 				throw new RuntimeException(sprintf(
-					'The update checker cannot determine if "%s" is a plugin or a theme. ' .
+					'The update checker cannot determine if "%s" is a plugin or a theme. '.
 					'This is a bug. Please contact the PUC developer.',
 					htmlentities($fullPath)
 				));
@@ -58,36 +58,36 @@ 
 			$service = self::getVcsService($metadataUrl);
 
 			$apiClass = null;
-			if ( empty($service) ) {
+			if (empty($service)) {
 				//The default is to get update information from a remote JSON file.
-				$checkerClass = $type . '_UpdateChecker';
+				$checkerClass = $type.'_UpdateChecker';
 			} else {
 				//You can also use a VCS repository like GitHub.
-				$checkerClass = 'Vcs_' . $type . 'UpdateChecker';
-				$apiClass = $service . 'Api';
+				$checkerClass = 'Vcs_'.$type.'UpdateChecker';
+				$apiClass = $service.'Api';
 			}
 
 			$checkerClass = self::getCompatibleClassVersion($checkerClass);
-			if ( $checkerClass === null ) {
+			if ($checkerClass === null) {
 				trigger_error(
 					sprintf(
 						'PUC %s does not support updates for %ss %s',
 						htmlentities(self::$latestCompatibleVersion),
 						strtolower($type),
-						$service ? ('hosted on ' . htmlentities($service)) : 'using JSON metadata'
+						$service ? ('hosted on '.htmlentities($service)) : 'using JSON metadata'
 					),
 					E_USER_ERROR
 				);
 				return null;
 			}
       
-			if ( !isset($apiClass) ) {
+			if (!isset($apiClass)) {
 				//Plain old update checker.
 				return new $checkerClass($metadataUrl, $id, $slug, $checkPeriod, $optionName, $muPluginFile);
 			} else {
 				//VCS checker + an API client.
 				$apiClass = self::getCompatibleClassVersion($apiClass);
-				if ( $apiClass === null ) {
+				if ($apiClass === null) {
 					trigger_error(sprintf(
 						'PUC %s does not support %s',
 						htmlentities(self::$latestCompatibleVersion),
@@ -117,12 +117,12 @@ 
 		 * @return string Normalized path.
 		 */
 		public static function normalizePath($path) {
-			if ( function_exists('wp_normalize_path') ) {
+			if (function_exists('wp_normalize_path')) {
 				return wp_normalize_path($path);
 			}
 			$path = str_replace('\\', '/', $path);
 			$path = preg_replace('|(?<=.)/+|', '/', $path);
-			if ( substr($path, 1, 1) === ':' ) {
+			if (substr($path, 1, 1) === ':') {
 				$path = ucfirst($path);
 			}
 			return $path;
@@ -138,18 +138,18 @@ 
 			//Is the file inside the "plugins" or "mu-plugins" directory?
 			$pluginDir = self::normalizePath(WP_PLUGIN_DIR);
 			$muPluginDir = self::normalizePath(WPMU_PLUGIN_DIR);
-			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
+			if ((strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0)) {
 				return true;
 			}
 
 			//Is it a file at all? Caution: is_file() can fail if the parent dir. doesn't have the +x permission set.
-			if ( !is_file($absolutePath) ) {
+			if (!is_file($absolutePath)) {
 				return false;
 			}
 
 			//Does it have a valid plugin header?
 			//This is a last-ditch check for plugins symlinked from outside the WP root.
-			if ( function_exists('get_file_data') ) {
+			if (function_exists('get_file_data')) {
 				$headers = get_file_data($absolutePath, array('Name' => 'Plugin Name'), 'plugin');
 				return !empty($headers['Name']);
 			}
@@ -168,11 +168,11 @@ 
 		 * @return string|null Directory name, or NULL if the path doesn't point to a theme.
 		 */
 		protected static function getThemeDirectoryName($absolutePath) {
-			if ( is_file($absolutePath) ) {
+			if (is_file($absolutePath)) {
 				$absolutePath = dirname($absolutePath);
 			}
 
-			if ( file_exists($absolutePath . '/style.css') ) {
+			if (file_exists($absolutePath.'/style.css')) {
 				return basename($absolutePath);
 			}
 			return null;
@@ -192,13 +192,13 @@ 
 			$path = @parse_url($metadataUrl, PHP_URL_PATH);
 			//Check if the path looks like "/user-name/repository".
 			$usernameRepoRegex = '@^/?([^/]+?)/([^/#?&]+?)/?$@';
-			if ( preg_match($usernameRepoRegex, $path) ) {
+			if (preg_match($usernameRepoRegex, $path)) {
 				$knownServices = array(
 					'github.com' => 'GitHub',
 					'bitbucket.org' => 'BitBucket',
 					'gitlab.com' => 'GitLab',
 				);
-				if ( isset($knownServices[$host]) ) {
+				if (isset($knownServices[$host])) {
 					$service = $knownServices[$host];
 				}
 			}
@@ -214,7 +214,7 @@ 
 		 * @return string|null Full class name.
 		 */
 		protected static function getCompatibleClassVersion($class) {
-			if ( isset(self::$classVersions[$class][self::$latestCompatibleVersion]) ) {
+			if (isset(self::$classVersions[$class][self::$latestCompatibleVersion])) {
 				return self::$classVersions[$class][self::$latestCompatibleVersion];
 			}
 			return null;
@@ -227,11 +227,11 @@ 
 		 * @return null|string
 		 */
 		public static function getLatestClassVersion($class) {
-			if ( !self::$sorted ) {
+			if (!self::$sorted) {
 				self::sortVersions();
 			}
 
-			if ( isset(self::$classVersions[$class]) ) {
+			if (isset(self::$classVersions[$class])) {
 				return reset(self::$classVersions[$class]);
 			} else {
 				return null;
@@ -242,7 +242,7 @@ 
 		 * Sort available class versions in descending order (i.e. newest first).
 		 */
 		protected static function sortVersions() {
-			foreach ( self::$classVersions as $class => $versions ) {
+			foreach (self::$classVersions as $class => $versions) {
 				uksort($versions, array(__CLASS__, 'compareVersions'));
 				self::$classVersions[$class] = $versions;
 			}
@@ -263,14 +263,14 @@ 
 		 * @param string $version Version number, e.g. '1.2'.
 		 */
 		public static function addVersion($generalClass, $versionedClass, $version) {
-			if ( empty(self::$myMajorVersion) ) {
+			if (empty(self::$myMajorVersion)) {
 				$nameParts = explode('_', __CLASS__, 3);
 				self::$myMajorVersion = substr(ltrim($nameParts[1], 'v'), 0, 1);
 			}
 
 			//Store the greatest version number that matches our major version.
 			$components = explode('.', $version);
-			if ( $components[0] === self::$myMajorVersion ) {
+			if ($components[0] === self::$myMajorVersion) {
 
 				if (
 					empty(self::$latestCompatibleVersion)
@@ -281,7 +281,7 @@ 
 
 			}
 
-			if ( !isset(self::$classVersions[$generalClass]) ) {
+			if (!isset(self::$classVersions[$generalClass])) {
 				self::$classVersions[$generalClass] = array();
 			}
 			self::$classVersions[$generalClass][$version] = $versionedClass;

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

Indentation +43 added lines, -43 removed lines

@@ -2,48 +2,48 @@
 
 if ( !class_exists('Puc_v4p4_Autoloader', false) ):
 
-	class Puc_v4p4_Autoloader {
-		private $prefix = '';
-		private $rootDir = '';
-		private $libraryDir = '';
-
-		private $staticMap;
-
-		public function __construct() {
-			$this->rootDir = dirname(__FILE__) . '/';
-			$nameParts = explode('_', __CLASS__, 3);
-			$this->prefix = $nameParts[0] . '_' . $nameParts[1] . '_';
-
-			$this->libraryDir = realpath($this->rootDir . '../..') . '/';
-			$this->staticMap = array(
-				'PucReadmeParser' => 'vendor/readme-parser.php',
-				'Parsedown' => 'vendor/ParsedownLegacy.php',
-			);
-			if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
-				$this->staticMap['Parsedown'] = 'vendor/Parsedown.php';
-			}
-
-			spl_autoload_register(array($this, 'autoload'));
-		}
-
-		public function autoload($className) {
-			if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
-				/** @noinspection PhpIncludeInspection */
-				include ($this->libraryDir . $this->staticMap[$className]);
-				return;
-			}
-
-			if (strpos($className, $this->prefix) === 0) {
-				$path = substr($className, strlen($this->prefix));
-				$path = str_replace('_', '/', $path);
-				$path = $this->rootDir . $path . '.php';
-
-				if (file_exists($path)) {
-					/** @noinspection PhpIncludeInspection */
-					include $path;
-				}
-			}
-		}
-	}
+    class Puc_v4p4_Autoloader {
+        private $prefix = '';
+        private $rootDir = '';
+        private $libraryDir = '';
+
+        private $staticMap;
+
+        public function __construct() {
+            $this->rootDir = dirname(__FILE__) . '/';
+            $nameParts = explode('_', __CLASS__, 3);
+            $this->prefix = $nameParts[0] . '_' . $nameParts[1] . '_';
+
+            $this->libraryDir = realpath($this->rootDir . '../..') . '/';
+            $this->staticMap = array(
+                'PucReadmeParser' => 'vendor/readme-parser.php',
+                'Parsedown' => 'vendor/ParsedownLegacy.php',
+            );
+            if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
+                $this->staticMap['Parsedown'] = 'vendor/Parsedown.php';
+            }
+
+            spl_autoload_register(array($this, 'autoload'));
+        }
+
+        public function autoload($className) {
+            if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
+                /** @noinspection PhpIncludeInspection */
+                include ($this->libraryDir . $this->staticMap[$className]);
+                return;
+            }
+
+            if (strpos($className, $this->prefix) === 0) {
+                $path = substr($className, strlen($this->prefix));
+                $path = str_replace('_', '/', $path);
+                $path = $this->rootDir . $path . '.php';
+
+                if (file_exists($path)) {
+                    /** @noinspection PhpIncludeInspection */
+                    include $path;
+                }
+            }
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Autoloader', false) ):
+if (!class_exists('Puc_v4p4_Autoloader', false)):
 
 	class Puc_v4p4_Autoloader {
 		private $prefix = '';
@@ -10,16 +10,16 @@ 
 		private $staticMap;
 
 		public function __construct() {
-			$this->rootDir = dirname(__FILE__) . '/';
+			$this->rootDir = dirname(__FILE__).'/';
 			$nameParts = explode('_', __CLASS__, 3);
-			$this->prefix = $nameParts[0] . '_' . $nameParts[1] . '_';
+			$this->prefix = $nameParts[0].'_'.$nameParts[1].'_';
 
-			$this->libraryDir = realpath($this->rootDir . '../..') . '/';
+			$this->libraryDir = realpath($this->rootDir.'../..').'/';
 			$this->staticMap = array(
 				'PucReadmeParser' => 'vendor/readme-parser.php',
 				'Parsedown' => 'vendor/ParsedownLegacy.php',
 			);
-			if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
+			if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
 				$this->staticMap['Parsedown'] = 'vendor/Parsedown.php';
 			}
 
@@ -27,16 +27,16 @@ 
 		}
 
 		public function autoload($className) {
-			if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
+			if (isset($this->staticMap[$className]) && file_exists($this->libraryDir.$this->staticMap[$className])) {
 				/** @noinspection PhpIncludeInspection */
-				include ($this->libraryDir . $this->staticMap[$className]);
+				include ($this->libraryDir.$this->staticMap[$className]);
 				return;
 			}
 
 			if (strpos($className, $this->prefix) === 0) {
 				$path = substr($className, strlen($this->prefix));
 				$path = str_replace('_', '/', $path);
-				$path = $this->rootDir . $path . '.php';
+				$path = $this->rootDir.$path.'.php';
 
 				if (file_exists($path)) {
 					/** @noinspection PhpIncludeInspection */

classes/external/php/plugin-update-checker/Puc/v4p4/DebugBar/ThemePanel.php

Indentation +13 added lines, -13 removed lines

@@ -2,20 +2,20 @@
 
 if ( !class_exists('Puc_v4p4_DebugBar_ThemePanel', false) ):
 
-	class Puc_v4p4_DebugBar_ThemePanel extends Puc_v4p4_DebugBar_Panel {
-		/**
-		 * @var Puc_v4p4_Theme_UpdateChecker
-		 */
-		protected $updateChecker;
+    class Puc_v4p4_DebugBar_ThemePanel extends Puc_v4p4_DebugBar_Panel {
+        /**
+         * @var Puc_v4p4_Theme_UpdateChecker
+         */
+        protected $updateChecker;
 
-		protected function displayConfigHeader() {
-			$this->row('Theme directory', htmlentities($this->updateChecker->directoryName));
-			parent::displayConfigHeader();
-		}
+        protected function displayConfigHeader() {
+            $this->row('Theme directory', htmlentities($this->updateChecker->directoryName));
+            parent::displayConfigHeader();
+        }
 
-		protected function getUpdateFields() {
-			return array_merge(parent::getUpdateFields(), array('details_url'));
-		}
-	}
+        protected function getUpdateFields() {
+            return array_merge(parent::getUpdateFields(), array('details_url'));
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if ( !class_exists('Puc_v4p4_DebugBar_ThemePanel', false) ):
+if (!class_exists('Puc_v4p4_DebugBar_ThemePanel', false)):
 
 	class Puc_v4p4_DebugBar_ThemePanel extends Puc_v4p4_DebugBar_Panel {
 		/**