From: Gunnar Wrobel Date: Thu, 26 Mar 2009 10:27:14 +0000 (+0000) Subject: Attemted to use strict checking but this fails at the moment because a X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a85666233a03ed74be3ab3b4906e330b311f8102;p=horde.git Attemted to use strict checking but this fails at the moment because a number of packages from horde-cvs offer static methods that are not yet declared as such. Fixed only some strict issues within the Kolab_Server package. --- diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php index 71eef4eb6..9f531caa5 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php @@ -147,7 +147,7 @@ class Horde_Kolab_Server_Object * @return Horde_Kolab_Server_Object|PEAR_Error The newly created concrete * Horde_Kolab_Server_Object instance. */ - public function &factory($type, $uid, &$storage, $data = null) + static public function &factory($type, $uid, &$storage, $data = null) { $result = Horde_Kolab_Server_Object::loadClass($type); @@ -170,7 +170,7 @@ class Horde_Kolab_Server_Object * * @return true|PEAR_Error True if successfull. */ - public static function loadClass($type) + static public function loadClass($type) { if (!class_exists($type)) { throw new Horde_Kolab_Server_Exception('Class definition of ' . $type . ' not found.'); @@ -356,7 +356,7 @@ class Horde_Kolab_Server_Object $info[self::ATTRIBUTE_OC] = $this->object_classes; $result = $this->db->save($this->uid, $info); - if ($result === false || is_a($result, 'PEAR_Error')) { + if ($result === false || $result instanceOf PEAR_Error) { return $result; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php index ade18c1be..56147f79d 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php @@ -109,7 +109,7 @@ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object_base $this->db->getBaseUid()); $admin_group = $this->db->fetch($admins_uid, 'Horde_Kolab_Server_Object_group'); - if (is_a($admin_group, 'PEAR_Error') || !$admin_group->exists()) { + if ($admin_group instanceOf PEAR_Error || !$admin_group->exists()) { $members = array($this->uid); @@ -121,12 +121,12 @@ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object_base 'type' => 'Horde_Kolab_Server_Object_group', self::ATTRIBUTE_MEMBER => $members, self::ATTRIBUTE_VISIBILITY => false)); - if (is_a($result, 'PEAR_Error')) { + if ($result instanceOf PEAR_Error) { return $result; } } else { $result = $admin_group->isMember($this->uid); - if (is_a($result, 'PEAR_Error')) { + if ($result instanceOf PEAR_Error) { return $result; } if ($result === false) { diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php index 1549abcbe..37eda13b6 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php @@ -82,7 +82,7 @@ class Horde_Kolab_Server_Object_domainmaintainer extends Horde_Kolab_Server_Obje //FIXME: This should be made easier by the group object $domain_group = $this->db->fetch($domain_uid, 'Horde_Kolab_Server_Object_group'); - if (is_a($domain_group, 'PEAR_Error')) { + if ($domain_group instanceOf PEAR_Error) { return $domain_group; } if (!$domain_group->exists()) { @@ -91,7 +91,7 @@ class Horde_Kolab_Server_Object_domainmaintainer extends Horde_Kolab_Server_Obje self::ATTRIBUTE_MEMBER => $members)); } else { $result = $domain_group->isMember($this->uid); - if (is_a($result, 'PEAR_Error')) { + if ($result instanceOf PEAR_Error) { return $result; } if ($result === false) { diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php index 34b8c00b1..34312e97d 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php @@ -727,9 +727,9 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase */ public function assertNoError($var) { - if (is_a($var, 'Horde_Kolab_Server_Exception')) { + if ($var instanceOf Horde_Kolab_Server_Exception) { $this->assertEquals('', $var->getMessage()); - } else if (is_a($var, 'PEAR_Error')) { + } else if ($var instanceOf PEAR_Error) { $this->assertEquals('', $var->getMessage()); } } @@ -746,7 +746,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase */ public function assertError($var, $msg = null) { - if (!is_a($var, 'PEAR_Error')) { + if (!$var instanceOf PEAR_Error) { $this->assertType('Horde_Kolab_Server_Exception', $var); if (isset($msg)) { $this->assertEquals($msg, $var->getMessage()); diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php index 2a4d7b84f..5e49ab14a 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php @@ -57,6 +57,12 @@ class Horde_Kolab_Server_AllTests */ public static function suite() { + // Catch strict standards + // FIXME: This does not work yet, as we still have a number of + // static methods in basic Horde libraries that are not + // declared as such. + //error_reporting(E_ALL | E_STRICT); + $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Kolab_Server'); $basedir = dirname(__FILE__); diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php index 51fdbf3ff..01edac6c4 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php @@ -56,7 +56,7 @@ class Horde_Kolab_Server_ldapTest extends PHPUnit_Framework_TestCase 'count' => 1))); $classes = $ldap->getObjectClasses('cn=Gunnar Wrobel,dc=example,dc=org'); - if (is_a($classes, 'PEAR_Error')) { + if ($classes instanceOf PEAR_Error) { $this->assertEquals('', $classes->getMessage()); } $this->assertContains('top', $classes);