Merge pull request #304 from nextcloud/bugfix/noid/compat-friendica

Compat friendica
nextcloud · Jan 4, 2019 · 42f482f · 42f482f
2 parents 3051f69 + 89cd8fa
commit 42f482f
Show file tree

Hide file tree

Showing 7 changed files with 449 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -11,9 +11,15 @@
   ],
   "require": {
     "daita/my-small-php-tools": "dev-master",
-    "digitalbazaar/json-ld": "0.4.7"
+    "friendica/json-ld": "^1.0"
   },
   "require-dev": {
     "jakub-onderka/php-parallel-lint": "^1.0"
-  }
+  },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://git.friendi.ca/friendica/php-json-ld"
+    }
+  ]
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Migration/Version0001Date20190103000001.php b/lib/Migration/Version0001Date20190103000001.php
@@ -0,0 +1,118 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCA\Social\Db\CoreRequestBuilder;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20190103000001
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20190103000001 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/** @var array */
+	public static $editToChar2000 = [
+		[CoreRequestBuilder::TABLE_CACHE_ACTORS, 'public_key']
+	];
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		foreach (self::$editToChar2000 as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field . '_copy')) {
+				continue;
+			}
+
+			$table->addColumn($field . '_copy', Type::TEXT, ['notnull' => false]);
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+
+		foreach (self::$editToChar2000 as $edit) {
+			list($tableName, $field) = $edit;
+
+			$qb = $this->connection->getQueryBuilder();
+			$qb->update($tableName)
+			   ->set($field . '_copy', $field)
+			   ->execute();
+		}
+	}
+
+}
+
diff --git a/lib/Migration/Version0001Date20190103000002.php b/lib/Migration/Version0001Date20190103000002.php
@@ -0,0 +1,75 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\Schema\SchemaException;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20190103000002
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20190103000002 extends SimpleMigrationStep {
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		foreach (Version0001Date20190103000001::$editToChar2000 as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field) && $table->hasColumn($field . '_copy')) {
+				$table->dropColumn($field);
+			}
+		}
+
+		return $schema;
+	}
+
+}
+
diff --git a/lib/Migration/Version0001Date20190103000003.php b/lib/Migration/Version0001Date20190103000003.php
@@ -0,0 +1,111 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20190103000003
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20190103000003 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		foreach (Version0001Date20190103000001::$editToChar2000 as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field)) {
+				continue;
+			}
+
+			$table->addColumn($field, Type::STRING, ['notnull' => false, 'length' => 2000]);
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+
+		foreach (Version0001Date20190103000001::$editToChar2000 as $edit) {
+			list($table, $field) = $edit;
+
+			$qb = $this->connection->getQueryBuilder();
+			$qb->update($table)
+			   ->set($field, $field . '_copy')
+			   ->execute();
+		}
+	}
+
+}
+