[pkg-kolab] r1523 - in php-kolab-filter/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Thu Sep 23 09:43:51 UTC 2010
Author: sathieu
Date: 2010-09-23 09:43:50 +0000 (Thu, 23 Sep 2010)
New Revision: 1523
Modified:
php-kolab-filter/trunk/debian/changelog
php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff
Log:
More removal of E_DEPRECATED errors. All &new Class() are removed now.
Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog 2010-09-17 07:07:48 UTC (rev 1522)
+++ php-kolab-filter/trunk/debian/changelog 2010-09-23 09:43:50 UTC (rev 1523)
@@ -1,3 +1,9 @@
+php-kolab-filter (0.1.9-4) unstable; urgency=low
+
+ * More removal of E_DEPRECATED errors. All &new Class() are removed now.
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 20 Sep 2010 08:46:03 +0200
+
php-kolab-filter (0.1.9-3) unstable; urgency=medium
* Urgency medium for #594541
Modified: php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff 2010-09-17 07:07:48 UTC (rev 1522)
+++ php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff 2010-09-23 09:43:50 UTC (rev 1523)
@@ -10,7 +10,7 @@
Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php
===================================================================
--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php 1970-01-01 10:13:08.000000000 +0100
-+++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php 2010-09-10 09:27:52.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php 2010-09-20 08:42:46.000000000 +0200
@@ -143,7 +143,7 @@
$this->_fqhostname, $this->_sender,
$resource, $this->_tmpfile), __FILE__, __LINE__,
@@ -23,7 +23,7 @@
Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php
===================================================================
--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php 1970-01-01 10:13:08.000000000 +0100
-+++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php 2010-09-10 09:27:52.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php 2010-09-20 08:45:33.000000000 +0200
@@ -103,10 +103,10 @@
*/
function _fatal($errno, $errmsg, $filename, $linenum, $vars)
@@ -31,7 +31,7 @@
- /* Ignore strict errors for now since even PEAR will raise
- * strict notices
+ /* Ignore strict and deprecated errors for now since even
-+ * PEAR will raise strict and deprecated notices
++ * PEAR will raise strict and deprecated notices
*/
- if ($errno == E_STRICT) {
+ if (($errno == E_STRICT) || ($errno == E_DEPRECATED)) {
@@ -50,7 +50,7 @@
Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php
===================================================================
--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php 1970-01-01 10:13:08.000000000 +0100
-+++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php 2010-09-10 09:27:52.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php 2010-09-20 08:42:46.000000000 +0200
@@ -75,7 +75,7 @@
include dirname(__FILE__) . '/Transport/' . $driver . '.php';
}
@@ -63,7 +63,7 @@
Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php
===================================================================
--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php 1970-01-01 10:13:08.000000000 +0100
-+++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php 2010-09-10 09:27:52.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php 2010-09-20 08:42:46.000000000 +0200
@@ -19,8 +19,8 @@
require_once 'Horde/Kolab/Filter/Response.php';
@@ -75,3 +75,215 @@
$result = $parser->parse();
if (is_a($result, 'PEAR_Error')) {
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/drop.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/drop.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/drop.php 2010-09-20 08:44:04.000000000 +0200
+@@ -27,7 +27,7 @@
+ */
+ function &_createTransport()
+ {
+- $transport = &new DropWrapper();
++ $transport = new DropWrapper();
+ return $transport;
+ }
+ }
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lda.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lda.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lda.php 2010-09-20 08:44:04.000000000 +0200
+@@ -29,7 +29,7 @@
+ {
+ require_once dirname(__FILE__) . '/DovecotLDA.php';
+
+- $transport = &new Dovecot_LDA();
++ $transport = new Dovecot_LDA();
+
+ return $transport;
+ }
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lmtp.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lmtp.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/lmtp.php 2010-09-20 08:44:04.000000000 +0200
+@@ -38,7 +38,7 @@
+ $this->_params['port'] = 2003;
+ }
+
+- $transport = &new Net_LMTP_TLS($this->_params['host'],
++ $transport = new Net_LMTP_TLS($this->_params['host'],
+ $this->_params['port']);
+
+ return $transport;
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/smtp.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/smtp.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/smtp.php 2010-09-20 08:44:04.000000000 +0200
+@@ -38,7 +38,7 @@
+ $this->_params['port'] = 25;
+ }
+
+- $transport = &new Net_SMTP($this->_params['host'],
++ $transport = new Net_SMTP($this->_params['host'],
+ $this->_params['port']);
+ return $transport;
+ }
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/stdout.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/stdout.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport/stdout.php 2010-09-20 08:44:04.000000000 +0200
+@@ -27,7 +27,7 @@
+ */
+ function &_createTransport()
+ {
+- $transport = &new StdOutWrapper();
++ $transport = new StdOutWrapper();
+ return $transport;
+ }
+ }
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Test/Filter.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Test/Filter.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Test/Filter.php 2010-09-20 08:44:04.000000000 +0200
+@@ -248,10 +248,10 @@
+ /* Setup the class */
+ if (empty($params['incoming'])) {
+ require_once 'Horde/Kolab/Filter/Content.php';
+- $parser = &new Horde_Kolab_Filter_Content();
++ $parser = new Horde_Kolab_Filter_Content();
+ } else {
+ require_once 'Horde/Kolab/Filter/Incoming.php';
+- $parser = &new Horde_Kolab_Filter_Incoming();
++ $parser = new Horde_Kolab_Filter_Incoming();
+ }
+
+ ob_start();
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabfilter.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabfilter.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabfilter.php 2010-09-20 08:44:04.000000000 +0200
+@@ -19,8 +19,8 @@
+ require_once 'Horde/Kolab/Filter/Response.php';
+
+ /* Parse the mail */
+-$parser = &new Horde_Kolab_Filter_Content();
+-$response = &new Horde_Kolab_Filter_Response();
++$parser = new Horde_Kolab_Filter_Content();
++$response = new Horde_Kolab_Filter_Response();
+
+ $result = $parser->parse();
+ if (is_a($result, 'PEAR_Error')) {
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/FilterTest.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/FilterTest.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/FilterTest.php 2010-09-20 08:44:04.000000000 +0200
+@@ -56,7 +56,7 @@
+ public function testIncorrectUsage()
+ {
+ $_SERVER['argv'] = array($_SERVER['argv'][0]);
+- $parser = &new Horde_Kolab_Filter_Incoming();
++ $parser = new Horde_Kolab_Filter_Incoming();
+ $inh = fopen(dirname(__FILE__) . '/fixtures/tiny.eml', 'r');
+ $result = $parser->parse($inh, 'echo');
+
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/LoadTest.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/LoadTest.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/LoadTest.php 2010-09-20 08:44:04.000000000 +0200
+@@ -106,15 +106,15 @@
+
+ for ($i = 0; $i < 10; $i++) {
+
+- $parser = &new Horde_Kolab_Filter_Incoming();
++ $parser = new Horde_Kolab_Filter_Incoming();
+ $inh = fopen(dirname(__FILE__) . '/fixtures/tiny.eml', 'r');
+ $parser->parse($inh, 'drop');
+
+- $parser = &new Horde_Kolab_Filter_Incoming();
++ $parser = new Horde_Kolab_Filter_Incoming();
+ $inh = fopen(dirname(__FILE__) . '/fixtures/simple.eml', 'r');
+ $parser->parse($inh, 'drop');
+
+- $parser = &new Horde_Kolab_Filter_Incoming();
++ $parser = new Horde_Kolab_Filter_Incoming();
+ $inh = fopen($tmpfile, 'r');
+ $parser->parse($inh, 'drop');
+
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/ResourceTest.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/ResourceTest.php 2010-09-20 08:43:41.000000000 +0200
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/test/Horde/Kolab/Filter/ResourceTest.php 2010-09-20 08:44:04.000000000 +0200
+@@ -44,7 +44,7 @@
+ */
+ public function testGetResourceData()
+ {
+- $r = &new Kolab_Resource();
++ $r = new Kolab_Resource();
+ $d = $r->_getResourceData('test at example.org', 'wrobel at example.org');
+ $this->assertNoError($d);
+ $this->assertEquals('wrobel at example.org', $d['id']);
+@@ -58,9 +58,9 @@
+ */
+ public function testManual()
+ {
+- $r = &new Kolab_Resource();
++ $r = new Kolab_Resource();
+ $this->assertTrue($r->handleMessage('otherhost', 'test at example.org', 'wrobel at example.org', null));
+- $r = &new Kolab_Resource();
++ $r = new Kolab_Resource();
+ $this->assertTrue($r->handleMessage('localhost', 'test at example.org', 'wrobel at example.org', null));
+ }
+
+@@ -72,7 +72,7 @@
+ {
+ $this->markTestIncomplete('Fails for unknown reason.');
+
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20080926T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20081126T000000Z'));
+
+@@ -104,7 +104,7 @@
+ $this->markTestIncomplete('Fails for unknown reason.');
+
+ require_once 'Horde/iCalendar/vfreebusy.php';
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20080926T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20081126T000000Z'));
+
+@@ -137,7 +137,7 @@
+ */
+ public function testRecurrenceNodefault()
+ {
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20080926T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20081126T000000Z'));
+
+@@ -159,7 +159,7 @@
+ {
+ $this->markTestIncomplete('Fails for unknown reason.');
+
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20090901T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20091101T000000Z'));
+
+@@ -188,7 +188,7 @@
+ */
+ public function testAllDay()
+ {
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20090901T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20091101T000000Z'));
+
+@@ -222,7 +222,7 @@
+ $this->markTestIncomplete('Sends mail');
+
+ require_once 'Horde/iCalendar/vfreebusy.php';
+- $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
++ $GLOBALS['KOLAB_FILTER_TESTING'] = new Horde_iCalendar_vfreebusy();
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20080926T000000Z'));
+ $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20081126T000000Z'));
+
More information about the pkg-kolab-devel
mailing list