cvs: pearweb /include/roadmap info.php package-generator.php

dufuz		Fri May  2 22:07:51 2008 UTC

  Modified files:              
    /pearweb/include/roadmap	info.php package-generator.php 
  Log:
  Cosmetics
  
http://cvs.php.net/viewvc.cgi/pearweb/include/roadmap/info.php?r1=1.4&r2=1.5&diff_format=u
Index: pearweb/include/roadmap/info.php
diff -u pearweb/include/roadmap/info.php:1.4 pearweb/include/roadmap/info.php:1.5
--- pearweb/include/roadmap/info.php:1.4	Sat Aug  4 20:15:48 2007
+++ pearweb/include/roadmap/info.php	Fri May  2 22:07:51 2008
@@ -3,23 +3,21 @@
 {
     function roadmapExists($package)
     {
-        $ret = $GLOBALS['dbh']->getOne('
-            SELECT id
-            FROM bugdb_roadmap WHERE
-            package=?
-        ',array($package));
+        $sql = 'SELECT id FROM bugdb_roadmap WHERE package = ?';
+        $ret = $GLOBALS['dbh']->getOne($sql, array($package));
         return (boolean)$ret;
     }
 
     function nextRelease($package)
     {
-        $ret = $GLOBALS['dbh']->getAll('
+        $sql = '
             SELECT roadmap_version,releasedate
             FROM bugdb_roadmap WHERE
-            package=? AND
+            package = ? AND
             releasedate <> "1976-09-02 17:15:30"
-            ORDER BY releasedate ASC
-        ',array($package));
+            ORDER BY releasedate ASC';
+
+        $ret = $GLOBALS['dbh']->getAll($sql, array($package));
         if (!$ret) {
             return false;
         }
@@ -27,7 +25,10 @@
         include_once 'pear-database-package.php';
         $releases = array_keys(package::info($package, 'releases'));
         foreach ($ret as $roadmap) {
-            if (in_array($roadmap[0], $releases)) continue;
+            if (in_array($roadmap[0], $releases)) {
+                continue;
+            }
+
             return $roadmap;
         }
     }
@@ -37,20 +38,22 @@
         if (!$next) {
             list($next,) = Roadmap_Info::nextRelease($package);
         }
-        $count = $GLOBALS['dbh']->getAssoc('
-            SELECT bugdb.status,COUNT(bugdb.id) FROM bugdb_roadmap_link,
-                bugdb, bugdb_roadmap
+
+        $sql = '
+            SELECT bugdb.status, COUNT(bugdb.id)
+            FROM bugdb_roadmap_link b_r_l, bugdb_roadmap b_r, bugdb
             WHERE
-                bugdb_roadmap.roadmap_version=? AND
-                bugdb_roadmap.package=? AND
-                bugdb_roadmap_link.roadmap_id=bugdb_roadmap.id AND
-                bugdb.id=bugdb_roadmap_link.id
-            GROUP BY bugdb.status
-        ', false, array($next, $package));
-        $total = 0;
-        $closed = 0;
+                b_r.roadmap_version = ? AND
+                b_r.package = ? AND
+                b_r_l.roadmap_id = b_r.id AND
+                bugdb.id = b_r_l.id
+            GROUP BY bugdb.status';
+
+        $count = $GLOBALS['dbh']->getAssoc($sql, false, array($next, $package));
+        $total = $closed = 0;
+        $s = array('Closed', 'Duplicate', 'Bogus', "Won't Fix");
         foreach ($count as $status => $amount) {
-            if ($status == 'Closed') {
+            if (in_array($status, $s)) {
                 $closed = $amount;
             }
             $total += $amount;
http://cvs.php.net/viewvc.cgi/pearweb/include/roadmap/package-generator.php?r1=1.10&r2=1.11&diff_format=u
Index: pearweb/include/roadmap/package-generator.php
diff -u pearweb/include/roadmap/package-generator.php:1.10 pearweb/include/roadmap/package-generator.php:1.11
--- pearweb/include/roadmap/package-generator.php:1.10	Sat Jun 23 22:43:48 2007
+++ pearweb/include/roadmap/package-generator.php	Fri May  2 22:07:51 2008
@@ -10,7 +10,7 @@
     /**
      * @param string $package Package for this roadmap
      */
-    function Roadmap_Package_Generator($package)
+    function __construct($package)
     {
         $this->_dbh = &$GLOBALS['dbh'];
         $this->_package = $package;
@@ -24,15 +24,16 @@
      */
     function getRoadmapPackage($version)
     {
-        $packagexml = $this->_dbh->getOne('
+        $sql = '
             SELECT packagexml
             FROM packages p, releases r, files f
             WHERE
-                p.name=? AND
+                p.name = ? AND
                 r.package = p.id AND
                 f.release = r.id
-            ORDER BY r.releasedate DESC
-        ', array($this->_package));
+            ORDER BY r.releasedate DESC';
+
+        $packagexml = $this->_dbh->getOne($sql, array($this->_package));
         if ($packagexml) {
             $pf = $this->getPackageXmlV2($packagexml);
             $oldchangelog = $pf->getChangelog();
@@ -157,6 +158,7 @@
                 'php license' => 'http://www.php.net/license',
                 'lgpl' => 'http://www.gnu.org/copyleft/lesser.html',
                 'bsd' => 'http://www.opensource.org/licenses/bsd-license.php',
+                'bsd license' => 'http://www.opensource.org/licenses/bsd-license.php',
                 'bsd style' => 'http://www.opensource.org/licenses/bsd-license.php',
                 'bsd-style' => 'http://www.opensource.org/licenses/bsd-license.php',
                 'mit' => 'http://www.opensource.org/licenses/mit-license.php',
@@ -172,7 +174,7 @@
         $pf->clearContents();
         $pf->addFile('/', 'ADDFILESHERE', array('name' => 'ADDFILESHERE', 'role' => 'php'));
         $pf->setPhpDep('4.3.0');
-        $pf->setPearinstallerDep('1.4.3');
+        $pf->setPearinstallerDep('1.5.4');
         $pf->addRelease();
         return $pf;
     }
@@ -231,19 +233,21 @@
      */
     function getReleaseNotes($version)
     {
-        $bugs = $this->_dbh->getAll('
+        $sql = '
             SELECT b.sdesc, b.assign, b.bug_type, b.id
             FROM
                 bugdb b, bugdb_roadmap_link l, bugdb_roadmap r
             WHERE
-                r.package=? AND
-                r.roadmap_version=? AND
+                r.package = ? AND
+                r.roadmap_version = ? AND
                 l.roadmap_id = r.id AND
                 b.id = l.id AND
-                b.status="Closed"
-            ORDER BY b.bug_type, b.id
-        ', array($this->_package, $version), DB_FETCHMODE_ASSOC);
-        $notes = '';
+                b.status = ?
+            ORDER BY b.bug_type, b.id';
+
+        $values = array($this->_package, $version, 'Closed');
+        $bugs   = $this->_dbh->getAll($sql , $values, DB_FETCHMODE_ASSOC);
+        $notes  = '';
         foreach ($bugs as $bug) {
             $fix = in_array($bug['bug_type'], array('Bug', 'Documentation Bug')) ?
                 ' * Fix Bug #' :