NatLibFi / Skosmos

model/VocabularyConfig.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      * @param string $property the property to query
      * @param string $lang preferred language for the literal,
      */
-    private function getLiteral($property, $lang=null)
+    private function getLiteral($property, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();

Braces +15 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
 
         // not found with selected language, try any language
         $literal = $this->resource->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
     }
 
     /**
@@ -85,8 +86,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();
@@ -205,10 +207,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -225,10 +229,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -329,11 +335,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());

model/VocabularyDataObject.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Copyright (c) 2012-2013 Aalto University and University of Helsinki
- * MIT License
- * see LICENSE.txt for more information
- */
+     * Copyright (c) 2012-2013 Aalto University and University of Helsinki
+     * MIT License
+     * see LICENSE.txt for more information
+     */
 
 /* Register text: namespace needed for jena-text queries */
 EasyRdf_Namespace::set('text', 'http://jena.apache.org/text#');

model/ConceptProperty.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return strnatcasecmp($a,$b);
+                return strnatcasecmp($a, $b);
             });
         }
         $this->is_sorted = true;

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

@@ -118,7 +118,7 @@
         return $type;
     }
 
-    private function getQueryParam($name, $explode=false) {
+    private function getQueryParam($name, $explode = false) {
         if ($explode) {
             return $this->request->getQueryParam($name) ? explode(' ', $this->request->getQueryParam($name)) : null;
         }

model/sparql/GenericSparql.php

Doc Comments +1 added lines, -1 removed lines

@@ -585,7 +585,7 @@
 
     /**
      * Generate a VALUES clause for limiting the targeted graphs.
-     * @param array $vocabs array of Vocabulary objects to target
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
      * @return string VALUES clause, or "" if not necessary to limit
      */
     protected function formatValuesGraph($vocabs) {

Braces +6 added lines, -2 removed lines

@@ -56,12 +56,16 @@
         $this->model = $model;
 
         // set graphClause so that it can be used by all queries
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
+        if ($this->isDefaultEndpoint()) {
+          // default endpoint; query any graph (and catch it in a variable)
         {
             $this->graphClause = "GRAPH $graph";
-        } elseif ($graph) // query a specific graph
+        }
+        } elseif ($graph) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";

Spacing +2 added lines, -2 removed lines

@@ -649,7 +649,7 @@ 
             }
         }
 
-        return implode(' UNION ', $type_patterns);;
+        return implode(' UNION ', $type_patterns); ;
     }
 
     /**
@@ -791,7 +791,7 @@ 
 
         $schemecond = '';
         if (!empty($schemes)) {
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
             }
         }

controller/RestController.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,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);
@@ -201,7 +201,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 $this->returnJson($ret);

model/GlobalConfig.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 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;

Doc Comments +3 added lines

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