KriKrixs / PHP-BeatSaver-API

lib/object/beatmap/BeatMap.php

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
     {
         $response = [];
 
-        foreach($this->bm->versions as $version) {
+        foreach ($this->bm->versions as $version) {
             $response[] = new BeatMapVersion($version);
         }
 

lib/functions/MultiQuery.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
         $l_Handles  = [];
         foreach ($p_URLs as $l_URL)
         {
-            $l_CURL = curl_init($this->apiUrl.$apiUrlExt.$l_URL);
+            $l_CURL = curl_init($this->apiUrl . $apiUrlExt . $l_URL);
             curl_setopt($l_CURL, CURLOPT_USERAGENT, $this->userAgent);
             curl_setopt($l_CURL, CURLOPT_RETURNTRANSFER, true);
 
@@ -87,7 +87,7 @@ 
                     mkdir($targetDir, 0777, true);
                 }
 
-                if(substr($targetDir, -1) !== "/")
+                if (substr($targetDir, -1) !== "/")
                     $targetDir .= "/";
 
                 //The path & filename to save to.
@@ -101,7 +101,7 @@ 
 
                 $result = curl_exec($ch);
 
-                if(curl_errno($ch) === 0) {
+                if (curl_errno($ch) === 0) {
                     $response->pushDownloadMapHash($hash);
                     echo "Ok ";
                 } else {

Braces +11 added lines, -8 removed lines

@@ -41,8 +41,9 @@ 
             $l_Handles[] = $l_CURL;
         }
 
-        foreach ($l_Handles as $l_Current)
-            curl_multi_add_handle($l_Multi, $l_Current);
+        foreach ($l_Handles as $l_Current) {
+                    curl_multi_add_handle($l_Multi, $l_Current);
+        }
 
         $l_RunningHandles = null;
 
@@ -57,10 +58,11 @@ 
         {
             $l_Error = curl_error($l_Current);
 
-            if (!empty($l_Error) || curl_getinfo($l_Current, CURLINFO_HTTP_CODE) !== 200)
-                $l_Result[] = false;
-            else
-                $l_Result[] = new BeatMap(json_decode(curl_multi_getcontent($l_Current)));
+            if (!empty($l_Error) || curl_getinfo($l_Current, CURLINFO_HTTP_CODE) !== 200) {
+                            $l_Result[] = false;
+            } else {
+                            $l_Result[] = new BeatMap(json_decode(curl_multi_getcontent($l_Current)));
+            }
 
             curl_multi_remove_handle($l_Multi, $l_Current);
         }
@@ -87,8 +89,9 @@ 
                     mkdir($targetDir, 0777, true);
                 }
 
-                if(substr($targetDir, -1) !== "/")
-                    $targetDir .= "/";
+                if(substr($targetDir, -1) !== "/") {
+                                    $targetDir .= "/";
+                }
 
                 //The path & filename to save to.
                 $saveTo = $targetDir . $hash . $extension;

lib/BeatSaverAPI.php

Spacing +43 added lines, -43 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function __construct(string $userAgent, bool $needAutoloader = false)
     {
-        if($needAutoloader)
+        if ($needAutoloader)
             $this->autoload("./");
 
         $this->userAgent = $userAgent;
@@ -34,15 +34,15 @@ 
     }
 
     private function autoload($directory) {
-        if(is_dir($directory)) {
+        if (is_dir($directory)) {
             $scan = scandir($directory);
             unset($scan[0], $scan[1]); //unset . and ..
-            foreach($scan as $file) {
-                if(is_dir($directory."/".$file)) {
-                    $this->autoload($directory."/".$file);
+            foreach ($scan as $file) {
+                if (is_dir($directory . "/" . $file)) {
+                    $this->autoload($directory . "/" . $file);
                 } else {
-                    if(strpos($file, '.php') !== false) {
-                        include_once($directory."/".$file);
+                    if (strpos($file, '.php') !== false) {
+                        include_once($directory . "/" . $file);
                     }
                 }
             }
@@ -86,7 +86,7 @@ 
 
         $apiResult = $this->callAPI($endpoint);
 
-        if($apiResult === false || $apiResult == "Not Found") {
+        if ($apiResult === false || $apiResult == "Not Found") {
             $response->setErrorStatus(true)->setErrorMessage("[getMap] Something went wrong with the API call.");
             return $response;
         }
@@ -145,7 +145,7 @@ 
 
         $apiResult = $this->callAPI($endpoint);
 
-        if($apiResult === false || $apiResult == "Not Found") {
+        if ($apiResult === false || $apiResult == "Not Found") {
             $response->setErrorStatus(true)->setErrorMessage("[getMap] Something went wrong with the API call.");
             return $response;
         }
@@ -191,15 +191,15 @@ 
         $callNumber = 0;
         $result = new ResponseMaps();
 
-        if(count($hashes) < 2) {
+        if (count($hashes) < 2) {
             return $result->setErrorStatus(true)->setErrorMessage("This functions require a minimum of 2 hashes in the array");
         }
 
-        foreach($hashes as $hash) {
+        foreach ($hashes as $hash) {
             $hashesString .= $hash;
 
-            if($i !== 0 && $i % self::MAX_HASHES_NUMBER === 0) {
-                if($callNumber === self::MAX_CALL_PER_SECS) {
+            if ($i !== 0 && $i % self::MAX_HASHES_NUMBER === 0) {
+                if ($callNumber === self::MAX_CALL_PER_SECS) {
                     sleep(1);
                     $callNumber = 0;
                 }
@@ -209,7 +209,7 @@ 
 
                 $mapsArray[] = array_merge($mapsArray, $maps->getBeatMaps());
 
-                if(!isset($mapsArray["errorStatus"]) || !$mapsArray["errorStatus"]) {
+                if (!isset($mapsArray["errorStatus"]) || !$mapsArray["errorStatus"]) {
                     $mapsArray["errorStatus"] = $maps->getErrorStatus();
                     $mapsArray["errorMessage"] = $maps->getErrorMessage();
                 }
@@ -223,18 +223,18 @@ 
         }
 
 
-        if($i !== 0) {
+        if ($i !== 0) {
             $maps = $this->getMaps($hashesString);
             $mapsArray[] = array_merge($mapsArray, $maps->getBeatMaps());
 
-            if(!isset($mapsArray["errorStatus"]) || !$mapsArray["errorStatus"]) {
+            if (!isset($mapsArray["errorStatus"]) || !$mapsArray["errorStatus"]) {
                 $mapsArray["errorStatus"] = $maps->getErrorStatus();
                 $mapsArray["errorMessage"] = $maps->getErrorMessage();
             }
         }
 
-        if(isset($mapsArray["errorStatus"]) && $mapsArray["errorStatus"])
-            $result->setErrorStatus( $mapsArray["errorStatus"])->setErrorMessage( $mapsArray["errorMessage"]);
+        if (isset($mapsArray["errorStatus"]) && $mapsArray["errorStatus"])
+            $result->setErrorStatus($mapsArray["errorStatus"])->setErrorMessage($mapsArray["errorMessage"]);
 
         unset($mapsArray["errorStatus"]);
         unset($mapsArray["errorMessage"]);
@@ -256,20 +256,20 @@ 
         $callNumber = 0;
 
         // Latest
-        if($numberOfPage === 0 && $startPage === 0){
+        if ($numberOfPage === 0 && $startPage === 0) {
             $apiResult = json_decode($this->callAPI(str_ireplace("page", 0, $endpoint)));
 
-            if($apiResult === false || $apiResult == "Not Found") {
+            if ($apiResult === false || $apiResult == "Not Found") {
                 $response->setErrorStatus(true)->setErrorMessage("[getMaps] Something went wrong with the API call while calling the first page.");
                 return $response;
-            } else{
+            } else {
                 foreach ($apiResult->docs as $beatmap) {
                     $maps[] = new BeatMap($beatmap);
                 }
             }
         } else {
-            for($i = $startPage; $i < ($i + $numberOfPage); $i++){
-                if($callNumber === self::MAX_CALL_PER_SECS) {
+            for ($i = $startPage; $i < ($i + $numberOfPage); $i++) {
+                if ($callNumber === self::MAX_CALL_PER_SECS) {
                     sleep(1);
                     $callNumber = 0;
                 }
@@ -277,10 +277,10 @@ 
                 $apiResult = json_decode($this->callAPI(str_ireplace("page", $i, $endpoint)));
                 $callNumber++;
 
-                if($apiResult === false || $apiResult == "Not Found") {
+                if ($apiResult === false || $apiResult == "Not Found") {
                     $response->setErrorStatus(true)->setErrorMessage("[getMaps] Something went wrong with the API call while calling page number " . $i . ".");
 
-                    if($apiResult == "Not Found")
+                    if ($apiResult == "Not Found")
                         return $response;
                 }
 
@@ -362,23 +362,23 @@ 
 
         $endpoint = "/search/text/page?sortOrder=" . $sort[$sortOrder];
 
-        if($mapName)                $endpoint .= "&q=" . urlencode($mapName);
-        if($startDate)              $endpoint .= "&from=" . $startDate->format("Y-m-d");
-        if($endDate)                $endpoint .= "&to=" . $endDate->format("Y-m-d");
-        if($ranked)                 $endpoint .= "&ranked=" . /** @scrutinizer ignore-type */ var_export($ranked, true);
-        if($automapper)             $endpoint .= "&automapper=" . /** @scrutinizer ignore-type */ var_export($automapper, true);
-        if($chroma)                 $endpoint .= "&chroma=" . /** @scrutinizer ignore-type */ var_export($chroma, true);
-        if($noodle)                 $endpoint .= "&noodle=" . /** @scrutinizer ignore-type */ var_export($noodle, true);
-        if($cinema)                 $endpoint .= "&cinema=" . /** @scrutinizer ignore-type */ var_export($cinema, true);
-        if($fullSpread)             $endpoint .= "&fullSpread=" . /** @scrutinizer ignore-type */ var_export($fullSpread, true);
-        if($minBpm)                 $endpoint .= "&minBpm=" . /** @scrutinizer ignore-type */ $minBpm;
-        if($maxBpm)                 $endpoint .= "&maxBpm=" . /** @scrutinizer ignore-type */ $maxBpm;
-        if($minNps)                 $endpoint .= "&minNps=" . /** @scrutinizer ignore-type */ $minNps;
-        if($maxNps)                 $endpoint .= "&maxNps=" . /** @scrutinizer ignore-type */ $maxNps;
-        if($minRating)              $endpoint .= "&minRating=" . /** @scrutinizer ignore-type */ $minRating;
-        if($maxRating)              $endpoint .= "&maxRating=" . /** @scrutinizer ignore-type */ $maxRating;
-        if($minDuration !== null)   $endpoint .= "&minDuration=" . /** @scrutinizer ignore-type */ $minDuration;
-        if($maxDuration !== null)   $endpoint .= "&maxDuration=" . /** @scrutinizer ignore-type */ $maxDuration;
+        if ($mapName)                $endpoint .= "&q=" . urlencode($mapName);
+        if ($startDate)              $endpoint .= "&from=" . $startDate->format("Y-m-d");
+        if ($endDate)                $endpoint .= "&to=" . $endDate->format("Y-m-d");
+        if ($ranked)                 $endpoint .= "&ranked=" . /** @scrutinizer ignore-type */ var_export($ranked, true);
+        if ($automapper)             $endpoint .= "&automapper=" . /** @scrutinizer ignore-type */ var_export($automapper, true);
+        if ($chroma)                 $endpoint .= "&chroma=" . /** @scrutinizer ignore-type */ var_export($chroma, true);
+        if ($noodle)                 $endpoint .= "&noodle=" . /** @scrutinizer ignore-type */ var_export($noodle, true);
+        if ($cinema)                 $endpoint .= "&cinema=" . /** @scrutinizer ignore-type */ var_export($cinema, true);
+        if ($fullSpread)             $endpoint .= "&fullSpread=" . /** @scrutinizer ignore-type */ var_export($fullSpread, true);
+        if ($minBpm)                 $endpoint .= "&minBpm=" . /** @scrutinizer ignore-type */ $minBpm;
+        if ($maxBpm)                 $endpoint .= "&maxBpm=" . /** @scrutinizer ignore-type */ $maxBpm;
+        if ($minNps)                 $endpoint .= "&minNps=" . /** @scrutinizer ignore-type */ $minNps;
+        if ($maxNps)                 $endpoint .= "&maxNps=" . /** @scrutinizer ignore-type */ $maxNps;
+        if ($minRating)              $endpoint .= "&minRating=" . /** @scrutinizer ignore-type */ $minRating;
+        if ($maxRating)              $endpoint .= "&maxRating=" . /** @scrutinizer ignore-type */ $maxRating;
+        if ($minDuration !== null)   $endpoint .= "&minDuration=" . /** @scrutinizer ignore-type */ $minDuration;
+        if ($maxDuration !== null)   $endpoint .= "&maxDuration=" . /** @scrutinizer ignore-type */ $maxDuration;
 
         return $this->getMapsByEndpoint($endpoint, $numberOfPage, $startPage);
     }
@@ -398,7 +398,7 @@ 
 
         $apiResult = $this->callAPI($endpoint);
 
-        if($apiResult === false || $apiResult == "Not Found") {
+        if ($apiResult === false || $apiResult == "Not Found") {
             $response->setErrorStatus(true)->setErrorMessage("[getMap] Something went wrong with the API call.");
             return $response;
         }

Braces +60 added lines, -23 removed lines

@@ -26,8 +26,9 @@ 
      */
     public function __construct(string $userAgent, bool $needAutoloader = false)
     {
-        if($needAutoloader)
-            $this->autoload("./");
+        if($needAutoloader) {
+                    $this->autoload("./");
+        }
 
         $this->userAgent = $userAgent;
         $this->multiQuery = new MultiQuery(self::BEATSAVER_URL, $userAgent);
@@ -233,8 +234,9 @@ 
             }
         }
 
-        if(isset($mapsArray["errorStatus"]) && $mapsArray["errorStatus"])
-            $result->setErrorStatus( $mapsArray["errorStatus"])->setErrorMessage( $mapsArray["errorMessage"]);
+        if(isset($mapsArray["errorStatus"]) && $mapsArray["errorStatus"]) {
+                    $result->setErrorStatus( $mapsArray["errorStatus"])->setErrorMessage( $mapsArray["errorMessage"]);
+        }
 
         unset($mapsArray["errorStatus"]);
         unset($mapsArray["errorMessage"]);
@@ -280,8 +282,9 @@ 
                 if($apiResult === false || $apiResult == "Not Found") {
                     $response->setErrorStatus(true)->setErrorMessage("[getMaps] Something went wrong with the API call while calling page number " . $i . ".");
 
-                    if($apiResult == "Not Found")
-                        return $response;
+                    if($apiResult == "Not Found") {
+                                            return $response;
+                    }
                 }
 
                 foreach ($apiResult->docs as $beatmap) {
@@ -362,23 +365,57 @@ 
 
         $endpoint = "/search/text/page?sortOrder=" . $sort[$sortOrder];
 
-        if($mapName)                $endpoint .= "&q=" . urlencode($mapName);
-        if($startDate)              $endpoint .= "&from=" . $startDate->format("Y-m-d");
-        if($endDate)                $endpoint .= "&to=" . $endDate->format("Y-m-d");
-        if($ranked)                 $endpoint .= "&ranked=" . /** @scrutinizer ignore-type */ var_export($ranked, true);
-        if($automapper)             $endpoint .= "&automapper=" . /** @scrutinizer ignore-type */ var_export($automapper, true);
-        if($chroma)                 $endpoint .= "&chroma=" . /** @scrutinizer ignore-type */ var_export($chroma, true);
-        if($noodle)                 $endpoint .= "&noodle=" . /** @scrutinizer ignore-type */ var_export($noodle, true);
-        if($cinema)                 $endpoint .= "&cinema=" . /** @scrutinizer ignore-type */ var_export($cinema, true);
-        if($fullSpread)             $endpoint .= "&fullSpread=" . /** @scrutinizer ignore-type */ var_export($fullSpread, true);
-        if($minBpm)                 $endpoint .= "&minBpm=" . /** @scrutinizer ignore-type */ $minBpm;
-        if($maxBpm)                 $endpoint .= "&maxBpm=" . /** @scrutinizer ignore-type */ $maxBpm;
-        if($minNps)                 $endpoint .= "&minNps=" . /** @scrutinizer ignore-type */ $minNps;
-        if($maxNps)                 $endpoint .= "&maxNps=" . /** @scrutinizer ignore-type */ $maxNps;
-        if($minRating)              $endpoint .= "&minRating=" . /** @scrutinizer ignore-type */ $minRating;
-        if($maxRating)              $endpoint .= "&maxRating=" . /** @scrutinizer ignore-type */ $maxRating;
-        if($minDuration !== null)   $endpoint .= "&minDuration=" . /** @scrutinizer ignore-type */ $minDuration;
-        if($maxDuration !== null)   $endpoint .= "&maxDuration=" . /** @scrutinizer ignore-type */ $maxDuration;
+        if($mapName) {
+            $endpoint .= "&q=" . urlencode($mapName);
+        }
+        if($startDate) {
+            $endpoint .= "&from=" . $startDate->format("Y-m-d");
+        }
+        if($endDate) {
+            $endpoint .= "&to=" . $endDate->format("Y-m-d");
+        }
+        if($ranked) {
+            $endpoint .= "&ranked=" . /** @scrutinizer ignore-type */ var_export($ranked, true);
+        }
+        if($automapper) {
+            $endpoint .= "&automapper=" . /** @scrutinizer ignore-type */ var_export($automapper, true);
+        }
+        if($chroma) {
+            $endpoint .= "&chroma=" . /** @scrutinizer ignore-type */ var_export($chroma, true);
+        }
+        if($noodle) {
+            $endpoint .= "&noodle=" . /** @scrutinizer ignore-type */ var_export($noodle, true);
+        }
+        if($cinema) {
+            $endpoint .= "&cinema=" . /** @scrutinizer ignore-type */ var_export($cinema, true);
+        }
+        if($fullSpread) {
+            $endpoint .= "&fullSpread=" . /** @scrutinizer ignore-type */ var_export($fullSpread, true);
+        }
+        if($minBpm) {
+            $endpoint .= "&minBpm=" . /** @scrutinizer ignore-type */ $minBpm;
+        }
+        if($maxBpm) {
+            $endpoint .= "&maxBpm=" . /** @scrutinizer ignore-type */ $maxBpm;
+        }
+        if($minNps) {
+            $endpoint .= "&minNps=" . /** @scrutinizer ignore-type */ $minNps;
+        }
+        if($maxNps) {
+            $endpoint .= "&maxNps=" . /** @scrutinizer ignore-type */ $maxNps;
+        }
+        if($minRating) {
+            $endpoint .= "&minRating=" . /** @scrutinizer ignore-type */ $minRating;
+        }
+        if($maxRating) {
+            $endpoint .= "&maxRating=" . /** @scrutinizer ignore-type */ $maxRating;
+        }
+        if($minDuration !== null) {
+            $endpoint .= "&minDuration=" . /** @scrutinizer ignore-type */ $minDuration;
+        }
+        if($maxDuration !== null) {
+            $endpoint .= "&maxDuration=" . /** @scrutinizer ignore-type */ $maxDuration;
+        }
 
         return $this->getMapsByEndpoint($endpoint, $numberOfPage, $startPage);
     }