Backmerge to develop (restcord#147)

cryptiklemur · veteran29 · HilbertGilbertson · web-flow · commit d33e78940f61 · 2021-01-12T13:15:57.000-06:00
* Allowing new versions of PHP, Symfony, PHPUnit (restcord#144) * Allow symfony 5 (restcord#106) * Added premium_since to GuildMember model (restcord#116) Note that I was unable to utilise the downloadServiceDefinition binary, as it is dependent upon a web resource that no longer appears to exist (https://discord-service-definition.herokuapp.com/) Accordingly, GuildMember.php had to be edited manually, along with the service definition file. * Back Merge (restcord#136) * Updated Discord's API URL (restcord#119) From the announcement made in the Developers server: :mega: API Updates :mega: Discord has finally made the switch to discord.com :tada: With this change also means that the API endpoint is moving too! Please start moving your libraries, webhooks, and integrations over to using discord.com in place of discordapp.com. We currently plan to start requiring the new domain later this year for third party developers on November 7th, 2020. We will be sending out more formal notices (system DMs and account emails) to announce this breaking change in the coming weeks. * Allow symfony 5 (restcord#106) (restcord#120) Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Better options parsing (restcord#125) Custom options overrides defaults * Better options parsing (restcord#125) Custom options overrides defaults * Fix style CI (restcord#127) phpdoc_to_comment cant be disabled since it is not enabled in the preset. https://docs.styleci.io/presets * Update LICENSE (restcord#130) * Update README.md (restcord#131) * Fix RateLimiter (exclude minor parameters) (restcord#126) * Simplify getRoute with explicit cast, Remove unecessary duplicate call to getUri, * Crude minor parameter removal * Improve error handling, * Fix styleci * Revert last change * Use while for delay to not interfere when multiple requests are delayed, * Update src/RateLimit/Provider/AbstractRateLimitProvider.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Add new line at EOF Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Laravel wrapped moved to GitHub (restcord#132) * Added with_counts query parameter to getGuild (restcord#133) * Added with_counts to getGuild * Updated type to be boolean * Allowing avatars to be treated as strings (restcord#134) * Allowing avatars to be treated as strings * Maintaining strongly typed comparisons * Develop (restcord#135) * Allow symfony 5 (restcord#106) * Added premium_since to GuildMember model (restcord#116) Note that I was unable to utilise the downloadServiceDefinition binary, as it is dependent upon a web resource that no longer appears to exist (https://discord-service-definition.herokuapp.com/) Accordingly, GuildMember.php had to be edited manually, along with the service definition file. Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> Co-authored-by: Néstor Pérez <25409753+nepetadosmil@users.noreply.github.com> Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: Andrey <andrey9506@yandex.ru> Co-authored-by: Patrick <privat@skyraptor.eu> Co-authored-by: Patrick <patrick.henninger@contagt.com> Co-authored-by: Ben Kuhl <benkuhl@gmail.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> * Allow PHP 8.0 (restcord#143) * Updated Discord's API URL (restcord#119) From the announcement made in the Developers server: :mega: API Updates :mega: Discord has finally made the switch to discord.com :tada: With this change also means that the API endpoint is moving too! Please start moving your libraries, webhooks, and integrations over to using discord.com in place of discordapp.com. We currently plan to start requiring the new domain later this year for third party developers on November 7th, 2020. We will be sending out more formal notices (system DMs and account emails) to announce this breaking change in the coming weeks. * Allow symfony 5 (restcord#106) (restcord#120) Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Better options parsing (restcord#125) Custom options overrides defaults * Better options parsing (restcord#125) Custom options overrides defaults * Fix style CI (restcord#127) phpdoc_to_comment cant be disabled since it is not enabled in the preset. https://docs.styleci.io/presets * Update LICENSE (restcord#130) * Update README.md (restcord#131) * Fix RateLimiter (exclude minor parameters) (restcord#126) * Simplify getRoute with explicit cast, Remove unecessary duplicate call to getUri, * Crude minor parameter removal * Improve error handling, * Fix styleci * Revert last change * Use while for delay to not interfere when multiple requests are delayed, * Update src/RateLimit/Provider/AbstractRateLimitProvider.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Update src/RateLimit/RateLimiter.php Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Add new line at EOF Co-authored-by: Aaron Scherer <aequasi@gmail.com> * Laravel wrapped moved to GitHub (restcord#132) * Added with_counts query parameter to getGuild (restcord#133) * Added with_counts to getGuild * Updated type to be boolean * Allowing avatars to be treated as strings (restcord#134) * Allowing avatars to be treated as strings * Maintaining strongly typed comparisons * Develop (restcord#135) * Allow symfony 5 (restcord#106) * Added premium_since to GuildMember model (restcord#116) Note that I was unable to utilise the downloadServiceDefinition binary, as it is dependent upon a web resource that no longer appears to exist (https://discord-service-definition.herokuapp.com/) Accordingly, GuildMember.php had to be edited manually, along with the service definition file. Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> * Adding public properties (restcord#137) * Improve User Avatar (restcord#138) See : https://discord.com/developers/docs/reference#image-formatting-cdn-endpoints Signed-off-by: Dark❶ <dark-1@users.noreply.github.com> * Allow PHP 8.0 * Apply suggestions from code review Co-authored-by: Aaron Scherer <aequasi@gmail.com> * fix symfony/options-resolver version constraint * Remove old PHP versions from travis Co-authored-by: Néstor Pérez <25409753+nepetadosmil@users.noreply.github.com> Co-authored-by: Aaron Scherer <aequasi@gmail.com> Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: Andrey <andrey9506@yandex.ru> Co-authored-by: Patrick <privat@skyraptor.eu> Co-authored-by: Patrick <patrick.henninger@contagt.com> Co-authored-by: Ben Kuhl <benkuhl@gmail.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> Co-authored-by: Dark❶ <dark-1@users.noreply.github.com> Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> Co-authored-by: Néstor Pérez <25409753+nepetadosmil@users.noreply.github.com> Co-authored-by: Andrey <andrey9506@yandex.ru> Co-authored-by: Patrick <privat@skyraptor.eu> Co-authored-by: Patrick <patrick.henninger@contagt.com> Co-authored-by: Ben Kuhl <benkuhl@gmail.com> Co-authored-by: iggyvolz <iggyvolz@gmail.com> Co-authored-by: Dark❶ <dark-1@users.noreply.github.com> * Apply fixes from StyleCI [ci skip] [skip ci] Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: HilbertGilbertson <hilbertgilbertson@ctos.online> Co-authored-by: Néstor Pérez <25409753+nepetadosmil@users.noreply.github.com> Co-authored-by: Andrey <andrey9506@yandex.ru> Co-authored-by: Patrick <privat@skyraptor.eu> Co-authored-by: Patrick <patrick.henninger@contagt.com> Co-authored-by: Ben Kuhl <benkuhl@gmail.com> Co-authored-by: iggyvolz <iggyvolz@gmail.com> Co-authored-by: Dark❶ <dark-1@users.noreply.github.com> Co-authored-by: Aaron Scherer <aequasi@users.noreply.github.com>
diff --git a/bin/stupidFunctionalTest.php b/bin/stupidFunctionalTest.php
@@ -139,8 +139,8 @@ function ($severity, $message, $file, $line) {
         'channel.id' => $dm->id,
         'embed'      => [
             'title' => 'RestCord test at: '.date(
-                    'Y-m-d H:i:s'
-                ),
+                'Y-m-d H:i:s'
+            ),
         ],
     ]
 );
diff --git a/src/RateLimit/Provider/AbstractRateLimitProvider.php b/src/RateLimit/Provider/AbstractRateLimitProvider.php
@@ -32,10 +32,10 @@ abstract class AbstractRateLimitProvider
      */
     public function getRoute(RequestInterface $request)
     {
-        $route = (string)$request->getUri();
+        $route = (string) $request->getUri();
 
         if ($request->getMethod() === 'DELETE' && strpos($route, 'messages') !== false) {
-            $route = 'DELETE-' . $route;
+            $route = 'DELETE-'.$route;
         }
 
         $stripped = $this->stripMinorParameters($route);
@@ -101,27 +101,27 @@ abstract public function setRequestAllowance(RequestInterface $request, Response
     /**
      * Method to match out major parameters of the route and
      * remove minor parameters / numbers. This has to be done
-     * to ensure correct rate limiting according to: 
-     * https://discord.com/developers/docs/topics/rate-limits
+     * to ensure correct rate limiting according to:
+     * https://discord.com/developers/docs/topics/rate-limits.
      *
      * @param string $url
+     *
      * @return string
      */
-    protected function stripMinorParameters(string $url) : string
+    protected function stripMinorParameters(string $url): string
     {
         $matches = [];
         if (
             (
                 preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/channels\/\d*).*?$/', $url, $matches) === 1 ||
                 preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/guilds\/\d*).*?$/', $url, $matches) === 1 ||
-                preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/users\/@me\/guilds\/\d*).*?$/', $url, $matches) === 1 || 
+                preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/users\/@me\/guilds\/\d*).*?$/', $url, $matches) === 1 ||
                 preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/webhooks\/\d*).*?$/', $url, $matches) === 1
             ) && count($matches) === 2
         ) {
-            $url = $matches[1] . preg_replace('/[0-9]+/', '', substr($url, strlen($matches[1])));
+            $url = $matches[1].preg_replace('/[0-9]+/', '', substr($url, strlen($matches[1])));
         }
 
         return $url;
     }
 }
-
diff --git a/src/RateLimit/RateLimiter.php b/src/RateLimit/RateLimiter.php
@@ -65,14 +65,15 @@ public function __construct(AbstractRateLimitProvider $provider, array $options,
      *
      * @param callable $handler
      *
-     * @return \Closure
      * @throws RatelimitException
+     *
+     * @return \Closure
      */
     public function __invoke(callable $handler)
     {
         return function (RequestInterface $request, $options) use ($handler) {
             // Amount of time to delay the request by
-            while(($delay = $this->getDelay($request)) > 0) {
+            while (($delay = $this->getDelay($request)) > 0) {
                 // Throw an exception if configured to do so, this will NOT delay the request and raise an Exception
                 if ($this->options['throwOnRatelimit']) {
                     throw new RatelimitException($request->getMethod().' '.$request->getUri());
@@ -216,4 +217,3 @@ protected function setAllowance(RequestInterface $request)
         };
     }
 }
-
diff --git a/src/Traits/AvatarTrait.php b/src/Traits/AvatarTrait.php
@@ -28,8 +28,7 @@ public function getAvatar($format = 'webp', $size = null)
         $url = Constants::CDN_URL.'embed/avatars/'.($this->discriminator % 5).'.png';
 
         // Check if User has Avatar
-        if ($this->avatar)
-        {
+        if ($this->avatar) {
             if (strpos($this->avatar, 'a_') === 0) {
                 $format = 'gif';
             }
diff --git a/tests/ServiceDescriptionTest.php b/tests/ServiceDescriptionTest.php
@@ -34,7 +34,7 @@ class ServiceDescriptionTest extends TestCase
      */
     public $client;
 
-    public function setUp():void
+    public function setUp(): void
     {
         $this->description = json_decode(
             file_get_contents(__DIR__.'/../src/Resources/service_description-v6.json'),

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ abstract class AbstractRateLimitProvider`
`32`	`32`	`*/`
`33`	`33`	`public function getRoute(RequestInterface $request)`
`34`	`34`	`{`
`35`		`- $route = (string)$request->getUri();`
	`35`	`+ $route = (string) $request->getUri();`
`36`	`36`
`37`	`37`	`if ($request->getMethod() === 'DELETE' && strpos($route, 'messages') !== false) {`
`38`		`- $route = 'DELETE-' . $route;`
	`38`	`+ $route = 'DELETE-'.$route;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$stripped = $this->stripMinorParameters($route);`
`@@ -101,27 +101,27 @@ abstract public function setRequestAllowance(RequestInterface $request, Response`
`101`	`101`	`/**`
`102`	`102`	`* Method to match out major parameters of the route and`
`103`	`103`	`* remove minor parameters / numbers. This has to be done`
`104`		`- * to ensure correct rate limiting according to:`
`105`		`- * https://discord.com/developers/docs/topics/rate-limits`
	`104`	`+ * to ensure correct rate limiting according to:`
	`105`	`+ * https://discord.com/developers/docs/topics/rate-limits.`
`106`	`106`	`*`
`107`	`107`	`* @param string $url`
	`108`	`+ *`
`108`	`109`	`* @return string`
`109`	`110`	`*/`
`110`		`- protected function stripMinorParameters(string $url) : string`
	`111`	`+ protected function stripMinorParameters(string $url): string`
`111`	`112`	`{`
`112`	`113`	`$matches = [];`
`113`	`114`	`if (`
`114`	`115`	`(`
`115`	`116`	`preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/channels\/\d).?$/', $url, $matches) === 1 \|\|`
`116`	`117`	`preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/guilds\/\d).?$/', $url, $matches) === 1 \|\|`
`117`		`- preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/users\/@me\/guilds\/\d).?$/', $url, $matches) === 1 \|\|`
	`118`	`+ preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/users\/@me\/guilds\/\d).?$/', $url, $matches) === 1 \|\|`
`118`	`119`	`preg_match('/^(https:\/\/discord\.com\/api\/v\d+\/webhooks\/\d).?$/', $url, $matches) === 1`
`119`	`120`	`) && count($matches) === 2`
`120`	`121`	`) {`
`121`		`- $url = $matches[1] . preg_replace('/[0-9]+/', '', substr($url, strlen($matches[1])));`
	`122`	`+ $url = $matches[1].preg_replace('/[0-9]+/', '', substr($url, strlen($matches[1])));`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`return $url;`
`125`	`126`	`}`
`126`	`127`	`}`
`127`		`-`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,15 @@ public function __construct(AbstractRateLimitProvider $provider, array $options,`
`65`	`65`	`*`
`66`	`66`	`* @param callable $handler`
`67`	`67`	`*`
`68`		`- * @return \Closure`
`69`	`68`	`* @throws RatelimitException`
	`69`	`+ *`
	`70`	`+ * @return \Closure`
`70`	`71`	`*/`
`71`	`72`	`public function __invoke(callable $handler)`
`72`	`73`	`{`
`73`	`74`	`return function (RequestInterface $request, $options) use ($handler) {`
`74`	`75`	`// Amount of time to delay the request by`
`75`		`- while(($delay = $this->getDelay($request)) > 0) {`
	`76`	`+ while (($delay = $this->getDelay($request)) > 0) {`
`76`	`77`	`// Throw an exception if configured to do so, this will NOT delay the request and raise an Exception`
`77`	`78`	`if ($this->options['throwOnRatelimit']) {`
`78`	`79`	`throw new RatelimitException($request->getMethod().' '.$request->getUri());`
`@@ -216,4 +217,3 @@ protected function setAllowance(RequestInterface $request)`
`216`	`217`	`};`
`217`	`218`	`}`
`218`	`219`	`}`
`219`		`-`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public function getAvatar($format = 'webp', $size = null)`
`28`	`28`	`$url = Constants::CDN_URL.'embed/avatars/'.($this->discriminator % 5).'.png';`
`29`	`29`
`30`	`30`	`// Check if User has Avatar`
`31`		`- if ($this->avatar)`
`32`		`- {`
	`31`	`+ if ($this->avatar) {`
`33`	`32`	`if (strpos($this->avatar, 'a_') === 0) {`
`34`	`33`	`$format = 'gif';`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ServiceDescriptionTest extends TestCase`
`34`	`34`	`*/`
`35`	`35`	`public $client;`
`36`	`36`
`37`		`- public function setUp():void`
	`37`	`+ public function setUp(): void`
`38`	`38`	`{`
`39`	`39`	`$this->description = json_decode(`
`40`	`40`	`file_get_contents(__DIR__.'/../src/Resources/service_description-v6.json'),`