Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jan 2017 11:54:18 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432211 - in head/mail/pear-Mail_Queue: . files
Message-ID:  <201701231154.v0NBsIBU090976@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Mon Jan 23 11:54:17 2017
New Revision: 432211
URL: https://svnweb.freebsd.org/changeset/ports/432211

Log:
  mail/pear-Mail_Queue: overloading isError static mismatch
  
  Since devel/pear was upgraded to 1.10.1, mail/pear-Mail_Queue
  was broken and could not be used, giving the following error:
    PHP Fatal error:  Cannot make static method PEAR::isError() non
    static in class Mail_Queue in /usr/local/share/pear/Mail/Queue.php on line 126
  
  Upstream bug report: http://pear.php.net/bugs/bug.php?id=20976
  
  PR:		215325
  Submitted by:	ml@netfence.it
  Reported by:	ml@netfence.it
  MFH:		2017Q1
  Approved by:	Jochen Neumeister (maintainer), rakuco (mentor)

Added:
  head/mail/pear-Mail_Queue/files/
  head/mail/pear-Mail_Queue/files/patch-Mail_Queue.php   (contents, props changed)
Modified:
  head/mail/pear-Mail_Queue/Makefile

Modified: head/mail/pear-Mail_Queue/Makefile
==============================================================================
--- head/mail/pear-Mail_Queue/Makefile	Mon Jan 23 11:52:47 2017	(r432210)
+++ head/mail/pear-Mail_Queue/Makefile	Mon Jan 23 11:54:17 2017	(r432211)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail_Queue
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	mail www pear
 
 MAINTAINER=	joneum@bsdproject.de

Added: head/mail/pear-Mail_Queue/files/patch-Mail_Queue.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/pear-Mail_Queue/files/patch-Mail_Queue.php	Mon Jan 23 11:54:17 2017	(r432211)
@@ -0,0 +1,11 @@
+--- Mail/Queue.php.orig	2016-12-15 17:08:51 UTC
++++ Mail/Queue.php
+@@ -587,7 +587,7 @@ class Mail_Queue extends PEAR
+      * @return  boolean   whether $value is an MAILQUEUE_ERROR
+      * @access public
+      */
+-    function isError($value)
++    static function isError($value)
+     {
+         return (is_object($value) && is_a($value, 'pear_error'));
+     }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701231154.v0NBsIBU090976>