[BUGFIX] remove static method calls on non-static methods

htuscher · htuscher · commit d826a1383007 · 2015-03-14T17:31:51.000+01:00
This changes make the extension usable under PHP 5.6

Resolves: #65490
Change-Id: I7b226c99dbc707950215b8ab5004fe96d0bb685b
diff --git a/Classes/Facet/SimpleFacetRenderer.php b/Classes/Facet/SimpleFacetRenderer.php
@@ -79,7 +79,7 @@ public function getFacetProperties() {
 
 		if ($facet['count'] > $this->solrConfiguration['search.']['faceting.']['limit']) {
 			$showAllLink = '<a href="#" class="tx-solr-facet-show-all">###LLL:faceting_showMore###</a>';
-			$showAllLink = tslib_cObj::wrap($showAllLink, $this->solrConfiguration['search.']['faceting.']['showAllLink.']['wrap']);
+			$showAllLink = $GLOBALS['TSFE']->cObj->wrap($showAllLink, $this->solrConfiguration['search.']['faceting.']['showAllLink.']['wrap']);
 			$facet['show_all_link'] = $showAllLink;
 		}
 
@@ -92,4 +92,4 @@ public function getFacetProperties() {
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/solr/Classes/Facet/SimpleFacetRenderer.php']);
 }
 
-?>
+?>
diff --git a/Classes/SpellChecker.php b/Classes/SpellChecker.php
@@ -136,7 +136,7 @@ public function getSpellCheckingSuggestions() {
 
 			$suggestions = $this->getSuggestions();
 			if($suggestions && !$suggestions['correctlySpelled'] && !empty($suggestions['collation'])) {
-				$suggestionsLink = tslib_cObj::noTrimWrap(
+				$suggestionsLink = $GLOBALS['TSFE']->cObj->noTrimWrap(
 					$this->getSuggestionQueryLink(),
 					$this->configuration['search.']['spellchecking.']['wrap']
 				);
@@ -153,4 +153,4 @@ public function getSpellCheckingSuggestions() {
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/solr/Classes/SpellChecker.php']);
 }
 
-?>
+?>
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
 		}
 	],
 	"require": {
-		"php": ">5.3.0,~5.5.0"
+		"php": ">5.3.0,~5.6.0"
 	},
 	"require-dev": {
 		"typo3-ci/typo3cms": "dev-master"

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function getFacetProperties() {`
`79`	`79`
`80`	`80`	`if ($facet['count'] > $this->solrConfiguration['search.']['faceting.']['limit']) {`
`81`	`81`	`$showAllLink = '<a href="#" class="tx-solr-facet-show-all">###LLL:faceting_showMore###</a>';`
`82`		`- $showAllLink = tslib_cObj::wrap($showAllLink, $this->solrConfiguration['search.']['faceting.']['showAllLink.']['wrap']);`
	`82`	`+ $showAllLink = $GLOBALS['TSFE']->cObj->wrap($showAllLink, $this->solrConfiguration['search.']['faceting.']['showAllLink.']['wrap']);`
`83`	`83`	`$facet['show_all_link'] = $showAllLink;`
`84`	`84`	`}`
`85`	`85`
`@@ -92,4 +92,4 @@ public function getFacetProperties() {`
`92`	`92`	`include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/solr/Classes/Facet/SimpleFacetRenderer.php']);`
`93`	`93`	`}`
`94`	`94`
`95`		`-?>`
	`95`	`+?>`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`}`
`34`	`34`	`],`
`35`	`35`	`"require": {`
`36`		`- "php": ">5.3.0,~5.5.0"`
	`36`	`+ "php": ">5.3.0,~5.6.0"`
`37`	`37`	`},`
`38`	`38`	`"require-dev": {`
`39`	`39`	`"typo3-ci/typo3cms": "dev-master"`