From eceef567844288172e8916960d7dcd6fb178d353 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 9 Aug 2010 08:51:38 +0000
Subject: [PATCH] SessionHandler: Rename getSessionId to getCookieSessionId.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2494 44740490-163a-0410-bde0-09ae8108e29a
---
 lib/SimpleSAML/SessionHandler.php       | 8 ++++----
 lib/SimpleSAML/SessionHandlerCookie.php | 8 ++++----
 lib/SimpleSAML/SessionHandlerPHP.php    | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/SimpleSAML/SessionHandler.php b/lib/SimpleSAML/SessionHandler.php
index 90eb51162..c16d50618 100644
--- a/lib/SimpleSAML/SessionHandler.php
+++ b/lib/SimpleSAML/SessionHandler.php
@@ -47,12 +47,12 @@ abstract class SimpleSAML_SessionHandler {
 	}
 
 
-	/* This function retrieves the session id of the current session.
+	/**
+	 * Retrieve the session id of saved in the session cookie.
 	 *
-	 * Returns:
-	 *  The session id of the current session.
+	 * @return string  The session id saved in the cookie.
 	 */
-	abstract public function getSessionId();
+	abstract public function getCookieSessionId();
 
 
 	/**
diff --git a/lib/SimpleSAML/SessionHandlerCookie.php b/lib/SimpleSAML/SessionHandlerCookie.php
index 16be64fb9..0aca668a5 100644
--- a/lib/SimpleSAML/SessionHandlerCookie.php
+++ b/lib/SimpleSAML/SessionHandlerCookie.php
@@ -55,12 +55,12 @@ extends SimpleSAML_SessionHandler {
 	}
 
 
-	/* This function retrieves the session id of the current session.
+	/**
+	 * Retrieve the session id of saved in the session cookie.
 	 *
-	 * Returns:
-	 *  The session id of the current session.
+	 * @return string  The session id saved in the cookie.
 	 */
-	public function getSessionId() {
+	public function getCookieSessionId() {
 		return $this->session_id;
 	}
 
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 37b12d4df..f2009bdf9 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -65,12 +65,12 @@ class SimpleSAML_SessionHandlerPHP extends SimpleSAML_SessionHandler {
 	}
 
 
-	/* This function retrieves the session id of the current session.
+	/**
+	 * Retrieve the session id of saved in the session cookie.
 	 *
-	 * Returns:
-	 *  The session id of the current session.
+	 * @return string  The session id saved in the cookie.
 	 */
-	public function getSessionId() {
+	public function getCookieSessionId() {
 		return session_id();
 	}
 
-- 
GitLab