From 9d901073c70549365bbb3670a69410bb88122293 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:43:40 +0100 Subject: [PATCH] chore: remove framework and cli --- composer.json | 2 +- composer.lock | 199 +++++++++++++++++++++++++++---------------- src/Queue/Job.php | 2 +- src/Queue/Server.php | 2 +- 4 files changed, 130 insertions(+), 75 deletions(-) diff --git a/composer.json b/composer.json index 85a185f..1f96527 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "php": ">=8.3", "php-amqplib/php-amqplib": "^3.7", "utopia-php/console": "0.0.*", - "utopia-php/framework": "0.33.*", + "utopia-php/servers": "0.2.*", "utopia-php/telemetry": "0.1.*", "utopia-php/pools": "0.8.*", "utopia-php/fetch": "0.4.*" diff --git a/composer.lock b/composer.lock index 8b4d571..a4d5235 100644 --- 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": "b49fa1b36e008319f31246488511888a", + "content-hash": "fd78fa72abc1a99711084becdfaebfef", "packages": [ { "name": "brick/math", @@ -2173,98 +2173,100 @@ "time": "2025-06-29T15:42:06+00:00" }, { - "name": "utopia-php/compression", - "version": "0.1.3", + "name": "utopia-php/console", + "version": "0.0.1", "source": { "type": "git", - "url": "https://github.com/utopia-php/compression.git", - "reference": "66f093557ba66d98245e562036182016c7dcfe8a" + "url": "https://github.com/utopia-php/console.git", + "reference": "f77104e4a888fa9cb3e08f32955ec09479ab7a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/compression/zipball/66f093557ba66d98245e562036182016c7dcfe8a", - "reference": "66f093557ba66d98245e562036182016c7dcfe8a", + "url": "https://api.github.com/repos/utopia-php/console/zipball/f77104e4a888fa9cb3e08f32955ec09479ab7a92", + "reference": "f77104e4a888fa9cb3e08f32955ec09479ab7a92", "shasum": "" }, "require": { - "php": ">=8.0" + "php": ">=7.4" }, "require-dev": { "laravel/pint": "1.2.*", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3", - "vimeo/psalm": "4.0.1" + "squizlabs/php_codesniffer": "^3.6", + "swoole/ide-helper": "4.8.8" }, "type": "library", "autoload": { "psr-4": { - "Utopia\\Compression\\": "src/Compression" + "Utopia\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "A simple Compression library to handle file compression", + "description": "Console helpers for logging, prompting, and executing commands", "keywords": [ - "compression", - "framework", + "cli", + "console", "php", - "upf", + "terminal", "utopia" ], "support": { - "issues": "https://github.com/utopia-php/compression/issues", - "source": "https://github.com/utopia-php/compression/tree/0.1.3" + "issues": "https://github.com/utopia-php/console/issues", + "source": "https://github.com/utopia-php/console/tree/0.0.1" }, - "time": "2025-01-15T15:15:51+00:00" + "time": "2025-10-20T14:41:36+00:00" }, { - "name": "utopia-php/console", - "version": "0.0.1", + "name": "utopia-php/di", + "version": "0.1.0", "source": { "type": "git", - "url": "https://github.com/utopia-php/console.git", - "reference": "f77104e4a888fa9cb3e08f32955ec09479ab7a92" + "url": "https://github.com/utopia-php/di.git", + "reference": "22490c95f7ac3898ed1c33f1b1b5dd577305ee31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/console/zipball/f77104e4a888fa9cb3e08f32955ec09479ab7a92", - "reference": "f77104e4a888fa9cb3e08f32955ec09479ab7a92", + "url": "https://api.github.com/repos/utopia-php/di/zipball/22490c95f7ac3898ed1c33f1b1b5dd577305ee31", + "reference": "22490c95f7ac3898ed1c33f1b1b5dd577305ee31", "shasum": "" }, "require": { - "php": ">=7.4" + "php": ">=8.2" }, "require-dev": { - "laravel/pint": "1.2.*", + "laravel/pint": "^1.2", + "phpbench/phpbench": "^1.2", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.3", - "squizlabs/php_codesniffer": "^3.6", - "swoole/ide-helper": "4.8.8" + "phpunit/phpunit": "^9.5.25", + "swoole/ide-helper": "4.8.3" }, "type": "library", "autoload": { "psr-4": { - "Utopia\\": "src/" + "Utopia\\": "src/", + "Tests\\E2E\\": "tests/e2e" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Console helpers for logging, prompting, and executing commands", + "description": "A simple and lite library for managing dependency injections", "keywords": [ - "cli", - "console", + "framework", + "http", "php", - "terminal", - "utopia" + "upf" ], "support": { - "issues": "https://github.com/utopia-php/console/issues", - "source": "https://github.com/utopia-php/console/tree/0.0.1" + "issues": "https://github.com/utopia-php/di/issues", + "source": "https://github.com/utopia-php/di/tree/0.1.0" }, - "time": "2025-10-20T14:41:36+00:00" + "time": "2024-08-08T14:35:19+00:00" }, { "name": "utopia-php/fetch", @@ -2306,79 +2308,85 @@ "time": "2025-04-25T13:48:02+00:00" }, { - "name": "utopia-php/framework", - "version": "0.33.28", + "name": "utopia-php/pools", + "version": "0.8.2", "source": { "type": "git", - "url": "https://github.com/utopia-php/http.git", - "reference": "5aaa94d406577b0059ad28c78022606890dc6de0" + "url": "https://github.com/utopia-php/pools.git", + "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/http/zipball/5aaa94d406577b0059ad28c78022606890dc6de0", - "reference": "5aaa94d406577b0059ad28c78022606890dc6de0", + "url": "https://api.github.com/repos/utopia-php/pools/zipball/05c67aba42eb68ac65489cc1e7fc5db83db2dd4d", + "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d", "shasum": "" }, "require": { - "php": ">=8.1", - "utopia-php/compression": "0.1.*", + "php": ">=8.3", "utopia-php/telemetry": "0.1.*" }, "require-dev": { - "laravel/pint": "^1.2", - "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.5.25" + "laravel/pint": "1.*", + "phpstan/phpstan": "1.*", + "phpunit/phpunit": "11.*" }, "type": "library", "autoload": { "psr-4": { - "Utopia\\": "src/" + "Utopia\\Pools\\": "src/Pools" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "A simple, light and advanced PHP framework", + "authors": [ + { + "name": "Team Appwrite", + "email": "team@appwrite.io" + } + ], + "description": "A simple library to manage connection pools", "keywords": [ "framework", "php", - "upf" + "pools", + "utopia" ], "support": { - "issues": "https://github.com/utopia-php/http/issues", - "source": "https://github.com/utopia-php/http/tree/0.33.28" + "issues": "https://github.com/utopia-php/pools/issues", + "source": "https://github.com/utopia-php/pools/tree/0.8.2" }, - "time": "2025-09-25T10:44:24+00:00" + "time": "2025-04-17T02:04:54+00:00" }, { - "name": "utopia-php/pools", - "version": "0.8.2", + "name": "utopia-php/servers", + "version": "0.2.0", "source": { "type": "git", - "url": "https://github.com/utopia-php/pools.git", - "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d" + "url": "https://github.com/utopia-php/servers.git", + "reference": "92de8b5cd52fe2dc4bc873c39f8f4e8bb2ef2332" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/pools/zipball/05c67aba42eb68ac65489cc1e7fc5db83db2dd4d", - "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d", + "url": "https://api.github.com/repos/utopia-php/servers/zipball/92de8b5cd52fe2dc4bc873c39f8f4e8bb2ef2332", + "reference": "92de8b5cd52fe2dc4bc873c39f8f4e8bb2ef2332", "shasum": "" }, "require": { - "php": ">=8.3", - "utopia-php/telemetry": "0.1.*" + "php": ">=8.0", + "utopia-php/di": "0.1.*", + "utopia-php/validators": "0.0.*" }, "require-dev": { - "laravel/pint": "1.*", - "phpstan/phpstan": "1.*", - "phpunit/phpunit": "11.*" + "laravel/pint": "^0.2.3", + "phpstan/phpstan": "^1.8", + "phpunit/phpunit": "^9.5.5" }, "type": "library", "autoload": { "psr-4": { - "Utopia\\Pools\\": "src/Pools" + "Utopia\\Servers\\": "src/Servers" } }, "notification-url": "https://packagist.org/downloads/", @@ -2391,18 +2399,19 @@ "email": "team@appwrite.io" } ], - "description": "A simple library to manage connection pools", + "description": "A base library for building Utopia style servers.", "keywords": [ "framework", "php", - "pools", + "servers", + "upf", "utopia" ], "support": { - "issues": "https://github.com/utopia-php/pools/issues", - "source": "https://github.com/utopia-php/pools/tree/0.8.2" + "issues": "https://github.com/utopia-php/servers/issues", + "source": "https://github.com/utopia-php/servers/tree/0.2.0" }, - "time": "2025-04-17T02:04:54+00:00" + "time": "2025-10-21T08:56:24+00:00" }, { "name": "utopia-php/telemetry", @@ -2453,6 +2462,52 @@ "source": "https://github.com/utopia-php/telemetry/tree/0.1.1" }, "time": "2025-03-17T11:57:52+00:00" + }, + { + "name": "utopia-php/validators", + "version": "0.0.2", + "source": { + "type": "git", + "url": "https://github.com/utopia-php/validators.git", + "reference": "894210695c5d35fa248fb65f7fe7237b6ff4fb0b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/utopia-php/validators/zipball/894210695c5d35fa248fb65f7fe7237b6ff4fb0b", + "reference": "894210695c5d35fa248fb65f7fe7237b6ff4fb0b", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "ext-xdebug": "*", + "laravel/pint": "^1.2", + "phpstan/phpstan": "1.*", + "phpunit/phpunit": "^9.5.25" + }, + "type": "library", + "autoload": { + "psr-4": { + "Utopia\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A lightweight collection of reusable validators for Utopia projects", + "keywords": [ + "php", + "utopia", + "validation", + "validator" + ], + "support": { + "issues": "https://github.com/utopia-php/validators/issues", + "source": "https://github.com/utopia-php/validators/tree/0.0.2" + }, + "time": "2025-10-20T21:52:28+00:00" } ], "packages-dev": [ diff --git a/src/Queue/Job.php b/src/Queue/Job.php index 591d867..49017cd 100644 --- a/src/Queue/Job.php +++ b/src/Queue/Job.php @@ -2,7 +2,7 @@ namespace Utopia\Queue; -use Utopia\Hook; +use Utopia\Servers\Hook; class Job extends Hook { diff --git a/src/Queue/Server.php b/src/Queue/Server.php index 3ee64c4..11c6cce 100644 --- a/src/Queue/Server.php +++ b/src/Queue/Server.php @@ -5,7 +5,7 @@ use Exception; use Throwable; use Utopia\Console; -use Utopia\Hook; +use Utopia\Servers\Hook; use Utopia\Telemetry\Adapter as Telemetry; use Utopia\Telemetry\Adapter\None as NoTelemetry; use Utopia\Telemetry\Histogram;