nextcloud / server

lib/private/DB/MDB2SchemaReader.php

Indentation +292 added lines, -292 removed lines

@@ -37,312 +37,312 @@
 
 class MDB2SchemaReader {
 
-	/**
-	 * @var string $DBTABLEPREFIX
-	 */
-	protected $DBTABLEPREFIX;
+    /**
+     * @var string $DBTABLEPREFIX
+     */
+    protected $DBTABLEPREFIX;
 
-	/**
-	 * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	protected $platform;
+    /**
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    protected $platform;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	public function __construct(IConfig $config, AbstractPlatform $platform) {
-		$this->platform = $platform;
-		$this->config = $config;
-		$this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
-	}
+    /**
+     * @param \OCP\IConfig $config
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    public function __construct(IConfig $config, AbstractPlatform $platform) {
+        $this->platform = $platform;
+        $this->config = $config;
+        $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
+    }
 
-	/**
-	 * @param string $file
-	 * @param Schema $schema
-	 * @return Schema
-	 * @throws \DomainException
-	 */
-	public function loadSchemaFromFile($file, Schema $schema) {
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($file);
-		libxml_disable_entity_loader($loadEntities);
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'table':
-					$this->loadTable($schema, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param string $file
+     * @param Schema $schema
+     * @return Schema
+     * @throws \DomainException
+     */
+    public function loadSchemaFromFile($file, Schema $schema) {
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($file);
+        libxml_disable_entity_loader($loadEntities);
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'table':
+                    $this->loadTable($schema, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		return $schema;
-	}
+            }
+        }
+        return $schema;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadTable($schema, $xml) {
-		$table = null;
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
-					$name = $this->platform->quoteIdentifier($name);
-					$table = $schema->createTable($name);
-					break;
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'declaration':
-					if (is_null($table)) {
-						throw new \DomainException('Table declaration before table name');
-					}
-					$this->loadDeclaration($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadTable($schema, $xml) {
+        $table = null;
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
+                    $name = $this->platform->quoteIdentifier($name);
+                    $table = $schema->createTable($name);
+                    break;
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'declaration':
+                    if (is_null($table)) {
+                        throw new \DomainException('Table declaration before table name');
+                    }
+                    $this->loadDeclaration($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadDeclaration($table, $xml) {
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'field':
-					$this->loadField($table, $child);
-					break;
-				case 'index':
-					$this->loadIndex($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadDeclaration($table, $xml) {
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'field':
+                    $this->loadField($table, $child);
+                    break;
+                case 'index':
+                    $this->loadIndex($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadField($table, $xml) {
-		$options = [ 'notnull' => false ];
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = $this->platform->quoteIdentifier($name);
-					break;
-				case 'type':
-					$type = (string)$child;
-					switch ($type) {
-						case 'text':
-							$type = 'string';
-							break;
-						case 'clob':
-							$type = 'text';
-							break;
-						case 'timestamp':
-							$type = 'datetime';
-							break;
-						case 'numeric':
-							$type = 'decimal';
-							break;
-					}
-					break;
-				case 'length':
-					$length = (string)$child;
-					$options['length'] = $length;
-					break;
-				case 'unsigned':
-					$unsigned = $this->asBool($child);
-					$options['unsigned'] = $unsigned;
-					break;
-				case 'notnull':
-					$notnull = $this->asBool($child);
-					$options['notnull'] = $notnull;
-					break;
-				case 'autoincrement':
-					$autoincrement = $this->asBool($child);
-					$options['autoincrement'] = $autoincrement;
-					break;
-				case 'default':
-					$default = (string)$child;
-					$options['default'] = $default;
-					break;
-				case 'comments':
-					$comment = (string)$child;
-					$options['comment'] = $comment;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					$options['primary'] = $primary;
-					break;
-				case 'precision':
-					$precision = (string)$child;
-					$options['precision'] = $precision;
-					break;
-				case 'scale':
-					$scale = (string)$child;
-					$options['scale'] = $scale;
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadField($table, $xml) {
+        $options = [ 'notnull' => false ];
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = $this->platform->quoteIdentifier($name);
+                    break;
+                case 'type':
+                    $type = (string)$child;
+                    switch ($type) {
+                        case 'text':
+                            $type = 'string';
+                            break;
+                        case 'clob':
+                            $type = 'text';
+                            break;
+                        case 'timestamp':
+                            $type = 'datetime';
+                            break;
+                        case 'numeric':
+                            $type = 'decimal';
+                            break;
+                    }
+                    break;
+                case 'length':
+                    $length = (string)$child;
+                    $options['length'] = $length;
+                    break;
+                case 'unsigned':
+                    $unsigned = $this->asBool($child);
+                    $options['unsigned'] = $unsigned;
+                    break;
+                case 'notnull':
+                    $notnull = $this->asBool($child);
+                    $options['notnull'] = $notnull;
+                    break;
+                case 'autoincrement':
+                    $autoincrement = $this->asBool($child);
+                    $options['autoincrement'] = $autoincrement;
+                    break;
+                case 'default':
+                    $default = (string)$child;
+                    $options['default'] = $default;
+                    break;
+                case 'comments':
+                    $comment = (string)$child;
+                    $options['comment'] = $comment;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    $options['primary'] = $primary;
+                    break;
+                case 'precision':
+                    $precision = (string)$child;
+                    $options['precision'] = $precision;
+                    break;
+                case 'scale':
+                    $scale = (string)$child;
+                    $options['scale'] = $scale;
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (isset($name) && isset($type)) {
-			if (isset($options['default']) && empty($options['default'])) {
-				if (empty($options['notnull']) || !$options['notnull']) {
-					unset($options['default']);
-					$options['notnull'] = false;
-				} else {
-					$options['default'] = '';
-				}
-				if ($type == 'integer' || $type == 'decimal') {
-					$options['default'] = 0;
-				} elseif ($type == 'boolean') {
-					$options['default'] = false;
-				}
-				if (!empty($options['autoincrement']) && $options['autoincrement']) {
-					unset($options['default']);
-				}
-			}
-			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
-			}
-			if ($type === 'integer' && isset($options['length'])) {
-				$length = $options['length'];
-				if ($length < 4) {
-					$type = 'smallint';
-				} elseif ($length > 4) {
-					$type = 'bigint';
-				}
-			}
-			if ($type === 'boolean' && isset($options['default'])) {
-				$options['default'] = $this->asBool($options['default']);
-			}
-			if (!empty($options['autoincrement'])
-				&& !empty($options['notnull'])
-			) {
-				$options['primary'] = true;
-			}
+            }
+        }
+        if (isset($name) && isset($type)) {
+            if (isset($options['default']) && empty($options['default'])) {
+                if (empty($options['notnull']) || !$options['notnull']) {
+                    unset($options['default']);
+                    $options['notnull'] = false;
+                } else {
+                    $options['default'] = '';
+                }
+                if ($type == 'integer' || $type == 'decimal') {
+                    $options['default'] = 0;
+                } elseif ($type == 'boolean') {
+                    $options['default'] = false;
+                }
+                if (!empty($options['autoincrement']) && $options['autoincrement']) {
+                    unset($options['default']);
+                }
+            }
+            if ($type === 'integer' && isset($options['default'])) {
+                $options['default'] = (int)$options['default'];
+            }
+            if ($type === 'integer' && isset($options['length'])) {
+                $length = $options['length'];
+                if ($length < 4) {
+                    $type = 'smallint';
+                } elseif ($length > 4) {
+                    $type = 'bigint';
+                }
+            }
+            if ($type === 'boolean' && isset($options['default'])) {
+                $options['default'] = $this->asBool($options['default']);
+            }
+            if (!empty($options['autoincrement'])
+                && !empty($options['notnull'])
+            ) {
+                $options['primary'] = true;
+            }
 
-			$table->addColumn($name, $type, $options);
-			if (!empty($options['primary']) && $options['primary']) {
-				$table->setPrimaryKey([$name]);
-			}
-		}
-	}
+            $table->addColumn($name, $type, $options);
+            if (!empty($options['primary']) && $options['primary']) {
+                $table->setPrimaryKey([$name]);
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadIndex($table, $xml) {
-		$name = null;
-		$fields = [];
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					break;
-				case 'unique':
-					$unique = $this->asBool($child);
-					break;
-				case 'field':
-					foreach ($child->children() as $field) {
-						/**
-						 * @var \SimpleXMLElement $field
-						 */
-						switch ($field->getName()) {
-							case 'name':
-								$field_name = (string)$field;
-								$field_name = $this->platform->quoteIdentifier($field_name);
-								$fields[] = $field_name;
-								break;
-							case 'sorting':
-								break;
-							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadIndex($table, $xml) {
+        $name = null;
+        $fields = [];
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    break;
+                case 'unique':
+                    $unique = $this->asBool($child);
+                    break;
+                case 'field':
+                    foreach ($child->children() as $field) {
+                        /**
+                         * @var \SimpleXMLElement $field
+                         */
+                        switch ($field->getName()) {
+                            case 'name':
+                                $field_name = (string)$field;
+                                $field_name = $this->platform->quoteIdentifier($field_name);
+                                $fields[] = $field_name;
+                                break;
+                            case 'sorting':
+                                break;
+                            default:
+                                throw new \DomainException('Unknown element: ' . $field->getName());
 
-						}
-					}
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+                        }
+                    }
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (!empty($fields)) {
-			if (isset($primary) && $primary) {
-				if ($table->hasPrimaryKey()) {
-					return;
-				}
-				$table->setPrimaryKey($fields, $name);
-			} else {
-				if (isset($unique) && $unique) {
-					$table->addUniqueIndex($fields, $name);
-				} else {
-					$table->addIndex($fields, $name);
-				}
-			}
-		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
-		}
-	}
+            }
+        }
+        if (!empty($fields)) {
+            if (isset($primary) && $primary) {
+                if ($table->hasPrimaryKey()) {
+                    return;
+                }
+                $table->setPrimaryKey($fields, $name);
+            } else {
+                if (isset($unique) && $unique) {
+                    $table->addUniqueIndex($fields, $name);
+                } else {
+                    $table->addIndex($fields, $name);
+                }
+            }
+        } else {
+            throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+        }
+    }
 
-	/**
-	 * @param \SimpleXMLElement|string $xml
-	 * @return bool
-	 */
-	private function asBool($xml) {
-		$result = (string)$xml;
-		if ($result == 'true') {
-			$result = true;
-		} elseif ($result == 'false') {
-			$result = false;
-		}
-		return (bool)$result;
-	}
+    /**
+     * @param \SimpleXMLElement|string $xml
+     * @return bool
+     */
+    private function asBool($xml) {
+        $result = (string)$xml;
+        if ($result == 'true') {
+            $result = true;
+        } elseif ($result == 'false') {
+            $result = false;
+        }
+        return (bool)$result;
+    }
 }

lib/private/DB/MDB2SchemaWriter.php

Indentation +138 added lines, -138 removed lines

@@ -31,150 +31,150 @@
 
 class MDB2SchemaWriter {
 
-	/**
-	 * @param string $file
-	 * @param \OC\DB\Connection $conn
-	 * @return bool
-	 */
-	public static function saveSchemaToFile($file, \OC\DB\Connection $conn) {
-		$config = \OC::$server->getConfig();
+    /**
+     * @param string $file
+     * @param \OC\DB\Connection $conn
+     * @return bool
+     */
+    public static function saveSchemaToFile($file, \OC\DB\Connection $conn) {
+        $config = \OC::$server->getConfig();
 
-		$xml = new \SimpleXMLElement('<database/>');
-		$xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
-		$xml->addChild('create', 'true');
-		$xml->addChild('overwrite', 'false');
-		if ($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
-			$xml->addChild('charset', 'utf8mb4');
-		} else {
-			$xml->addChild('charset', 'utf8');
-		}
+        $xml = new \SimpleXMLElement('<database/>');
+        $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
+        $xml->addChild('create', 'true');
+        $xml->addChild('overwrite', 'false');
+        if ($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
+            $xml->addChild('charset', 'utf8mb4');
+        } else {
+            $xml->addChild('charset', 'utf8');
+        }
 
-		// FIX ME: bloody work around
-		if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			$filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
-		} else {
-			$filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
-		}
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        // FIX ME: bloody work around
+        if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
+            $filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
+        } else {
+            $filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
+        }
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
-		foreach ($conn->getSchemaManager()->listTables() as $table) {
-			self::saveTable($table, $xml->addChild('table'));
-		}
-		file_put_contents($file, $xml->asXML());
-		return true;
-	}
+        foreach ($conn->getSchemaManager()->listTables() as $table) {
+            self::saveTable($table, $xml->addChild('table'));
+        }
+        file_put_contents($file, $xml->asXML());
+        return true;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveTable($table, $xml) {
-		$xml->addChild('name', $table->getName());
-		$declaration = $xml->addChild('declaration');
-		foreach ($table->getColumns() as $column) {
-			self::saveColumn($column, $declaration->addChild('field'));
-		}
-		foreach ($table->getIndexes() as $index) {
-			if ($index->getName() == 'PRIMARY') {
-				$autoincrement = false;
-				foreach ($index->getColumns() as $column) {
-					if ($table->getColumn($column)->getAutoincrement()) {
-						$autoincrement = true;
-					}
-				}
-				if ($autoincrement) {
-					continue;
-				}
-			}
-			self::saveIndex($index, $declaration->addChild('index'));
-		}
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveTable($table, $xml) {
+        $xml->addChild('name', $table->getName());
+        $declaration = $xml->addChild('declaration');
+        foreach ($table->getColumns() as $column) {
+            self::saveColumn($column, $declaration->addChild('field'));
+        }
+        foreach ($table->getIndexes() as $index) {
+            if ($index->getName() == 'PRIMARY') {
+                $autoincrement = false;
+                foreach ($index->getColumns() as $column) {
+                    if ($table->getColumn($column)->getAutoincrement()) {
+                        $autoincrement = true;
+                    }
+                }
+                if ($autoincrement) {
+                    continue;
+                }
+            }
+            self::saveIndex($index, $declaration->addChild('index'));
+        }
+    }
 
-	/**
-	 * @param Column $column
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveColumn($column, $xml) {
-		$xml->addChild('name', $column->getName());
-		switch ($column->getType()) {
-			case 'SmallInt':
-			case 'Integer':
-			case 'BigInt':
-				$xml->addChild('type', 'integer');
-				$default = $column->getDefault();
-				if (is_null($default) && $column->getAutoincrement()) {
-					$default = '0';
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				if ($column->getAutoincrement()) {
-					$xml->addChild('autoincrement', '1');
-				}
-				if ($column->getUnsigned()) {
-					$xml->addChild('unsigned', 'true');
-				}
-				$length = '4';
-				if ($column->getType() == 'SmallInt') {
-					$length = '2';
-				} elseif ($column->getType() == 'BigInt') {
-					$length = '8';
-				}
-				$xml->addChild('length', $length);
-				break;
-			case 'String':
-				$xml->addChild('type', 'text');
-				$default = trim($column->getDefault());
-				if ($default === '') {
-					$default = false;
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', $column->getLength());
-				break;
-			case 'Text':
-				$xml->addChild('type', 'clob');
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
-			case 'Decimal':
-				$xml->addChild('type', 'decimal');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '15');
-				break;
-			case 'Boolean':
-				$xml->addChild('type', 'integer');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '1');
-				break;
-			case 'DateTime':
-				$xml->addChild('type', 'timestamp');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
+    /**
+     * @param Column $column
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveColumn($column, $xml) {
+        $xml->addChild('name', $column->getName());
+        switch ($column->getType()) {
+            case 'SmallInt':
+            case 'Integer':
+            case 'BigInt':
+                $xml->addChild('type', 'integer');
+                $default = $column->getDefault();
+                if (is_null($default) && $column->getAutoincrement()) {
+                    $default = '0';
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                if ($column->getAutoincrement()) {
+                    $xml->addChild('autoincrement', '1');
+                }
+                if ($column->getUnsigned()) {
+                    $xml->addChild('unsigned', 'true');
+                }
+                $length = '4';
+                if ($column->getType() == 'SmallInt') {
+                    $length = '2';
+                } elseif ($column->getType() == 'BigInt') {
+                    $length = '8';
+                }
+                $xml->addChild('length', $length);
+                break;
+            case 'String':
+                $xml->addChild('type', 'text');
+                $default = trim($column->getDefault());
+                if ($default === '') {
+                    $default = false;
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', $column->getLength());
+                break;
+            case 'Text':
+                $xml->addChild('type', 'clob');
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
+            case 'Decimal':
+                $xml->addChild('type', 'decimal');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '15');
+                break;
+            case 'Boolean':
+                $xml->addChild('type', 'integer');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '1');
+                break;
+            case 'DateTime':
+                $xml->addChild('type', 'timestamp');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
 
-		}
-	}
+        }
+    }
 
-	/**
-	 * @param Index $index
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveIndex($index, $xml) {
-		$xml->addChild('name', $index->getName());
-		if ($index->isPrimary()) {
-			$xml->addChild('primary', 'true');
-		} elseif ($index->isUnique()) {
-			$xml->addChild('unique', 'true');
-		}
-		foreach ($index->getColumns() as $column) {
-			$field = $xml->addChild('field');
-			$field->addChild('name', $column);
-			$field->addChild('sorting', 'ascending');
-		}
-	}
+    /**
+     * @param Index $index
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveIndex($index, $xml) {
+        $xml->addChild('name', $index->getName());
+        if ($index->isPrimary()) {
+            $xml->addChild('primary', 'true');
+        } elseif ($index->isUnique()) {
+            $xml->addChild('unique', 'true');
+        }
+        foreach ($index->getColumns() as $column) {
+            $field = $xml->addChild('field');
+            $field->addChild('name', $column);
+            $field->addChild('sorting', 'ascending');
+        }
+    }
 
-	private static function toBool($bool) {
-		return $bool ? 'true' : 'false';
-	}
+    private static function toBool($bool) {
+        return $bool ? 'true' : 'false';
+    }
 }

lib/private/DB/SQLiteMigrator.php

Indentation +53 added lines, -53 removed lines

@@ -32,62 +32,62 @@
 
 class SQLiteMigrator extends Migrator {
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 *
-	 * For sqlite we simple make a copy of the entire database, and test the migration on that
-	 */
-	public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
-		$dbFile = $this->connection->getDatabase();
-		$tmpFile = $this->buildTempDatabase();
-		copy($dbFile, $tmpFile);
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     *
+     * For sqlite we simple make a copy of the entire database, and test the migration on that
+     */
+    public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
+        $dbFile = $this->connection->getDatabase();
+        $tmpFile = $this->buildTempDatabase();
+        copy($dbFile, $tmpFile);
 
-		$connectionParams = [
-			'path' => $tmpFile,
-			'driver' => 'pdo_sqlite',
-		];
-		$conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-		try {
-			$this->applySchema($targetSchema, $conn);
-			$conn->close();
-			unlink($tmpFile);
-		} catch (DBALException $e) {
-			$conn->close();
-			unlink($tmpFile);
-			throw new MigrationException('', $e->getMessage());
-		}
-	}
+        $connectionParams = [
+            'path' => $tmpFile,
+            'driver' => 'pdo_sqlite',
+        ];
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
+        try {
+            $this->applySchema($targetSchema, $conn);
+            $conn->close();
+            unlink($tmpFile);
+        } catch (DBALException $e) {
+            $conn->close();
+            unlink($tmpFile);
+            throw new MigrationException('', $e->getMessage());
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
-		$tmpFile = uniqid("oc_");
-		return "$dataDir/$tmpFile.db";
-	}
+    /**
+     * @return string
+     */
+    private function buildTempDatabase() {
+        $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+        $tmpFile = uniqid("oc_");
+        return "$dataDir/$tmpFile.db";
+    }
 
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('varchar ', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
 
-		// with sqlite autoincrement columns is of type integer
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
-					$column->setType(Type::getType('integer'));
-				}
-			}
-		}
+        // with sqlite autoincrement columns is of type integer
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+                    $column->setType(Type::getType('integer'));
+                }
+            }
+        }
 
-		return parent::getDiff($targetSchema, $connection);
-	}
+        return parent::getDiff($targetSchema, $connection);
+    }
 }

lib/private/Command/FileAccess.php

Indentation +7 added lines, -7 removed lines

@@ -25,12 +25,12 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user) {
-		\OC_Util::setupFS($user->getUID());
-	}
+    protected function setupFS(IUser $user) {
+        \OC_Util::setupFS($user->getUID());
+    }
 
-	protected function getUserFolder(IUser $user) {
-		$this->setupFS($user);
-		return \OC::$server->getUserFolder($user->getUID());
-	}
+    protected function getUserFolder(IUser $user) {
+        $this->setupFS($user);
+        return \OC::$server->getUserFolder($user->getUID());
+    }
 }

lib/private/Memcache/Memcached.php

Indentation +189 added lines, -189 removed lines

@@ -33,193 +33,193 @@
 use OCP\IMemcache;
 
 class Memcached extends Cache implements IMemcache {
-	use CASTrait;
-
-	/**
-	 * @var \Memcached $cache
-	 */
-	private static $cache = null;
-
-	use CADTrait;
-
-	public function __construct($prefix = '') {
-		parent::__construct($prefix);
-		if (is_null(self::$cache)) {
-			self::$cache = new \Memcached();
-
-			$defaultOptions = [
-				\Memcached::OPT_CONNECT_TIMEOUT => 50,
-				\Memcached::OPT_RETRY_TIMEOUT => 50,
-				\Memcached::OPT_SEND_TIMEOUT => 50,
-				\Memcached::OPT_RECV_TIMEOUT => 50,
-				\Memcached::OPT_POLL_TIMEOUT => 50,
-
-				// Enable compression
-				\Memcached::OPT_COMPRESSION => true,
-
-				// Turn on consistent hashing
-				\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
-
-				// Enable Binary Protocol
-				//\Memcached::OPT_BINARY_PROTOCOL =>      true,
-			];
-			// by default enable igbinary serializer if available
-			if (\Memcached::HAVE_IGBINARY) {
-				$defaultOptions[\Memcached::OPT_SERIALIZER] =
-					\Memcached::SERIALIZER_IGBINARY;
-			}
-			$options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
-			if (is_array($options)) {
-				$options = $options + $defaultOptions;
-				self::$cache->setOptions($options);
-			} else {
-				throw new HintException("Expected 'memcached_options' config to be an array, got $options");
-			}
-
-			$servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
-			if (!$servers) {
-				$server = \OC::$server->getSystemConfig()->getValue('memcached_server');
-				if ($server) {
-					$servers = [$server];
-				} else {
-					$servers = [['localhost', 11211]];
-				}
-			}
-			self::$cache->addServers($servers);
-		}
-	}
-
-	/**
-	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
-
-	public function get($key) {
-		$result = self::$cache->get($this->getNameSpace() . $key);
-		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
-			return null;
-		} else {
-			return $result;
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			$result = self::$cache->set($this->getNameSpace() . $key, $value, $ttl);
-		} else {
-			$result = self::$cache->set($this->getNameSpace() . $key, $value);
-		}
-		if ($result !== true) {
-			$this->verifyReturnCode();
-		}
-		return $result;
-	}
-
-	public function hasKey($key) {
-		self::$cache->get($this->getNameSpace() . $key);
-		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
-	}
-
-	public function remove($key) {
-		$result = self::$cache->delete($this->getNameSpace() . $key);
-		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
-			$this->verifyReturnCode();
-		}
-		return $result;
-	}
-
-	public function clear($prefix = '') {
-		$prefix = $this->getNameSpace() . $prefix;
-		$allKeys = self::$cache->getAllKeys();
-		if ($allKeys === false) {
-			// newer Memcached doesn't like getAllKeys(), flush everything
-			self::$cache->flush();
-			return true;
-		}
-		$keys = [];
-		$prefixLength = strlen($prefix);
-		foreach ($allKeys as $key) {
-			if (substr($key, 0, $prefixLength) === $prefix) {
-				$keys[] = $key;
-			}
-		}
-		if (method_exists(self::$cache, 'deleteMulti')) {
-			self::$cache->deleteMulti($keys);
-		} else {
-			foreach ($keys as $key) {
-				self::$cache->delete($key);
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * 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
-	 * @throws \Exception
-	 */
-	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
-		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
-			$this->verifyReturnCode();
-		}
-		return $result;
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	public static function isAvailable() {
-		return extension_loaded('memcached');
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function verifyReturnCode() {
-		$code = self::$cache->getResultCode();
-		if ($code === \Memcached::RES_SUCCESS) {
-			return;
-		}
-		$message = self::$cache->getResultMessage();
-		throw new \Exception("Error $code interacting with memcached : $message");
-	}
+    use CASTrait;
+
+    /**
+     * @var \Memcached $cache
+     */
+    private static $cache = null;
+
+    use CADTrait;
+
+    public function __construct($prefix = '') {
+        parent::__construct($prefix);
+        if (is_null(self::$cache)) {
+            self::$cache = new \Memcached();
+
+            $defaultOptions = [
+                \Memcached::OPT_CONNECT_TIMEOUT => 50,
+                \Memcached::OPT_RETRY_TIMEOUT => 50,
+                \Memcached::OPT_SEND_TIMEOUT => 50,
+                \Memcached::OPT_RECV_TIMEOUT => 50,
+                \Memcached::OPT_POLL_TIMEOUT => 50,
+
+                // Enable compression
+                \Memcached::OPT_COMPRESSION => true,
+
+                // Turn on consistent hashing
+                \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
+
+                // Enable Binary Protocol
+                //\Memcached::OPT_BINARY_PROTOCOL =>      true,
+            ];
+            // by default enable igbinary serializer if available
+            if (\Memcached::HAVE_IGBINARY) {
+                $defaultOptions[\Memcached::OPT_SERIALIZER] =
+                    \Memcached::SERIALIZER_IGBINARY;
+            }
+            $options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
+            if (is_array($options)) {
+                $options = $options + $defaultOptions;
+                self::$cache->setOptions($options);
+            } else {
+                throw new HintException("Expected 'memcached_options' config to be an array, got $options");
+            }
+
+            $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
+            if (!$servers) {
+                $server = \OC::$server->getSystemConfig()->getValue('memcached_server');
+                if ($server) {
+                    $servers = [$server];
+                } else {
+                    $servers = [['localhost', 11211]];
+                }
+            }
+            self::$cache->addServers($servers);
+        }
+    }
+
+    /**
+     * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
+     */
+    protected function getNameSpace() {
+        return $this->prefix;
+    }
+
+    public function get($key) {
+        $result = self::$cache->get($this->getNameSpace() . $key);
+        if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
+            return null;
+        } else {
+            return $result;
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            $result = self::$cache->set($this->getNameSpace() . $key, $value, $ttl);
+        } else {
+            $result = self::$cache->set($this->getNameSpace() . $key, $value);
+        }
+        if ($result !== true) {
+            $this->verifyReturnCode();
+        }
+        return $result;
+    }
+
+    public function hasKey($key) {
+        self::$cache->get($this->getNameSpace() . $key);
+        return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
+    }
+
+    public function remove($key) {
+        $result = self::$cache->delete($this->getNameSpace() . $key);
+        if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
+            $this->verifyReturnCode();
+        }
+        return $result;
+    }
+
+    public function clear($prefix = '') {
+        $prefix = $this->getNameSpace() . $prefix;
+        $allKeys = self::$cache->getAllKeys();
+        if ($allKeys === false) {
+            // newer Memcached doesn't like getAllKeys(), flush everything
+            self::$cache->flush();
+            return true;
+        }
+        $keys = [];
+        $prefixLength = strlen($prefix);
+        foreach ($allKeys as $key) {
+            if (substr($key, 0, $prefixLength) === $prefix) {
+                $keys[] = $key;
+            }
+        }
+        if (method_exists(self::$cache, 'deleteMulti')) {
+            self::$cache->deleteMulti($keys);
+        } else {
+            foreach ($keys as $key) {
+                self::$cache->delete($key);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 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
+     * @throws \Exception
+     */
+    public function add($key, $value, $ttl = 0) {
+        $result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+        if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
+            $this->verifyReturnCode();
+        }
+        return $result;
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        $result = self::$cache->increment($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        $result = self::$cache->decrement($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    public static function isAvailable() {
+        return extension_loaded('memcached');
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function verifyReturnCode() {
+        $code = self::$cache->getResultCode();
+        if ($code === \Memcached::RES_SUCCESS) {
+            return;
+        }
+        $message = self::$cache->getResultMessage();
+        throw new \Exception("Error $code interacting with memcached : $message");
+    }
 }

lib/private/Memcache/NullCache.php

Indentation +33 added lines, -33 removed lines

@@ -27,47 +27,47 @@
 namespace OC\Memcache;
 
 class NullCache extends Cache implements \OCP\IMemcache {
-	public function get($key) {
-		return null;
-	}
+    public function get($key) {
+        return null;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function set($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function hasKey($key) {
-		return false;
-	}
+    public function hasKey($key) {
+        return false;
+    }
 
-	public function remove($key) {
-		return true;
-	}
+    public function remove($key) {
+        return true;
+    }
 
-	public function add($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function add($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function inc($key, $step = 1) {
-		return true;
-	}
+    public function inc($key, $step = 1) {
+        return true;
+    }
 
-	public function dec($key, $step = 1) {
-		return true;
-	}
+    public function dec($key, $step = 1) {
+        return true;
+    }
 
-	public function cas($key, $old, $new) {
-		return true;
-	}
+    public function cas($key, $old, $new) {
+        return true;
+    }
 
-	public function cad($key, $old) {
-		return true;
-	}
+    public function cad($key, $old) {
+        return true;
+    }
 
-	public function clear($prefix = '') {
-		return true;
-	}
+    public function clear($prefix = '') {
+        return true;
+    }
 
-	public static function isAvailable() {
-		return true;
-	}
+    public static function isAvailable() {
+        return true;
+    }
 }

lib/private/Contacts/ContactsMenu/Entry.php

Indentation +136 added lines, -136 removed lines

@@ -29,140 +29,140 @@
 
 class Entry implements IEntry {
 
-	/** @var string|int|null */
-	private $id = null;
-
-	/** @var string */
-	private $fullName = '';
-
-	/** @var string[] */
-	private $emailAddresses = [];
-
-	/** @var string|null */
-	private $avatar;
-
-	/** @var IAction[] */
-	private $actions = [];
-
-	/** @var array */
-	private $properties = [];
-
-	/**
-	 * @param string $id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @param string $displayName
-	 */
-	public function setFullName($displayName) {
-		$this->fullName = $displayName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getFullName() {
-		return $this->fullName;
-	}
-
-	/**
-	 * @param string $address
-	 */
-	public function addEMailAddress($address) {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEMailAddresses() {
-		return $this->emailAddresses;
-	}
-
-	/**
-	 * @param string $avatar
-	 */
-	public function setAvatar($avatar) {
-		$this->avatar = $avatar;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAvatar() {
-		return $this->avatar;
-	}
-
-	/**
-	 * @param IAction $action
-	 */
-	public function addAction(IAction $action) {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions() {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions() {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	/**
-	 * @param array $contact key-value array containing additional properties
-	 */
-	public function setProperties(array $contact) {
-		$this->properties = $contact;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getProperty($key) {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-		];
-	}
+    /** @var string|int|null */
+    private $id = null;
+
+    /** @var string */
+    private $fullName = '';
+
+    /** @var string[] */
+    private $emailAddresses = [];
+
+    /** @var string|null */
+    private $avatar;
+
+    /** @var IAction[] */
+    private $actions = [];
+
+    /** @var array */
+    private $properties = [];
+
+    /**
+     * @param string $id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @param string $displayName
+     */
+    public function setFullName($displayName) {
+        $this->fullName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullName() {
+        return $this->fullName;
+    }
+
+    /**
+     * @param string $address
+     */
+    public function addEMailAddress($address) {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEMailAddresses() {
+        return $this->emailAddresses;
+    }
+
+    /**
+     * @param string $avatar
+     */
+    public function setAvatar($avatar) {
+        $this->avatar = $avatar;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAvatar() {
+        return $this->avatar;
+    }
+
+    /**
+     * @param IAction $action
+     */
+    public function addAction(IAction $action) {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions() {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions() {
+        usort($this->actions, function (IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    /**
+     * @param array $contact key-value array containing additional properties
+     */
+    public function setProperties(array $contact) {
+        $this->properties = $contact;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getProperty($key) {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize() {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function (IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+        ];
+    }
 }

lib/private/BackgroundJob/Legacy/QueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\BackgroundJob\Legacy;
 
 class QueuedJob extends \OC\BackgroundJob\QueuedJob {
-	public function run($argument) {
-		$class = $argument['klass'];
-		$method = $argument['method'];
-		$parameters = $argument['parameters'];
-		if (is_callable([$class, $method])) {
-			call_user_func([$class, $method], $parameters);
-		}
-	}
+    public function run($argument) {
+        $class = $argument['klass'];
+        $method = $argument['method'];
+        $parameters = $argument['parameters'];
+        if (is_callable([$class, $method])) {
+            call_user_func([$class, $method], $parameters);
+        }
+    }
 }

lib/private/Template/TemplateFileLocator.php

Indentation +29 added lines, -29 removed lines

@@ -26,37 +26,37 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $dirs;
-	private $path;
+    protected $dirs;
+    private $path;
 
-	/**
-	 * @param string[] $dirs
-	 */
-	public function __construct($dirs) {
-		$this->dirs = $dirs;
-	}
+    /**
+     * @param string[] $dirs
+     */
+    public function __construct($dirs) {
+        $this->dirs = $dirs;
+    }
 
-	/**
-	 * @param string $template
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function find($template) {
-		if ($template === '') {
-			throw new \InvalidArgumentException('Empty template name');
-		}
+    /**
+     * @param string $template
+     * @return string
+     * @throws \Exception
+     */
+    public function find($template) {
+        if ($template === '') {
+            throw new \InvalidArgumentException('Empty template name');
+        }
 
-		foreach ($this->dirs as $dir) {
-			$file = $dir.$template.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
-		}
-		throw new \Exception('template file not found: template:'.$template);
-	}
+        foreach ($this->dirs as $dir) {
+            $file = $dir.$template.'.php';
+            if (is_file($file)) {
+                $this->path = $dir;
+                return $file;
+            }
+        }
+        throw new \Exception('template file not found: template:'.$template);
+    }
 
-	public function getPath() {
-		return $this->path;
-	}
+    public function getPath() {
+        return $this->path;
+    }
 }