fix: Fix codacy issues

geokrety · Oct 25, 2023 · cd0a9d7 · cd0a9d7
1 parent f885a49
commit cd0a9d7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/website/app/GeoKrety/Controller/Pages/AbstractPictureUpload.php b/website/app/GeoKrety/Controller/Pages/AbstractPictureUpload.php
@@ -49,7 +49,7 @@ private function render_response(\Base $f3, array $response) {
      */
     public function request_s3_file_signature_api(\Base $f3) {
         $this->set_response_content_type($f3);
-        $this->authenticate_via_secid($f3);
+        $this->authenticate_via_secid();
         RateLimit::check_rate_limit_raw('API_V1_REQUEST_S3_FILE_SIGNATURE', $this->f3->get('REQUEST.secid'));
         $data = $this->request_s3_file_signature($f3);
         // Remove some dropzone internal headers on the public API
@@ -75,7 +75,7 @@ public function request_s3_file_signature_ajax(\Base $f3) {
 
     private function request_s3_file_signature(\Base $f3) {
         try {
-            $this->check_permission($f3);
+            $this->check_permission();
         } catch (UploadPermissionException $e) {
             http_response_code(403);
             Error::buildError(true, [$e->getMessage()]);
@@ -193,5 +193,5 @@ abstract public function setRelationships(Picture $picture): void;
      *
      * @throws UploadPermissionException
      */
-    abstract protected function check_permission(\Base $f3);
+    abstract protected function check_permission();
 }
diff --git a/website/app/GeoKrety/Controller/Pages/Base.php b/website/app/GeoKrety/Controller/Pages/Base.php
@@ -63,9 +63,9 @@ public function loadCurrentUser() {
         }
     }
 
-    public function authenticate_via_secid(\Base $f3) {
+    public function authenticate_via_secid() {
         $login = new Login();
-        $user = $login->secidAuth($this->f3, $this->f3->get('REQUEST.secid'));
+        $login->secidAuth($this->f3, $this->f3->get('REQUEST.secid'));
     }
 
     public function isLoggedIn(): bool {

diff --git a/website/app/GeoKrety/Controller/Pages/GeokretAvatarUpload.php b/website/app/GeoKrety/Controller/Pages/GeokretAvatarUpload.php
@@ -38,7 +38,7 @@ public function setRelationships(Picture $picture): void {
      *
      * @throws UploadPermissionException
      */
-    protected function check_permission(\Base $f3): void {
+    protected function check_permission(): void {
         if ($this->geokret->isOwner()) {
             return;
         }

diff --git a/website/app/GeoKrety/Controller/Pages/MoveAvatarUpload.php b/website/app/GeoKrety/Controller/Pages/MoveAvatarUpload.php
@@ -37,7 +37,7 @@ public function setRelationships(Picture $picture): void {
      *
      * @throws UploadPermissionException
      */
-    protected function check_permission(\Base $f3): void {
+    protected function check_permission(): void {
         if ($this->hasWritePermission($this->move)) {
             return;
         }

diff --git a/website/app/GeoKrety/Controller/Pages/UserAvatarUpload.php b/website/app/GeoKrety/Controller/Pages/UserAvatarUpload.php
@@ -37,7 +37,7 @@ public function setRelationships(Picture $picture): void {
      *
      * @throws UploadPermissionException
      */
-    protected function check_permission(\Base $f3): void {
+    protected function check_permission(): void {
         if ($this->user->isCurrentUser()) {
             return;
         }

diff --git a/website/app/GeoKrety/Service/Xml/Generic.php b/website/app/GeoKrety/Service/Xml/Generic.php
@@ -36,9 +36,9 @@ public static function buildGeneric(bool $stream, string $root, array|string $da
                     $xml->addItem($k, $v);
                 }
                 $xml->xml->endElement();
-            } else {
-                $xml->addItem($key, $value);
+                continue;
             }
+            $xml->addItem($key, $value);
         }
         $xml->end();
         $xml->finish(); // may return raw gzipped data