Completed
Push — master ( 29134b...153eff )
by Henri
03:02
created
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/ConceptSearchParameters.php 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
         return $type;
119 119
     }
120 120
 
121
-    private function getQueryParam($name, $explode=false) {
121
+    private function getQueryParam($name, $explode = false) {
122 122
         if ($explode) {
123 123
             return $this->request->getQueryParam($name) ? explode(' ', $this->request->getQueryParam($name)) : null;
124 124
         }
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/VocabularyCategory.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -10,6 +10,9 @@
 block discarded – undo
10 10
  */
11 11
 class VocabularyCategory extends DataObject
12 12
 {
13
+    /**
14
+     * @param Model $model
15
+     */
13 16
     public function __construct($model, $resource)
14 17
     {
15 18
         if (!($model instanceof Model)) {
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.
model/GlobalConfig.php 2 patches
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='/../config.inc') 
9
+    public function __construct($config_name = '/../config.inc') 
10 10
     {
11 11
         try {
12 12
             $file_path = dirname(__FILE__) . $config_name;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -23,6 +23,9 @@
 block discarded – undo
23 23
         }
24 24
     }
25 25
     
26
+    /**
27
+     * @param string $name
28
+     */
26 29
     private function getConstant($name, $default)
27 30
     {
28 31
         if (defined($name) && constant($name)) {
Please login to merge, or discard this patch.
model/DataObject.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,10 +68,12 @@
 block discarded – undo
68 68
         if ($sortable !== null) {
69 69
             uksort($sortable, array($this, 'mycompare'));
70 70
             foreach ($sortable as $prop => $vals) {
71
-                if (is_array($prop)) // the ConceptProperty objects have their own sorting methods
71
+                if (is_array($prop)) {
72
+                  // the ConceptProperty objects have their own sorting methods
72 73
                 {
73 74
                     ksort($sortable[$prop]);
74 75
                 }
76
+                }
75 77
 
76 78
             }
77 79
         }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
      */
115 115
     public function getEnvLang()    
116 116
     {
117
-       // get language from locale, same as used by gettext, set by Controller
118
-       return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
117
+        // get language from locale, same as used by gettext, set by Controller
118
+        return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
119 119
     }
120 120
 }
Please login to merge, or discard this patch.
model/PluginRegister.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 class PluginRegister {
4 4
     private $requestedPlugins;
5 5
 
6
-    public function __construct($requestedPlugins=array()) {
6
+    public function __construct($requestedPlugins = array()) {
7 7
         $this->requestedPlugins = $requestedPlugins;
8 8
     }
9 9
     
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
      * @param array $names the plugin name strings (foldernames) in an array 
69 69
      * @return array
70 70
      */
71
-    public function getPluginsJS($names=null) {
71
+    public function getPluginsJS($names = null) {
72 72
         if ($names) {
73 73
             $names = array_merge($this->requestedPlugins, $names);
74 74
             return $this->filterPluginsByName('js', $names);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      * @param array $names the plugin name strings (foldernames) in an array 
82 82
      * @return array
83 83
      */
84
-    public function getPluginsCSS($names=null) {
84
+    public function getPluginsCSS($names = null) {
85 85
         if ($names) {
86 86
             $names = array_merge($this->requestedPlugins, $names);
87 87
             return $this->filterPluginsByName('css', $names);
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
      * @param array $names the plugin name strings (foldernames) in an array 
95 95
      * @return array
96 96
      */
97
-    public function getPluginsTemplates($names=null) {
97
+    public function getPluginsTemplates($names = null) {
98 98
         if ($names) {
99 99
             $names = array_merge($this->requestedPlugins, $names);
100 100
             return $this->filterPluginsByName('templates', $names);
@@ -107,15 +107,15 @@  discard block
 block discarded – undo
107 107
      * @param array $names the plugin name strings (foldernames) in an array 
108 108
      * @return array
109 109
      */
110
-    public function getTemplates($names=null) {
110
+    public function getTemplates($names = null) {
111 111
         $templateStrings = array();
112 112
         $plugins = $this->getPluginsTemplates($names);
113 113
         foreach ($plugins as $folder => $templates) {
114 114
             foreach ($templates as $path) {
115 115
                 if (file_exists($path)) {
116 116
                     $filename = explode('/', $path);
117
-                    $filename = $filename[sizeof($filename)-1];
118
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
117
+                    $filename = $filename[sizeof($filename) - 1];
118
+                    $id = $folder . '-' . substr($filename, 0, (strrpos($filename, ".")));
119 119
                     $templateStrings[$id] = file_get_contents($path);
120 120
                 }
121 121
             }
Please login to merge, or discard this patch.