NatLibFi / Skosmos

model/PluginRegister.php

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 class PluginRegister {
     private $requestedPlugins;
 
-    public function __construct($requestedPlugins=array()) {
+    public function __construct($requestedPlugins = array()) {
         $this->requestedPlugins = $requestedPlugins;
     }
 
@@ -31,7 +31,7 @@ 
      * @param boolean $raw interpret $type values as raw text instead of files
      * @return array
      */
-    private function filterPlugins($type, $raw=false) {
+    private function filterPlugins($type, $raw = false) {
         $plugins = $this->getPlugins();
         $ret = array();
         if (!empty($plugins)) {
@@ -43,7 +43,7 @@ 
                     }
                     else {
                         foreach ($files[$type] as $file) {
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                         }
                     }
                 }
@@ -74,7 +74,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsJS($names=null) {
+    public function getPluginsJS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('js', $names);
@@ -87,7 +87,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsCSS($names=null) {
+    public function getPluginsCSS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('css', $names);
@@ -100,7 +100,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsTemplates($names=null) {
+    public function getPluginsTemplates($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('templates', $names);
@@ -113,15 +113,15 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getTemplates($names=null) {
+    public function getTemplates($names = null) {
         $templateStrings = array();
         $plugins = $this->getPluginsTemplates($names);
         foreach ($plugins as $folder => $templates) {
             foreach ($templates as $path) {
                 if (file_exists($path)) {
                     $filename = explode('/', $path);
-                    $filename = $filename[sizeof($filename)-1];
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
+                    $filename = $filename[sizeof($filename) - 1];
+                    $id = $folder.'-'.substr($filename, 0, (strrpos($filename, ".")));
                     $templateStrings[$id] = file_get_contents($path);
                 }
             }

model/Cache.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * Wraps apc_store() and apcu_store()
      */
-    public function store($key, $value, $ttl=3600) {
+    public function store($key, $value, $ttl = 3600) {
         if (function_exists('apcu_store')) {
             return apcu_store($key, $value, $ttl);
         }

model/ConceptPropertyValue.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     {
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
         if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = $this->getNotation() . $label;
+            $label = $this->getNotation().$label;
         }
 
         return $label;
@@ -47,9 +47,9 @@ 
                 }
                 // We need to check all the labels in case one of them matches a subtag of the current language
                 if ($this->resource->allLiterals('skos:prefLabel')) {
-                    foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
+                    foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
                         // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
-                        if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
+                        if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
                             return EasyRdf\Literal::create($label, $fallback);
                         }
                     }
@@ -137,7 +137,7 @@ 
     public function getReifiedPropertyValues() {
         $ret = array();
         $props = $this->resource->propertyUris();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
             foreach ($this->resource->allLiterals($prop) as $val) {
                 if ($prop !== 'rdf:value') { // shown elsewhere

model/BaseConfig.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * @param string $default default value
      * @param string $lang preferred language for the literal
      */
-    protected function getLiteral($property, $default=null, $lang=null)
+    protected function getLiteral($property, $default = null, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();

migrate-config.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
     foreach (explode(' ', GLOBAL_PLUGINS) as $pluginName) {
         $globalPluginsArray[] = "\"$pluginName\"";
     }
-    $globalPlugins = " " . implode(', ', $globalPluginsArray) . " ";
+    $globalPlugins = " ".implode(', ', $globalPluginsArray)." ";
 }
 
 # print the prefixes

model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null, $sort_by_notation=false)
+    public function __construct($prop, $label, $super = null, $sort_by_notation = false)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -61,7 +61,7 @@ 
      */
     public function getDescription()
     {
-        $helpprop = $this->prop . "_help";
+        $helpprop = $this->prop."_help";
 
         return gettext($helpprop); // can't use string constant, it'd be picked up by xgettext
     }
@@ -80,7 +80,7 @@ 
 
     public function addValue($value)
     {
-        $this->values[$value->getNotation() . $value->getLabel() . $value->getUri()] = $value;
+        $this->values[$value->getNotation().$value->getLabel().$value->getUri()] = $value;
         $this->is_sorted = false;
     }
 
@@ -88,7 +88,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a),strtolower($b));
+                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a), strtolower($b));
             });
         }
         $this->is_sorted = true;

model/LabelSkosXL.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function getPrefLabel() {
         $label = null;
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label->getLang() == $this->clang) {
                 return $label;
@@ -23,7 +23,7 @@ 
     public function getProperties() {
         $ret = array();
         $props = $this->resource->properties();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             if ($prop !== 'skosxl:prefLabel') {
                 $ret[$prop] = $this->resource->get($prop);
             }

model/Concept.php

Spacing +25 added lines, -25 removed lines

@@ -137,9 +137,9 @@ 
                 return $this->resource->label($fallback);
             }
             // We need to check all the labels in case one of them matches a subtag of the current language
-            foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
+            foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
                 // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
-                if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
+                if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
                     return EasyRdf\Literal::create($label, $fallback);
                 }
             }
@@ -160,7 +160,7 @@ 
 
     public function hasXlLabel($prop = 'prefLabel')
     {
-        if ($this->resource->hasProperty('skosxl:' . $prop)) {
+        if ($this->resource->hasProperty('skosxl:'.$prop)) {
             return true;
         }
         return false;
@@ -169,7 +169,7 @@ 
     public function getXlLabel()
     {
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label !== null && $label->getLang() == $this->clang) {
                 return new LabelSkosXL($this->model, $labres);
@@ -276,7 +276,7 @@ 
         // catch external subjects that have $res as object
         $extSubjects = $exGraph->resourcesMatching("schema:about", $res);
 
-        $propList =  array_unique(array_merge(
+        $propList = array_unique(array_merge(
             $this->DEFAULT_EXT_PROPERTIES,
             $this->getVocab()->getConfig()->getExtProperties(),
             $this->getVocab()->getConfig()->getPlugins()->getExtProperties()
@@ -301,7 +301,7 @@ 
      * @param string[] $seen Processed resources so far
      * @param string[] $props (optional) limit to these property URIs
      */
-    private function addExternalTriplesToGraph($res, &$seen, $props=null)
+    private function addExternalTriplesToGraph($res, &$seen, $props = null)
     {
         if (array_key_exists($res->getUri(), $seen) && $seen[$res->getUri()] === 0) {
             return;
@@ -331,7 +331,7 @@ 
      */
     private function addPropertyValues($res, $prop, &$seen)
     {
-        $resList = $res->allResources('<' . $prop . '>');
+        $resList = $res->allResources('<'.$prop.'>');
 
         foreach ($resList as $res2) {
             if ($res2->isBNode()) {
@@ -341,7 +341,7 @@ 
             $this->addResourceReifications($res, $prop, $res2, $seen);
         }
 
-        $litList = $res->allLiterals('<' . $prop . '>');
+        $litList = $res->allLiterals('<'.$prop.'>');
 
         foreach ($litList as $lit) {
             $this->graph->addLiteral($res, $prop, $lit);
@@ -518,15 +518,15 @@ 
                 // if not found in current vocabulary, look up in the default graph to be able
                 // to read an ontology loaded in a separate graph
                 // note that this imply that the property has an rdf:type declared for the query to work
-                if(!$is_well_known && !$proplabel) {
+                if (!$is_well_known && !$proplabel) {
                     $envLangLabels = $this->model->getDefaultSparql()->queryLabel($longUri, $this->getEnvLang());
                     
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
 
-					if($envLangLabels) {
+					if ($envLangLabels) {
 						$proplabel = $envLangLabels[$this->getEnvLang()];
                     } else {
-						if($defaultPropLabel) {
+						if ($defaultPropLabel) {
 							$proplabel = $defaultPropLabel[''];
 						}
 					}
@@ -539,12 +539,12 @@ 
                 }
 
                 // also look up superprops in the default graph if not found in current vocabulary
-                if(!$is_well_known && (!$superprops || empty($superprops))) {
+                if (!$is_well_known && (!$superprops || empty($superprops))) {
                     $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri);
                 }
 
                 // we're reading only one super property, even if there are multiple ones
-                $superprop = ($superprops)?$superprops[0]:null;
+                $superprop = ($superprops) ? $superprops[0] : null;
                 if ($superprop) {
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
                 }
@@ -557,7 +557,7 @@ 
                 }
 
                 // searching for subproperties of literals too
-                if($superprops) {
+                if ($superprops) {
                     foreach ($superprops as $subi) {
                         $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi;
                         $duplicates[$suburi] = $prop;
@@ -677,14 +677,14 @@ 
 
             // making a human readable string from the timestamps
             if ($created != '') {
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
             }
 
             if ($modified != '') {
                 if ($created != '') {
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
                 } else {
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
                 }
 
             }
@@ -692,12 +692,12 @@ 
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
-                $ret = gettext('skosmos:modified') . ' ' . $modified;
+                $modified = (string)$this->resource->get('dc:modified');
+                $ret = gettext('skosmos:modified').' '.$modified;
             }
             if ($this->resource->get('dc:created')) {
-                $created .= (string) $this->resource->get('dc:created');
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created;
+                $created .= (string)$this->resource->get('dc:created');
+                $ret .= ' '.gettext('skosmos:created').' '.$created;
             }
         }
         return $ret;
@@ -769,7 +769,7 @@ 
                     $groups[$collLabel] = array($group);
 
                     $res = $collection;
-                    while($super = $this->graph->resourcesMatching('skos:member', $res)) {
+                    while ($super = $this->graph->resourcesMatching('skos:member', $res)) {
                         foreach ($super as $res) {
                             $superprop = new ConceptPropertyValue($this->model, $this->vocab, $res, 'skosmos:memberOfSuper', $this->clang);
                             array_unshift($groups[$collLabel], $superprop);
@@ -811,7 +811,7 @@ 
         $ret = array();
         foreach ($labels as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
             }
@@ -873,10 +873,10 @@ 
             }
             else if ($context[$vocabPrefix] !== $vocabUriSpace) {
                 $i = 2;
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
                     $i += 1;
                 }
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
             }
         }
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));

controller/EntityController.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
         $baseurl = $this->getBaseHref();
         $vocid = $vocab->getId();
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
+        $url = $baseurl."rest/v1/$vocid/data?$query";
         $this->redirect303($url);
     }
 
@@ -27,16 +27,16 @@ 
         $localname = $vocab->getLocalName($uri);
 
         if (!$localname) {
-            $url = $baseurl . "$vocid/";
+            $url = $baseurl."$vocid/";
         } else {
 
    	        if ($localname !== $uri && $localname === urlencode($localname)) {
    	        // the URI can be shortened
-            $url = $baseurl . "$vocid/page/$localname";
+            $url = $baseurl."$vocid/page/$localname";
             } else {
                 // must use full URI
    	            $query = http_build_query(array('uri'=>$uri));
-                $url = $baseurl . "$vocid/page/?" . $query;
+                $url = $baseurl."$vocid/page/?".$query;
 	        }
         }
         $this->redirect303($url);
@@ -57,7 +57,7 @@ 
             // guess vocabulary based on URI
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
             if ($vocab === null) {
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
             }
             $request->setVocab($vocab->getId());
         }