Move from cboden/ratchet to plesk/ratchetphp

Fix the Bookmark2 set action
2 years ago · d6d9b118b4
4 changed files with 71 additions and 74 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,9 @@ v0.23 (trunk)
 ---------------------------
 * Group-up the confidentiality setting in the config and clarify the wording
 * Completely hide the blog and the link to it if the profile is not public
+* UI fixes
+* Move from cboden/ratchet to plesk/ratchetphp
+* Fix the Bookmark2 set action

 v0.22
 ---------------------------
--- a/composer.json
+++ b/composer.json
@ -36,7 +36,7 @@
        "doctrine/dbal": "^3.6.1",
        "monolog/monolog": "^3.3",

-        "cboden/ratchet": "^0.4.4",
+        "plesk/ratchetphp": "^1.0.0",
        "react/child-process": "^0.6.5",
        "react/http": "^1.8.0",
        "react/dns": "^1.10.0",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "876269c26c1f496bc3cc25181682f85c",
+    "content-hash": "6be372be93c79fdf8c048a9b64de8d2a",
    "packages": [
        {
            "name": "brick/math",
@ -294,69 +294,6 @@
            },
            "time": "2023-02-24T22:07:16+00:00"
        },
-        {
-            "name": "cboden/ratchet",
-            "version": "v0.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ratchetphp/Ratchet.git",
-                "reference": "5012dc954541b40c5599d286fd40653f5716a38f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/5012dc954541b40c5599d286fd40653f5716a38f",
-                "reference": "5012dc954541b40c5599d286fd40653f5716a38f",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/psr7": "^1.7|^2.0",
-                "php": ">=5.4.2",
-                "ratchet/rfc6455": "^0.3.1",
-                "react/event-loop": ">=0.4",
-                "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
-                "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0|^6.0",
-                "symfony/routing": "^2.6|^3.0|^4.0|^5.0|^6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Ratchet\\": "src/Ratchet"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Matt Bonneau",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP WebSocket library",
-            "homepage": "http://socketo.me",
-            "keywords": [
-                "Ratchet",
-                "WebSockets",
-                "server",
-                "sockets",
-                "websocket"
-            ],
-            "support": {
-                "chat": "https://gitter.im/reactphp/reactphp",
-                "issues": "https://github.com/ratchetphp/Ratchet/issues",
-                "source": "https://github.com/ratchetphp/Ratchet/tree/v0.4.4"
-            },
-            "time": "2021-12-14T00:20:41+00:00"
-        },
        {
            "name": "cocur/slugify",
            "version": "v4.3.0",
@ -3352,6 +3289,72 @@
            ],
            "time": "2023-02-25T19:38:58+00:00"
        },
+        {
+            "name": "plesk/ratchetphp",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/plesk/ratchetphp.git",
+                "reference": "8c9cdce380ca222f11ec820371339efca7e0c0a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/plesk/ratchetphp/zipball/8c9cdce380ca222f11ec820371339efca7e0c0a7",
+                "reference": "8c9cdce380ca222f11ec820371339efca7e0c0a7",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^2.5.0",
+                "php": "^8.0 || ^8.1 || ^8.2",
+                "ratchet/rfc6455": "^0.3.1",
+                "react/event-loop": "^1.4.0",
+                "react/socket": "^1.13.0",
+                "symfony/http-foundation": "^5.4.24 || ^6.0",
+                "symfony/routing": "^5.4.22 || ^6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6.9",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ratchet\\": "src/Ratchet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Matt Bonneau",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Alexey Yuzhakov",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP WebSocket library",
+            "homepage": "http://socketo.me",
+            "keywords": [
+                "Ratchet",
+                "WebSockets",
+                "server",
+                "sockets",
+                "websocket"
+            ],
+            "support": {
+                "source": "https://github.com/plesk/ratchetphp/tree/v1.0.1"
+            },
+            "time": "2023-06-30T04:36:31+00:00"
+        },
        {
            "name": "psr/cache",
            "version": "3.0.0",
--- a/src/Moxl/Xec/Action/Bookmark2/Set.php
+++ b/src/Moxl/Xec/Action/Bookmark2/Set.php
@ -16,15 +16,6 @@ class Set extends Action
    public function request()
    {
        $this->store();
-
-        // If we set the version 1, ensure to remove 0
-        if ($this->_version == '1' && $this->_conference->bookmarkversion == 0) {
-            $d = new Delete;
-            $d->setId($this->_conference->conference)
-              ->setVersion('0')
-              ->request();
-        }
-
        Bookmark2::set($this->_conference, $this->_version, $this->_withPublishOption);
    }