Merge pull request #578 from Mou-Ikkai/0.7.x

Dependency update.

app/workers/audits.php

@@ -14,7 +14,7 @@ class AuditsV1
 {
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -39,7 +39,7 @@ class AuditsV1
         $audit->log($userId, $event, $resource, $userAgent, $ip, '', $data);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/certificates.php

@@ -20,7 +20,7 @@ class CertificatesV1
 {
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -199,7 +199,7 @@ class CertificatesV1
         Authorization::reset();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/deletes.php

@@ -17,7 +17,7 @@ class DeletesV1
 {
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -39,7 +39,7 @@ class DeletesV1
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/functions.php

@@ -99,7 +99,7 @@ class FunctionsV1
 {
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -354,7 +354,7 @@ class FunctionsV1
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 }

app/workers/mails.php

@@ -15,7 +15,7 @@ class MailsV1
      */
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -63,7 +63,7 @@ class MailsV1
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/tasks.php

@@ -22,7 +22,7 @@ class TasksV1
      */
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -205,7 +205,7 @@ class TasksV1
         return true;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/usage.php

@@ -16,7 +16,7 @@ class UsageV1
      */
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -59,7 +59,7 @@ class UsageV1
         $statsd->count('storage.all'.$tags, $storage);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

app/workers/webhooks.php

@@ -18,7 +18,7 @@ class WebhooksV1
 {
     public $args = [];
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
@@ -106,7 +106,7 @@ class WebhooksV1
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // ... Remove environment for this job
     }

composer.json

@@ -37,25 +37,25 @@
         "utopia-php/abuse": "0.2.*",
         "utopia-php/audit": "0.3.*",
         "utopia-php/cache": "0.2.*",
-        "utopia-php/cli": "0.6.2",
+        "utopia-php/cli": "0.7.1",
         "utopia-php/config": "0.2.*",
         "utopia-php/locale": "0.3.*",
         "utopia-php/registry": "0.2.*",
-        "utopia-php/domains": "0.2.*",
+        "utopia-php/domains": "1.1.*",
 
         "resque/php-resque": "1.3.6",
-        "geoip2/geoip2": "2.9.0",
-        "piwik/device-detector": "3.5.1",
-        "dragonmantank/cron-expression": "2.2.0",
-        "domnikl/statsd": "2.0.*",
+        "geoip2/geoip2": "2.10.0",
+        "piwik/device-detector": "3.13.0",
+        "dragonmantank/cron-expression": "3.0.1",
+        "domnikl/statsd": "3.0.*",
         "influxdb/influxdb-php": "1.15.*",
-        "bacon/bacon-qr-code": "2.0.0",
-        "phpmailer/phpmailer": "6.1.6"
+        "bacon/bacon-qr-code": "2.0.2",
+        "phpmailer/phpmailer": "6.1.7"
     },
     "require-dev": {
-        "swoole/ide-helper": "4.5.2",
+        "swoole/ide-helper": "4.5.4",
         "appwrite/sdk-generator": "master",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.3"
     },
     "repositories": [
         {

package-lock.json

@@ -8484,9 +8484,9 @@
       }
     },
     "yargs-parser": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz",
-      "integrity": "sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==",
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A==",
       "dev": true
     }
   }

package.json

@@ -4,7 +4,7 @@
   "license": "BSD-3-Clause",
   "repository": "public",
   "devDependencies": {
-    "yargs-parser": ">=13.1.2",
+    "yargs-parser": ">=20.2.0",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",

tests/unit/Auth/AuthTest.php

@@ -8,11 +8,11 @@ use PHPUnit\Framework\TestCase;
 
 class AuthTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -118,4 +118,4 @@ class AuthTest extends TestCase
         $this->assertEquals(Auth::tokenVerify($tokens3, Auth::TOKEN_TYPE_LOGIN, $secret), false);
         $this->assertEquals(Auth::tokenVerify($tokens3, Auth::TOKEN_TYPE_LOGIN, 'false-secret'), false);
     }
-}
+}

tests/unit/Auth/Validator/PasswordTest.php

@@ -12,12 +12,12 @@ class PasswordTestTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Password();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -36,4 +36,4 @@ class PasswordTestTest extends TestCase
         $this->assertEquals($this->object->isValid('WUnOZcn0piQMN8Mh31xw4KQPF0gcNGVA'), true);
         $this->assertEquals($this->object->isValid('WUnOZcn0piQMN8Mh31xw4KQPF0gcNGVAx'), false);
     }
-}
+}

tests/unit/Database/Validator/KeyTest.php

@@ -12,12 +12,12 @@ class KeyTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Key();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -33,4 +33,4 @@ class KeyTest extends TestCase
         $this->assertEquals($this->object->isValid('socialAccountForYoutubeSubscribe'), true);
         $this->assertEquals($this->object->isValid('socialAccountForYoutubeSubscrib'), true);
     }
-}
+}

tests/unit/Database/Validator/UIDTest.php

@@ -12,12 +12,12 @@ class UIDTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new UID();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -27,4 +27,4 @@ class UIDTest extends TestCase
         $this->assertEquals($this->object->isValid('5f058a89258075f058a89258075f058t'), true);
         $this->assertEquals($this->object->isValid('5f058a89258075f058a89258075f058tx'), false);
     }
-}
+}

tests/unit/Docker/ComposeTest.php

@@ -14,7 +14,7 @@ class ComposeTest extends TestCase
     protected $object = null;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         $data = @file_get_contents(__DIR__.'/../../resources/docker/docker-compose.yml');
 
@@ -25,7 +25,7 @@ class ComposeTest extends TestCase
         $this->object = new Compose($data);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -56,4 +56,4 @@ class ComposeTest extends TestCase
         $this->assertEquals('appwrite-redis', $this->object->getVolumes()[1]);
         $this->assertEquals('appwrite-cache', $this->object->getVolumes()[2]);
     }
-}
+}

tests/unit/Docker/EnvTest.php

@@ -14,7 +14,7 @@ class EnvTest extends TestCase
     protected $object = null;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         $data = @file_get_contents(__DIR__.'/../../resources/docker/.env');
 
@@ -25,7 +25,7 @@ class EnvTest extends TestCase
         $this->object = new Env($data);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -46,4 +46,4 @@ _APP_Y=value2
 _APP_Z=value3
 ", $this->object->export());
     }
-}
+}

tests/unit/Event/EventTest.php

@@ -18,7 +18,7 @@ class EventTest extends TestCase
      */
     protected $queue = '';
 
-    public function setUp()
+    public function setUp(): void
     {
         $redisHost = App::getEnv('_APP_REDIS_HOST', '');
         $redisPort = App::getEnv('_APP_REDIS_PORT', '');
@@ -28,7 +28,7 @@ class EventTest extends TestCase
         $this->object = new Event($this->queue, 'TestsV1');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -63,4 +63,4 @@ class EventTest extends TestCase
         $this->assertEquals(null, $this->object->getParam('key2'));
         $this->assertEquals(null, $this->object->getParam('key3'));
     }
-}
+}

tests/unit/Network/Validators/CNAMETest.php

@@ -12,12 +12,12 @@ class CNAMETest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new CNAME('appwrite.io');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -31,4 +31,4 @@ class CNAMETest extends TestCase
         $this->assertEquals($this->object->isValid('test1.appwrite.org'), false);
         $this->assertEquals($this->object->isValid('test1.appwrite.org'), false);
     }
-}
+}

tests/unit/Network/Validators/DomainTest.php

@@ -12,12 +12,12 @@ class DomainTest extends TestCase
      */
     protected $domain = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->domain = new Domain();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->domain = null;
     }
@@ -43,4 +43,4 @@ class DomainTest extends TestCase
         $this->assertEquals(false, $this->domain->isValid(1));
         $this->assertEquals(false, $this->domain->isValid(1.2));
     }
-}
+}

tests/unit/OpenSSL/OpenSSLTest.php

@@ -7,11 +7,11 @@ use PHPUnit\Framework\TestCase;
 
 class OpenSSLTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -27,4 +27,4 @@ class OpenSSLTest extends TestCase
 
         $this->assertEquals(OpenSSL::decrypt($data, $method, $key, 0, $iv, $tag), $secret);
     }
-}
+}

tests/unit/Resize/ResizeTest.php

@@ -7,11 +7,11 @@ use PHPUnit\Framework\TestCase;
 
 class ResizeTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -167,4 +167,4 @@ class ResizeTest extends TestCase
         $this->assertEquals('GIF', $image->getImageFormat());
         \unlink($target);
     }
-}
+}

tests/unit/Storage/Compression/Algorithms/GZIPTest.php

@@ -12,12 +12,12 @@ class GZIPTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new GZIP();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -77,4 +77,4 @@ class GZIPTest extends TestCase
         
         $this->assertEquals($dataSize, 3038056);
     }
-}
+}

tests/unit/Storage/Device/LocalTest.php

@@ -12,12 +12,12 @@ class LocalTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Local(realpath(__DIR__ . '/../../../resources/disk-a'));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -120,4 +120,4 @@ class LocalTest extends TestCase
     {
         $this->assertGreaterThan(0, $this->object->getPartitionTotalSpace());
     }
-}
+}

tests/unit/Storage/StorageTest.php

@@ -12,11 +12,11 @@ Storage::setDevice('disk-b', new Local(__DIR__ . '/../../resources/disk-b'));
 
 class StorageTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -39,4 +39,4 @@ class StorageTest extends TestCase
         $this->assertEquals(Storage::exists('disk-b'), true);
         $this->assertEquals(Storage::exists('disk-c'), false);
     }
-}
+}

tests/unit/Storage/Validator/FileNameTest.php

@@ -12,12 +12,12 @@ class FileNameTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new FileName();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -30,4 +30,4 @@ class FileNameTest extends TestCase
         $this->assertEquals($this->object->isValid('test.png'), true);
         $this->assertEquals($this->object->isValid('test'), true);
     }
-}
+}

tests/unit/Storage/Validator/FileSizeTest.php

@@ -12,12 +12,12 @@ class FileSizeTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new FileSize(1000);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -27,4 +27,4 @@ class FileSizeTest extends TestCase
         $this->assertEquals($this->object->isValid(1000), true);
         $this->assertEquals($this->object->isValid(999), true);
     }
-}
+}

tests/unit/Storage/Validator/FileTypeTest.php

@@ -12,12 +12,12 @@ class FileTypeTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new FileType([FileType::FILE_TYPE_JPEG]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -28,4 +28,4 @@ class FileTypeTest extends TestCase
         $this->assertEquals($this->object->isValid(__DIR__ . '/../../../resources/disk-b/kitten-1.png'), false);
         $this->assertEquals($this->object->isValid(__DIR__ . '/../../../resources/disk-b/kitten-2.png'), false);
     }
-}
+}

tests/unit/Storage/Validator/UploadTest.php

@@ -12,12 +12,12 @@ class UploadTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Upload();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -29,4 +29,4 @@ class UploadTest extends TestCase
         $this->assertEquals($this->object->isValid(__DIR__ . '/../../../resources/disk-b/kitten-2.png'), false);
         $this->assertEquals($this->object->isValid(__FILE__), false);
     }
-}
+}

tests/unit/Task/Validator/CronTest.php

@@ -12,12 +12,12 @@ class CronTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Cron();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -37,4 +37,4 @@ class CronTest extends TestCase
         $this->assertEquals(null, false);
         $this->assertEquals('', false);
     }
-}
+}

tests/unit/Template/TemplateTest.php

@@ -12,7 +12,7 @@ class TemplateTest extends TestCase
      */
     protected $object = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->object = new Template(__DIR__.'/../../resources/template.tpl');
         $this->object
@@ -20,7 +20,7 @@ class TemplateTest extends TestCase
         ;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
@@ -65,4 +65,4 @@ class TemplateTest extends TestCase
         $this->assertEquals('app-write', Template::fromCamelCaseToDash('appWrite'));
         $this->assertEquals('app-write', Template::fromCamelCaseToDash('App Write'));
     }
-}
+}