From 7a2bcde2fa3ebe6439d14dec89da18813b097999 Mon Sep 17 00:00:00 2001 From: Marco Giovinazzi Date: Wed, 7 Nov 2018 23:48:06 +0100 Subject: [PATCH 01/12] deps update for 1.0 --- composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 13bf306..3dd30e1 100644 --- a/composer.json +++ b/composer.json @@ -29,16 +29,15 @@ "Comodojo\\Daemon\\": "src/Comodojo/Daemon" } }, - "minimum-stability": "dev", "require": { "php": ">=5.6.0", "ext-posix": "*", "ext-pcntl": "*", "ext-shmop": "*", "ext-sockets": "*", - "comodojo/foundation": "dev-master", - "comodojo/rpcserver": "dev-master", - "comodojo/rpcclient": "dev-master", + "comodojo/foundation": "^1.0", + "comodojo/rpcserver": "^2.0", + "comodojo/rpcclient": "^2.0", "league/climate": "^3.0" }, "require-dev": { From f342cdf546bfdcb8e0af39e4efb6d3fe894397b3 Mon Sep 17 00:00:00 2001 From: Marco Giovinazzi Date: Wed, 7 Nov 2018 23:50:02 +0100 Subject: [PATCH 02/12] update readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d8399d9..b9b27c0 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ Solid PHP daemon toolkit -***This is the development branch, please do not use it in production*** - ## Installation Install [composer](https://getcomposer.org/), then: From 980352f0ac8d79a8ecf161e1a261a30fc153206f Mon Sep 17 00:00:00 2001 From: Marco Giovinazzi Date: Wed, 7 Nov 2018 23:48:06 +0100 Subject: [PATCH 03/12] deps update for 1.0 --- composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 13bf306..3dd30e1 100644 --- a/composer.json +++ b/composer.json @@ -29,16 +29,15 @@ "Comodojo\\Daemon\\": "src/Comodojo/Daemon" } }, - "minimum-stability": "dev", "require": { "php": ">=5.6.0", "ext-posix": "*", "ext-pcntl": "*", "ext-shmop": "*", "ext-sockets": "*", - "comodojo/foundation": "dev-master", - "comodojo/rpcserver": "dev-master", - "comodojo/rpcclient": "dev-master", + "comodojo/foundation": "^1.0", + "comodojo/rpcserver": "^2.0", + "comodojo/rpcclient": "^2.0", "league/climate": "^3.0" }, "require-dev": { From 97ec53f5d52c781878f7a4e2c8c268eaf9aba72b Mon Sep 17 00:00:00 2001 From: Marco Giovinazzi Date: Wed, 7 Nov 2018 23:50:02 +0100 Subject: [PATCH 04/12] update readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d8399d9..b9b27c0 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ Solid PHP daemon toolkit -***This is the development branch, please do not use it in production*** - ## Installation Install [composer](https://getcomposer.org/), then: From 1f482e77c55955893c7ea5ea20f87a5c4aac3ba2 Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Fri, 29 Oct 2021 10:30:16 +0200 Subject: [PATCH 05/12] Update composer.json --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 3dd30e1..228081c 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "comodojo/daemon", + "name": "pmarcelli/daemon", "description": "Solid PHP daemon toolkit", "license": "MIT", "type": "library", @@ -30,14 +30,14 @@ } }, "require": { - "php": ">=5.6.0", + "php": "^7.3", "ext-posix": "*", "ext-pcntl": "*", "ext-shmop": "*", "ext-sockets": "*", - "comodojo/foundation": "^1.0", - "comodojo/rpcserver": "^2.0", - "comodojo/rpcclient": "^2.0", + "pmarcelli/foundation": "dev-foundation_u7320", + "pmarcelli/rpcserver": "dev-rpcserver_u7320", + "pmarcelli/rpcclient": "dev-rpcclient_u7320", "league/climate": "^3.0" }, "require-dev": { From 971c2f1462f5f64b935455b1a4f415211f102b0b Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Wed, 3 Nov 2021 10:14:27 +0100 Subject: [PATCH 06/12] Update SocketTransport.php --- src/Comodojo/Daemon/Socket/SocketTransport.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Comodojo/Daemon/Socket/SocketTransport.php b/src/Comodojo/Daemon/Socket/SocketTransport.php index 2be5431..2774501 100644 --- a/src/Comodojo/Daemon/Socket/SocketTransport.php +++ b/src/Comodojo/Daemon/Socket/SocketTransport.php @@ -2,7 +2,7 @@ use \Comodojo\RpcClient\Interfaces\Transport as TransportInterface; use \Comodojo\Httprequest\Httprequest; -use \phpseclib\Crypt\AES; +use phpseclib3\Crypt\AES; use \Psr\Log\LoggerInterface; use \Comodojo\Exception\RpcException; use \Comodojo\Exception\SocketException; @@ -203,8 +203,9 @@ private function can($data, $key) { if ( !empty($key) && is_string($key) ) { - $this->aes = new AES(); + $this->aes = new AES('ecb'); + //Only keys of sizes 16, 24 or 32 supported $this->aes->setKey($key); $return = 'comodojo_encrypted_request-'.base64_encode($this->aes->encrypt($data)); From c912d4cdac2726026bf4db6c91e07afaf30cd126 Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:27:23 +0100 Subject: [PATCH 07/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b9b27c0..d8399d9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Solid PHP daemon toolkit +***This is the development branch, please do not use it in production*** + ## Installation Install [composer](https://getcomposer.org/), then: From e54d6a58d7ef885986d59f6d70216665b16211c6 Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:27:57 +0100 Subject: [PATCH 08/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 228081c..18778b7 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "php": "^7.3", + "php": ">=5.6.0", "ext-posix": "*", "ext-pcntl": "*", "ext-shmop": "*", From cdfd45b20697ecd31f7a7f5d2aa14f2625a3321e Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 11 Nov 2021 15:14:18 +0100 Subject: [PATCH 09/12] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 18778b7..6d4a6d1 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "pmarcelli/daemon", + "name": "comodojo/daemon", "description": "Solid PHP daemon toolkit", "license": "MIT", "type": "library", @@ -35,9 +35,9 @@ "ext-pcntl": "*", "ext-shmop": "*", "ext-sockets": "*", - "pmarcelli/foundation": "dev-foundation_u7320", - "pmarcelli/rpcserver": "dev-rpcserver_u7320", - "pmarcelli/rpcclient": "dev-rpcclient_u7320", + "comodojo/foundation": "dev-master", + "comodojo/rpcserver": "dev-master", + "comodojo/rpcclient": "dev-master", "league/climate": "^3.0" }, "require-dev": { From 70610cb9dffc3da80ea93966e4c17880c6c4721a Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 11 Nov 2021 15:58:59 +0100 Subject: [PATCH 10/12] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6d4a6d1..71eebe2 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "Comodojo\\Daemon\\": "src/Comodojo/Daemon" } }, + "minimum-stability": "dev", "require": { "php": ">=5.6.0", "ext-posix": "*", From 38cdc408494056ac8d2ab7a6803f160d282d1472 Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:00:14 +0100 Subject: [PATCH 11/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 71eebe2..13bf306 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "Comodojo\\Daemon\\": "src/Comodojo/Daemon" } }, - "minimum-stability": "dev", + "minimum-stability": "dev", "require": { "php": ">=5.6.0", "ext-posix": "*", From 9759445dcb6be1d536285001f3663753f580e452 Mon Sep 17 00:00:00 2001 From: pmacelli <91888876+pmacelli@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:00:30 +0100 Subject: [PATCH 12/12] Update composer.json --- composer.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 13bf306..18778b7 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "comodojo/daemon", + "name": "pmarcelli/daemon", "description": "Solid PHP daemon toolkit", "license": "MIT", "type": "library", @@ -29,16 +29,15 @@ "Comodojo\\Daemon\\": "src/Comodojo/Daemon" } }, - "minimum-stability": "dev", "require": { "php": ">=5.6.0", "ext-posix": "*", "ext-pcntl": "*", "ext-shmop": "*", "ext-sockets": "*", - "comodojo/foundation": "dev-master", - "comodojo/rpcserver": "dev-master", - "comodojo/rpcclient": "dev-master", + "pmarcelli/foundation": "dev-foundation_u7320", + "pmarcelli/rpcserver": "dev-rpcserver_u7320", + "pmarcelli/rpcclient": "dev-rpcclient_u7320", "league/climate": "^3.0" }, "require-dev": {