NatLibFi / Skosmos

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

@@ -92,7 +92,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -153,7 +153,7 @@ 
                 foreach ($conceptscheme->allLiterals($prop, null) as $val) {
                     $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
                     if ($val->getValue() instanceof DateTime) {
-                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang) . ' ' . Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
+                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang).' '.Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
                     }
                     $ret[$prop][] = $val;
                 }
@@ -264,7 +264,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -273,7 +273,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
@@ -591,14 +591,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);
     }
     

Doc Comments +12 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
      * Get the localname of a concept in the vocabulary. If the URI is not
      * in the URI space of this vocabulary, return the full URI.
      *
-     * @param $uri string full URI of concept
+     * @param string $uri string full URI of concept
      * @return string local name of concept, or original full URI if the local name cannot be determined
      */
     public function getLocalName($uri)
@@ -293,6 +293,8 @@ 
 
     /**
      * Counts the statistics of the vocabulary.
+     * @param string $array
+     * @param string $group
      * @return array of the concept/group counts
      */
     public function getStatistics($lang = '', $array=null, $group=null)
@@ -332,6 +334,7 @@ 
     /**
      * Gets the child relations of a concept and whether these children have more children.
      * @param string $uri
+     * @param string $lang
      */
     public function getConceptChildren($uri, $lang)
     {
@@ -440,6 +443,8 @@ 
     /**
      * Lists the concepts available in the concept group.
      * @param $clname
+     * @param string $glname
+     * @param string $clang
      * @return array
      */
     public function listConceptGroupContents($glname, $clang)
@@ -466,7 +471,7 @@ 
     /**
      * Returns the letters of the alphabet which have been used in this vocabulary.
      * The returned letters may also include specials such as '0-9' (digits) and '!*' (special characters).
-     * @param $clang content language
+     * @param string $clang content language
      * @return array array of letters
      */
     public function getAlphabet($clang)
@@ -501,6 +506,7 @@ 
      * Also the special tokens '0-9' (digits), '!*' (special characters) and '*'
      * (everything) are supported.
      * @param $letter letter (or special token) to search for
+     * @param string $clang
      */
     public function searchConceptsAlphabetical($letter, $limit = null, $offset = null, $clang = null)
     {
@@ -607,6 +613,7 @@ 
      * Returns a list of recently changed or entirely new concepts.
      * @param string $clang content language for the labels
      * @param string $lang UI language for the dates
+     * @param string $prop
      * @return Array
      */
     public function getChangeList($prop, $clang, $lang, $offset)
@@ -620,6 +627,9 @@ 
       return $bydate;
     }
 
+    /**
+     * @param string $lang
+     */
     public function getTitle($lang=null) {
       return $this->config->getTitle($lang);
     }

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

rest.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     } elseif ($parts[1] == 'data') {
         $controller->data($request);
     } elseif (sizeof($parts) == 2) {
-        header("Location: " . $parts[1] . "/");
+        header("Location: ".$parts[1]."/");
     } else {
         $vocab = $parts[1];
         try {
@@ -93,5 +93,5 @@ 
     }
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }

model/Request.php

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

Braces +12 added lines, -4 removed lines

@@ -74,7 +74,9 @@ 
      */
     public function getQueryParam($paramName)
     {
-        if (!isset($this->queryParams[$paramName])) return null;
+        if (!isset($this->queryParams[$paramName])) {
+          return null;
+        }
         $val = filter_var($this->queryParams[$paramName], FILTER_SANITIZE_STRING);
         return ($val !== null ? str_replace('\\', '', $val) : null);
     }
@@ -91,7 +93,9 @@ 
 
     public function getQueryParamPOST($paramName)
     {
-        if (!isset($this->queryParamsPOST[$paramName])) return null;
+        if (!isset($this->queryParamsPOST[$paramName])) {
+          return null;
+        }
         return filter_var($this->queryParamsPOST[$paramName], FILTER_SANITIZE_STRING);
     }
 
@@ -106,7 +110,9 @@ 
 
     public function getServerConstant($paramName)
     {
-        if (!isset($this->serverConstants[$paramName])) return null;
+        if (!isset($this->serverConstants[$paramName])) {
+          return null;
+        }
         return filter_var($this->serverConstants[$paramName], FILTER_SANITIZE_STRING);
     }
 
@@ -239,9 +245,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);
         }

entity.php

Spacing +1 added lines, -1 removed lines

@@ -23,5 +23,5 @@
 
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }

index.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
     }
     require_once 'vendor/autoload.php';
 } catch (Exception $e) {
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     return;
 }
 
@@ -32,7 +32,7 @@ 
     // if language code missing, redirect to guessed language
     // in any case, redirect to <lang>/
     $lang = sizeof($parts) == 2 && $parts[1] !== '' ? $parts[1] : $controller->guessLanguage();
-    header("Location: " . $lang . "/");
+    header("Location: ".$lang."/");
 } else {
   if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
         $request->setLang($parts[1]);
@@ -61,8 +61,8 @@ 
         }
         if (sizeof($parts) == 3) { // language code missing
             $lang = $controller->guessLanguage();
-            $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/";
-            header("Location: " . $newurl);
+            $newurl = $controller->getBaseHref().$vocab."/".$lang."/";
+            header("Location: ".$newurl);
         } else {
             if (array_key_exists($parts[2], $config->getLanguages())) {
                 $lang = $parts[2];
@@ -103,10 +103,10 @@ 
                 }
             } else { // language code missing, redirect to some language version
                 $lang = $controller->guessLanguage($vocab);
-                $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/" . implode('/', array_slice($parts, 2));
+                $newurl = $controller->getBaseHref().$vocab."/".$lang."/".implode('/', array_slice($parts, 2));
                 $qs = $request->getServerConstant('QUERY_STRING');
                 if ($qs) {
-                    $newurl .= "?" . $qs;
+                    $newurl .= "?".$qs;
                 }
                 header("Location: $newurl");
             }

model/SkosmosTurtleParser.php

Doc Comments +1 added lines

@@ -55,6 +55,7 @@
 
     /**
      * Steps back, restoring the previous character or statement read() to the input buffer.
+     * @param string $chars
      */
     protected function unread($chars)
     {

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      */
     protected function peek()
     {
-        if(!$this->dataLength) { $this->dataLength = strlen($this->data); }
+        if (!$this->dataLength) { $this->dataLength = strlen($this->data); }
         if ($this->dataLength > $this->bytePos) {
             $slice = substr($this->data, $this->bytePos, 4);
             return mb_substr($slice, 0, 1, "UTF-8");
@@ -78,7 +78,7 @@ 
     {
         if ($this->bytePos - 4 > 0) {
             $slice = substr($this->data, $this->bytePos - 4, 4);
-            while($slice != '') {
+            while ($slice != '') {
                 if (!self::isWhitespace(mb_substr($slice, -1, 1, "UTF-8"))) {
                     return;
                 }

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
     }
 
     /**

model/LabelSkosXL.php

Doc Comments +3 added lines

@@ -3,6 +3,9 @@
 class LabelSkosXL extends DataObject
 {
 
+    /**
+     * @param Model $model
+     */
     public function __construct($model, $resource)
     {
         parent::__construct($model, $resource);

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function getPrefLabel() {
         $label = null;
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label->getLang() == $this->clang) {
                 return $label;
@@ -23,7 +23,7 @@ 
     public function getProperties() {
         $ret = array();
         $props = $this->resource->properties();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             if ($prop !== 'skosxl:prefLabel') {
                 $ret[$prop] = $this->resource->get($prop);
             }