NatLibFi / Skosmos

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

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

model/ConceptMappingPropertyValue.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return $notation . $label;
+        return $notation.$label;
     }
 
     public function getType()

controller/EntityController.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
         $baseurl = $this->getBaseHref();
         $vocid = $vocab->getId();
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
+        $url = $baseurl."rest/v1/$vocid/data?$query";
         $this->redirect303($url);
     }
     
@@ -32,11 +32,11 @@ 
         $localname = $vocab->getLocalName($uri);
         if ($localname !== $uri && $localname === urlencode($localname)) {
             // the URI can be shortened
-            $url = $baseurl . "$vocid/page/$localname";
+            $url = $baseurl."$vocid/page/$localname";
         } else {
             // must use full URI
             $query = http_build_query(array('uri'=>$uri));
-            $url = $baseurl . "$vocid/page/?" . $query;
+            $url = $baseurl."$vocid/page/?".$query;
         }
         $this->redirect303($url);
     }
@@ -56,7 +56,7 @@ 
             // guess vocabulary based on URI
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
             if ($vocab === null) {
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
             }
             $request->setVocab($vocab->getId());
         }

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/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null)
+    public function __construct($prop, $label, $super = null)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -59,7 +59,7 @@ 
      */
     public function getDescription()
     {
-        $helpprop = $this->prop . "_help";
+        $helpprop = $this->prop."_help";
 
         return gettext($helpprop); // can't use string constant, it'd be picked up by xgettext
     }
@@ -78,7 +78,7 @@ 
 
     public function addValue($value)
     {
-        $this->values[$value->getNotation() . $value->getLabel() . $value->getUri()] = $value;
+        $this->values[$value->getNotation().$value->getLabel().$value->getUri()] = $value;
         $this->is_sorted = false;
     }
 
@@ -86,7 +86,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return strnatcasecmp($a,$b);
+                return strnatcasecmp($a, $b);
             });
         }
         $this->is_sorted = true;