Completed
Pull Request — master (#478)
by Dan Michael O.
11:22
created
rest.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 Aalto University and University of Helsinki
4
- * MIT License
5
- * see LICENSE.txt for more information
6
- */
3
+     * Copyright (c) 2012 Aalto University and University of Helsinki
4
+     * MIT License
5
+     * see LICENSE.txt for more information
6
+     */
7 7
 
8 8
 /**
9 9
  * Includes the side wide settings.
Please login to merge, or discard this patch.
model/Request.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -167,9 +167,11 @@
 block discarded – undo
167 167
      */
168 168
     public function setVocab($vocabid)
169 169
     {
170
-        if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string
170
+        if (strpos($vocabid, ' ') !== false) {
171
+          // if there are multiple vocabularies just storing the string
171 172
         {
172 173
             $this->setVocabids($vocabid);
174
+        }
173 175
         } else {
174 176
             $this->vocab = $this->model->getVocabulary($vocabid);
175 177
         }
Please login to merge, or discard this 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/sparql/JenaTextSparql.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/ConceptPropertyValueLiteral.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
                 return Punic\Calendar::formatDate($val, 'short');
45 45
             } catch (Exception $e) {
46 46
                 trigger_error($e->getMessage(), E_USER_WARNING);
47
-                return (string) $this->literal;
47
+                return (string)$this->literal;
48 48
             }
49 49
         }
50 50
         return $this->literal->getValue();
Please login to merge, or discard this patch.
model/Concept.php 2 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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -463,11 +463,11 @@
 block discarded – undo
463 463
             trigger_error($e->getMessage(), E_USER_WARNING);
464 464
             $ret = '';
465 465
             if ($this->resource->get('dc11:modified') || $this->resource->get('dc:modified')) {
466
-                $modified = $this->resource->get('dc11:modified') ? (string) $this->resource->get('dc11:modified') : (string) $this->resource->get('dc:modified');
466
+                $modified = $this->resource->get('dc11:modified') ? (string)$this->resource->get('dc11:modified') : (string)$this->resource->get('dc:modified');
467 467
                 $ret = gettext('skosmos:modified') . ' ' . $modified; 
468 468
             }
469 469
             if ($this->resource->get('dc11:created') || $this->resource->get('dc:created')) {
470
-                $created .= $this->resource->get('dc11:created') ? (string) $this->resource->get('dc11:created') : (string) $this->resource->get('dc:created');
470
+                $created .= $this->resource->get('dc11:created') ? (string)$this->resource->get('dc11:created') : (string)$this->resource->get('dc:created');
471 471
                 $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
472 472
             }
473 473
         }
Please login to merge, or discard this patch.
model/Model.php 3 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 Aalto University and University of Helsinki
4
- * MIT License
5
- * see LICENSE.txt for more information
6
- */
3
+     * Copyright (c) 2012 Aalto University and University of Helsinki
4
+     * MIT License
5
+     * see LICENSE.txt for more information
6
+     */
7 7
 
8 8
 /**
9 9
  * Includes the side wide settings.
Please login to merge, or discard this patch.
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/Vocabulary.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,10 +76,12 @@
 block discarded – undo
76 76
      */
77 77
     public function getUriSpace()
78 78
     {
79
-        if ($this->urispace === null) // initialize cache
79
+        if ($this->urispace === null) {
80
+          // initialize cache
80 81
         {
81 82
             $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue();
82 83
         }
84
+        }
83 85
 
84 86
         return $this->urispace;
85 87
     }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
      * Counts the statistics of the vocabulary.
279 279
      * @return array of the concept/group counts
280 280
      */
281
-    public function getStatistics($lang = '', $array=null, $group=null)
281
+    public function getStatistics($lang = '', $array = null, $group = null)
282 282
     {
283 283
         $sparql = $this->getSparql();
284 284
         // find the number of concepts
@@ -594,14 +594,14 @@  discard block
 block discarded – undo
594 594
     {
595 595
       $changelist = $this->getSparql()->queryChangeList($clang, $offset, $prop);
596 596
       $bydate = array();
597
-      foreach($changelist as $concept) {
597
+      foreach ($changelist as $concept) {
598 598
         $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
599
-        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
599
+        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
600 600
       }
601 601
       return $bydate;
602 602
     }
603 603
 
604
-    public function getTitle($lang=null) {
604
+    public function getTitle($lang = null) {
605 605
       return $this->config->getTitle($lang);
606 606
     }
607 607
     
Please login to merge, or discard this patch.
model/VocabularyConfig.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
      * @param string $property the property to query
31 31
      * @param string $lang preferred language for the literal,
32 32
      */
33
-    private function getLiteral($property, $lang=null)
33
+    private function getLiteral($property, $lang = null)
34 34
     {
35 35
         if (!isset($lang)) {;
36 36
             $lang = $this->getEnvLang();
Please login to merge, or discard this patch.
Braces   +15 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,8 +43,9 @@  discard block
 block discarded – undo
43 43
 
44 44
         // not found with selected language, try any language
45 45
         $literal = $this->resource->getLiteral($property);
46
-        if ($literal)
47
-          return $literal->getValue();
46
+        if ($literal) {
47
+                  return $literal->getValue();
48
+        }
48 49
     }
49 50
 
50 51
     /**
@@ -85,8 +86,9 @@  discard block
 block discarded – undo
85 86
     public function getShortName()
86 87
     {
87 88
         $shortname = $this->getLiteral('skosmos:shortName');
88
-        if ($shortname) 
89
-          return $shortname;
89
+        if ($shortname) {
90
+                  return $shortname;
91
+        }
90 92
 
91 93
         // if no shortname exists fall back to the id
92 94
         return $this->getId();
@@ -205,10 +207,12 @@  discard block
 block discarded – undo
205 207
         $ret = array();
206 208
         foreach ($resources as $res) {
207 209
             $prop = $res->getURI();
208
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
210
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
211
+              // shortening property labels if possible
209 212
             {
210 213
                 $prop = EasyRdf_Namespace::shorten($prop);
211 214
             }
215
+            }
212 216
 
213 217
             $ret[] = $prop;
214 218
         }
@@ -225,10 +229,12 @@  discard block
 block discarded – undo
225 229
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
226 230
         foreach ($resources as $res) {
227 231
             $prop = $res->getURI();
228
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
232
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
233
+              // shortening property labels if possible
229 234
             {
230 235
                 $prop = EasyRdf_Namespace::shorten($prop);
231 236
             }
237
+            }
232 238
 
233 239
             if ($prop === $property) {
234 240
                 return true;
@@ -329,11 +335,12 @@  discard block
 block discarded – undo
329 335
     public function getId()
330 336
     {
331 337
         $uriparts = explode("#", $this->resource->getURI());
332
-        if (count($uriparts) != 1)
333
-        // hash namespace
338
+        if (count($uriparts) != 1) {
339
+                // hash namespace
334 340
         {
335 341
             return $uriparts[1];
336 342
         }
343
+        }
337 344
 
338 345
         // slash namespace
339 346
         $uriparts = explode("/", $this->resource->getURI());
Please login to merge, or discard this patch.
model/VocabularyDataObject.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.