NatLibFi / Skosmos

controller/WebController.php

Braces +9 added lines, -3 removed lines

@@ -307,11 +307,17 @@
         $subject = $this->model->getConfig()->getServiceName() . " feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
-        if (empty($sender)) $sender = $envelopeSender;
-        if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress();
+        if (empty($sender)) {
+          $sender = $envelopeSender;
+        }
+        if (empty($sender)) {
+          $sender = $this->model->getConfig()->getFeedbackAddress();
+        }
 
         // determine sender name - default to "anonymous user" if not given by user
-        if (empty($fromName)) $fromName = "anonymous user";
+        if (empty($fromName)) {
+          $fromName = "anonymous user";
+        }
 
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender);
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";

Spacing +22 added lines, -22 removed lines

@@ -37,7 +37,7 @@ 
         // specify where to look for templates and cache
         $loader = new Twig_Loader_Filesystem('view');
         // initialize Twig environment
-        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
+        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true));
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
@@ -60,7 +60,7 @@ 
         $this->twig->addFilter(new Twig_SimpleFilter('link_url', array($this, 'linkUrlFilter')));
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -107,18 +107,18 @@ 
         $localname = $vocab->getLocalName($uri);
         if ($localname !== $uri && $localname === urlencode($localname)) {
             // check that the prefix stripping worked, and there are no problematic chars in localname
-            $paramstr = sizeof($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = sizeof($params) > 0 ? '?'.http_build_query($params) : '';
             if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
-                return "$vocid/$lang/$type/$localname" . $paramstr;
+                return "$vocid/$lang/$type/$localname".$paramstr;
             }
 
-            return "$vocid/$lang/$localname" . $paramstr;
+            return "$vocid/$lang/$localname".$paramstr;
         }
 
         // case 2: URI outside vocabulary namespace, or has problematic chars
         // pass the full URI as parameter instead
         $params['uri'] = $uri;
-        return "$vocid/$lang/$type/?" . http_build_query($params);
+        return "$vocid/$lang/$type/?".http_build_query($params);
     }
 
     /**
@@ -276,9 +276,9 @@ 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     {
         $headers = "MIME-Version: 1.0″ . '\r\n";
-        $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n";
+        $headers .= "Content-type: text/html; charset=UTF-8"."\r\n";
         if (!empty($toMail)) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
         if (!empty($fromEmail)) {
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
@@ -300,11 +300,11 @@ 
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         if ($fromVocab !== null && $fromVocab !== '') {
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
         }
 
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
+        $subject = $this->model->getConfig()->getServiceName()." feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
         if (empty($sender)) $sender = $envelopeSender;
@@ -317,10 +317,10 @@ 
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
 
         // adding some information about the user for debugging purposes.
-        $message = $message . "<br /><br /> Debugging information:"
-            . "<br />Timestamp: " . date(DATE_RFC2822)
-            . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT')
-            . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
+        $message = $message."<br /><br /> Debugging information:"
+            . "<br />Timestamp: ".date(DATE_RFC2822)
+            . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $subject, $message, $headers, $params);
@@ -328,7 +328,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error-page.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -375,7 +375,7 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
             }
         }
@@ -386,7 +386,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
             $this->invokeGenericErrorPage($request, $e->getMessage());
             return;
@@ -402,7 +402,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
@@ -427,7 +427,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -448,7 +448,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -465,7 +465,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $searchResults,
                 'search_count' => $counts,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'limit_parent' => $parameters->getParentLimit(),
                 'limit_type' =>  $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null,
                 'limit_group' => $parameters->getGroupLimit(),
@@ -594,7 +594,7 @@ 
      * Loads and renders the view containing a list of recent changes in the vocabulary.
      * @param Request $request
      */
-    public function invokeChangeList($request, $prop='dc:created')
+    public function invokeChangeList($request, $prop = 'dc:created')
     {
         // set language parameters for gettext
         $this->setLanguageProperties($request->getLang());

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

Spacing +7 added lines, -7 removed lines

@@ -24,17 +24,17 @@ 
     /** EasyRdf\Graph graph */
     private $graph;
 
-    public function __construct($config_name='/../config.ttl')
+    public function __construct($config_name = '/../config.ttl')
     {
         $this->cache = new Cache();
         try {
-            $this->filePath = realpath( dirname(__FILE__) . $config_name );
+            $this->filePath = realpath(dirname(__FILE__).$config_name);
             if (!file_exists($this->filePath)) {
                 throw new Exception('config.ttl file is missing, please provide one.');
             }
             $this->initializeConfig();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }
@@ -55,8 +55,8 @@ 
             // use APC user cache to store parsed config.ttl configuration
             if ($this->cache->isAvailable()) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->filePath) . ", " . filemtime($this->filePath);
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->filePath).", ".filemtime($this->filePath);
+                $nskey = "namespaces of ".$key;
                 $this->graph = $this->cache->fetch($key);
                 $this->namespaces = $this->cache->fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -77,7 +77,7 @@ 
             $this->resource = $configResources[0];
             $this->initializeNamespaces();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }      
     }
 
@@ -299,7 +299,7 @@ 
     public function getGlobalPlugins()
     {
         $globalPlugins = array();
-        $globalPluginsResource =  $this->getResource()->getResource("skosmos:globalPlugins");
+        $globalPluginsResource = $this->getResource()->getResource("skosmos:globalPlugins");
         if ($globalPluginsResource) {
             foreach ($globalPluginsResource as $resource) {
                 $globalPlugins[] = $resource->getValue();

model/Model.php

Spacing +8 added lines, -8 removed lines

@@ -219,18 +219,18 @@ 
         }
 
         $vocabs = $params->getVocabs();
-        $showDeprecated=false;
+        $showDeprecated = false;
         if (sizeof($vocabs) === 1) { // search within vocabulary
             $voc = $vocabs[0];
             $sparql = $voc->getSparql();
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
         } else { // multi-vocabulary or global search
             $voc = null;
             $sparql = $this->getDefaultSparql();
             // @TODO : in a global search showDeprecated will always be false and cannot be set globally
         }
 
-        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params,$showDeprecated);
+        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params, $showDeprecated);
         if ($params->getRest() && $results && $params->getSearchLimit() !== 0) {
           $results = array_slice($results, $params->getOffset(), $params->getSearchLimit());
         }
@@ -382,7 +382,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->globalConfig->getGraph()->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -465,9 +465,9 @@ 
         }
 
         // if there are multiple vocabularies and one is the preferred vocabulary, return it
-        if($preferredVocabId != null) {
+        if ($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
-                if($vocab->getId() == $preferredVocabId) {
+                if ($vocab->getId() == $preferredVocabId) {
                     return $vocab;
                 }
             }
@@ -567,7 +567,7 @@ 
         // using apc cache for the resource if available
         if ($this->globalConfig->getCache()->isAvailable()) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . $uri;
+            $key = 'fetch: '.$uri;
             $resource = $this->globalConfig->getCache()->fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -588,7 +588,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

Braces +6 added lines, -3 removed lines

@@ -350,10 +350,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    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, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore
@@ -475,8 +477,9 @@ 
 
         // no preferred vocabulary, or it was not found, search in which vocabulary the concept has a label
         foreach ($vocabs as $vocab) {
-            if ($vocab->getConceptLabel($uri, null) !== null)
-                return $vocab;
+            if ($vocab->getConceptLabel($uri, null) !== null) {
+                            return $vocab;
+            }
         }
 
         // if the URI couldn't be found, fall back to the first vocabulary

model/BaseConfig.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * @param string $default default value
      * @param string $lang preferred language for the literal
      */
-    protected function getLiteral($property, $default=null, $lang=null)
+    protected function getLiteral($property, $default = null, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();

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

@@ -7,11 +7,11 @@
 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
-     */
+  /**
+   * 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
+   */
     protected function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

model/VocabularyConfig.php

Spacing +2 added lines, -2 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');
@@ -35,7 +35,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;

Braces +15 added lines, -7 removed lines

@@ -58,8 +58,9 @@ 
     public function getShortName()
     {
         $shortname = $this->getLiteral('skosmos:shortName');
-        if ($shortname)
-          return $shortname;
+        if ($shortname) {
+                  return $shortname;
+        }
 
         // if no shortname exists fall back to the id
         return $this->getId();
@@ -194,10 +195,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -214,10 +217,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -329,11 +334,12 @@ 
     public function getId()
     {
         $uriparts = explode("#", $this->resource->getURI());
-        if (count($uriparts) != 1)
-        // hash namespace
+        if (count($uriparts) != 1) {
+                // hash namespace
         {
             return $uriparts[1];
         }
+        }
 
         // slash namespace
         $uriparts = explode("/", $this->resource->getURI());
@@ -361,10 +367,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // prefixing if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // prefixing if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }

Doc Comments +3 added lines, -3 removed lines

@@ -265,7 +265,7 @@ 
 
     /**
      * Returns a boolean value set in the config.ttl config.
-     * @return array array of concept class URIs (can be empty)
+     * @return string[] array of concept class URIs (can be empty)
      */
     public function getIndexClasses()
     {
@@ -274,7 +274,7 @@ 
 
     /**
      * Returns skosmos:externalProperty values set in the config.ttl config.
-     * @return array array of external property URIs (can be empty)
+     * @return string[] array of external property URIs (can be empty)
      */
     public function getExtProperties()
     {
@@ -420,7 +420,7 @@ 
      * Additionally, the chosen content language is inserted with the highest priority
      * and the vocab default language is inserted with the lowest priority.
      * @param string $clang
-     * @return array of language code strings
+     * @return string[] of language code strings
      */
     public function getLanguageOrder($clang)
     {

migrate-config.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
     foreach (explode(' ', GLOBAL_PLUGINS) as $pluginName) {
         $globalPluginsArray[] = "\"$pluginName\"";
     }
-    $globalPlugins = " " . implode(', ', $globalPluginsArray) . " ";
+    $globalPlugins = " ".implode(', ', $globalPluginsArray)." ";
 }
 
 # print the prefixes

model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null, $sort_by_notation=false)
+    public function __construct($prop, $label, $super = null, $sort_by_notation = false)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -61,7 +61,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
     }
@@ -80,7 +80,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;
     }
 
@@ -88,7 +88,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a),strtolower($b));
+                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a), strtolower($b));
             });
         }
         $this->is_sorted = true;

model/ConceptMappingPropertyValue.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return $notation . $label;
+        return $notation.$label;
     }
 
     public function getType()
@@ -172,14 +172,14 @@ 
             'from' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->source->getUri(),
+                        'uri' => (string)$this->source->getUri(),
                     ]
                 ]
             ],
             'to' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->getUri()
+                        'uri' => (string)$this->getUri()
                     ]
                 ]
             ]
@@ -188,20 +188,20 @@ 
         $fromScheme = $this->vocab->getDefaultConceptScheme();
         if (isset($fromScheme)) {
             $ret['fromScheme'] = [
-                'uri' => (string) $fromScheme,
+                'uri' => (string)$fromScheme,
             ];
         }
 
         $exvocab = $this->getExvocab();
         if (isset($exvocab)) {
             $ret['toScheme'] = [
-                'uri' => (string) $exvocab->getDefaultConceptScheme(),
+                'uri' => (string)$exvocab->getDefaultConceptScheme(),
             ];
         }
 
         $notation = $this->getNotation();
         if (isset($notation)) {
-            $ret['to']['memberSet'][0]['notation'] = (string) $notation;
+            $ret['to']['memberSet'][0]['notation'] = (string)$notation;
         }
 
         $label = $this->getLabel();