Bug#692358: Review php5-midgard2 package
>>> Also, you should include the debdiff between both versions in this bug
>>> report.
Attached dsc files diff.
Piotras
diff -Nru php5-midgard2-10.05.6/debian/changelog php5-midgard2-10.05.7/debian/changelog
--- php5-midgard2-10.05.6/debian/changelog 2012-03-09 07:56:53.000000000 +0100
+++ php5-midgard2-10.05.7/debian/changelog 2012-06-16 00:06:45.000000000 +0200
@@ -1,6 +1,13 @@
+php5-midgard2 (10.05.7-1) unstable; urgency=low
+
+ * New upstream
+ * Use php5en(dis)mod in prerm and postinst. Closes: #667785
+
+ -- Piotr Pokora <piotrek.pokora@gmail.com> Wed, 13 Jun 2012 21:34:29 +0200
+
php5-midgard2 (10.05.6-1) unstable; urgency=low
- * New upstream. Closes: #656484
+ * New upstream. Closes #656484
-- Piotr Pokora <piotrek.pokora@gmail.com> Tue, 06 Mar 2012 20:00:22 +0100
diff -Nru php5-midgard2-10.05.6/debian/control php5-midgard2-10.05.7/debian/control
--- php5-midgard2-10.05.6/debian/control 2012-03-06 20:04:12.000000000 +0100
+++ php5-midgard2-10.05.7/debian/control 2012-06-16 00:06:45.000000000 +0200
@@ -5,11 +5,11 @@
Uploaders:
Standards-Version: 3.9.3
Homepage: http://www.midgard-project.org
-Build-Depends: debhelper (>=7.0), php5-dev, libmidgard2-dev(>=10.05.6)
+Build-Depends: debhelper (>=7.0), php5-dev, libmidgard2-dev(>=10.05.7)
Package: php5-midgard2
Architecture: any
-Depends: php5-cli (>=5.2.0) | php5-cgi (>=5.2.0), midgard2-common (>=10.05.6), ucf, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Depends: php5-cli (>=5.2.0) | php5-cgi (>=5.2.0), midgard2-common (>=10.05.7), ucf, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
Suggests: libapache2-mod-php5 (>=5.2.0) | lighttpd | nginx, php5-memcache
Replaces:
Conflicts:
diff -Nru php5-midgard2-10.05.6/debian/php5-midgard2.postinst php5-midgard2-10.05.7/debian/php5-midgard2.postinst
--- php5-midgard2-10.05.6/debian/php5-midgard2.postinst 2012-03-06 20:00:11.000000000 +0100
+++ php5-midgard2-10.05.7/debian/php5-midgard2.postinst 2012-06-16 00:06:45.000000000 +0200
@@ -1,11 +1,16 @@
#!/bin/sh
+set -e
-#DEBHELPER#
+[ -x /usr/bin/dpkg-maintscript-helper ] && \
+ dpkg-maintscript-helper rm_conffile /etc/php5/conf.d/midgard2.ini 10.05.6~ -- "$@"
-set -e
+#DEBHELPER#
if test "$1" = "configure"; then
- ucf /usr/share/doc/php5-midgard2/midgard2.ini /etc/php5/conf.d/midgard2.ini
+ ucf /usr/share/doc/php5-midgard2/midgard2.ini /etc/php5/mods-available/midgard2.ini
+ php5enmod midgard2
fi
+#DEBHELPER#
+
exit 0
diff -Nru php5-midgard2-10.05.6/debian/php5-midgard2.postrm php5-midgard2-10.05.7/debian/php5-midgard2.postrm
--- php5-midgard2-10.05.6/debian/php5-midgard2.postrm 2012-03-06 20:00:11.000000000 +0100
+++ php5-midgard2-10.05.7/debian/php5-midgard2.postrm 2012-06-16 00:06:45.000000000 +0200
@@ -1,14 +1,20 @@
#!/bin/sh
-
set -e
+[ -x /usr/bin/dpkg-maintscript-helper ] && \
+ dpkg-maintscript-helper rm_conffile /etc/php5/conf.d/midgard2.ini 10.05.6~ -- "$@"
+
#DEBHELPER#
if test "$1" = "purge"; then
if which ucf >/dev/null 2>&1; then
- ucf --purge /etc/php5/conf.d/midgard2.ini
+ ucf --purge /etc/php5/mods-available/midgard2.ini
fi
- rm -f /etc/php5/conf.d/midgard2.ini
+ rm -f /etc/php5/mods-available/midgard2.ini
+fi
+
+if test "$1" = "remove"; then
+ php5dismod midgard2
fi
exit 0
diff -Nru php5-midgard2-10.05.6/docs/midgard_documentor.php php5-midgard2-10.05.7/docs/midgard_documentor.php
--- php5-midgard2-10.05.6/docs/midgard_documentor.php 2012-03-06 12:08:19.000000000 +0100
+++ php5-midgard2-10.05.7/docs/midgard_documentor.php 2012-03-14 11:46:56.000000000 +0100
@@ -113,6 +113,44 @@
return $classes;
}
+ public static function get_midgard_abstract_classes()
+ {
+ $classes = array();
+
+ $all_classes = self::get_classes();
+
+ if (empty($all_classes))
+ return $classes;
+
+ foreach ($all_classes as $refclass)
+ {
+ if ($refclass->isAbstract() === false) {
+ continue;
+ }
+ $classes[] = $refclass;
+ }
+ return $classes;
+ }
+
+ public static function get_midgard_interfaces()
+ {
+ $classes = array();
+
+ $all_classes = self::get_classes();
+
+ if (empty($all_classes))
+ return $classes;
+
+ foreach ($all_classes as $refclass)
+ {
+ if ($refclass->isInterface() === false) {
+ continue;
+ }
+ $classes[] = $refclass;
+ }
+ return $classes;
+ }
+
public function create_footer()
{
@@ -133,6 +171,22 @@
{
$this->add_to_index($refclass);
}
+
+ $this->index_buffer .= "<h2> Abstract classes </h2>";
+ $midgard_abstract_classes = self::get_midgard_abstract_classes();
+
+ foreach ($midgard_abstract_classes as $refclass)
+ {
+ $this->add_to_index($refclass);
+ }
+
+ $this->index_buffer .= "<h2> Interfaces </h2>";
+ $midgard_interfaces = self::get_midgard_interfaces();
+
+ foreach ($midgard_interfaces as $refclass)
+ {
+ $this->add_to_index($refclass);
+ }
$this->index_buffer .= "<h2> Database access classes </h2>";
$midgard_dbobject_classes = self::get_midgard_dbobject_classes();
diff -Nru php5-midgard2-10.05.6/phpunit/tests/010_Query/SqlQuerySelectDataConstraintGroupTest.php php5-midgard2-10.05.7/phpunit/tests/010_Query/SqlQuerySelectDataConstraintGroupTest.php
--- php5-midgard2-10.05.6/phpunit/tests/010_Query/SqlQuerySelectDataConstraintGroupTest.php 1970-01-01 01:00:00.000000000 +0100
+++ php5-midgard2-10.05.7/phpunit/tests/010_Query/SqlQuerySelectDataConstraintGroupTest.php 2012-03-14 11:46:56.000000000 +0100
@@ -0,0 +1,69 @@
+<?php
+
+class SqlQuerySelectDataConstraintGroupTest extends MidgardTest
+{
+ protected $select = null;
+ protected $mgd = null;
+
+ public function setUp()
+ {
+ $this->mgd = midgard_connection::get_instance();
+
+ if ($this->select === null) {
+ $this->select = new MidgardSqlQuerySelectData(midgard_connection::get_instance());
+ }
+ }
+
+ public function tearDown()
+ {
+ unset($this->select);
+ }
+
+ public function testInheritance()
+ {
+ $cg = new MidgardQueryConstraintGroup("AND");
+ $this->assertInstanceOf("MidgardQueryConstraintSimple", $cg);
+ }
+
+ public function testQueryConstraintGroup()
+ {
+ $storage = new MidgardQueryStorage("midgard_snippet");
+ $columnA = new MidgardSqlQueryColumn(
+ new MidgardQueryProperty("name", $storage),
+ "tbl1",
+ "a"
+ );
+
+ $columnB = new MidgardSqlQueryColumn(
+ new MidgardQueryProperty("code", $storage),
+ "tbl1",
+ "b"
+ );
+
+ $this->select->add_column($columnA);
+ $this->select->add_column($columnB);
+
+ $cg = new MidgardQueryConstraintGroup("AND");
+
+ $cg->add_constraint(
+ new MidgardSqlQueryConstraint(
+ $columnA,
+ "<>",
+ new MidgardQueryValue("")
+ )
+ );
+
+ $cg->add_constraint(
+ new MidgardSqlQueryConstraint(
+ $columnB,
+ "<>",
+ new MidgardQueryValue("")
+ )
+ );
+
+ $this->select->set_constraint($cg);
+ $this->select->execute();
+ }
+}
+
+?>
Reply to: