NatLibFi / Skosmos

model/DataObject.php

Braces +3 added lines, -1 removed lines

@@ -79,10 +79,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]);
                 }
+                }
             }
         }
         return $sortable;

Indentation +2 added lines, -2 removed lines

@@ -124,8 +124,8 @@
      */
     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 +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 +5 added lines, -5 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) {
@@ -1120,9 +1120,9 @@ 
         }
         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)));
 

model/PluginRegister.php

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/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);
             }
+            }
         }
     }
 

model/BaseConfig.php

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 +6 added lines, -6 removed lines

@@ -7,12 +7,12 @@
 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
-     * @return boolean the boolean value for the given property, or the default value if not found
-     */
+  /**
+   * 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
+   * @return boolean the boolean value for the given property, or the default value if not found
+   */
     protected function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

model/Concept.php

Indentation +6 added lines, -6 removed lines

@@ -517,13 +517,13 @@
                     
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
 
-					if($envLangLabels) {
-						$proplabel = $envLangLabels[$this->getEnvLang()];
+          if($envLangLabels) {
+            $proplabel = $envLangLabels[$this->getEnvLang()];
                     } else {
-						if($defaultPropLabel) {
-							$proplabel = $defaultPropLabel[''];
-						}
-					}
+            if($defaultPropLabel) {
+              $proplabel = $defaultPropLabel[''];
+            }
+          }
                 }
 
                 // look for superproperties in the current graph

Braces +5 added lines, -5 removed lines

@@ -312,8 +312,7 @@ 
             foreach ($res->propertyUris() as $prop) {
                 $this->addPropertyValues($res, $prop, $seen);
             }
-        }
-        else {
+        } else {
             foreach ($props as $prop) {
                 if ($res->hasProperty($prop)) {
                     $this->addPropertyValues($res, $prop, $seen);
@@ -678,7 +677,9 @@ 
         $subPrefLabelProps = $this->graph->resourcesMatching('rdfs:subPropertyOf', $prefLabelProp);
         foreach ($subPrefLabelProps as $subPrefLabelProp) {
             // return the first available translation
-            if ($subPrefLabelProp->label($lang)) return $subPrefLabelProp->label($lang);
+            if ($subPrefLabelProp->label($lang)) {
+              return $subPrefLabelProp->label($lang);
+            }
         }
         return null;
     }
@@ -909,8 +910,7 @@ 
         if (!in_array($vocabUriSpace, $context, true)) {
             if (!isset($context[$vocabPrefix])) {
                 $context[$vocabPrefix] = $vocabUriSpace;
-            }
-            else if ($context[$vocabPrefix] !== $vocabUriSpace) {
+            } else if ($context[$vocabPrefix] !== $vocabUriSpace) {
                 $i = 2;
                 while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
                     $i += 1;

controller/EntityController.php

Indentation +4 added lines, -4 removed lines

@@ -30,14 +30,14 @@
             $url = $baseurl . "$vocid/";
         } else {
 
-   	        if ($localname !== $uri && $localname === urlencode($localname)) {
-   	        // the URI can be shortened
+              if ($localname !== $uri && $localname === urlencode($localname)) {
+              // the URI can be shortened
             $url = $baseurl . "$vocid/page/$localname";
             } else {
                 // must use full URI
-   	            $query = http_build_query(array('uri'=>$uri));
+                  $query = http_build_query(array('uri'=>$uri));
                 $url = $baseurl . "$vocid/page/?" . $query;
-	        }
+          }
         }
         $this->redirect303($url);
     }

model/sparql/GenericSparql.php

Braces +8 added lines, -6 removed lines

@@ -47,12 +47,16 @@ 
         $this->client = new EasyRdf\Sparql\Client($endpoint);
 
         // 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 !== null) // query a specific graph
+        }
+        } elseif ($graph !== null) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";
@@ -1274,8 +1278,7 @@ 
             if (isset($row->qualifier)) {
                 if ($row->qualifier instanceof EasyRdf\Literal) {
                     $hit['qualifier'] = $row->qualifier->getValue();
-                }
-                else {
+                } else {
                     $hit['qualifier'] = $row->qualifier->localName();
                 }
             }
@@ -1955,8 +1958,7 @@ 
         if (sizeof($ret) > 0) {
             // existing concept, with children
             return $ret;
-        }
-        else {
+        } else {
             // nonexistent concept
             return null;
         }

Indentation +10 added lines, -10 removed lines

@@ -65,7 +65,7 @@ 
      *
      * @param string $query
      * @return string
-    */
+     */
     protected function generateQueryPrefixes($query)
     {
         // Check for undefined prefixes
@@ -233,9 +233,9 @@ 
         $gcl = $this->graphClause;
         $classes = ($classes) ? $classes : array('http://www.w3.org/2004/02/skos/core#Concept');
 
-	$quote_string = function($val) { return "'$val'"; };
-	$quoted_values = array_map($quote_string, $langs);
-	$langFilter = "FILTER(?lang IN (" . implode(',', $quoted_values) . "))";
+  $quote_string = function($val) { return "'$val'"; };
+  $quoted_values = array_map($quote_string, $langs);
+  $langFilter = "FILTER(?lang IN (" . implode(',', $quoted_values) . "))";
 
         $values = $this->formatValues('?type', $classes, 'uri');
         $valuesProp = $this->formatValues('?prop', $props, null);
@@ -962,7 +962,7 @@ 
         return $query;
     }
     /**
-    *  This function can be overwritten in other SPARQL dialects for the possibility of handling the different language clauses
+     *  This function can be overwritten in other SPARQL dialects for the possibility of handling the different language clauses
      * @param string $lang
      * @return string formatted language clause
      */
@@ -1911,7 +1911,7 @@ 
 
     /**
      * Generates a sparql query for finding the hierarchy for a concept.
-	 * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
+     * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
      * @param string $uri concept uri.
      * @param string $lang
      * @param string $fallback language to use if label is not available in the preferred language
@@ -1988,10 +1988,10 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=explode(" ", $row->tops->getValue());
-               // sort to guarantee an alphabetical ordering of the URI
-               sort($topConceptsList);
-               $ret[$uri]['tops'] = $topConceptsList;
+                $topConceptsList=explode(" ", $row->tops->getValue());
+                // sort to guarantee an alphabetical ordering of the URI
+                sort($topConceptsList);
+                $ret[$uri]['tops'] = $topConceptsList;
             }
             if (isset($row->children)) {
                 if (!isset($ret[$uri]['narrower'])) {

model/ConceptProperty.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
             return $help;
         }
 
-       // if not, see if there was a comment/definition for the property in the graph
+        // if not, see if there was a comment/definition for the property in the graph
         if ($this->tooltip !== null) {
             return $this->tooltip;
         }

Braces +3 added lines, -6 removed lines

@@ -125,11 +125,9 @@ 
                             return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel()));
                         }
                         return 1;
-                    }
-                    else if ($bnot == null) {
+                    } else if ($bnot == null) {
                         return -1;
-                    }
-                    else {
+                    } else {
                         // assume that notations are unique, choose strategy
                         if ($this->sort_by_notation == "lexical") {
                             return strcoll($anot, $bnot);
@@ -138,8 +136,7 @@ 
                         }
                     }
                 });
-            }
-            else {
+            } else {
                 uasort($this->values, function($a, $b) {
                     // assume that labels are unique
                     return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel()));