nextcloud / server

apps/user_ldap/lib/Migration/UUIDFixGroup.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
 use OCP\IConfig;
 
 class UUIDFixGroup extends UUIDFix {
-	public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
-		$this->mapper = $mapper;
-		$this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config, 
-			\OC::$server->getNotificationManager(), \OC::$server->getUserSession(),
-			\OC::$server->query('LDAPUserPluginManager'));
-	}
+    public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
+        $this->mapper = $mapper;
+        $this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config, 
+            \OC::$server->getNotificationManager(), \OC::$server->getUserSession(),
+            \OC::$server->query('LDAPUserPluginManager'));
+    }
 }

lib/private/Collaboration/AutoComplete/Manager.php

Indentation +45 added lines, -45 removed lines

@@ -28,54 +28,54 @@
 use OCP\IServerContainer;
 
 class Manager implements IManager {
-	/** @var string[] */
-	protected $sorters =[];
+    /** @var string[] */
+    protected $sorters =[];
 
-	/** @var ISorter[]  */
-	protected $sorterInstances = [];
-	/** @var IServerContainer */
-	private $c;
+    /** @var ISorter[]  */
+    protected $sorterInstances = [];
+    /** @var IServerContainer */
+    private $c;
 
-	public function __construct(IServerContainer $container) {
-		$this->c = $container;
-	}
+    public function __construct(IServerContainer $container) {
+        $this->c = $container;
+    }
 
-	public function runSorters(array $sorters, array &$sortArray, array $context) {
-		$sorterInstances = $this->getSorters();
-		while($sorter = array_shift($sorters)) {
-			if(isset($sorterInstances[$sorter])) {
-				$sorterInstances[$sorter]->sort($sortArray, $context);
-			} else {
-				$this->c->getLogger()->warning('No sorter for ID "{id}", skipping', [
-					'app' => 'core', 'id' => $sorter
-				]);
-			}
-		}
-	}
+    public function runSorters(array $sorters, array &$sortArray, array $context) {
+        $sorterInstances = $this->getSorters();
+        while($sorter = array_shift($sorters)) {
+            if(isset($sorterInstances[$sorter])) {
+                $sorterInstances[$sorter]->sort($sortArray, $context);
+            } else {
+                $this->c->getLogger()->warning('No sorter for ID "{id}", skipping', [
+                    'app' => 'core', 'id' => $sorter
+                ]);
+            }
+        }
+    }
 
-	public function registerSorter($className) {
-		$this->sorters[] = $className;
-	}
+    public function registerSorter($className) {
+        $this->sorters[] = $className;
+    }
 
-	protected function getSorters() {
-		if(count($this->sorterInstances) === 0) {
-			foreach ($this->sorters as $sorter) {
-				/** @var ISorter $instance */
-				$instance = $this->c->resolve($sorter);
-				if(!$instance instanceof ISorter) {
-					$this->c->getLogger()->notice('Skipping sorter which is not an instance of ISorter. Class name: {class}',
-						['app' => 'core', 'class' => $sorter]);
-					continue;
-				}
-				$sorterId = trim($instance->getId());
-				if(trim($sorterId) === '') {
-					$this->c->getLogger()->notice('Skipping sorter with empty ID. Class name: {class}',
-						['app' => 'core', 'class' => $sorter]);
-					continue;
-				}
-				$this->sorterInstances[$sorterId] = $instance;
-			}
-		}
-		return $this->sorterInstances;
-	}
+    protected function getSorters() {
+        if(count($this->sorterInstances) === 0) {
+            foreach ($this->sorters as $sorter) {
+                /** @var ISorter $instance */
+                $instance = $this->c->resolve($sorter);
+                if(!$instance instanceof ISorter) {
+                    $this->c->getLogger()->notice('Skipping sorter which is not an instance of ISorter. Class name: {class}',
+                        ['app' => 'core', 'class' => $sorter]);
+                    continue;
+                }
+                $sorterId = trim($instance->getId());
+                if(trim($sorterId) === '') {
+                    $this->c->getLogger()->notice('Skipping sorter with empty ID. Class name: {class}',
+                        ['app' => 'core', 'class' => $sorter]);
+                    continue;
+                }
+                $this->sorterInstances[$sorterId] = $instance;
+            }
+        }
+        return $this->sorterInstances;
+    }
 }

apps/comments/lib/JSSettingsHelper.php

Indentation +11 added lines, -11 removed lines

@@ -27,19 +27,19 @@
 use OCP\IServerContainer;
 
 class JSSettingsHelper {
-	/** @var IServerContainer */
-	private $c;
+    /** @var IServerContainer */
+    private $c;
 
-	public function __construct(IServerContainer $c) {
-		$this->c = $c;
-	}
+    public function __construct(IServerContainer $c) {
+        $this->c = $c;
+    }
 
-	public function extend(array $settings) {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
+    public function extend(array $settings) {
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
 
-		$value = (int)$this->c->getConfig()->getAppValue('comments', 'maxAutoCompleteResults', 10);
-		$appConfig['comments']['maxAutoCompleteResults'] = $value;
+        $value = (int)$this->c->getConfig()->getAppValue('comments', 'maxAutoCompleteResults', 10);
+        $appConfig['comments']['maxAutoCompleteResults'] = $value;
 
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
+    }
 }

apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php

Indentation +64 added lines, -64 removed lines

@@ -33,78 +33,78 @@
 
 class ShareRecipientSorter implements ISorter {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var Folder */
-	private $rootFolder;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IManager */
+    private $shareManager;
+    /** @var Folder */
+    private $rootFolder;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
-		$this->shareManager = $shareManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
+        $this->shareManager = $shareManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+    }
 
-	public function getId() {
-		return 'share-recipients';
-	}
+    public function getId() {
+        return 'share-recipients';
+    }
 
-	public function sort(array &$sortArray, array $context) {
-		// let's be tolerant. Comments  uses "files" by default, other usages are often singular
-		if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if($user === null) {
-			return;
-		}
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
-		if(count($nodes) === 0) {
-			return;
-		}
-		$al = $this->shareManager->getAccessList($nodes[0]);
+    public function sort(array &$sortArray, array $context) {
+        // let's be tolerant. Comments  uses "files" by default, other usages are often singular
+        if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if($user === null) {
+            return;
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        /** @var Node[] $nodes */
+        $nodes = $userFolder->getById((int)$context['itemId']);
+        if(count($nodes) === 0) {
+            return;
+        }
+        $al = $this->shareManager->getAccessList($nodes[0]);
 
-		foreach ($sortArray as $type => &$byType) {
-			if(!isset($al[$type]) || !is_array($al[$type])) {
-				continue;
-			}
+        foreach ($sortArray as $type => &$byType) {
+            if(!isset($al[$type]) || !is_array($al[$type])) {
+                continue;
+            }
 
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
-				$result = $this->compare($a[1], $b[1], $al[$type]);
-				if($result === 0) {
-					$result = $a[0] - $b[0];
-				}
-				return $result;
-			});
+            usort($workArray, function ($a, $b) use ($al, $type) {
+                $result = $this->compare($a[1], $b[1], $al[$type]);
+                if($result === 0) {
+                    $result = $a[0] - $b[0];
+                }
+                return $result;
+            });
 
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
 
-	/**
-	 * @param array $a
-	 * @param array $b
-	 * @param array $al
-	 * @return int
-	 */
-	protected function compare(array $a, array $b, array $al) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
+    /**
+     * @param array $a
+     * @param array $b
+     * @param array $al
+     * @return int
+     */
+    protected function compare(array $a, array $b, array $al) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+        $valueA = (int)in_array($a, $al, true);
+        $valueB = (int)in_array($b, $al, true);
 
-		return $valueB - $valueA;
-	}
+        return $valueB - $valueA;
+    }
 }

apps/comments/lib/Collaboration/CommentersSorter.php

Indentation +83 added lines, -83 removed lines

@@ -29,87 +29,87 @@
 
 class CommentersSorter implements ISorter {
 
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	public function __construct(ICommentsManager $commentsManager) {
-		$this->commentsManager = $commentsManager;
-	}
-
-	public function getId() {
-		return 'commenters';
-	}
-
-	/**
-	 * Sorts people who commented on the given item atop (descelating) of the
-	 * others
-	 *
-	 * @param array $sortArray
-	 * @param array $context
-	 */
-	public function sort(array &$sortArray, array $context) {
-		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
-		if(count($commenters) === 0) {
-			return;
-		}
-
-		foreach ($sortArray as $type => &$byType) {
-			if(!isset($commenters[$type])) {
-				continue;
-			}
-
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
-
-			usort($workArray, function ($a, $b) use ($commenters, $type) {
-				$r = $this->compare($a[1], $b[1], $commenters[$type]);
-				if($r === 0) {
-					$r = $a[0] - $b[0];
-				}
-				return $r;
-			});
-
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
-
-	/**
-	 * @param $type
-	 * @param $id
-	 * @return array
-	 */
-	protected function retrieveCommentsInformation($type, $id) {
-		$comments = $this->commentsManager->getForObject($type, $id);
-		if(count($comments) === 0) {
-			return [];
-		}
-
-		$actors = [];
-		foreach ($comments as $comment) {
-			if(!isset($actors[$comment->getActorType()])) {
-				$actors[$comment->getActorType()] = [];
-			}
-			if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
-				$actors[$comment->getActorType()][$comment->getActorId()] = 1;
-			} else {
-				$actors[$comment->getActorType()][$comment->getActorId()]++;
-			}
-		}
-		return $actors;
-	}
-
-	protected function compare(array $a, array $b, array $commenters) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
-
-		$valueA = isset($commenters[$a]) ? $commenters[$a] : 0;
-		$valueB = isset($commenters[$b]) ? $commenters[$b] : 0;
-
-		return $valueB - $valueA;
-	}
+    /** @var ICommentsManager */
+    private $commentsManager;
+
+    public function __construct(ICommentsManager $commentsManager) {
+        $this->commentsManager = $commentsManager;
+    }
+
+    public function getId() {
+        return 'commenters';
+    }
+
+    /**
+     * Sorts people who commented on the given item atop (descelating) of the
+     * others
+     *
+     * @param array $sortArray
+     * @param array $context
+     */
+    public function sort(array &$sortArray, array $context) {
+        $commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
+        if(count($commenters) === 0) {
+            return;
+        }
+
+        foreach ($sortArray as $type => &$byType) {
+            if(!isset($commenters[$type])) {
+                continue;
+            }
+
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
+
+            usort($workArray, function ($a, $b) use ($commenters, $type) {
+                $r = $this->compare($a[1], $b[1], $commenters[$type]);
+                if($r === 0) {
+                    $r = $a[0] - $b[0];
+                }
+                return $r;
+            });
+
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
+
+    /**
+     * @param $type
+     * @param $id
+     * @return array
+     */
+    protected function retrieveCommentsInformation($type, $id) {
+        $comments = $this->commentsManager->getForObject($type, $id);
+        if(count($comments) === 0) {
+            return [];
+        }
+
+        $actors = [];
+        foreach ($comments as $comment) {
+            if(!isset($actors[$comment->getActorType()])) {
+                $actors[$comment->getActorType()] = [];
+            }
+            if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
+                $actors[$comment->getActorType()][$comment->getActorId()] = 1;
+            } else {
+                $actors[$comment->getActorType()][$comment->getActorId()]++;
+            }
+        }
+        return $actors;
+    }
+
+    protected function compare(array $a, array $b, array $commenters) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
+
+        $valueA = isset($commenters[$a]) ? $commenters[$a] : 0;
+        $valueB = isset($commenters[$b]) ? $commenters[$b] : 0;
+
+        return $valueB - $valueA;
+    }
 }

lib/public/Calendar/ICalendar.php

Indentation +33 added lines, -33 removed lines

@@ -31,41 +31,41 @@
  */
 interface ICalendar {
 
-	/**
-	 * @return string defining the technical unique key
-	 * @since 13.0.0
-	 */
-	public function getKey();
+    /**
+     * @return string defining the technical unique key
+     * @since 13.0.0
+     */
+    public function getKey();
 
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * Calendar color
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayColor();
+    /**
+     * Calendar color
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayColor();
 
-	/**
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null);
+    /**
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null);
 
-	/**
-	 * @return integer build up using \OCP\Constants
-	 * @since 13.0.0
-	 */
-	public function getPermissions();
+    /**
+     * @return integer build up using \OCP\Constants
+     * @since 13.0.0
+     */
+    public function getPermissions();
 }

lib/private/DB/OracleMigrator.php

Indentation +189 added lines, -189 removed lines

@@ -34,194 +34,194 @@
 
 class OracleMigrator extends Migrator {
 
-	/**
-	 * Quote a column's name but changing the name requires recreating
-	 * the column instance and copying over all properties.
-	 *
-	 * @param Column $column old column
-	 * @return Column new column instance with new name
-	 */
-	protected function quoteColumn(Column $column) {
-		$newColumn = new Column(
-			$this->connection->quoteIdentifier($column->getName()),
-			$column->getType()
-		);
-		$newColumn->setAutoincrement($column->getAutoincrement());
-		$newColumn->setColumnDefinition($column->getColumnDefinition());
-		$newColumn->setComment($column->getComment());
-		$newColumn->setDefault($column->getDefault());
-		$newColumn->setFixed($column->getFixed());
-		$newColumn->setLength($column->getLength());
-		$newColumn->setNotnull($column->getNotnull());
-		$newColumn->setPrecision($column->getPrecision());
-		$newColumn->setScale($column->getScale());
-		$newColumn->setUnsigned($column->getUnsigned());
-		$newColumn->setPlatformOptions($column->getPlatformOptions());
-		$newColumn->setCustomSchemaOptions($column->getPlatformOptions());
-		return $newColumn;
-	}
-
-	/**
-	 * Quote an index's name but changing the name requires recreating
-	 * the index instance and copying over all properties.
-	 *
-	 * @param Index $index old index
-	 * @return Index new index instance with new name
-	 */
-	protected function quoteIndex($index) {
-		return new Index(
-		//TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
-			$index->getName(),
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $index->getColumns()),
-			$index->isUnique(),
-			$index->isPrimary(),
-			$index->getFlags(),
-			$index->getOptions()
-		);
-	}
-
-	/**
-	 * Quote an ForeignKeyConstraint's name but changing the name requires recreating
-	 * the ForeignKeyConstraint instance and copying over all properties.
-	 *
-	 * @param ForeignKeyConstraint $fkc old fkc
-	 * @return ForeignKeyConstraint new fkc instance with new name
-	 */
-	protected function quoteForeignKeyConstraint($fkc) {
-		return new ForeignKeyConstraint(
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getLocalColumns()),
-			$this->connection->quoteIdentifier($fkc->getForeignTableName()),
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getForeignColumns()),
-			$fkc->getName(),
-			$fkc->getOptions()
-		);
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 * @throws DBALException
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
-
-		// oracle forces us to quote the identifiers
-		$schemaDiff->newTables = array_map(function(Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				array_map(function(Column $column) {
-					return $this->quoteColumn($column);
-				}, $table->getColumns()),
-				array_map(function(Index $index) {
-					return $this->quoteIndex($index);
-				}, $table->getIndexes()),
-				array_map(function(ForeignKeyConstraint $fck) {
-					return $this->quoteForeignKeyConstraint($fck);
-				}, $table->getForeignKeys()),
-				0,
-				$table->getOptions()
-			);
-		}, $schemaDiff->newTables);
-
-		$schemaDiff->removedTables = array_map(function(Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				$table->getColumns(),
-				$table->getIndexes(),
-				$table->getForeignKeys(),
-				0,
-				$table->getOptions()
-			);
-		}, $schemaDiff->removedTables);
-
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-
-			$tableDiff->addedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->addedColumns);
-
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-				// auto increment is not relevant for oracle and can anyhow not be applied on change
-				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
-			}
-			// remove columns that no longer have changed (because autoincrement and unsigned are not supported)
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
-				return count($column->changedProperties) > 0;
-			});
-
-			$tableDiff->removedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->removedColumns);
-
-			$tableDiff->renamedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->renamedColumns);
-
-			$tableDiff->addedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->addedIndexes);
-
-			$tableDiff->changedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->changedIndexes);
-
-			$tableDiff->removedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->removedIndexes);
-
-			$tableDiff->renamedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->renamedIndexes);
-
-			$tableDiff->addedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->addedForeignKeys);
-
-			$tableDiff->changedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->changedForeignKeys);
-
-			$tableDiff->removedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->removedForeignKeys);
-		}
-
-		return $schemaDiff;
-	}
-
-	/**
-	 * @param string $name
-	 * @return string
-	 */
-	protected function generateTemporaryTableName($name) {
-		return 'oc_' . uniqid();
-	}
-
-	/**
-	 * @param $statement
-	 * @return string
-	 */
-	protected function convertStatementToScript($statement) {
-		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
-		}
-		$script = $statement . ';';
-		$script .= PHP_EOL;
-		$script .= PHP_EOL;
-		return $script;
-	}
-
-	protected function getFilterExpression() {
-		return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-	}
+    /**
+     * Quote a column's name but changing the name requires recreating
+     * the column instance and copying over all properties.
+     *
+     * @param Column $column old column
+     * @return Column new column instance with new name
+     */
+    protected function quoteColumn(Column $column) {
+        $newColumn = new Column(
+            $this->connection->quoteIdentifier($column->getName()),
+            $column->getType()
+        );
+        $newColumn->setAutoincrement($column->getAutoincrement());
+        $newColumn->setColumnDefinition($column->getColumnDefinition());
+        $newColumn->setComment($column->getComment());
+        $newColumn->setDefault($column->getDefault());
+        $newColumn->setFixed($column->getFixed());
+        $newColumn->setLength($column->getLength());
+        $newColumn->setNotnull($column->getNotnull());
+        $newColumn->setPrecision($column->getPrecision());
+        $newColumn->setScale($column->getScale());
+        $newColumn->setUnsigned($column->getUnsigned());
+        $newColumn->setPlatformOptions($column->getPlatformOptions());
+        $newColumn->setCustomSchemaOptions($column->getPlatformOptions());
+        return $newColumn;
+    }
+
+    /**
+     * Quote an index's name but changing the name requires recreating
+     * the index instance and copying over all properties.
+     *
+     * @param Index $index old index
+     * @return Index new index instance with new name
+     */
+    protected function quoteIndex($index) {
+        return new Index(
+        //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
+            $index->getName(),
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $index->getColumns()),
+            $index->isUnique(),
+            $index->isPrimary(),
+            $index->getFlags(),
+            $index->getOptions()
+        );
+    }
+
+    /**
+     * Quote an ForeignKeyConstraint's name but changing the name requires recreating
+     * the ForeignKeyConstraint instance and copying over all properties.
+     *
+     * @param ForeignKeyConstraint $fkc old fkc
+     * @return ForeignKeyConstraint new fkc instance with new name
+     */
+    protected function quoteForeignKeyConstraint($fkc) {
+        return new ForeignKeyConstraint(
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getLocalColumns()),
+            $this->connection->quoteIdentifier($fkc->getForeignTableName()),
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getForeignColumns()),
+            $fkc->getName(),
+            $fkc->getOptions()
+        );
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     * @throws DBALException
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
+
+        // oracle forces us to quote the identifiers
+        $schemaDiff->newTables = array_map(function(Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                array_map(function(Column $column) {
+                    return $this->quoteColumn($column);
+                }, $table->getColumns()),
+                array_map(function(Index $index) {
+                    return $this->quoteIndex($index);
+                }, $table->getIndexes()),
+                array_map(function(ForeignKeyConstraint $fck) {
+                    return $this->quoteForeignKeyConstraint($fck);
+                }, $table->getForeignKeys()),
+                0,
+                $table->getOptions()
+            );
+        }, $schemaDiff->newTables);
+
+        $schemaDiff->removedTables = array_map(function(Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                $table->getColumns(),
+                $table->getIndexes(),
+                $table->getForeignKeys(),
+                0,
+                $table->getOptions()
+            );
+        }, $schemaDiff->removedTables);
+
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+
+            $tableDiff->addedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->addedColumns);
+
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+                // auto increment is not relevant for oracle and can anyhow not be applied on change
+                $column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
+            }
+            // remove columns that no longer have changed (because autoincrement and unsigned are not supported)
+            $tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+                return count($column->changedProperties) > 0;
+            });
+
+            $tableDiff->removedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->removedColumns);
+
+            $tableDiff->renamedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->renamedColumns);
+
+            $tableDiff->addedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->addedIndexes);
+
+            $tableDiff->changedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->changedIndexes);
+
+            $tableDiff->removedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->removedIndexes);
+
+            $tableDiff->renamedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->renamedIndexes);
+
+            $tableDiff->addedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->addedForeignKeys);
+
+            $tableDiff->changedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->changedForeignKeys);
+
+            $tableDiff->removedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->removedForeignKeys);
+        }
+
+        return $schemaDiff;
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     */
+    protected function generateTemporaryTableName($name) {
+        return 'oc_' . uniqid();
+    }
+
+    /**
+     * @param $statement
+     * @return string
+     */
+    protected function convertStatementToScript($statement) {
+        if (substr($statement, -1) === ';') {
+            return $statement . PHP_EOL . '/' . PHP_EOL;
+        }
+        $script = $statement . ';';
+        $script .= PHP_EOL;
+        $script .= PHP_EOL;
+        return $script;
+    }
+
+    protected function getFilterExpression() {
+        return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+    }
 
 }

lib/private/DB/MDB2SchemaManager.php

Indentation +121 added lines, -121 removed lines

@@ -37,136 +37,136 @@
 use OCP\IDBConnection;
 
 class MDB2SchemaManager {
-	/** @var \OC\DB\Connection $conn */
-	protected $conn;
+    /** @var \OC\DB\Connection $conn */
+    protected $conn;
 
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct($conn) {
+        $this->conn = $conn;
+    }
 
-	/**
-	 * saves database scheme to xml file
-	 * @param string $file name of file
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function getDbStructure($file) {
-		return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
-	}
+    /**
+     * saves database scheme to xml file
+     * @param string $file name of file
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function getDbStructure($file) {
+        return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
+    }
 
-	/**
-	 * Creates tables from XML file
-	 * @param string $file file to read structure from
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function createDbFromStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		return $this->executeSchemaChange($toSchema);
-	}
+    /**
+     * Creates tables from XML file
+     * @param string $file file to read structure from
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function createDbFromStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        return $this->executeSchemaChange($toSchema);
+    }
 
-	/**
-	 * @return \OC\DB\Migrator
-	 */
-	public function getMigrator() {
-		$random = \OC::$server->getSecureRandom();
-		$platform = $this->conn->getDatabasePlatform();
-		$config = \OC::$server->getConfig();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		if ($platform instanceof SqlitePlatform) {
-			return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof MySqlPlatform) {
-			return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof PostgreSqlPlatform) {
-			return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
-		} else {
-			return new Migrator($this->conn, $random, $config, $dispatcher);
-		}
-	}
+    /**
+     * @return \OC\DB\Migrator
+     */
+    public function getMigrator() {
+        $random = \OC::$server->getSecureRandom();
+        $platform = $this->conn->getDatabasePlatform();
+        $config = \OC::$server->getConfig();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        if ($platform instanceof SqlitePlatform) {
+            return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof MySqlPlatform) {
+            return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof PostgreSqlPlatform) {
+            return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
+        } else {
+            return new Migrator($this->conn, $random, $config, $dispatcher);
+        }
+    }
 
-	/**
-	 * Reads database schema from file
-	 *
-	 * @param string $file file to read from
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	private function readSchemaFromFile($file) {
-		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		return $schemaReader->loadSchemaFromFile($file, $toSchema);
-	}
+    /**
+     * Reads database schema from file
+     *
+     * @param string $file file to read from
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    private function readSchemaFromFile($file) {
+        $platform = $this->conn->getDatabasePlatform();
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        return $schemaReader->loadSchemaFromFile($file, $toSchema);
+    }
 
-	/**
-	 * update the database scheme
-	 * @param string $file file to read structure from
-	 * @param bool $generateSql only return the sql needed for the upgrade
-	 * @return string|boolean
-	 */
-	public function updateDbFromStructure($file, $generateSql = false) {
-		$toSchema = $this->readSchemaFromFile($file);
-		$migrator = $this->getMigrator();
+    /**
+     * update the database scheme
+     * @param string $file file to read structure from
+     * @param bool $generateSql only return the sql needed for the upgrade
+     * @return string|boolean
+     */
+    public function updateDbFromStructure($file, $generateSql = false) {
+        $toSchema = $this->readSchemaFromFile($file);
+        $migrator = $this->getMigrator();
 
-		if ($generateSql) {
-			return $migrator->generateChangeScript($toSchema);
-		} else {
-			$migrator->migrate($toSchema);
-			return true;
-		}
-	}
+        if ($generateSql) {
+            return $migrator->generateChangeScript($toSchema);
+        } else {
+            $migrator->migrate($toSchema);
+            return true;
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @return string
-	 */
-	public function generateChangeScript($schema) {
-		$migrator = $this->getMigrator();
-		return $migrator->generateChangeScript($schema);
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @return string
+     */
+    public function generateChangeScript($schema) {
+        $migrator = $this->getMigrator();
+        return $migrator->generateChangeScript($schema);
+    }
 
-	/**
-	 * remove all tables defined in a database structure xml file
-	 *
-	 * @param string $file the xml file describing the tables
-	 */
-	public function removeDBStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		$toSchema = clone $fromSchema;
-		/** @var $table \Doctrine\DBAL\Schema\Table */
-		foreach ($toSchema->getTables() as $table) {
-			$toSchema->dropTable($table->getName());
-		}
-		$comparator = new \Doctrine\DBAL\Schema\Comparator();
-		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
-		$this->executeSchemaChange($schemaDiff);
-	}
+    /**
+     * remove all tables defined in a database structure xml file
+     *
+     * @param string $file the xml file describing the tables
+     */
+    public function removeDBStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        $toSchema = clone $fromSchema;
+        /** @var $table \Doctrine\DBAL\Schema\Table */
+        foreach ($toSchema->getTables() as $table) {
+            $toSchema->dropTable($table->getName());
+        }
+        $comparator = new \Doctrine\DBAL\Schema\Comparator();
+        $schemaDiff = $comparator->compare($fromSchema, $toSchema);
+        $this->executeSchemaChange($schemaDiff);
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
-	 * @return bool
-	 */
-	private function executeSchemaChange($schema) {
-		$this->conn->beginTransaction();
-		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
-			$this->conn->query($sql);
-		}
-		$this->conn->commit();
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
+     * @return bool
+     */
+    private function executeSchemaChange($schema) {
+        $this->conn->beginTransaction();
+        foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
+            $this->conn->query($sql);
+        }
+        $this->conn->commit();
 
-		if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
-			$this->conn->close();
-			$this->conn->connect();
-		}
-		return true;
-	}
+        if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
+            $this->conn->close();
+            $this->conn->connect();
+        }
+        return true;
+    }
 }

core/Controller/WalledGardenController.php

Indentation +11 added lines, -11 removed lines

@@ -28,15 +28,15 @@
 
 class WalledGardenController extends Controller {
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return Response
-	 */
-	function get() {
-		$resp = new Response();
-		$resp->setStatus(Http::STATUS_NO_CONTENT);
-		return $resp;
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    function get() {
+        $resp = new Response();
+        $resp->setStatus(Http::STATUS_NO_CONTENT);
+        return $resp;
+    }
 }