[xoops-svn] SF.net SVN: xoops-svn:[10303] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<tr...@us...>]

Revision: 10303
          http://sourceforge.net/p/xoops/svn/10303
Author:   trabis
Date:     2012-12-02 17:49:37 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Moving XoopsRegistry to lib folder

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Registry.php

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/registry.php

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/registry.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/registry.php	2012-12-02 17:33:39 UTC (rev 10302)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/registry.php	2012-12-02 17:49:37 UTC (rev 10303)
@@ -1,210 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Registry
- *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package         class
- * @since           2.6.0
- * @author          trabis <lus...@gm...>
- * @version         $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to li...@ze... so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class XoopsRegistry extends ArrayObject
-{
-    /**
-     * Class name of the singleton registry object.
-     * @var string
-     */
-    private static $_registryClassName = 'XoopsRegistry';
-
-    /**
-     * Registry object provides storage for shared objects.
-     * @var XoopsRegistry
-     */
-    private static $_registry = null;
-
-    /**
-     * Retrieves the default registry instance.
-     *
-     * @return XoopsRegistry
-     */
-    public static function getInstance()
-    {
-        if (self::$_registry === null) {
-            self::init();
-        }
-
-        return self::$_registry;
-    }
-
-    /**
-     * Set the default registry instance to a specified instance.
-     *
-     * @param XoopsRegistry $registry An object instance of type XoopsRegistry,
-     *   or a subclass.
-     * @return void
-     * @throws Zend_Exception if registry is already initialized.
-     */
-    public static function setInstance(XoopsRegistry $registry)
-    {
-        if (self::$_registry !== null) {
-            trigger_error('Registry is already initialized');
-        }
-
-        self::setClassName(get_class($registry));
-        self::$_registry = $registry;
-    }
-
-    /**
-     * Initialize the default registry instance.
-     *
-     * @return void
-     */
-    protected static function init()
-    {
-        self::setInstance(new self::$_registryClassName());
-    }
-
-    /**
-     * Set the class name to use for the default registry instance.
-     * Does not affect the currently initialized instance, it only applies
-     * for the next time you instantiate.
-     *
-     * @param string $registryClassName
-     * @return void
-     * @throws Zend_Exception if the registry is initialized or if the
-     *   class name is not valid.
-     */
-    public static function setClassName($registryClassName = 'XoopsRegistry')
-    {
-        if (self::$_registry !== null) {
-            trigger_error('Registry is already initialized');
-        }
-
-        if (!is_string($registryClassName)) {
-            trigger_error("Argument is not a class name");
-        }
-
-        self::$_registryClassName = $registryClassName;
-    }
-
-    /**
-     * Unset the default registry instance.
-     * Primarily used in tearDown() in unit tests.
-     * @returns void
-     */
-    public static function _unsetInstance()
-    {
-        self::$_registry = null;
-    }
-
-    /**
-     * getter method, basically same as offsetGet().
-     *
-     * This method can be called from an object of type Zend_Registry, or it
-     * can be called statically.  In the latter case, it uses the default
-     * static instance stored in the class.
-     *
-     * @param string $index - get the value associated with $index
-     * @return mixed
-     * @throws Zend_Exception if no entry is registered for $index.
-     */
-    public static function get($index)
-    {
-        $instance = self::getInstance();
-
-        if (!$instance->offsetExists($index)) {
-            trigger_error("No entry is registered for key '$index'");
-        }
-
-        return $instance->offsetGet($index);
-    }
-
-    /**
-     * setter method, basically same as offsetSet().
-     *
-     * This method can be called from an object of type Zend_Registry, or it
-     * can be called statically.  In the latter case, it uses the default
-     * static instance stored in the class.
-     *
-     * @param string $index The location in the ArrayObject in which to store
-     *   the value.
-     * @param mixed $value The object to store in the ArrayObject.
-     * @return void
-     */
-    public static function set($index, $value)
-    {
-        $instance = self::getInstance();
-        $instance->offsetSet($index, $value);
-    }
-
-    /**
-     * Returns TRUE if the $index is a named value in the registry,
-     * or FALSE if $index was not found in the registry.
-     *
-     * @param  string $index
-     * @return boolean
-     */
-    public static function isRegistered($index)
-    {
-        if (self::$_registry === null) {
-            return false;
-        }
-        return self::$_registry->offsetExists($index);
-    }
-
-    /**
-     * Constructs a parent ArrayObject with default
-     * ARRAY_AS_PROPS to allow access as an object
-     *
-     * @param array $array data array
-     * @param integer $flags ArrayObject flags
-     */
-    public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS)
-    {
-        parent::__construct($array, $flags);
-    }
-
-    /**
-     * @param string $index
-     * @return mixed
-     *
-     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-     */
-    public function offsetExists($index)
-    {
-        return array_key_exists($index, $this);
-    }
-
-}

Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Registry.php (from rev 10297, XoopsCore/branches/2.6.x/2.6.0/htdocs/class/registry.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Registry.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Registry.php	2012-12-02 17:49:37 UTC (rev 10303)
@@ -0,0 +1,206 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Registry
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         class
+ * @since           2.6.0
+ * @author          trabis <lus...@gm...>
+ * @version         $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to li...@ze... so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Registry
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Xoops_Registry extends ArrayObject
+{
+    /**
+     * Class name of the singleton registry object.
+     * @var string
+     */
+    private static $_registryClassName = 'Xoops_Registry';
+
+    /**
+     * Registry object provides storage for shared objects.
+     * @var Xoops_Registry
+     */
+    private static $_registry = null;
+
+    /**
+     * Retrieves the default registry instance.
+     *
+     * @return Xoops_Registry
+     */
+    public static function getInstance()
+    {
+        if (self::$_registry === null) {
+            self::init();
+        }
+
+        return self::$_registry;
+    }
+
+    /**
+     * Set the default registry instance to a specified instance.
+     *
+     * @param Xoops_Registry $registry An object instance of type Xoops_Registry,
+     *   or a subclass.
+     * @return void
+     */
+    public static function setInstance(Xoops_Registry $registry)
+    {
+        if (self::$_registry !== null) {
+            trigger_error('Registry is already initialized');
+        }
+
+        self::setClassName(get_class($registry));
+        self::$_registry = $registry;
+    }
+
+    /**
+     * Initialize the default registry instance.
+     *
+     * @return void
+     */
+    protected static function init()
+    {
+        self::setInstance(new self::$_registryClassName());
+    }
+
+    /**
+     * Set the class name to use for the default registry instance.
+     * Does not affect the currently initialized instance, it only applies
+     * for the next time you instantiate.
+     *
+     * @param string $registryClassName
+     * @return void
+     */
+    public static function setClassName($registryClassName = 'Xoops_Registry')
+    {
+        if (self::$_registry !== null) {
+            trigger_error('Registry is already initialized');
+        }
+
+        if (!is_string($registryClassName)) {
+            trigger_error("Argument is not a class name");
+        }
+
+        self::$_registryClassName = $registryClassName;
+    }
+
+    /**
+     * Unset the default registry instance.
+     * Primarily used in tearDown() in unit tests.
+     * @returns void
+     */
+    public static function _unsetInstance()
+    {
+        self::$_registry = null;
+    }
+
+    /**
+     * getter method, basically same as offsetGet().
+     *
+     * This method can be called from an object of type Zend_Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index - get the value associated with $index
+     * @return mixed
+     */
+    public static function get($index)
+    {
+        $instance = self::getInstance();
+
+        if (!$instance->offsetExists($index)) {
+            trigger_error("No entry is registered for key '$index'");
+        }
+
+        return $instance->offsetGet($index);
+    }
+
+    /**
+     * setter method, basically same as offsetSet().
+     *
+     * This method can be called from an object of type Zend_Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index The location in the ArrayObject in which to store
+     *   the value.
+     * @param mixed $value The object to store in the ArrayObject.
+     * @return void
+     */
+    public static function set($index, $value)
+    {
+        $instance = self::getInstance();
+        $instance->offsetSet($index, $value);
+    }
+
+    /**
+     * Returns TRUE if the $index is a named value in the registry,
+     * or FALSE if $index was not found in the r