com web/bugs: Fix extra indentation: include/php_versions.p hp

Commit: 6ca97626c02e8918960395d33a8344b73796035d Author: Peter Kokot <peterkokot@gmail.com> Thu, 25 Oct 2018 03:21:12 +0200 Parents: cd01d60c3f2ee72fd22f8f0e31da6b5cb7b13ae1 Branches: master Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=6ca97626c02e8918960395d33a8344b73796035d Log: Fix extra indentation Changed paths: M include/php_versions.php Diff: diff --git a/include/php_versions.php b/include/php_versions.php index 8860049..8aa07af 100644 --- a/include/php_versions.php +++ b/include/php_versions.php @@ -1,107 +1,106 @@ <?php - /* - The RC and dev versions are pulled from the https://qa.php.net/api.php - if you want to add a new version, add it there at include/release-qa.php - the result is cached for an hour in /tmp/<systemd>/tmp/versions.php - the versions are weighted by the following: - - major+minor version desc (7>5.4>5.3>master) - - between a minor version we order by the micro if available: first the qa releases: alpha/beta/rc, then the stable, then the Git versions(snaps, Git) - - Stable releases are pulled from https://php.net/releases/active.php - */ - - // Custom versions appended to the list - $custom_versions = [ - 'Next Major Version', - 'Next Minor Version', - 'Irrelevant' +/* +The RC and dev versions are pulled from the https://qa.php.net/api.php +if you want to add a new version, add it there at include/release-qa.php +the result is cached for an hour in /tmp/<systemd>/tmp/versions.php +the versions are weighted by the following: +- major+minor version desc (7>5.4>5.3>master) +- between a minor version we order by the micro if available: first the qa releases: alpha/beta/rc, then the stable, then the Git versions(snaps, Git) + +Stable releases are pulled from https://php.net/releases/active.php +*/ + +// Custom versions appended to the list +$custom_versions = [ + 'Next Major Version', + 'Next Minor Version', + 'Irrelevant' +]; + +if(!file_exists("/tmp/versions.php") || filemtime("/tmp/versions.php") < $_SERVER['REQUEST_TIME'] - 3600) { + $versions = buildVersions(); + $versions_data = var_export($versions, true); + file_put_contents("/tmp/versions.php", '<?php $versions = '.$versions_data.';'); +} else { + include "/tmp/versions.php"; +} + +$versions = array_merge($versions, $custom_versions); + +function buildVersions() { + $dev_versions = json_decode(file_get_contents('https://qa.php.net/api.php?type=qa-releases&format=json&only=dev_versions')); + + $versions = []; + + $date = date('Y-m-d'); + $default_versions = [ + "Git-{$date} (snap)", + "Git-{$date} (Git)", ]; - if(!file_exists("/tmp/versions.php") || filemtime("/tmp/versions.php") < $_SERVER['REQUEST_TIME'] - 3600) { - $versions = buildVersions(); - $versions_data = var_export($versions, true); - file_put_contents("/tmp/versions.php", '<?php $versions = '.$versions_data.';'); - } else { - include "/tmp/versions.php"; - } - - $versions = array_merge($versions, $custom_versions); - - function buildVersions() { - $dev_versions = json_decode(file_get_contents('https://qa.php.net/api.php?type=qa-releases&format=json&only=dev_versions')); - - $versions = []; - - $date = date('Y-m-d'); - $default_versions = [ - "Git-{$date} (snap)", - "Git-{$date} (Git)", - ]; + foreach ($dev_versions as $dev_version) { + $dev_version_parts = parseVersion($dev_version); - foreach ($dev_versions as $dev_version) { - $dev_version_parts = parseVersion($dev_version); - - // if it is a dev version, then add that branch, add the minor-1 version, if it's appropriate - if ($dev_version_parts['type'] == 'dev') { - if (!isset($versions[$dev_version_parts['major']][$dev_version_parts['minor']])) { - $versions[$dev_version_parts['major']][$dev_version_parts['minor']] = []; - } - } - // then it is a qa version (alpha|beta|rc) - else { - $versions[$dev_version_parts['major']][$dev_version_parts['minor']][$dev_version_parts['micro']] = $dev_version_parts; - ksort($versions[$dev_version_parts['major']][$dev_version_parts['minor']]); + // if it is a dev version, then add that branch, add the minor-1 version, if it's appropriate + if ($dev_version_parts['type'] == 'dev') { + if (!isset($versions[$dev_version_parts['major']][$dev_version_parts['minor']])) { + $versions[$dev_version_parts['major']][$dev_version_parts['minor']] = []; } } + // then it is a qa version (alpha|beta|rc) + else { + $versions[$dev_version_parts['major']][$dev_version_parts['minor']][$dev_version_parts['micro']] = $dev_version_parts; + ksort($versions[$dev_version_parts['major']][$dev_version_parts['minor']]); + } + } - $stable_releases = json_decode(file_get_contents('https://php.net/releases/active.php'), true); - foreach ($stable_releases as $major => $major_releases) { - foreach ($major_releases as $release) { - $version_parts = parseVersion($release['version']); - $versions[$version_parts['major']][$version_parts['minor']][$version_parts['micro']] = $version_parts; - ksort($versions[$version_parts['major']][$version_parts['minor']]); - } + $stable_releases = json_decode(file_get_contents('https://php.net/releases/active.php'), true); + foreach ($stable_releases as $major => $major_releases) { + foreach ($major_releases as $release) { + $version_parts = parseVersion($release['version']); + $versions[$version_parts['major']][$version_parts['minor']][$version_parts['micro']] = $version_parts; + ksort($versions[$version_parts['major']][$version_parts['minor']]); } + } - $flat_versions = []; + $flat_versions = []; - // add master to the end of the list - foreach ($default_versions as $default_version) { - $flat_versions[] = 'master-'.$default_version; - } + // add master to the end of the list + foreach ($default_versions as $default_version) { + $flat_versions[] = 'master-'.$default_version; + } - // add the fetched versions to the list - foreach ($versions as $major_number => $major) { - foreach ($major as $minor_number => $minor) { - // add the default versions to ever minor branch - foreach ($default_versions as $default_version) { - $flat_versions[] = $major_number.'.'.$minor_number.$default_version; - } - foreach ($minor as $micro_number => $micro) { - $flat_versions[] = $micro['original_version']; - } + // add the fetched versions to the list + foreach ($versions as $major_number => $major) { + foreach ($major as $minor_number => $minor) { + // add the default versions to ever minor branch + foreach ($default_versions as $default_version) { + $flat_versions[] = $major_number.'.'.$minor_number.$default_version; + } + foreach ($minor as $micro_number => $micro) { + $flat_versions[] = $micro['original_version']; } } - - // reverse the order, this makes it descending - $flat_versions = array_reverse($flat_versions); - - return $flat_versions; } - - function parseVersion($version){ - $version_parts = []; - $raw_parts = []; - preg_match('#(?P<major>\d+)\.(?P<minor>\d+).(?P<micro>\d+)[-]?(?P<type>RC|alpha|beta|dev)?(?P<number>[\d]?).*#ui', $version, $raw_parts); - $version_parts = [ - 'major' => $raw_parts['major'], - 'minor' => $raw_parts['minor'], - 'micro' => $raw_parts['micro'], - 'type' => strtolower($raw_parts['type']?$raw_parts['type']:'stable'), - 'number' => $raw_parts['number'], - 'original_version' => $version, - ]; - return $version_parts; - } + // reverse the order, this makes it descending + $flat_versions = array_reverse($flat_versions); + + return $flat_versions; +} + +function parseVersion($version){ + $version_parts = []; + $raw_parts = []; + preg_match('#(?P<major>\d+)\.(?P<minor>\d+).(?P<micro>\d+)[-]?(?P<type>RC|alpha|beta|dev)?(?P<number>[\d]?).*#ui', $version, $raw_parts); + $version_parts = [ + 'major' => $raw_parts['major'], + 'minor' => $raw_parts['minor'], + 'micro' => $raw_parts['micro'], + 'type' => strtolower($raw_parts['type']?$raw_parts['type']:'stable'), + 'number' => $raw_parts['number'], + 'original_version' => $version, + ]; + return $version_parts; +}