[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove WebRequest::checkSessionCookie() method as being depr...

2016-12-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329511 )

Change subject: Remove WebRequest::checkSessionCookie() method as being 
deprecated
..


Remove WebRequest::checkSessionCookie() method as being deprecated

Bug: T61113
Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
---
M RELEASE-NOTES-1.29
M includes/DerivativeRequest.php
M includes/WebRequest.php
3 files changed, 2 insertions(+), 20 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..9e3cfac 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. Use
+\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() 
instead.
 
 == Compatibility ==
 
diff --git a/includes/DerivativeRequest.php b/includes/DerivativeRequest.php
index 4c149ae..487e86c 100644
--- a/includes/DerivativeRequest.php
+++ b/includes/DerivativeRequest.php
@@ -49,10 +49,6 @@
return $this->base->getCookie( $key, $prefix, $default );
}
 
-   public function checkSessionCookie() {
-   return $this->base->checkSessionCookie();
-   }
-
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e7c9b83..3bbdc3f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -758,22 +758,6 @@
}
 
/**
-* Returns true if the request has a persistent session.
-* This does not necessarily mean that the user is logged in!
-*
-* @deprecated since 1.27, use
-*  
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-*  instead.
-* @return bool
-*/
-   public function checkSessionCookie() {
-   global $wgInitialSessionId;
-   wfDeprecated( __METHOD__, '1.27' );
-   return $wgInitialSessionId !== null &&
-   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
-   }
-
-   /**
 * Get a cookie from the $_COOKIE jar
 *
 * @param string $key The name of the cookie

-- 
To view, visit https://gerrit.wikimedia.org/r/329511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Victorbarbu 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove WebRequest::checkSessionCookie() method as being depr...

2016-12-28 Thread Victorbarbu (Code Review) 
Victorbarbu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329511 )

Change subject: Remove WebRequest::checkSessionCookie() method as being 
deprecated
..

Remove WebRequest::checkSessionCookie() method as being deprecated

Bug: T61113
Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
---
M RELEASE-NOTES-1.29
M includes/DerivativeRequest.php
M includes/WebRequest.php
3 files changed, 2 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/329511/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..ab5757d 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. use
+\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() 
instead.
 
 == Compatibility ==
 
diff --git a/includes/DerivativeRequest.php b/includes/DerivativeRequest.php
index 4c149ae..487e86c 100644
--- a/includes/DerivativeRequest.php
+++ b/includes/DerivativeRequest.php
@@ -49,10 +49,6 @@
return $this->base->getCookie( $key, $prefix, $default );
}
 
-   public function checkSessionCookie() {
-   return $this->base->checkSessionCookie();
-   }
-
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e7c9b83..3bbdc3f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -758,22 +758,6 @@
}
 
/**
-* Returns true if the request has a persistent session.
-* This does not necessarily mean that the user is logged in!
-*
-* @deprecated since 1.27, use
-*  
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-*  instead.
-* @return bool
-*/
-   public function checkSessionCookie() {
-   global $wgInitialSessionId;
-   wfDeprecated( __METHOD__, '1.27' );
-   return $wgInitialSessionId !== null &&
-   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
-   }
-
-   /**
 * Get a cookie from the $_COOKIE jar
 *
 * @param string $key The name of the cookie

-- 
To view, visit https://gerrit.wikimedia.org/r/329511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits