NatLibFi / Skosmos

model/Request.php

Braces +3 added lines, -1 removed lines

@@ -167,9 +167,11 @@
      */
     public function setVocab($vocabid)
     {
-        if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string
+        if (strpos($vocabid, ' ') !== false) {
+          // if there are multiple vocabularies just storing the string
         {
             $this->setVocabids($vocabid);
+        }
         } else {
             $this->vocab = $this->model->getVocabulary($vocabid);
         }

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
     
     /**

model/ConceptPropertyValueLiteral.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 return Punic\Calendar::formatDate($val, 'short');
             } catch (Exception $e) {
                 trigger_error($e->getMessage(), E_USER_WARNING);
-                return (string) $this->literal;
+                return (string)$this->literal;
             }
         }
         return $this->literal->getValue();

model/Vocabulary.php

Braces +3 added lines, -1 removed lines

@@ -76,10 +76,12 @@
      */
     public function getUriSpace()
     {
-        if ($this->urispace === null) // initialize cache
+        if ($this->urispace === null) {
+          // initialize cache
         {
             $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue();
         }
+        }
 
         return $this->urispace;
     }

Spacing +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -159,7 +159,7 @@ 
                 $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
                     $value = $val->getValue();
                     if ($value instanceof DateTime) {
-                        $val = Punic\Calendar::formatDate($value, 'full', $lang) . ' ' . Punic\Calendar::format($value, 'HH:mm:ss', $lang);
+                        $val = Punic\Calendar::formatDate($value, 'full', $lang).' '.Punic\Calendar::format($value, 'HH:mm:ss', $lang);
                     }
                     $ret[$prop][] = $val;
                 }
@@ -270,7 +270,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -279,7 +279,7 @@ 
      * Counts the statistics of the vocabulary.
      * @return array of the concept/group counts
      */
-    public function getStatistics($lang = '', $array=null, $group=null)
+    public function getStatistics($lang = '', $array = null, $group = null)
     {
         $sparql = $this->getSparql();
         // find the number of concepts
@@ -595,14 +595,14 @@ 
     {
       $changelist = $this->getSparql()->queryChangeList($clang, $offset, $prop);
       $bydate = array();
-      foreach($changelist as $concept) {
+      foreach ($changelist as $concept) {
         $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
-        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
+        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true).Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
       }
       return $bydate;
     }
 
-    public function getTitle($lang=null) {
+    public function getTitle($lang = null) {
       return $this->config->getTitle($lang);
     }
     

model/ConceptSearchParameters.php

Braces +3 added lines, -2 removed lines

@@ -67,8 +67,9 @@
     public function getSearchTerm() 
     {
         $term = $this->request->getQueryParam('q') ? $this->request->getQueryParam('q') : $this->request->getQueryParam('query');
-        if (!$term && $this->rest)
-            $term = $this->request->getQueryParam('label');
+        if (!$term && $this->rest) {
+                    $term = $this->request->getQueryParam('label');
+        }
         $term = trim($term); // surrounding whitespace is not considered significant
         return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
     }

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,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() 

model/VocabularyCategory.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
  */
 class VocabularyCategory extends DataObject
 {
+    /**
+     * @param Model $model
+     */
     public function __construct($model, $resource)
     {
         if (!($model instanceof Model)) {

model/Model.php

Braces +6 added lines, -2 removed lines

@@ -101,10 +101,12 @@ 
     
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $full_uri) {
-            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf_Namespace::set($prefix, $full_uri);
             }
+            }
         }
     }
 
@@ -379,10 +381,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf_Namespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore

Spacing +7 added lines, -7 removed lines

@@ -65,15 +65,15 @@ 
     private function initializeVocabularies()
     {
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
         }
 
         try {
             // use APC user cache to store parsed vocabularies.ttl configuration
             if (function_exists('apc_store') && function_exists('apc_fetch')) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
+                $nskey = "namespaces of ".$key;
                 $this->graph = apc_fetch($key);
                 $this->namespaces = apc_fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -86,7 +86,7 @@ 
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
     }
 
@@ -424,7 +424,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -571,7 +571,7 @@ 
         // using apc cache for the resource if available
         if (function_exists('apc_store') && function_exists('apc_fetch')) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . EasyRdf_Utils::removeFragmentFromUri($uri);
+            $key = 'fetch: '.EasyRdf_Utils::removeFragmentFromUri($uri);
             $resource = apc_fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -592,7 +592,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

model/GlobalConfig.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         }
     }
     
+    /**
+     * @param string $name
+     */
     private function getConstant($name, $default)
     {
         if (defined($name) && constant($name)) {

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@ 
 class GlobalConfig {
     private $languages;
 
-    public function __construct($config_name='/../config.inc') 
+    public function __construct($config_name = '/../config.inc') 
     {
         try {
-            $file_path = dirname(__FILE__) . $config_name;
+            $file_path = dirname(__FILE__).$config_name;
             if (!file_exists($file_path)) {
                 throw new Exception('config.inc file is missing, please provide one.');
             }
@@ -18,7 +18,7 @@ 
                 $this->languages = $LANGUAGES;
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }

model/DataObject.php

Braces +3 added lines, -1 removed lines

@@ -68,10 +68,12 @@
         if ($sortable !== null) {
             uksort($sortable, array($this, 'mycompare'));
             foreach ($sortable as $prop => $vals) {
-                if (is_array($prop)) // the ConceptProperty objects have their own sorting methods
+                if (is_array($prop)) {
+                  // the ConceptProperty objects have their own sorting methods
                 {
                     ksort($sortable[$prop]);
                 }
+                }
 
             }
         }

Indentation +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@
      */
     public function getEnvLang()    
     {
-       // get language from locale, same as used by gettext, set by Controller
-       return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
+        // get language from locale, same as used by gettext, set by Controller
+        return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
     }
 }

controller/RestController.php

Braces +9 added lines, -3 removed lines

@@ -407,7 +407,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) {
@@ -415,7 +417,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         // case 3: exact match on alternate label
         foreach ($results as $res) {
@@ -423,7 +427,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
 
         // case 4: case-insensitive match on alternate label

Doc Comments +26 added lines

@@ -114,6 +114,9 @@ 
         return $this->returnJson($ret);
     }
     
+    /**
+     * @param Request $request
+     */
     private function constructSearchParameters($request)
     {
         $parameters = new ConceptSearchParameters($request, $this->model->getConfig(), true);
@@ -129,6 +132,9 @@ 
         return $parameters;    
     }
 
+    /**
+     * @param Request $request
+     */
     private function transformSearchResults($request, $results)
     {
         // before serializing to JSON, get rid of the Vocabulary object that came with each resource
@@ -504,6 +510,9 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param Request $request
+     */
     private function redirectToVocabData($request) {
         $urls = $request->getVocab()->getConfig()->getDataURLs();
         if (sizeof($urls) == 0) {
@@ -519,6 +528,9 @@ 
         header("Location: " . $urls[$format]);
     }
     
+    /**
+     * @param string $format
+     */
     private function returnDataResults($results, $format) {
         if ($format == 'application/ld+json' || $format == 'application/json') {
             // further compact JSON-LD document using a context
@@ -606,6 +618,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)
     {
         foreach ($objects as $objuri => $vals) {
@@ -620,6 +638,14 @@ 
         return $ret;    
     }
     
+    /**
+     * @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();

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,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;
         }
         
@@ -122,7 +122,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);
@@ -168,7 +168,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;
     }
@@ -513,10 +513,10 @@ 
 
         $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)));
         }
 
-        header("Location: " . $urls[$format]);
+        header("Location: ".$urls[$format]);
     }
     
     private function returnDataResults($results, $format) {
@@ -570,7 +570,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;