-[](https://travis-ci.org/utopia-php/framework)
-
+[](https://travis-ci.org/utopia-php/http)
+
[](https://discord.gg/GSeTUeA)
-Utopia Framework is a PHP MVC based framework with minimal must-have features for professional, simple, advanced and secure web development. This library is maintained by the [Appwrite team](https://appwrite.io).
+Utopia HTTP is a PHP MVC based framework with minimal must-have features for professional, simple, advanced and secure web development. This library is maintained by the [Appwrite team](https://appwrite.io).
-Utopia Framework is dependency free. Any extra features such as authentication, caching will be available as standalone models in order to keep the framework core as clean, light and easy to learn.
+Utopia HTTP keeps routing and request lifecycle concerns separate from resource wiring by relying on the standalone Utopia DI package for dependency injection.
## Getting Started
-Install using composer:
+Install using Composer:
+
```bash
-composer require utopia-php/framework
+composer require utopia-php/http
```
-Init your first application:
+Init your first application in `src/server.php`:
+
```php
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
-use Utopia\App;
-use Utopia\Request;
-use Utopia\Response;
+use Utopia\DI\Container;
+use Utopia\Http\Http;
+use Utopia\Http\Request;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\FPM\Server;
-App::get('/hello-world') // Define Route
+$container = new Container();
+
+Http::get('/hello-world') // Define Route
->inject('request')
->inject('response')
->action(
- function($request, $response) {
+ function(Request $request, Response $response) {
$response
->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
->addHeader('Expires', '0')
@@ -38,90 +44,230 @@ App::get('/hello-world') // Define Route
}
);
-App::setMode(App::MODE_TYPE_PRODUCTION); // Define Mode
+Http::setMode(Http::MODE_TYPE_PRODUCTION);
-$app = new App('America/New_York');
-$request = new Request();
-$response = new Response();
+$http = new Http(new Server(), 'America/New_York', $container);
+$http->start();
+```
-$app->run($request, $response);
+Run HTTP server:
+
+```bash
+php -S localhost:8000 src/server.php
```
-### Hooks
+Send HTTP request:
+
+```bash
+curl http://localhost:8000/hello-world
+```
+
+### Server Adapters
+
+The library supports server adapters to be able to run on any PHP setup. You could use the FPM or Swoole server.
+
+#### Use PHP FPM server
-There are three types of hooks, init hooks, shutdown hooks and error hooks. Init hooks are executed before the route action is executed. Shutdown hook is executed after route action is executed before application shuts down. Finally error hooks are executed whenever there's an error in the application lifecycle. You can provide multiple hooks for each stage. If you do not assign groups to the hook, by default the hook will be executed for every route.
+```php
+use Utopia\DI\Container;
+use Utopia\Http\Http;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\FPM\Server;
+
+$container = new Container();
+
+Http::get('/')
+ ->inject('response')
+ ->action(
+ function(Response $response) {
+ $response->send('Hello from PHP FPM');
+ }
+ );
+
+$http = new Http(new Server(), 'America/New_York', $container);
+$http->start();
+```
+
+> When using PHP FPM, you can use the command `php -S localhost:80 src/server.php` to run the HTTP server locally
+
+#### Using Swoole server
```php
-require_once __DIR__ . '/../../vendor/autoload.php';
+use Utopia\DI\Container;
+use Utopia\Http\Http;
+use Utopia\Http\Request;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\Swoole\Server;
-use Utopia\App;
-use Utopia\Request;
-use Utopia\Response;
+$container = new Container();
-App::init()
+Http::get('/')
+ ->inject('request')
->inject('response')
- ->action(function($response) {
- $response->addHeader('content-type', 'application/json');
+ ->action(
+ function(Request $request, Response $response) {
+ $response->send('Hello from Swoole');
+ }
+ );
+
+$http = new Http(new Server('0.0.0.0', '80'), 'America/New_York', $container);
+$http->start();
+```
+
+> When using Swoole, you can use the command `php src/server.php` to run the HTTP server locally, but you need Swoole installed. For setup with Docker, check out our [example application](/example)
+
+### Parameters
+
+Parameters are used to receive input into endpoint action from the HTTP request. Parameters could be defined as URL parameters or in a body with a structure such as JSON.
+
+Every parameter must have a validator defined. Validators are simple classes that verify the input and ensure the security of inputs. You can define your own validators or use some of [built-in validators](/src/Http/Validator).
+
+Define an endpoint with params:
+
+```php
+Http::get('/')
+ ->param('name', 'World', new Text(256), 'Name to greet. Optional, max length 256.', true)
+ ->inject('response')
+ ->action(function(string $name, Response $response) {
+ $response->send('Hello ' . $name);
});
+```
-App::error()
+Send HTTP requests to ensure the parameter works:
+
+```bash
+curl http://localhost:8000/hello-world
+curl http://localhost:8000/hello-world?name=Utopia
+curl http://localhost:8000/hello-world?name=Appwrite
+```
+
+It's always recommended to use params instead of getting params or body directly from the request resource. If you do that intentionally, always make sure to run validation right after fetching such a raw input.
+
+### Hooks
+
+There are three types of hooks:
+
+- **Init hooks** are executed before the route action is executed
+- **Shutdown hooks** are executed after route action is finished, but before application shuts down
+- **Error hooks** are executed whenever there's an error in the application lifecycle.
+
+You can provide multiple hooks for each stage. If you do not assign groups to the hook, by default, the hook will be executed for every route. If a group is defined on a hook, it will only run during the lifecycle of a request with the same group name on the action.
+
+```php
+Http::init()
+ ->inject('request')
+ ->action(function(Request $request) {
+ \var_dump("Recieved: " . $request->getMethod() . ' ' . $request->getURI());
+ });
+
+Http::shutdown()
+ ->inject('response')
+ ->action(function(Response $response) {
+ \var_dump('Responding with status code: ' . $response->getStatusCode());
+ });
+
+Http::error()
->inject('error')
->inject('response')
- ->action(function($error, $response) {
+ ->action(function(\Throwable $error, Response $response) {
$response
->setStatusCode(500)
->send('Error occurred ' . $error);
});
+```
-App::get('/hello-world') // Define Route
- ->inject('request')
+Hooks are designed to be actions that run during the lifecycle of requests. Hooks should include functional logic. Hooks are not designed to prepare dependencies or context for the request. For such a use case, you should use resources.
+
+### Groups
+
+Groups allow you to define common behavior for multiple endpoints.
+
+You can start by defining a group on an endpoint. Keep in mind you can also define multiple groups on a single endpoint.
+
+```php
+Http::get('/v1/health')
+ ->groups(['api', 'public'])
->inject('response')
->action(
- function($request, $response) {
- $response
- ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
- ->addHeader('Expires', '0')
- ->addHeader('Pragma', 'no-cache')
- ->json(['Hello' => 'World']);
+ function(Response $response) {
+ $response->send('OK');
}
);
+```
+
+Now you can define hooks that would apply only to specific groups. Remember, hooks can also be assigned to multiple groups.
+
+```php
+Http::init()
+ ->groups(['api'])
+ ->inject('request')
+ ->inject('response')
+ ->action(function(Request $request, Response $response) {
+ $apiKey = $request->getHeader('x-api-key', '');
+
+ if(empty($apiKey)) {
+ $response
+ ->setStatusCode(Response::STATUS_CODE_UNAUTHORIZED)
+ ->send('API key missing.');
+ }
+ });
+```
+
+Groups are designed to be actions that run during the lifecycle of requests to endpoints that have some logic in common. Groups allow you to prevent code duplication and are designed to be defined anywhere in your source code to allow flexibility.
-App::setMode(App::MODE_TYPE_PRODUCTION); // Define Mode
+### Resources
-$app = new App('America/New_York');
-$request = new Request();
-$response = new Response();
+Resources allow you to prepare dependencies for requests such as database connections or shared services. Register application dependencies on the DI container with `set()`. Runtime values such as `request`, `response`, `route`, `error`, and `context` are scoped by `Http` for each request.
-$app->run($request, $response);
+Define a dependency on the DI container:
+
+```php
+$container->set('bootTime', function () {
+ return \microtime(true);
+});
+```
+
+Inject resource into endpoint action:
+
+```php
+$http = new Http(new Server(), 'America/New_York', $container);
+
+Http::get('/')
+ ->inject('bootTime')
+ ->inject('response')
+ ->action(function(float $bootTime, Response $response) {
+ $response->send('Process started at: ' . \strval($bootTime));
+ });
```
+Inject resource into a hook:
+
+```php
+Http::shutdown()
+ ->inject('bootTime')
+ ->action(function(float $bootTime) {
+ $uptime = \microtime(true) - $bootTime;
+ \var_dump("Process uptime: " . $uptime . " seconds");
+ });
+```
+
+In advanced scenarios, resources can also be injected into other resources or endpoint parameters.
+
+Resources are designed to prepare dependencies or context for the request. Resources are not meant to do functional logic or return callbacks. For such a use case, you should use hooks.
+
+To learn more about architecture and features for this library, check out more in-depth [Getting started guide](/docs/Getting-Starting-Guide.md).
+
## System Requirements
-Utopia Framework requires PHP 8.0 or later. We recommend using the latest PHP version whenever possible.
+Utopia HTTP requires PHP 8.2 or later. We recommend using the latest PHP version whenever possible.
## More from Utopia
-Our ecosystem support other thin PHP projects aiming to extend the core PHP Utopia framework.
-
-Each project is focused on solving a single, very simple problem and you can use composer to include any of them in your next project.
-
-Library | Description
---- | ---
-**[Utopia AB](https://github.com/utopia-php/ab)** | Simple PHP library for managing AB testing on the server side.
-**[Utopia Abuse](https://github.com/utopia-php/abuse)** | Simple PHP library for rate limiting usage of different features in your app or API.
-**[Utopia Analytics](https://github.com/utopia-php/analytics)** | Simple PHP library to send information about events or pageviews to Google Analytics.
-**[Utopia Audit](https://github.com/utopia-php/audit)** | Simple PHP library for audit logging users actions and system events
-**[Utopia Cache](https://github.com/utopia-php/cache)** | Simple PHP library for managing cache with different storage adapters.
-**[Utopia CLI](https://github.com/utopia-php/cli)** | Simple PHP library for for building simple command line tools.
-**[Utopia Config](https://github.com/utopia-php/config)** | Simple PHP library for managing your app configuration.
-**[Utopia Database](https://github.com/utopia-php/database)** | Simple PHP library for managing application persistency. It supports multiple database adapters.
-**[Utopia Domains](https://github.com/utopia-php/domains)** | Simple PHP library for parsing domain names.
-**[Utopia Image](https://github.com/utopia-php/image)** | Simple PHP library for creating common image manipulations that is easy to use.
-**[Utopia Locale](https://github.com/utopia-php/locale)** | Simple PHP library for adding support to multiple locales in your app or API.
-**[Utopia Preloader](https://github.com/utopia-php/preloader)** | Simple PHP library for managing PHP preloading configuration.
-**[Utopia Registry](https://github.com/utopia-php/registry)** | Simple PHP library for dependency injection and lazy loading of objects or resources.
-**[Utopia System](https://github.com/utopia-php/system)** | Simple PHP library for obtaining information about the host's system.
-**[Utopia Storage](https://github.com/utopia-php/storage)** | Simple and lite PHP library for managing application storage. It supports multiple storage adapters.
+Our ecosystem supports other thin PHP projects aiming to extend the core PHP Utopia HTTP.
+
+Each project is focused on solving a single, very simple problem and you can use composer to include any of them in your next project.
+
+You can find all libraries in [GitHub Utopia organization](https://github.com/utopia-php).
## Contributing
@@ -129,16 +275,10 @@ All code contributions - including those of people having commit access - must g
Fork the project, create a feature branch, and send us a pull request.
-You can refer to the [Contributing Guide](https://github.com/utopia-php/framework/blob/master/CONTRIBUTING.md) for more info.
+You can refer to the [Contributing Guide](https://github.com/utopia-php/http/blob/master/CONTRIBUTING.md) for more info.
For security issues, please email security@appwrite.io instead of posting a public issue in GitHub.
-### Testing
-
- - `docker-compose up -d`
- - `docker-compose exec web vendor/bin/phpunit --configuration phpunit.xml`
- - `docker-compose exec web vendor/bin/psalm --show-info=true`
-
## Copyright and license
The MIT License (MIT) [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)
diff --git a/composer.json b/composer.json
index fe84d0d0..40e0392d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,33 +1,51 @@
{
- "name": "utopia-php/framework",
- "description": "A simple, light and advanced PHP framework",
+ "name": "utopia-php/http",
+ "description": "A simple, light and advanced PHP HTTP framework",
"type": "library",
"keywords": [
"php",
"framework",
+ "http",
"upf"
],
"license": "MIT",
"minimum-stability": "stable",
"autoload": {
"psr-4": {
- "Utopia\\": "src/"
+ "Utopia\\": "src/",
+ "Tests\\E2E\\": "tests/e2e"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "Utopia\\Http\\Tests\\": "tests/"
}
},
"scripts": {
"lint": "vendor/bin/pint --test",
"format": "vendor/bin/pint",
- "check": "vendor/bin/phpstan analyse -c phpstan.neon",
+ "check": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit 512M",
"test": "vendor/bin/phpunit --configuration phpunit.xml",
"bench": "vendor/bin/phpbench run --report=benchmark"
},
"require": {
- "php": ">=8.0"
+ "php": ">=8.2",
+ "utopia-php/di": "0.3.*",
+ "utopia-php/validators": "0.2.*",
+ "ext-swoole": "*"
+ },
+ "config": {
+ "allow-plugins": {
+ "php-http/discovery": true,
+ "tbachert/spi": true
+ }
},
"require-dev": {
+ "doctrine/instantiator": "^1.5",
+ "laravel/pint": "1.*",
+ "phpbench/phpbench": "^1.2",
+ "phpstan/phpstan": "1.*",
"phpunit/phpunit": "^9.5.25",
- "laravel/pint": "^1.2",
- "phpstan/phpstan": "^1.10",
- "phpbench/phpbench": "^1.2"
+ "swoole/ide-helper": "4.8.3"
}
}
diff --git a/composer.lock b/composer.lock
index 9bcef239..c854c2ab 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,21 +4,171 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "d41ea47cadd897ad4053410229874733",
- "packages": [],
+ "content-hash": "5afd948989df91d546b1694354e2f9d2",
+ "packages": [
+ {
+ "name": "psr/container",
+ "version": "2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/container.git",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Container\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common Container Interface (PHP FIG PSR-11)",
+ "homepage": "https://github.com/php-fig/container",
+ "keywords": [
+ "PSR-11",
+ "container",
+ "container-interface",
+ "container-interop",
+ "psr"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/2.0.2"
+ },
+ "time": "2021-11-05T16:47:00+00:00"
+ },
+ {
+ "name": "utopia-php/di",
+ "version": "0.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/utopia-php/di.git",
+ "reference": "68873b7267842315d01d82a83b988bae525eab31"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/utopia-php/di/zipball/68873b7267842315d01d82a83b988bae525eab31",
+ "reference": "68873b7267842315d01d82a83b988bae525eab31",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.2",
+ "psr/container": "^2.0"
+ },
+ "require-dev": {
+ "laravel/pint": "^1.27",
+ "phpbench/phpbench": "^1.2",
+ "phpstan/phpstan": "^2.1",
+ "phpunit/phpunit": "^9.5.25",
+ "swoole/ide-helper": "4.8.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Utopia\\": "src/",
+ "Tests\\E2E\\": "tests/e2e"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "A simple and lite library for managing dependency injections",
+ "keywords": [
+ "PSR-11",
+ "container",
+ "dependency-injection",
+ "di",
+ "php",
+ "utopia"
+ ],
+ "support": {
+ "issues": "https://github.com/utopia-php/di/issues",
+ "source": "https://github.com/utopia-php/di/tree/0.3.1"
+ },
+ "time": "2026-03-13T05:47:23+00:00"
+ },
+ {
+ "name": "utopia-php/validators",
+ "version": "0.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/utopia-php/validators.git",
+ "reference": "30b6030a5b100fc1dff34506e5053759594b2a20"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/utopia-php/validators/zipball/30b6030a5b100fc1dff34506e5053759594b2a20",
+ "reference": "30b6030a5b100fc1dff34506e5053759594b2a20",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.0"
+ },
+ "require-dev": {
+ "laravel/pint": "1.*",
+ "phpstan/phpstan": "2.*",
+ "phpunit/phpunit": "11.*"
+ },
+ "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.2.0"
+ },
+ "time": "2026-01-13T09:16:51+00:00"
+ }
+ ],
"packages-dev": [
{
"name": "doctrine/annotations",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
+ "reference": "901c2ee5d26eb64ff43c47976e114bf00843acf7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/901c2ee5d26eb64ff43c47976e114bf00843acf7",
+ "reference": "901c2ee5d26eb64ff43c47976e114bf00843acf7",
"shasum": ""
},
"require": {
@@ -30,10 +180,10 @@
"require-dev": {
"doctrine/cache": "^2.0",
"doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.8.0",
+ "phpstan/phpstan": "^1.10.28",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "symfony/cache": "^5.4 || ^6",
- "vimeo/psalm": "^4.10"
+ "symfony/cache": "^5.4 || ^6.4 || ^7",
+ "vimeo/psalm": "^4.30 || ^5.14"
},
"suggest": {
"php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
@@ -79,36 +229,37 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/2.0.1"
+ "source": "https://github.com/doctrine/annotations/tree/2.0.2"
},
- "time": "2023-02-02T22:02:53+00:00"
+ "abandoned": true,
+ "time": "2024-09-05T10:17:24+00:00"
},
{
"name": "doctrine/instantiator",
- "version": "2.0.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
- "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
"shasum": ""
},
"require": {
- "php": "^8.1"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^11",
+ "doctrine/coding-standard": "^9 || ^11",
"ext-pdo": "*",
"ext-phar": "*",
- "phpbench/phpbench": "^1.2",
- "phpstan/phpstan": "^1.9.4",
- "phpstan/phpstan-phpunit": "^1.3",
- "phpunit/phpunit": "^9.5.27",
- "vimeo/psalm": "^5.4"
+ "phpbench/phpbench": "^0.16 || ^1",
+ "phpstan/phpstan": "^1.4",
+ "phpstan/phpstan-phpunit": "^1",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.30 || ^5.4"
},
"type": "library",
"autoload": {
@@ -135,7 +286,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+ "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
},
"funding": [
{
@@ -151,31 +302,31 @@
"type": "tidelift"
}
],
- "time": "2022-12-30T00:23:10+00:00"
+ "time": "2022-12-30T00:15:36+00:00"
},
{
"name": "doctrine/lexer",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "84a527db05647743d50373e0ec53a152f2cde568"
+ "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
- "reference": "84a527db05647743d50373e0ec53a152f2cde568",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+ "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
"shasum": ""
},
"require": {
"php": "^8.1"
},
"require-dev": {
- "doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.9",
- "phpunit/phpunit": "^9.5",
+ "doctrine/coding-standard": "^12",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^10.5",
"psalm/plugin-phpunit": "^0.18.3",
- "vimeo/psalm": "^5.0"
+ "vimeo/psalm": "^5.21"
},
"type": "library",
"autoload": {
@@ -212,7 +363,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/3.0.0"
+ "source": "https://github.com/doctrine/lexer/tree/3.0.1"
},
"funding": [
{
@@ -228,20 +379,20 @@
"type": "tidelift"
}
],
- "time": "2022-12-15T16:57:16+00:00"
+ "time": "2024-02-05T11:56:58+00:00"
},
{
"name": "laravel/pint",
- "version": "v1.13.7",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
- "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece"
+ "reference": "bdec963f53172c5e36330f3a400604c69bf02d39"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/pint/zipball/4157768980dbd977f1c4b4cc94997416d8b30ece",
- "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece",
+ "url": "https://api.github.com/repos/laravel/pint/zipball/bdec963f53172c5e36330f3a400604c69bf02d39",
+ "reference": "bdec963f53172c5e36330f3a400604c69bf02d39",
"shasum": ""
},
"require": {
@@ -249,16 +400,17 @@
"ext-mbstring": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
- "php": "^8.1.0"
+ "php": "^8.2.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^3.38.0",
- "illuminate/view": "^10.30.1",
- "laravel-zero/framework": "^10.3.0",
- "mockery/mockery": "^1.6.6",
- "nunomaduro/larastan": "^2.6.4",
- "nunomaduro/termwind": "^1.15.1",
- "pestphp/pest": "^2.24.2"
+ "friendsofphp/php-cs-fixer": "^3.94.2",
+ "illuminate/view": "^12.54.1",
+ "larastan/larastan": "^3.9.3",
+ "laravel-zero/framework": "^12.0.5",
+ "mockery/mockery": "^1.6.12",
+ "nunomaduro/termwind": "^2.4.0",
+ "pestphp/pest": "^3.8.6",
+ "shipfastlabs/agent-detector": "^1.1.0"
},
"bin": [
"builds/pint"
@@ -284,6 +436,7 @@
"description": "An opinionated code formatter for PHP.",
"homepage": "https://laravel.com",
"keywords": [
+ "dev",
"format",
"formatter",
"lint",
@@ -294,20 +447,20 @@
"issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint"
},
- "time": "2023-12-05T19:43:12+00:00"
+ "time": "2026-03-12T15:51:39+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.1",
+ "version": "1.13.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+ "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+ "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
"shasum": ""
},
"require": {
@@ -315,11 +468,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -345,7 +499,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
},
"funding": [
{
@@ -353,29 +507,31 @@
"type": "tidelift"
}
],
- "time": "2023-03-08T13:26:56+00:00"
+ "time": "2025-08-01T08:46:24+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.18.0",
+ "version": "v5.7.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+ "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
+ "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
+ "ext-json": "*",
"ext-tokenizer": "*",
- "php": ">=7.0"
+ "php": ">=7.4"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -383,7 +539,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.9-dev"
+ "dev-master": "5.x-dev"
}
},
"autoload": {
@@ -407,26 +563,27 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
},
- "time": "2023-12-10T21:03:43+00:00"
+ "time": "2025-12-06T11:56:16+00:00"
},
{
"name": "phar-io/manifest",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+ "reference": "54750ef60c58e43759730615a392c31c80e23176"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+ "reference": "54750ef60c58e43759730615a392c31c80e23176",
"shasum": ""
},
"require": {
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-phar": "*",
"ext-xmlwriter": "*",
"phar-io/version": "^3.0.1",
@@ -467,9 +624,15 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": {
"issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+ "source": "https://github.com/phar-io/manifest/tree/2.0.4"
},
- "time": "2021-07-20T11:28:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2024-03-03T12:33:53+00:00"
},
{
"name": "phar-io/version",
@@ -524,24 +687,24 @@
},
{
"name": "phpbench/container",
- "version": "2.2.2",
+ "version": "2.2.3",
"source": {
"type": "git",
"url": "https://github.com/phpbench/container.git",
- "reference": "a59b929e00b87b532ca6d0edd8eca0967655af33"
+ "reference": "0c7b2d36c1ea53fe27302fb8873ded7172047196"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpbench/container/zipball/a59b929e00b87b532ca6d0edd8eca0967655af33",
- "reference": "a59b929e00b87b532ca6d0edd8eca0967655af33",
+ "url": "https://api.github.com/repos/phpbench/container/zipball/0c7b2d36c1ea53fe27302fb8873ded7172047196",
+ "reference": "0c7b2d36c1ea53fe27302fb8873ded7172047196",
"shasum": ""
},
"require": {
"psr/container": "^1.0|^2.0",
- "symfony/options-resolver": "^4.2 || ^5.0 || ^6.0 || ^7.0"
+ "symfony/options-resolver": "^4.2 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.16",
+ "php-cs-fixer/shim": "^3.89",
"phpstan/phpstan": "^0.12.52",
"phpunit/phpunit": "^8"
},
@@ -569,73 +732,22 @@
"description": "Simple, configurable, service container.",
"support": {
"issues": "https://github.com/phpbench/container/issues",
- "source": "https://github.com/phpbench/container/tree/2.2.2"
+ "source": "https://github.com/phpbench/container/tree/2.2.3"
},
- "time": "2023-10-30T13:38:26+00:00"
- },
- {
- "name": "phpbench/dom",
- "version": "0.3.3",
- "source": {
- "type": "git",
- "url": "https://github.com/phpbench/dom.git",
- "reference": "786a96db538d0def931f5b19225233ec42ec7a72"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpbench/dom/zipball/786a96db538d0def931f5b19225233ec42ec7a72",
- "reference": "786a96db538d0def931f5b19225233ec42ec7a72",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "php": "^7.3||^8.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^3.14",
- "phpstan/phpstan": "^1.10",
- "phpunit/phpunit": "^8.0||^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PhpBench\\Dom\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Daniel Leech",
- "email": "daniel@dantleech.com"
- }
- ],
- "description": "DOM wrapper to simplify working with the PHP DOM implementation",
- "support": {
- "issues": "https://github.com/phpbench/dom/issues",
- "source": "https://github.com/phpbench/dom/tree/0.3.3"
- },
- "time": "2023-03-06T23:46:57+00:00"
+ "time": "2025-11-06T09:05:13+00:00"
},
{
"name": "phpbench/phpbench",
- "version": "1.2.15",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/phpbench/phpbench.git",
- "reference": "f7000319695cfad04a57fc64bf7ef7abdf4c437c"
+ "reference": "9a28fd0833f11171b949843c6fd663eb69b6d14c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpbench/phpbench/zipball/f7000319695cfad04a57fc64bf7ef7abdf4c437c",
- "reference": "f7000319695cfad04a57fc64bf7ef7abdf4c437c",
+ "url": "https://api.github.com/repos/phpbench/phpbench/zipball/9a28fd0833f11171b949843c6fd663eb69b6d14c",
+ "reference": "9a28fd0833f11171b949843c6fd663eb69b6d14c",
"shasum": ""
},
"require": {
@@ -646,30 +758,31 @@
"ext-reflection": "*",
"ext-spl": "*",
"ext-tokenizer": "*",
- "php": "^8.1",
- "phpbench/container": "^2.1",
- "phpbench/dom": "~0.3.3",
+ "php": "^8.2",
+ "phpbench/container": "^2.2",
"psr/log": "^1.1 || ^2.0 || ^3.0",
"seld/jsonlint": "^1.1",
- "symfony/console": "^4.2 || ^5.0 || ^6.0 || ^7.0",
- "symfony/filesystem": "^4.2 || ^5.0 || ^6.0 || ^7.0",
- "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
- "symfony/options-resolver": "^4.2 || ^5.0 || ^6.0 || ^7.0",
- "symfony/process": "^4.2 || ^5.0 || ^6.0 || ^7.0",
+ "symfony/console": "^6.1 || ^7.0 || ^8.0",
+ "symfony/filesystem": "^6.1 || ^7.0 || ^8.0",
+ "symfony/finder": "^6.1 || ^7.0 || ^8.0",
+ "symfony/options-resolver": "^6.1 || ^7.0 || ^8.0",
+ "symfony/process": "^6.1 || ^7.0 || ^8.0",
"webmozart/glob": "^4.6"
},
"require-dev": {
"dantleech/invoke": "^2.0",
- "friendsofphp/php-cs-fixer": "^3.0",
+ "ergebnis/composer-normalize": "^2.39",
"jangregor/phpstan-prophecy": "^1.0",
- "phpspec/prophecy": "dev-master",
+ "php-cs-fixer/shim": "^3.9",
+ "phpspec/prophecy": "^1.22",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
- "phpunit/phpunit": "^10.0",
- "rector/rector": "^0.18.10",
- "symfony/error-handler": "^5.2 || ^6.0 || ^7.0",
- "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+ "phpunit/phpunit": "^11.5",
+ "rector/rector": "^1.2",
+ "sebastian/exporter": "^6.3.2",
+ "symfony/error-handler": "^6.1 || ^7.0 || ^8.0",
+ "symfony/var-dumper": "^6.1 || ^7.0 || ^8.0"
},
"suggest": {
"ext-xdebug": "For Xdebug profiling extension."
@@ -712,7 +825,7 @@
],
"support": {
"issues": "https://github.com/phpbench/phpbench/issues",
- "source": "https://github.com/phpbench/phpbench/tree/1.2.15"
+ "source": "https://github.com/phpbench/phpbench/tree/1.5.1"
},
"funding": [
{
@@ -720,20 +833,15 @@
"type": "github"
}
],
- "time": "2023-11-29T12:21:11+00:00"
+ "time": "2026-03-05T08:18:58+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "1.10.50",
- "source": {
- "type": "git",
- "url": "https://github.com/phpstan/phpstan.git",
- "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
- },
+ "version": "1.12.33",
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
- "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/37982d6fc7cbb746dda7773530cda557cdf119e1",
+ "reference": "37982d6fc7cbb746dda7773530cda557cdf119e1",
"shasum": ""
},
"require": {
@@ -776,45 +884,41 @@
{
"url": "https://github.com/phpstan",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
- "type": "tidelift"
}
],
- "time": "2023-12-13T10:59:42+00:00"
+ "time": "2026-02-28T20:30:03+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.30",
+ "version": "9.2.32",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089"
+ "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089",
- "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+ "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.18 || ^5.0",
+ "nikic/php-parser": "^4.19.1 || ^5.1.0",
"php": ">=7.3",
- "phpunit/php-file-iterator": "^3.0.3",
- "phpunit/php-text-template": "^2.0.2",
- "sebastian/code-unit-reverse-lookup": "^2.0.2",
- "sebastian/complexity": "^2.0",
- "sebastian/environment": "^5.1.2",
- "sebastian/lines-of-code": "^1.0.3",
- "sebastian/version": "^3.0.1",
- "theseer/tokenizer": "^1.2.0"
+ "phpunit/php-file-iterator": "^3.0.6",
+ "phpunit/php-text-template": "^2.0.4",
+ "sebastian/code-unit-reverse-lookup": "^2.0.3",
+ "sebastian/complexity": "^2.0.3",
+ "sebastian/environment": "^5.1.5",
+ "sebastian/lines-of-code": "^1.0.4",
+ "sebastian/version": "^3.0.2",
+ "theseer/tokenizer": "^1.2.3"
},
"require-dev": {
- "phpunit/phpunit": "^9.3"
+ "phpunit/phpunit": "^9.6"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -823,7 +927,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "9.2-dev"
+ "dev-main": "9.2.x-dev"
}
},
"autoload": {
@@ -852,7 +956,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
},
"funding": [
{
@@ -860,7 +964,7 @@
"type": "github"
}
],
- "time": "2023-12-22T06:47:57+00:00"
+ "time": "2024-08-22T04:23:01+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -1105,45 +1209,45 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.15",
+ "version": "9.6.34",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+ "reference": "b36f02317466907a230d3aa1d34467041271ef4a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b36f02317466907a230d3aa1d34467041271ef4a",
+ "reference": "b36f02317466907a230d3aa1d34467041271ef4a",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.3.1 || ^2",
+ "doctrine/instantiator": "^1.5.0 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
+ "myclabs/deep-copy": "^1.13.4",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
"php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.28",
- "phpunit/php-file-iterator": "^3.0.5",
+ "phpunit/php-code-coverage": "^9.2.32",
+ "phpunit/php-file-iterator": "^3.0.6",
"phpunit/php-invoker": "^3.1.1",
- "phpunit/php-text-template": "^2.0.3",
- "phpunit/php-timer": "^5.0.2",
- "sebastian/cli-parser": "^1.0.1",
- "sebastian/code-unit": "^1.0.6",
- "sebastian/comparator": "^4.0.8",
- "sebastian/diff": "^4.0.3",
- "sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.5",
- "sebastian/global-state": "^5.0.1",
- "sebastian/object-enumerator": "^4.0.3",
- "sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.2",
+ "phpunit/php-text-template": "^2.0.4",
+ "phpunit/php-timer": "^5.0.3",
+ "sebastian/cli-parser": "^1.0.2",
+ "sebastian/code-unit": "^1.0.8",
+ "sebastian/comparator": "^4.0.10",
+ "sebastian/diff": "^4.0.6",
+ "sebastian/environment": "^5.1.5",
+ "sebastian/exporter": "^4.0.8",
+ "sebastian/global-state": "^5.0.8",
+ "sebastian/object-enumerator": "^4.0.4",
+ "sebastian/resource-operations": "^3.0.4",
+ "sebastian/type": "^3.2.1",
"sebastian/version": "^3.0.2"
},
"suggest": {
@@ -1188,7 +1292,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.34"
},
"funding": [
{
@@ -1199,12 +1303,20 @@
"url": "https://github.com/sebastianbergmann",
"type": "github"
},
+ {
+ "url": "https://liberapay.com/sebastianbergmann",
+ "type": "liberapay"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/sebastianbergmann",
+ "type": "thanks_dev"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
"type": "tidelift"
}
],
- "time": "2023-12-01T16:55:19+00:00"
+ "time": "2026-01-27T05:45:00+00:00"
},
{
"name": "psr/cache",
@@ -1255,71 +1367,18 @@
},
"time": "2021-02-03T23:26:27+00:00"
},
- {
- "name": "psr/container",
- "version": "2.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/container.git",
- "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
- "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
- "shasum": ""
- },
- "require": {
- "php": ">=7.4.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Container\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common Container Interface (PHP FIG PSR-11)",
- "homepage": "https://github.com/php-fig/container",
- "keywords": [
- "PSR-11",
- "container",
- "container-interface",
- "container-interop",
- "psr"
- ],
- "support": {
- "issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/2.0.2"
- },
- "time": "2021-11-05T16:47:00+00:00"
- },
{
"name": "psr/log",
- "version": "3.0.0",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
"shasum": ""
},
"require": {
@@ -1354,22 +1413,22 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/3.0.0"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
- "time": "2021-07-14T16:46:02+00:00"
+ "time": "2024-09-11T13:17:53+00:00"
},
{
"name": "sebastian/cli-parser",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+ "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+ "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
"shasum": ""
},
"require": {
@@ -1404,7 +1463,7 @@
"homepage": "https://github.com/sebastianbergmann/cli-parser",
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
},
"funding": [
{
@@ -1412,7 +1471,7 @@
"type": "github"
}
],
- "time": "2020-09-28T06:08:49+00:00"
+ "time": "2024-03-02T06:27:43+00:00"
},
{
"name": "sebastian/code-unit",
@@ -1527,16 +1586,16 @@
},
{
"name": "sebastian/comparator",
- "version": "4.0.8",
+ "version": "4.0.10",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+ "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
- "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e4df00b9b3571187db2831ae9aada2c6efbd715d",
+ "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d",
"shasum": ""
},
"require": {
@@ -1589,15 +1648,27 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.10"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://liberapay.com/sebastianbergmann",
+ "type": "liberapay"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/sebastianbergmann",
+ "type": "thanks_dev"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+ "type": "tidelift"
}
],
- "time": "2022-09-14T12:41:17+00:00"
+ "time": "2026-01-24T09:22:56+00:00"
},
{
"name": "sebastian/complexity",
@@ -1658,16 +1729,16 @@
},
{
"name": "sebastian/diff",
- "version": "4.0.5",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+ "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+ "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
"shasum": ""
},
"require": {
@@ -1712,7 +1783,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
},
"funding": [
{
@@ -1720,7 +1791,7 @@
"type": "github"
}
],
- "time": "2023-05-07T05:35:17+00:00"
+ "time": "2024-03-02T06:30:58+00:00"
},
{
"name": "sebastian/environment",
@@ -1787,16 +1858,16 @@
},
{
"name": "sebastian/exporter",
- "version": "4.0.5",
+ "version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+ "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+ "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c",
"shasum": ""
},
"require": {
@@ -1852,28 +1923,40 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://liberapay.com/sebastianbergmann",
+ "type": "liberapay"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/sebastianbergmann",
+ "type": "thanks_dev"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+ "type": "tidelift"
}
],
- "time": "2022-09-14T06:03:37+00:00"
+ "time": "2025-09-24T06:03:27+00:00"
},
{
"name": "sebastian/global-state",
- "version": "5.0.6",
+ "version": "5.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+ "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+ "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
"shasum": ""
},
"require": {
@@ -1916,15 +1999,27 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://liberapay.com/sebastianbergmann",
+ "type": "liberapay"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/sebastianbergmann",
+ "type": "thanks_dev"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state",
+ "type": "tidelift"
}
],
- "time": "2023-08-02T09:26:13+00:00"
+ "time": "2025-08-10T07:10:35+00:00"
},
{
"name": "sebastian/lines-of-code",
@@ -2097,16 +2192,16 @@
},
{
"name": "sebastian/recursion-context",
- "version": "4.0.5",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+ "reference": "539c6691e0623af6dc6f9c20384c120f963465a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
- "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0",
+ "reference": "539c6691e0623af6dc6f9c20384c120f963465a0",
"shasum": ""
},
"require": {
@@ -2148,28 +2243,40 @@
"homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://liberapay.com/sebastianbergmann",
+ "type": "liberapay"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/sebastianbergmann",
+ "type": "thanks_dev"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+ "type": "tidelift"
}
],
- "time": "2023-02-03T06:07:39+00:00"
+ "time": "2025-08-10T06:57:39+00:00"
},
{
"name": "sebastian/resource-operations",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
"shasum": ""
},
"require": {
@@ -2181,7 +2288,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -2202,8 +2309,7 @@
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"support": {
- "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
- "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
},
"funding": [
{
@@ -2211,7 +2317,7 @@
"type": "github"
}
],
- "time": "2020-09-28T06:45:17+00:00"
+ "time": "2024-03-14T16:00:52+00:00"
},
{
"name": "sebastian/type",
@@ -2324,23 +2430,23 @@
},
{
"name": "seld/jsonlint",
- "version": "1.10.1",
+ "version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "76d449a358ece77d6f1d6331c68453e657172202"
+ "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202",
- "reference": "76d449a358ece77d6f1d6331c68453e657172202",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2",
+ "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2",
"shasum": ""
},
"require": {
"php": "^5.3 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^1.5",
+ "phpstan/phpstan": "^1.11",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
},
"bin": [
@@ -2372,7 +2478,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/jsonlint/issues",
- "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1"
+ "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0"
},
"funding": [
{
@@ -2384,50 +2490,85 @@
"type": "tidelift"
}
],
- "time": "2023-12-18T13:03:25+00:00"
+ "time": "2024-07-11T14:55:45+00:00"
+ },
+ {
+ "name": "swoole/ide-helper",
+ "version": "4.8.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/swoole/ide-helper.git",
+ "reference": "3ac4971814273889933b871e03b2a6b340e58f79"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/swoole/ide-helper/zipball/3ac4971814273889933b871e03b2a6b340e58f79",
+ "reference": "3ac4971814273889933b871e03b2a6b340e58f79",
+ "shasum": ""
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Team Swoole",
+ "email": "team@swoole.com"
+ }
+ ],
+ "description": "IDE help files for Swoole.",
+ "support": {
+ "issues": "https://github.com/swoole/ide-helper/issues",
+ "source": "https://github.com/swoole/ide-helper/tree/4.8.3"
+ },
+ "funding": [
+ {
+ "url": "https://gitee.com/swoole/swoole?donate=true",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/swoole",
+ "type": "github"
+ }
+ ],
+ "time": "2021-12-01T08:11:40+00:00"
},
{
"name": "symfony/console",
- "version": "v7.0.1",
+ "version": "v8.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5"
+ "reference": "15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/cdce5c684b2f920bb1343deecdfba356ffad83d5",
- "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5",
+ "url": "https://api.github.com/repos/symfony/console/zipball/15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a",
+ "reference": "15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a",
"shasum": ""
},
"require": {
- "php": ">=8.2",
- "symfony/polyfill-mbstring": "~1.0",
+ "php": ">=8.4",
+ "symfony/polyfill-mbstring": "^1.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/string": "^6.4|^7.0"
- },
- "conflict": {
- "symfony/dependency-injection": "<6.4",
- "symfony/dotenv": "<6.4",
- "symfony/event-dispatcher": "<6.4",
- "symfony/lock": "<6.4",
- "symfony/process": "<6.4"
+ "symfony/string": "^7.4|^8.0"
},
"provide": {
"psr/log-implementation": "1.0|2.0|3.0"
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^6.4|^7.0",
- "symfony/dependency-injection": "^6.4|^7.0",
- "symfony/event-dispatcher": "^6.4|^7.0",
- "symfony/http-foundation": "^6.4|^7.0",
- "symfony/http-kernel": "^6.4|^7.0",
- "symfony/lock": "^6.4|^7.0",
- "symfony/messenger": "^6.4|^7.0",
- "symfony/process": "^6.4|^7.0",
- "symfony/stopwatch": "^6.4|^7.0",
- "symfony/var-dumper": "^6.4|^7.0"
+ "symfony/config": "^7.4|^8.0",
+ "symfony/dependency-injection": "^7.4|^8.0",
+ "symfony/event-dispatcher": "^7.4|^8.0",
+ "symfony/http-foundation": "^7.4|^8.0",
+ "symfony/http-kernel": "^7.4|^8.0",
+ "symfony/lock": "^7.4|^8.0",
+ "symfony/messenger": "^7.4|^8.0",
+ "symfony/process": "^7.4|^8.0",
+ "symfony/stopwatch": "^7.4|^8.0",
+ "symfony/var-dumper": "^7.4|^8.0"
},
"type": "library",
"autoload": {
@@ -2461,7 +2602,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.0.1"
+ "source": "https://github.com/symfony/console/tree/v8.0.7"
},
"funding": [
{
@@ -2472,25 +2613,29 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-12-01T15:10:06+00:00"
+ "time": "2026-03-06T14:06:22+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.4.0",
+ "version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+ "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
- "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+ "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
"shasum": ""
},
"require": {
@@ -2498,12 +2643,12 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "3.4-dev"
- },
"thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
+ "branch-alias": {
+ "dev-main": "3.6-dev"
}
},
"autoload": {
@@ -2528,7 +2673,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -2544,27 +2689,30 @@
"type": "tidelift"
}
],
- "time": "2023-05-23T14:45:45+00:00"
+ "time": "2024-09-25T14:21:43+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v7.0.0",
+ "version": "v8.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7"
+ "reference": "7bf9162d7a0dff98d079b72948508fa48018a770"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7",
- "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/7bf9162d7a0dff98d079b72948508fa48018a770",
+ "reference": "7bf9162d7a0dff98d079b72948508fa48018a770",
"shasum": ""
},
"require": {
- "php": ">=8.2",
+ "php": ">=8.4",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
+ "require-dev": {
+ "symfony/process": "^7.4|^8.0"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -2591,7 +2739,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v7.0.0"
+ "source": "https://github.com/symfony/filesystem/tree/v8.0.6"
},
"funding": [
{
@@ -2602,32 +2750,36 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-07-27T06:33:22+00:00"
+ "time": "2026-02-25T16:59:43+00:00"
},
{
"name": "symfony/finder",
- "version": "v7.0.0",
+ "version": "v8.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56"
+ "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56",
- "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/441404f09a54de6d1bd6ad219e088cdf4c91f97c",
+ "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c",
"shasum": ""
},
"require": {
- "php": ">=8.2"
+ "php": ">=8.4"
},
"require-dev": {
- "symfony/filesystem": "^6.4|^7.0"
+ "symfony/filesystem": "^7.4|^8.0"
},
"type": "library",
"autoload": {
@@ -2655,7 +2807,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v7.0.0"
+ "source": "https://github.com/symfony/finder/tree/v8.0.6"
},
"funding": [
{
@@ -2666,29 +2818,33 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-10-31T17:59:56+00:00"
+ "time": "2026-01-29T09:41:02+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v7.0.0",
+ "version": "v8.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "700ff4096e346f54cb628ea650767c8130f1001f"
+ "reference": "d2b592535ffa6600c265a3893a7f7fd2bad82dd7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f",
- "reference": "700ff4096e346f54cb628ea650767c8130f1001f",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d2b592535ffa6600c265a3893a7f7fd2bad82dd7",
+ "reference": "d2b592535ffa6600c265a3893a7f7fd2bad82dd7",
"shasum": ""
},
"require": {
- "php": ">=8.2",
+ "php": ">=8.4",
"symfony/deprecation-contracts": "^2.5|^3"
},
"type": "library",
@@ -2722,7 +2878,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v7.0.0"
+ "source": "https://github.com/symfony/options-resolver/tree/v8.0.0"
},
"funding": [
{
@@ -2733,29 +2889,33 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-08-08T10:20:21+00:00"
+ "time": "2025-11-12T15:55:31+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.28.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -2765,12 +2925,9 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -2804,7 +2961,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
},
"funding": [
{
@@ -2815,41 +2972,42 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.28.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "875e90aeea2777b6f135677f618529449334a612"
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
- "reference": "875e90aeea2777b6f135677f618529449334a612",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -2885,7 +3043,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
},
"funding": [
{
@@ -2896,41 +3054,42 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2025-06-27T09:58:17+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.28.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -2969,7 +3128,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
},
"funding": [
{
@@ -2980,29 +3139,34 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.28.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "42292d99c55abe617799667f454222c54c60e229"
+ "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
- "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+ "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "ext-iconv": "*",
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -3012,12 +3176,9 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -3052,7 +3213,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
},
"funding": [
{
@@ -3063,29 +3224,33 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-07-28T09:04:16+00:00"
+ "time": "2024-12-23T08:48:59+00:00"
},
{
"name": "symfony/process",
- "version": "v7.0.0",
+ "version": "v8.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d"
+ "reference": "b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/13bdb1670c7f510494e04fcb2bfa29af63db9c0d",
- "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d",
+ "url": "https://api.github.com/repos/symfony/process/zipball/b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674",
+ "reference": "b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674",
"shasum": ""
},
"require": {
- "php": ">=8.2"
+ "php": ">=8.4"
},
"type": "library",
"autoload": {
@@ -3113,7 +3278,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v7.0.0"
+ "source": "https://github.com/symfony/process/tree/v8.0.5"
},
"funding": [
{
@@ -3124,42 +3289,47 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-11-20T16:43:42+00:00"
+ "time": "2026-01-26T15:08:38+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v3.4.0",
+ "version": "v3.6.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
- "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
"shasum": ""
},
"require": {
"php": ">=8.1",
- "psr/container": "^2.0"
+ "psr/container": "^1.1|^2.0",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "3.4-dev"
- },
"thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
+ "branch-alias": {
+ "dev-main": "3.6-dev"
}
},
"autoload": {
@@ -3195,7 +3365,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
},
"funding": [
{
@@ -3206,43 +3376,47 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-07-30T20:28:31+00:00"
+ "time": "2025-07-15T11:30:57+00:00"
},
{
"name": "symfony/string",
- "version": "v7.0.0",
+ "version": "v8.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620"
+ "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/92bd2bfbba476d4a1838e5e12168bef2fd1e6620",
- "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620",
+ "url": "https://api.github.com/repos/symfony/string/zipball/6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
+ "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
"shasum": ""
},
"require": {
- "php": ">=8.2",
- "symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-intl-grapheme": "~1.0",
- "symfony/polyfill-intl-normalizer": "~1.0",
- "symfony/polyfill-mbstring": "~1.0"
+ "php": ">=8.4",
+ "symfony/polyfill-ctype": "^1.8",
+ "symfony/polyfill-intl-grapheme": "^1.33",
+ "symfony/polyfill-intl-normalizer": "^1.0",
+ "symfony/polyfill-mbstring": "^1.0"
},
"conflict": {
"symfony/translation-contracts": "<2.5"
},
"require-dev": {
- "symfony/error-handler": "^6.4|^7.0",
- "symfony/http-client": "^6.4|^7.0",
- "symfony/intl": "^6.4|^7.0",
+ "symfony/emoji": "^7.4|^8.0",
+ "symfony/http-client": "^7.4|^8.0",
+ "symfony/intl": "^7.4|^8.0",
"symfony/translation-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^6.4|^7.0"
+ "symfony/var-exporter": "^7.4|^8.0"
},
"type": "library",
"autoload": {
@@ -3281,7 +3455,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v7.0.0"
+ "source": "https://github.com/symfony/string/tree/v8.0.6"
},
"funding": [
{
@@ -3292,25 +3466,29 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2023-11-29T08:40:23+00:00"
+ "time": "2026-02-09T10:14:57+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.2",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+ "reference": "b7489ce515e168639d17feec34b8847c326b0b3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c",
+ "reference": "b7489ce515e168639d17feec34b8847c326b0b3c",
"shasum": ""
},
"require": {
@@ -3339,7 +3517,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+ "source": "https://github.com/theseer/tokenizer/tree/1.3.1"
},
"funding": [
{
@@ -3347,20 +3525,20 @@
"type": "github"
}
],
- "time": "2023-11-20T00:12:19+00:00"
+ "time": "2025-11-17T20:03:58+00:00"
},
{
"name": "webmozart/glob",
- "version": "4.6.0",
+ "version": "4.7.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/glob.git",
- "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655"
+ "reference": "8a2842112d6916e61e0e15e316465b611f3abc17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655",
- "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655",
+ "url": "https://api.github.com/repos/webmozarts/glob/zipball/8a2842112d6916e61e0e15e316465b611f3abc17",
+ "reference": "8a2842112d6916e61e0e15e316465b611f3abc17",
"shasum": ""
},
"require": {
@@ -3394,19 +3572,20 @@
"description": "A PHP implementation of Ant's glob.",
"support": {
"issues": "https://github.com/webmozarts/glob/issues",
- "source": "https://github.com/webmozarts/glob/tree/4.6.0"
+ "source": "https://github.com/webmozarts/glob/tree/4.7.0"
},
- "time": "2022-05-24T19:45:58+00:00"
+ "time": "2024-03-07T20:33:40+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=8.0"
+ "php": ">=8.2",
+ "ext-swoole": "*"
},
- "platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "platform-dev": {},
+ "plugin-api-version": "2.6.0"
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 849fa5ec..322de5ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,27 @@
-version: '3'
-
services:
- web:
- build: .
+ fpm:
+ build:
+ context: .
+ dockerfile: Dockerfile.fpm
ports:
- "9020:80"
volumes:
- ./src:/usr/share/nginx/html/src
- - ./tests:/usr/share/nginx/html/tests
\ No newline at end of file
+ - ./tests:/usr/share/nginx/html/tests
+ networks:
+ - testing
+ depends_on:
+ - swoole
+ swoole:
+ build:
+ context: .
+ dockerfile: Dockerfile.swoole
+ ports:
+ - "9501:80"
+ volumes:
+ - ./src:/usr/src/code/src
+ - ./tests:/usr/src/code/tests
+ networks:
+ - testing
+networks:
+ testing:
\ No newline at end of file
diff --git a/docs/Getting-Starting-Guide.md b/docs/Getting-Starting-Guide.md
index ab1779ac..86455959 100644
--- a/docs/Getting-Starting-Guide.md
+++ b/docs/Getting-Starting-Guide.md
@@ -1,50 +1,38 @@
-# Getting Started with Utopia-PHP
+# Getting Started with Utopia HTTP
# Intro
-Utopia Framework is an easy-to-use PHP MVC based framework with minimal must-have features for professional, simple, advanced and secure web development. It follows an architecture like Express and is based on the declarative programming approach. Documenting and writing code are usually seen as two separate tasks and very often, documentation loses priority in the software development lifecycle. Utopia unifies the two with a flexible API that allows your code to be self-documenting. What’s interesting about Utopia is its ability to accept metadata along with it’s route definitions. This metadata can then be used for various purposes like generating documentation, swagger specifications and more.
+Utopia HTTP is an easy-to-use PHP MVC based framework with minimal must-have features for professional, simple, advanced and secure web development. It follows an architecture like Express and is based on the declarative programming approach. Documenting and writing code are usually seen as two separate tasks and very often, documentation loses priority in the software development lifecycle. Utopia unifies the two with a flexible API that allows your code to be self-documenting. What’s interesting about Utopia is its ability to accept metadata along with it’s route definitions. This metadata can then be used for various purposes like generating documentation, swagger specifications and more.
# Defining Routes
-If you’re new to Utopia, let’s get started by looking at an example of a basic GET route for an application that you can create using Utopia. We'll be using a [Swoole server](https://github.com/swoole/swoole-src) in this example, but you should be able to extend it to any HTTP server.
+If you’re new to Utopia, let’s get started by looking at an example of a basic GET route for an application that you can create using Utopia. We'll be using a [Swoole server](https://github.com/swoole/swoole-src) in this example, but you should be able to extend it to any HTTP server.
## Basic GET Route
```php
-use Utopia\App;
-use Utopia\Swoole\Request;
-use Utopia\Swoole\Response;
-use Swoole\Http\Server;
-use Swoole\Http\Request as SwooleRequest;
-use Swoole\Http\Response as SwooleResponse;
+use Utopia\Http\Http;
+use Utopia\Http\Request;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\Swoole\Server;
-$http = new Server("0.0.0.0", 8080);
-
-App::get('/')
+Http::get('/')
->inject('request')
->inject('response')
->action(
- function($request, $response) {
+ function(Request $request, Response $response) {
// Return raw HTML
$response->send("'.$line.'
'; - } - } - - $paragraphs = \str_replace("\n", '$index- $html = \str_replace($foundTxt[0], \array_map(function ($el) { - return ''; - }, \array_keys($foundTxt[0])), $html); - $html = \str_replace($foundPre[0], \array_map(function ($el) { - return '
'.$el.''; - }, \array_keys($foundPre[0])), $html); - - // your stuff - $search = [ - '/\>[^\S ]+/s', // strip whitespaces after tags, except space - '/[^\S ]+\', - '<', - '\\1', - ]; - - $html = \preg_replace($search, $replace, $html); - - // Replacing back with content - $html = \str_replace(\array_map(function ($el) { - return ''; - }, \array_keys($foundTxt[0])), $foundTxt[0], $html); - $html = \str_replace(\array_map(function ($el) { - return '
'.$el.''; - }, \array_keys($foundPre[0])), $foundPre[0], $html); - } - - return $html; - } - - /* View Helpers */ - - /** - * Exec - * - * Exec child View components - * - * @param array|self $view - * @return string - * - * @throws Exception - */ - public function exec($view): string - { - $output = ''; - - if (\is_array($view)) { - foreach ($view as $node) { /* @var $node self */ - if ($node instanceof self) { - $node->setParent($this); - $output .= $node->render(); - } - } - } - - if ($view instanceof self) { - $view->setParent($this); - $output = $view->render(); - } - - return $output; - } -} diff --git a/tests/HookTest.php b/tests/HookTest.php index 10164818..49a0afd5 100644 --- a/tests/HookTest.php +++ b/tests/HookTest.php @@ -1,6 +1,6 @@ app = new App('Asia/Tel_Aviv'); + Http::reset(); + $this->container = new Container(); + $this->http = new Http(new Server($this->container), 'Asia/Tel_Aviv'); $this->saveRequest(); } public function tearDown(): void { - $this->app = null; + $this->http = null; + $this->container = null; $this->restoreRequest(); } @@ -42,31 +49,31 @@ protected function restoreRequest(): void public function testCanGetDifferentModes(): void { - $this->assertEmpty(App::getMode()); - $this->assertFalse(App::isProduction()); - $this->assertFalse(App::isDevelopment()); - $this->assertFalse(App::isStage()); + $this->assertEmpty(Http::getMode()); + $this->assertFalse(Http::isProduction()); + $this->assertFalse(Http::isDevelopment()); + $this->assertFalse(Http::isStage()); - App::setMode(App::MODE_TYPE_PRODUCTION); + Http::setMode(Http::MODE_TYPE_PRODUCTION); - $this->assertEquals(App::MODE_TYPE_PRODUCTION, App::getMode()); - $this->assertTrue(App::isProduction()); - $this->assertFalse(App::isDevelopment()); - $this->assertFalse(App::isStage()); + $this->assertEquals(Http::MODE_TYPE_PRODUCTION, Http::getMode()); + $this->assertTrue(Http::isProduction()); + $this->assertFalse(Http::isDevelopment()); + $this->assertFalse(Http::isStage()); - App::setMode(App::MODE_TYPE_DEVELOPMENT); + Http::setMode(Http::MODE_TYPE_DEVELOPMENT); - $this->assertEquals(App::MODE_TYPE_DEVELOPMENT, App::getMode()); - $this->assertFalse(App::isProduction()); - $this->assertTrue(App::isDevelopment()); - $this->assertFalse(App::isStage()); + $this->assertEquals(Http::MODE_TYPE_DEVELOPMENT, Http::getMode()); + $this->assertFalse(Http::isProduction()); + $this->assertTrue(Http::isDevelopment()); + $this->assertFalse(Http::isStage()); - App::setMode(App::MODE_TYPE_STAGE); + Http::setMode(Http::MODE_TYPE_STAGE); - $this->assertEquals(App::MODE_TYPE_STAGE, App::getMode()); - $this->assertFalse(App::isProduction()); - $this->assertFalse(App::isDevelopment()); - $this->assertTrue(App::isStage()); + $this->assertEquals(Http::MODE_TYPE_STAGE, Http::getMode()); + $this->assertFalse(Http::isProduction()); + $this->assertFalse(Http::isDevelopment()); + $this->assertTrue(Http::isStage()); } public function testCanGetEnvironmentVariable(): void @@ -74,53 +81,16 @@ public function testCanGetEnvironmentVariable(): void // Mock $_SERVER['key'] = 'value'; - $this->assertEquals(App::getEnv('key'), 'value'); - $this->assertEquals(App::getEnv('unknown', 'test'), 'test'); - } - - public function testCanGetResources(): void - { - App::setResource('rand', fn () => rand()); - App::setResource('first', fn ($second) => "first-{$second}", ['second']); - App::setResource('second', fn () => 'second'); - - $second = $this->app->getResource('second'); - $first = $this->app->getResource('first'); - $this->assertEquals('second', $second); - $this->assertEquals('first-second', $first); - - $resource = $this->app->getResource('rand'); - - $this->assertNotEmpty($resource); - $this->assertEquals($resource, $this->app->getResource('rand')); - $this->assertEquals($resource, $this->app->getResource('rand')); - $this->assertEquals($resource, $this->app->getResource('rand')); - - // Default Params - $route = new Route('GET', '/path'); - - $route - ->inject('rand') - ->param('x', 'x-def', new Text(200), 'x param', true) - ->param('y', 'y-def', new Text(200), 'y param', true) - ->action(function ($x, $y, $rand) { - echo $x . '-' . $y . '-' . $rand; - }); - - \ob_start(); - $this->app->execute($route, new Request(), new Response()); - $result = \ob_get_contents(); - \ob_end_clean(); - - $this->assertEquals('x-def-y-def-' . $resource, $result); + $this->assertEquals(Http::getEnv('key'), 'value'); + $this->assertEquals(Http::getEnv('unknown', 'test'), 'test'); } public function testCanExecuteRoute(): void { - App::setResource('rand', fn () => rand()); - $resource = $this->app->getResource('rand'); + $this->container->set('rand', fn () => rand()); + $resource = $this->container->get('rand'); - $this->app + $this->http ->error() ->inject('error') ->action(function ($error) { @@ -138,12 +108,12 @@ public function testCanExecuteRoute(): void }); \ob_start(); - $this->app->execute($route, new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); // With Params - + $resource = $this->container->get('rand'); $route = new Route('GET', '/path'); $route @@ -160,16 +130,16 @@ public function testCanExecuteRoute(): void }); \ob_start(); - $request = new UtopiaRequestTest(); + $request = new UtopiaFPMRequestTest(); $request::_setParams(['x' => 'param-x', 'y' => 'param-y', 'z' => 'param-z']); - $this->app->execute($route, $request, new Response()); + $this->http->execute($route, $request); $result = \ob_get_contents(); \ob_end_clean(); $this->assertEquals($resource . '-param-x-param-y', $result); // With Error - + $resource = $this->container->get('rand'); $route = new Route('GET', '/path'); $route @@ -180,51 +150,51 @@ public function testCanExecuteRoute(): void }); \ob_start(); - $request = new UtopiaRequestTest(); + $request = new UtopiaFPMRequestTest(); $request::_setParams(['x' => 'param-x', 'y' => 'param-y']); - $this->app->execute($route, $request, new Response()); + $this->http->execute($route, $request); $result = \ob_get_contents(); \ob_end_clean(); $this->assertEquals('error: Invalid `x` param: Value must be a valid string and no longer than 1 chars', $result); // With Hooks - - $this->app + $resource = $this->container->get('rand'); + $this->http ->init() ->inject('rand') ->action(function ($rand) { echo 'init-' . $rand . '-'; }); - $this->app + $this->http ->shutdown() ->action(function () { echo '-shutdown'; }); - $this->app + $this->http ->init() ->groups(['api']) ->action(function () { echo '(init-api)-'; }); - $this->app + $this->http ->shutdown() ->groups(['api']) ->action(function () { echo '-(shutdown-api)'; }); - $this->app + $this->http ->init() ->groups(['homepage']) ->action(function () { echo '(init-homepage)-'; }); - $this->app + $this->http ->shutdown() ->groups(['homepage']) ->action(function () { @@ -252,18 +222,19 @@ public function testCanExecuteRoute(): void }); \ob_start(); - $request = new UtopiaRequestTest(); + $request = new UtopiaFPMRequestTest(); $request::_setParams(['x' => 'param-x', 'y' => 'param-y']); - $this->app->execute($route, $request, new Response()); + $this->http->execute($route, $request); $result = \ob_get_contents(); \ob_end_clean(); $this->assertEquals('init-' . $resource . '-(init-api)-param-x-param-y-(shutdown-api)-shutdown', $result); + $resource = $this->container->get('rand'); \ob_start(); - $request = new UtopiaRequestTest(); + $request = new UtopiaFPMRequestTest(); $request::_setParams(['x' => 'param-x', 'y' => 'param-y']); - $this->app->execute($homepage, $request, new Response()); + $this->http->execute($homepage, $request); $result = \ob_get_contents(); \ob_end_clean(); @@ -272,13 +243,13 @@ public function testCanExecuteRoute(): void public function testCanAddAndExecuteHooks() { - $this->app + $this->http ->init() ->action(function () { echo '(init)-'; }); - $this->app + $this->http ->shutdown() ->action(function () { echo '-(shutdown)'; @@ -293,7 +264,7 @@ public function testCanAddAndExecuteHooks() }); \ob_start(); - $this->app->execute($route, new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); @@ -309,7 +280,7 @@ public function testCanAddAndExecuteHooks() }); \ob_start(); - $this->app->execute($route, new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); @@ -318,51 +289,51 @@ public function testCanAddAndExecuteHooks() public function testAllowRouteOverrides() { - App::setAllowOverride(false); - $this->assertFalse(App::getAllowOverride()); - App::get('/')->action(function () { + Http::setAllowOverride(false); + $this->assertFalse(Http::getAllowOverride()); + Http::get('/')->action(function () { echo 'Hello first'; }); try { - App::get('/')->action(function () { + Http::get('/')->action(function () { echo 'Hello second'; }); $this->fail('Failed to throw exception'); - } catch (Exception $e) { + } catch (\Exception $e) { // Threw exception as expected $this->assertEquals('Route for (GET:) already registered.', $e->getMessage()); } // Test success - App::setAllowOverride(true); - $this->assertTrue(App::getAllowOverride()); - App::get('/')->action(function () { + Http::setAllowOverride(true); + $this->assertTrue(Http::getAllowOverride()); + Http::get('/')->action(function () { echo 'Hello first'; }); - App::get('/')->action(function () { + Http::get('/')->action(function () { echo 'Hello second'; }); } public function testCanHookThrowExceptions() { - $this->app + $this->http ->init() ->param('y', '', new Text(5), 'y param', false) ->action(function ($y) { echo '(init)-' . $y . '-'; }); - $this->app + $this->http ->error() ->inject('error') ->action(function ($error) { echo 'error-' . $error->getMessage(); }); - $this->app + $this->http ->shutdown() ->action(function () { echo '-(shutdown)'; @@ -377,7 +348,7 @@ public function testCanHookThrowExceptions() }); \ob_start(); - $this->app->execute($route, new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); @@ -385,7 +356,7 @@ public function testCanHookThrowExceptions() \ob_start(); $_GET['y'] = 'y-def'; - $this->app->execute($route, new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); @@ -396,60 +367,60 @@ public function testCanSetRoute() { $route = new Route('GET', '/path'); - $this->assertEquals($this->app->getRoute(), null); - $this->app->setRoute($route); - $this->assertEquals($this->app->getRoute(), $route); + $this->assertEquals($this->http->getRoute(), null); + $this->http->setRoute($route); + $this->assertEquals($this->http->getRoute(), $route); } public function providerRouteMatching(): array { return [ - 'GET request' => [App::REQUEST_METHOD_GET, '/path1'], - 'GET request on different route' => [App::REQUEST_METHOD_GET, '/path2'], - 'GET request with trailing slash #1' => [App::REQUEST_METHOD_GET, '/path3', '/path3/'], - 'GET request with trailing slash #2' => [App::REQUEST_METHOD_GET, '/path3/', '/path3/'], - 'GET request with trailing slash #3' => [App::REQUEST_METHOD_GET, '/path3/', '/path3'], - 'POST request' => [App::REQUEST_METHOD_POST, '/path1'], - 'PUT request' => [App::REQUEST_METHOD_PUT, '/path1'], - 'PATCH request' => [App::REQUEST_METHOD_PATCH, '/path1'], - 'DELETE request' => [App::REQUEST_METHOD_DELETE, '/path1'], - '1 separators' => [App::REQUEST_METHOD_GET, '/a/'], - '2 separators' => [App::REQUEST_METHOD_GET, '/a/b'], - '3 separators' => [App::REQUEST_METHOD_GET, '/a/b/c'] + 'GET request' => [Http::REQUEST_METHOD_GET, '/path1'], + 'GET request on different route' => [Http::REQUEST_METHOD_GET, '/path2'], + 'GET request with trailing slash #1' => [Http::REQUEST_METHOD_GET, '/path3', '/path3/'], + 'GET request with trailing slash #2' => [Http::REQUEST_METHOD_GET, '/path3/', '/path3/'], + 'GET request with trailing slash #3' => [Http::REQUEST_METHOD_GET, '/path3/', '/path3'], + 'POST request' => [Http::REQUEST_METHOD_POST, '/path1'], + 'PUT request' => [Http::REQUEST_METHOD_PUT, '/path1'], + 'PATCH request' => [Http::REQUEST_METHOD_PATCH, '/path1'], + 'DELETE request' => [Http::REQUEST_METHOD_DELETE, '/path1'], + '1 separators' => [Http::REQUEST_METHOD_GET, '/a/'], + '2 separators' => [Http::REQUEST_METHOD_GET, '/a/b'], + '3 separators' => [Http::REQUEST_METHOD_GET, '/a/b/c'] ]; } /** * @dataProvider providerRouteMatching */ - public function testCanMatchRoute(string $method, string $path, string $url = null): void + public function testCanMatchRoute(string $method, string $path, ?string $url = null): void { $url ??= $path; $expected = null; switch ($method) { - case App::REQUEST_METHOD_GET: - $expected = App::get($path); + case Http::REQUEST_METHOD_GET: + $expected = Http::get($path); break; - case App::REQUEST_METHOD_POST: - $expected = App::post($path); + case Http::REQUEST_METHOD_POST: + $expected = Http::post($path); break; - case App::REQUEST_METHOD_PUT: - $expected = App::put($path); + case Http::REQUEST_METHOD_PUT: + $expected = Http::put($path); break; - case App::REQUEST_METHOD_PATCH: - $expected = App::patch($path); + case Http::REQUEST_METHOD_PATCH: + $expected = Http::patch($path); break; - case App::REQUEST_METHOD_DELETE: - $expected = App::delete($path); + case Http::REQUEST_METHOD_DELETE: + $expected = Http::delete($path); break; } $_SERVER['REQUEST_METHOD'] = $method; $_SERVER['REQUEST_URI'] = $url; - $this->assertEquals($expected, $this->app->match(new Request())); - $this->assertEquals($expected, $this->app->getRoute()); + $this->assertEquals($expected, $this->http->match(new Request())); + $this->assertEquals($expected, $this->http->getRoute()); } public function testNoMismatchRoute(): void @@ -470,43 +441,43 @@ public function testNoMismatchRoute(): void ]; foreach ($requests as $request) { - App::get($request['path']); + Http::get($request['path']); - $_SERVER['REQUEST_METHOD'] = App::REQUEST_METHOD_GET; + $_SERVER['REQUEST_METHOD'] = Http::REQUEST_METHOD_GET; $_SERVER['REQUEST_URI'] = $request['url']; - $route = $this->app->match(new Request(), fresh: true); + $route = $this->http->match(new Request(), fresh: true); $this->assertEquals(null, $route); - $this->assertEquals(null, $this->app->getRoute()); + $this->assertEquals(null, $this->http->getRoute()); } } public function testCanMatchFreshRoute(): void { - $route1 = App::get('/path1'); - $route2 = App::get('/path2'); + $route1 = Http::get('/path1'); + $route2 = Http::get('/path2'); try { // Match first request $_SERVER['REQUEST_METHOD'] = 'HEAD'; $_SERVER['REQUEST_URI'] = '/path1'; - $matched = $this->app->match(new Request()); + $matched = $this->http->match(new Request()); $this->assertEquals($route1, $matched); - $this->assertEquals($route1, $this->app->getRoute()); + $this->assertEquals($route1, $this->http->getRoute()); // Second request match returns cached route $_SERVER['REQUEST_METHOD'] = 'HEAD'; $_SERVER['REQUEST_URI'] = '/path2'; $request2 = new Request(); - $matched = $this->app->match($request2); + $matched = $this->http->match($request2, fresh: false); $this->assertEquals($route1, $matched); - $this->assertEquals($route1, $this->app->getRoute()); + $this->assertEquals($route1, $this->http->getRoute()); // Fresh match returns new route - $matched = $this->app->match($request2, fresh: true); + $matched = $this->http->match($request2, fresh: true); $this->assertEquals($route2, $matched); - $this->assertEquals($route2, $this->app->getRoute()); + $this->assertEquals($route2, $this->http->getRoute()); } catch (\Exception $e) { $this->fail($e->getMessage()); } @@ -522,14 +493,14 @@ public function testCanRunRequest(): void $_SERVER['REQUEST_METHOD'] = 'HEAD'; $_SERVER['REQUEST_URI'] = '/path'; - App::get('/path') + Http::get('/path') ->inject('response') ->action(function ($response) { $response->send('HELLO'); }); \ob_start(); - $this->app->run(new Request(), new Response()); + $this->http->run(new Request(), new Response()); $result = \ob_get_contents(); \ob_end_clean(); @@ -547,34 +518,14 @@ public function testWildcardRoute(): void $_SERVER['REQUEST_METHOD'] = 'GET'; $_SERVER['REQUEST_URI'] = '/unknown_path'; - App::init() - ->inject('request') - ->inject('response') - ->action(function (Request $request, Response $response) { - $route = $this->app->getRoute(); - App::setResource('myRoute', fn () => $route); - - if ($request->getURI() === '/init_response') { - $response->send('THIS IS RESPONSE FROM INIT!'); - } + Http::init() + ->action(function () { + $route = $this->http->getRoute(); + $this->container->set('myRoute', fn () => $route); }); - App::options() - ->inject('request') - ->inject('response') - ->action(function (Request $request, Response $response) { - $origin = $request->getOrigin(); - $response - ->addHeader('Server', 'Appwrite') - ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE') - ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies') - ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies') - ->addHeader('Access-Control-Allow-Origin', $origin) - ->addHeader('Access-Control-Allow-Credentials', 'true') - ->noContent(); - }); - App::wildcard() + Http::wildcard() ->inject('myRoute') ->inject('response') ->action(function (mixed $myRoute, $response) { @@ -586,7 +537,7 @@ public function testWildcardRoute(): void }); \ob_start(); - @$this->app->run(new Request(), new Response()); + @$this->http->run(new Request(), new Response()); $result = \ob_get_contents(); \ob_end_clean(); @@ -595,23 +546,70 @@ public function testWildcardRoute(): void \ob_start(); $req = new Request(); $req = $req->setMethod('OPTIONS'); - @$this->app->run($req, new Response()); + @$this->http->run($req, new Response()); $result = \ob_get_contents(); \ob_end_clean(); $this->assertEquals('', $result); - $_SERVER['REQUEST_METHOD'] = 'GET'; - $_SERVER['REQUEST_URI'] = '/init_response'; + $_SERVER['REQUEST_METHOD'] = $method; + $_SERVER['REQUEST_URI'] = $uri; + } + + public function testCallableStringParametersNotExecuted(): void + { + // Test that callable strings (like function names) are not executed + $route = new Route('GET', '/test-callable-string'); + + $route + ->param('callback', 'phpinfo', new Text(200), 'callback param', true) + ->action(function ($callback) { + // If the string 'phpinfo' was executed as a function, + // it would output PHP info. Instead, it should just be the string. + echo 'callback-value: ' . $callback; + }); \ob_start(); - @$this->app->run(new Request(), new Response()); + $this->http->execute($route, new Request()); $result = \ob_get_contents(); \ob_end_clean(); - $this->assertEquals('THIS IS RESPONSE FROM INIT!', $result); + $this->assertEquals('callback-value: phpinfo', $result); - $_SERVER['REQUEST_METHOD'] = $method; - $_SERVER['REQUEST_URI'] = $uri; + // Test with request parameter that is a callable string + $route2 = new Route('GET', '/test-callable-string-param'); + + $route2 + ->param('func', 'default', new Text(200), 'func param', false) + ->action(function ($func) { + echo 'func-value: ' . $func; + }); + + \ob_start(); + $request = new UtopiaFPMRequestTest(); + $request::_setParams(['func' => 'system']); + $this->http->execute($route2, $request); + $result = \ob_get_contents(); + \ob_end_clean(); + + $this->assertEquals('func-value: system', $result); + + // Test callable closure still works + $route3 = new Route('GET', '/test-callable-closure'); + + $route3 + ->param('generated', function () { + return 'generated-value'; + }, new Text(200), 'generated param', true) + ->action(function ($generated) { + echo 'generated: ' . $generated; + }); + + \ob_start(); + $this->http->execute($route3, new Request()); + $result = \ob_get_contents(); + \ob_end_clean(); + + $this->assertEquals('generated: generated-value', $result); } } diff --git a/tests/RequestTest.php b/tests/RequestTest.php index 727d534a..02d8930a 100755 --- a/tests/RequestTest.php +++ b/tests/RequestTest.php @@ -1,9 +1,9 @@ assertEquals(null, $this->request->getRangeStart()); $this->assertEquals(null, $this->request->getRangeEnd()); } + + public function testCanGetSizeWithArrayHeaders() + { + $this->request->addHeader('content-type', 'application/json'); + + $reflection = new \ReflectionClass($this->request); + $headersProperty = $reflection->getProperty('headers'); + $headersProperty->setAccessible(true); + + $headers = $headersProperty->getValue($this->request) ?? []; + $headers['accept'] = ['application/json', 'text/html']; + $headers['x-custom'] = ['value1', 'value2', 'value3']; + $headersProperty->setValue($this->request, $headers); + + $size = $this->request->getSize(); + + $this->assertIsInt($size); + $this->assertGreaterThan(0, $size); + } } diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php index 30b20477..8dd8394a 100755 --- a/tests/ResponseTest.php +++ b/tests/ResponseTest.php @@ -1,10 +1,11 @@ response->setContentType(Response::CONTENT_TYPE_HTML, Response::CHARSET_UTF8); // Assertions - $this->assertInstanceOf('Utopia\Response', $contentType); + $this->assertInstanceOf('Utopia\Http\Response', $contentType); } public function testCanSetStatus() @@ -31,11 +32,11 @@ public function testCanSetStatus() $status = $this->response->setStatusCode(Response::STATUS_CODE_OK); // Assertions - $this->assertInstanceOf('Utopia\Response', $status); + $this->assertInstanceOf('Utopia\Http\Response', $status); try { $this->response->setStatusCode(0); // Unknown status code - } catch(\Exception $e) { + } catch (\Exception $e) { $this->assertInstanceOf('\Exception', $e); return; @@ -49,7 +50,7 @@ public function testCanGetStatus() $status = $this->response->setStatusCode(Response::STATUS_CODE_OK); // Assertions - $this->assertInstanceOf('Utopia\Response', $status); + $this->assertInstanceOf('Utopia\Http\Response', $status); $this->assertEquals(Response::STATUS_CODE_OK, $this->response->getStatusCode()); } diff --git a/tests/RouteTest.php b/tests/RouteTest.php index cbdea1c3..ea48e111 100755 --- a/tests/RouteTest.php +++ b/tests/RouteTest.php @@ -1,6 +1,6 @@ assertEquals($routeIndex, Router::match(App::REQUEST_METHOD_GET, '/')); - $this->assertEquals($routeAbout, Router::match(App::REQUEST_METHOD_GET, '/about')); - $this->assertEquals($routeAboutMe, Router::match(App::REQUEST_METHOD_GET, '/about/me')); + $this->assertEquals($routeIndex, Router::match(Http::REQUEST_METHOD_GET, '/')); + $this->assertEquals($routeAbout, Router::match(Http::REQUEST_METHOD_GET, '/about')); + $this->assertEquals($routeAboutMe, Router::match(Http::REQUEST_METHOD_GET, '/about/me')); } public function testCanMatchUrlWithPlaceholder(): void { - $routeBlog = new Route(App::REQUEST_METHOD_GET, '/blog'); - $routeBlogAuthors = new Route(App::REQUEST_METHOD_GET, '/blog/authors'); - $routeBlogAuthorsComments = new Route(App::REQUEST_METHOD_GET, '/blog/authors/comments'); - $routeBlogPost = new Route(App::REQUEST_METHOD_GET, '/blog/:post'); - $routeBlogPostComments = new Route(App::REQUEST_METHOD_GET, '/blog/:post/comments'); - $routeBlogPostCommentsSingle = new Route(App::REQUEST_METHOD_GET, '/blog/:post/comments/:comment'); + $routeBlog = new Route(Http::REQUEST_METHOD_GET, '/blog'); + $routeBlogAuthors = new Route(Http::REQUEST_METHOD_GET, '/blog/authors'); + $routeBlogAuthorsComments = new Route(Http::REQUEST_METHOD_GET, '/blog/authors/comments'); + $routeBlogPost = new Route(Http::REQUEST_METHOD_GET, '/blog/:post'); + $routeBlogPostComments = new Route(Http::REQUEST_METHOD_GET, '/blog/:post/comments'); + $routeBlogPostCommentsSingle = new Route(Http::REQUEST_METHOD_GET, '/blog/:post/comments/:comment'); Router::addRoute($routeBlog); Router::addRoute($routeBlogAuthors); @@ -42,12 +42,12 @@ public function testCanMatchUrlWithPlaceholder(): void Router::addRoute($routeBlogPostComments); Router::addRoute($routeBlogPostCommentsSingle); - $this->assertEquals($routeBlog, Router::match(App::REQUEST_METHOD_GET, '/blog')); - $this->assertEquals($routeBlogAuthors, Router::match(App::REQUEST_METHOD_GET, '/blog/authors')); - $this->assertEquals($routeBlogAuthorsComments, Router::match(App::REQUEST_METHOD_GET, '/blog/authors/comments')); - $this->assertEquals($routeBlogPost, Router::match(App::REQUEST_METHOD_GET, '/blog/test')); - $this->assertEquals($routeBlogPostComments, Router::match(App::REQUEST_METHOD_GET, '/blog/test/comments')); - $this->assertEquals($routeBlogPostCommentsSingle, Router::match(App::REQUEST_METHOD_GET, '/blog/test/comments/:comment')); + $this->assertEquals($routeBlog, Router::match(Http::REQUEST_METHOD_GET, '/blog')); + $this->assertEquals($routeBlogAuthors, Router::match(Http::REQUEST_METHOD_GET, '/blog/authors')); + $this->assertEquals($routeBlogAuthorsComments, Router::match(Http::REQUEST_METHOD_GET, '/blog/authors/comments')); + $this->assertEquals($routeBlogPost, Router::match(Http::REQUEST_METHOD_GET, '/blog/test')); + $this->assertEquals($routeBlogPostComments, Router::match(Http::REQUEST_METHOD_GET, '/blog/test/comments')); + $this->assertEquals($routeBlogPostCommentsSingle, Router::match(Http::REQUEST_METHOD_GET, '/blog/test/comments/:comment')); } public function testCanMatchUrlWithWildcard(): void @@ -69,36 +69,36 @@ public function testCanMatchUrlWithWildcard(): void public function testCanMatchHttpMethod(): void { - $routeGET = new Route(App::REQUEST_METHOD_GET, '/'); - $routePOST = new Route(App::REQUEST_METHOD_POST, '/'); + $routeGET = new Route(Http::REQUEST_METHOD_GET, '/'); + $routePOST = new Route(Http::REQUEST_METHOD_POST, '/'); Router::addRoute($routeGET); Router::addRoute($routePOST); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/')); - $this->assertEquals($routePOST, Router::match(App::REQUEST_METHOD_POST, '/')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/')); + $this->assertEquals($routePOST, Router::match(Http::REQUEST_METHOD_POST, '/')); - $this->assertNotEquals($routeGET, Router::match(App::REQUEST_METHOD_POST, '/')); - $this->assertNotEquals($routePOST, Router::match(App::REQUEST_METHOD_GET, '/')); + $this->assertNotEquals($routeGET, Router::match(Http::REQUEST_METHOD_POST, '/')); + $this->assertNotEquals($routePOST, Router::match(Http::REQUEST_METHOD_GET, '/')); } public function testCanMatchAlias(): void { - $routeGET = new Route(App::REQUEST_METHOD_GET, '/target'); + $routeGET = new Route(Http::REQUEST_METHOD_GET, '/target'); $routeGET ->alias('/alias') ->alias('/alias2'); Router::addRoute($routeGET); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/target')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/alias')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/alias2')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/target')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/alias')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/alias2')); } public function testCanMatchMix(): void { - $routeGET = new Route(App::REQUEST_METHOD_GET, '/'); + $routeGET = new Route(Http::REQUEST_METHOD_GET, '/'); $routeGET ->alias('/console/*') ->alias('/auth/*') @@ -109,37 +109,37 @@ public function testCanMatchMix(): void Router::addRoute($routeGET); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/console')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/invite')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/login')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/recover')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/console/lorem/ipsum/dolor')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/auth/lorem/ipsum')); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/register/lorem/ipsum')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/console')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/invite')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/login')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/recover')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/console/lorem/ipsum/dolor')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/auth/lorem/ipsum')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/register/lorem/ipsum')); } public function testCanMatchFilename(): void { - $routeGET = new Route(App::REQUEST_METHOD_GET, '/robots.txt'); + $routeGET = new Route(Http::REQUEST_METHOD_GET, '/robots.txt'); Router::addRoute($routeGET); - $this->assertEquals($routeGET, Router::match(App::REQUEST_METHOD_GET, '/robots.txt')); + $this->assertEquals($routeGET, Router::match(Http::REQUEST_METHOD_GET, '/robots.txt')); } public function testCannotFindUnknownRouteByPath(): void { - $this->assertNull(Router::match(App::REQUEST_METHOD_GET, '/404')); + $this->assertNull(Router::match(Http::REQUEST_METHOD_GET, '/404')); } public function testCannotFindUnknownRouteByMethod(): void { - $route = new Route(App::REQUEST_METHOD_GET, '/404'); + $route = new Route(Http::REQUEST_METHOD_GET, '/404'); Router::addRoute($route); - $this->assertEquals($route, Router::match(App::REQUEST_METHOD_GET, '/404')); + $this->assertEquals($route, Router::match(Http::REQUEST_METHOD_GET, '/404')); - $this->assertNull(Router::match(App::REQUEST_METHOD_POST, '/404')); + $this->assertNull(Router::match(Http::REQUEST_METHOD_POST, '/404')); } } diff --git a/tests/UtopiaRequestTest.php b/tests/UtopiaFPMRequestTest.php similarity index 90% rename from tests/UtopiaRequestTest.php rename to tests/UtopiaFPMRequestTest.php index 19ae0f6b..4c78751d 100644 --- a/tests/UtopiaRequestTest.php +++ b/tests/UtopiaFPMRequestTest.php @@ -1,10 +1,10 @@ assertFalse($arrayList->isValid(['text'])); - $this->assertEquals('Value must a valid array and Value must be a valid integer', $arrayList->getDescription()); - - $arrayList = new ArrayList(new Integer(), 3); - $this->assertFalse($arrayList->isValid(['a', 'b', 'c', 'd'])); - $this->assertEquals('Value must a valid array no longer than 3 items and Value must be a valid integer', $arrayList->getDescription()); - } - - public function testCanValidateTextValues(): void - { - $arrayList = new ArrayList(new Text(100)); - $this->assertTrue($arrayList->isArray(), 'true'); - $this->assertTrue($arrayList->isValid([0 => 'string', 1 => 'string'])); - $this->assertTrue($arrayList->isValid(['string', 'string'])); - $this->assertFalse($arrayList->isValid(['string', 'string', 3])); - $this->assertFalse($arrayList->isValid('string')); - $this->assertFalse($arrayList->isValid('string')); - $this->assertEquals(\Utopia\Validator::TYPE_STRING, $arrayList->getType()); - $this->assertInstanceOf(Text::class, $arrayList->getValidator()); - } - - public function testCanValidateNumericValues(): void - { - $arrayList = new ArrayList(new Numeric()); - $this->assertTrue($arrayList->isValid([1, 2, 3])); - $this->assertFalse($arrayList->isValid(1)); - $this->assertFalse($arrayList->isValid('string')); - $this->assertEquals(\Utopia\Validator::TYPE_MIXED, $arrayList->getType()); - $this->assertInstanceOf(Numeric::class, $arrayList->getValidator()); - } - - public function testCanValidateNumericValuesWithBoundaries(): void - { - $arrayList = new ArrayList(new Numeric(), 2); - $this->assertTrue($arrayList->isValid([1])); - $this->assertTrue($arrayList->isValid([1, 2])); - $this->assertFalse($arrayList->isValid([1, 2, 3])); - $this->assertEquals($arrayList->getType(), \Utopia\Validator::TYPE_MIXED); - $this->assertInstanceOf(Numeric::class, $arrayList->getValidator()); - } -} diff --git a/tests/Validator/AssocTest.php b/tests/Validator/AssocTest.php deleted file mode 100755 index 8bf1c96e..00000000 --- a/tests/Validator/AssocTest.php +++ /dev/null @@ -1,43 +0,0 @@ -assoc = new Assoc(); - } - - public function tearDown(): void - { - $this->assoc = null; - } - - public function testCanValidateAssocArray(): void - { - $this->assertTrue($this->assoc->isValid(['1' => 'a', '0' => 'b', '2' => 'c'])); - $this->assertTrue($this->assoc->isValid(['a' => 'a', 'b' => 'b', 'c' => 'c'])); - $this->assertTrue($this->assoc->isValid([])); - $this->assertTrue($this->assoc->isValid(['value' => str_repeat('-', 62000)])); - $this->assertTrue($this->assoc->isArray()); - $this->assertEquals(\Utopia\Validator::TYPE_ARRAY, $this->assoc->getType()); - } - - public function testCantValidateSequentialArray(): void - { - $this->assertFalse($this->assoc->isValid([0 => 'string', 1 => 'string'])); - $this->assertFalse($this->assoc->isValid(['a'])); - $this->assertFalse($this->assoc->isValid(['a', 'b', 'c'])); - $this->assertFalse($this->assoc->isValid(['0' => 'a', '1' => 'b', '2' => 'c'])); - } - - public function testCantValidateAssocArrayWithOver65kCharacters(): void - { - $this->assertFalse($this->assoc->isValid(['value' => str_repeat('-', 66000)])); - } -} diff --git a/tests/Validator/BooleanTest.php b/tests/Validator/BooleanTest.php deleted file mode 100755 index b1742918..00000000 --- a/tests/Validator/BooleanTest.php +++ /dev/null @@ -1,46 +0,0 @@ -assertTrue($boolean->isValid(true)); - $this->assertTrue($boolean->isValid(false)); - $this->assertFalse($boolean->isValid('false')); - $this->assertFalse($boolean->isValid('true')); - $this->assertFalse($boolean->isValid('0')); - $this->assertFalse($boolean->isValid('1')); - $this->assertFalse($boolean->isValid(0)); - $this->assertFalse($boolean->isValid(1)); - $this->assertFalse($boolean->isValid(['string', 'string'])); - $this->assertFalse($boolean->isValid('string')); - $this->assertFalse($boolean->isValid(1.2)); - $this->assertFalse($boolean->isArray()); - $this->assertEquals($boolean->getType(), \Utopia\Validator::TYPE_BOOLEAN); - } - - public function testCanValidateLoosely() - { - $boolean = new Boolean(true); - - $this->assertTrue($boolean->isValid(true)); - $this->assertTrue($boolean->isValid(false)); - $this->assertTrue($boolean->isValid('false')); - $this->assertTrue($boolean->isValid('true')); - $this->assertTrue($boolean->isValid('0')); - $this->assertTrue($boolean->isValid('1')); - $this->assertTrue($boolean->isValid(0)); - $this->assertTrue($boolean->isValid(1)); - $this->assertFalse($boolean->isValid(['string', 'string'])); - $this->assertFalse($boolean->isValid('string')); - $this->assertFalse($boolean->isValid(1.2)); - $this->assertFalse($boolean->isArray()); - $this->assertEquals(\Utopia\Validator::TYPE_BOOLEAN, $boolean->getType()); - } -} diff --git a/tests/Validator/DomainTest.php b/tests/Validator/DomainTest.php deleted file mode 100644 index ca14a20e..00000000 --- a/tests/Validator/DomainTest.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @version 1.0 RC4 - * @license The MIT License (MIT)
line1
line2
', $this->view->print("line1\n\nline2", View::FILTER_NL2P)); - } - - public function testCanSetParamWithEscapedHtml() - { - $this->view->setParam('key', 'value'); - $this->assertEquals('<html>value</html>', $this->view->getParam('key', 'default')); - } -} diff --git a/tests/docker/nginx.conf b/tests/docker/nginx.conf index 978f1c03..f38e0e60 100644 --- a/tests/docker/nginx.conf +++ b/tests/docker/nginx.conf @@ -33,7 +33,7 @@ http { listen [::]:80 ipv6only=on; ## listen for ipv6 root /usr/share/nginx/html/tests/e2e; - index index.php server.php index.html index.htm; + index index.php server-fpm.php index.html index.htm; server_tokens off; @@ -53,7 +53,7 @@ http { location / { # First attempt to serve request as file, then # as directory, then fall back to index.html - try_files $uri $uri/ /server.php?q=$uri&$args; + try_files $uri $uri/ /server-fpm.php?q=$uri&$args; } @@ -74,7 +74,7 @@ http { fastcgi_param HTTP_IF_NONE_MATCH $http_if_none_match; fastcgi_param HTTP_IF_MODIFIED_SINCE $http_if_modified_since; fastcgi_read_timeout 600; - fastcgi_index server.php; + fastcgi_index server-fpm.php; include fastcgi_params; } diff --git a/tests/docker/start b/tests/docker/start index f6df2a64..66526ef0 100755 --- a/tests/docker/start +++ b/tests/docker/start @@ -1,6 +1,6 @@ #!/bin/bash -export PHP_VERSION=$PHP_VERSION +POOL_CONF="${PHP_FPM_POOL_CONF:-/usr/local/etc/php-fpm.d/www.conf}" chown -Rf www-data.www-data /usr/share/nginx/html/ @@ -12,13 +12,13 @@ function setEnvironmentVariable() { fi # Check whether variable already exists - if ! grep -q "\[$1\]" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf; then + if ! grep -q "\[$1\]" "$POOL_CONF"; then # Add variable - echo "env[$1] = $2" >> /etc/php/$PHP_VERSION/fpm/pool.d/www.conf + echo "env[$1] = $2" >> "$POOL_CONF" fi # Reset variable - # sed -i "s/^env\[$1.*/env[$1] = $2/g" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf + # sed -i "s/^env\[$1.*/env[$1] = $2/g" "$POOL_CONF" } # Start supervisord and services diff --git a/tests/docker/supervisord.conf b/tests/docker/supervisord.conf index 41f5c4d3..00c651f3 100644 --- a/tests/docker/supervisord.conf +++ b/tests/docker/supervisord.conf @@ -22,8 +22,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface [supervisorctl] serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket -[program:php8-fpm] -command=php-fpm%(ENV_PHP_VERSION)s -F +[program:php-fpm] +command=php-fpm -F autostart=true autorestart=true priority=5 diff --git a/tests/e2e/BaseTest.php b/tests/e2e/BaseTest.php new file mode 100644 index 00000000..04b4249d --- /dev/null +++ b/tests/e2e/BaseTest.php @@ -0,0 +1,79 @@ +client->call(Client::METHOD_GET, '/'); + $this->assertEquals('Hello World!', $response['body']); + } + + public function testResponseValue() + { + $response = $this->client->call(Client::METHOD_GET, '/value/123'); + $this->assertEquals('123', $response['body']); + } + + public function testChunkResponse() + { + $response = $this->client->call(Client::METHOD_GET, '/chunked'); + $this->assertEquals('Hello World!', $response['body']); + } + + public function testRedirect() + { + $response = $this->client->call(Client::METHOD_GET, '/redirect'); + $this->assertEquals('Hello World!', $response['body']); + } + + public function testFile() + { + $response = $this->client->call(Client::METHOD_GET, '/humans.txt'); + $this->assertEquals(204, $response['headers']['status-code']); + } + + public function testCookie() + { + // One cookie + $cookie = 'cookie1=value1'; + $response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals($cookie, $response['body']); + + // Two cookiees + $cookie = 'cookie1=value1; cookie2=value2'; + $response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals($cookie, $response['body']); + + // Two cookies without optional space + $cookie = 'cookie1=value1;cookie2=value2'; + $response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals($cookie, $response['body']); + + // Cookie with "=" in value + $cookie = 'cookie1=value1=value2'; + $response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals($cookie, $response['body']); + + // Case sensitivity for cookie names + $cookie = 'cookie1=v1; Cookie1=v2'; + $response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals($cookie, $response['body']); + } + + public function testSetCookie() + { + $response = $this->client->call(Client::METHOD_GET, '/set-cookie'); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals('value1', $response['cookies']['key1']); + $this->assertEquals('value2', $response['cookies']['key2']); + } +} diff --git a/tests/e2e/Client.php b/tests/e2e/Client.php index 4052689b..42fdd5a8 100644 --- a/tests/e2e/Client.php +++ b/tests/e2e/Client.php @@ -29,13 +29,14 @@ class Client * * @var string */ - protected $baseUrl = 'http://web'; + protected $baseUrl; /** * SDK constructor. */ - public function __construct() + public function __construct(string $baseUrl = 'http://fpm') { + $this->baseUrl = $baseUrl; } /** @@ -60,6 +61,8 @@ public function call(string $method, string $path = '', array $headers = [], arr $responseType = ''; $responseBody = ''; + $cookies = []; + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); @@ -67,7 +70,7 @@ public function call(string $method, string $path = '', array $headers = [], arr curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0); curl_setopt($ch, CURLOPT_TIMEOUT, 15); - curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders) { + curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders, &$cookies) { $len = strlen($header); $header = explode(':', $header, 2); @@ -75,6 +78,12 @@ public function call(string $method, string $path = '', array $headers = [], arr return $len; } + if (strtolower(trim($header[0])) == 'set-cookie') { + $parsed = $this->parseCookie((string)trim($header[1])); + $name = array_key_first($parsed); + $cookies[$name] = $parsed[$name]; + } + $responseHeaders[strtolower(trim($header[0]))] = trim($header[1]); return $len; @@ -98,6 +107,23 @@ public function call(string $method, string $path = '', array $headers = [], arr return [ 'headers' => $responseHeaders, 'body' => $responseBody, + 'cookies' => $cookies, ]; } + + /** + * Parse Cookie String + * + * @param string $cookie + * @return array + */ + public function parseCookie(string $cookie): array + { + $cookies = []; + + parse_str(strtr($cookie, ['&' => '%26', '+' => '%2B', ';' => '&']), $cookies); + + return $cookies; + } + } diff --git a/tests/e2e/ResponseFPMTest.php b/tests/e2e/ResponseFPMTest.php new file mode 100644 index 00000000..8a3cb4ff --- /dev/null +++ b/tests/e2e/ResponseFPMTest.php @@ -0,0 +1,17 @@ +client = new Client(); + } +} diff --git a/tests/e2e/ResponseSwooleTest.php b/tests/e2e/ResponseSwooleTest.php new file mode 100755 index 00000000..0851554a --- /dev/null +++ b/tests/e2e/ResponseSwooleTest.php @@ -0,0 +1,23 @@ +client = new Client('http://swoole'); + } + + public function testSwooleResources(): void + { + $response = $this->client->call(Client::METHOD_DELETE, '/swoole-test'); + $this->assertEquals('DELETE', $response['body']); + } +} diff --git a/tests/e2e/ResponseTest.php b/tests/e2e/ResponseTest.php deleted file mode 100644 index 878cc23f..00000000 --- a/tests/e2e/ResponseTest.php +++ /dev/null @@ -1,46 +0,0 @@ -client = new Client(); - } - - public function testResponse() - { - $response = $this->client->call(Client::METHOD_GET, '/'); - $this->assertEquals('Hello World!', $response['body']); - } - - public function testResponseValue() - { - $response = $this->client->call(Client::METHOD_GET, '/value/123'); - $this->assertEquals('123', $response['body']); - } - - public function testChunkResponse() - { - $response = $this->client->call(Client::METHOD_GET, '/chunked'); - $this->assertEquals('Hello World!', $response['body']); - } - - public function testRedirect() - { - $response = $this->client->call(Client::METHOD_GET, '/redirect'); - $this->assertEquals('Hello World!', $response['body']); - } - - public function testFile() - { - $response = $this->client->call(Client::METHOD_GET, '/humans.txt'); - $this->assertEquals(204, $response['headers']['status-code']); - } -} diff --git a/tests/e2e/server.php b/tests/e2e/init.php similarity index 58% rename from tests/e2e/server.php rename to tests/e2e/init.php index cef864ee..fb0d9d59 100644 --- a/tests/e2e/server.php +++ b/tests/e2e/init.php @@ -2,9 +2,9 @@ require_once __DIR__.'/../../vendor/autoload.php'; -use Utopia\App; -use Utopia\Request; -use Utopia\Response; +use Utopia\Http\Http; +use Utopia\Http\Request; +use Utopia\Http\Response; use Utopia\Validator\Text; ini_set('memory_limit', '1024M'); @@ -13,20 +13,37 @@ ini_set('display_socket_timeout', '-1'); error_reporting(E_ALL); -App::get('/') +Http::get('/') ->inject('response') ->action(function (Response $response) { $response->send('Hello World!'); }); -App::get('/value/:value') +Http::get('/value/:value') ->param('value', '', new Text(64)) ->inject('response') ->action(function (string $value, Response $response) { $response->send($value); }); -App::get('/chunked') + +Http::get('/cookies') + ->inject('request') + ->inject('response') + ->action(function (Request $request, Response $response) { + $response->send($request->getHeaders()['cookie'] ?? ''); + }); + +Http::get('/set-cookie') + ->inject('request') + ->inject('response') + ->action(function (Request $request, Response $response) { + $response->addHeader('Set-Cookie', 'key1=value1'); + $response->addHeader('Set-Cookie', 'key2=value2'); + $response->send('OK'); + }); + +Http::get('/chunked') ->inject('response') ->action(function (Response $response) { foreach (['Hello ', 'World!'] as $key => $word) { @@ -34,20 +51,14 @@ } }); -App::get('/redirect') +Http::get('/redirect') ->inject('response') ->action(function (Response $response) { $response->redirect('/'); }); -App::get('/humans.txt') +Http::get('/humans.txt') ->inject('response') ->action(function (Response $response) { $response->noContent(); }); - -$request = new Request(); -$response = new Response(); - -$app = new App('UTC'); -$app->run($request, $response); diff --git a/tests/e2e/server-fpm.php b/tests/e2e/server-fpm.php new file mode 100644 index 00000000..eb15c7e2 --- /dev/null +++ b/tests/e2e/server-fpm.php @@ -0,0 +1,11 @@ +start(); diff --git a/tests/e2e/server-swoole.php b/tests/e2e/server-swoole.php new file mode 100755 index 00000000..e15e1be4 --- /dev/null +++ b/tests/e2e/server-swoole.php @@ -0,0 +1,29 @@ +inject('swooleRequest') + ->inject('swooleResponse') + ->action(function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) { + $method = $swooleRequest->getMethod(); + $swooleResponse->header('Content-Type', 'text/plain'); + $swooleResponse->header('Cache-Control', 'no-cache'); + $swooleResponse->setStatusCode(200); + $swooleResponse->write($method); + $swooleResponse->end(); + }); + +$server = new Server('0.0.0.0', '80'); +$http = new Http($server, 'UTC'); + +run(function () use ($http) { + $http->start(); +}); diff --git a/tests/mocks/View/template.phtml b/tests/mocks/View/template.phtml deleted file mode 100755 index 51d1c6a4..00000000 --- a/tests/mocks/View/template.phtml +++ /dev/null @@ -1 +0,0 @@ -