nextcloud / server

lib/private/Repair/OldGroupMembershipShares.php

Indentation +85 added lines, -85 removed lines

@@ -31,89 +31,89 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 * @suppress SqlInjectionChecker
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     * @suppress SqlInjectionChecker
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

lib/private/Repair/RepairInvalidShares.php

Indentation +86 added lines, -86 removed lines

@@ -33,90 +33,90 @@
  */
 class RepairInvalidShares implements IRepairStep {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 * @suppress SqlInjectionChecker
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     * @suppress SqlInjectionChecker
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

apps/testing/lib/Controller/ConfigController.php

Indentation +32 added lines, -32 removed lines

@@ -29,39 +29,39 @@
 
 class ConfigController extends OCSController {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setAppValue($appid, $configkey, $value) {
-		$this->config->setAppValue($appid, $configkey, $value);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setAppValue($appid, $configkey, $value) {
+        $this->config->setAppValue($appid, $configkey, $value);
+        return new DataResponse();
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @return DataResponse
-	 */
-	public function deleteAppValue($appid, $configkey) {
-		$this->config->deleteAppValue($appid, $configkey);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @return DataResponse
+     */
+    public function deleteAppValue($appid, $configkey) {
+        $this->config->deleteAppValue($appid, $configkey);
+        return new DataResponse();
+    }
 }

apps/testing/lib/Controller/LockingController.php

Indentation +204 added lines, -204 removed lines

@@ -39,208 +39,208 @@
 
 class LockingController extends OCSController {
 
-	/** @var ILockingProvider */
-	protected $lockingProvider;
-
-	/** @var FakeDBLockingProvider */
-	protected $fakeDBLockingProvider;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ILockingProvider $lockingProvider
-	 * @param FakeDBLockingProvider $fakeDBLockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								ILockingProvider $lockingProvider,
-								FakeDBLockingProvider $fakeDBLockingProvider,
-								IDBConnection $connection,
-								IConfig $config,
-								IRootFolder $rootFolder) {
-		parent::__construct($appName, $request);
-
-		$this->lockingProvider = $lockingProvider;
-		$this->fakeDBLockingProvider = $fakeDBLockingProvider;
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * @return ILockingProvider
-	 * @throws \RuntimeException
-	 */
-	protected function getLockingProvider() {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return $this->fakeDBLockingProvider;
-		}
-		throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-	}
-
-	/**
-	 * @param string $user
-	 * @param string $path
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getPath($user, $path) {
-		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function isLockingEnabled() {
-		try {
-			$this->getLockingProvider();
-			return new DataResponse();
-		} catch (\RuntimeException $e) {
-			throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function acquireLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function changeLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function releaseLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function isLocked($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new DataResponse();
-		}
-
-		throw new OCSException('', Http::STATUS_LOCKED);
-	}
-
-	/**
-	 * @param int $type
-	 * @return DataResponse
-	 */
-	public function releaseAll($type = null) {
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else if ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new DataResponse();
-	}
+    /** @var ILockingProvider */
+    protected $lockingProvider;
+
+    /** @var FakeDBLockingProvider */
+    protected $fakeDBLockingProvider;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ILockingProvider $lockingProvider
+     * @param FakeDBLockingProvider $fakeDBLockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                ILockingProvider $lockingProvider,
+                                FakeDBLockingProvider $fakeDBLockingProvider,
+                                IDBConnection $connection,
+                                IConfig $config,
+                                IRootFolder $rootFolder) {
+        parent::__construct($appName, $request);
+
+        $this->lockingProvider = $lockingProvider;
+        $this->fakeDBLockingProvider = $fakeDBLockingProvider;
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+    }
+
+    /**
+     * @return ILockingProvider
+     * @throws \RuntimeException
+     */
+    protected function getLockingProvider() {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return $this->fakeDBLockingProvider;
+        }
+        throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+    }
+
+    /**
+     * @param string $user
+     * @param string $path
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getPath($user, $path) {
+        $node = $this->rootFolder->getUserFolder($user)->get($path);
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function isLockingEnabled() {
+        try {
+            $this->getLockingProvider();
+            return new DataResponse();
+        } catch (\RuntimeException $e) {
+            throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function acquireLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function changeLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function releaseLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function isLocked($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new DataResponse();
+        }
+
+        throw new OCSException('', Http::STATUS_LOCKED);
+    }
+
+    /**
+     * @param int $type
+     * @return DataResponse
+     */
+    public function releaseAll($type = null) {
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else if ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new DataResponse();
+    }
 }

lib/public/AppFramework/Http/ICallbackResponse.php

Indentation +7 added lines, -7 removed lines

@@ -33,12 +33,12 @@
  */
 interface ICallbackResponse {
 
-	/**
-	 * Outputs the content that should be printed
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback(IOutput $output);
+    /**
+     * Outputs the content that should be printed
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback(IOutput $output);
 
 }

lib/private/TempManager.php

Indentation +221 added lines, -221 removed lines

@@ -34,246 +34,246 @@
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
-	/** @var string[] Current temporary files and folders, used for cleanup */
-	protected $current = [];
-	/** @var string i.e. /tmp on linux systems */
-	protected $tmpBaseDir;
-	/** @var ILogger */
-	protected $log;
-	/** @var IConfig */
-	protected $config;
+    /** @var string[] Current temporary files and folders, used for cleanup */
+    protected $current = [];
+    /** @var string i.e. /tmp on linux systems */
+    protected $tmpBaseDir;
+    /** @var ILogger */
+    protected $log;
+    /** @var IConfig */
+    protected $config;
 
-	/** Prefix */
-	const TMP_PREFIX = 'oc_tmp_';
+    /** Prefix */
+    const TMP_PREFIX = 'oc_tmp_';
 
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(ILogger $logger, IConfig $config) {
-		$this->log = $logger;
-		$this->config = $config;
-		$this->tmpBaseDir = $this->getTempBaseDir();
-	}
+    /**
+     * @param \OCP\ILogger $logger
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(ILogger $logger, IConfig $config) {
+        $this->log = $logger;
+        $this->config = $config;
+        $this->tmpBaseDir = $this->getTempBaseDir();
+    }
 
-	/**
-	 * Builds the filename with suffix and removes potential dangerous characters
-	 * such as directory separators.
-	 *
-	 * @param string $absolutePath Absolute path to the file / folder
-	 * @param string $postFix Postfix appended to the temporary file name, may be user controlled
-	 * @return string
-	 */
-	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
-			$postFix = str_replace(['\\', '/'], '', $postFix);
-			$absolutePath .= '-';
-		}
+    /**
+     * Builds the filename with suffix and removes potential dangerous characters
+     * such as directory separators.
+     *
+     * @param string $absolutePath Absolute path to the file / folder
+     * @param string $postFix Postfix appended to the temporary file name, may be user controlled
+     * @return string
+     */
+    private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
+        if($postFix !== '') {
+            $postFix = '.' . ltrim($postFix, '.');
+            $postFix = str_replace(['\\', '/'], '', $postFix);
+            $absolutePath .= '-';
+        }
 
-		return $absolutePath . $postFix;
-	}
+        return $absolutePath . $postFix;
+    }
 
-	/**
-	 * Create a temporary file and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary file name
-	 * @return string
-	 */
-	public function getTemporaryFile($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique file and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $file;
+    /**
+     * Create a temporary file and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary file name
+     * @return string
+     */
+    public function getTemporaryFile($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique file and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $file;
 
-			// If a postfix got specified sanitize it and create a postfixed
-			// temporary file
-			if($postFix !== '') {
-				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
-				touch($fileNameWithPostfix);
-				chmod($fileNameWithPostfix, 0600);
-				$this->current[] = $fileNameWithPostfix;
-				return $fileNameWithPostfix;
-			}
+            // If a postfix got specified sanitize it and create a postfixed
+            // temporary file
+            if($postFix !== '') {
+                $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
+                touch($fileNameWithPostfix);
+                chmod($fileNameWithPostfix, 0600);
+                $this->current[] = $fileNameWithPostfix;
+                return $fileNameWithPostfix;
+            }
 
-			return $file;
-		} else {
-			$this->log->warning(
-				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $file;
+        } else {
+            $this->log->warning(
+                'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Create a temporary folder and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary folder name
-	 * @return string
-	 */
-	public function getTemporaryFolder($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique directory and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $uniqueFileName;
+    /**
+     * Create a temporary folder and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary folder name
+     * @return string
+     */
+    public function getTemporaryFolder($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique directory and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $uniqueFileName;
 
-			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
-			mkdir($path, 0700);
-			$this->current[] = $path;
+            // Build a name without postfix
+            $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+            mkdir($path, 0700);
+            $this->current[] = $path;
 
-			return $path . '/';
-		} else {
-			$this->log->warning(
-				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $path . '/';
+        } else {
+            $this->log->warning(
+                'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Remove the temporary files and folders generated during this request
-	 */
-	public function clean() {
-		$this->cleanFiles($this->current);
-	}
+    /**
+     * Remove the temporary files and folders generated during this request
+     */
+    public function clean() {
+        $this->cleanFiles($this->current);
+    }
 
-	/**
-	 * @param string[] $files
-	 */
-	protected function cleanFiles($files) {
-		foreach ($files as $file) {
-			if (file_exists($file)) {
-				try {
-					\OC_Helper::rmdirr($file);
-				} catch (\UnexpectedValueException $ex) {
-					$this->log->warning(
-						"Error deleting temporary file/folder: {file} - Reason: {error}",
-						[
-							'file' => $file,
-							'error' => $ex->getMessage(),
-						]
-					);
-				}
-			}
-		}
-	}
+    /**
+     * @param string[] $files
+     */
+    protected function cleanFiles($files) {
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                try {
+                    \OC_Helper::rmdirr($file);
+                } catch (\UnexpectedValueException $ex) {
+                    $this->log->warning(
+                        "Error deleting temporary file/folder: {file} - Reason: {error}",
+                        [
+                            'file' => $file,
+                            'error' => $ex->getMessage(),
+                        ]
+                    );
+                }
+            }
+        }
+    }
 
-	/**
-	 * Remove old temporary files and folders that were failed to be cleaned
-	 */
-	public function cleanOld() {
-		$this->cleanFiles($this->getOldFiles());
-	}
+    /**
+     * Remove old temporary files and folders that were failed to be cleaned
+     */
+    public function cleanOld() {
+        $this->cleanFiles($this->getOldFiles());
+    }
 
-	/**
-	 * Get all temporary files and folders generated by oc older than an hour
-	 *
-	 * @return string[]
-	 */
-	protected function getOldFiles() {
-		$cutOfTime = time() - 3600;
-		$files = [];
-		$dh = opendir($this->tmpBaseDir);
-		if ($dh) {
-			while (($file = readdir($dh)) !== false) {
-				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
-					$mtime = filemtime($path);
-					if ($mtime < $cutOfTime) {
-						$files[] = $path;
-					}
-				}
-			}
-		}
-		return $files;
-	}
+    /**
+     * Get all temporary files and folders generated by oc older than an hour
+     *
+     * @return string[]
+     */
+    protected function getOldFiles() {
+        $cutOfTime = time() - 3600;
+        $files = [];
+        $dh = opendir($this->tmpBaseDir);
+        if ($dh) {
+            while (($file = readdir($dh)) !== false) {
+                if (substr($file, 0, 7) === self::TMP_PREFIX) {
+                    $path = $this->tmpBaseDir . '/' . $file;
+                    $mtime = filemtime($path);
+                    if ($mtime < $cutOfTime) {
+                        $files[] = $path;
+                    }
+                }
+            }
+        }
+        return $files;
+    }
 
-	/**
-	 * Get the temporary base directory configured on the server
-	 *
-	 * @return string Path to the temporary directory or null
-	 * @throws \UnexpectedValueException
-	 */
-	public function getTempBaseDir() {
-		if ($this->tmpBaseDir) {
-			return $this->tmpBaseDir;
-		}
+    /**
+     * Get the temporary base directory configured on the server
+     *
+     * @return string Path to the temporary directory or null
+     * @throws \UnexpectedValueException
+     */
+    public function getTempBaseDir() {
+        if ($this->tmpBaseDir) {
+            return $this->tmpBaseDir;
+        }
 
-		$directories = [];
-		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
-			$directories[] = $temp;
-		}
-		if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TEMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMPDIR')) {
-			$directories[] = $temp;
-		}
-		if ($temp = sys_get_temp_dir()) {
-			$directories[] = $temp;
-		}
+        $directories = [];
+        if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+            $directories[] = $temp;
+        }
+        if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TEMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMPDIR')) {
+            $directories[] = $temp;
+        }
+        if ($temp = sys_get_temp_dir()) {
+            $directories[] = $temp;
+        }
 
-		foreach ($directories as $dir) {
-			if ($this->checkTemporaryDirectory($dir)) {
-				return $dir;
-			}
-		}
+        foreach ($directories as $dir) {
+            if ($this->checkTemporaryDirectory($dir)) {
+                return $dir;
+            }
+        }
 
-		$temp = tempnam(dirname(__FILE__), '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		throw new \UnexpectedValueException('Unable to detect system temporary directory');
-	}
+        $temp = tempnam(dirname(__FILE__), '');
+        if (file_exists($temp)) {
+            unlink($temp);
+            return dirname($temp);
+        }
+        throw new \UnexpectedValueException('Unable to detect system temporary directory');
+    }
 
-	/**
-	 * Check if a temporary directory is ready for use
-	 *
-	 * @param mixed $directory
-	 * @return bool
-	 */
-	private function checkTemporaryDirectory($directory) {
-		// suppress any possible errors caused by is_writable
-		// checks missing or invalid path or characters, wrong permissions etc
-		try {
-			if (is_writable($directory)) {
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		$this->log->warning('Temporary directory {dir} is not present or writable',
-			['dir' => $directory]
-		);
-		return false;
-	}
+    /**
+     * Check if a temporary directory is ready for use
+     *
+     * @param mixed $directory
+     * @return bool
+     */
+    private function checkTemporaryDirectory($directory) {
+        // suppress any possible errors caused by is_writable
+        // checks missing or invalid path or characters, wrong permissions etc
+        try {
+            if (is_writable($directory)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        $this->log->warning('Temporary directory {dir} is not present or writable',
+            ['dir' => $directory]
+        );
+        return false;
+    }
 
-	/**
-	 * Override the temporary base directory
-	 *
-	 * @param string $directory
-	 */
-	public function overrideTempBaseDir($directory) {
-		$this->tmpBaseDir = $directory;
-	}
+    /**
+     * Override the temporary base directory
+     *
+     * @param string $directory
+     */
+    public function overrideTempBaseDir($directory) {
+        $this->tmpBaseDir = $directory;
+    }
 
 }

lib/private/App/CodeChecker/MigrationSchemaChecker.php

Indentation +164 added lines, -164 removed lines

@@ -29,179 +29,179 @@
 
 class MigrationSchemaChecker extends NodeVisitorAbstract {
 
-	/** @var string */
-	protected $schemaVariableName = null;
-	/** @var array */
-	protected $tableVariableNames = [];
-	/** @var array */
-	public $errors = [];
+    /** @var string */
+    protected $schemaVariableName = null;
+    /** @var array */
+    protected $tableVariableNames = [];
+    /** @var array */
+    public $errors = [];
 
-	/**
-	 * @param Node $node
-	 * @return void
-	 *
-	 * @suppress PhanUndeclaredProperty
-	 */
-	public function enterNode(Node $node) {
-		/**
-		 * Check tables
-		 */
-		if ($this->schemaVariableName !== null &&
-			 $node instanceof Node\Expr\Assign &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->expr instanceof Node\Expr\MethodCall &&
-			 $node->expr->var instanceof Node\Expr\Variable &&
-			 $node->expr->var->name === $this->schemaVariableName) {
+    /**
+     * @param Node $node
+     * @return void
+     *
+     * @suppress PhanUndeclaredProperty
+     */
+    public function enterNode(Node $node) {
+        /**
+         * Check tables
+         */
+        if ($this->schemaVariableName !== null &&
+             $node instanceof Node\Expr\Assign &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->expr instanceof Node\Expr\MethodCall &&
+             $node->expr->var instanceof Node\Expr\Variable &&
+             $node->expr->var->name === $this->schemaVariableName) {
 
-			if ($node->expr->name === 'createTable') {
-				if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->expr->args[0]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->expr->args[0]->value->value,
-							'reason' => 'Table name is too long (max. 27)',
-						];
-					} else {
-						$this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
-					}
-				}
-			} else if ($node->expr->name === 'getTable') {
-				if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
-					$this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
-				}
-			}
-		} else if ($this->schemaVariableName !== null &&
-			 $node instanceof Node\Expr\MethodCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->var->name === $this->schemaVariableName) {
+            if ($node->expr->name === 'createTable') {
+                if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->expr->args[0]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->expr->args[0]->value->value,
+                            'reason' => 'Table name is too long (max. 27)',
+                        ];
+                    } else {
+                        $this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
+                    }
+                }
+            } else if ($node->expr->name === 'getTable') {
+                if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
+                    $this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
+                }
+            }
+        } else if ($this->schemaVariableName !== null &&
+             $node instanceof Node\Expr\MethodCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->var->name === $this->schemaVariableName) {
 
-			if ($node->name === 'renameTable') {
-				$this->errors[] = [
-					'line' => $node->getLine(),
-					'disallowedToken' => 'Deprecated method',
-					'reason' => sprintf(
-						'`$%s->renameTable()` must not be used',
-						$node->var->name
-					),
-				];
-			}
+            if ($node->name === 'renameTable') {
+                $this->errors[] = [
+                    'line' => $node->getLine(),
+                    'disallowedToken' => 'Deprecated method',
+                    'reason' => sprintf(
+                        '`$%s->renameTable()` must not be used',
+                        $node->var->name
+                    ),
+                ];
+            }
 
-		/**
-		 * Check columns and Indexes
-		 */
-		} else if (!empty($this->tableVariableNames) &&
-			 $node instanceof Node\Expr\MethodCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 isset($this->tableVariableNames[$node->var->name])) {
+        /**
+         * Check columns and Indexes
+         */
+        } else if (!empty($this->tableVariableNames) &&
+             $node instanceof Node\Expr\MethodCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             isset($this->tableVariableNames[$node->var->name])) {
 
-			if ($node->name === 'addColumn' || $node->name === 'changeColumn') {
-				if (isset($node->args[0]) && $node->args[0]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[0]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[0]->value->value,
-							'reason' => sprintf(
-								'Column name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
+            if ($node->name === 'addColumn' || $node->name === 'changeColumn') {
+                if (isset($node->args[0]) && $node->args[0]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[0]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[0]->value->value,
+                            'reason' => sprintf(
+                                'Column name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
 
-					// On autoincrement the max length of the table name is 21 instead of 27
-					if (isset($node->args[2]) && $node->args[2]->value instanceof Node\Expr\Array_) {
-						/** @var Node\Expr\Array_ $options */
-						$options = $node->args[2]->value;
-						if ($this->checkColumnForAutoincrement($options)) {
-							if (!$this->checkNameLength($this->tableVariableNames[$node->var->name], true)) {
-								$this->errors[] = [
-									'line' => $node->getLine(),
-									'disallowedToken' => $this->tableVariableNames[$node->var->name],
-									'reason' => 'Table name is too long because of autoincrement (max. 21)',
-								];
-							}
-						}
-					}
-				}
-			} else if ($node->name === 'addIndex' ||
-				 $node->name === 'addUniqueIndex' ||
-				 $node->name === 'renameIndex' ||
-				 $node->name === 'setPrimaryKey') {
-				if (isset($node->args[1]) && $node->args[1]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[1]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[1]->value->value,
-							'reason' => sprintf(
-								'Index name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
-				}
-			} else if ($node->name === 'addForeignKeyConstraint') {
-				if (isset($node->args[4]) && $node->args[4]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[4]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[4]->value->value,
-							'reason' => sprintf(
-								'Constraint name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
-				}
-			} else if ($node->name === 'renameColumn') {
-				$this->errors[] = [
-					'line' => $node->getLine(),
-					'disallowedToken' => 'Deprecated method',
-					'reason' => sprintf(
-						'`$%s->renameColumn()` must not be used',
-						$node->var->name
-					),
-				];
-			}
+                    // On autoincrement the max length of the table name is 21 instead of 27
+                    if (isset($node->args[2]) && $node->args[2]->value instanceof Node\Expr\Array_) {
+                        /** @var Node\Expr\Array_ $options */
+                        $options = $node->args[2]->value;
+                        if ($this->checkColumnForAutoincrement($options)) {
+                            if (!$this->checkNameLength($this->tableVariableNames[$node->var->name], true)) {
+                                $this->errors[] = [
+                                    'line' => $node->getLine(),
+                                    'disallowedToken' => $this->tableVariableNames[$node->var->name],
+                                    'reason' => 'Table name is too long because of autoincrement (max. 21)',
+                                ];
+                            }
+                        }
+                    }
+                }
+            } else if ($node->name === 'addIndex' ||
+                 $node->name === 'addUniqueIndex' ||
+                 $node->name === 'renameIndex' ||
+                 $node->name === 'setPrimaryKey') {
+                if (isset($node->args[1]) && $node->args[1]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[1]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[1]->value->value,
+                            'reason' => sprintf(
+                                'Index name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
+                }
+            } else if ($node->name === 'addForeignKeyConstraint') {
+                if (isset($node->args[4]) && $node->args[4]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[4]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[4]->value->value,
+                            'reason' => sprintf(
+                                'Constraint name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
+                }
+            } else if ($node->name === 'renameColumn') {
+                $this->errors[] = [
+                    'line' => $node->getLine(),
+                    'disallowedToken' => 'Deprecated method',
+                    'reason' => sprintf(
+                        '`$%s->renameColumn()` must not be used',
+                        $node->var->name
+                    ),
+                ];
+            }
 
-		/**
-		 * Find the schema
-		 */
-		} else if ($node instanceof Node\Expr\Assign &&
-			 $node->expr instanceof Node\Expr\FuncCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->expr->name instanceof Node\Expr\Variable &&
-			 $node->expr->name->name === 'schemaClosure') {
-			// E.g. $schema = $schemaClosure();
-			$this->schemaVariableName = $node->var->name;
-		}
-	}
+        /**
+         * Find the schema
+         */
+        } else if ($node instanceof Node\Expr\Assign &&
+             $node->expr instanceof Node\Expr\FuncCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->expr->name instanceof Node\Expr\Variable &&
+             $node->expr->name->name === 'schemaClosure') {
+            // E.g. $schema = $schemaClosure();
+            $this->schemaVariableName = $node->var->name;
+        }
+    }
 
-	protected function checkNameLength($tableName, $hasAutoincrement = false) {
-		if ($hasAutoincrement) {
-			return strlen($tableName) <= 21;
-		}
-		return strlen($tableName) <= 27;
-	}
+    protected function checkNameLength($tableName, $hasAutoincrement = false) {
+        if ($hasAutoincrement) {
+            return strlen($tableName) <= 21;
+        }
+        return strlen($tableName) <= 27;
+    }
 
-	/**
-	 * @param Node\Expr\Array_ $optionsArray
-	 * @return bool Whether the column is an autoincrement column
-	 */
-	protected function checkColumnForAutoincrement(Node\Expr\Array_ $optionsArray) {
-		foreach ($optionsArray->items as $option) {
-			if ($option->key instanceof Node\Scalar\String_) {
-				if ($option->key->value === 'autoincrement' &&
-					 $option->value instanceof Node\Expr\ConstFetch) {
-					/** @var Node\Expr\ConstFetch $const */
-					$const = $option->value;
+    /**
+     * @param Node\Expr\Array_ $optionsArray
+     * @return bool Whether the column is an autoincrement column
+     */
+    protected function checkColumnForAutoincrement(Node\Expr\Array_ $optionsArray) {
+        foreach ($optionsArray->items as $option) {
+            if ($option->key instanceof Node\Scalar\String_) {
+                if ($option->key->value === 'autoincrement' &&
+                     $option->value instanceof Node\Expr\ConstFetch) {
+                    /** @var Node\Expr\ConstFetch $const */
+                    $const = $option->value;
 
-					if ($const->name instanceof Name &&
-						 $const->name->parts === ['true']) {
-						return true;
-					}
-				}
-			}
-		}
+                    if ($const->name instanceof Name &&
+                         $const->name->parts === ['true']) {
+                        return true;
+                    }
+                }
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/OCS/Exception.php

Indentation +9 added lines, -9 removed lines

@@ -25,16 +25,16 @@
 
 class Exception extends \Exception {
 
-	/** @var Result */
-	private $result;
+    /** @var Result */
+    private $result;
 
-	public function __construct(Result $result) {
-		parent::__construct();
-		$this->result = $result;
-	}
+    public function __construct(Result $result) {
+        parent::__construct();
+        $this->result = $result;
+    }
 
-	public function getResult() {
-		return $this->result;
-	}
+    public function getResult() {
+        return $this->result;
+    }
 
 }

lib/private/Search/Result/File.php

Indentation +70 added lines, -70 removed lines

@@ -32,85 +32,85 @@
  */
 class File extends \OCP\Search\Result {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'file';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'file';
 
-	/**
-	 * Path to file
-	 * @var string
-	 */
-	public $path;
+    /**
+     * Path to file
+     * @var string
+     */
+    public $path;
 
-	/**
-	 * Size, in bytes
-	 * @var int 
-	 */
-	public $size;
+    /**
+     * Size, in bytes
+     * @var int 
+     */
+    public $size;
 
-	/**
-	 * Date modified, in human readable form
-	 * @var string
-	 */
-	public $modified;
+    /**
+     * Date modified, in human readable form
+     * @var string
+     */
+    public $modified;
 
-	/**
-	 * File mime type
-	 * @var string
-	 */
-	public $mime_type;
+    /**
+     * File mime type
+     * @var string
+     */
+    public $mime_type;
 
-	/**
-	 * File permissions:
-	 * 
-	 * @var string
-	 */
-	public $permissions;
+    /**
+     * File permissions:
+     * 
+     * @var string
+     */
+    public $permissions;
 
-	/**
-	 * Create a new file search result
-	 * @param FileInfo $data file data given by provider
-	 */
-	public function __construct(FileInfo $data) {
+    /**
+     * Create a new file search result
+     * @param FileInfo $data file data given by provider
+     */
+    public function __construct(FileInfo $data) {
 
-		$path = $this->getRelativePath($data->getPath());
+        $path = $this->getRelativePath($data->getPath());
 
-		$info = pathinfo($path);
-		$this->id = $data->getId();
-		$this->name = $info['basename'];
-		$this->link = \OC::$server->getURLGenerator()->linkToRoute(
-			'files.view.index',
-			[
-				'dir' => $info['dirname'],
-				'scrollto' => $info['basename'],
-			]
-		);
-		$this->permissions = $data->getPermissions();
-		$this->path = $path;
-		$this->size = $data->getSize();
-		$this->modified = $data->getMtime();
-		$this->mime_type = $data->getMimetype();
-	}
+        $info = pathinfo($path);
+        $this->id = $data->getId();
+        $this->name = $info['basename'];
+        $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+            'files.view.index',
+            [
+                'dir' => $info['dirname'],
+                'scrollto' => $info['basename'],
+            ]
+        );
+        $this->permissions = $data->getPermissions();
+        $this->path = $path;
+        $this->size = $data->getSize();
+        $this->modified = $data->getMtime();
+        $this->mime_type = $data->getMimetype();
+    }
 
-	/**
-	 * @var Folder $userFolderCache
-	 */
-	static protected $userFolderCache = null;
+    /**
+     * @var Folder $userFolderCache
+     */
+    static protected $userFolderCache = null;
 
-	/**
-	 * converts a path relative to the users files folder
-	 * eg /user/files/foo.txt -> /foo.txt
-	 * @param string $path
-	 * @return string relative path
-	 */
-	protected function getRelativePath ($path) {
-		if (!isset(self::$userFolderCache)) {
-			$user = \OC::$server->getUserSession()->getUser()->getUID();
-			self::$userFolderCache = \OC::$server->getUserFolder($user);
-		}
-		return self::$userFolderCache->getRelativePath($path);
-	}
+    /**
+     * converts a path relative to the users files folder
+     * eg /user/files/foo.txt -> /foo.txt
+     * @param string $path
+     * @return string relative path
+     */
+    protected function getRelativePath ($path) {
+        if (!isset(self::$userFolderCache)) {
+            $user = \OC::$server->getUserSession()->getUser()->getUID();
+            self::$userFolderCache = \OC::$server->getUserFolder($user);
+        }
+        return self::$userFolderCache->getRelativePath($path);
+    }
 
 }