Use type casting instead of *val() method

MorrisJobke · MorrisJobke · commit c1e4f9f30563 · 2018-01-26T11:35:42.000+01:00
It should be up to 6x faster

Signed-off-by: Morris Jobke &lt;hey@morrisjobke.de&gt;
diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php
@@ -36,7 +36,7 @@ function() {
 
 $eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
 	$event->addEntityCollection('files', function($name) {
-		$nodes = \OC::$server->getUserFolder()->getById(intval($name));
+		$nodes = \OC::$server->getUserFolder()->getById((int)$name);
 		return !empty($nodes);
 	});
 });
diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php
@@ -40,6 +40,6 @@ static function xmlDeserialize(Reader $reader) {
 			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');
 		}
 
-		return intval($value);
+		return (int)$value;
 	}
 }
diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php
@@ -40,6 +40,6 @@ static function xmlDeserialize(Reader $reader) {
 			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}offset has illegal value');
 		}
 
-		return intval($value);
+		return (int)$value;
 	}
 }
diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
@@ -97,7 +97,7 @@ public function handleGetProperties(
 		}
 
 		$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
-			return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
+			return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());
 		});
 
 		$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
@@ -153,9 +153,9 @@ public function getUnreadCount(Node $node) {
 			return null;
 		}
 
-		$lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
+		$lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user);
 
-		return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
+		return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead);
 	}
 
 }
diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php
@@ -369,7 +369,7 @@ protected function sanitizeMtime($mtimeFromRequest) {
 			throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
 		}
 
-		return intval($mtimeFromRequest);
+		return (int)$mtimeFromRequest;
 	}
 
 }
diff --git a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php
@@ -60,7 +60,7 @@ public function __construct(
 				$userSession,
 				$groupManager,
 				function($name) {
-					$nodes = \OC::$server->getUserFolder()->getById(intval($name));
+					$nodes = \OC::$server->getUserFolder()->getById((int)$name);
 					return !empty($nodes);
 				}
 			),
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Parser.php b/apps/files_external/3rdparty/icewind/smb/src/Parser.php
@@ -133,7 +133,7 @@ public function parseStat($output) {
 		return [
 			'mtime' => strtotime($data['write_time']),
 			'mode'  => hexdec(substr($data['attributes'], strpos($data['attributes'], '('), -1)),
-			'size'  => isset($data['stream']) ? intval(explode(' ', $data['stream'])[1]) : 0
+			'size'  => isset($data['stream']) ? (int)explode(' ', $data['stream'])[1] : 0
 		];
 	}
 
diff --git a/apps/files_trashbin/lib/Expiration.php b/apps/files_trashbin/lib/Expiration.php
@@ -142,13 +142,13 @@ private function parseRetentionObligation(){
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = intval($minValue);
+			$this->minAge = (int)$minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = intval($maxValue);
+			$this->maxAge = (int)$maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -158,8 +158,8 @@ private function parseRetentionObligation(){
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = intval($minValue);
-			$this->maxAge = intval($maxValue);
+			$this->minAge = (int)$minValue;
+			$this->maxAge = (int)$maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
@@ -175,13 +175,13 @@ private function parseRetentionObligation(){
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = intval($minValue);
+			$this->minAge = (int)$minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = intval($maxValue);
+			$this->maxAge = (int)$maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -191,8 +191,8 @@ private function parseRetentionObligation(){
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = intval($minValue);
-			$this->maxAge = intval($maxValue);
+			$this->minAge = (int)$minValue;
+			$this->maxAge = (int)$maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
@@ -503,7 +503,7 @@ public static function expireOlderThanMaxForUser($uid){
 
 		$toDelete = [];
 		foreach (array_reverse($versions['all']) as $key => $version) {
-			if (intval($version['version'])<$threshold) {
+			if ((int)$version['version'] <$threshold) {
 				$toDelete[$key] = $version;
 			} else {
 				//Versions are sorted by time - nothing mo to iterate.
diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
@@ -32,7 +32,7 @@
 $serverConnections = $helper->getServerConfigurationPrefixes();
 sort($serverConnections);
 $lk = array_pop($serverConnections);
-$ln = intval(str_replace('s', '', $lk));
+$ln = (int)str_replace('s', '', $lk);
 $nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
 
 $resultData = array('configPrefix' => $nk);
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php
@@ -109,8 +109,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
 
-		$offset = intval($input->getOption('offset'));
-		$limit = intval($input->getOption('limit'));
+		$offset = (int)$input->getOption('offset');
+		$limit = (int)$input->getOption('limit');
 		$this->validateOffsetAndLimit($offset, $limit);
 
 		if($input->getOption('group')) {
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
@@ -106,7 +106,7 @@ public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID =
 		$this->doNotValidate = !in_array($this->configPrefix,
 			$helper->getServerConfigurationPrefixes());
 		$this->hasPagedResultSupport =
-			intval($this->configuration->ldapPagingSize) !== 0
+			(int)$this->configuration->ldapPagingSize !== 0
 			|| $this->ldap->hasPagedResultSupport();
 	}
 
@@ -368,7 +368,7 @@ private function doSoftValidation() {
 			}
 		}
 
-		$backupPort = intval($this->configuration->ldapBackupPort);
+		$backupPort = (int)$this->configuration->ldapBackupPort;
 		if ($backupPort <= 0) {
 			$this->configuration->backupPort = $this->configuration->ldapPort;
 		}
@@ -399,7 +399,7 @@ private function doSoftValidation() {
 	private function doCriticalValidation() {
 		$configurationOK = true;
 		$errorStr = 'Configuration Error (prefix '.
-					strval($this->configPrefix).'): ';
+			(string)$this->configPrefix .'): ';
 
 		//options that shall not be empty
 		$options = array('ldapHost', 'ldapPort', 'ldapUserDisplayName',
diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php
@@ -285,7 +285,7 @@ public function show($configID, $showPassword = false) {
 
 			$config = new Configuration($configID);
 			$data = $config->getConfiguration();
-			if(!boolval(intval($showPassword))) {
+			if(!(int)$showPassword) {
 				$data['ldapAgentPassword'] = '***';
 			}
 			foreach ($data as $key => $value) {
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
@@ -266,7 +266,7 @@ private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
 		$groups = $this->access->groupsMatchFilter($groups);
 		$allGroups =  $groups;
 		$nestedGroups = $this->access->connection->ldapNestedGroups;
-		if (intval($nestedGroups) === 1) {
+		if ((int)$nestedGroups === 1) {
 			foreach ($groups as $group) {
 				$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
 				$allGroups = array_merge($allGroups, $subGroups);
@@ -667,8 +667,8 @@ public function getUserGroups($uid) {
 		// if possible, read out membership via memberOf. It's far faster than
 		// performing a search, which still is a fallback later.
 		// memberof doesn't support memberuid, so skip it here.
-		if(intval($this->access->connection->hasMemberOfFilterSupport) === 1
-			&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
+		if((int)$this->access->connection->hasMemberOfFilterSupport === 1
+			&& (int)$this->access->connection->useMemberOfToDetectMembership === 1
 		    && strtolower($this->access->connection->ldapGroupMemberAssocAttr) !== 'memberuid'
 		    ) {
 			$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
@@ -122,7 +122,7 @@ public function getNextServerConfigurationPrefix() {
 
 		sort($serverConnections);
 		$lastKey = array_pop($serverConnections);
-		$lastNumber = intval(str_replace('s', '', $lastKey));
+		$lastNumber = (int)str_replace('s', '', $lastKey);
 		return 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
 	}
 
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -69,8 +69,8 @@ class CleanUp extends TimedJob {
 
 	public function __construct() {
 		$minutes = \OC::$server->getConfig()->getSystemValue(
-			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
-		$this->setInterval(intval($minutes) * 60);
+			'ldapUserCleanupInterval', (string)$this->defaultIntervalMin);
+		$this->setInterval((int)$minutes * 60);
 	}
 
 	/**
@@ -183,7 +183,7 @@ public function isCleanUpAllowed() {
 	 */
 	private function isCleanUpEnabled() {
 		return (bool)$this->ocConfig->getSystemValue(
-			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
+			'ldapUserCleanupInterval', (string)$this->defaultIntervalMin);
 	}
 
 	/**
@@ -215,7 +215,7 @@ private function checkUser(array $user) {
 	 * @return int
 	 */
 	private function getOffset() {
-		return intval($this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0));
+		return (int)$this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0);
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Migration/UUIDFixInsert.php b/apps/user_ldap/lib/Migration/UUIDFixInsert.php
@@ -90,7 +90,7 @@ public function run(IOutput $output) {
 					$offset += $batchSize;
 				} catch (\InvalidArgumentException $e) {
 					if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
-						$batchSize = intval(floor(count($records) * 0.8));
+						$batchSize = (int)floor(count($records) * 0.8);
 						$retry = true;
 					}
 				}
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
@@ -207,7 +207,7 @@ public function getAttributes($minimal = false) {
 	public function isDeletedUser($id) {
 		$isDeleted = $this->ocConfig->getUserValue(
 			$id, 'user_ldap', 'isDeleted', 0);
-		return intval($isDeleted) === 1;
+		return (int)$isDeleted === 1;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php
@@ -166,7 +166,7 @@ public function getHomePath() {
 	 * @return int
 	 */
 	public function getLastLogin() {
-		return intval($this->lastLogin);
+		return (int)$this->lastLogin;
 	}
 
 	/**
@@ -211,7 +211,7 @@ protected function determineShares() {
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if(intval($sResult) === 1) {
+		if((int)$sResult === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}
@@ -223,7 +223,7 @@ protected function determineShares() {
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if(intval($sResult) === 1) {
+		if((int)$sResult === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
@@ -227,7 +227,7 @@ public function detectUserDisplayNameAttribute() {
 		if ($attr !== '' && $attr !== 'displayName') {
 			// most likely not the default value with upper case N,
 			// verify it still produces a result
-			$count = intval($this->countUsersWithAttribute($attr, true));
+			$count = (int)$this->countUsersWithAttribute($attr, true);
 			if($count > 0) {
 				//no change, but we sent it back to make sure the user interface
 				//is still correct, even if the ajax call was cancelled meanwhile
@@ -239,7 +239,7 @@ public function detectUserDisplayNameAttribute() {
 		// first attribute that has at least one result wins
 		$displayNameAttrs = array('displayname', 'cn');
 		foreach ($displayNameAttrs as $attr) {
-			$count = intval($this->countUsersWithAttribute($attr, true));
+			$count = (int)$this->countUsersWithAttribute($attr, true);
 
 			if($count > 0) {
 				$this->applyFind('ldap_display_name', $attr);
@@ -267,7 +267,7 @@ public function detectEmailAttribute() {
 
 		$attr = $this->configuration->ldapEmailAttribute;
 		if ($attr !== '') {
-			$count = intval($this->countUsersWithAttribute($attr, true));
+			$count = (int)$this->countUsersWithAttribute($attr, true);
 			if($count > 0) {
 				return false;
 			}
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php
@@ -63,7 +63,7 @@ protected function configure() {
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$appid = $input->getArgument('appid');
-		$path = strval($input->getOption('path'));
+		$path = (string)$input->getOption('path');
 		$result = $this->checker->verifyAppSignature($appid, $path);
 		$this->writeArrayInOutputFormat($input, $output, $result);
 		if (count($result)>0){
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php
diff --git a/lib/private/Route/CachingRouter.php b/lib/private/Route/CachingRouter.php
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
diff --git a/lib/public/Collaboration/Collaborators/SearchResultType.php b/lib/public/Collaboration/Collaborators/SearchResultType.php

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ static function xmlDeserialize(Reader $reader) {`
`40`	`40`	`throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');`
`41`	`41`	`}`
`42`	`42`
`43`		`- return intval($value);`
	`43`	`+ return (int)$value;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function handleGetProperties(`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {`
`100`		`- return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));`
	`100`	`+ return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());`
`101`	`101`	`});`
`102`	`102`
`103`	`103`	`$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {`
`@@ -153,9 +153,9 @@ public function getUnreadCount(Node $node) {`
`153`	`153`	`return null;`
`154`	`154`	`}`
`155`	`155`
`156`		`- $lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);`
	`156`	`+ $lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user);`
`157`	`157`
`158`		`- return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);`
	`158`	`+ return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ protected function sanitizeMtime($mtimeFromRequest) {`
`369`	`369`	`throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');`
`370`	`370`	`}`
`371`	`371`
`372`		`- return intval($mtimeFromRequest);`
	`372`	`+ return (int)$mtimeFromRequest;`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function __construct(`
`60`	`60`	`$userSession,`
`61`	`61`	`$groupManager,`
`62`	`62`	`function($name) {`
`63`		`- $nodes = \OC::$server->getUserFolder()->getById(intval($name));`
	`63`	`+ $nodes = \OC::$server->getUserFolder()->getById((int)$name);`
`64`	`64`	`return !empty($nodes);`
`65`	`65`	`}`
`66`	`66`	`),`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function parseStat($output) {`
`133`	`133`	`return [`
`134`	`134`	`'mtime' => strtotime($data['write_time']),`
`135`	`135`	`'mode' => hexdec(substr($data['attributes'], strpos($data['attributes'], '('), -1)),`
`136`		`- 'size' => isset($data['stream']) ? intval(explode(' ', $data['stream'])[1]) : 0`
	`136`	`+ 'size' => isset($data['stream']) ? (int)explode(' ', $data['stream'])[1] : 0`
`137`	`137`	`];`
`138`	`138`	`}`
`139`	`139`