Fix signatures, missing returns for edge cases etc.

lib/Api.php

@@ -1814,6 +1814,7 @@ public function addField($address = '', $name = '', $field = '',
             throw new Turba_Exception(_("Permission denied"));
         }
 
+        $res = [];
         try {
             $res = $driver->search(array('email' => trim($address)), null, 'AND');
         } catch (Turba_Exception $e) {
@@ -2419,6 +2420,7 @@ public function searchTags($names, $max = 10, $from = 0,
                                $resource_type = '', $user = null, $raw = false)
     {
         global $injector, $registry;
+        $sources = [];
 
         $results = $injector
             ->getInstance('Turba_Tagger')
@@ -2443,7 +2445,7 @@ public function searchTags($names, $max = 10, $from = 0,
                     if (count($result) == 0) {
                         continue;
                     } elseif (count($result) > 1) {
-                        throw new Turba_Exception(sprintf("Internal Horde Error: multiple Turba objects with same objectId %s.", $uid));
+                        throw new Turba_Exception(sprintf("Internal Horde Error: multiple Turba objects with same objectId %s.", $contact_uid));
                     }
                     foreach ($result->objects as $obj) {
                         $return[] = array(
@@ -2550,7 +2552,7 @@ protected function _encodeContent($content)
                     $out[$attr] = $hooks->callHook(
                         'encode_attribute',
                         'turba',
-                        array($attr, $value, null, null)
+                        array($attr, $val, null, null)
                     );
                 } catch (Turba_Exception $e) {}
             }

lib/Application.php

@@ -342,6 +342,7 @@ public function configSpecialValues($what)
             $addressbooks[''] = _("None");
             return $addressbooks;
         }
+        return [];
     }
 
     /**
@@ -846,6 +847,7 @@ public function download(Horde_Variables $vars)
 
             break;
         }
+        return [];
     }
 
     /**
@@ -1113,6 +1115,7 @@ public function davPutObject($collection, $object, $data)
                 $dav->addObjectMap($id, $object, $internal);
             }
         }
+        return null;
     }
 
     /**
@@ -1140,6 +1143,7 @@ public function davDeleteObject($collection, $object)
             $dav->deleteExternalObjectId($object, $internal);
         } catch (Horde_Dav_Exception $e) {
         }
+        return true;
     }
 
     /**

lib/Backup/Contacts.php

@@ -94,14 +94,14 @@ public function key()
 
     /**
      */
-    public function next()
+    public function next(): void
     {
         $this->_list->next();
     }
 
     /**
      */
-    public function rewind()
+    public function rewind(): void
     {
         if (!isset($this->_driver->map['__owner'])) {
             $this->_list = new EmptyIterator();
@@ -115,7 +115,7 @@ public function rewind()
 
     /**
      */
-    public function valid()
+    public function valid(): bool
     {
         return $this->_list->valid();
     }

lib/Driver/Favourites.php

@@ -122,6 +122,7 @@ protected function _match($contact, $val)
             return empty($val['test']) ||
                 stristr($contact[$val['field']], $val['test']) !== false;
         }
+        return false;
     }
 
     /**

lib/Driver/Group.php

@@ -15,6 +15,8 @@
  */
 class Turba_Driver_Group extends Turba_Driver
 {
+
+    protected $_gid;
     /**
      * Constructor function.
      *

lib/Driver/Prefs.php

@@ -104,6 +104,8 @@ protected function _delete($object_key, $object_id)
      * Saves the specified object in the preferences.
      *
      * @param Turba_Object $object TODO
+     * 
+     * @return string object id
      */
     function _save($object)
     {
@@ -114,6 +116,7 @@ function _save($object)
         $book = $this->_getAddressBook();
         $book[$object_id] = $attributes;
         $this->_setAddressBook($book);
+        return (string) $object_id;
     }
 
     /**
@@ -139,9 +142,8 @@ protected function _getAddressBook()
      *
      * @param $addressbook TODO
      *
-     * @return TODO
      */
-    protected function _setAddressBook($addressbook)
+    protected function _setAddressBook($addressbook): void
     {
         global $prefs;
 

lib/Driver/Sql.php

@@ -65,7 +65,7 @@ public function __construct($name = '', array $params = array())
      *
      * @return integer  The number of contacts that the user owns.
      */
-    public function count()
+    public function count(): int
     {
         $test = $this->getContactOwner();
         if (!isset($this->_countCache[$test])) {

lib/Driver/Vbook.php

@@ -35,6 +35,8 @@ class Turba_Driver_Vbook extends Turba_Driver
      */
     protected $_driver;
 
+    protected $_share;
+
     /**
      * Constructs a new Turba_Driver object.
      *

lib/Form/EditContactGroup.php

@@ -36,9 +36,16 @@ public function __construct($vars, $contact)
         }
     }
 
-    public function renderActive($renderer, $vars, $action, $method)
+    public function renderActive(
+        $renderer = null,
+        $vars = null,
+        $action = '',
+        $method = 'get',
+        $enctype = null,
+        $focus = true
+    )
     {
-        parent::renderActive($renderer, $vars, $action, $method);
+        parent::renderActive($renderer, $vars, $action, $method, $enctype, $focus);
 
         $results = new Turba_List($vars->get('objectkeys'));
 

lib/List.php

@@ -26,7 +26,7 @@ class Turba_List implements Countable
     /**
      * The field to compare objects by.
      *
-     * @var string
+     * @var iterable
      */
     protected $_usortCriteria;
 
@@ -254,7 +254,7 @@ protected function _cmp(Turba_Object $a, Turba_Object $b)
 
     /* Countable methods. */
 
-    public function count()
+    public function count(): int
     {
         return count($this->objects);
     }

lib/Test.php

@@ -96,7 +96,7 @@ public function appTests()
      */
     protected function _doConnectionTest($params)
     {
-        $ret .= 'server="' . htmlspecialchars($params['server']) . '" ' .
+        $ret = 'server="' . htmlspecialchars($params['server']) . '" ' .
             'basedn="' . htmlspecialchars($params['basedn']) . '" ' .
             'filter="' . htmlspecialchars($params['filter']) . '"<br />';
 

lib/View/List.php

@@ -511,7 +511,7 @@ public function getAddSources()
      *
      * @return integer  The number of objects in the list.
      */
-    public function count()
+    public function count(): int
     {
         return $this->list->count();
     }