NatLibFi / Skosmos

model/sparql/GenericSparql.php

Doc Comments +3 added lines, -2 removed lines

@@ -137,7 +137,8 @@ 
 
     /**
      * @param array $langs Languages to query for
-     * @param array $props property names
+     * @param string[] $props property names
+     * @return string
      */
     private function generateCountLangConceptsQuery($langs, $classes, $props) {
         $gc = $this->graphClause;
@@ -169,7 +170,7 @@ 
      * Transforms the CountLangConcepts results into an array of label counts.
      * @param EasyRdf_Sparql_Result $result query results to be transformed
      * @param array $langs Languages to query for
-     * @param array $props property names
+     * @param string[] $props property names
      */
     private function transformCountLangConceptsResults($result, $langs, $props) {
         $ret = array();

Braces +9 added lines, -3 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 = "";
@@ -616,9 +620,11 @@ 
         // extra types to query, if using thesaurus arrays and no additional type restrictions have been applied
         $extratypes = ($arrayClass && $types === array('skos:Concept')) ? "UNION { ?s a <$arrayClass> }" : "";
 
-        if (sizeof($unprefixed_types) === 1) // if only one type limitation set no UNION needed
+        if (sizeof($unprefixed_types) === 1) {
+          // if only one type limitation set no UNION needed
         {
             $type = '<' . $unprefixed_types[0] . '>';
+        }
         } else { // multiple type limitations require setting a UNION for each of those
             $type = '[]';
             foreach ($unprefixed_types as $utype) {

controller/WebController.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 
         // register a Twig filter for generating URLs for vocabulary resources (concepts and groups)
         $controller = $this; // for use by anonymous function below
-        $urlFilter = new Twig_SimpleFilter('link_url', function ($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
+        $urlFilter = new Twig_SimpleFilter('link_url', function($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
             // $vocab can either be null, a vocabulary id (string) or a Vocabulary object
             if ($vocab === null) {
                 // target vocabulary is unknown, best bet is to link to the plain URI
@@ -114,7 +114,7 @@ 
         $this->twig->addFilter($urlFilter);
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) use ($controller) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) use ($controller) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -611,7 +611,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());

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

Braces +3 added lines, -1 removed lines

@@ -381,10 +381,12 @@
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf_Namespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Copyright (c) 2012 Aalto University and University of Helsinki
- * MIT License
- * see LICENSE.txt for more information
- */
+     * Copyright (c) 2012 Aalto University and University of Helsinki
+     * MIT License
+     * see LICENSE.txt for more information
+     */
 
 /**
  * Includes the side wide settings.

model/Vocabulary.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,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();
@@ -909,9 +909,9 @@ 
     {
       $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;
     }

Braces +18 added lines, -9 removed lines

@@ -46,8 +46,9 @@ 
 
         // not found with selected language, try any language
         $literal = $this->resource->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
     }
 
     /**
@@ -57,11 +58,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());
@@ -180,10 +182,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;
     }
@@ -243,8 +247,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();
@@ -513,10 +518,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -533,10 +540,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;

model/Request.php

Braces +3 added lines, -1 removed lines

@@ -167,9 +167,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);
         }

model/Concept.php

Spacing +1 added lines, -1 removed lines

@@ -461,7 +461,7 @@
             }
         } catch (Exception $e) {
             trigger_error($e->getMessage(), E_USER_WARNING);
-            return gettext('skosmos:modified') . ' ' . (string) $this->resource->get('dc:modified') . ' ' . gettext('skosmos:created') . ' ' . (string) $this->resource->get('dc:created');
+            return gettext('skosmos:modified') . ' ' . (string)$this->resource->get('dc:modified') . ' ' . gettext('skosmos:created') . ' ' . (string)$this->resource->get('dc:created');
         }
         return $ret;
     }

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/sparql/JenaTextSparql.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#');

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
    * @return string SPARQL text search clause
    */
 
-  protected function createTextQueryCondition($term, $property='')
+  protected function createTextQueryCondition($term, $property = '')
   {
     // construct the lucene search term for jena-text
     

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

Indentation +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@
      */
     public function getEnvLang()    
     {
-       // get language from locale, same as used by gettext, set by Controller
-       return substr(getenv("LC_ALL"), 0, 2);
+        // get language from locale, same as used by gettext, set by Controller
+        return substr(getenv("LC_ALL"), 0, 2);
     }
 }

Braces +3 added lines, -1 removed lines

@@ -72,10 +72,12 @@
 
         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]);
             }
+            }
 
         }