Net_URL_Mapper 0.9.1

diff --git a/extlib/Net/URL/Mapper.php b/extlib/Net/URL/Mapper.php
index 65e38818bb9b70c91c4f93996ff3b2f8d7155d55..009c13521407046968388c53c6c3d8bc5f73a37f 100644 (file)
--- a/extlib/Net/URL/Mapper.php
+++ b/extlib/Net/URL/Mapper.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Mapper.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Mapper.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Exception.php b/extlib/Net/URL/Mapper/Exception.php
index ac3ad172b15eda1eb8ef84a26b5f007dfabbe89a..1915ad9782becf28a263a2ed1fde41c680479684 100644 (file)
--- a/extlib/Net/URL/Mapper/Exception.php
+++ b/extlib/Net/URL/Mapper/Exception.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Exception.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Exception.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Part.php b/extlib/Net/URL/Mapper/Part.php
index 2f15b2c1628b7e06861163b3902fa576883931f3..087c368eeac731f630287dd5a65c491890b986e0 100644 (file)
--- a/extlib/Net/URL/Mapper/Part.php
+++ b/extlib/Net/URL/Mapper/Part.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Part.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Part.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Part/Dynamic.php b/extlib/Net/URL/Mapper/Part/Dynamic.php
index 349d87338caa3d7601f1f2fe0750726a0c11d832..914afa421134559b758b05212f721bb468ddcc68 100644 (file)
--- a/extlib/Net/URL/Mapper/Part/Dynamic.php
+++ b/extlib/Net/URL/Mapper/Part/Dynamic.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Dynamic.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Dynamic.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Part/Fixed.php b/extlib/Net/URL/Mapper/Part/Fixed.php
index b315b442dbc59398f0617484f682a7fd8a46fb4a..7d94973eac9b9d0212f2b318726da97ef82987d5 100644 (file)
--- a/extlib/Net/URL/Mapper/Part/Fixed.php
+++ b/extlib/Net/URL/Mapper/Part/Fixed.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Fixed.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Fixed.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Part/Wildcard.php b/extlib/Net/URL/Mapper/Part/Wildcard.php
index 6085ff6489a86f9ab8156a50edec0f283220d386..84e29e1306f1c61de6c6890ffc6c7bacce4ace40 100644 (file)
--- a/extlib/Net/URL/Mapper/Part/Wildcard.php
+++ b/extlib/Net/URL/Mapper/Part/Wildcard.php
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Wildcard.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Wildcard.php 232857 2007-03-28 10:23:04Z mansion $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 

diff --git a/extlib/Net/URL/Mapper/Path.php b/extlib/Net/URL/Mapper/Path.php
index b541002c7af6a4473ec16b43b0b34eceac472f33..b459fa1fd3053d7b16bf2529091ded09706ce6c3 100644 (file)
--- a/extlib/Net/URL/Mapper/Path.php
+++ b/extlib/Net/URL/Mapper/Path.php
@@ -5,7 +5,7 @@
  * PHP version 5
  *
  * LICENSE:
- * 
+ *
  * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
  * All rights reserved.
  *
@@ -16,9 +16,9 @@
  *    * Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the 
+ *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products 
+ *    * The names of the authors may not be used to endorse or promote products
  *      derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
@@ -37,7 +37,7 @@
  * @package    Net_URL_Mapper
  * @author     Bertrand Mansion <golgote@mamasam.com>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Path.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @version    CVS: $Id: Path.php 296456 2010-03-20 00:41:08Z kguest $
  * @link       http://pear.php.net/package/Net_URL_Mapper
  */
 
@@ -84,6 +84,22 @@ class Net_URL_Mapper_Path
         $this->getRequired();
     }
 
+    /**
+    * Called when the object is serialized
+    * Make sure we do not store too much info when the object is serialized
+    * and call the regular expressions generator functions so that they will
+    * not need to be generated again on wakeup.
+    *
+    * @return   array   Name of properties to store when serialized
+    */
+    public function __sleep()
+    {
+        $this->getFormat();
+        $this->getRule();
+        return array('alias', 'path', 'defaults', 'rule', 'format',
+            'parts', 'minKeys', 'maxKeys', 'fixed', 'required');
+    }
+
     public function getPath()
     {
         return $this->path;
@@ -127,7 +143,7 @@ class Net_URL_Mapper_Path
     /**
     * Set the path parts default values
     * @param array  Associative array with format partname => value
-    */    
+    */
     public function setDefaults($defaults)
     {
         if (is_array($defaults)) {
@@ -140,11 +156,11 @@ class Net_URL_Mapper_Path
     /**
     * Set the path parts default values
     * @param array  Associative array with format partname => value
-    */    
+    */
     public function setRules($rules)
     {
         if (is_array($rules)) {
-            $this->rules = $rules;   
+            $this->rules = $rules;
         } else {
             $this->rules = array();
         }
@@ -153,7 +169,7 @@ class Net_URL_Mapper_Path
     /**
     * Returns the regular expression used to match this path
     * @return string  PERL Regular expression
-    */ 
+    */
     public function getRule()
     {
         if (is_null($this->rule)) {
@@ -213,10 +229,10 @@ class Net_URL_Mapper_Path
 
     /**
     * Checks whether the path contains the given part by name
-    * If value parameter is given, the part also checks if the 
+    * If value parameter is given, the part also checks if the
     * given value conforms to the part rule.
     * @param string Part name
-    * @param mixed  The value to check against 
+    * @param mixed  The value to check against
     */
     public function hasKey($partName, $value = null)
     {
@@ -241,7 +257,12 @@ class Net_URL_Mapper_Path
         }
         $path = '/'.trim(Net_URL::resolvePath($path), '/');
         if (!empty($qstring)) {
-            $path .= '?'.http_build_query($qstring);
+            if(strpos($path, '?') === false) {
+                $path .= '?';
+            } else {
+                $path .= '&';
+            }
+            $path .= http_build_query($qstring);
         }
         if (!empty($anchor)) {
             $path .= '#'.ltrim($anchor, '#');
@@ -427,4 +448,4 @@ class Net_URL_Mapper_Path
 
 }
 
-?>
\ No newline at end of file
+?>