NatLibFi / Skosmos

controller/Controller.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#');

index.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/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 +3 added lines, -3 removed lines

@@ -651,7 +651,7 @@ 
             }
         }
 
-        return implode(' UNION ', $type_patterns);;
+        return implode(' UNION ', $type_patterns); ;
     }
 
     /**
@@ -829,7 +829,7 @@ 
 
         $schemecond = '';
         if (!empty($schemes)) {
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
             }
         }
@@ -918,7 +918,7 @@ 
                 $hit['type'][] = $qnamecache[$typeuri];
             }
 
-            if(!empty($fields)) {
+            if (!empty($fields)) {
                 foreach ($fields as $prop) {
                     $propname = $prop . 's';
                     if (isset($row->$propname)) {

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);

Doc Comments +6 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

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

model/NamespaceExposingTurtleParser.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Copyright (c) 2016 University of Helsinki
- * MIT License
- * see LICENSE.txt for more information
- */
+     * Copyright (c) 2016 University of Helsinki
+     * MIT License
+     * see LICENSE.txt for more information
+     */
 
 class NamespaceExposingTurtleParser extends EasyRdf_Parser_Turtle
 {

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)) {

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 +6 added lines, -6 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
+     */
 
 /**
  * Dataobject wraps EasyRdf resources and provides access to the data.
@@ -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
     }
 }

model/Concept.php

Spacing +2 added lines, -2 removed lines

@@ -459,11 +459,11 @@
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
+                $modified = (string)$this->resource->get('dc:modified');
                 $ret = gettext('skosmos:modified') . ' ' . $modified; 
             }
             if ($this->resource->get('dc:created')) {
-                $created .= (string) $this->resource->get('dc:created');
+                $created .= (string)$this->resource->get('dc:created');
                 $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
             }
         }