Bugs fixed

- Updated qrcode to v4.2
- Removed baconqrcode from composer
- Removed comments
- Fixed some indents
- Fixed the QR endpoint

app/controllers/api/avatars.php

@@ -11,15 +11,10 @@ use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
 use Appwrite\Resize\Resize;
 use Appwrite\URL\URL as URLParse;
-/* use BaconQrCode\Renderer\ImageRenderer;
-use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
-use BaconQrCode\Renderer\RendererStyle\RendererStyle;
-use BaconQrCode\Writer; */
 use Utopia\Config\Config;
 use Utopia\Validator\HexColor;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-/* use SebastianBergmann\CodeCoverage\Report\Html\Renderer; */
 
 $avatarCallback = function ($type, $code, $width, $height, $quality, $response) {
     /** @var Utopia\Response $response */
@@ -60,8 +55,7 @@ $avatarCallback = function ($type, $code, $width, $height, $quality, $response)
             ->setContentType('image/png')
             ->addHeader('Expires', $date)
             ->addHeader('X-Appwrite-Cache', 'hit')
-            ->send($data)
+            ->send($data);
-        ;
     }
 
     $resize = new Resize(\file_get_contents($path));
@@ -78,8 +72,7 @@ $avatarCallback = function ($type, $code, $width, $height, $quality, $response)
         ->setContentType('image/png')
         ->addHeader('Expires', $date)
         ->addHeader('X-Appwrite-Cache', 'miss')
-        ->send($data, null);
+        ->send($data, null);;
-    ;
 
     unset($resize);
 };
@@ -163,8 +156,7 @@ App::get('/v1/avatars/image')
                 ->setContentType('image/png')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'hit')
-                ->send($data)
+                ->send($data);
-            ;
         }
 
         if (!\extension_loaded('imagick')) {
@@ -195,8 +187,7 @@ App::get('/v1/avatars/image')
             ->setContentType('image/png')
             ->addHeader('Expires', $date)
             ->addHeader('X-Appwrite-Cache', 'miss')
-            ->send($data);
+            ->send($data);;
-        ;
 
         unset($resize);
     }, ['response']);
@@ -229,8 +220,7 @@ App::get('/v1/avatars/favicon')
                 ->setContentType('image/png')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'hit')
-                ->send($data)
+                ->send($data);
-            ;
         }
 
         if (!\extension_loaded('imagick')) {
@@ -244,7 +234,8 @@ App::get('/v1/avatars/favicon')
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 3,
             CURLOPT_URL => $url,
-            CURLOPT_USERAGENT => \sprintf(APP_USERAGENT,
+            CURLOPT_USERAGENT => \sprintf(
+                APP_USERAGENT,
                 App::getEnv('_APP_VERSION', 'UNKNOWN'),
                 App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
             ),
@@ -322,8 +313,7 @@ App::get('/v1/avatars/favicon')
                 ->setContentType('image/x-icon')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'miss')
-                ->send($data)
+                ->send($data);
-            ;
         }
 
         $fetch = @\file_get_contents($outputHref, false);
@@ -368,19 +358,12 @@ App::get('/v1/avatars/qr')
         /** @var Utopia\Response $response */
 
         $download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
-
-       /*  $renderer = new ImageRenderer(
-            new RendererStyle($size, $margin),
-            new ImagickImageBackEnd('png', 100)
-        ); */
         $qropts = new QROptions([
             'quietzone'         => $size
         ]);
         $qrcode = new QRCode($qropts);
         $qrcode->render($text);
 
-        /* $writer = new Writer($renderer); */
-
         if ($download) {
             $response->addHeader('Content-Disposition', 'attachment; filename="qr.png"');
         }
@@ -388,8 +371,7 @@ App::get('/v1/avatars/qr')
         $response
             ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
             ->setContentType('image/png')
-            /* ->send($writer->writeString($text)) */
+            ->send($qrcode->render($text));
-        ;
     }, ['response']);
 
 App::get('/v1/avatars/initials')
@@ -466,6 +448,5 @@ App::get('/v1/avatars/initials')
         $response
             ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
             ->setContentType('image/png')
-            ->send($image->getImageBlob())
+            ->send($image->getImageBlob());
-        ;
     }, ['response', 'user']);

composer.json

@@ -49,9 +49,8 @@
         "dragonmantank/cron-expression": "3.0.1",
         "domnikl/statsd": "3.0.*",
         "influxdb/influxdb-php": "1.15.*",
-        "bacon/bacon-qr-code": "2.0.2",
         "phpmailer/phpmailer": "6.1.7",
-        "chillerlan/php-qrcode": "^4.1"
+        "chillerlan/php-qrcode": "^4.2"
     },
     "require-dev": {
         "swoole/ide-helper": "4.5.4",