5.3 compatibility

Author: dracony

src/PHPixie/HTTP/Messages/URI.php

@@ -30,7 +30,7 @@ abstract class URI implements UriInterface
      * @const string
      */
     const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
-    
+
     /**
      * generated uri string cache
      * @var string|null
@@ -42,7 +42,7 @@ abstract class URI implements UriInterface
     public function __toString()
     {
         if ($this->uriString === null) {
-            
+
             $uri = '';
 
             if(($scheme = $this->getScheme()) !== '') {
@@ -59,22 +59,22 @@ public function __toString()
             if(($fragment = $this->getFragment()) !== '') {
                 $uri .= '#' . $fragment;
             }
-            
+
             $this->uriString = $uri;
         }
-        
+
         return $this->uriString;
     }
 
     public function getAuthority()
     {
         $authority = '';
         $authority.= $this->getHost();
-        
+
         if (($userInfo = $this->getUserInfo()) !== '') {
             $authority = $userInfo . '@' . $authority;
         }
-        
+
         $port = $this->getPort();
         if ($port !== null) {
             $authority .= ':' . $port;
@@ -87,7 +87,7 @@ public function getScheme()
     {
         return $this->part('scheme');
     }
-    
+
     public function getUserInfo()
     {
         return $this->part('userInfo');
@@ -101,11 +101,11 @@ public function getHost()
     public function getPort()
     {
         $port = $this->part('port');
-        
+
         if($this->isStandardPort($this->getScheme(), $port)) {
             $port = null;
         }
-        
+
         return $port;
     }
 
@@ -128,8 +128,8 @@ public function withScheme($scheme)
     {
         $scheme = strtolower($scheme);
         $scheme = str_replace('://', '', $scheme);
-        
-        if (!in_array($scheme, ['', 'http', 'https'], true)) {
+
+        if (!in_array($scheme, array('', 'http', 'https'), true)) {
             throw new InvalidArgumentException("Unsupported scheme '$scheme', must be either 'http', 'https' or ''");
         }
 
@@ -139,14 +139,14 @@ public function withScheme($scheme)
     public function withUserInfo($user, $password = null)
     {
         $userInfo = $this->normalizePart($user);
-        
+
         if ($userInfo !== '' && $password !== null) {
             $userInfo.= ':' . $password;
         }
-        
+
         return $this->updatePart('userInfo', $userInfo);
     }
-    
+
     protected function updatePart($key, $value)
     {
         $new = clone $this;
@@ -155,7 +155,7 @@ protected function updatePart($key, $value)
 
         return $new;
     }
-    
+
     public function withHost($host)
     {
         $host = $this->normalizePart($host);
@@ -168,14 +168,14 @@ public function withPort($port)
             if (!is_numeric($port)) {
                 throw new InvalidArgumentException("Port '$port' is not numeric");
             }
-            
+
             $port = (int) $port;
-            
+
             if ($port < 1 || $port > 65535) {
                 throw new InvalidArgumentException("Invalid port '$port' specified");
             }
         }
-        
+
         return $this->updatePart('port', $port);
     }
 
@@ -197,25 +197,25 @@ public function withFragment($fragment)
         $fragment = $this->normalizeFragment($fragment);
         return $this->updatePart('fragment', $fragment);
     }
-    
+
     protected function normalizeFragment($fragment)
     {
         $fragment = $this->normalizePart($fragment, '#');
         return $this->normalizeQueryString($fragment);
     }
-    
+
     protected function normalizePart($part, $prefix = null) {
         if($part === null || $part === '') {
             return '';
         }
-        
+
         if($prefix !== null && $part[0] === $prefix) {
             return substr($part, 1);
         }
-        
+
         return $part;
     }
-    
+
     /**
      * Is a given port non-standard for the current scheme?
      *
@@ -252,11 +252,11 @@ protected function normalizePath($path)
         if (strpos($path, '#') !== false) {
             throw new InvalidArgumentException("Path '$path' contains '#'");
         }
-         
+
         if ($path === null || $path === '') {
             return '/';
         }
-        
+
         if($path[0] !== '/') {
             $path = '/' . $path;
         }
@@ -270,10 +270,10 @@ protected function normalizePath($path)
 
     /**
      * Filter a query string to ensure it is propertly encoded.
-     * 
+     *
      * Ensures that the values in the query string are properly urlencoded.
-     * 
-     * @param string $query 
+     *
+     * @param string $query
      * @return string
      */
     protected function normalizeQuery($query)
@@ -283,17 +283,17 @@ protected function normalizeQuery($query)
                 'Query string must not include a URI fragment'
             );
         }
-        
-        $query = $this->normalizePart($query, '?');        
-        
+
+        $query = $this->normalizePart($query, '?');
+
         $pairs = explode('&', $query);
-        
+
         foreach ($pairs as $pairKey => $pair) {
             $pair = explode('=', $pair, 2);
             foreach($pair as $key => $value) {
                 $pair[$key] = $this->normalizeQueryString($value);
             }
-            
+
             $parts[$pairKey] = implode('=', $pair);
         }
 
@@ -307,27 +307,27 @@ protected function normalizeQuery($query)
      * @return string
      */
     protected function normalizeQueryString($value)
-    {        
+    {
         return preg_replace_callback(
             '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
             array($this, 'encodeMatchedQueryPart'),
             $value
         );
     }
-    
+
     protected function encodeMatchedQueryPart($matches) {
         return rawurlencode($matches[0]);
     }
-    
+
     protected function part($name)
     {
         if(!array_key_exists($name, $this->parts)) {
             $this->requirePart($name);
         }
-        
+
         return $this->parts[$name];
     }
-    
+
     protected function requirePart($name)
     {
         if($name === 'port') {
@@ -336,4 +336,4 @@ protected function requirePart($name)
             $this->parts[$name] = '';
         }
     }
-}
+}