Merge pull request #816 from wmde/languageFeatures

Make use of language features like end() and array_pad()

Author: mariushoch

src/ByPropertyIdArray.php

@@ -221,7 +221,7 @@ private function moveObjectInPropertyGroup( $object, $toIndex ) {
 		$propertyId = $object->getPropertyId();
 
 		$numericIndices = $this->getFlatArrayIndices( $propertyId );
-		$lastIndex = $numericIndices[count( $numericIndices ) - 1];
+		$lastIndex = end( $numericIndices );
 
 		if ( $toIndex > $lastIndex + 1 || $toIndex < $numericIndices[0] ) {
 			throw new OutOfBoundsException( 'Object cannot be moved to ' . $toIndex );
@@ -398,7 +398,7 @@ public function moveObjectToIndex( $object, $toIndex ) {
 		} else {
 			$edgeIndex = ( $toIndex <= $propertyIndices[0] )
 				? $propertyIndices[0]
-				: $propertyIndices[count( $propertyIndices ) - 1];
+				: end( $propertyIndices );
 
 			$this->moveObjectInPropertyGroup( $object, $edgeIndex );
 			$this->movePropertyGroup( $object->getPropertyId(), $toIndex );
@@ -465,11 +465,11 @@ private function addObjectToPropertyGroup( $object, $index = null ) {
 		}
 
 		// Add index to allow placing object after the last object of the "property group":
-		$validIndices[] = $validIndices[count( $validIndices ) - 1] + 1;
+		$validIndices[] = end( $validIndices ) + 1;
 
 		if ( $index === null ) {
 			// If index is null, append object to "property group".
-			$index = $validIndices[count( $validIndices ) - 1];
+			$index = end( $validIndices );
 		}
 
 		if ( in_array( $index, $validIndices ) ) {

src/Entity/EntityId.php

@@ -224,8 +224,7 @@ public function equals( $target ) {
 	 * @return string[] Array of form [ string $repositoryName, string $localPart ]
 	 */
 	protected static function extractRepositoryNameAndLocalPart( $serialization ) {
-		$parts = explode( ':', $serialization, 2 );
-		return isset( $parts[1] ) ? $parts : [ '', $parts[0] ];
+		return array_pad( explode( ':', $serialization, 2 ), -2, '' );
 	}
 
 }

src/Snak/DerivedPropertyValueSnak.php

@@ -72,11 +72,7 @@ public function getDerivedDataValues() {
 	 * @return DataValue|null
 	 */
 	public function getDerivedDataValue( $key ) {
-		if ( isset( $this->derivedDataValues[$key] ) ) {
-			return $this->derivedDataValues[$key];
-		}
-
-		return null;
+		return $this->derivedDataValues[$key] ?? null;
 	}
 
 	/**

tests/unit/Snak/SnakListTest.php

@@ -144,9 +144,7 @@ public function testRemoveSnak( SnakList $array ) {
 	public function testAddSnak( SnakList $array ) {
 		$elementCount = $array->count();
 
-		$elements = $this->elementInstancesProvider();
-		$element = array_shift( $elements );
-		$element = $element[0][0];
+		$element = $this->elementInstancesProvider()[0][0][0];
 
 		if ( !$array->hasSnak( $element ) ) {
 			++$elementCount;