Completed
Push — master ( f90a78...1b0cb2 )
by Henri
29:59
created
model/sparql/GenericSparql.php 4 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2012-2013 Aalto University and University of Helsinki
4
- * MIT License
5
- * see LICENSE.txt for more information
6
- */
3
+     * Copyright (c) 2012-2013 Aalto University and University of Helsinki
4
+     * MIT License
5
+     * see LICENSE.txt for more information
6
+     */
7 7
 
8 8
 /* Register text: namespace needed for jena-text queries */
9 9
 EasyRdf_Namespace::set('text', 'http://jena.apache.org/text#');
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -585,7 +585,7 @@
 block discarded – undo
585 585
 
586 586
     /**
587 587
      * Generate a VALUES clause for limiting the targeted graphs.
588
-     * @param array $vocabs array of Vocabulary objects to target
588
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
589 589
      * @return string VALUES clause, or "" if not necessary to limit
590 590
      */
591 591
     protected function formatValuesGraph($vocabs) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,12 +56,16 @@
 block discarded – undo
56 56
         $this->model = $model;
57 57
 
58 58
         // set graphClause so that it can be used by all queries
59
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
59
+        if ($this->isDefaultEndpoint()) {
60
+          // default endpoint; query any graph (and catch it in a variable)
60 61
         {
61 62
             $this->graphClause = "GRAPH $graph";
62
-        } elseif ($graph) // query a specific graph
63
+        }
64
+        } elseif ($graph) {
65
+          // query a specific graph
63 66
         {
64 67
             $this->graphClause = "GRAPH <$graph>";
68
+        }
65 69
         } else // query the default graph
66 70
         {
67 71
             $this->graphClause = "";
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -649,7 +649,7 @@
 block discarded – undo
649 649
             }
650 650
         }
651 651
 
652
-        return implode(' UNION ', $type_patterns);;
652
+        return implode(' UNION ', $type_patterns); ;
653 653
     }
654 654
 
655 655
     /**
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2012-2013 Aalto University and University of Helsinki
4
- * MIT License
5
- * see LICENSE.txt for more information
6
- */
3
+     * Copyright (c) 2012-2013 Aalto University and University of Helsinki
4
+     * MIT License
5
+     * see LICENSE.txt for more information
6
+     */
7 7
 
8 8
 /* Register text: namespace needed for jena-text queries */
9 9
 EasyRdf_Namespace::set('text', 'http://jena.apache.org/text#');
Please login to merge, or discard this patch.
model/GlobalConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 class GlobalConfig {
7 7
     private $languages;
8 8
 
9
-    public function __construct($config_name=null) 
9
+    public function __construct($config_name = null) 
10 10
     {
11 11
         try {
12 12
             $file_path = dirname(__FILE__);
Please login to merge, or discard this patch.
model/ConceptSearchParameters.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,9 @@
 block discarded – undo
67 67
     public function getSearchTerm() 
68 68
     {
69 69
         $term = $this->request->getQueryParam('q') ? $this->request->getQueryParam('q') : $this->request->getQueryParam('query');
70
-        if (!$term && $this->rest)
71
-            $term = $this->request->getQueryParam('label');
70
+        if (!$term && $this->rest) {
71
+                    $term = $this->request->getQueryParam('label');
72
+        }
72 73
         $term = trim($term); // surrounding whitespace is not considered significant
73 74
         return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
74 75
     }
Please login to merge, or discard this patch.
controller/WebController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         // register a Twig filter for generating URLs for vocabulary resources (concepts and groups)
75 75
         $controller = $this; // for use by anonymous function below
76
-        $urlFilter = new Twig_SimpleFilter('link_url', function ($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
76
+        $urlFilter = new Twig_SimpleFilter('link_url', function($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
77 77
             // $vocab can either be null, a vocabulary id (string) or a Vocabulary object
78 78
             if ($vocab === null) {
79 79
                 // target vocabulary is unknown, best bet is to link to the plain URI
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         $this->twig->addFilter($urlFilter);
115 115
 
116 116
         // register a Twig filter for generating strings from language codes with CLDR
117
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
117
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
118 118
             return Language::getName($langcode, $lang);
119 119
         });
120 120
         $this->twig->addFilter($langFilter);
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
359 359
         $vocabObjects = array();
360 360
         if ($vocids) {
361
-            foreach($vocids as $vocid) {
361
+            foreach ($vocids as $vocid) {
362 362
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
363 363
             }
364 364
         }
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                 'search_count' => $counts,
386 386
                 'languages' => $this->languages,
387 387
                 'search_results' => $search_results,
388
-                'rest' => $parameters->getOffset()>0,
388
+                'rest' => $parameters->getOffset() > 0,
389 389
                 'global_search' => true,
390 390
                 'term' => $request->getQueryParam('q'),
391 391
                 'lang_list' => $langList,
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
                 'vocab' => $vocab,
449 449
                 'search_results' => $search_results,
450 450
                 'search_count' => $counts,
451
-                'rest' => $parameters->getOffset()>0,
451
+                'rest' => $parameters->getOffset() > 0,
452 452
                 'limit_parent' => $parameters->getParentLimit(),
453 453
                 'limit_type' => $request->getQueryParam('type'),
454 454
                 'limit_group' => $parameters->getGroupLimit(),
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
      * Loads and renders the view containing a list of recent changes in the vocabulary.
595 595
      * @param Request $request
596 596
      */
597
-    public function invokeChangeList($request, $prop='dc:created')
597
+    public function invokeChangeList($request, $prop = 'dc:created')
598 598
     {
599 599
         // set language parameters for gettext
600 600
         $this->setLanguageProperties($request->getLang());
Please login to merge, or discard this patch.
controller/RestController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         // convert to vocids array to support multi-vocabulary search
169 169
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array();
170 170
         $vocabObjects = array();
171
-        foreach($vocids as $vocid) {
171
+        foreach ($vocids as $vocid) {
172 172
             $vocabObjects[] = $this->model->getVocabulary($vocid);
173 173
         }
174 174
         $parameters->setVocabularies($vocabObjects);
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         if ($request->getQueryParam('labellang')) {
202 202
             $ret['@context']['@language'] = $request->getQueryParam('labellang');
203 203
         } elseif ($request->getQueryParam('lang')) {
204
-            $ret['@context']['@language'] = $request->getQueryParam('lang');;
204
+            $ret['@context']['@language'] = $request->getQueryParam('lang'); ;
205 205
         }
206 206
 
207 207
         return $this->returnJson($ret);
Please login to merge, or discard this patch.
model/Model.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -382,7 +382,7 @@
 block discarded – undo
382 382
     public function getVocabularyCategories()
383 383
     {
384 384
         $cats = $this->graph->allOfType('skos:Concept');
385
-        if(empty($cats)) {
385
+        if (empty($cats)) {
386 386
             return array(new VocabularyCategory($this, null));
387 387
         }
388 388
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,10 +101,12 @@  discard block
 block discarded – undo
101 101
     
102 102
     private function initializeNamespaces() {
103 103
         foreach ($this->namespaces as $prefix => $full_uri) {
104
-            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
104
+            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
105
+              // if not already defined
105 106
             {
106 107
                 EasyRdf_Namespace::set($prefix, $full_uri);
107 108
             }
109
+            }
108 110
         }
109 111
     }
110 112
 
@@ -379,10 +381,12 @@  discard block
 block discarded – undo
379 381
                 // register vocabulary ids as RDF namespace prefixes
380 382
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
381 383
                 try {
382
-                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
384
+                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
385
+                      // if not already defined
383 386
                     {
384 387
                         EasyRdf_Namespace::set($prefix, $voc->getUriSpace());
385 388
                     }
389
+                    }
386 390
 
387 391
                 } catch (Exception $e) {
388 392
                     // not valid as namespace identifier, ignore
Please login to merge, or discard this patch.
model/NamespaceExposingTurtleParser.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2016 University of Helsinki
4
- * MIT License
5
- * see LICENSE.txt for more information
6
- */
3
+     * Copyright (c) 2016 University of Helsinki
4
+     * MIT License
5
+     * see LICENSE.txt for more information
6
+     */
7 7
 
8 8
 class NamespaceExposingTurtleParser extends EasyRdf_Parser_Turtle
9 9
 {
Please login to merge, or discard this patch.