Completed
Pull Request — master (#930)
by Dan Michael O.
01:51
created
model/Cache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     /**
20 20
      * Wraps apc_store() and apcu_store()
21 21
      */
22
-    public function store($key, $value, $ttl=3600) {
22
+    public function store($key, $value, $ttl = 3600) {
23 23
         if (function_exists('apcu_store')) {
24 24
             return apcu_store($key, $value, $ttl);
25 25
         }
Please login to merge, or discard this patch.
model/BaseConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
      * @param string $default default value
43 43
      * @param string $lang preferred language for the literal
44 44
      */
45
-    protected function getLiteral($property, $default=null, $lang=null)
45
+    protected function getLiteral($property, $default = null, $lang = null)
46 46
     {
47 47
         if (!isset($lang)) {;
48 48
             $lang = $this->getEnvLang();
Please login to merge, or discard this patch.
migrate-config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
     foreach (explode(' ', GLOBAL_PLUGINS) as $pluginName) {
85 85
         $globalPluginsArray[] = "\"$pluginName\"";
86 86
     }
87
-    $globalPlugins = " " . implode(', ', $globalPluginsArray) . " ";
87
+    $globalPlugins = " ".implode(', ', $globalPluginsArray)." ";
88 88
 }
89 89
 
90 90
 # print the prefixes
Please login to merge, or discard this patch.
model/LabelSkosXL.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
     public function getPrefLabel() {
12 12
         $label = null;
13 13
         $labels = $this->resource->allResources('skosxl:prefLabel');
14
-        foreach($labels as $labres) {
14
+        foreach ($labels as $labres) {
15 15
             $label = $labres->getLiteral('skosxl:literalForm');
16 16
             if ($label->getLang() == $this->clang) {
17 17
                 return $label;
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     public function getProperties() {
24 24
         $ret = array();
25 25
         $props = $this->resource->properties();
26
-        foreach($props as $prop) {
26
+        foreach ($props as $prop) {
27 27
             if ($prop !== 'skosxl:prefLabel') {
28 28
                 $ret[$prop] = $this->resource->get($prop);
29 29
             }
Please login to merge, or discard this patch.
model/Concept.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
                 return $this->resource->label($fallback);
138 138
             }
139 139
             // We need to check all the labels in case one of them matches a subtag of the current language
140
-            foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
140
+            foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
141 141
                 // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
142
-                if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
142
+                if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
143 143
                     return EasyRdf\Literal::create($label, $fallback);
144 144
                 }
145 145
             }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
     public function hasXlLabel($prop = 'prefLabel')
162 162
     {
163
-        if ($this->resource->hasProperty('skosxl:' . $prop)) {
163
+        if ($this->resource->hasProperty('skosxl:'.$prop)) {
164 164
             return true;
165 165
         }
166 166
         return false;
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     public function getXlLabel()
170 170
     {
171 171
         $labels = $this->resource->allResources('skosxl:prefLabel');
172
-        foreach($labels as $labres) {
172
+        foreach ($labels as $labres) {
173 173
             $label = $labres->getLiteral('skosxl:literalForm');
174 174
             if ($label !== null && $label->getLang() == $this->clang) {
175 175
                 return new LabelSkosXL($this->model, $labres);
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
         // catch external subjects that have $res as object
277 277
         $extSubjects = $exGraph->resourcesMatching("schema:about", $res);
278 278
 
279
-        $propList =  array_unique(array_merge(
279
+        $propList = array_unique(array_merge(
280 280
             $this->DEFAULT_EXT_PROPERTIES,
281 281
             $this->getVocab()->getConfig()->getExtProperties(),
282 282
             $this->getVocab()->getConfig()->getPlugins()->getExtProperties()
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
      * @param string[] $seen Processed resources so far
302 302
      * @param string[] $props (optional) limit to these property URIs
303 303
      */
304
-    private function addExternalTriplesToGraph($res, &$seen, $props=null)
304
+    private function addExternalTriplesToGraph($res, &$seen, $props = null)
305 305
     {
306 306
         if (array_key_exists($res->getUri(), $seen) && $seen[$res->getUri()] === 0) {
307 307
             return;
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
      */
332 332
     private function addPropertyValues($res, $prop, &$seen)
333 333
     {
334
-        $resList = $res->allResources('<' . $prop . '>');
334
+        $resList = $res->allResources('<'.$prop.'>');
335 335
 
336 336
         foreach ($resList as $res2) {
337 337
             if ($res2->isBNode()) {
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
             $this->addResourceReifications($res, $prop, $res2, $seen);
342 342
         }
343 343
 
344
-        $litList = $res->allLiterals('<' . $prop . '>');
344
+        $litList = $res->allLiterals('<'.$prop.'>');
345 345
 
346 346
         foreach ($litList as $lit) {
347 347
             $this->graph->addLiteral($res, $prop, $lit);
@@ -518,15 +518,15 @@  discard block
 block discarded – undo
518 518
                 // if not found in current vocabulary, look up in the default graph to be able
519 519
                 // to read an ontology loaded in a separate graph
520 520
                 // note that this imply that the property has an rdf:type declared for the query to work
521
-                if(!$is_well_known && !$proplabel) {
521
+                if (!$is_well_known && !$proplabel) {
522 522
                     $envLangLabels = $this->model->getDefaultSparql()->queryLabel($longUri, $this->getEnvLang());
523 523
                     
524 524
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
525 525
 
526
-					if($envLangLabels) {
526
+					if ($envLangLabels) {
527 527
 						$proplabel = $envLangLabels[$this->getEnvLang()];
528 528
                     } else {
529
-						if($defaultPropLabel) {
529
+						if ($defaultPropLabel) {
530 530
 							$proplabel = $defaultPropLabel[''];
531 531
 						}
532 532
 					}
@@ -539,12 +539,12 @@  discard block
 block discarded – undo
539 539
                 }
540 540
 
541 541
                 // also look up superprops in the default graph if not found in current vocabulary
542
-                if(!$is_well_known && (!$superprops || empty($superprops))) {
542
+                if (!$is_well_known && (!$superprops || empty($superprops))) {
543 543
                     $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri);
544 544
                 }
545 545
 
546 546
                 // we're reading only one super property, even if there are multiple ones
547
-                $superprop = ($superprops)?$superprops[0]:null;
547
+                $superprop = ($superprops) ? $superprops[0] : null;
548 548
                 if ($superprop) {
549 549
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
550 550
                 }
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
                 }
558 558
 
559 559
                 // searching for subproperties of literals too
560
-                if($superprops) {
560
+                if ($superprops) {
561 561
                     foreach ($superprops as $subi) {
562 562
                         $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi;
563 563
                         $duplicates[$suburi] = $prop;
@@ -677,14 +677,14 @@  discard block
 block discarded – undo
677 677
 
678 678
             // making a human readable string from the timestamps
679 679
             if ($created != '') {
680
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
680
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
681 681
             }
682 682
 
683 683
             if ($modified != '') {
684 684
                 if ($created != '') {
685
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
685
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
686 686
                 } else {
687
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
687
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
688 688
                 }
689 689
 
690 690
             }
@@ -692,12 +692,12 @@  discard block
 block discarded – undo
692 692
             trigger_error($e->getMessage(), E_USER_WARNING);
693 693
             $ret = '';
694 694
             if ($this->resource->get('dc:modified')) {
695
-                $modified = (string) $this->resource->get('dc:modified');
696
-                $ret = gettext('skosmos:modified') . ' ' . $modified;
695
+                $modified = (string)$this->resource->get('dc:modified');
696
+                $ret = gettext('skosmos:modified').' '.$modified;
697 697
             }
698 698
             if ($this->resource->get('dc:created')) {
699
-                $created .= (string) $this->resource->get('dc:created');
700
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created;
699
+                $created .= (string)$this->resource->get('dc:created');
700
+                $ret .= ' '.gettext('skosmos:created').' '.$created;
701 701
             }
702 702
         }
703 703
         return $ret;
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
                     $groups[$collLabel] = array($group);
770 770
 
771 771
                     $res = $collection;
772
-                    while($super = $this->graph->resourcesMatching('skos:member', $res)) {
772
+                    while ($super = $this->graph->resourcesMatching('skos:member', $res)) {
773 773
                         foreach ($super as $res) {
774 774
                             $superprop = new ConceptPropertyValue($this->model, $this->vocab, $res, 'skosmos:memberOfSuper', $this->clang);
775 775
                             array_unshift($groups[$collLabel], $superprop);
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
         $ret = array();
812 812
         foreach ($labels as $lit) {
813 813
             // filtering away subsets of the current language eg. en vs en-GB
814
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
814
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
815 815
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
816 816
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
817 817
             }
@@ -873,10 +873,10 @@  discard block
 block discarded – undo
873 873
             }
874 874
             else if ($context[$vocabPrefix] !== $vocabUriSpace) {
875 875
                 $i = 2;
876
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
876
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
877 877
                     $i += 1;
878 878
                 }
879
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
879
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
880 880
             }
881 881
         }
882 882
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));
Please login to merge, or discard this patch.
controller/EntityController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
         $baseurl = $this->getBaseHref();
17 17
         $vocid = $vocab->getId();
18 18
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
19
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
19
+        $url = $baseurl."rest/v1/$vocid/data?$query";
20 20
         $this->redirect303($url);
21 21
     }
22 22
 
@@ -27,16 +27,16 @@  discard block
 block discarded – undo
27 27
         $localname = $vocab->getLocalName($uri);
28 28
 
29 29
         if (!$localname) {
30
-            $url = $baseurl . "$vocid/";
30
+            $url = $baseurl."$vocid/";
31 31
         } else {
32 32
 
33 33
    	        if ($localname !== $uri && $localname === urlencode($localname)) {
34 34
    	        // the URI can be shortened
35
-            $url = $baseurl . "$vocid/page/$localname";
35
+            $url = $baseurl."$vocid/page/$localname";
36 36
             } else {
37 37
                 // must use full URI
38 38
    	            $query = http_build_query(array('uri'=>$uri));
39
-                $url = $baseurl . "$vocid/page/?" . $query;
39
+                $url = $baseurl."$vocid/page/?".$query;
40 40
 	        }
41 41
         }
42 42
         $this->redirect303($url);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
             // guess vocabulary based on URI
58 58
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
59 59
             if ($vocab === null) {
60
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
60
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
61 61
             }
62 62
             $request->setVocab($vocab->getId());
63 63
         }
Please login to merge, or discard this patch.
model/VocabularyConfig.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
     private $plugins;
9 9
     private $languageOrderCache = array();
10 10
 
11
-    public function __construct($resource, $globalPlugins=array())
11
+    public function __construct($resource, $globalPlugins = array())
12 12
     {
13 13
         $this->resource = $resource;
14 14
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         $langs = $this->getLanguages();
37 37
         $deflang = reset($langs); // picking the first one from the list with reset since the keys are not numeric
38 38
         if (sizeof($langs) > 1) {
39
-            trigger_error("Default language for vocabulary '" . $this->getShortName() . "' unknown, choosing '$deflang'.", E_USER_WARNING);
39
+            trigger_error("Default language for vocabulary '".$this->getShortName()."' unknown, choosing '$deflang'.", E_USER_WARNING);
40 40
         }
41 41
 
42 42
         return $deflang;
Please login to merge, or discard this patch.
model/GlobalConfig.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
      */
29 29
     private $configModifiedTime = null;
30 30
 
31
-    public function __construct($config_name='/../config.ttl')
31
+    public function __construct($config_name = '/../config.ttl')
32 32
     {
33 33
         $this->cache = new Cache();
34 34
         try {
35
-            $this->filePath = realpath( dirname(__FILE__) . $config_name );
35
+            $this->filePath = realpath(dirname(__FILE__).$config_name);
36 36
             if (!file_exists($this->filePath)) {
37 37
                 throw new Exception('config.ttl file is missing, please provide one.');
38 38
             }
39 39
             $this->initializeConfig();
40 40
         } catch (Exception $e) {
41
-            echo "Error: " . $e->getMessage();
41
+            echo "Error: ".$e->getMessage();
42 42
             return;
43 43
         }
44 44
     }
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
             // use APC user cache to store parsed config.ttl configuration
73 73
             if ($this->cache->isAvailable() && !is_null($this->configModifiedTime)) {
74 74
                 // @codeCoverageIgnoreStart
75
-                $key = realpath($this->filePath) . ", " . $this->configModifiedTime;
76
-                $nskey = "namespaces of " . $key;
75
+                $key = realpath($this->filePath).", ".$this->configModifiedTime;
76
+                $nskey = "namespaces of ".$key;
77 77
                 $this->graph = $this->cache->fetch($key);
78 78
                 $this->namespaces = $this->cache->fetch($nskey);
79 79
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
             $this->resource = $configResources[0];
95 95
             $this->initializeNamespaces();
96 96
         } catch (Exception $e) {
97
-            echo "Error: " . $e->getMessage();
97
+            echo "Error: ".$e->getMessage();
98 98
         }      
99 99
     }
100 100
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
     public function getGlobalPlugins()
325 325
     {
326 326
         $globalPlugins = array();
327
-        $globalPluginsResource =  $this->getResource()->getResource("skosmos:globalPlugins");
327
+        $globalPluginsResource = $this->getResource()->getResource("skosmos:globalPlugins");
328 328
         if ($globalPluginsResource) {
329 329
             foreach ($globalPluginsResource as $resource) {
330 330
                 $globalPlugins[] = $resource->getValue();
Please login to merge, or discard this patch.
model/ConceptPropertyValue.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     {
25 25
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
26 26
         if ($this->vocab->getConfig()->sortByNotation()) {
27
-            $label = ltrim($this->getNotation() . ' ') . $label;
27
+            $label = ltrim($this->getNotation().' ').$label;
28 28
         }
29 29
 
30 30
         return $label;
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
                 }
48 48
                 // We need to check all the labels in case one of them matches a subtag of the current language
49 49
                 if ($this->resource->allLiterals('skos:prefLabel')) {
50
-                    foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
50
+                    foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
51 51
                         // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
52
-                        if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
52
+                        if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
53 53
                             return EasyRdf\Literal::create($label, $fallback);
54 54
                         }
55 55
                     }
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
     public function getReifiedPropertyValues() {
142 142
         $ret = array();
143 143
         $props = $this->resource->propertyUris();
144
-        foreach($props as $prop) {
144
+        foreach ($props as $prop) {
145 145
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
146 146
             foreach ($this->resource->allLiterals($prop) as $val) {
147 147
                 if ($prop !== 'rdf:value') { // shown elsewhere
Please login to merge, or discard this patch.