Call Linker methods statically

[lhc/web/wiklou.git] / includes / Cookie.php

diff --git a/includes/Cookie.php b/includes/Cookie.php
index 6d3cfd8..76739cc 100644 (file)
--- a/includes/Cookie.php
+++ b/includes/Cookie.php
@@ -42,7 +42,7 @@ class Cookie {
                if ( isset( $attr['path'] ) ) {
                        $this->path = $attr['path'];
                } else {
-                       $this->path = "/";
+                       $this->path = '/';
                }
 
                if ( isset( $attr['domain'] ) ) {
@@ -50,7 +50,7 @@ class Cookie {
                                $this->domain = $attr['domain'];
                        }
                } else {
-                       throw new MWException( "You must specify a domain." );
+                       throw new MWException( 'You must specify a domain.' );
                }
        }
 
@@ -62,13 +62,16 @@ class Cookie {
         * A better method might be to use a blacklist like
         * http://publicsuffix.org/
         *
+        * @fixme fails to detect 3-letter top-level domains
+        * @fixme fails to detect 2-letter top-level domains for single-domain use (probably not a big problem in practice, but there are test cases)
+        *
         * @param $domain String: the domain to validate
         * @param $originDomain String: (optional) the domain the cookie originates from
         * @return Boolean
         */
        public static function validateCookieDomain( $domain, $originDomain = null ) {
                // Don't allow a trailing dot
-               if ( substr( $domain, -1 ) == "." ) {
+               if ( substr( $domain, -1 ) == '.' ) {
                        return false;
                }
 
@@ -96,20 +99,20 @@ class Cookie {
                                || ( count( $dc ) == 3 && strlen( $dc[0] ) == "" && strlen( $dc[1] ) <= 2 ) ) {
                                return false;
                        }
-                       if ( ( count( $dc ) == 2 || ( count( $dc ) == 3 && $dc[0] == "" ) )
+                       if ( ( count( $dc ) == 2 || ( count( $dc ) == 3 && $dc[0] == '' ) )
                                && preg_match( '/(com|net|org|gov|edu)\...$/', $domain ) ) {
                                return false;
                        }
                }
 
                if ( $originDomain != null ) {
-                       if ( substr( $domain, 0, 1 ) != "." && $domain != $originDomain ) {
+                       if ( substr( $domain, 0, 1 ) != '.' && $domain != $originDomain ) {
                                return false;
                        }
 
-                       if ( substr( $domain, 0, 1 ) == "."
+                       if ( substr( $domain, 0, 1 ) == '.'
                                && substr_compare( $originDomain, $domain, -strlen( $domain ),
-                                                                  strlen( $domain ), TRUE ) != 0 ) {
+                                                                  strlen( $domain ), true ) != 0 ) {
                                return false;
                        }
                }
@@ -125,43 +128,46 @@ class Cookie {
         * @return String
         */
        public function serializeToHttpRequest( $path, $domain ) {
-               $ret = "";
+               $ret = '';
 
                if ( $this->canServeDomain( $domain )
                                && $this->canServePath( $path )
                                && $this->isUnExpired() ) {
-                       $ret = $this->name . "=" . $this->value;
+                       $ret = $this->name . '=' . $this->value;
                }
 
                return $ret;
        }
 
+       /**
+        * @param $domain
+        * @return bool
+        */
        protected function canServeDomain( $domain ) {
                if ( $domain == $this->domain
                        || ( strlen( $domain ) > strlen( $this->domain )
-                                && substr( $this->domain, 0, 1 ) == "."
+                                && substr( $this->domain, 0, 1 ) == '.'
                                 && substr_compare( $domain, $this->domain, -strlen( $this->domain ),
-                                                                       strlen( $this->domain ), TRUE ) == 0 ) ) {
+                                                                       strlen( $this->domain ), true ) == 0 ) ) {
                        return true;
                }
 
                return false;
        }
 
+       /**
+        * @param $path
+        * @return bool
+        */
        protected function canServePath( $path ) {
-               if ( $this->path && substr_compare( $this->path, $path, 0, strlen( $this->path ) ) == 0 ) {
-                       return true;
-               }
-
-               return false;
+               return ( $this->path && substr_compare( $this->path, $path, 0, strlen( $this->path ) ) == 0 );
        }
 
+       /**
+        * @return bool
+        */
        protected function isUnExpired() {
-               if ( $this->isSessionKey || $this->expires > time() ) {
-                       return true;
-               }
-
-               return false;
+               return $this->isSessionKey || $this->expires > time();
        }
 }
 
@@ -199,7 +205,7 @@ class CookieJar {
                        }
                }
 
-               return implode( "; ", $cookies );
+               return implode( '; ', $cookies );
        }
 
        /**
@@ -209,20 +215,20 @@ class CookieJar {
         * @param $domain String: cookie's domain
         */
        public function parseCookieResponseHeader ( $cookie, $domain ) {
-               $len = strlen( "Set-Cookie:" );
+               $len = strlen( 'Set-Cookie:' );
 
-               if ( substr_compare( "Set-Cookie:", $cookie, 0, $len, TRUE ) === 0 ) {
+               if ( substr_compare( 'Set-Cookie:', $cookie, 0, $len, true ) === 0 ) {
                        $cookie = substr( $cookie, $len );
                }
 
-               $bit = array_map( 'trim', explode( ";", $cookie ) );
+               $bit = array_map( 'trim', explode( ';', $cookie ) );
 
                if ( count( $bit ) >= 1 ) {
-                       list( $name, $value ) = explode( "=", array_shift( $bit ), 2 );
+                       list( $name, $value ) = explode( '=', array_shift( $bit ), 2 );
                        $attr = array();
 
                        foreach ( $bit as $piece ) {
-                               $parts = explode( "=", $piece );
+                               $parts = explode( '=', $piece );
                                if ( count( $parts ) > 1 ) {
                                        $attr[strtolower( $parts[0] )] = $parts[1];
                                } else {