linkeddatacenter / BOTK-core

library/BOTK/Core/EndPoint.php

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 namespace BOTK\Core;
 
 use \InvalidArgumentException;
-use Respect\Rest\Router,
-    Respect\Rest\Request;
-use BOTK\Core\Models\HttpProblem,
-    BOTK\Core\Representations\Error;
+use Respect\Rest\Router;
+use Respect\Rest\Request;
+use BOTK\Core\Models\HttpProblem;
+use BOTK\Core\Representations\Error;
 
 
 

Indentation +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
     protected $endPointPath=null;   //lazy initialization
     protected $endPointName=null;    
         
-     // Hooks to build resusable end-poins
+        // Hooks to build resusable end-poins
     protected function setRoutes() {}
 
     
@@ -94,7 +94,7 @@ 
                 //
                 // $endPointPath:            /service
                 $endPointPath = dirname($scriptName);
-           } elseif (!empty($_SERVER['PATH_INFO']) && $pos = strpos($requestURI,$_SERVER['PATH_INFO']))  {
+            } elseif (!empty($_SERVER['PATH_INFO']) && $pos = strpos($requestURI,$_SERVER['PATH_INFO']))  {
                 // Complex rewriting roule. Try extract application path using PATH_INFO variable
                 // $_SERVER['REQUEST_URI']:     /service/v1/hello/to/world?query_string#fragment
                 // $_SERVER['SCRIPT_NAME']:     /serviceV1/index.php
@@ -186,7 +186,7 @@ 
         //Warning this trigger is called only in php >5.4. Otherwhise just empty content is printed
         //(but original status is preserved)
         if (empty($result) && ($errorCode=Http::getHttpResponseCode()) >= 400) {
-           $result = ErrorManager::getInstance()->serializeHttpProblem(new HttpProblem($errorCode));              
+            $result = ErrorManager::getInstance()->serializeHttpProblem(new HttpProblem($errorCode));              
         }
         return $result;
     }

Spacing +18 added lines, -18 removed lines

@@ -49,9 +49,9 @@ 
 
 class EndPoint extends Router
 {
-    protected $endPointCatalog=array();
-    protected $endPointPath=null;   //lazy initialization
-    protected $endPointName=null;    
+    protected $endPointCatalog = array();
+    protected $endPointPath = null; //lazy initialization
+    protected $endPointName = null;    
         
      // Hooks to build resusable end-poins
     protected function setRoutes() {}
@@ -94,17 +94,17 @@ 
                 //
                 // $endPointPath:            /service
                 $endPointPath = dirname($scriptName);
-           } elseif (!empty($_SERVER['PATH_INFO']) && $pos = strpos($requestURI,$_SERVER['PATH_INFO']))  {
+           } elseif (!empty($_SERVER['PATH_INFO']) && $pos = strpos($requestURI, $_SERVER['PATH_INFO'])) {
                 // Complex rewriting roule. Try extract application path using PATH_INFO variable
                 // $_SERVER['REQUEST_URI']:     /service/v1/hello/to/world?query_string#fragment
                 // $_SERVER['SCRIPT_NAME']:     /serviceV1/index.php
                 // $_SERVER['PATH_INFO']:       /hello/to/world
                 //
                 // $endPointPath:            /service/v1
-                $endPointPath = substr($requestURI,0,$pos);
+                $endPointPath = substr($requestURI, 0, $pos);
             } else {
-                throw new HttpErrorException( HttpProblem::factory(
-                    404,'End-point not found',"Unable autodetecting application path: URI=$requestURI."));
+                throw new HttpErrorException(HttpProblem::factory(
+                    404, 'End-point not found', "Unable autodetecting application path: URI=$requestURI."));
             }
             $this->endPointPath = $endPointPath;
         }
@@ -121,7 +121,7 @@ 
         if (is_null($this->endPointName)) {
             $endPointPath = $this->getEndPointPath();
             $pathinfo = substr($_SERVER['REQUEST_URI'], strlen($endPointPath));
-            $haystack = $pathinfo . '/';
+            $haystack = $pathinfo.'/';
             $this->endPointName = preg_match('@/([a-z0-9]+)[/?#]@', $haystack, $matches) 
                 ? $matches[1] 
                 : '';
@@ -133,7 +133,7 @@ 
 
     public function __construct($virtualhost = null)
     {
-        if (is_null($virtualhost)) $virtualhost=$this->getEndPointPath();
+        if (is_null($virtualhost)) $virtualhost = $this->getEndPointPath();
         
         // Anti-Pattens
         // allow ?_output=MIMETYPE on the URI to override HTTP accept header requests.
@@ -156,7 +156,7 @@ 
     /**
      * Redefine run taking into account mountend end points
      */
-    public function run(Request $request=null)
+    public function run(Request $request = null)
     {
         $endPointName = $this->getEndPointName();
         $applicationPath = $this->getEndPointPath(); 
@@ -165,27 +165,27 @@ 
             ? $this->endPointCatalog[$endPointName]
             : ''; 
 
-        $virtualhost = empty($endPointName)?$applicationPath:($applicationPath.'/'.$endPointName);
+        $virtualhost = empty($endPointName) ? $applicationPath : ($applicationPath.'/'.$endPointName);
        
-        if ( !$routerClass ) {
+        if (!$routerClass) {
             $result = parent::run($request); //fall back to local application routing
         } else {
             // now we test that $routerclass is a valid end_point
             $myClass = get_class();
-            if ($routerClass ==$myClass || is_subclass_of($routerClass, $myClass)){
+            if ($routerClass == $myClass || is_subclass_of($routerClass, $myClass)) {
                 // Create new end-point
                 $endpoint = new $routerClass($virtualhost);
                 $result = $endpoint->run();
             } else {
                 throw new HttpErrorException(HttpProblem::factory( 
-                    500, 'Invalid endpoint', $routerClass.' end point class is not a subClass of '. $myClass));                
+                    500, 'Invalid endpoint', $routerClass.' end point class is not a subClass of '.$myClass));                
             }
         }
         
         //now prepare an error report for humans when something went wrong
         //Warning this trigger is called only in php >5.4. Otherwhise just empty content is printed
         //(but original status is preserved)
-        if (empty($result) && ($errorCode=Http::getHttpResponseCode()) >= 400) {
+        if (empty($result) && ($errorCode = Http::getHttpResponseCode()) >= 400) {
            $result = ErrorManager::getInstance()->serializeHttpProblem(new HttpProblem($errorCode));              
         }
         return $result;
@@ -202,12 +202,12 @@ 
      * See allo cachin at controller level (i.e. caching at resource level)
      *************************************************************************/
      
-    public function representationCachingProcessor($method=Caching::NO)
+    public function representationCachingProcessor($method = Caching::NO)
     {
         $cachingClass = '\\BOTK\\Core\\Caching';
         
-        if ( !method_exists($cachingClass, $method)) $method =Caching::NO; 
-        return array( $cachingClass, $method);
+        if (!method_exists($cachingClass, $method)) $method = Caching::NO; 
+        return array($cachingClass, $method);
     }
 
 }

Braces +6 added lines, -2 removed lines

@@ -133,7 +133,9 @@ 
 
     public function __construct($virtualhost = null)
     {
-        if (is_null($virtualhost)) $virtualhost=$this->getEndPointPath();
+        if (is_null($virtualhost)) {
+            $virtualhost=$this->getEndPointPath();
+        }
         
         // Anti-Pattens
         // allow ?_output=MIMETYPE on the URI to override HTTP accept header requests.
@@ -206,7 +208,9 @@ 
     {
         $cachingClass = '\\BOTK\\Core\\Caching';
         
-        if ( !method_exists($cachingClass, $method)) $method =Caching::NO; 
+        if ( !method_exists($cachingClass, $method)) {
+            $method =Caching::NO;
+        }
         return array( $cachingClass, $method);
     }
 

library/BOTK/Core/Http.php

Doc Comments +4 added lines

@@ -65,6 +65,10 @@
     /*************************************************************************
      * Parsing of response Header
      *************************************************************************/
+
+    /**
+     * @param string $name
+     */
     public static function getResponseHeader($name)
     {
         $sentHeaders = headers_list();

Indentation +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
  */
  
 class Http
- {
+    {
     public static $STATUS_CODES = array(100 => "Continue", 101 => "Switching Protocols", 102 => "Processing", 
         200 => "OK", 201 => "Created", 202 => "Accepted", 203 => "Non-Authoritative Information", 
         204 => "No Content", 205 => "Reset Content", 206 => "Partial Content", 207 => "Multi-Status", 
@@ -43,7 +43,7 @@ 
             $GLOBALS['http_response_code'] = $statusCode; // no other way to simulate http_response_code()
             header($protocol . ' ' . $statusCode . ' ' . $text);
         } else {
-           http_response_code($statusCode);
+            http_response_code($statusCode);
         }
     } 
 
@@ -56,7 +56,7 @@ 
                 ? $GLOBALS['http_response_code']
                 : 200;
         } else {
-           $statusCode=http_response_code();
+            $statusCode=http_response_code();
         }
         
         return $statusCode;
@@ -109,8 +109,8 @@ 
                 $meta = stream_get_meta_data($data);
                 for ($j = 0; isset($meta['wrapper_data'][$j]); $j++){
                     if (strstr(strtolower($meta['wrapper_data'][$j]), 'etag')){
-                       $etag = str_replace('"', '', trim(substr($meta['wrapper_data'][$j], 6)));
-                       break;
+                        $etag = str_replace('"', '', trim(substr($meta['wrapper_data'][$j], 6)));
+                        break;
                     }
                 }
             } elseif (is_object($data) && method_exists($data, 'getEtag')){
@@ -138,7 +138,7 @@ 
     {
         // Skypp if already sent header...
         if ( $lastModifiedOnHeaderVal=self::getResponseHeader('Last-Modified')) {
-             return  $lastModifiedOn  = new \DateTime(trim($lastModifiedOnHeaderVal));
+                return  $lastModifiedOn  = new \DateTime(trim($lastModifiedOnHeaderVal));
         } 
 
         //if $data is a resource try to get creation date from resource metadata
@@ -154,9 +154,9 @@ 
                 
                 for ($j = 0; isset($meta['wrapper_data'][$j]); $j++){
                     if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified')){
-                       $modtime = substr($meta['wrapper_data'][$j], 15);
-                       $lastModifiedOn = new \DateTime($modtime);
-                       break;
+                        $modtime = substr($meta['wrapper_data'][$j], 15);
+                        $lastModifiedOn = new \DateTime($modtime);
+                        break;
                     }
                 }
             }
@@ -169,4 +169,4 @@ 
         
         return $lastModifiedOn;
     }
- }
+    }

Spacing +27 added lines, -27 removed lines

@@ -36,12 +36,12 @@ 
     public static function setHttpResponseCode($statusCode)
     {
         if (version_compare(phpversion(), '5.4', '<')) {         
-            $text = ($statusCode && isset( $httpStatusCodes[$statusCode]))
+            $text = ($statusCode && isset($httpStatusCodes[$statusCode]))
                 ? Http::$STATUS_CODES[$statusCode]
                 : '';
             $protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1');
             $GLOBALS['http_response_code'] = $statusCode; // no other way to simulate http_response_code()
-            header($protocol . ' ' . $statusCode . ' ' . $text);
+            header($protocol.' '.$statusCode.' '.$text);
         } else {
            http_response_code($statusCode);
         }
@@ -56,7 +56,7 @@ 
                 ? $GLOBALS['http_response_code']
                 : 200;
         } else {
-           $statusCode=http_response_code();
+           $statusCode = http_response_code();
         }
         
         return $statusCode;
@@ -69,7 +69,7 @@ 
     {
         $sentHeaders = headers_list();
         foreach ($sentHeaders as $sentHeader) {
-            if (preg_match("/$name:(.+)/i", $sentHeader,$matches)){
+            if (preg_match("/$name:(.+)/i", $sentHeader, $matches)) {
                 return trim($matches[1]);
             }
         }
@@ -78,18 +78,18 @@ 
 
     public static function getETagResponse()
     {
-        return preg_match('/"(.*)"/', self::getResponseHeader('ETag'),$matches)?trim($matches[1]):'';
+        return preg_match('/"(.*)"/', self::getResponseHeader('ETag'), $matches) ? trim($matches[1]) : '';
     }
 
 
     public static function getResponseLinks()
     {
         $sentHeaders = headers_list();
-        $result=array();
+        $result = array();
         foreach ($sentHeaders as $sentHeader) {
-            if (strpos($sentHeader, 'Link:')===0){
+            if (strpos($sentHeader, 'Link:') === 0) {
                 $l = new WebLink;
-                $result[] =$l->httpParse($sentHeader);
+                $result[] = $l->httpParse($sentHeader);
             }
         }
         return $result;
@@ -99,21 +99,21 @@ 
     /**
      * Override ETag with a new calculated value from $data
      */
-    public static function setETagHeader($data,$etag=null)
+    public static function setETagHeader($data, $etag = null)
     {
         // Recaluclate ETag overridin existent one Use  Weak validation
         if (is_null($etag)) {
-            if (is_resource($data)){
+            if (is_resource($data)) {
                 $etag = uniqid();
                 //try http wrapper to get a better value,
                 $meta = stream_get_meta_data($data);
-                for ($j = 0; isset($meta['wrapper_data'][$j]); $j++){
-                    if (strstr(strtolower($meta['wrapper_data'][$j]), 'etag')){
+                for ($j = 0; isset($meta['wrapper_data'][$j]); $j++) {
+                    if (strstr(strtolower($meta['wrapper_data'][$j]), 'etag')) {
                        $etag = str_replace('"', '', trim(substr($meta['wrapper_data'][$j], 6)));
                        break;
                     }
                 }
-            } elseif (is_object($data) && method_exists($data, 'getEtag')){
+            } elseif (is_object($data) && method_exists($data, 'getEtag')) {
                 $etag = $data->getEtag();
             } else {
                 $etag = md5(serialize($data));
@@ -121,39 +121,39 @@ 
             
         }
         // take into account ETags alread sent:
-        $oldETag=self::getETagResponse();
-        if($oldETag){
-            $etag= "\"$oldETag/$etag\"";
+        $oldETag = self::getETagResponse();
+        if ($oldETag) {
+            $etag = "\"$oldETag/$etag\"";
         } else {
-            $etag= "\"$etag\"";            
+            $etag = "\"$etag\"";            
         }
-        header ('ETag: '.$etag);  // use Weak for semantically equivalent value
+        header('ETag: '.$etag); // use Weak for semantically equivalent value
         return $etag;
     }
 
     /**
      * send Last-Modified header if not already set
      */
-    public static function setLastModifiedHeader($data,\DateTime $defaultDate)
+    public static function setLastModifiedHeader($data, \DateTime $defaultDate)
     {
         // Skypp if already sent header...
-        if ( $lastModifiedOnHeaderVal=self::getResponseHeader('Last-Modified')) {
-             return  $lastModifiedOn  = new \DateTime(trim($lastModifiedOnHeaderVal));
+        if ($lastModifiedOnHeaderVal = self::getResponseHeader('Last-Modified')) {
+             return  $lastModifiedOn = new \DateTime(trim($lastModifiedOnHeaderVal));
         } 
 
         //if $data is a resource try to get creation date from resource metadata
-        if ( is_resource($data)){
+        if (is_resource($data)) {
             // try fstat first
             $fstat = @fstat($data);
-            if (!empty($fstat)){
-                $lastModifiedOn = new \DateTime(date('r',$fstat['mtime']));
+            if (!empty($fstat)) {
+                $lastModifiedOn = new \DateTime(date('r', $fstat['mtime']));
             } else {
                 //try http wrapper
                 $meta = stream_get_meta_data($data);
                 $lastModifiedOn = $defaultDate;
                 
-                for ($j = 0; isset($meta['wrapper_data'][$j]); $j++){
-                    if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified')){
+                for ($j = 0; isset($meta['wrapper_data'][$j]); $j++) {
+                    if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified')) {
                        $modtime = substr($meta['wrapper_data'][$j], 15);
                        $lastModifiedOn = new \DateTime($modtime);
                        break;
@@ -163,7 +163,7 @@ 
         } elseif (is_object($data) && method_exists($data, 'getLastModifiedDate')) {
             $lastModifiedOn = $data->getLastModifiedDate();
         } else {
-            $lastModifiedOn  = $defaultDate;
+            $lastModifiedOn = $defaultDate;
         }
         header('Last-Modified: '.$lastModifiedOn->format(\DateTime::RFC2822));
         

library/BOTK/Core/Representations/AbstractContentNegotiationPolicy.php

Doc Comments +3 added lines

@@ -99,6 +99,7 @@ 
 
     /**
      * An helper to setup content type and alternate web link headers
+     * @param string $contentType
      */
     public static function setContentType($contentType, $policyClass = null)
     {
@@ -171,6 +172,7 @@ 
      * if $useCustomFields use an xml representation for fields.. Not yet standarized in html5
      * 
      * This render use html5 semantic tagging.
+     * @param boolean $dataIsHtmlFragment
      */
     public static function htmlSerializer($data, 
             $meta = null,
@@ -245,6 +247,7 @@ 
     /**
      * an super simple template engine!
      * 
+     * @param string $template
      */
     public static function templateSerializer($data, $template) {
         if(ob_start()){

Indentation +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  */
 abstract class AbstractContentNegotiationPolicy
 {
-   // redefine this to change the list of supported response representation
+    // redefine this to change the list of supported response representation
     protected static $renderers = array();
     protected static $parsers = array();
     protected static $translators = array();
@@ -144,8 +144,8 @@ 
      */
     public static function htmlWebLinks(array $links) {
         $html = "<dl>\n";
-         $alternateLinks = array();
-         foreach($links as $link ){
+            $alternateLinks = array();
+            foreach($links as $link ){
             $linkName = $link->rel?$link->rel:'Link';
             $href=$link->href;
             if(0===strcasecmp($linkName,'alternate')){
@@ -157,10 +157,10 @@ 
             } else {
                 $html .= "<dt>$linkName:</dt><dd><a href='$href'>$href</a></dd>\n";
             }
-         }
-         if (count($alternateLinks)){
+            }
+            if (count($alternateLinks)){
             $html .= "<dt>alternate:</dt><dd>".implode(', ',$alternateLinks)."</dd>\n"; 
-         }
+            }
         $html .= "</dl>\n";
         
         return $html;
@@ -205,7 +205,7 @@ 
         // prepare head    
         $head = implode("\n",$metadata);
             
-       // Prepare data content
+        // Prepare data content
         $text = is_scalar($data)
             ? ((string)$data)
             : var_export($data, true);          

Spacing +35 added lines, -35 removed lines

@@ -35,7 +35,7 @@ 
     protected static function getPolicies($index)
     {
         $result = array();
-        $thisClassName= get_called_class(); // late binging from PHP > 5.3
+        $thisClassName = get_called_class(); // late binging from PHP > 5.3
         foreach ($index as $key=>$function) {
             if (!is_callable($function)) {
                 // use late binding classname scope scope
@@ -74,11 +74,11 @@ 
      */
     public static function render($data, array $renderers)
     {
-        $header = array_key_exists('HTTP_ACCEPT', $_SERVER)?$_SERVER['HTTP_ACCEPT']:false;
+        $header = array_key_exists('HTTP_ACCEPT', $_SERVER) ? $_SERVER['HTTP_ACCEPT'] : false;
 
-        $best_match = $header?Mimeparse::bestMatch(array_keys($renderers), $header):reset($renderers);
+        $best_match = $header ? Mimeparse::bestMatch(array_keys($renderers), $header) : reset($renderers);
 
-        $renderer = $best_match?$renderers[$best_match]:'json_encode';
+        $renderer = $best_match ? $renderers[$best_match] : 'json_encode';
         //fallback to json
         return call_user_func($renderer, $data);
     }
@@ -93,7 +93,7 @@ 
      */
     public static function getResourceState($data)
     {
-        return is_object($data)?get_object_vars($data):$data;
+        return is_object($data) ? get_object_vars($data) : $data;
     }
 
 
@@ -103,14 +103,14 @@ 
     public static function setContentType($contentType, $policyClass = null)
     {
         if (is_null($policyClass)) $policyClass = get_called_class();
-        header('Content-Type: ' . $contentType);
-        $selfUri = isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'';
+        header('Content-Type: '.$contentType);
+        $selfUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
         if ($selfUri && is_subclass_of($policyClass, __CLASS__)) {
             $altenatives = array_keys($policyClass::$renderers);
-            header(WebLink::factory($selfUri)->rel('self')->httpSerializer(),false);
+            header(WebLink::factory($selfUri)->rel('self')->httpSerializer(), false);
             foreach ($altenatives as $type) {
                 if ($contentType != $type) {
-                    header(WebLink::factory($selfUri)->rel('alternate')->type($type)->httpSerializer(),false);
+                    header(WebLink::factory($selfUri)->rel('alternate')->type($type)->httpSerializer(), false);
                 }
             }
         }
@@ -129,8 +129,8 @@ 
      */
     public static function htmlWebLinkSerializer(\BOTK\Core\WebLink $link) {
         $tag = '<link href="'.$link->href.'"';
-        foreach (array('rel', 'type','hreflang') as $attribute) {
-            if( $value = $link->$attribute) $tag .= " $attribute='$value'";
+        foreach (array('rel', 'type', 'hreflang') as $attribute) {
+            if ($value = $link->$attribute) $tag .= " $attribute='$value'";
         }
         $tag .= ' />'; 
         
@@ -145,21 +145,21 @@ 
     public static function htmlWebLinks(array $links) {
         $html = "<dl>\n";
          $alternateLinks = array();
-         foreach($links as $link ){
-            $linkName = $link->rel?$link->rel:'Link';
-            $href=$link->href;
-            if(0===strcasecmp($linkName,'alternate')){
-                $type = $link->type?$link->type:'unspecfified type';
+         foreach ($links as $link) {
+            $linkName = $link->rel ? $link->rel : 'Link';
+            $href = $link->href;
+            if (0 === strcasecmp($linkName, 'alternate')) {
+                $type = $link->type ? $link->type : 'unspecfified type';
                 // manage antipatter to make alternate format ccallable from browser
-                $glue=(false===strpos($href, '?'))?'?':'&amp';
-                $forceOutput=$glue.'_output='.urlencode($type);
+                $glue = (false === strpos($href, '?')) ? '?' : '&amp';
+                $forceOutput = $glue.'_output='.urlencode($type);
                 $alternateLinks[] = "<a href='$href{$forceOutput}'>$type</a> ";
             } else {
                 $html .= "<dt>$linkName:</dt><dd><a href='$href'>$href</a></dd>\n";
             }
          }
-         if (count($alternateLinks)){
-            $html .= "<dt>alternate:</dt><dd>".implode(', ',$alternateLinks)."</dd>\n"; 
+         if (count($alternateLinks)) {
+            $html .= "<dt>alternate:</dt><dd>".implode(', ', $alternateLinks)."</dd>\n"; 
          }
         $html .= "</dl>\n";
         
@@ -177,20 +177,20 @@ 
             $title  = null,         
             $header = null,
             $footer = null,
-            $dataIsHtmlFragment=null) {
+            $dataIsHtmlFragment = null) {
         //set defaults
-        if (is_null($meta)) {$meta=array();}
-        if (is_null($title)) {$title= is_object($data)?get_class($data):gettype($data);}
-        if (is_null($header)) {$header="<h1>$title</h1>";}
-        if (is_null($footer)) {$footer='';}
-        if (is_null($dataIsHtmlFragment)) {$dataIsHtmlFragment=false;}
+        if (is_null($meta)) {$meta = array(); }
+        if (is_null($title)) {$title = is_object($data) ? get_class($data) : gettype($data); }
+        if (is_null($header)) {$header = "<h1>$title</h1>"; }
+        if (is_null($footer)) {$footer = ''; }
+        if (is_null($dataIsHtmlFragment)) {$dataIsHtmlFragment = false; }
          
         // initilalize metadata
         
         $metadata = array();       
-        if (is_string($meta) && ($meta=trim($meta))){
+        if (is_string($meta) && ($meta = trim($meta))) {
             $metadata[] = "<link rel='stylesheet' type='text/css' href='$meta'/>";
-        } elseif( is_array($metadata)){
+        } elseif (is_array($metadata)) {
             $metadata = $meta;
         }
          
@@ -200,20 +200,20 @@ 
         foreach ($links as $link) {
             $metadata[] = self::htmlWebLinkSerializer($link);
         }
-        $navLinks = empty($links)?'':static::htmlWebLinks($links);
+        $navLinks = empty($links) ? '' : static::htmlWebLinks($links);
         
         // prepare head    
-        $head = implode("\n",$metadata);
+        $head = implode("\n", $metadata);
             
        // Prepare data content
         $text = is_scalar($data)
-            ? ((string)$data)
+            ? ((string) $data)
             : var_export($data, true);          
-        $htmlDataRepresentation = $dataIsHtmlFragment?$text:htmlspecialchars($text);
+        $htmlDataRepresentation = $dataIsHtmlFragment ? $text : htmlspecialchars($text);
          
         return is_null($meta)  // if meta is null render just data as html fragment
-            ?  $htmlDataRepresentation
-            : ( "<!DOCTYPE html>
+            ? $htmlDataRepresentation
+            : ("<!DOCTYPE html>
 <html>
     <head>
         <meta charset='utf-8'>
@@ -247,7 +247,7 @@ 
      * 
      */
     public static function templateSerializer($data, $template) {
-        if(ob_start()){
+        if (ob_start()) {
             @require $template;
             $result = ob_get_contents();
             ob_end_clean();

Braces +9 added lines, -3 removed lines

@@ -42,7 +42,9 @@ 
                 $function = array($thisClassName, $function);
             }
             // try again to see if now is callable...
-            if (is_callable($function)) $result[$key] = $function;
+            if (is_callable($function)) {
+                $result[$key] = $function;
+            }
         }
 
         return $result;
@@ -102,7 +104,9 @@ 
      */
     public static function setContentType($contentType, $policyClass = null)
     {
-        if (is_null($policyClass)) $policyClass = get_called_class();
+        if (is_null($policyClass)) {
+            $policyClass = get_called_class();
+        }
         header('Content-Type: ' . $contentType);
         $selfUri = isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'';
         if ($selfUri && is_subclass_of($policyClass, __CLASS__)) {
@@ -130,7 +134,9 @@ 
     public static function htmlWebLinkSerializer(\BOTK\Core\WebLink $link) {
         $tag = '<link href="'.$link->href.'"';
         foreach (array('rel', 'type','hreflang') as $attribute) {
-            if( $value = $link->$attribute) $tag .= " $attribute='$value'";
+            if( $value = $link->$attribute) {
+                $tag .= " $attribute='$value'";
+            }
         }
         $tag .= ' />'; 
         

library/BOTK/Core/SimpleTemplateEngine.php

Doc Comments +2 added lines, -4 removed lines

@@ -41,7 +41,6 @@ 
     /**
      * Call Constructor.
      *
-     * @param  string $file
      */   
     public static function factory($template='',$openDelimiter = '{', $closeDelimiter = '}')
     {
@@ -52,8 +51,8 @@ 
     /**
      * Sets the template string.
      *
-     * @param  string $file
      * @throws InvalidArgumentException
+     * @param string $string
      */
      public function setTemplate($string)
      {
@@ -111,8 +110,7 @@ 
     /**
      * Add one template variables.
      *
-     * @param  tag   $values
-     * @param  value $merge
+     * @param  tag   $value
      */
     public function addVar($tag,$value)
     {

Indentation +10 added lines, -10 removed lines

@@ -55,12 +55,12 @@ 
      * @param  string $file
      * @throws InvalidArgumentException
      */
-     public function setTemplate($string)
-     {
-         $this->template=$string;
+        public function setTemplate($string)
+        {
+            $this->template=$string;
          
-         return $this;
-     }
+            return $this;
+        }
      
         
     /**
@@ -83,7 +83,7 @@ 
 
         else {
             throw new InvalidArgumentException(
-              'Template file could not be loaded.'
+                'Template file could not be loaded.'
             );
         }
         
@@ -157,14 +157,14 @@ 
             $error = error_get_last();
 
             throw new RuntimeException(
-              sprintf(
+                sprintf(
                 'Could not write to %s: %s',
                 $target,
                 substr(
-                  $error['message'],
-                  strpos($error['message'], ':') + 2
+                    $error['message'],
+                    strpos($error['message'], ':') + 2
+                )
                 )
-              )
             );
         }
     }

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @param  string $template
      */
-    public function __construct($template='',$openDelimiter = '{', $closeDelimiter = '}')
+    public function __construct($template = '', $openDelimiter = '{', $closeDelimiter = '}')
     {
         $this->setTemplate($template);
         $this->openDelimiter  = $openDelimiter;
@@ -43,9 +43,9 @@ 
      *
      * @param  string $file
      */   
-    public static function factory($template='',$openDelimiter = '{', $closeDelimiter = '}')
+    public static function factory($template = '', $openDelimiter = '{', $closeDelimiter = '}')
     {
-        return new static($template,$openDelimiter, $closeDelimiter);
+        return new static($template, $openDelimiter, $closeDelimiter);
     }
     
     
@@ -57,7 +57,7 @@ 
      */
      public function setTemplate($string)
      {
-         $this->template=$string;
+         $this->template = $string;
          
          return $this;
      }
@@ -71,7 +71,7 @@ 
      */
     public function setFromFile($file)
     {
-        $distFile = $file . '.dist';
+        $distFile = $file.'.dist';
 
         if (file_exists($file)) {
             $this->template = file_get_contents($file);
@@ -114,9 +114,9 @@ 
      * @param  tag   $values
      * @param  value $merge
      */
-    public function addVar($tag,$value)
+    public function addVar($tag, $value)
     {
-        return $this->setVars(array ( $tag => $value));
+        return $this->setVars(array($tag => $value));
     }
 
     /**
@@ -129,7 +129,7 @@ 
         $keys = array();
 
         foreach ($this->values as $key => $value) {
-            $keys[] = $this->openDelimiter . $key . $this->closeDelimiter;
+            $keys[] = $this->openDelimiter.$key.$this->closeDelimiter;
         }
 
         return str_replace($keys, $this->values, $this->template);

Braces +2 added lines, -6 removed lines

@@ -75,13 +75,9 @@
 
         if (file_exists($file)) {
             $this->template = file_get_contents($file);
-        }
-
-        else if (file_exists($distFile)) {
+        } else if (file_exists($distFile)) {
             $this->setTemplate(file_get_contents($distFile));
-        }
-
-        else {
+        } else {
             throw new InvalidArgumentException(
               'Template file could not be loaded.'
             );

library/BOTK/Core/ErrorManager.php

Indentation +2 added lines, -2 removed lines

@@ -107,10 +107,10 @@
                 (string) $e,// developer description is string view for exception
                 $isHttpErrorCode?null:($phpErrorURI.'#'.$errorCode), // guess problem instance
                 $isHttpErrorCode?null:$phpErrorURI // guess problem type
-              );
+                );
         }
          
-       // Set header and rendering payload
+        // Set header and rendering payload
         Http::setHttpResponseCode($problem->httpStatus);
         return  $this->serializeHttpProblem($problem);
     }

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
 
     public function setContentPolicy($contentPolicy)
     {
-        if (!is_subclass_of($contentPolicy,'\\BOTK\\Core\\Representations\\Error')) {
+        if (!is_subclass_of($contentPolicy, '\\BOTK\\Core\\Representations\\Error')) {
             // do not use erromanagement inside erro management :-)
             die("$contentPolicy is not a valid Content Negotiation Policy");
         }
@@ -40,9 +40,9 @@ 
     /**
      * Register or unregister an error handler
      */
-    public function registerErrorHandler( $f = null)
+    public function registerErrorHandler($f = null)
     {
-        if (is_null($this->errorHandler) && is_callable($f)){
+        if (is_null($this->errorHandler) && is_callable($f)) {
             // Initialize
             $this->errorHandler = $f;
             $prioryty = $this->priority;
@@ -51,11 +51,11 @@ 
             // Reset error handler
             restore_error_handler();
             $this->errorHandler = null;
-        } elseif (is_null($this->errorHandler) &&  is_null($f)) {
+        } elseif (is_null($this->errorHandler) && is_null($f)) {
             // Install default
             $priority = $this->priority;
             set_error_handler( 
-                function ($errno, $errstr, $errfile, $errline) use ($priority) 
+                function($errno, $errstr, $errfile, $errline) use ($priority) 
                 {
                     throw new ErrorException($errstr, $errno, $priority, $errfile, $errline);
                 }
@@ -72,7 +72,7 @@ 
     }
  
        
-    public function registerViewer( array $viewer, $errorCode = 0)
+    public function registerViewer(array $viewer, $errorCode = 0)
     {
         $this->viewers[$errorCode] = $viewer;          
     }
@@ -86,27 +86,27 @@ 
     public function serializeHttpProblem(HttpProblem $problem)
     {
         $CNPClassName = $this->contentPolicy;
-        return  $CNPClassName::render($problem,$CNPClassName::renderers());
+        return  $CNPClassName::render($problem, $CNPClassName::renderers());
     }
     
-    public function render( Exception $e)
+    public function render(Exception $e)
     {          
         // build error model from Exception
-        if ($e instanceof HttpErrorException){
+        if ($e instanceof HttpErrorException) {
             $problem = $e->getHttpProblem();
         } else {
             // guess http status code
             $errorCode  = $e->getCode();
-            $isHttpErrorCode = ($errorCode >=400 && array_key_exists($errorCode, Http::$STATUS_CODES));
-            $statusCode = $isHttpErrorCode?$errorCode:500;
+            $isHttpErrorCode = ($errorCode >= 400 && array_key_exists($errorCode, Http::$STATUS_CODES));
+            $statusCode = $isHttpErrorCode ? $errorCode : 500;
 
-            $phpErrorURI='http://php.net/manual/errorfunc.constants';
+            $phpErrorURI = 'http://php.net/manual/errorfunc.constants';
             $problem = new HttpProblem(  // Populate a new HttpProblem model
                 $statusCode,
                 null, // use default title
-                (string) $e,// developer description is string view for exception
-                $isHttpErrorCode?null:($phpErrorURI.'#'.$errorCode), // guess problem instance
-                $isHttpErrorCode?null:$phpErrorURI // guess problem type
+                (string) $e, // developer description is string view for exception
+                $isHttpErrorCode ? null : ($phpErrorURI.'#'.$errorCode), // guess problem instance
+                $isHttpErrorCode ? null : $phpErrorURI // guess problem type
               );
         }
          

library/BOTK/Core/Representations/Standard.php

Indentation +11 added lines, -11 removed lines

@@ -73,12 +73,12 @@ 
     public static function htmlRenderer($data) {
         static::setContentType('text/html');
         $isHtmlFragment=false;
-		$metadata = array(
-				'title'			=> null,
-				'htmlMetadata'	=> static::$htmlMetadata,
-				'header'		=> null,
-				'footer'		=> null,
-		);			
+        $metadata = array(
+                'title'			=> null,
+                'htmlMetadata'	=> static::$htmlMetadata,
+                'header'		=> null,
+                'footer'		=> null,
+        );			
         if( is_object($data) ){
             if (method_exists($data,'__toHtml')) {
                 $resourceState =  $data->__toHtml();
@@ -86,11 +86,11 @@ 
             } else {
                 $resourceState = static::getResourceState($data);
             }
-			if (method_exists($data,'__metadata')){
-				$metadata= array_merge($metadata, $data->__metadata());
-			} else {
-				$metadata['title'] = get_class($data);
-			}
+            if (method_exists($data,'__metadata')){
+                $metadata= array_merge($metadata, $data->__metadata());
+            } else {
+                $metadata['title'] = get_class($data);
+            }
         } else {
             $resourceState = $data;
         }

Spacing +11 added lines, -11 removed lines

@@ -72,22 +72,22 @@ 
      */
     public static function htmlRenderer($data) {
         static::setContentType('text/html');
-        $isHtmlFragment=false;
+        $isHtmlFragment = false;
 		$metadata = array(
 				'title'			=> null,
 				'htmlMetadata'	=> static::$htmlMetadata,
 				'header'		=> null,
 				'footer'		=> null,
 		);			
-        if( is_object($data) ){
-            if (method_exists($data,'__toHtml')) {
-                $resourceState =  $data->__toHtml();
-                $isHtmlFragment=true;
+        if (is_object($data)) {
+            if (method_exists($data, '__toHtml')) {
+                $resourceState = $data->__toHtml();
+                $isHtmlFragment = true;
             } else {
                 $resourceState = static::getResourceState($data);
             }
-			if (method_exists($data,'__metadata')){
-				$metadata= array_merge($metadata, $data->__metadata());
+			if (method_exists($data, '__metadata')) {
+				$metadata = array_merge($metadata, $data->__metadata());
 			} else {
 				$metadata['title'] = get_class($data);
 			}
@@ -95,7 +95,7 @@ 
             $resourceState = $data;
         }
      
-        return static::htmlSerializer( $resourceState, $metadata['htmlMetadata'], $metadata['title'], $metadata['header'], $metadata['footer'], $isHtmlFragment);
+        return static::htmlSerializer($resourceState, $metadata['htmlMetadata'], $metadata['title'], $metadata['header'], $metadata['footer'], $isHtmlFragment);
     }
 
     
@@ -105,7 +105,7 @@ 
      */
     public static function plaintextRenderer($data) {
         static::setContentType('text/plain');
-        return (is_object($data) && method_exists($data,'__toString'))
+        return (is_object($data) && method_exists($data, '__toString'))
             ? (string) $data
             : var_export(static::getResourceState($data), true);
     }     
@@ -149,11 +149,11 @@ 
      * Serialize data structure using Xmlon class.
      * 
      */
-    public static function xmlSerializer($data, array $processingInstructions=array(),$rootElement=null) {
+    public static function xmlSerializer($data, array $processingInstructions = array(), $rootElement = null) {
         if (is_null($rootElement)) $rootElement = 'data';
         $encoder = new \Paranoiq\Xmlon\XmlonEncoder; // for xml serializing
         $encoder->addXmlHeader = false;
-        return implode("\n",$processingInstructions)."\n".$encoder->encode($data,$rootElement);
+        return implode("\n", $processingInstructions)."\n".$encoder->encode($data, $rootElement);
     }  
 
 }

Braces +3 added lines, -1 removed lines

@@ -150,7 +150,9 @@
      * 
      */
     public static function xmlSerializer($data, array $processingInstructions=array(),$rootElement=null) {
-        if (is_null($rootElement)) $rootElement = 'data';
+        if (is_null($rootElement)) {
+            $rootElement = 'data';
+        }
         $encoder = new \Paranoiq\Xmlon\XmlonEncoder; // for xml serializing
         $encoder->addXmlHeader = false;
         return implode("\n",$processingInstructions)."\n".$encoder->encode($data,$rootElement);

library/BOTK/Core/Representations/Error.php

Spacing +13 added lines, -13 removed lines

@@ -50,13 +50,13 @@ 
         static::setContentType('application/api-problem+xml');
         
         $result = "<?xml version='1.0' encoding='UTF-8'?>\n";
-        $result.= "<problem>\n";
-        if($error->problemInstance) $result.= "\t<describedBy>".htmlspecialchars($error->problemInstance)."</describedBy>\n";
-        if($error->title)           $result.= "\t<title>".htmlspecialchars($error->title)."</title>\n";
-        if($error->detail)          $result.= "\t<detail>".htmlspecialchars($error->detail)."</detail>\n";
-        if($error->problemType)     $result.= "\t<supportId>".htmlspecialchars($error->problemType)."</supportId>\n";
-        if($error->httpStatus)      $result.= "\t<httpStatus>$error->httpStatus</httpStatus>\n";
-        $result.= "</problem>\n";
+        $result .= "<problem>\n";
+        if ($error->problemInstance) $result .= "\t<describedBy>".htmlspecialchars($error->problemInstance)."</describedBy>\n";
+        if ($error->title)           $result .= "\t<title>".htmlspecialchars($error->title)."</title>\n";
+        if ($error->detail)          $result .= "\t<detail>".htmlspecialchars($error->detail)."</detail>\n";
+        if ($error->problemType)     $result .= "\t<supportId>".htmlspecialchars($error->problemType)."</supportId>\n";
+        if ($error->httpStatus)      $result .= "\t<httpStatus>$error->httpStatus</httpStatus>\n";
+        $result .= "</problem>\n";
         
         return $result;
     }
@@ -69,20 +69,20 @@ 
         static::setContentType('Content-Type: text/html');
         // Reuse standard html serializer default management
         $metadata = static::$htmlMetadata;
-        if (is_string($metadata)){
+        if (is_string($metadata)) {
             $metadata = array("<link rel='stylesheet' type='text/css' href='$metadata'/>");
         } 
         
-        $head = implode("\n",$metadata);
-        $title =htmlspecialchars("$error->httpStatus $error->title");
-        if($error->problemInstance) {
+        $head = implode("\n", $metadata);
+        $title = htmlspecialchars("$error->httpStatus $error->title");
+        if ($error->problemInstance) {
             $pi = htmlspecialchars($error->problemInstance);
             $problemInstance = "<a href='$pi'>$pi</a>";
-        } else  {
+        } else {
             $problemInstance = 'unknown';
         }
 
-        if($error->problemType) {
+        if ($error->problemType) {
             $pt = htmlspecialchars($error->problemType);
             $problemType = "<a href='$pt'>$pt</a>";
         } else {

Braces +15 added lines, -5 removed lines

@@ -51,11 +51,21 @@
         
         $result = "<?xml version='1.0' encoding='UTF-8'?>\n";
         $result.= "<problem>\n";
-        if($error->problemInstance) $result.= "\t<describedBy>".htmlspecialchars($error->problemInstance)."</describedBy>\n";
-        if($error->title)           $result.= "\t<title>".htmlspecialchars($error->title)."</title>\n";
-        if($error->detail)          $result.= "\t<detail>".htmlspecialchars($error->detail)."</detail>\n";
-        if($error->problemType)     $result.= "\t<supportId>".htmlspecialchars($error->problemType)."</supportId>\n";
-        if($error->httpStatus)      $result.= "\t<httpStatus>$error->httpStatus</httpStatus>\n";
+        if($error->problemInstance) {
+            $result.= "\t<describedBy>".htmlspecialchars($error->problemInstance)."</describedBy>\n";
+        }
+        if($error->title) {
+            $result.= "\t<title>".htmlspecialchars($error->title)."</title>\n";
+        }
+        if($error->detail) {
+            $result.= "\t<detail>".htmlspecialchars($error->detail)."</detail>\n";
+        }
+        if($error->problemType) {
+            $result.= "\t<supportId>".htmlspecialchars($error->problemType)."</supportId>\n";
+        }
+        if($error->httpStatus) {
+            $result.= "\t<httpStatus>$error->httpStatus</httpStatus>\n";
+        }
         $result.= "</problem>\n";
         
         return $result;

library/BOTK/Core/Models/HttpProblem.php

Spacing +8 added lines, -8 removed lines

@@ -20,17 +20,17 @@ 
     public $problemInstance;    
     public $httpStatus;
 
-    public function __construct($httpStatus=null, $title=null, $detail=null, $problemInstance=null, $problemType= null)
+    public function __construct($httpStatus = null, $title = null, $detail = null, $problemInstance = null, $problemType = null)
     {
         // sanitize values
-        if ($httpStatus<400 || $httpStatus> 599) $httpStatus=500;
+        if ($httpStatus < 400 || $httpStatus > 599) $httpStatus = 500;
         
         // set defaults
-        if ( is_null($problemType))       $problemType = 'http://dbpedia.org/resource/Category:HTTP_status_codes';
-        if ( is_null($httpStatus))        $httpStatus = 500;
-        if ( is_null($title))             $title = isset(Http::$STATUS_CODES[$httpStatus])?Http::$STATUS_CODES[$httpStatus]:'Unknown server error';
-        if ( is_null($detail))            $detail = '';
-        if ( is_null($problemInstance))   $problemInstance = 'http://dbpedia.org/resource/HTTP_'.$httpStatus;
+        if (is_null($problemType))       $problemType = 'http://dbpedia.org/resource/Category:HTTP_status_codes';
+        if (is_null($httpStatus))        $httpStatus = 500;
+        if (is_null($title))             $title = isset(Http::$STATUS_CODES[$httpStatus]) ? Http::$STATUS_CODES[$httpStatus] : 'Unknown server error';
+        if (is_null($detail))            $detail = '';
+        if (is_null($problemInstance))   $problemInstance = 'http://dbpedia.org/resource/HTTP_'.$httpStatus;
 
         $this->httpStatus = $httpStatus;
         $this->title = $title;
@@ -39,7 +39,7 @@ 
         $this->problemType = $problemType;
     }
     
-    public static function factory($httpStatus=null, $title=null, $detail=null, $problemInstance=null, $problemType= null)
+    public static function factory($httpStatus = null, $title = null, $detail = null, $problemInstance = null, $problemType = null)
     {
         return new static($httpStatus, $title, $detail, $problemInstance, $problemType);
     }

Braces +18 added lines, -6 removed lines

@@ -23,14 +23,26 @@
     public function __construct($httpStatus=null, $title=null, $detail=null, $problemInstance=null, $problemType= null)
     {
         // sanitize values
-        if ($httpStatus<400 || $httpStatus> 599) $httpStatus=500;
+        if ($httpStatus<400 || $httpStatus> 599) {
+            $httpStatus=500;
+        }
         
         // set defaults
-        if ( is_null($problemType))       $problemType = 'http://dbpedia.org/resource/Category:HTTP_status_codes';
-        if ( is_null($httpStatus))        $httpStatus = 500;
-        if ( is_null($title))             $title = isset(Http::$STATUS_CODES[$httpStatus])?Http::$STATUS_CODES[$httpStatus]:'Unknown server error';
-        if ( is_null($detail))            $detail = '';
-        if ( is_null($problemInstance))   $problemInstance = 'http://dbpedia.org/resource/HTTP_'.$httpStatus;
+        if ( is_null($problemType)) {
+            $problemType = 'http://dbpedia.org/resource/Category:HTTP_status_codes';
+        }
+        if ( is_null($httpStatus)) {
+            $httpStatus = 500;
+        }
+        if ( is_null($title)) {
+            $title = isset(Http::$STATUS_CODES[$httpStatus])?Http::$STATUS_CODES[$httpStatus]:'Unknown server error';
+        }
+        if ( is_null($detail)) {
+            $detail = '';
+        }
+        if ( is_null($problemInstance)) {
+            $problemInstance = 'http://dbpedia.org/resource/HTTP_'.$httpStatus;
+        }
 
         $this->httpStatus = $httpStatus;
         $this->title = $title;

library/BOTK/Core/Controller.php

Spacing +16 added lines, -16 removed lines

@@ -24,16 +24,16 @@ 
   
     public function options() 
     {
-        $supportedOptions[]='OPTIONS';
-        if( method_exists($this, 'get')) { $supportedOptions[]='GET'; $supportedOptions[]='HEAD' ;}
-        if( method_exists($this, 'post')) $supportedOptions[]='POST';
-        if( method_exists($this, 'put')) $supportedOptions[]='PUT';
-        if( method_exists($this, 'delete')) $supportedOptions[]='DELETE';
-        if( method_exists($this, 'patch')) $supportedOptions[]='PATCH';
-        if( method_exists($this, 'trace')) $supportedOptions[]='TRACE';
-        if( method_exists($this, 'connect')) $supportedOptions[]='CONNECT';
+        $supportedOptions[] = 'OPTIONS';
+        if (method_exists($this, 'get')) { $supportedOptions[] = 'GET'; $supportedOptions[] = 'HEAD'; }
+        if (method_exists($this, 'post')) $supportedOptions[] = 'POST';
+        if (method_exists($this, 'put')) $supportedOptions[] = 'PUT';
+        if (method_exists($this, 'delete')) $supportedOptions[] = 'DELETE';
+        if (method_exists($this, 'patch')) $supportedOptions[] = 'PATCH';
+        if (method_exists($this, 'trace')) $supportedOptions[] = 'TRACE';
+        if (method_exists($this, 'connect')) $supportedOptions[] = 'CONNECT';
         
-        header ( 'Allow: '. implode(',', $supportedOptions));
+        header('Allow: '.implode(',', $supportedOptions));
 
         return'';   
     }
@@ -43,28 +43,28 @@ 
      * @param mixed $links can be a weblink, an array of or a single or null to bypas hypermedia management
      * @param mixed cacheFor  can be an integer that represents the max-age of cache or null to bypass caching
      */
-    public function stateTransfer($resource=null,  $links=array())
+    public function stateTransfer($resource = null, $links = array())
     {
         // send links header: manage both a single link both an array
-        if( is_array($links)){
-            foreach ($links as $link){
-                header($link->httpSerializer(),false);
+        if (is_array($links)) {
+            foreach ($links as $link) {
+                header($link->httpSerializer(), false);
             }
-        } elseif( $links){
+        } elseif ($links) {
             header($links->httpSerializer());
         }           
         
         return $resource;
     }
     
-    public function setState($resource=null,  $restorers=array())
+    public function setState($resource = null, $restorers = array())
     {
         // TBD
         return $resource;
     }
 
     
-    public function resourceCachingProcessor($resouce, $sec=0)
+    public function resourceCachingProcessor($resouce, $sec = 0)
     {
         return Caching::processor($resouce, $sec);
     }

Braces +18 added lines, -6 removed lines

@@ -26,12 +26,24 @@
     {
         $supportedOptions[]='OPTIONS';
         if( method_exists($this, 'get')) { $supportedOptions[]='GET'; $supportedOptions[]='HEAD' ;}
-        if( method_exists($this, 'post')) $supportedOptions[]='POST';
-        if( method_exists($this, 'put')) $supportedOptions[]='PUT';
-        if( method_exists($this, 'delete')) $supportedOptions[]='DELETE';
-        if( method_exists($this, 'patch')) $supportedOptions[]='PATCH';
-        if( method_exists($this, 'trace')) $supportedOptions[]='TRACE';
-        if( method_exists($this, 'connect')) $supportedOptions[]='CONNECT';
+        if( method_exists($this, 'post')) {
+            $supportedOptions[]='POST';
+        }
+        if( method_exists($this, 'put')) {
+            $supportedOptions[]='PUT';
+        }
+        if( method_exists($this, 'delete')) {
+            $supportedOptions[]='DELETE';
+        }
+        if( method_exists($this, 'patch')) {
+            $supportedOptions[]='PATCH';
+        }
+        if( method_exists($this, 'trace')) {
+            $supportedOptions[]='TRACE';
+        }
+        if( method_exists($this, 'connect')) {
+            $supportedOptions[]='CONNECT';
+        }
         
         header ( 'Allow: '. implode(',', $supportedOptions));