nextcloud / server

apps/user_ldap/lib/ConnectionFactory.php

Indentation +8 added lines, -8 removed lines

@@ -25,14 +25,14 @@
 
 
 class ConnectionFactory {
-	/** @var ILDAPWrapper */
-	private $ldap;
+    /** @var ILDAPWrapper */
+    private $ldap;
 
-	public function __construct(ILDAPWrapper $ldap) {
-		$this->ldap = $ldap;
-	}
+    public function __construct(ILDAPWrapper $ldap) {
+        $this->ldap = $ldap;
+    }
 
-	public function get($prefix) {
-		return new Connection($this->ldap, $prefix, 'user_ldap');
-	}
+    public function get($prefix) {
+        return new Connection($this->ldap, $prefix, 'user_ldap');
+    }
 }

apps/files/lib/Service/TagService.php

Indentation +97 added lines, -97 removed lines

@@ -39,111 +39,111 @@
  */
 class TagService {
 
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IManager */
-	private $activityManager;
-	/** @var ITags */
-	private $tagger;
-	/** @var Folder */
-	private $homeFolder;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IManager */
+    private $activityManager;
+    /** @var ITags */
+    private $tagger;
+    /** @var Folder */
+    private $homeFolder;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param ITags $tagger
-	 * @param Folder $homeFolder
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IManager $activityManager,
-		ITags $tagger,
-		Folder $homeFolder,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->userSession = $userSession;
-		$this->activityManager = $activityManager;
-		$this->tagger = $tagger;
-		$this->homeFolder = $homeFolder;
-		$this->dispatcher = $dispatcher;
-	}
+    /**
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param ITags $tagger
+     * @param Folder $homeFolder
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IManager $activityManager,
+        ITags $tagger,
+        Folder $homeFolder,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->userSession = $userSession;
+        $this->activityManager = $activityManager;
+        $this->tagger = $tagger;
+        $this->homeFolder = $homeFolder;
+        $this->dispatcher = $dispatcher;
+    }
 
-	/**
-	 * Updates the tags of the specified file path.
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @param string $path path
-	 * @param array  $tags array of tags
-	 * @return array list of tags
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
-	 */
-	public function updateFileTags($path, $tags) {
-		$fileId = $this->homeFolder->get($path)->getId();
+    /**
+     * Updates the tags of the specified file path.
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @param string $path path
+     * @param array  $tags array of tags
+     * @return array list of tags
+     * @throws \OCP\Files\NotFoundException if the file does not exist
+     */
+    public function updateFileTags($path, $tags) {
+        $fileId = $this->homeFolder->get($path)->getId();
 
-		$currentTags = $this->tagger->getTagsForObjects(array($fileId));
+        $currentTags = $this->tagger->getTagsForObjects(array($fileId));
 
-		if (!empty($currentTags)) {
-			$currentTags = current($currentTags);
-		}
+        if (!empty($currentTags)) {
+            $currentTags = current($currentTags);
+        }
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === Tags::TAG_FAVORITE) {
-				$this->addActivity(true, $fileId, $path);
-			}
-			$this->tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === Tags::TAG_FAVORITE) {
-				$this->addActivity(false, $fileId, $path);
-			}
-			$this->tagger->unTag($fileId, $tag);
-		}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === Tags::TAG_FAVORITE) {
+                $this->addActivity(true, $fileId, $path);
+            }
+            $this->tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === Tags::TAG_FAVORITE) {
+                $this->addActivity(false, $fileId, $path);
+            }
+            $this->tagger->unTag($fileId, $tag);
+        }
 
-		// TODO: re-read from tagger to make sure the
-		// list is up to date, in case of concurrent changes ?
-		return $tags;
-	}
+        // TODO: re-read from tagger to make sure the
+        // list is up to date, in case of concurrent changes ?
+        return $tags;
+    }
 
-	/**
-	 * @param bool $addToFavorite
-	 * @param int $fileId
-	 * @param string $path
-	 */
-	protected function addActivity($addToFavorite, $fileId, $path) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return;
-		}
+    /**
+     * @param bool $addToFavorite
+     * @param int $fileId
+     * @param string $path
+     */
+    protected function addActivity($addToFavorite, $fileId, $path) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return;
+        }
 
-		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
-			'userId' => $user->getUID(),
-			'fileId' => $fileId,
-			'path' => $path,
-		]));
+        $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
+        $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+            'userId' => $user->getUID(),
+            'fileId' => $fileId,
+            'path' => $path,
+        ]));
 
-		$event = $this->activityManager->generateEvent();
-		try {
-			$event->setApp('files')
-				->setObject('files', $fileId, $path)
-				->setType('favorite')
-				->setAuthor($user->getUID())
-				->setAffectedUser($user->getUID())
-				->setTimestamp(time())
-				->setSubject(
-					$addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
-					['id' => $fileId, 'path' => $path]
-				);
-			$this->activityManager->publish($event);
-		} catch (\InvalidArgumentException $e) {
-		} catch (\BadMethodCallException $e) {
-		}
-	}
+        $event = $this->activityManager->generateEvent();
+        try {
+            $event->setApp('files')
+                ->setObject('files', $fileId, $path)
+                ->setType('favorite')
+                ->setAuthor($user->getUID())
+                ->setAffectedUser($user->getUID())
+                ->setTimestamp(time())
+                ->setSubject(
+                    $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
+                    ['id' => $fileId, 'path' => $path]
+                );
+            $this->activityManager->publish($event);
+        } catch (\InvalidArgumentException $e) {
+        } catch (\BadMethodCallException $e) {
+        }
+    }
 }
 

apps/files_sharing/lib/External/Mount.php

Indentation +44 added lines, -44 removed lines

@@ -29,53 +29,53 @@
 
 class Mount extends MountPoint implements MoveableMount {
 
-	/**
-	 * @var \OCA\Files_Sharing\External\Manager
-	 */
-	protected $manager;
+    /**
+     * @var \OCA\Files_Sharing\External\Manager
+     */
+    protected $manager;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $options
-	 * @param \OCA\Files_Sharing\External\Manager $manager
-	 * @param \OC\Files\Storage\StorageFactory $loader
-	 */
-	public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
-		parent::__construct($storage, $mountpoint, $options, $loader);
-		$this->manager = $manager;
-	}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $options
+     * @param \OCA\Files_Sharing\External\Manager $manager
+     * @param \OC\Files\Storage\StorageFactory $loader
+     */
+    public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
+        parent::__construct($storage, $mountpoint, $options, $loader);
+        $this->manager = $manager;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$result = $this->manager->setMountPoint($this->mountPoint, $target);
-		$this->setMountPoint($target);
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $result = $this->manager->setMountPoint($this->mountPoint, $target);
+        $this->setMountPoint($target);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount() {
-		return $this->manager->removeShare($this->mountPoint);
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return mixed
+     * @return bool
+     */
+    public function removeMount() {
+        return $this->manager->removeShare($this->mountPoint);
+    }
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 */
-	public function getMountType() {
-		return 'shared';
-	}
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storages
+     * in the web interface
+     *
+     * @return string
+     */
+    public function getMountType() {
+        return 'shared';
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php

Indentation +22 added lines, -22 removed lines

@@ -30,27 +30,27 @@
 
 class MySqlExpressionBuilder extends ExpressionBuilder {
 
-	/** @var string */
-	protected $charset;
-
-	/**
-	 * @param \OCP\IDBConnection|Connection $connection
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
-		parent::__construct($connection, $queryBuilder);
-
-		$params = $connection->getParams();
-		$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
-	}
+    /** @var string */
+    protected $charset;
+
+    /**
+     * @param \OCP\IDBConnection|Connection $connection
+     * @param IQueryBuilder $queryBuilder
+     */
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
+        parent::__construct($connection, $queryBuilder);
+
+        $params = $connection->getParams();
+        $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
+    }
 
 }

lib/private/Memcache/APCu.php

Indentation +125 added lines, -125 removed lines

@@ -30,140 +30,140 @@
 use OCP\IMemcache;
 
 class APCu extends Cache implements IMemcache {
-	use CASTrait {
-		cas as casEmulated;
-	}
+    use CASTrait {
+        cas as casEmulated;
+    }
 
-	use CADTrait;
+    use CADTrait;
 
-	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
+    public function get($key) {
+        $result = apcu_fetch($this->getPrefix() . $key, $success);
+        if (!$success) {
+            return null;
+        }
+        return $result;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
-	}
+    public function set($key, $value, $ttl = 0) {
+        return apcu_store($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
-	}
+    public function hasKey($key) {
+        return apcu_exists($this->getPrefix() . $key);
+    }
 
-	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
-	}
+    public function remove($key) {
+        return apcu_delete($this->getPrefix() . $key);
+    }
 
-	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
-		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
-		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
-		}
-		return apcu_delete($iter);
-	}
+    public function clear($prefix = '') {
+        $ns = $this->getPrefix() . $prefix;
+        $ns = preg_quote($ns, '/');
+        if(class_exists('\APCIterator')) {
+            $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+        } else {
+            $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+        }
+        return apcu_delete($iter);
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        return apcu_add($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_inc method on a non-existing object will increment
-		 * "0" and result in "1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_inc method on a non-existing object will increment
+         * "0" and result in "1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_inc($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_dec method on a non-existing object will decrement
-		 * "0" and result in "-1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_dec method on a non-existing object will decrement
+         * "0" and result in "-1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_dec($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		// apc only does cas for ints
-		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
-		} else {
-			return $this->casEmulated($key, $old, $new);
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        // apc only does cas for ints
+        if (is_int($old) and is_int($new)) {
+            return apcu_cas($this->getPrefix() . $key, $old, $new);
+        } else {
+            return $this->casEmulated($key, $old, $new);
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	static public function isAvailable() {
-		if (!extension_loaded('apcu')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
-			return false;
-		} elseif (
-				version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
-				version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
-		) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    /**
+     * @return bool
+     */
+    static public function isAvailable() {
+        if (!extension_loaded('apcu')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
+            return false;
+        } elseif (
+                version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
+                version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
+        ) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }

lib/private/App/CodeChecker/DatabaseSchemaChecker.php

Indentation +77 added lines, -77 removed lines

@@ -25,81 +25,81 @@
 
 class DatabaseSchemaChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
-			return ['errors' => [], 'warnings' => []];
-		}
-
-		libxml_use_internal_errors(true);
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
-		libxml_disable_entity_loader($loadEntities);
-
-
-		$errors = $warnings = [];
-
-		foreach ($xml->table as $table) {
-			// Table names
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
-			}
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
-			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
-			}
-
-			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
-			}
-
-			$hasAutoIncrement = false;
-
-			// Column names
-			foreach ($table->declaration->field as $column) {
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
-				}
-
-				if (strlen((string)$column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
-				}
-
-				if ($column->autoincrement) {
-					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
-					}
-
-					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
-					}
-
-					$hasAutoIncrement = true;
-				}
-			}
-
-			// Index names
-			foreach ($table->declaration->index as $index) {
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
-				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
-				}
-
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
-				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
-				}
-			}
-		}
-
-		return ['errors' => $errors, 'warnings' => $warnings];
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!file_exists($appPath . '/appinfo/database.xml')) {
+            return ['errors' => [], 'warnings' => []];
+        }
+
+        libxml_use_internal_errors(true);
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+        libxml_disable_entity_loader($loadEntities);
+
+
+        $errors = $warnings = [];
+
+        foreach ($xml->table as $table) {
+            // Table names
+            if (strpos((string)$table->name, '*dbprefix*') !== 0) {
+                $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
+            }
+            $tableName = substr((string)$table->name, strlen('*dbprefix*'));
+            if (strpos($tableName, '*dbprefix*') !== false) {
+                $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
+            }
+
+            if (strlen($tableName) > 27) {
+                $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+            }
+
+            $hasAutoIncrement = false;
+
+            // Column names
+            foreach ($table->declaration->field as $column) {
+                if (strpos((string)$column->name, '*dbprefix*') !== false) {
+                    $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
+                }
+
+                if (strlen((string)$column->name) > 30) {
+                    $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+                }
+
+                if ($column->autoincrement) {
+                    if ($hasAutoIncrement) {
+                        $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
+                    }
+
+                    if (strlen($tableName) > 21) {
+                        $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+                    }
+
+                    $hasAutoIncrement = true;
+                }
+            }
+
+            // Index names
+            foreach ($table->declaration->index as $index) {
+                $hasPrefix = strpos((string)$index->name, '*dbprefix*');
+                if ($hasPrefix !== false && $hasPrefix !== 0) {
+                    $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
+                }
+
+                $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
+                if (strlen($indexName) > 27) {
+                    $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+                }
+            }
+        }
+
+        return ['errors' => $errors, 'warnings' => $warnings];
+    }
 }

core/Command/Maintenance/UpdateHtaccess.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
 
 class UpdateHtaccess extends Command {
 
-	protected function configure() {
-		$this
-			->setName('maintenance:update:htaccess')
-			->setDescription('Updates the .htaccess file');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:update:htaccess')
+            ->setDescription('Updates the .htaccess file');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if (\OC\Setup::updateHtaccess()) {
-			$output->writeln('.htaccess has been updated');
-			return 0;
-		} else {
-			$output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
-			return 1;
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (\OC\Setup::updateHtaccess()) {
+            $output->writeln('.htaccess has been updated');
+            return 0;
+        } else {
+            $output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
+            return 1;
+        }
+    }
 }

lib/public/IImage.php

Indentation +160 added lines, -160 removed lines

@@ -29,164 +29,164 @@
  * @since 8.1.0
  */
 interface IImage {
-	/**
-	 * Determine whether the object contains an image resource.
-	 *
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function valid();
-
-	/**
-	 * Returns the MIME type of the image or an empty string if no image is loaded.
-	 *
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function mimeType();
-
-	/**
-	 * Returns the width of the image or -1 if no image is loaded.
-	 *
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function width();
-
-	/**
-	 * Returns the height of the image or -1 if no image is loaded.
-	 *
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function height();
-
-	/**
-	 * Returns the width when the image orientation is top-left.
-	 *
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function widthTopLeft();
-
-	/**
-	 * Returns the height when the image orientation is top-left.
-	 *
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function heightTopLeft();
-
-	/**
-	 * Outputs the image.
-	 *
-	 * @param string $mimeType
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function show($mimeType = null);
-
-	/**
-	 * Saves the image.
-	 *
-	 * @param string $filePath
-	 * @param string $mimeType
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function save($filePath = null, $mimeType = null);
-
-	/**
-	 * @return resource Returns the image resource in any.
-	 * @since 8.1.0
-	 */
-	public function resource();
-
-	/**
-	 * @return string Returns the raw data mimetype
-	 * @since 13.0.0
-	 */
-	public function dataMimeType();
-
-	/**
-	 * @return string Returns the raw image data.
-	 * @since 8.1.0
-	 */
-	public function data();
-
-	/**
-	 * (I'm open for suggestions on better method name ;)
-	 * Get the orientation based on EXIF data.
-	 *
-	 * @return int The orientation or -1 if no EXIF data is available.
-	 * @since 8.1.0
-	 */
-	public function getOrientation();
-
-	/**
-	 * (I'm open for suggestions on better method name ;)
-	 * Fixes orientation based on EXIF data.
-	 *
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function fixOrientation();
-
-	/**
-	 * Resizes the image preserving ratio.
-	 *
-	 * @param integer $maxSize The maximum size of either the width or height.
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function resize($maxSize);
-
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function preciseResize(int $width, int $height): bool;
-
-	/**
-	 * Crops the image to the middle square. If the image is already square it just returns.
-	 *
-	 * @param int $size maximum size for the result (optional)
-	 * @return bool for success or failure
-	 * @since 8.1.0
-	 */
-	public function centerCrop($size = 0);
-
-	/**
-	 * Crops the image from point $x$y with dimension $wx$h.
-	 *
-	 * @param int $x Horizontal position
-	 * @param int $y Vertical position
-	 * @param int $w Width
-	 * @param int $h Height
-	 * @return bool for success or failure
-	 * @since 8.1.0
-	 */
-	public function crop(int $x, int $y, int $w, int $h): bool;
-
-	/**
-	 * Resizes the image to fit within a boundary while preserving ratio.
-	 *
-	 * @param integer $maxWidth
-	 * @param integer $maxHeight
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function fitIn($maxWidth, $maxHeight);
-
-	/**
-	 * Shrinks the image to fit within a boundary while preserving ratio.
-	 *
-	 * @param integer $maxWidth
-	 * @param integer $maxHeight
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function scaleDownToFit($maxWidth, $maxHeight);
+    /**
+     * Determine whether the object contains an image resource.
+     *
+     * @return bool
+     * @since 8.1.0
+     */
+    public function valid();
+
+    /**
+     * Returns the MIME type of the image or an empty string if no image is loaded.
+     *
+     * @return string
+     * @since 8.1.0
+     */
+    public function mimeType();
+
+    /**
+     * Returns the width of the image or -1 if no image is loaded.
+     *
+     * @return int
+     * @since 8.1.0
+     */
+    public function width();
+
+    /**
+     * Returns the height of the image or -1 if no image is loaded.
+     *
+     * @return int
+     * @since 8.1.0
+     */
+    public function height();
+
+    /**
+     * Returns the width when the image orientation is top-left.
+     *
+     * @return int
+     * @since 8.1.0
+     */
+    public function widthTopLeft();
+
+    /**
+     * Returns the height when the image orientation is top-left.
+     *
+     * @return int
+     * @since 8.1.0
+     */
+    public function heightTopLeft();
+
+    /**
+     * Outputs the image.
+     *
+     * @param string $mimeType
+     * @return bool
+     * @since 8.1.0
+     */
+    public function show($mimeType = null);
+
+    /**
+     * Saves the image.
+     *
+     * @param string $filePath
+     * @param string $mimeType
+     * @return bool
+     * @since 8.1.0
+     */
+    public function save($filePath = null, $mimeType = null);
+
+    /**
+     * @return resource Returns the image resource in any.
+     * @since 8.1.0
+     */
+    public function resource();
+
+    /**
+     * @return string Returns the raw data mimetype
+     * @since 13.0.0
+     */
+    public function dataMimeType();
+
+    /**
+     * @return string Returns the raw image data.
+     * @since 8.1.0
+     */
+    public function data();
+
+    /**
+     * (I'm open for suggestions on better method name ;)
+     * Get the orientation based on EXIF data.
+     *
+     * @return int The orientation or -1 if no EXIF data is available.
+     * @since 8.1.0
+     */
+    public function getOrientation();
+
+    /**
+     * (I'm open for suggestions on better method name ;)
+     * Fixes orientation based on EXIF data.
+     *
+     * @return bool
+     * @since 8.1.0
+     */
+    public function fixOrientation();
+
+    /**
+     * Resizes the image preserving ratio.
+     *
+     * @param integer $maxSize The maximum size of either the width or height.
+     * @return bool
+     * @since 8.1.0
+     */
+    public function resize($maxSize);
+
+    /**
+     * @param int $width
+     * @param int $height
+     * @return bool
+     * @since 8.1.0
+     */
+    public function preciseResize(int $width, int $height): bool;
+
+    /**
+     * Crops the image to the middle square. If the image is already square it just returns.
+     *
+     * @param int $size maximum size for the result (optional)
+     * @return bool for success or failure
+     * @since 8.1.0
+     */
+    public function centerCrop($size = 0);
+
+    /**
+     * Crops the image from point $x$y with dimension $wx$h.
+     *
+     * @param int $x Horizontal position
+     * @param int $y Vertical position
+     * @param int $w Width
+     * @param int $h Height
+     * @return bool for success or failure
+     * @since 8.1.0
+     */
+    public function crop(int $x, int $y, int $w, int $h): bool;
+
+    /**
+     * Resizes the image to fit within a boundary while preserving ratio.
+     *
+     * @param integer $maxWidth
+     * @param integer $maxHeight
+     * @return bool
+     * @since 8.1.0
+     */
+    public function fitIn($maxWidth, $maxHeight);
+
+    /**
+     * Shrinks the image to fit within a boundary while preserving ratio.
+     *
+     * @param integer $maxWidth
+     * @param integer $maxHeight
+     * @return bool
+     * @since 8.1.0
+     */
+    public function scaleDownToFit($maxWidth, $maxHeight);
 }

lib/public/AppFramework/IAppContainer.php

Indentation +24 added lines, -24 removed lines

@@ -37,31 +37,31 @@
  */
 interface IAppContainer extends IContainer {
 
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 * @since 6.0.0
-	 */
-	public function getAppName();
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     * @since 6.0.0
+     */
+    public function getAppName();
 
-	/**
-	 * @return \OCP\IServerContainer
-	 * @since 6.0.0
-	 */
-	public function getServer();
+    /**
+     * @return \OCP\IServerContainer
+     * @since 6.0.0
+     */
+    public function getServer();
 
-	/**
-	 * @param string $middleWare
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	public function registerMiddleWare($middleWare);
+    /**
+     * @param string $middleWare
+     * @return boolean
+     * @since 6.0.0
+     */
+    public function registerMiddleWare($middleWare);
 
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 * @since 8.2.0
-	 */
-	 public function registerCapability($serviceName);
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     * @since 8.2.0
+     */
+        public function registerCapability($serviceName);
 }