Completed
Pull Request — master (#419)
by Dan Michael O.
03:19 queued 34s
created
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.
controller/Controller.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/ConceptProperty.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
     {
81 81
         if (!empty($this->values)) {
82 82
             uksort($this->values, function($a, $b) {
83
-                return strnatcasecmp($a,$b);
83
+                return strnatcasecmp($a, $b);
84 84
             });
85 85
         }
86 86
         $this->is_sorted = true;
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.
controller/WebController.php 1 patch
Spacing   +3 added lines, -3 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);
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
      * Loads and renders the view containing a list of recent changes in the vocabulary.
612 612
      * @param Request $request
613 613
      */
614
-    public function invokeChangeList($request, $prop='dc:created')
614
+    public function invokeChangeList($request, $prop = 'dc:created')
615 615
     {
616 616
         // set language parameters for gettext
617 617
         $this->setLanguageProperties($request->getLang());
Please login to merge, or discard this patch.