From 519fd863aa7b69642c73578f7196c4b563c466e7 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 6 Nov 2014 08:30:32 -0800 Subject: [PATCH] Move Cookie(Jar) to libs/ This doesn't rely on any other parts of MediaWiki since we can replace MWException with InvalidArgumentException here. Change-Id: Id4512b184d24efc6674d486a5d452aa44dc871c6 --- includes/AutoLoader.php | 4 ++-- includes/{ => libs}/Cookie.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename includes/{ => libs}/Cookie.php (99%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 5024b7a437..e89e5006a9 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -48,8 +48,6 @@ $wgAutoloadLocalClasses = array( 'CollationCkb' => 'includes/Collation.php', 'CollationEt' => 'includes/Collation.php', 'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php', - 'Cookie' => 'includes/Cookie.php', - 'CookieJar' => 'includes/Cookie.php', 'CurlHttpRequest' => 'includes/HttpFunctions.php', 'DeprecatedGlobal' => 'includes/DeprecatedGlobal.php', 'DerivativeRequest' => 'includes/WebRequest.php', @@ -676,6 +674,8 @@ $wgAutoloadLocalClasses = array( # includes/libs 'ArrayUtils' => 'includes/libs/ArrayUtils.php', + 'Cookie' => 'includes/libs/Cookie.php', + 'CookieJar' => 'includes/libs/Cookie.php', 'CSSMin' => 'includes/libs/CSSMin.php', 'GenericArrayObject' => 'includes/libs/GenericArrayObject.php', 'HashRing' => 'includes/libs/HashRing.php', diff --git a/includes/Cookie.php b/includes/libs/Cookie.php similarity index 99% rename from includes/Cookie.php rename to includes/libs/Cookie.php index cb041904b8..56dc6eaccc 100644 --- a/includes/Cookie.php +++ b/includes/libs/Cookie.php @@ -69,7 +69,7 @@ class Cookie { $this->domain = $attr['domain']; } } else { - throw new MWException( 'You must specify a domain.' ); + throw new InvalidArgumentException( '$attr must contain a domain' ); } } -- 2.20.1