From: Art4 <art4@wlabs.de>
Date: Thu, 28 Nov 2024 15:11:11 +0000 (+0000)
Subject: Merge branch '2024.09-rc' into port-2024.09-rc-into-develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=66d7ec57344d12571b1a0fe685ca2ea8172e336e;p=friendica.git

Merge branch '2024.09-rc' into port-2024.09-rc-into-develop
---

66d7ec57344d12571b1a0fe685ca2ea8172e336e
diff --cc composer.json
index 4acfe7e41a,91e78517dd..23dc4d4992
--- a/composer.json
+++ b/composer.json
@@@ -74,8 -57,26 +74,9 @@@
  		"psr/log": "^1.1",
  		"seld/cli-prompt": "^1.0",
  		"smarty/smarty": "^4",
++		"textalk/websocket": "^1.6",
  		"ua-parser/uap-php": "^3.9",
 -		"xemlock/htmlpurifier-html5": "^0.1.11",
 -		"fxp/composer-asset-plugin": "^1.4",
 -		"bower-asset/base64": "^1.0",
 -		"bower-asset/chart-js": "^2.8",
 -		"bower-asset/dompurify": "^1.0",
 -		"bower-asset/fork-awesome": "^1.1",
 -		"npm-asset/cropperjs": "1.2.2",
 -		"npm-asset/es-jquery-sortable": "^0.9.13",
 -		"npm-asset/fullcalendar": "^3.10",
 -		"npm-asset/imagesloaded": "4.1.4",
 -		"npm-asset/jquery": "^2.0",
 -		"npm-asset/jquery-colorbox": "^1.6",
 -		"npm-asset/jquery-datetimepicker": "^2.5",
 -		"npm-asset/jgrowl": "^1.4",
 -		"npm-asset/moment": "^2.24",
 -		"npm-asset/perfect-scrollbar": "0.6.16",
 -		"npm-asset/textcomplete": "^0.18.2",
 -		"npm-asset/typeahead.js": "^0.11.1",
 -		"textalk/websocket": "^1.6"
 +		"xemlock/htmlpurifier-html5": "^0.1.11"
  	},
  	"suggest": {
  		"ext-imagick": "For faster image processing",
diff --cc composer.lock
index 8d200a3f67,dc956e175a..11cc407661
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -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": "3e31a2243fb69e47e1b7000cca946fa2",
 -    "content-hash": "8b3a5f2e265b338812e30e719ff3aa80",
++    "content-hash": "64436f375561718bb857e3e1b0e503c9",
      "packages": [
          {
              "name": "asika/simple-console",
@@@ -3658,6 -4409,53 +3774,57 @@@
              ],
              "time": "2020-10-23T14:02:19+00:00"
          },
+         {
+             "name": "textalk/websocket",
+             "version": "1.6.3",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/Textalk/websocket-php.git",
+                 "reference": "67de79745b1a357caf812bfc44e0abf481cee012"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/67de79745b1a357caf812bfc44e0abf481cee012",
+                 "reference": "67de79745b1a357caf812bfc44e0abf481cee012",
+                 "shasum": ""
+             },
+             "require": {
+                 "php": "^7.4 | ^8.0",
+                 "phrity/net-uri": "^1.0",
+                 "phrity/util-errorhandler": "^1.0",
+                 "psr/http-message": "^1.0",
+                 "psr/log": "^1.0 | ^2.0 | ^3.0"
+             },
+             "require-dev": {
+                 "php-coveralls/php-coveralls": "^2.0",
+                 "phpunit/phpunit": "^9.0",
+                 "squizlabs/php_codesniffer": "^3.5"
+             },
+             "type": "library",
+             "autoload": {
+                 "psr-4": {
+                     "WebSocket\\": "lib"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "ISC"
+             ],
+             "authors": [
+                 {
+                     "name": "Fredrik Liljegren"
+                 },
+                 {
+                     "name": "Sören Jensen"
+                 }
+             ],
+             "description": "WebSocket client and server",
++            "support": {
++                "issues": "https://github.com/Textalk/websocket-php/issues",
++                "source": "https://github.com/Textalk/websocket-php/tree/1.6.3"
++            },
+             "time": "2022-11-07T18:59:33+00:00"
+         },
          {
              "name": "ua-parser/uap-php",
              "version": "v3.9.14",