NatLibFi / Skosmos

controller/WebController.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#');

Doc Comments +1 added lines

@@ -573,6 +573,7 @@
 
     /**
      * Invokes a very generic errorpage.
+     * @param string $message
      */
     public function invokeGenericErrorPage($request, $message = null)
     {

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);
@@ -357,7 +357,7 @@ 
         // convert to vocids array to support multi-vocabulary search
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
-        foreach($vocids as $vocid) {
+        foreach ($vocids as $vocid) {
             $vocabObjects[] = $this->model->getVocabulary($vocid);
         }
         $parameters->setVocabularies($vocabObjects);
@@ -383,7 +383,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,
@@ -446,7 +446,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(),
@@ -592,7 +592,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/Model.php

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

Doc Comments +9 added lines

@@ -116,11 +116,17 @@ 
         return $this->request->getQueryParam('parent') !== '' ? $this->request->getQueryParam('parent') : null;
     }
 
+    /**
+     * @return integer
+     */
     public function getOffset() 
     {
         return ($this->request->getQueryParam('offset') && is_numeric($this->request->getQueryParam('offset')) && $this->request->getQueryParam('offset') >= 0) ? $this->request->getQueryParam('offset') : 0;
     }
 
+    /**
+     * @return integer|null
+     */
     public function getSearchLimit()
     {
         return $this->config->getDefaultSearchLimit();
@@ -130,6 +136,9 @@ 
         return $this->unique;
     }
 
+    /**
+     * @param boolean $unique
+     */
     public function setUnique($unique) {
         $this->unique = $unique;
     }

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
     }

model/sparql/GenericSparql.php

Doc Comments +2 added lines, -19 removed lines

@@ -143,6 +143,7 @@ 
     /**
      * @param array $langs Languages to query for
      * @param string[] $props property names
+     * @return string
      */
     private function generateCountLangConceptsQuery($langs, $classes, $props) {
         $gc = $this->graphClause;
@@ -584,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) {
@@ -789,16 +790,7 @@ 
 
     /**
      * Query for concepts using a search term.
-     * @param string $term search term
      * @param array $vocabs array of Vocabulary objects to search; empty for global search
-     * @param string $lang language code of the returned labels
-     * @param string $search_lang language code used for matching labels (null means any language)
-     * @param int $limit maximum number of hits to retrieve; 0 for unlimited
-     * @param int $offset offset of results to retrieve; 0 for beginning of list
-     * @param string $arrayClass the URI for thesaurus array class, or null if not used
-     * @param array $types limit search to concepts of the given type(s)
-     * @param string $parent limit search to concepts which have the given concept as parent in the transitive broader hierarchy
-     * @param string $group limit search to concepts which are in the given group
      * @param boolean $hidden include matches on hidden labels (default: true)
      * @param array $fields extra fields to include in the result (array of strings). (default: null = none)
      * @param boolean $unique restrict results to unique concepts (default: false)
@@ -942,16 +934,7 @@ 
 
     /**
      * Query for concepts using a search term.
-     * @param string $term search term
      * @param array $vocabs array of Vocabulary objects to search; empty for global search
-     * @param string $lang language code of the returned labels
-     * @param string $search_lang language code used for matching labels (null means any language)
-     * @param int $limit maximum number of hits to retrieve; 0 for unlimited
-     * @param int $offset offset of results to retrieve; 0 for beginning of list
-     * @param string $arrayClass the URI for thesaurus array class, or null if not used
-     * @param array $types limit search to concepts of the given type(s)
-     * @param string $parent limit search to concepts which have the given concept as parent in the transitive broader hierarchy
-     * @param string $group limit search to concepts which are in the given group
      * @param boolean $hidden include matches on hidden labels (default: true)
      * @param array $fields extra fields to include in the result (array of strings). (default: null = none)
      * @param boolean $unique restrict results to unique concepts (default: false)

controller/RestController.php

Spacing +1 added lines, -1 removed lines

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