NatLibFi / Skosmos

model/ConceptSearchParameters.php

Braces +3 added lines, -2 removed lines

@@ -67,8 +67,9 @@
     public function getSearchTerm() 
     {
         $term = $this->request->getQueryParam('q') ? $this->request->getQueryParam('q') : $this->request->getQueryParam('query');
-        if (!$term && $this->rest)
-            $term = $this->request->getQueryParam('label');
+        if (!$term && $this->rest) {
+                    $term = $this->request->getQueryParam('label');
+        }
         $term = trim($term); // surrounding whitespace is not considered significant
         return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
     }

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
         return $type;
     }
 
-    private function getQueryParam($name, $explode=false) {
+    private function getQueryParam($name, $explode = false) {
         if ($explode) {
             return $this->request->getQueryParam($name) ? explode(' ', $this->request->getQueryParam($name)) : null;
         }

model/sparql/GenericSparql.php

Doc Comments +1 added lines, -1 removed lines

@@ -585,7 +585,7 @@
 
     /**
      * Generate a VALUES clause for limiting the targeted graphs.
-     * @param array $vocabs array of Vocabulary objects to target
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
      * @return string VALUES clause, or "" if not necessary to limit
      */
     protected function formatValuesGraph($vocabs) {

Braces +6 added lines, -2 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 = "";

Spacing +2 added lines, -2 removed lines

@@ -649,7 +649,7 @@ 
             }
         }
 
-        return implode(' UNION ', $type_patterns);;
+        return implode(' UNION ', $type_patterns); ;
     }
 
     /**
@@ -791,7 +791,7 @@ 
 
         $schemecond = '';
         if (!empty($schemes)) {
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
             }
         }

controller/RestController.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,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);
@@ -201,7 +201,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 $this->returnJson($ret);

model/Model.php

Spacing +1 added lines, -1 removed lines

@@ -382,7 +382,7 @@
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 

Braces +6 added lines, -2 removed lines

@@ -101,10 +101,12 @@ 
     
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $full_uri) {
-            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, $full_uri);
             }
+            }
         }
     }
 
@@ -379,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

model/GlobalConfig.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 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;

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         }
     }
     
+    /**
+     * @param string $name
+     */
     private function getConstant($name, $default)
     {
         if (defined($name) && constant($name)) {

model/DataObject.php

Braces +3 added lines, -1 removed lines

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

Indentation +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@
      */
     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/Plugins.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
 class Plugins {
     private $globalPlugins;
 
-    public function __construct($globalPlugins=array()) {
+    public function __construct($globalPlugins = array()) {
         $this->globalPlugins = $globalPlugins;
     }
     
@@ -68,7 +68,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array 
      * @return array
      */
-    public function getPluginsJS($names=null) {
+    public function getPluginsJS($names = null) {
         if ($names) {
             $names = array_merge($this->globalPlugins, $names);
             return $this->filterPluginsByName('js', $names);
@@ -81,7 +81,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array 
      * @return array
      */
-    public function getPluginsCSS($names=null) {
+    public function getPluginsCSS($names = null) {
         if ($names) {
             $names = array_merge($this->globalPlugins, $names);
             return $this->filterPluginsByName('css', $names);
@@ -94,7 +94,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array 
      * @return array
      */
-    public function getPluginsTemplates($names=null) {
+    public function getPluginsTemplates($names = null) {
         if ($names) {
             $names = array_merge($this->globalPlugins, $names);
             return $this->filterPluginsByName('templates', $names);
@@ -107,14 +107,14 @@ 
      * @param array $names the plugin name strings (foldernames) in an array 
      * @return array
      */
-    public function getTemplates($names=null) {
+    public function getTemplates($names = null) {
         $templateStrings = array();
         $plugins = $this->getPluginsTemplates($names);
         foreach ($plugins as $folder => $templates) {
             foreach ($templates as $path) {
                 if (file_exists($path)) {
-                    $filename = explode('/', $path)[sizeof(explode('/', $path))-1];
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
+                    $filename = explode('/', $path)[sizeof(explode('/', $path)) - 1];
+                    $id = $folder . '-' . substr($filename, 0, (strrpos($filename, ".")));
                     $templateStrings[$id] = file_get_contents($path);
                 }
             }

model/Concept.php

Spacing +2 added lines, -2 removed lines

@@ -459,11 +459,11 @@
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc: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');
+                $created .= (string)$this->resource->get('dc:created');
                 $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
             }
         }