Merge "Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER"

diff --combined includes/session/SessionManager.php
index 8695b68,14bc752..9ca3bbc
--- 1/includes/session/SessionManager.php
--- 2/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@@ -168,6 -168,7 +168,6 @@@ final class SessionManager implements S
                        $store = $options['store'];
                } else {
                        $store = \ObjectCache::getInstance( $this->config->get( 'SessionCacheType' ) );
 -                      $store->setLogger( $this->logger );
                }
                $this->store = $store instanceof CachedBagOStuff ? $store : new CachedBagOStuff( $store );
  
@@@ -952,6 -953,15 +952,15 @@@
         * @return Session
         */
        public function getSessionFromInfo( SessionInfo $info, WebRequest $request ) {
+               if ( defined( 'MW_NO_SESSION' ) ) {
+                       if ( MW_NO_SESSION === 'warn' ) {
+                               // Undocumented safety case for converting existing entry points
+                               $this->logger->error( 'Sessions are supposed to be disabled for this entry point' );
+                       } else {
+                               throw new \BadMethodCallException( 'Sessions are disabled for this entry point' );
+                       }
+               }
+ 
                $id = $info->getId();
  
                if ( !isset( $this->allSessionBackends[$id] ) ) {