com web/php: Remove the eol.php special case for 5.3.29.: eol.php include/branches.inc include/version.inc

Commit: 295c61015cd6da71f09e1823fe28b6d1f27aac2a Author: Adam Harvey <aharvey@php.net> Tue, 30 Sep 2014 17:07:55 -0700 Parents: cd0315128dff5e65f9c8f44edf0631f9cd1ef19e Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=295c61015cd6da71f09e1823fe28b6d1f27aac2a Log: Remove the eol.php special case for 5.3.29. Instead, let's have an optional "eol" flag for releases in the $RELEASES array, and use that to drive eol.php. Changed paths: M eol.php M include/branches.inc M include/version.inc Diff: diff --git a/eol.php b/eol.php index 95255c4..8eca02b 100644 --- a/eol.php +++ b/eol.php @@ -38,7 +38,7 @@ site_header('Unsupported Branches'); </tr> </thead> <tbody> - <?php foreach (get_eol_branches(array('5.3.29')) as $major => $branches): + <?php foreach (get_eol_branches() as $major => $branches): foreach ($branches as $branch => $detail) { try { diff --git a/include/branches.inc b/include/branches.inc index 7aa6ed0..b524fcc 100644 --- a/include/branches.inc +++ b/include/branches.inc @@ -13,6 +13,7 @@ function version_number_to_branch($version) { * must be in $RELEASES _and_ must be the full version number, not the branch: * ie provide array('5.3.29'), not array('5.3'). */ function get_eol_branches($always_include = null) { + $always_include = $always_include ? $always_include : array(); $branches = array(); // Gather the last release on each branch into a convenient array. @@ -31,12 +32,19 @@ function get_eol_branches($always_include = null) { } /* Exclude releases from active branches, where active is defined as "in - * the $RELEASES array". */ + * the $RELEASES array and not explicitly marked as EOL there". */ foreach ($GLOBALS['RELEASES'] as $major => $releases) { foreach ($releases as $version => $release) { if ($branch = version_number_to_branch($version)) { - if (isset($branches[$major][$branch])) { - unset($branches[$major][$branch]); + if (empty($release['eol'])) { + /* This branch isn't EOL: remove it from our array. */ + if (isset($branches[$major][$branch])) { + unset($branches[$major][$branch]); + } + } else { + /* Add the release information to the EOL branches array, since it + * should be newer than the information we got from $OLDRELEASES. */ + $always_include[] = $version; } } } diff --git a/include/version.inc b/include/version.inc index 189f3f8..81944a0 100644 --- a/include/version.inc +++ b/include/version.inc @@ -10,7 +10,8 @@ * "date" => "this files release date", * "note" => "this file was updated 29feb due to broken phar files..", * ), - * "announcement" => "bool, release announcement exists in releases/?" + * "announcement" => "bool, release announcement exists in releases/?", + * "eol" => "bool, true to mark as EOL (affects bug tracker and eol.php)" * ), * ), * ); @@ -127,6 +128,7 @@ $RELEASES = array( ), $PHP_5_3_VERSION => array( "announcement" => true, + "eol" => true, "source" => array( array( "filename" => "php-$PHP_5_3_VERSION.tar.bz2",