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

controller/WebController.php

Spacing +6 added lines, -6 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) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -358,7 +358,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);
             }
         }
@@ -385,7 +385,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $search_results,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParam('q'),
                 'lang_list' => $langList,
@@ -448,7 +448,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $search_results,
                 'search_count' => $counts,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'limit_parent' => $parameters->getParentLimit(),
                 'limit_type' => $request->getQueryParam('type'),
                 '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());

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

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Copyright (c) 2016 University of Helsinki
- * MIT License
- * see LICENSE.txt for more information
- */
+     * Copyright (c) 2016 University of Helsinki
+     * MIT License
+     * see LICENSE.txt for more information
+     */
 
 class NamespaceExposingTurtleParser extends EasyRdf_Parser_Turtle
 {

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 +6 added lines, -6 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
+     */
 
 /**
  * Dataobject wraps EasyRdf resources and provides access to the data.
@@ -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/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; 
             }
         }