Merge pull request #1105 from SQKo/refactor-upgrade-v10-compatibility-v7

Compatibility support from v7 to v10 for startThread and namespace
discord-php · Jun 24, 2023 · d9109c9 · d9109c9
2 parents 8344765 + 1145037
commit d9109c9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/Discord/Parts/Channel/Channel.php b/src/Discord/Parts/Channel/Channel.php
@@ -949,8 +949,20 @@ protected function getDefaultReactionEmojiAttribute(): ?Reaction
      *
      * @since 10.0.0 Arguments for `$name`, `$private` and `$auto_archive_duration` are now inside `$options`
      */
-    public function startThread(array $options, ?string $reason = null): ExtendedPromiseInterface
+    public function startThread(array|string $options, string|null|bool $reason = null, int $_auto_archive_duration = 1440, ?string $_reason = null): ExtendedPromiseInterface
     {
+        // Old v7 signature
+        if (is_string($options)) {
+            $options = [
+                'name' => $options,
+                'auto_archive_duration' => $_auto_archive_duration,
+            ];
+            if (is_bool($reason)) {
+                $options['private'] = $reason;
+            }
+            $reason = $_reason;
+        }
+
         $resolver = new OptionsResolver();
         $resolver
             ->setDefined([

diff --git a/src/Discord/Parts/Channel/Message.php b/src/Discord/Parts/Channel/Message.php
@@ -739,8 +739,19 @@ public function getLinkAttribute(): ?string
      *
      * @since 10.0.0 Arguments for `$name` and `$auto_archive_duration` are now inside `$options`
      */
-    public function startThread(array $options, ?string $reason = null): ExtendedPromiseInterface
+    public function startThread(array|string $options, string|null|int $reason = null, ?string $_reason = null): ExtendedPromiseInterface
     {
+        // Old v7 signature
+        if (is_string($options)) {
+            $options = [
+                'name' => $options,
+            ];
+            if (! is_string($reason)) {
+                $options['auto_archive_duration'] = $reason ?? 1440;
+            }
+            $reason = $_reason;
+        }
+
         $resolver = new OptionsResolver();
         $resolver
             ->setDefined([

diff --git a/src/Discord/functions.php b/src/Discord/functions.php
@@ -354,3 +354,10 @@ function nowait(PromiseInterface $promiseInterface)
 
     return $resolved;
 }
+
+/**
+ * File namespaces that were changed in new versions are aliased
+ */
+class_alias(\Discord\Repository\Channel\StageInstanceRepository::class, '\Discord\Repository\Guild\StageInstanceRepository'); // @since 10.0.0
+class_alias(\Discord\Parts\Guild\CommandPermissions::class, '\Discord\Parts\Interactions\Command\Overwrite'); // @since 10.0.0
+class_alias(\Discord\Repository\Guild\CommandPermissionsRepository::class, '\Discord\Repository\Guild\OverwriteRepository'); // @since 10.0.0