PHP 7.1 required changes (#2269)

SemanticMediaWiki · Feb 18, 2017 · ff2cd37 · ff2cd37
1 parent 017364c
commit ff2cd37
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 15 deletions.
diff --git a/includes/datavalues/SMW_DataValue.php b/includes/datavalues/SMW_DataValue.php
@@ -324,7 +324,7 @@ public function getOption( $key ) {
 	 * @return boolean
 	 */
 	public function isEnabledFeature( $feature ) {
-		return ( $this->getOption( 'smwgDVFeatures' ) & $feature ) != 0;
+		return ( (int)$this->getOption( 'smwgDVFeatures' ) & $feature ) != 0;
 	}
 
 	/**

diff --git a/includes/queryprinters/ListResultPrinter.php b/includes/queryprinters/ListResultPrinter.php
@@ -407,7 +407,7 @@ protected function addTemplateContentFields( $row ) {
 			$fieldName = '';
 
 			// {{{?Foo}}}
-			if ( $this->mNamedArgs || $this->params['template arguments'] === 'legacy' ) {
+			if ( $this->mNamedArgs || $this->params['template arguments'] === 'legacy'  ) {
 				$fieldName = '?' . $field->getPrintRequest()->getLabel();
 			}
 
@@ -418,7 +418,7 @@ protected function addTemplateContentFields( $row ) {
 
 			// {{{1}}}
 			if ( $fieldName === '' || $fieldName === '?' || $this->params['template arguments'] === 'numbered' ) {
-				$fieldName = $fieldName . $i + 1;
+				$fieldName = intval( $i + 1 );
 			}
 
 			while ( ( $text = $field->getNextText( SMW_OUTPUT_WIKI, $this->getLinker( $i == 0 ) ) ) !== false ) {

diff --git a/src/SPARQLStore/QueryEngine/CompoundConditionBuilder.php b/src/SPARQLStore/QueryEngine/CompoundConditionBuilder.php
@@ -420,7 +420,7 @@ public function canUseQFeature( $queryFeatureFlag ) {
 			$canUse = $this->engineOptions->get( 'smwgQSubcategoryDepth' ) > 0;
 		}
 
-		return $this->engineOptions->get( 'smwgSparqlQFeatures' ) === ( $this->engineOptions->get( 'smwgSparqlQFeatures' ) | $queryFeatureFlag ) && $canUse;
+		return $this->engineOptions->get( 'smwgSparqlQFeatures' ) === ( (int)$this->engineOptions->get( 'smwgSparqlQFeatures' ) | (int)$queryFeatureFlag ) && $canUse;
 	}
 
 	/**

diff --git a/tests/autoloader.php b/tests/autoloader.php
@@ -8,8 +8,7 @@
  *
  * require __DIR__ . '/../../SemanticMediaWiki/tests/autoloader.php'
  */
-
-if ( PHP_SAPI !== 'cli' ) {
+if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
 	die( 'Not an entry point' );
 }
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
+if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
 	die( 'Not an entry point' );
 }
 

diff --git a/tests/phpunit/Integration/EncodingIntegrationTest.php b/tests/phpunit/Integration/EncodingIntegrationTest.php
@@ -28,7 +28,7 @@ class EncodingIntegrationTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testBaseTemplateToolboxURLEncoding( $setup, $expected ) {
 
-		$toolbox  = '';
+		$toolbox  = array();
 
 		foreach ( $setup['settings'] as $key => $value) {
 			ApplicationFactory::getInstance()->getSettings()->set( $key, $value );

diff --git a/tests/phpunit/Integration/JSONScript/TestCases/p-0438.json b/tests/phpunit/Integration/JSONScript/TestCases/p-0438.json
@@ -43,7 +43,7 @@
 					"title=\"Property:Has keyword\">KeywordCaption</a>",
 					"title=\"Property:Has query\">query-displaytitle</a></span><div class=\"smwttcontent\">„query-displaytitle“",
 					"title=\"Property:Has query\">QueryCaption</a></span><div class=\"smwttcontent\">„query-displaytitle“",
-					"title=\"Especial:Ask/-5B-5BCategoría:P0438-5D-5D/-3FModification-20date/-3FModification-20date=ModificationSomeLabel/-3FHas-20keyword/-3FHas-20keyword=KeywordCaption/-3FHas-20query/-3FHas-20query=QueryCaption/mainlabel=/limit=1/offset=1/format=table\">"
+					":Ask/-5B-5BCategoría:P0438-5D-5D/-3FModification-20date/-3FModification-20date=ModificationSomeLabel/-3FHas-20keyword/-3FHas-20keyword=KeywordCaption/-3FHas-20query/-3FHas-20query=QueryCaption/mainlabel=/limit=1/offset=1/format=table\">"
 				]
 			}
 		}

diff --git a/tests/phpunit/JsonTestCaseFileHandler.php b/tests/phpunit/JsonTestCaseFileHandler.php
@@ -200,7 +200,7 @@ public function getSettingsFor( $key ) {
 			$smwgDVFeatures = '';
 
 			foreach ( $settings[$key] as $value ) {
-				$smwgDVFeatures = constant( $value ) | $smwgDVFeatures;
+				$smwgDVFeatures = constant( $value ) | (int)$smwgDVFeatures;
 			}
 
 			return $smwgDVFeatures;
@@ -210,7 +210,7 @@ public function getSettingsFor( $key ) {
 			$smwgFulltextSearchIndexableDataTypes = '';
 
 			foreach ( $settings[$key] as $value ) {
-				$smwgFulltextSearchIndexableDataTypes = constant( $value ) | $smwgFulltextSearchIndexableDataTypes;
+				$smwgFulltextSearchIndexableDataTypes = constant( $value ) | (int)$smwgFulltextSearchIndexableDataTypes;
 			}
 
 			return $smwgFulltextSearchIndexableDataTypes;

diff --git a/tests/phpunit/Unit/MediaWiki/Hooks/BaseTemplateToolboxTest.php b/tests/phpunit/Unit/MediaWiki/Hooks/BaseTemplateToolboxTest.php
@@ -44,7 +44,7 @@ public function testCanConstruct() {
 	 */
 	public function testProcess( $setup, $expected ) {
 
-		$toolbox  = '';
+		$toolbox = array();
 
 		ApplicationFactory::getInstance()->registerObject(
 			'Settings',

diff --git a/tests/phpunit/Unit/PermissionPthValidatorTest.php b/tests/phpunit/Unit/PermissionPthValidatorTest.php
@@ -42,7 +42,7 @@ public function testGrantPermissionToMainNamespace() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$result = '';
+		$result = array();
 
 		$instance = new PermissionPthValidator(
 			$this->editProtectionValidator
@@ -79,7 +79,7 @@ public function testToReturnFalseOnMwNamespacePermissionCheck( $title, $permissi
 			->with( $this->equalTo( $permission ) )
 			->will( $this->returnValue( false ) );
 
-		$result = '';
+		$result = array();
 
 		$instance = new PermissionPthValidator(
 			$this->editProtectionValidator
@@ -132,7 +132,7 @@ public function testToReturnFalseOnNamespaceWithEditPermissionCheck() {
 			->with( $this->equalTo( $editProtectionRight ) )
 			->will( $this->returnValue( false ) );
 
-		$result = '';
+		$result = array();
 
 		$instance = new PermissionPthValidator(
 			$this->editProtectionValidator