com web/php: prepare to show PHP 7 releases alongside PHP 5 releases: downloads.php include/gpg-keys.inc include/version.inc

Commit: eb71b89291d0be27a0c30e47e358ea2d5e3eba01 Author: Anatol Belski <ab@php.net> Sun, 29 Nov 2015 21:23:17 +0100 Parents: ba689b39b79fdf2c7d9fdc531f9de2d51f5dae07 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=eb71b89291d0be27a0c30e47e358ea2d5e3eba01 Log: prepare to show PHP 7 releases alongside PHP 5 releases Changed paths: M downloads.php M include/gpg-keys.inc M include/version.inc Diff: diff --git a/downloads.php b/downloads.php index e0c7f19..c304269 100644 --- a/downloads.php +++ b/downloads.php @@ -9,9 +9,6 @@ include_once $_SERVER['DOCUMENT_ROOT'] .. '/include/version.inc'; header_nocache(); $SHOW_COUNT = 4; -$MAJOR = 5; - -$releases = array_slice($RELEASES[$MAJOR], 0, $SHOW_COUNT); $SIDEBAR_DATA = ' <div class="panel"> @@ -43,7 +40,10 @@ site_header("Downloads", ) ); ?> -<a id="v5"></a> +<?php foreach ($RELEASES as $MAJOR => $major_releases): /* major releases loop start */ + $releases = array_slice($major_releases, 0, $SHOW_COUNT); +?> +<a id="v<?php echo $MAJOR; ?>"></a> <?php $i = 0; foreach ($releases as $v => $a): ?> <?php $mver = substr($v, 0, strrpos($v, '.')); ?> <?php $stable = $i++ === 0 ? "Current Stable" : "Old Stable"; ?> @@ -80,6 +80,7 @@ site_header("Downloads", <a href="#gpg-<?php echo $mver; ?>">GPG Keys for PHP <?php echo $mver; ?></a> </div> <?php endforeach; ?> +<?php endforeach; /* major releases loop end */ ?> <hr> <h2>GPG Keys</h2> @@ -88,7 +89,11 @@ The releases are tagged and signed in the <a href='git.php'>PHP Git Repository</ The following official GnuPG keys of the current PHP Release Manager can be used to verify the tags: </p> -<?php foreach ($RELEASES[$MAJOR] as $v => $_): ?> + +<?php foreach ($RELEASES as $MAJOR => $major_releases): /* major releases loop start */ + $releases = array_slice($major_releases, 0, $SHOW_COUNT); +?> +<?php foreach ($releases as $v => $_): ?> <?php $branch = implode('.', array_slice(explode('.', $v), 0, 2)); ?> <?php if (isset($GPG_KEYS[$branch])): ?> <h3 id="gpg-<?php echo $branch; ?>" class="content-header">PHP <?php echo $branch; ?></h3> @@ -99,6 +104,8 @@ to verify the tags: </div> <?php endif ?> <?php endforeach ?> +<?php endforeach; /* major releases loop end */ ?> + <p> <a href="gpg-keys.php"> A full list of GPG keys used for current and older releases is also diff --git a/include/gpg-keys.inc b/include/gpg-keys.inc index 24e892d...278922e 100644 --- a/include/gpg-keys.inc +++ b/include/gpg-keys.inc @@ -1,11 +1,11 @@ <?php // GPG keys used for signing releases. $GPG_KEYS = array( - "7.0" => <<< GPG -pub 2048R/22FE5A12 2015-07-07 [expires: 2020-07-05] +/*pub 2048R/22FE5A12 2015-07-07 [expires: 2020-07-05] Key fingerprint = D620 173D 6924 BA1C 2244 C7C4 1B6B 6676 22FE 5A12 uid Kalle Sommer Nielsen (PHP) &lt;kalle@php.net&gt; - +*/ + "7.0" => <<< GPG pub 2048R/9C0D5763 2015-06-09 [expires: 2024-06-06] Key fingerprint = 1A4E 8B72 77C4 2E53 DBA9 C7B9 BCAA 30EA 9C0D 5763 uid Anatol Belski &lt;ab@php.net&gt; diff --git a/include/version.inc b/include/version.inc index 0396724..bc4d0bc 100644 --- a/include/version.inc +++ b/include/version.inc @@ -16,6 +16,22 @@ * ), * ), * ); +/* PHP 7.0 Release */ +$PHP_7_0_RC = false; // Current RC version (e.g., '5.6.7RC1') or false +$PHP_7_0_RC_DATE = '29 Oct 2015'; + +$PHP_7_0_VERSION = "7.0.0"; +$PHP_7_0_DATE = "26 Nov 2015"; +$PHP_7_0_MD5 = array( + "tar.bz2" => "2e1332123a7e19d15ed2af2d1d6bd6fd", + "tar.gz" => "ae625e0cfcfdacea3e7a70a075e47155", + "tar.xz" => "96080ad8c5111446f58290cc6f18698c", +); +$PHP_7_0_SHA256 = array( + "tar.bz2" => "36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0", + "tar.gz" => "29baf7ffca644f7f8e86028c40275b9e460342bdf9562d45f8f0498899cb738d", + "tar.xz" => "c8edf6b05fd8a69ebd88d90c5c0975ee168502204622ad5cfcd550bc222632d9", +); /* PHP 5.6 Release */ $PHP_5_6_RC = false; // Current RC version (e.g., '5.6.7RC1') or false $PHP_5_6_RC_DATE = '15 Oct 2015'; @@ -50,6 +66,34 @@ $PHP_5_5_SHA256 = array( ); $RELEASES = array( + /*7 => array( + $PHP_7_0_VERSION => array( + "announcement" => true, + "source" => array( + array( + "filename" => "php-$PHP_7_0_VERSION.tar.bz2", + "name" => "PHP $PHP_7_0_VERSION (tar.bz2)", + "md5" => $PHP_7_0_MD5["tar.bz2"], + "sha256" => $PHP_7_0_SHA256["tar.bz2"], + "date" => $PHP_7_0_DATE, + ), + array( + "filename" => "php-$PHP_7_0_VERSION.tar.gz", + "name" => "PHP $PHP_7_0_VERSION (tar.gz)", + "md5" => $PHP_7_0_MD5["tar.gz"], + "sha256" => $PHP_7_0_SHA256["tar..gz"], + "date" => $PHP_7_0_DATE, + ), + array( + "filename" => "php-$PHP_7_0_VERSION.tar.xz", + "name" => "PHP $PHP_7_0_VERSION (tar.xz)", + "md5" => $PHP_7_0_MD5["tar.xz"], + "sha256" => $PHP_7_0_SHA256["tar.xz"], + "date" => $PHP_7_0_DATE, + ), + ), + ), + ),*/ 5 => array( $PHP_5_6_VERSION => array( "announcement" => true, @@ -110,3 +154,7 @@ $PHP_5_VERSION = $PHP_5_6_VERSION; // Some scripts require this set $PHP_5_DATE = $PHP_5_6_DATE; // Used by buumpRelease script $PHP_5_RC_DATE = $PHP_5_6_RC_DATE; // Used by master +$PHP_7_VERSION = $PHP_7_0_VERSION; // Some scripts require this set +$PHP_7_DATE = $PHP_7_0_DATE; // Used by buumpRelease script +$PHP_7_RC_DATE = $PHP_7_0_RC_DATE; // Used by master +