NatLibFi / Skosmos

model/ConceptPropertyValueLiteral.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 return Punic\Calendar::formatDate($val, 'short');
             } catch (Exception $e) {
                 trigger_error($e->getMessage(), E_USER_WARNING);
-                return (string) $this->literal;
+                return (string)$this->literal;
             }
         }
         return $this->literal->getValue();

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

model/Concept.php

Doc Comments +2 added lines

@@ -55,6 +55,7 @@ 
      * @param Vocabulary $vocab
      * @param EasyRdf_Resource $resource
      * @param EasyRdf_Graph $graph
+     * @param string|null $clang
      */
     public function __construct($model, $vocab, $resource, $graph, $clang)
     {
@@ -512,6 +513,7 @@ 
 
     /**
      * Gets the groups/arrays the concept belongs to.
+     * @param boolean $includeArrays
      */
     public function getReverseResources($includeArrays) {
         $groups = array();

Spacing +11 added lines, -11 removed lines

@@ -122,12 +122,12 @@ 
         // 3. label in any language
         $label = $this->resource->label();
         // if the label lang code is a subset of the ui lang eg. en-GB
-        if ($label !== null && strpos($label->getLang(), $lang . '-') === 0) {
+        if ($label !== null && strpos($label->getLang(), $lang.'-') === 0) {
             return EasyRdf_Literal::create($label, $lang);
         }
 
         if ($label !== null) {
-            return $label->getLang() ? $label->getValue() . " (" . $label->getLang() . ")" : $label->getValue();
+            return $label->getLang() ? $label->getValue()." (".$label->getLang().")" : $label->getValue();
         }
 
         // empty
@@ -452,14 +452,14 @@ 
 
             // making a human readable string from the timestamps
             if ($created != '') {
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
             }
 
             if ($modified != '') {
                 if ($created != '') {
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
                 } else {
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
                 }
 
             }
@@ -467,12 +467,12 @@ 
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
-                $ret = gettext('skosmos:modified') . ' ' . $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');
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
+                $created .= (string)$this->resource->get('dc:created');
+                $ret .= ' '.gettext('skosmos:created').' '.$created; 
             }
         }
         return $ret;
@@ -580,13 +580,13 @@ 
         $labels = array();
         foreach ($this->resource->allLiterals('skos:prefLabel') as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $labels[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($lit, 'skos:prefLabel');
             }
         }
         foreach ($this->resource->allLiterals('skos:altLabel') as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $labels[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($lit, 'skos:altLabel');
             }
         }

controller/RestController.php

Doc Comments +26 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
@@ -504,6 +510,9 @@ 
         return $this->returnJson($ret);
     }
 
+    /**
+     * @param Request $request
+     */
     private function redirectToVocabData($request) {
         $urls = $request->getVocab()->getConfig()->getDataURLs();
         if (sizeof($urls) == 0) {
@@ -519,6 +528,9 @@ 
         header("Location: " . $urls[$format]);
     }
     
+    /**
+     * @param string $format
+     */
     private function returnDataResults($results, $format) {
         if ($format == 'application/ld+json' || $format == 'application/json') {
             // further compact JSON-LD document using a context
@@ -606,6 +618,12 @@ 
         return $this->returnJson($ret);
     }
     
+    /**
+     * @param string $uri
+     * @param string $lang
+     * @param string $propname
+     * @param string $propuri
+     */
     private function transformPropertyResults($uri, $lang, $objects, $propname, $propuri)
     {
         foreach ($objects as $objuri => $vals) {
@@ -620,6 +638,14 @@ 
         return $ret;    
     }
     
+    /**
+     * @param string $uri
+     * @param string $lang
+     * @param string $tpropname
+     * @param string $tpropuri
+     * @param string $dpropname
+     * @param string $dpropuri
+     */
     private function transformTransitivePropertyResults($uri, $lang, $objects, $tpropname, $tpropuri, $dpropname, $dpropuri)
     {
         $results = array();

Spacing +11 added lines, -11 removed lines

@@ -25,7 +25,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".json_encode($data).");";
             return;
         }
         
@@ -88,7 +88,7 @@ 
                 'vocabularies' => 'onki:hasVocabulary',
                 'id' => 'onki:vocabularyIdentifier',
                 'uri' => '@id',
-                '@base' => $this->getBaseHref() . "rest/v1/vocabularies",
+                '@base' => $this->getBaseHref()."rest/v1/vocabularies",
             ),
             'uri' => '',
             'vocabularies' => $results,
@@ -105,7 +105,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);
@@ -144,7 +144,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 $ret;
     }
@@ -211,7 +211,7 @@ 
                 'prefLabel' => 'skos:prefLabel',
                 'title' => 'dct:title',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/",
             ),
             'uri' => '',
             'id' => $vocab->getId(),
@@ -261,7 +261,7 @@ 
                 'subTypes' => array('@id' => 'void:class', '@type' => '@id'),
                 'count' => 'void:entities',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -335,7 +335,7 @@ 
                 'language' => 'void-ext:language',
                 'properties' => 'void:propertyPartition',
                 'labels' => 'void:triples',
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -372,7 +372,7 @@ 
             $types[] = $type;
         }
 
-        $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/";
+        $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/";
 
         $ret = array_merge_recursive($this->context, array(
             '@context' => array(
@@ -530,10 +530,10 @@ 
 
         $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls)));
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls)));
         }
 
-        header("Location: " . $urls[$format]);
+        header("Location: ".$urls[$format]);
     }
     
     private function returnDataResults($results, $format) {
@@ -587,7 +587,7 @@ 
 
         $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS);
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS);
         }
 
         $vocid = $vocab ? $vocab->getId() : null;

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

Spacing +7 added lines, -7 removed lines

@@ -65,15 +65,15 @@ 
     private function initializeVocabularies()
     {
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
         }
 
         try {
             // use APC user cache to store parsed vocabularies.ttl configuration
             if (function_exists('apc_store') && function_exists('apc_fetch')) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
+                $nskey = "namespaces of ".$key;
                 $this->graph = apc_fetch($key);
                 $this->namespaces = apc_fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -86,7 +86,7 @@ 
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
     }
 
@@ -424,7 +424,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -571,7 +571,7 @@ 
         // using apc cache for the resource if available
         if (function_exists('apc_store') && function_exists('apc_fetch')) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . EasyRdf_Utils::removeFragmentFromUri($uri);
+            $key = 'fetch: '.EasyRdf_Utils::removeFragmentFromUri($uri);
             $resource = apc_fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -592,7 +592,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

model/VocabularyConfig.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 {
     private $plugins;
 
-    public function __construct($resource, $globalPlugins=array()) 
+    public function __construct($resource, $globalPlugins = array()) 
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -40,7 +40,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();
@@ -72,7 +72,7 @@ 
         $langs = $this->getLanguages();
         $deflang = reset($langs); // picking the first one from the list with reset since the keys are not numeric
         if (sizeof($langs) > 1) {
-            trigger_error("Default language for vocabulary '" . $this->getShortName() . "' unknown, choosing '$deflang'.", E_USER_WARNING);
+            trigger_error("Default language for vocabulary '".$this->getShortName()."' unknown, choosing '$deflang'.", E_USER_WARNING);
         }
 
         return $deflang;