From 57a6d43c74123be9e8212734e9931032d97d8b2b Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 12:19:56 -0400
Subject: [PATCH] Fix constant names, cannot type hint scalers

---
 framework/Core/lib/Horde/Core/Binder/Group.php | 36 --------------------------
 framework/Group/lib/Horde/Group.php            |  6 ++---
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 framework/Core/lib/Horde/Core/Binder/Group.php

diff --git a/framework/Core/lib/Horde/Core/Binder/Group.php b/framework/Core/lib/Horde/Core/Binder/Group.php
deleted file mode 100644
index fada734cd..000000000
--- a/framework/Core/lib/Horde/Core/Binder/Group.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Group implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        $group = null;
-        if (!empty($GLOBALS['conf']['group']['cache'])) {
-            $session = new Horde_SessionObjects();
-            $group = $session->query('horde_group');
-        }
-
-        if (!$group) {
-            $driver = $GLOBALS['conf']['group']['driver'];
-            $params = Horde::getDriverConfig('group', $driver);
-            if ($driver == 'ldap') {
-                $params['ldap'] = $injector->getInstance('Horde_Core_Factory_Ldap')->getLdap('horde', 'group');
-            }
-            $group = Horde_Group::factory($driver, $params);
-        }
-
-        if (!empty($GLOBALS['conf']['group']['cache'])) {
-            register_shutdown_function(array($group, 'shutdown'));
-        }
-
-        return $group;
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Group/lib/Horde/Group.php b/framework/Group/lib/Horde/Group.php
index aedd5c4c1..d80795d9b 100644
--- a/framework/Group/lib/Horde/Group.php
+++ b/framework/Group/lib/Horde/Group.php
@@ -190,7 +190,7 @@ class Horde_Group
      * @return Horde_Group_DataTreeObject  A new group object.
      * @throws Horde_Group_Exception
      */
-    public function newGroup(string $name, $parent = self::ROOT)
+    public function newGroup($name, $parent = self::ROOT)
     {
         if ($parent != self::ROOT) {
             $name = $this->getGroupName($parent) . ':' . DataTree::encodeName($name);
@@ -508,8 +508,8 @@ class Horde_Group
     public function listGroups($refresh = false)
     {
         if ($refresh || !isset($this->_groupList)) {
-            $this->_groupList = $this->_datatree->get(DATATREE_FORMAT_FLAT, GROUP_ROOT, true);
-            unset($this->_groupList[GROUP_ROOT]);
+            $this->_groupList = $this->_datatree->get(DATATREE_FORMAT_FLAT, self::ROOT, true);
+            unset($this->_groupList[self::ROOT]);
         }
 
         return $this->_groupList;
-- 
2.11.0