NatLibFi / Skosmos

model/ConceptSearchParameters.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         if ($this->rest) {
             return $term;
         }
-        return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
+        return strpos($term, "*") === false ? $term."*" : $term; // default to prefix search
     }
 
     public function getContentLang()

Braces +3 added lines, -2 removed lines

@@ -69,8 +69,9 @@
     public function getSearchTerm()
     {
         $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query');
-        if (!$term && $this->rest)
-            $term = $this->request->getQueryParamRaw('label');
+        if (!$term && $this->rest) {
+                    $term = $this->request->getQueryParamRaw('label');
+        }
         $term = trim($term); // surrounding whitespace is not considered significant
         if ($this->rest) {
             return $term;

controller/RestController.php

Braces +18 added lines, -6 removed lines

@@ -400,7 +400,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         // case 2: case-insensitive match on preferred label
         foreach ($results as $res) {
@@ -408,7 +410,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         if ($lang === null) {
             // case 1A: exact match on preferred label in any language
@@ -419,7 +423,9 @@ 
                     $hits[] = $res;
                 }
             }
-            if (sizeof($hits) > 0) return $hits;
+            if (sizeof($hits) > 0) {
+              return $hits;
+            }
 
             // case 2A: case-insensitive match on preferred label in any language
             foreach ($results as $res) {
@@ -429,7 +435,9 @@ 
                     $hits[] = $res;
                 }
             }
-            if (sizeof($hits) > 0) return $hits;
+            if (sizeof($hits) > 0) {
+              return $hits;
+            }
         }
 
         // case 3: exact match on alternate label
@@ -438,7 +446,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
 
         // case 4: case-insensitive match on alternate label
@@ -447,7 +457,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         return $hits;
     }

Indentation +7 added lines, -7 removed lines

@@ -575,9 +575,9 @@ 
                 $vocid = $request->getVocab()->getId();
                 return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang");
             }
-		} else {
+    } else {
             header("Location: " . $urls[$format]);
-		}
+    }
     }
 
     private function returnDataResults($results, $format) {
@@ -1100,15 +1100,15 @@ 
         foreach($changeList as $conceptInfo) {
             if (array_key_exists('date', $conceptInfo)) {
                 $simpleChangeList[] =  array( 'uri' => $conceptInfo['uri'],
-                                               'prefLabel' => $conceptInfo['prefLabel'],
-                                               'date' => $conceptInfo['date']->format("Y-m-d\TH:i:sO") );
+                                                'prefLabel' => $conceptInfo['prefLabel'],
+                                                'date' => $conceptInfo['date']->format("Y-m-d\TH:i:sO") );
             }
         }
         return $this->returnJson(array_merge_recursive($this->context,
                                                         array('@context' => array( '@language' => $request->getLang(),
-                                                                                     'prefLabel' => 'skos:prefLabel',
-                                                                                     'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-                                                                                     'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
+                                                                                      'prefLabel' => 'skos:prefLabel',
+                                                                                      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
+                                                                                      'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
                                                         ),
                                                         array('changeList' => $simpleChangeList)));
 

Doc Comments +36 added lines

@@ -97,6 +97,9 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param Request $request
+     */
     private function constructSearchParameters($request)
     {
         $parameters = new ConceptSearchParameters($request, $this->model->getConfig(), true);
@@ -112,6 +115,10 @@ 
         return $parameters;
     }
 
+    /**
+     * @param Request $request
+     * @param ConceptSearchParameters $parameters
+     */
     private function transformSearchResults($request, $results, $parameters)
     {
         // before serializing to JSON, get rid of the Vocabulary object that came with each resource
@@ -420,6 +427,10 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param string $label
+     * @param string $lang
+     */
     private function findLookupHits($results, $label, $lang)
     {
         $hits = array();
@@ -481,6 +492,9 @@ 
         return $hits;
     }
 
+    /**
+     * @param string $lang
+     */
     private function transformLookupResults($lang, $hits)
     {
         if (sizeof($hits) == 0) {
@@ -555,6 +569,9 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param Request $request
+     */
     private function redirectToVocabData($request) {
         $urls = $request->getVocab()->getConfig()->getDataURLs();
         if (sizeof($urls) == 0) {
@@ -580,6 +597,10 @@ 
 		}
     }
 
+    /**
+     * @param string $results
+     * @param string $format
+     */
     private function returnDataResults($results, $format) {
         if ($format == 'application/ld+json' || $format == 'application/json') {
             // further compact JSON-LD document using a context
@@ -791,6 +812,12 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param string $uri
+     * @param string $lang
+     * @param string $propname
+     * @param string $propuri
+     */
     private function transformPropertyResults($uri, $lang, $objects, $propname, $propuri)
     {
         $results = array();
@@ -805,6 +832,14 @@ 
         );
     }
 
+    /**
+     * @param string $uri
+     * @param string $lang
+     * @param string $tpropname
+     * @param string $tpropuri
+     * @param string $dpropname
+     * @param string $dpropuri
+     */
     private function transformTransitivePropertyResults($uri, $lang, $objects, $tpropname, $tpropuri, $dpropname, $dpropuri)
     {
         $results = array();
@@ -1095,6 +1130,7 @@ 
      * @param Request $request
      * @param int $offset starting index offset
      * @param int $limit maximum number of concepts to return
+     * @param string $prop
      * @return object json-ld wrapped list of changed concepts
      */
     private function changedConcepts($request, $prop, $offset, $limit)

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".json_encode($data).");";
             return;
         }
 
@@ -88,7 +88,7 @@ 
                 'vocabularies' => 'onki:hasVocabulary',
                 'id' => 'onki:vocabularyIdentifier',
                 'uri' => '@id',
-                '@base' => $this->getBaseHref() . "rest/v1/vocabularies",
+                '@base' => $this->getBaseHref()."rest/v1/vocabularies",
             ),
             'uri' => '',
             'vocabularies' => $results,
@@ -105,7 +105,7 @@ 
         // convert to vocids array to support multi-vocabulary search
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array();
         $vocabObjects = array();
-        foreach($vocids as $vocid) {
+        foreach ($vocids as $vocid) {
             $vocabObjects[] = $this->model->getVocabulary($vocid);
         }
         $parameters->setVocabularies($vocabObjects);
@@ -136,12 +136,12 @@ 
         foreach ($parameters->getAdditionalFields() as $field) {
 
             // Quick-and-dirty compactification
-            $context[$field] = 'skos:' . $field;
+            $context[$field] = 'skos:'.$field;
             foreach ($results as &$result) {
                 foreach ($result as $k => $v) {
-                    if ($k == 'skos:' . $field) {
+                    if ($k == 'skos:'.$field) {
                         $result[$field] = $v;
-                        unset($result['skos:' . $field]);
+                        unset($result['skos:'.$field]);
                     }
                 }
             }
@@ -160,7 +160,7 @@ 
         if ($request->getQueryParam('labellang')) {
             $ret['@context']['@language'] = $request->getQueryParam('labellang');
         } elseif ($request->getQueryParam('lang')) {
-            $ret['@context']['@language'] = $request->getQueryParam('lang');;
+            $ret['@context']['@language'] = $request->getQueryParam('lang'); ;
         }
         return $ret;
     }
@@ -229,7 +229,7 @@ 
                 'prefLabel' => 'skos:prefLabel',
                 'title' => 'dct:title',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/",
             ),
             'uri' => '',
             'id' => $vocab->getId(),
@@ -283,7 +283,7 @@ 
                 'subTypes' => array('@id' => 'void:class', '@type' => '@id'),
                 'count' => 'void:entities',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -360,7 +360,7 @@ 
                 'language' => 'void-ext:language',
                 'properties' => 'void:propertyPartition',
                 'labels' => 'void:triples',
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -401,7 +401,7 @@ 
             $types[] = $type;
         }
 
-        $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/";
+        $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/";
 
         $ret = array_merge_recursive($this->context, array(
             '@context' => array(
@@ -564,19 +564,19 @@ 
 
         $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls)));
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls)));
         }
         if (is_array($urls[$format])) {
             $arr = $urls[$format];
             $dataLang = $request->getLang();
             if (isset($arr[$dataLang])) {
-                header("Location: " . $arr[$dataLang]);
+                header("Location: ".$arr[$dataLang]);
             } else {
                 $vocid = $request->getVocab()->getId();
                 return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang");
             }
 		} else {
-            header("Location: " . $urls[$format]);
+            header("Location: ".$urls[$format]);
 		}
     }
 
@@ -639,7 +639,7 @@ 
 
         $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS);
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS);
         }
 
         $vocid = $vocab ? $vocab->getId() : null;
@@ -924,7 +924,7 @@ 
                         }
                     }
                     // if the main concept scheme was not found, set 'top' to the first 'tops' (sorted alphabetically on the URIs)
-                    if (! isset($results[$uri]['top'])) {
+                    if (!isset($results[$uri]['top'])) {
                         $results[$uri]['top'] = $results[$uri]['tops'][0];
                     }
                 } else {
@@ -1102,18 +1102,18 @@ 
         $changeList = $request->getVocab()->getChangeList($prop, $request->getLang(), $offset, $limit);
 
         $simpleChangeList = array();
-        foreach($changeList as $conceptInfo) {
+        foreach ($changeList as $conceptInfo) {
             if (array_key_exists('date', $conceptInfo)) {
-                $simpleChangeList[] =  array( 'uri' => $conceptInfo['uri'],
+                $simpleChangeList[] = array('uri' => $conceptInfo['uri'],
                                                'prefLabel' => $conceptInfo['prefLabel'],
-                                               'date' => $conceptInfo['date']->format("Y-m-d\TH:i:sO") );
+                                               'date' => $conceptInfo['date']->format("Y-m-d\TH:i:sO"));
             }
         }
         return $this->returnJson(array_merge_recursive($this->context,
-                                                        array('@context' => array( '@language' => $request->getLang(),
+                                                        array('@context' => array('@language' => $request->getLang(),
                                                                                      'prefLabel' => 'skos:prefLabel',
                                                                                      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-                                                                                     'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
+                                                                                     'date' => array('@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime'))
                                                         ),
                                                         array('changeList' => $simpleChangeList)));
 

model/PluginRegister.php

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 class PluginRegister {
     private $requestedPlugins;
 
-    public function __construct($requestedPlugins=array()) {
+    public function __construct($requestedPlugins = array()) {
         $this->requestedPlugins = $requestedPlugins;
     }
 
@@ -31,7 +31,7 @@ 
      * @param boolean $raw interpret $type values as raw text instead of files
      * @return array
      */
-    private function filterPlugins($type, $raw=false) {
+    private function filterPlugins($type, $raw = false) {
         $plugins = $this->getPlugins();
         $ret = array();
         if (!empty($plugins)) {
@@ -43,7 +43,7 @@ 
                     }
                     else {
                         foreach ($files[$type] as $file) {
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                         }
                     }
                 }
@@ -74,7 +74,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsJS($names=null) {
+    public function getPluginsJS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('js', $names);
@@ -87,7 +87,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsCSS($names=null) {
+    public function getPluginsCSS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('css', $names);
@@ -100,7 +100,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsTemplates($names=null) {
+    public function getPluginsTemplates($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('templates', $names);
@@ -113,15 +113,15 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getTemplates($names=null) {
+    public function getTemplates($names = null) {
         $templateStrings = array();
         $plugins = $this->getPluginsTemplates($names);
         foreach ($plugins as $folder => $templates) {
             foreach ($templates as $path) {
                 if (file_exists($path)) {
                     $filename = explode('/', $path);
-                    $filename = $filename[sizeof($filename)-1];
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
+                    $filename = $filename[sizeof($filename) - 1];
+                    $id = $folder.'-'.substr($filename, 0, (strrpos($filename, ".")));
                     $templateStrings[$id] = file_get_contents($path);
                 }
             }

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
                     $ret[$name] = array();
                     if ($raw) {
                         $ret[$name] = $files[$type];
-                    }
-                    else {
+                    } else {
                         foreach ($files[$type] as $file) {
                             array_push($ret[$name], 'plugins/' . $name . '/' . $file);
                         }

model/Cache.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * Wraps apc_store() and apcu_store()
      */
-    public function store($key, $value, $ttl=3600) {
+    public function store($key, $value, $ttl = 3600) {
         if (function_exists('apcu_store')) {
             return apcu_store($key, $value, $ttl);
         }

controller/WebController.php

Braces +9 added lines, -3 removed lines

@@ -307,11 +307,17 @@
         $subject = $this->model->getConfig()->getServiceName() . " feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
-        if (empty($sender)) $sender = $envelopeSender;
-        if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress();
+        if (empty($sender)) {
+          $sender = $envelopeSender;
+        }
+        if (empty($sender)) {
+          $sender = $this->model->getConfig()->getFeedbackAddress();
+        }
 
         // determine sender name - default to "anonymous user" if not given by user
-        if (empty($fromName)) $fromName = "anonymous user";
+        if (empty($fromName)) {
+          $fromName = "anonymous user";
+        }
 
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender);
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";

Doc Comments +7 added lines

@@ -235,6 +235,11 @@ 
             ));
     }
 
+    /**
+     * @param string $fromName
+     * @param string|null $fromEmail
+     * @param string $sender
+     */
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     {
         $headers = "MIME-Version: 1.0" . "\r\n";
@@ -256,6 +261,7 @@ 
      * @param string $fromName senders own name.
      * @param string $fromEmail senders email address.
      * @param string $fromVocab which vocabulary is the feedback related to.
+     * @param string $toMail
      */
     public function sendFeedback($request, $message, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
     {
@@ -538,6 +544,7 @@ 
 
     /**
      * Invokes a very generic errorpage.
+     * @param string $message
      */
     public function invokeGenericErrorPage($request, $message = null)
     {

Indentation +4 added lines, -4 removed lines

@@ -594,10 +594,10 @@
     }
 
     /**
-    * Formats the list of concepts as labels arranged by modification month
-    * @param Array $changeList
-    * @param string $lang the language for displaying dates in the change list
-    */
+     * Formats the list of concepts as labels arranged by modification month
+     * @param Array $changeList
+     * @param string $lang the language for displaying dates in the change list
+     */
     public function formatChangeList($changeList, $lang)
     {
         $formatByDate = array();

Spacing +23 added lines, -23 removed lines

@@ -37,7 +37,7 @@ 
         // specify where to look for templates and cache
         $loader = new Twig_Loader_Filesystem('view');
         // initialize Twig environment
-        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
+        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true));
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
@@ -60,7 +60,7 @@ 
         $this->twig->addFilter(new Twig_SimpleFilter('link_url', array($this, 'linkUrlFilter')));
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -237,17 +237,17 @@ 
 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     {
-        $headers = "MIME-Version: 1.0" . "\r\n";
-        $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n";
+        $headers = "MIME-Version: 1.0"."\r\n";
+        $headers .= "Content-type: text/html; charset=UTF-8"."\r\n";
         if (!empty($toMail)) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
         if (!empty($fromEmail)) {
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
         }
 
         $service = $this->model->getConfig()->getServiceName();
-        return $headers . "From: $fromName via $service <$sender>";
+        return $headers."From: $fromName via $service <$sender>";
     }
 
     /**
@@ -261,11 +261,11 @@ 
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         if ($fromVocab !== null && $fromVocab !== '') {
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
         }
 
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
+        $subject = $this->model->getConfig()->getServiceName()." feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
         if (empty($sender)) $sender = $envelopeSender;
@@ -278,10 +278,10 @@ 
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
 
         // adding some information about the user for debugging purposes.
-        $message = $message . "<br /><br /> Debugging information:"
-            . "<br />Timestamp: " . date(DATE_RFC2822)
-            . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT')
-            . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
+        $message = $message."<br /><br /> Debugging information:"
+            . "<br />Timestamp: ".date(DATE_RFC2822)
+            . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $subject, $message, $headers, $params);
@@ -289,7 +289,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error-page.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -336,7 +336,7 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
             }
         }
@@ -347,7 +347,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
             $this->invokeGenericErrorPage($request, $e->getMessage());
             return;
@@ -363,7 +363,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
@@ -388,7 +388,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -409,7 +409,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -426,7 +426,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $searchResults,
                 'search_count' => $counts,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'limit_parent' => $parameters->getParentLimit(),
                 'limit_type' =>  $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null,
                 'limit_group' => $parameters->getGroupLimit(),
@@ -557,7 +557,7 @@ 
      * Loads and renders the view containing a list of recent changes in the vocabulary.
      * @param Request $request
      */
-    public function invokeChangeList($request, $prop='dc:created')
+    public function invokeChangeList($request, $prop = 'dc:created')
     {
         $offset = ($request->getQueryParam('offset') && is_numeric($request->getQueryParam('offset')) && $request->getQueryParam('offset') >= 0) ? $request->getQueryParam('offset') : 0;
         $limit = ($request->getQueryParam('limit') && is_numeric($request->getQueryParam('limit')) && $request->getQueryParam('limit') >= 0) ? $request->getQueryParam('limit') : 200;
@@ -585,7 +585,7 @@ 
      * @param int $limit maximum number of concepts to return
      * @return Array list of concepts
      */
-    public function getChangeList($request, $prop, $offset=0, $limit=200)
+    public function getChangeList($request, $prop, $offset = 0, $limit = 200)
     {
         // set language parameters for gettext
         $this->setLanguageProperties($request->getLang());
@@ -601,9 +601,9 @@ 
     public function formatChangeList($changeList, $lang)
     {
         $formatByDate = array();
-        foreach($changeList as $concept) {
+        foreach ($changeList as $concept) {
             $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
-            $formatByDate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
+            $formatByDate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true).Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
         }
         return $formatByDate;
     }

model/GlobalConfig.php

Braces +3 added lines, -1 removed lines

@@ -109,10 +109,12 @@
      */
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $fullUri) {
-            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf\RdfNamespace::set($prefix, $fullUri);
             }
+            }
         }
     }
 

Spacing +7 added lines, -7 removed lines

@@ -28,17 +28,17 @@ 
      */
     private $configModifiedTime = null;
 
-    public function __construct($config_name='/../config.ttl')
+    public function __construct($config_name = '/../config.ttl')
     {
         $this->cache = new Cache();
         try {
-            $this->filePath = realpath( dirname(__FILE__) . $config_name );
+            $this->filePath = realpath(dirname(__FILE__).$config_name);
             if (!file_exists($this->filePath)) {
                 throw new Exception('config.ttl file is missing, please provide one.');
             }
             $this->initializeConfig();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }
@@ -72,8 +72,8 @@ 
             // use APC user cache to store parsed config.ttl configuration
             if ($this->cache->isAvailable() && !is_null($this->configModifiedTime)) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->filePath) . ", " . $this->configModifiedTime;
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->filePath).", ".$this->configModifiedTime;
+                $nskey = "namespaces of ".$key;
                 $this->graph = $this->cache->fetch($key);
                 $this->namespaces = $this->cache->fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -94,7 +94,7 @@ 
             $this->resource = $configResources[0];
             $this->initializeNamespaces();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }      
     }
 
@@ -324,7 +324,7 @@ 
     public function getGlobalPlugins()
     {
         $globalPlugins = array();
-        $globalPluginsResource =  $this->getResource()->getResource("skosmos:globalPlugins");
+        $globalPluginsResource = $this->getResource()->getResource("skosmos:globalPlugins");
         if ($globalPluginsResource) {
             foreach ($globalPluginsResource as $resource) {
                 $globalPlugins[] = $resource->getValue();

model/Model.php

Braces +6 added lines, -3 removed lines

@@ -350,10 +350,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf\RdfNamespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore
@@ -475,8 +477,9 @@ 
 
         // no preferred vocabulary, or it was not found, search in which vocabulary the concept has a label
         foreach ($vocabs as $vocab) {
-            if ($vocab->getConceptLabel($uri, null) !== null)
-                return $vocab;
+            if ($vocab->getConceptLabel($uri, null) !== null) {
+                            return $vocab;
+            }
         }
 
         // if the URI couldn't be found, fall back to the first vocabulary

Spacing +8 added lines, -8 removed lines

@@ -220,18 +220,18 @@ 
         }
 
         $vocabs = $params->getVocabs();
-        $showDeprecated=false;
+        $showDeprecated = false;
         if (sizeof($vocabs) === 1) { // search within vocabulary
             $voc = $vocabs[0];
             $sparql = $voc->getSparql();
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
         } else { // multi-vocabulary or global search
             $voc = null;
             $sparql = $this->getDefaultSparql();
             // @TODO : in a global search showDeprecated will always be false and cannot be set globally
         }
 
-        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params,$showDeprecated);
+        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params, $showDeprecated);
         if ($params->getRest() && $results && $params->getSearchLimit() !== 0) {
           $results = array_slice($results, $params->getOffset(), $params->getSearchLimit());
         }
@@ -386,7 +386,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->globalConfig->getGraph()->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -469,9 +469,9 @@ 
         }
 
         // if there are multiple vocabularies and one is the preferred vocabulary, return it
-        if($preferredVocabId != null) {
+        if ($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
-                if($vocab->getId() == $preferredVocabId) {
+                if ($vocab->getId() == $preferredVocabId) {
                     // double check that a label exists in the preferred vocabulary
                     if ($vocab->getConceptLabel($uri, null) !== null) {
                         return $vocab;
@@ -553,7 +553,7 @@ 
         // using apc cache for the resource if available
         if ($this->globalConfig->getCache()->isAvailable()) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . $uri;
+            $key = 'fetch: '.$uri;
             $resource = $this->globalConfig->getCache()->fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->resolver->resolve($uri, $this->getConfig()->getHttpTimeout());
@@ -574,7 +574,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

model/BaseConfig.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * @param string $default default value
      * @param string $lang preferred language for the literal
      */
-    protected function getLiteral($property, $default=null, $lang=null)
+    protected function getLiteral($property, $default = null, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 
         // not found with selected language, try any language
         $literal = $this->getResource()->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
 
         return $default;
     }

Indentation +5 added lines, -5 removed lines

@@ -7,11 +7,11 @@
 abstract class BaseConfig extends DataObject
 {
 
-	/**
-     * Returns a boolean value based on a literal value from the config.ttl configuration.
-     * @param string $property the property to query
-     * @param boolean $default the default value if the value is not set in configuration
-     */
+  /**
+   * Returns a boolean value based on a literal value from the config.ttl configuration.
+   * @param string $property the property to query
+   * @param boolean $default the default value if the value is not set in configuration
+   */
     protected function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

model/VocabularyConfig.php

Braces +15 added lines, -7 removed lines

@@ -58,8 +58,9 @@ 
     public function getShortName()
     {
         $shortname = $this->getLiteral('skosmos:shortName');
-        if ($shortname)
-          return $shortname;
+        if ($shortname) {
+                  return $shortname;
+        }
 
         // if no shortname exists fall back to the id
         return $this->getId();
@@ -194,10 +195,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -214,10 +217,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -329,11 +334,12 @@ 
     public function getId()
     {
         $uriparts = explode("#", $this->resource->getURI());
-        if (count($uriparts) != 1)
-        // hash namespace
+        if (count($uriparts) != 1) {
+                // hash namespace
         {
             return $uriparts[1];
         }
+        }
 
         // slash namespace
         $uriparts = explode("/", $this->resource->getURI());
@@ -361,10 +367,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // prefixing if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // prefixing if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }

Doc Comments +4 added lines, -2 removed lines

@@ -266,6 +266,7 @@ 
 
     /**
      * Returns skosmos:marcSourcecode value set in config.ttl.
+     * @param string $lang
      * @return string marcsource name
      */
     public function getMarcSourceCode($lang = null)
@@ -275,7 +276,7 @@ 
 
     /**
      * Returns a boolean value set in the config.ttl config.
-     * @return array array of concept class URIs (can be empty)
+     * @return string[] array of concept class URIs (can be empty)
      */
     public function getIndexClasses()
     {
@@ -284,7 +285,7 @@ 
 
     /**
      * Returns skosmos:externalProperty values set in the config.ttl config.
-     * @return array array of external property URIs (can be empty)
+     * @return string[] array of external property URIs (can be empty)
      */
     public function getExtProperties()
     {
@@ -410,6 +411,7 @@ 
 
     /**
      * Returns the vocabulary dc:type value(s) with their labels and uris, if set in the vocabulary configuration.
+     * @param string $lang
      * @return array of objects or an empty array
      */
     public function getTypes($lang = null)

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
     "skos:related", "skos:historyNote", "skosmos:memberOf",
     "skosmos:memberOfArray");
 
-    public function __construct($resource, $globalPlugins=array())
+    public function __construct($resource, $globalPlugins = array())
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -56,7 +56,7 @@ 
                         $paramValue = $paramLiteral->getValue();
                         $paramLang = $paramLiteral->getLang();
                         if ($paramLang) {
-                            $paramName .= '_' . $paramLang;
+                            $paramName .= '_'.$paramLang;
                         }
                         $this->pluginParameters[$pluginName][$paramName] = $paramValue;
                     }
@@ -83,7 +83,7 @@ 
         $langs = $this->getLanguages();
         $deflang = reset($langs); // picking the first one from the list with reset since the keys are not numeric
         if (sizeof($langs) > 1) {
-            trigger_error("Default language for vocabulary '" . $this->getShortName() . "' unknown, choosing '$deflang'.", E_USER_WARNING);
+            trigger_error("Default language for vocabulary '".$this->getShortName()."' unknown, choosing '$deflang'.", E_USER_WARNING);
         }
 
         return $deflang;