Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'appwrite:master' into master

Browse source
This commit is contained in:
JB Leiknes 2021-10-14 21:52:11 +02:00 committed by GitHub
commit 06f2e1cdf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -395,7 +395,7 @@ Pull requests are great, but there are many other areas where you can help Appwr
### Blogging & Speaking ### Blogging & Speaking
Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or email team [at] appwrite [dot] io so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub. Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
### Presenting at Meetups ### Presenting at Meetups

18
src/Appwrite/Migration/Migration.php
View file

@ -98,7 +98,6 @@ abstract class Migration
Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum()); Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum());
\Co\run(function () use ($all, $callback) { \Co\run(function () use ($all, $callback) {
foreach ($all as $document) { foreach ($all as $document) {
go(function () use ($document, $callback) { go(function () use ($document, $callback) {
if (empty($document->getId()) || empty($document->getCollection())) { if (empty($document->getId()) || empty($document->getCollection())) {
@ -131,24 +130,23 @@ abstract class Migration
} }
} }
public function check_diff_multi($array1, $array2){ public function check_diff_multi($array1, $array2)
{
$result = array(); $result = array();
foreach($array1 as $key => $val) { foreach ($array1 as $key => $val) {
if(is_array($val) && isset($array2[$key])) { if (is_array($val) && isset($array2[$key])) {
$tmp = $this->check_diff_multi($val, $array2[$key]); $tmp = $this->check_diff_multi($val, $array2[$key]);
if($tmp) { if ($tmp) {
$result[$key] = $tmp; $result[$key] = $tmp;
} }
} } elseif (!isset($array2[$key])) {
elseif(!isset($array2[$key])) {
$result[$key] = null; $result[$key] = null;
} } elseif ($val !== $array2[$key]) {
elseif($val !== $array2[$key]) {
$result[$key] = $array2[$key]; $result[$key] = $array2[$key];
} }
if(isset($array2[$key])) { if (isset($array2[$key])) {
unset($array2[$key]); unset($array2[$key]);
} }
} }

4
src/Appwrite/Migration/Version/V06.php
View file

@ -2,7 +2,6 @@
namespace Appwrite\Migration\Version; namespace Appwrite\Migration\Version;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Appwrite\Database\Database; use Appwrite\Database\Database;
@ -35,8 +34,7 @@ class V06 extends Migration
case Database::SYSTEM_COLLECTION_KEYS: case Database::SYSTEM_COLLECTION_KEYS:
if ($document->getAttribute('secret', null)) { if ($document->getAttribute('secret', null)) {
$json = \json_decode($document->getAttribute('secret'), true); $json = \json_decode($document->getAttribute('secret'), true);
if (is_array($json)) if (is_array($json)) {
{
Console::log('Secret already encrypted. Skipped: ' . $document->getId()); Console::log('Secret already encrypted. Skipped: ' . $document->getId());
break; break;
} }