diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index f2927f574..55bc50056 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -190,7 +190,7 @@ function advancedcontentfilter_module() {}
function advancedcontentfilter_init()
{
if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
- $slim = new \Slim\App();
+ $slim = \Slim\Factory\AppFactory::create();
require __DIR__ . '/src/middlewares.php';
@@ -305,7 +305,7 @@ function advancedcontentfilter_build_fields($data)
* API
*/
-function advancedcontentfilter_get_rules()
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response)
{
if (!DI::userSession()->getLocalUserId()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
@@ -313,7 +313,8 @@ function advancedcontentfilter_get_rules()
$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()]));
- return json_encode($rules);
+ $response->getBody()->write(json_encode($rules));
+ return $response->withHeader('Content-Type', 'application/json');
}
function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -324,10 +325,11 @@ function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, Res
$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()]);
- return json_encode($rule);
+ $response->getBody()->write(json_encode($rule));
+ return $response->withHeader('Content-Type', 'application/json');
}
-function advancedcontentfilter_post_rules(ServerRequestInterface $request)
+function advancedcontentfilter_post_rules(ServerRequestInterface $request, ResponseInterface $response)
{
if (!DI::userSession()->getLocalUserId()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
@@ -360,7 +362,8 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
- return json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]);
+ $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]));
+ return $response->withHeader('Content-Type', 'application/json');
}
function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -391,7 +394,8 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
- return json_encode(['message' => DI::l10n()->t('Rule successfully updated')]);
+ $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully updated')]));
+ return $response->withHeader('Content-Type', 'application/json');
}
function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -414,7 +418,8 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
- return json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]);
+ $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]));
+ return $response->withHeader('Content-Type', 'application/json');
}
function advancedcontentfilter_get_variables_guid(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -437,7 +442,8 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
- return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
+ $response->getBody()->write(json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]));
+ return $response->withHeader('Content-Type', 'application/json');
}
/**
diff --git a/advancedcontentfilter/composer.json b/advancedcontentfilter/composer.json
index 93b19cd59..ceb152e79 100644
--- a/advancedcontentfilter/composer.json
+++ b/advancedcontentfilter/composer.json
@@ -11,8 +11,7 @@
}
],
"require": {
- "php": ">=5.6.0",
- "slim/slim": "^3.1",
+ "slim/slim": "^4",
"symfony/expression-language": "^3.4"
},
"license": "3-clause BSD license",
diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock
index 774b5ec8f..83d61074d 100644
--- a/advancedcontentfilter/composer.lock
+++ b/advancedcontentfilter/composer.lock
@@ -4,40 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "d0e3662dd9d910ffe4f71d325bc39319",
+ "content-hash": "3e87f0369e4799fc35d98f399c67f1e9",
"packages": [
- {
- "name": "container-interop/container-interop",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/container-interop/container-interop.git",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "shasum": ""
- },
- "require": {
- "psr/container": "^1.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Interop\\Container\\": "src/Interop/Container/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
- "homepage": "https://github.com/container-interop/container-interop",
- "abandoned": "psr/container",
- "time": "2017-02-14T19:40:03+00:00"
- },
{
"name": "nikic/fast-route",
"version": "v1.3.0",
@@ -84,56 +52,6 @@
],
"time": "2018-02-13T20:26:39+00:00"
},
- {
- "name": "pimple/pimple",
- "version": "v3.2.3",
- "source": {
- "type": "git",
- "url": "https://github.com/silexphp/Pimple.git",
- "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
- "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "psr/container": "^1.0"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "^3.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Pimple": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Pimple, a simple Dependency Injection Container",
- "homepage": "http://pimple.sensiolabs.org",
- "keywords": [
- "container",
- "dependency injection"
- ],
- "time": "2018-01-21T07:42:36+00:00"
- },
{
"name": "psr/cache",
"version": "1.0.1",
@@ -182,25 +100,25 @@
},
{
"name": "psr/container",
- "version": "1.0.0",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -215,7 +133,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -227,24 +145,25 @@
"container-interop",
"psr"
],
- "time": "2017-02-14T16:28:37+00:00"
+ "time": "2021-11-05T16:47:00+00:00"
},
{
- "name": "psr/http-message",
- "version": "1.0.1",
+ "name": "psr/http-factory",
+ "version": "1.0.2",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
@@ -261,6 +180,57 @@
"license": [
"MIT"
],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2023-04-10T20:10:41+00:00"
+ },
+ {
+ "name": "psr/http-message",
+ "version": "1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
"authors": [
{
"name": "PHP-FIG",
@@ -277,20 +247,126 @@
"request",
"response"
],
- "time": "2016-08-06T14:39:51+00:00"
+ "time": "2023-04-04T09:50:52+00:00"
},
{
- "name": "psr/log",
- "version": "1.1.2",
+ "name": "psr/http-server-handler",
+ "version": "1.0.2",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+ "url": "https://github.com/php-fig/http-server-handler.git",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side request handler",
+ "keywords": [
+ "handler",
+ "http",
+ "http-interop",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response",
+ "server"
+ ],
+ "time": "2023-04-10T20:06:20+00:00"
+ },
+ {
+ "name": "psr/http-server-middleware",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-server-middleware.git",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0",
+ "psr/http-server-handler": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side middleware",
+ "keywords": [
+ "http",
+ "http-interop",
+ "middleware",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2023-04-11T06:14:47+00:00"
+ },
+ {
+ "name": "psr/log",
+ "version": "1.1.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": ""
},
"require": {
@@ -314,7 +390,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
@@ -324,7 +400,7 @@
"psr",
"psr-3"
],
- "time": "2019-11-01T11:05:21+00:00"
+ "time": "2021-05-03T11:20:27+00:00"
},
{
"name": "psr/simple-cache",
@@ -376,32 +452,51 @@
},
{
"name": "slim/slim",
- "version": "3.9.2",
+ "version": "4.12.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
- "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+ "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
- "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+ "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+ "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.2",
- "nikic/fast-route": "^1.0",
- "php": ">=5.5.0",
- "pimple/pimple": "^3.0",
- "psr/container": "^1.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
+ "ext-json": "*",
+ "nikic/fast-route": "^1.3",
+ "php": "^7.4 || ^8.0",
+ "psr/container": "^1.0 || ^2.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.1",
+ "psr/http-server-handler": "^1.0",
+ "psr/http-server-middleware": "^1.0",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0",
- "squizlabs/php_codesniffer": "^2.5"
+ "adriansuter/php-autoload-override": "^1.4",
+ "ext-simplexml": "*",
+ "guzzlehttp/psr7": "^2.5",
+ "httpsoft/http-message": "^1.1",
+ "httpsoft/http-server-request": "^1.1",
+ "laminas/laminas-diactoros": "^2.17",
+ "nyholm/psr7": "^1.8",
+ "nyholm/psr7-server": "^1.0",
+ "phpspec/prophecy": "^1.17",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^9.6",
+ "slim/http": "^1.3",
+ "slim/psr7": "^1.6",
+ "squizlabs/php_codesniffer": "^3.7"
+ },
+ "suggest": {
+ "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+ "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+ "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+ "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
},
"type": "library",
"autoload": {
@@ -414,49 +509,64 @@
"MIT"
],
"authors": [
- {
- "name": "Rob Allen",
- "email": "rob@akrabat.com",
- "homepage": "http://akrabat.com"
- },
{
"name": "Josh Lockhart",
"email": "hello@joshlockhart.com",
"homepage": "https://joshlockhart.com"
},
- {
- "name": "Gabriel Manricks",
- "email": "gmanricks@me.com",
- "homepage": "http://gabrielmanricks.com"
- },
{
"name": "Andrew Smith",
"email": "a.smith@silentworks.co.uk",
"homepage": "http://silentworks.co.uk"
+ },
+ {
+ "name": "Rob Allen",
+ "email": "rob@akrabat.com",
+ "homepage": "http://akrabat.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
+ },
+ {
+ "name": "Gabriel Manricks",
+ "email": "gmanricks@me.com",
+ "homepage": "http://gabrielmanricks.com"
}
],
"description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
- "homepage": "https://slimframework.com",
+ "homepage": "https://www.slimframework.com",
"keywords": [
"api",
"framework",
"micro",
"router"
],
- "time": "2017-11-26T19:13:09+00:00"
+ "funding": [
+ {
+ "url": "https://opencollective.com/slimphp",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-07-23T04:54:29+00:00"
},
{
"name": "symfony/cache",
- "version": "v3.4.36",
+ "version": "v3.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3"
+ "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
- "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+ "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
"shasum": ""
},
"require": {
@@ -475,16 +585,11 @@
},
"require-dev": {
"cache/integration-tests": "dev-master",
- "doctrine/cache": "~1.6",
- "doctrine/dbal": "~2.4",
- "predis/predis": "~1.0"
+ "doctrine/cache": "^1.6",
+ "doctrine/dbal": "^2.4|^3.0",
+ "predis/predis": "^1.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"autoload": {
"psr-4": {
"Symfony\\Component\\Cache\\": ""
@@ -513,32 +618,42 @@
"caching",
"psr6"
],
- "time": "2019-12-01T10:45:41+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-10-24T10:57:07+00:00"
},
{
"name": "symfony/expression-language",
- "version": "v3.4.8",
+ "version": "v3.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
- "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
+ "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
- "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
+ "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
- "symfony/cache": "~3.1|~4.0"
+ "symfony/cache": "~3.1|~4.0",
+ "symfony/polyfill-php70": "~1.6"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"autoload": {
"psr-4": {
"Symfony\\Component\\ExpressionLanguage\\": ""
@@ -563,38 +678,56 @@
],
"description": "Symfony ExpressionLanguage Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:37:34+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-10-24T10:57:07+00:00"
},
{
"name": "symfony/polyfill-apcu",
- "version": "v1.13.1",
+ "version": "v1.28.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-apcu.git",
- "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116"
+ "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116",
- "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116",
+ "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
+ "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.13-dev"
+ "dev-main": "1.28-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Apcu\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Apcu\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -619,7 +752,86 @@
"portable",
"shim"
],
- "time": "2019-11-27T13:56:44+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-01-26T09:26:14+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php70",
+ "version": "v1.20.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php70.git",
+ "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
+ "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "type": "metapackage",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.20-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-10-23T14:02:19+00:00"
}
],
"packages-dev": [],
@@ -631,5 +843,6 @@
"platform": {
"php": ">=5.6.0"
},
- "platform-dev": []
+ "platform-dev": [],
+ "plugin-api-version": "1.1.0"
}
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index dffb93632..84dd6ed8e 100644
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -21,31 +21,12 @@
use Friendica\DI;
-$container = $slim->getContainer();
+/** @var $slim \Slim\App */
-// Error handler based off https://stackoverflow.com/a/48135009/757392
-$container['errorHandler'] = function () {
- return function(Psr\Http\Message\RequestInterface $request, Psr\Http\Message\ResponseInterface $response, Exception $exception)
- {
- $responseCode = 500;
+/**
+ * The routing middleware should be added before the ErrorMiddleware
+ * Otherwise exceptions thrown from it will not be handled
+ */
+$slim->addRoutingMiddleware();
- if (is_a($exception, 'Friendica\Network\HTTPException')) {
- $responseCode = $exception->getCode();
- }
-
- $errors['message'] = $exception->getMessage();
-
- $errors['responseCode'] = $responseCode;
-
- return $response
- ->withStatus($responseCode)
- ->withJson($errors);
- };
-};
-
-$container['notFoundHandler'] = function () {
- return function ()
- {
- throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('Method not found'));
- };
-};
+$errorMiddleware = $slim->addErrorMiddleware(true, true, true);
diff --git a/advancedcontentfilter/src/routes.php b/advancedcontentfilter/src/routes.php
index 09077bdae..a46f1b4b5 100644
--- a/advancedcontentfilter/src/routes.php
+++ b/advancedcontentfilter/src/routes.php
@@ -20,20 +20,17 @@
*/
/* @var $slim Slim\App */
-$slim->group('/advancedcontentfilter/api', function () {
- /* @var $this Slim\App */
- $this->group('/rules', function () {
- /* @var $this Slim\App */
- $this->get('', 'advancedcontentfilter_get_rules');
- $this->post('', 'advancedcontentfilter_post_rules');
+$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
+ $app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
+ $app->get('', 'advancedcontentfilter_get_rules');
+ $app->post('', 'advancedcontentfilter_post_rules');
- $this->get('/{id}', 'advancedcontentfilter_get_rules_id');
- $this->put('/{id}', 'advancedcontentfilter_put_rules_id');
- $this->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+ $app->get('/{id}', 'advancedcontentfilter_get_rules_id');
+ $app->put('/{id}', 'advancedcontentfilter_put_rules_id');
+ $app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
});
- $this->group('/variables', function () {
- /* @var $this Slim\App */
- $this->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+ $app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
+ $app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
});
});
diff --git a/advancedcontentfilter/vendor/composer/ClassLoader.php b/advancedcontentfilter/vendor/composer/ClassLoader.php
index dc02dfb11..03b9bb9c4 100644
--- a/advancedcontentfilter/vendor/composer/ClassLoader.php
+++ b/advancedcontentfilter/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
- return call_user_func_array('array_merge', $this->prefixesPsr0);
+ return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
}
return array();
@@ -279,7 +279,7 @@ class ClassLoader
*/
public function setApcuPrefix($apcuPrefix)
{
- $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+ $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}
/**
@@ -377,7 +377,7 @@ class ClassLoader
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_classmap.php b/advancedcontentfilter/vendor/composer/autoload_classmap.php
index 4f884be1d..aa3de8a37 100644
--- a/advancedcontentfilter/vendor/composer/autoload_classmap.php
+++ b/advancedcontentfilter/vendor/composer/autoload_classmap.php
@@ -23,27 +23,6 @@ return array(
'FastRoute\\RouteCollector' => $vendorDir . '/nikic/fast-route/src/RouteCollector.php',
'FastRoute\\RouteParser' => $vendorDir . '/nikic/fast-route/src/RouteParser.php',
'FastRoute\\RouteParser\\Std' => $vendorDir . '/nikic/fast-route/src/RouteParser/Std.php',
- 'Interop\\Container\\ContainerInterface' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
- 'Interop\\Container\\Exception\\ContainerException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
- 'Interop\\Container\\Exception\\NotFoundException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
- 'Pimple\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Container.php',
- 'Pimple\\Exception\\ExpectedInvokableException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
- 'Pimple\\Exception\\FrozenServiceException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
- 'Pimple\\Exception\\InvalidServiceIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
- 'Pimple\\Exception\\UnknownIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
- 'Pimple\\Psr11\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/Container.php',
- 'Pimple\\Psr11\\ServiceLocator' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
- 'Pimple\\ServiceIterator' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceIterator.php',
- 'Pimple\\ServiceProviderInterface' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
- 'Pimple\\Tests\\Fixtures\\Invokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
- 'Pimple\\Tests\\Fixtures\\NonInvokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
- 'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
- 'Pimple\\Tests\\Fixtures\\Service' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
- 'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
- 'Pimple\\Tests\\PimpleTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
- 'Pimple\\Tests\\Psr11\\ContainerTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
- 'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
- 'Pimple\\Tests\\ServiceIteratorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -52,12 +31,20 @@ return array(
'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
'Psr\\Container\\NotFoundExceptionInterface' => $vendorDir . '/psr/container/src/NotFoundExceptionInterface.php',
'Psr\\Http\\Message\\MessageInterface' => $vendorDir . '/psr/http-message/src/MessageInterface.php',
+ 'Psr\\Http\\Message\\RequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/RequestFactoryInterface.php',
'Psr\\Http\\Message\\RequestInterface' => $vendorDir . '/psr/http-message/src/RequestInterface.php',
+ 'Psr\\Http\\Message\\ResponseFactoryInterface' => $vendorDir . '/psr/http-factory/src/ResponseFactoryInterface.php',
'Psr\\Http\\Message\\ResponseInterface' => $vendorDir . '/psr/http-message/src/ResponseInterface.php',
+ 'Psr\\Http\\Message\\ServerRequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
'Psr\\Http\\Message\\ServerRequestInterface' => $vendorDir . '/psr/http-message/src/ServerRequestInterface.php',
+ 'Psr\\Http\\Message\\StreamFactoryInterface' => $vendorDir . '/psr/http-factory/src/StreamFactoryInterface.php',
'Psr\\Http\\Message\\StreamInterface' => $vendorDir . '/psr/http-message/src/StreamInterface.php',
+ 'Psr\\Http\\Message\\UploadedFileFactoryInterface' => $vendorDir . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
'Psr\\Http\\Message\\UploadedFileInterface' => $vendorDir . '/psr/http-message/src/UploadedFileInterface.php',
+ 'Psr\\Http\\Message\\UriFactoryInterface' => $vendorDir . '/psr/http-factory/src/UriFactoryInterface.php',
'Psr\\Http\\Message\\UriInterface' => $vendorDir . '/psr/http-message/src/UriInterface.php',
+ 'Psr\\Http\\Server\\MiddlewareInterface' => $vendorDir . '/psr/http-server-middleware/src/MiddlewareInterface.php',
+ 'Psr\\Http\\Server\\RequestHandlerInterface' => $vendorDir . '/psr/http-server-handler/src/RequestHandlerInterface.php',
'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
@@ -66,57 +53,83 @@ return array(
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
- 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
'Slim\\App' => $vendorDir . '/slim/slim/Slim/App.php',
'Slim\\CallableResolver' => $vendorDir . '/slim/slim/Slim/CallableResolver.php',
- 'Slim\\CallableResolverAwareTrait' => $vendorDir . '/slim/slim/Slim/CallableResolverAwareTrait.php',
- 'Slim\\Collection' => $vendorDir . '/slim/slim/Slim/Collection.php',
- 'Slim\\Container' => $vendorDir . '/slim/slim/Slim/Container.php',
- 'Slim\\DefaultServicesProvider' => $vendorDir . '/slim/slim/Slim/DefaultServicesProvider.php',
- 'Slim\\DeferredCallable' => $vendorDir . '/slim/slim/Slim/DeferredCallable.php',
- 'Slim\\Exception\\ContainerException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerException.php',
- 'Slim\\Exception\\ContainerValueNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
- 'Slim\\Exception\\InvalidMethodException' => $vendorDir . '/slim/slim/Slim/Exception/InvalidMethodException.php',
- 'Slim\\Exception\\MethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
- 'Slim\\Exception\\NotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/NotFoundException.php',
- 'Slim\\Exception\\SlimException' => $vendorDir . '/slim/slim/Slim/Exception/SlimException.php',
- 'Slim\\Handlers\\AbstractError' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractError.php',
- 'Slim\\Handlers\\AbstractHandler' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractHandler.php',
- 'Slim\\Handlers\\Error' => $vendorDir . '/slim/slim/Slim/Handlers/Error.php',
- 'Slim\\Handlers\\NotAllowed' => $vendorDir . '/slim/slim/Slim/Handlers/NotAllowed.php',
- 'Slim\\Handlers\\NotFound' => $vendorDir . '/slim/slim/Slim/Handlers/NotFound.php',
- 'Slim\\Handlers\\PhpError' => $vendorDir . '/slim/slim/Slim/Handlers/PhpError.php',
+ 'Slim\\Error\\AbstractErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\HtmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\JsonErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\XmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
+ 'Slim\\Exception\\HttpBadRequestException' => $vendorDir . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
+ 'Slim\\Exception\\HttpException' => $vendorDir . '/slim/slim/Slim/Exception/HttpException.php',
+ 'Slim\\Exception\\HttpForbiddenException' => $vendorDir . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
+ 'Slim\\Exception\\HttpGoneException' => $vendorDir . '/slim/slim/Slim/Exception/HttpGoneException.php',
+ 'Slim\\Exception\\HttpInternalServerErrorException' => $vendorDir . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
+ 'Slim\\Exception\\HttpMethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
+ 'Slim\\Exception\\HttpNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
+ 'Slim\\Exception\\HttpNotImplementedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
+ 'Slim\\Exception\\HttpSpecializedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+ 'Slim\\Exception\\HttpUnauthorizedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
+ 'Slim\\Factory\\AppFactory' => $vendorDir . '/slim/slim/Slim/Factory/AppFactory.php',
+ 'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\Psr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
+ 'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
+ 'Slim\\Factory\\Psr17\\ServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
+ 'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
+ 'Slim\\Factory\\Psr17\\SlimPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
+ 'Slim\\Factory\\ServerRequestCreatorFactory' => $vendorDir . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
+ 'Slim\\Handlers\\ErrorHandler' => $vendorDir . '/slim/slim/Slim/Handlers/ErrorHandler.php',
+ 'Slim\\Handlers\\Strategies\\RequestHandler' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
'Slim\\Handlers\\Strategies\\RequestResponse' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
'Slim\\Handlers\\Strategies\\RequestResponseArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
- 'Slim\\Http\\Body' => $vendorDir . '/slim/slim/Slim/Http/Body.php',
- 'Slim\\Http\\Cookies' => $vendorDir . '/slim/slim/Slim/Http/Cookies.php',
- 'Slim\\Http\\Environment' => $vendorDir . '/slim/slim/Slim/Http/Environment.php',
- 'Slim\\Http\\Headers' => $vendorDir . '/slim/slim/Slim/Http/Headers.php',
- 'Slim\\Http\\Message' => $vendorDir . '/slim/slim/Slim/Http/Message.php',
- 'Slim\\Http\\Request' => $vendorDir . '/slim/slim/Slim/Http/Request.php',
- 'Slim\\Http\\RequestBody' => $vendorDir . '/slim/slim/Slim/Http/RequestBody.php',
- 'Slim\\Http\\Response' => $vendorDir . '/slim/slim/Slim/Http/Response.php',
- 'Slim\\Http\\Stream' => $vendorDir . '/slim/slim/Slim/Http/Stream.php',
- 'Slim\\Http\\UploadedFile' => $vendorDir . '/slim/slim/Slim/Http/UploadedFile.php',
- 'Slim\\Http\\Uri' => $vendorDir . '/slim/slim/Slim/Http/Uri.php',
+ 'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
+ 'Slim\\Interfaces\\AdvancedCallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
'Slim\\Interfaces\\CallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
- 'Slim\\Interfaces\\CollectionInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
- 'Slim\\Interfaces\\Http\\CookiesInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
- 'Slim\\Interfaces\\Http\\EnvironmentInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
- 'Slim\\Interfaces\\Http\\HeadersInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
+ 'Slim\\Interfaces\\DispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
+ 'Slim\\Interfaces\\ErrorHandlerInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
+ 'Slim\\Interfaces\\ErrorRendererInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
'Slim\\Interfaces\\InvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
+ 'Slim\\Interfaces\\MiddlewareDispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
+ 'Slim\\Interfaces\\Psr17FactoryInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
+ 'Slim\\Interfaces\\Psr17FactoryProviderInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
+ 'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
+ 'Slim\\Interfaces\\RouteCollectorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
+ 'Slim\\Interfaces\\RouteCollectorProxyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
'Slim\\Interfaces\\RouteGroupInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
'Slim\\Interfaces\\RouteInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteInterface.php',
- 'Slim\\Interfaces\\RouterInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouterInterface.php',
- 'Slim\\MiddlewareAwareTrait' => $vendorDir . '/slim/slim/Slim/MiddlewareAwareTrait.php',
- 'Slim\\Routable' => $vendorDir . '/slim/slim/Slim/Routable.php',
- 'Slim\\Route' => $vendorDir . '/slim/slim/Slim/Route.php',
- 'Slim\\RouteGroup' => $vendorDir . '/slim/slim/Slim/RouteGroup.php',
- 'Slim\\Router' => $vendorDir . '/slim/slim/Slim/Router.php',
+ 'Slim\\Interfaces\\RouteParserInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
+ 'Slim\\Interfaces\\RouteResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
+ 'Slim\\Interfaces\\ServerRequestCreatorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
+ 'Slim\\Logger' => $vendorDir . '/slim/slim/Slim/Logger.php',
+ 'Slim\\MiddlewareDispatcher' => $vendorDir . '/slim/slim/Slim/MiddlewareDispatcher.php',
+ 'Slim\\Middleware\\BodyParsingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
+ 'Slim\\Middleware\\ContentLengthMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
+ 'Slim\\Middleware\\ErrorMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
+ 'Slim\\Middleware\\MethodOverrideMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
+ 'Slim\\Middleware\\OutputBufferingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
+ 'Slim\\Middleware\\RoutingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
+ 'Slim\\ResponseEmitter' => $vendorDir . '/slim/slim/Slim/ResponseEmitter.php',
+ 'Slim\\Routing\\Dispatcher' => $vendorDir . '/slim/slim/Slim/Routing/Dispatcher.php',
+ 'Slim\\Routing\\FastRouteDispatcher' => $vendorDir . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
+ 'Slim\\Routing\\Route' => $vendorDir . '/slim/slim/Slim/Routing/Route.php',
+ 'Slim\\Routing\\RouteCollector' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollector.php',
+ 'Slim\\Routing\\RouteCollectorProxy' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
+ 'Slim\\Routing\\RouteContext' => $vendorDir . '/slim/slim/Slim/Routing/RouteContext.php',
+ 'Slim\\Routing\\RouteGroup' => $vendorDir . '/slim/slim/Slim/Routing/RouteGroup.php',
+ 'Slim\\Routing\\RouteParser' => $vendorDir . '/slim/slim/Slim/Routing/RouteParser.php',
+ 'Slim\\Routing\\RouteResolver' => $vendorDir . '/slim/slim/Slim/Routing/RouteResolver.php',
+ 'Slim\\Routing\\RouteRunner' => $vendorDir . '/slim/slim/Slim/Routing/RouteRunner.php',
+ 'Slim\\Routing\\RoutingResults' => $vendorDir . '/slim/slim/Slim/Routing/RoutingResults.php',
'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractAdapter.php',
'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/cache/Adapter/AdapterInterface.php',
'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => $vendorDir . '/symfony/cache/Adapter/ApcuAdapter.php',
diff --git a/advancedcontentfilter/vendor/composer/autoload_namespaces.php b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
index c3cd02297..b7fc0125d 100644
--- a/advancedcontentfilter/vendor/composer/autoload_namespaces.php
+++ b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
@@ -6,5 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
- 'Pimple' => array($vendorDir . '/pimple/pimple/src'),
);
diff --git a/advancedcontentfilter/vendor/composer/autoload_psr4.php b/advancedcontentfilter/vendor/composer/autoload_psr4.php
index f466cc18f..876065857 100644
--- a/advancedcontentfilter/vendor/composer/autoload_psr4.php
+++ b/advancedcontentfilter/vendor/composer/autoload_psr4.php
@@ -12,9 +12,9 @@ return array(
'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
- 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
+ 'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
+ 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
- 'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'),
'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
);
diff --git a/advancedcontentfilter/vendor/composer/autoload_real.php b/advancedcontentfilter/vendor/composer/autoload_real.php
index 6d7169aeb..d6532d7d4 100644
--- a/advancedcontentfilter/vendor/composer/autoload_real.php
+++ b/advancedcontentfilter/vendor/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAdvancedContentFilterAddon
}
}
+ /**
+ * @return \Composer\Autoload\ClassLoader
+ */
public static function getLoader()
{
if (null !== self::$loader) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_static.php b/advancedcontentfilter/vendor/composer/autoload_static.php
index e7c2f8de4..917d3d90a 100644
--- a/advancedcontentfilter/vendor/composer/autoload_static.php
+++ b/advancedcontentfilter/vendor/composer/autoload_static.php
@@ -23,14 +23,11 @@ class ComposerStaticInitAdvancedContentFilterAddon
array (
'Psr\\SimpleCache\\' => 16,
'Psr\\Log\\' => 8,
+ 'Psr\\Http\\Server\\' => 16,
'Psr\\Http\\Message\\' => 17,
'Psr\\Container\\' => 14,
'Psr\\Cache\\' => 10,
),
- 'I' =>
- array (
- 'Interop\\Container\\' => 18,
- ),
'F' =>
array (
'FastRoute\\' => 10,
@@ -62,9 +59,15 @@ class ComposerStaticInitAdvancedContentFilterAddon
array (
0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
),
+ 'Psr\\Http\\Server\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
+ 1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+ ),
'Psr\\Http\\Message\\' =>
array (
- 0 => __DIR__ . '/..' . '/psr/http-message/src',
+ 0 => __DIR__ . '/..' . '/psr/http-factory/src',
+ 1 => __DIR__ . '/..' . '/psr/http-message/src',
),
'Psr\\Container\\' =>
array (
@@ -74,26 +77,12 @@ class ComposerStaticInitAdvancedContentFilterAddon
array (
0 => __DIR__ . '/..' . '/psr/cache/src',
),
- 'Interop\\Container\\' =>
- array (
- 0 => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container',
- ),
'FastRoute\\' =>
array (
0 => __DIR__ . '/..' . '/nikic/fast-route/src',
),
);
- public static $prefixesPsr0 = array (
- 'P' =>
- array (
- 'Pimple' =>
- array (
- 0 => __DIR__ . '/..' . '/pimple/pimple/src',
- ),
- ),
- );
-
public static $classMap = array (
'FastRoute\\BadRouteException' => __DIR__ . '/..' . '/nikic/fast-route/src/BadRouteException.php',
'FastRoute\\DataGenerator' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator.php',
@@ -112,27 +101,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
'FastRoute\\RouteCollector' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteCollector.php',
'FastRoute\\RouteParser' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser.php',
'FastRoute\\RouteParser\\Std' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser/Std.php',
- 'Interop\\Container\\ContainerInterface' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
- 'Interop\\Container\\Exception\\ContainerException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
- 'Interop\\Container\\Exception\\NotFoundException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
- 'Pimple\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Container.php',
- 'Pimple\\Exception\\ExpectedInvokableException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
- 'Pimple\\Exception\\FrozenServiceException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
- 'Pimple\\Exception\\InvalidServiceIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
- 'Pimple\\Exception\\UnknownIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
- 'Pimple\\Psr11\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/Container.php',
- 'Pimple\\Psr11\\ServiceLocator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
- 'Pimple\\ServiceIterator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceIterator.php',
- 'Pimple\\ServiceProviderInterface' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
- 'Pimple\\Tests\\Fixtures\\Invokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
- 'Pimple\\Tests\\Fixtures\\NonInvokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
- 'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
- 'Pimple\\Tests\\Fixtures\\Service' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
- 'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
- 'Pimple\\Tests\\PimpleTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
- 'Pimple\\Tests\\Psr11\\ContainerTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
- 'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
- 'Pimple\\Tests\\ServiceIteratorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -141,12 +109,20 @@ class ComposerStaticInitAdvancedContentFilterAddon
'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
'Psr\\Container\\NotFoundExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/NotFoundExceptionInterface.php',
'Psr\\Http\\Message\\MessageInterface' => __DIR__ . '/..' . '/psr/http-message/src/MessageInterface.php',
+ 'Psr\\Http\\Message\\RequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/RequestFactoryInterface.php',
'Psr\\Http\\Message\\RequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/RequestInterface.php',
+ 'Psr\\Http\\Message\\ResponseFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ResponseFactoryInterface.php',
'Psr\\Http\\Message\\ResponseInterface' => __DIR__ . '/..' . '/psr/http-message/src/ResponseInterface.php',
+ 'Psr\\Http\\Message\\ServerRequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
'Psr\\Http\\Message\\ServerRequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/ServerRequestInterface.php',
+ 'Psr\\Http\\Message\\StreamFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/StreamFactoryInterface.php',
'Psr\\Http\\Message\\StreamInterface' => __DIR__ . '/..' . '/psr/http-message/src/StreamInterface.php',
+ 'Psr\\Http\\Message\\UploadedFileFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
'Psr\\Http\\Message\\UploadedFileInterface' => __DIR__ . '/..' . '/psr/http-message/src/UploadedFileInterface.php',
+ 'Psr\\Http\\Message\\UriFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UriFactoryInterface.php',
'Psr\\Http\\Message\\UriInterface' => __DIR__ . '/..' . '/psr/http-message/src/UriInterface.php',
+ 'Psr\\Http\\Server\\MiddlewareInterface' => __DIR__ . '/..' . '/psr/http-server-middleware/src/MiddlewareInterface.php',
+ 'Psr\\Http\\Server\\RequestHandlerInterface' => __DIR__ . '/..' . '/psr/http-server-handler/src/RequestHandlerInterface.php',
'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
@@ -155,57 +131,83 @@ class ComposerStaticInitAdvancedContentFilterAddon
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
- 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
'Slim\\App' => __DIR__ . '/..' . '/slim/slim/Slim/App.php',
'Slim\\CallableResolver' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolver.php',
- 'Slim\\CallableResolverAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolverAwareTrait.php',
- 'Slim\\Collection' => __DIR__ . '/..' . '/slim/slim/Slim/Collection.php',
- 'Slim\\Container' => __DIR__ . '/..' . '/slim/slim/Slim/Container.php',
- 'Slim\\DefaultServicesProvider' => __DIR__ . '/..' . '/slim/slim/Slim/DefaultServicesProvider.php',
- 'Slim\\DeferredCallable' => __DIR__ . '/..' . '/slim/slim/Slim/DeferredCallable.php',
- 'Slim\\Exception\\ContainerException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerException.php',
- 'Slim\\Exception\\ContainerValueNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
- 'Slim\\Exception\\InvalidMethodException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/InvalidMethodException.php',
- 'Slim\\Exception\\MethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
- 'Slim\\Exception\\NotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/NotFoundException.php',
- 'Slim\\Exception\\SlimException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/SlimException.php',
- 'Slim\\Handlers\\AbstractError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractError.php',
- 'Slim\\Handlers\\AbstractHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractHandler.php',
- 'Slim\\Handlers\\Error' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Error.php',
- 'Slim\\Handlers\\NotAllowed' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotAllowed.php',
- 'Slim\\Handlers\\NotFound' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotFound.php',
- 'Slim\\Handlers\\PhpError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/PhpError.php',
+ 'Slim\\Error\\AbstractErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\HtmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\JsonErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
+ 'Slim\\Error\\Renderers\\XmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
+ 'Slim\\Exception\\HttpBadRequestException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
+ 'Slim\\Exception\\HttpException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpException.php',
+ 'Slim\\Exception\\HttpForbiddenException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
+ 'Slim\\Exception\\HttpGoneException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpGoneException.php',
+ 'Slim\\Exception\\HttpInternalServerErrorException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
+ 'Slim\\Exception\\HttpMethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
+ 'Slim\\Exception\\HttpNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
+ 'Slim\\Exception\\HttpNotImplementedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
+ 'Slim\\Exception\\HttpSpecializedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+ 'Slim\\Exception\\HttpUnauthorizedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
+ 'Slim\\Factory\\AppFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/AppFactory.php',
+ 'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\Psr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
+ 'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
+ 'Slim\\Factory\\Psr17\\ServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
+ 'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
+ 'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
+ 'Slim\\Factory\\Psr17\\SlimPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
+ 'Slim\\Factory\\ServerRequestCreatorFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
+ 'Slim\\Handlers\\ErrorHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/ErrorHandler.php',
+ 'Slim\\Handlers\\Strategies\\RequestHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
'Slim\\Handlers\\Strategies\\RequestResponse' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
'Slim\\Handlers\\Strategies\\RequestResponseArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
- 'Slim\\Http\\Body' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Body.php',
- 'Slim\\Http\\Cookies' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Cookies.php',
- 'Slim\\Http\\Environment' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Environment.php',
- 'Slim\\Http\\Headers' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Headers.php',
- 'Slim\\Http\\Message' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Message.php',
- 'Slim\\Http\\Request' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Request.php',
- 'Slim\\Http\\RequestBody' => __DIR__ . '/..' . '/slim/slim/Slim/Http/RequestBody.php',
- 'Slim\\Http\\Response' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Response.php',
- 'Slim\\Http\\Stream' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Stream.php',
- 'Slim\\Http\\UploadedFile' => __DIR__ . '/..' . '/slim/slim/Slim/Http/UploadedFile.php',
- 'Slim\\Http\\Uri' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Uri.php',
+ 'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
+ 'Slim\\Interfaces\\AdvancedCallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
'Slim\\Interfaces\\CallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
- 'Slim\\Interfaces\\CollectionInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
- 'Slim\\Interfaces\\Http\\CookiesInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
- 'Slim\\Interfaces\\Http\\EnvironmentInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
- 'Slim\\Interfaces\\Http\\HeadersInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
+ 'Slim\\Interfaces\\DispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
+ 'Slim\\Interfaces\\ErrorHandlerInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
+ 'Slim\\Interfaces\\ErrorRendererInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
'Slim\\Interfaces\\InvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
+ 'Slim\\Interfaces\\MiddlewareDispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
+ 'Slim\\Interfaces\\Psr17FactoryInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
+ 'Slim\\Interfaces\\Psr17FactoryProviderInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
+ 'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
+ 'Slim\\Interfaces\\RouteCollectorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
+ 'Slim\\Interfaces\\RouteCollectorProxyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
'Slim\\Interfaces\\RouteGroupInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
'Slim\\Interfaces\\RouteInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteInterface.php',
- 'Slim\\Interfaces\\RouterInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouterInterface.php',
- 'Slim\\MiddlewareAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareAwareTrait.php',
- 'Slim\\Routable' => __DIR__ . '/..' . '/slim/slim/Slim/Routable.php',
- 'Slim\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Route.php',
- 'Slim\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/RouteGroup.php',
- 'Slim\\Router' => __DIR__ . '/..' . '/slim/slim/Slim/Router.php',
+ 'Slim\\Interfaces\\RouteParserInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
+ 'Slim\\Interfaces\\RouteResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
+ 'Slim\\Interfaces\\ServerRequestCreatorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
+ 'Slim\\Logger' => __DIR__ . '/..' . '/slim/slim/Slim/Logger.php',
+ 'Slim\\MiddlewareDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareDispatcher.php',
+ 'Slim\\Middleware\\BodyParsingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
+ 'Slim\\Middleware\\ContentLengthMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
+ 'Slim\\Middleware\\ErrorMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
+ 'Slim\\Middleware\\MethodOverrideMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
+ 'Slim\\Middleware\\OutputBufferingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
+ 'Slim\\Middleware\\RoutingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
+ 'Slim\\ResponseEmitter' => __DIR__ . '/..' . '/slim/slim/Slim/ResponseEmitter.php',
+ 'Slim\\Routing\\Dispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Dispatcher.php',
+ 'Slim\\Routing\\FastRouteDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
+ 'Slim\\Routing\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Route.php',
+ 'Slim\\Routing\\RouteCollector' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollector.php',
+ 'Slim\\Routing\\RouteCollectorProxy' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
+ 'Slim\\Routing\\RouteContext' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteContext.php',
+ 'Slim\\Routing\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteGroup.php',
+ 'Slim\\Routing\\RouteParser' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteParser.php',
+ 'Slim\\Routing\\RouteResolver' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteResolver.php',
+ 'Slim\\Routing\\RouteRunner' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteRunner.php',
+ 'Slim\\Routing\\RoutingResults' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RoutingResults.php',
'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractAdapter.php',
'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/AdapterInterface.php',
'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ApcuAdapter.php',
@@ -294,7 +296,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitAdvancedContentFilterAddon::$prefixesPsr0;
$loader->classMap = ComposerStaticInitAdvancedContentFilterAddon::$classMap;
}, null, ClassLoader::class);
diff --git a/advancedcontentfilter/vendor/composer/installed.json b/advancedcontentfilter/vendor/composer/installed.json
index 8e6b80dcf..1a84a8fdb 100644
--- a/advancedcontentfilter/vendor/composer/installed.json
+++ b/advancedcontentfilter/vendor/composer/installed.json
@@ -1,37 +1,4 @@
[
- {
- "name": "container-interop/container-interop",
- "version": "1.2.0",
- "version_normalized": "1.2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/container-interop/container-interop.git",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "shasum": ""
- },
- "require": {
- "psr/container": "^1.0"
- },
- "time": "2017-02-14T19:40:03+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Interop\\Container\\": "src/Interop/Container/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
- "homepage": "https://github.com/container-interop/container-interop"
- },
{
"name": "nikic/fast-route",
"version": "v1.3.0",
@@ -80,58 +47,6 @@
"routing"
]
},
- {
- "name": "pimple/pimple",
- "version": "v3.2.3",
- "version_normalized": "3.2.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/silexphp/Pimple.git",
- "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
- "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "psr/container": "^1.0"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "^3.2"
- },
- "time": "2018-01-21T07:42:36+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Pimple": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Pimple, a simple Dependency Injection Container",
- "homepage": "http://pimple.sensiolabs.org",
- "keywords": [
- "container",
- "dependency injection"
- ]
- },
{
"name": "psr/cache",
"version": "1.0.1",
@@ -182,27 +97,27 @@
},
{
"name": "psr/container",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "2.0.2",
+ "version_normalized": "2.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.4.0"
},
- "time": "2017-02-14T16:28:37+00:00",
+ "time": "2021-11-05T16:47:00+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"installation-source": "dist",
@@ -218,7 +133,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -232,24 +147,25 @@
]
},
{
- "name": "psr/http-message",
- "version": "1.0.1",
- "version_normalized": "1.0.1.0",
+ "name": "psr/http-factory",
+ "version": "1.0.2",
+ "version_normalized": "1.0.2.0",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0 || ^2.0"
},
- "time": "2016-08-06T14:39:51+00:00",
+ "time": "2023-04-10T20:10:41+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -266,6 +182,59 @@
"license": [
"MIT"
],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ]
+ },
+ {
+ "name": "psr/http-message",
+ "version": "1.1",
+ "version_normalized": "1.1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "time": "2023-04-04T09:50:52+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
"authors": [
{
"name": "PHP-FIG",
@@ -284,28 +253,138 @@
]
},
{
- "name": "psr/log",
+ "name": "psr/http-server-handler",
"version": "1.0.2",
"version_normalized": "1.0.2.0",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "url": "https://github.com/php-fig/http-server-handler.git",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "time": "2023-04-10T20:06:20+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side request handler",
+ "keywords": [
+ "handler",
+ "http",
+ "http-interop",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response",
+ "server"
+ ]
+ },
+ {
+ "name": "psr/http-server-middleware",
+ "version": "1.0.2",
+ "version_normalized": "1.0.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-server-middleware.git",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0",
+ "psr/http-server-handler": "^1.0"
+ },
+ "time": "2023-04-11T06:14:47+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side middleware",
+ "keywords": [
+ "http",
+ "http-interop",
+ "middleware",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response"
+ ]
+ },
+ {
+ "name": "psr/log",
+ "version": "1.1.4",
+ "version_normalized": "1.1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
- "time": "2016-10-10T12:19:37+00:00",
+ "time": "2021-05-03T11:20:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"installation-source": "dist",
@@ -321,7 +400,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
@@ -384,35 +463,54 @@
},
{
"name": "slim/slim",
- "version": "3.9.2",
- "version_normalized": "3.9.2.0",
+ "version": "4.12.0",
+ "version_normalized": "4.12.0.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
- "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+ "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
- "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+ "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+ "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.2",
- "nikic/fast-route": "^1.0",
- "php": ">=5.5.0",
- "pimple/pimple": "^3.0",
- "psr/container": "^1.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
+ "ext-json": "*",
+ "nikic/fast-route": "^1.3",
+ "php": "^7.4 || ^8.0",
+ "psr/container": "^1.0 || ^2.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.1",
+ "psr/http-server-handler": "^1.0",
+ "psr/http-server-middleware": "^1.0",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0",
- "squizlabs/php_codesniffer": "^2.5"
+ "adriansuter/php-autoload-override": "^1.4",
+ "ext-simplexml": "*",
+ "guzzlehttp/psr7": "^2.5",
+ "httpsoft/http-message": "^1.1",
+ "httpsoft/http-server-request": "^1.1",
+ "laminas/laminas-diactoros": "^2.17",
+ "nyholm/psr7": "^1.8",
+ "nyholm/psr7-server": "^1.0",
+ "phpspec/prophecy": "^1.17",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^9.6",
+ "slim/http": "^1.3",
+ "slim/psr7": "^1.6",
+ "squizlabs/php_codesniffer": "^3.7"
},
- "time": "2017-11-26T19:13:09+00:00",
+ "suggest": {
+ "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+ "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+ "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+ "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
+ },
+ "time": "2023-07-23T04:54:29+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -425,49 +523,64 @@
"MIT"
],
"authors": [
- {
- "name": "Rob Allen",
- "email": "rob@akrabat.com",
- "homepage": "http://akrabat.com"
- },
{
"name": "Josh Lockhart",
"email": "hello@joshlockhart.com",
"homepage": "https://joshlockhart.com"
},
- {
- "name": "Gabriel Manricks",
- "email": "gmanricks@me.com",
- "homepage": "http://gabrielmanricks.com"
- },
{
"name": "Andrew Smith",
"email": "a.smith@silentworks.co.uk",
"homepage": "http://silentworks.co.uk"
+ },
+ {
+ "name": "Rob Allen",
+ "email": "rob@akrabat.com",
+ "homepage": "http://akrabat.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
+ },
+ {
+ "name": "Gabriel Manricks",
+ "email": "gmanricks@me.com",
+ "homepage": "http://gabrielmanricks.com"
}
],
"description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
- "homepage": "https://slimframework.com",
+ "homepage": "https://www.slimframework.com",
"keywords": [
"api",
"framework",
"micro",
"router"
+ ],
+ "funding": [
+ {
+ "url": "https://opencollective.com/slimphp",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+ "type": "tidelift"
+ }
]
},
{
"name": "symfony/cache",
- "version": "v3.4.8",
- "version_normalized": "3.4.8.0",
+ "version": "v3.4.47",
+ "version_normalized": "3.4.47.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "13255ddd056e49f3154747943f8ee175d555d394"
+ "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394",
- "reference": "13255ddd056e49f3154747943f8ee175d555d394",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+ "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
"shasum": ""
},
"require": {
@@ -486,17 +599,12 @@
},
"require-dev": {
"cache/integration-tests": "dev-master",
- "doctrine/cache": "~1.6",
- "doctrine/dbal": "~2.4",
- "predis/predis": "~1.0"
+ "doctrine/cache": "^1.6",
+ "doctrine/dbal": "^2.4|^3.0",
+ "predis/predis": "^1.0"
},
- "time": "2018-04-02T14:35:16+00:00",
+ "time": "2020-10-24T10:57:07+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -525,34 +633,44 @@
"keywords": [
"caching",
"psr6"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
]
},
{
"name": "symfony/expression-language",
- "version": "v3.4.8",
- "version_normalized": "3.4.8.0",
+ "version": "v3.4.47",
+ "version_normalized": "3.4.47.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
- "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
+ "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
- "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
+ "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
- "symfony/cache": "~3.1|~4.0"
+ "symfony/cache": "~3.1|~4.0",
+ "symfony/polyfill-php70": "~1.6"
},
- "time": "2018-01-03T07:37:34+00:00",
+ "time": "2020-10-24T10:57:07+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -577,41 +695,59 @@
}
],
"description": "Symfony ExpressionLanguage Component",
- "homepage": "https://symfony.com"
+ "homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ]
},
{
"name": "symfony/polyfill-apcu",
- "version": "v1.7.0",
- "version_normalized": "1.7.0.0",
+ "version": "v1.28.0",
+ "version_normalized": "1.28.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-apcu.git",
- "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
+ "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
- "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
+ "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
+ "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
- "time": "2018-01-30T19:27:44+00:00",
+ "time": "2023-01-26T09:26:14+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-main": "1.28-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Apcu\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Apcu\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -635,6 +771,86 @@
"polyfill",
"portable",
"shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ]
+ },
+ {
+ "name": "symfony/polyfill-php70",
+ "version": "v1.20.0",
+ "version_normalized": "1.20.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php70.git",
+ "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
+ "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "time": "2020-10-23T14:02:19+00:00",
+ "type": "metapackage",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.20-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
]
}
]
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore b/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
deleted file mode 100644
index b2395aa05..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-composer.lock
-composer.phar
-/vendor/
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE b/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
deleted file mode 100644
index 7671d9020..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 container-interop
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/README.md b/advancedcontentfilter/vendor/container-interop/container-interop/README.md
deleted file mode 100644
index cdd7a44c8..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# Container Interoperability
-
-[](https://packagist.org/packages/container-interop/container-interop)
-[](https://packagist.org/packages/container-interop/container-interop)
-
-## Deprecation warning!
-
-Starting Feb. 13th 2017, container-interop is officially deprecated in favor of [PSR-11](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-11-container.md).
-Container-interop has been the test-bed of PSR-11. From v1.2, container-interop directly extends PSR-11 interfaces.
-Therefore, all containers implementing container-interop are now *de-facto* compatible with PSR-11.
-
-- Projects implementing container-interop interfaces are encouraged to directly implement PSR-11 interfaces instead.
-- Projects consuming container-interop interfaces are very strongly encouraged to directly type-hint on PSR-11 interfaces, in order to be compatible with PSR-11 containers that are not compatible with container-interop.
-
-Regarding the delegate lookup feature, that is present in container-interop and not in PSR-11, the feature is actually a design pattern. It is therefore not deprecated. Documentation regarding this design pattern will be migrated from this repository into a separate website in the future.
-
-## About
-
-*container-interop* tries to identify and standardize features in *container* objects (service locators,
-dependency injection containers, etc.) to achieve interoperability.
-
-Through discussions and trials, we try to create a standard, made of common interfaces but also recommendations.
-
-If PHP projects that provide container implementations begin to adopt these common standards, then PHP
-applications and projects that use containers can depend on the common interfaces instead of specific
-implementations. This facilitates a high-level of interoperability and flexibility that allows users to consume
-*any* container implementation that can be adapted to these interfaces.
-
-The work done in this project is not officially endorsed by the [PHP-FIG](http://www.php-fig.org/), but it is being
-worked on by members of PHP-FIG and other good developers. We adhere to the spirit and ideals of PHP-FIG, and hope
-this project will pave the way for one or more future PSRs.
-
-
-## Installation
-
-You can install this package through Composer:
-
-```json
-composer require container-interop/container-interop
-```
-
-The packages adheres to the [SemVer](http://semver.org/) specification, and there will be full backward compatibility
-between minor versions.
-
-## Standards
-
-### Available
-
-- [`ContainerInterface`](src/Interop/Container/ContainerInterface.php).
-[Description](docs/ContainerInterface.md) [Meta Document](docs/ContainerInterface-meta.md).
-Describes the interface of a container that exposes methods to read its entries.
-- [*Delegate lookup feature*](docs/Delegate-lookup.md).
-[Meta Document](docs/Delegate-lookup-meta.md).
-Describes the ability for a container to delegate the lookup of its dependencies to a third-party container. This
-feature lets several containers work together in a single application.
-
-### Proposed
-
-View open [request for comments](https://github.com/container-interop/container-interop/labels/RFC)
-
-## Compatible projects
-
-### Projects implementing `ContainerInterface`
-
-- [Acclimate](https://github.com/jeremeamia/acclimate-container): Adapters for
- Aura.Di, Laravel, Nette DI, Pimple, Symfony DI, ZF2 Service manager, ZF2
- Dependency injection and any container using `ArrayAccess`
-- [Aura.Di](https://github.com/auraphp/Aura.Di)
-- [auryn-container-interop](https://github.com/elazar/auryn-container-interop)
-- [Burlap](https://github.com/codeeverything/burlap)
-- [Chernozem](https://github.com/pyrsmk/Chernozem)
-- [Data Manager](https://github.com/chrismichaels84/data-manager)
-- [Disco](https://github.com/bitexpert/disco)
-- [InDI](https://github.com/idealogica/indi)
-- [League/Container](http://container.thephpleague.com/)
-- [Mouf](http://mouf-php.com)
-- [Njasm Container](https://github.com/njasm/container)
-- [PHP-DI](http://php-di.org)
-- [Picotainer](https://github.com/thecodingmachine/picotainer)
-- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
-- [Pimple3-ContainerInterop](https://github.com/Sam-Burns/pimple3-containerinterop) (using Pimple v3)
-- [SitePoint Container](https://github.com/sitepoint/Container)
-- [Thruster Container](https://github.com/ThrusterIO/container) (PHP7 only)
-- [Ultra-Lite Container](https://github.com/ultra-lite/container)
-- [Unbox](https://github.com/mindplay-dk/unbox)
-- [XStatic](https://github.com/jeremeamia/xstatic)
-- [Zend\ServiceManager](https://github.com/zendframework/zend-servicemanager)
-- [Zit](https://github.com/inxilpro/Zit)
-
-### Projects implementing the *delegate lookup* feature
-
-- [Aura.Di](https://github.com/auraphp/Aura.Di)
-- [Burlap](https://github.com/codeeverything/burlap)
-- [Chernozem](https://github.com/pyrsmk/Chernozem)
-- [InDI](https://github.com/idealogica/indi)
-- [League/Container](http://container.thephpleague.com/)
-- [Mouf](http://mouf-php.com)
-- [Picotainer](https://github.com/thecodingmachine/picotainer)
-- [PHP-DI](http://php-di.org)
-- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
-- [Ultra-Lite Container](https://github.com/ultra-lite/container)
-
-### Middlewares implementing `ContainerInterface`
-
-- [Alias-Container](https://github.com/thecodingmachine/alias-container): add
- aliases support to any container
-- [Prefixer-Container](https://github.com/thecodingmachine/prefixer-container):
- dynamically prefix identifiers
-- [Lazy-Container](https://github.com/snapshotpl/lazy-container): lazy services
-
-### Projects using `ContainerInterface`
-
-The list below contains only a sample of all the projects consuming `ContainerInterface`. For a more complete list have a look [here](http://packanalyst.com/class?q=Interop%5CContainer%5CContainerInterface).
-
-| | Downloads |
-| --- | --- |
-| [Adroit](https://github.com/bitexpert/adroit) |  |
-| [Behat](https://github.com/Behat/Behat/pull/974) |  |
-| [blast-facades](https://github.com/phpthinktank/blast-facades): Minimize complexity and represent dependencies as facades. |  |
-| [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di): an extension to [Silex](http://silex.sensiolabs.org/) that adds support for any *container-interop* compatible container |  |
-| [mindplay/walkway](https://github.com/mindplay-dk/walkway): a modular request router |  |
-| [mindplay/middleman](https://github.com/mindplay-dk/middleman): minimalist PSR-7 middleware dispatcher |  |
-| [PHP-DI/Invoker](https://github.com/PHP-DI/Invoker): extensible and configurable invoker/dispatcher |  |
-| [Prophiler](https://github.com/fabfuel/prophiler) |  |
-| [Silly](https://github.com/mnapoli/silly): CLI micro-framework |  |
-| [Slim v3](https://github.com/slimphp/Slim) |  |
-| [Splash](http://mouf-php.com/packages/mouf/mvc.splash-common/version/8.0-dev/README.md) |  |
-| [Woohoo Labs. Harmony](https://github.com/woohoolabs/harmony): a flexible micro-framework |  |
-| [zend-expressive](https://github.com/zendframework/zend-expressive) |  |
-
-
-## Workflow
-
-Everyone is welcome to join and contribute.
-
-The general workflow looks like this:
-
-1. Someone opens a discussion (GitHub issue) to suggest an interface
-1. Feedback is gathered
-1. The interface is added to a development branch
-1. We release alpha versions so that the interface can be experimented with
-1. Discussions and edits ensue until the interface is deemed stable by a general consensus
-1. A new minor version of the package is released
-
-We try to not break BC by creating new interfaces instead of editing existing ones.
-
-While we currently work on interfaces, we are open to anything that might help towards interoperability, may that
-be code, best practices, etc.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/composer.json b/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
deleted file mode 100644
index 855f76672..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "container-interop/container-interop",
- "type": "library",
- "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
- "homepage": "https://github.com/container-interop/container-interop",
- "license": "MIT",
- "autoload": {
- "psr-4": {
- "Interop\\Container\\": "src/Interop/Container/"
- }
- },
- "require": {
- "psr/container": "^1.0"
- }
-}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
deleted file mode 100644
index 59f3d5599..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# ContainerInterface Meta Document
-
-## Introduction
-
-This document describes the process and discussions that lead to the `ContainerInterface`.
-Its goal is to explain the reasons behind each decision.
-
-## Goal
-
-The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
-container to obtain objects and parameters.
-
-By standardizing such a behavior, frameworks and libraries using the `ContainerInterface`
-could work with any compatible container.
-That would allow end users to choose their own container based on their own preferences.
-
-It is important to distinguish the two usages of a container:
-
-- configuring entries
-- fetching entries
-
-Most of the time, those two sides are not used by the same party.
-While it is often end users who tend to configure entries, it is generally the framework that fetch
-entries to build the application.
-
-This is why this interface focuses only on how entries can be fetched from a container.
-
-## Interface name
-
-The interface name has been thoroughly discussed and was decided by a vote.
-
-The list of options considered with their respective votes are:
-
-- `ContainerInterface`: +8
-- `ProviderInterface`: +2
-- `LocatorInterface`: 0
-- `ReadableContainerInterface`: -5
-- `ServiceLocatorInterface`: -6
-- `ObjectFactory`: -6
-- `ObjectStore`: -8
-- `ConsumerInterface`: -9
-
-[Full results of the vote](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
-
-The complete discussion can be read in [the issue #1](https://github.com/container-interop/container-interop/issues/1).
-
-## Interface methods
-
-The choice of which methods the interface would contain was made after a statistical analysis of existing containers.
-The results of this analysis are available [in this document](https://gist.github.com/mnapoli/6159681).
-
-The summary of the analysis showed that:
-
-- all containers offer a method to get an entry by its id
-- a large majority name such method `get()`
-- for all containers, the `get()` method has 1 mandatory parameter of type string
-- some containers have an optional additional argument for `get()`, but it doesn't have the same purpose between containers
-- a large majority of the containers offer a method to test if it can return an entry by its id
-- a majority name such method `has()`
-- for all containers offering `has()`, the method has exactly 1 parameter of type string
-- a large majority of the containers throw an exception rather than returning null when an entry is not found in `get()`
-- a large majority of the containers don't implement `ArrayAccess`
-
-The question of whether to include methods to define entries has been discussed in
-[issue #1](https://github.com/container-interop/container-interop/issues/1).
-It has been judged that such methods do not belong in the interface described here because it is out of its scope
-(see the "Goal" section).
-
-As a result, the `ContainerInterface` contains two methods:
-
-- `get()`, returning anything, with one mandatory string parameter. Should throw an exception if the entry is not found.
-- `has()`, returning a boolean, with one mandatory string parameter.
-
-### Number of parameters in `get()` method
-
-While `ContainerInterface` only defines one mandatory parameter in `get()`, it is not incompatible with
-existing containers that have additional optional parameters. PHP allows an implementation to offer more parameters
-as long as they are optional, because the implementation *does* satisfy the interface.
-
-This issue has been discussed in [issue #6](https://github.com/container-interop/container-interop/issues/6).
-
-### Type of the `$id` parameter
-
-The type of the `$id` parameter in `get()` and `has()` has been discussed in
-[issue #6](https://github.com/container-interop/container-interop/issues/6).
-While `string` is used in all the containers that were analyzed, it was suggested that allowing
-anything (such as objects) could allow containers to offer a more advanced query API.
-
-An example given was to use the container as an object builder. The `$id` parameter would then be an
-object that would describe how to create an instance.
-
-The conclusion of the discussion was that this was beyond the scope of getting entries from a container without
-knowing how the container provided them, and it was more fit for a factory.
-
-## Contributors
-
-Are listed here all people that contributed in the discussions or votes, by alphabetical order:
-
-- [Amy Stephen](https://github.com/AmyStephen)
-- [David Négrier](https://github.com/moufmouf)
-- [Don Gilbert](https://github.com/dongilbert)
-- [Jason Judge](https://github.com/judgej)
-- [Jeremy Lindblom](https://github.com/jeremeamia)
-- [Marco Pivetta](https://github.com/Ocramius)
-- [Matthieu Napoli](https://github.com/mnapoli)
-- [Paul M. Jones](https://github.com/pmjones)
-- [Stephan Hochdörfer](https://github.com/shochdoerfer)
-- [Taylor Otwell](https://github.com/taylorotwell)
-
-## Relevant links
-
-- [`ContainerInterface.php`](https://github.com/container-interop/container-interop/blob/master/src/Interop/Container/ContainerInterface.php)
-- [List of all issues](https://github.com/container-interop/container-interop/issues?labels=ContainerInterface&milestone=&page=1&state=closed)
-- [Vote for the interface name](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
deleted file mode 100644
index bda973d6f..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
+++ /dev/null
@@ -1,158 +0,0 @@
-Container interface
-===================
-
-This document describes a common interface for dependency injection containers.
-
-The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
-container to obtain objects and parameters (called *entries* in the rest of this document).
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
-interpreted as described in [RFC 2119][].
-
-The word `implementor` in this document is to be interpreted as someone
-implementing the `ContainerInterface` in a dependency injection-related library or framework.
-Users of dependency injections containers (DIC) are referred to as `user`.
-
-[RFC 2119]: http://tools.ietf.org/html/rfc2119
-
-1. Specification
------------------
-
-### 1.1 Basics
-
-- The `Interop\Container\ContainerInterface` exposes two methods : `get` and `has`.
-
-- `get` takes one mandatory parameter: an entry identifier. It MUST be a string.
- A call to `get` can return anything (a *mixed* value), or throws an exception if the identifier
- is not known to the container. Two successive calls to `get` with the same
- identifier SHOULD return the same value. However, depending on the `implementor`
- design and/or `user` configuration, different values might be returned, so
- `user` SHOULD NOT rely on getting the same value on 2 successive calls.
- While `ContainerInterface` only defines one mandatory parameter in `get()`, implementations
- MAY accept additional optional parameters.
-
-- `has` takes one unique parameter: an entry identifier. It MUST return `true`
- if an entry identifier is known to the container and `false` if it is not.
- `has($id)` returning true does not mean that `get($id)` will not throw an exception.
- It does however mean that `get($id)` will not throw a `NotFoundException`.
-
-### 1.2 Exceptions
-
-Exceptions directly thrown by the container MUST implement the
-[`Interop\Container\Exception\ContainerException`](../src/Interop/Container/Exception/ContainerException.php).
-
-A call to the `get` method with a non-existing id SHOULD throw a
-[`Interop\Container\Exception\NotFoundException`](../src/Interop/Container/Exception/NotFoundException.php).
-
-### 1.3 Additional features
-
-This section describes additional features that MAY be added to a container. Containers are not
-required to implement these features to respect the ContainerInterface.
-
-#### 1.3.1 Delegate lookup feature
-
-The goal of the *delegate lookup* feature is to allow several containers to share entries.
-Containers implementing this feature can perform dependency lookups in other containers.
-
-Containers implementing this feature will offer a greater lever of interoperability
-with other containers. Implementation of this feature is therefore RECOMMENDED.
-
-A container implementing this feature:
-
-- MUST implement the `ContainerInterface`
-- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
- or any possible way). The delegate container MUST implement the `ContainerInterface`.
-
-When a container is configured to use a delegate container for dependencies:
-
-- Calls to the `get` method should only return an entry if the entry is part of the container.
- If the entry is not part of the container, an exception should be thrown
- (as requested by the `ContainerInterface`).
-- Calls to the `has` method should only return `true` if the entry is part of the container.
- If the entry is not part of the container, `false` should be returned.
-- If the fetched entry has dependencies, **instead** of performing
- the dependency lookup in the container, the lookup is performed on the *delegate container*.
-
-Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
-
-It is however allowed for containers to provide exception cases for special entries, and a way to lookup
-into the same container (or another container) instead of the delegate container.
-
-2. Package
-----------
-
-The interfaces and classes described as well as relevant exception are provided as part of the
-[container-interop/container-interop](https://packagist.org/packages/container-interop/container-interop) package.
-
-3. `Interop\Container\ContainerInterface`
------------------------------------------
-
-```php
-setParentContainer($this);
- }
- }
- ...
- }
-}
-
-```
-
-**Cons:**
-
-Cons have been extensively discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51721777).
-Basically, forcing a setter into an interface is a bad idea. Setters are similar to constructor arguments,
-and it's a bad idea to standardize a constructor: how the delegate container is configured into a container is an implementation detail. This outweights the benefits of the interface.
-
-### 4.4 Alternative: no exception case for delegate lookups
-
-Originally, the proposed wording for delegate lookup calls was:
-
-> Important! The lookup MUST be performed on the delegate container **only**, not on the container itself.
-
-This was later replaced by:
-
-> Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
->
-> It is however allowed for containers to provide exception cases for special entries, and a way to lookup
-> into the same container (or another container) instead of the delegate container.
-
-Exception cases have been allowed to avoid breaking dependencies with some services that must be provided
-by the container (on @njasm proposal). This was proposed here: https://github.com/container-interop/container-interop/pull/20#issuecomment-56597235
-
-### 4.5 Alternative: having one of the containers act as the composite container
-
-In real-life scenarios, we usually have a big framework (Symfony 2, Zend Framework 2, etc...) and we want to
-add another DI container to this container. Most of the time, the "big" framework will be responsible for
-creating the controller's instances, using it's own DI container. Until *container-interop* is fully adopted,
-the "big" framework will not be aware of the existence of a composite container that it should use instead
-of its own container.
-
-For this real-life use cases, @mnapoli and @moufmouf proposed to extend the "big" framework's DI container
-to make it act as a composite container.
-
-This has been discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-40367194)
-and [here](http://mouf-php.com/container-interop-whats-next#solution4).
-
-This was implemented in Symfony 2 using:
-
-- [interop.symfony.di](https://github.com/thecodingmachine/interop.symfony.di/tree/v0.1.0)
-- [framework interop](https://github.com/mnapoli/framework-interop/)
-
-This was implemented in Silex using:
-
-- [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di)
-
-Having a container act as the composite container is not part of the delegate lookup standard because it is
-simply a temporary design pattern used to make existing frameworks that do not support yet ContainerInterop
-play nice with other DI containers.
-
-
-5. Implementations
-------------------
-
-The following projects already implement the delegate lookup feature:
-
-- [Mouf](http://mouf-php.com), through the [`setDelegateLookupContainer` method](https://github.com/thecodingmachine/mouf/blob/2.0/src/Mouf/MoufManager.php#L2120)
-- [PHP-DI](http://php-di.org/), through the [`$wrapperContainer` parameter of the constructor](https://github.com/mnapoli/PHP-DI/blob/master/src/DI/Container.php#L72)
-- [pimple-interop](https://github.com/moufmouf/pimple-interop), through the [`$container` parameter of the constructor](https://github.com/moufmouf/pimple-interop/blob/master/src/Interop/Container/Pimple/PimpleInterop.php#L62)
-
-6. People
----------
-
-Are listed here all people that contributed in the discussions, by alphabetical order:
-
-- [Alexandru Pătrănescu](https://github.com/drealecs)
-- [Ben Peachey](https://github.com/potherca)
-- [David Négrier](https://github.com/moufmouf)
-- [Jeremy Lindblom](https://github.com/jeremeamia)
-- [Marco Pivetta](https://github.com/Ocramius)
-- [Matthieu Napoli](https://github.com/mnapoli)
-- [Nelson J Morais](https://github.com/njasm)
-- [Phil Sturgeon](https://github.com/philsturgeon)
-- [Stephan Hochdörfer](https://github.com/shochdoerfer)
-
-7. Relevant Links
------------------
-
-_**Note:** Order descending chronologically._
-
-- [Pull request on the delegate lookup feature](https://github.com/container-interop/container-interop/pull/20)
-- [Pull request on the interface idea](https://github.com/container-interop/container-interop/pull/8)
-- [Original article exposing the delegate lookup idea along many others](http://mouf-php.com/container-interop-whats-next)
-
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
deleted file mode 100644
index f64a8f785..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
+++ /dev/null
@@ -1,60 +0,0 @@
-Delegate lookup feature
-=======================
-
-This document describes a standard for dependency injection containers.
-
-The goal set by the *delegate lookup* feature is to allow several containers to share entries.
-Containers implementing this feature can perform dependency lookups in other containers.
-
-Containers implementing this feature will offer a greater lever of interoperability
-with other containers. Implementation of this feature is therefore RECOMMENDED.
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
-interpreted as described in [RFC 2119][].
-
-The word `implementor` in this document is to be interpreted as someone
-implementing the delegate lookup feature in a dependency injection-related library or framework.
-Users of dependency injections containers (DIC) are referred to as `user`.
-
-[RFC 2119]: http://tools.ietf.org/html/rfc2119
-
-1. Vocabulary
--------------
-
-In a dependency injection container, the container is used to fetch entries.
-Entries can have dependencies on other entries. Usually, these other entries are fetched by the container.
-
-The *delegate lookup* feature is the ability for a container to fetch dependencies in
-another container. In the rest of the document, the word "container" will reference the container
-implemented by the implementor. The word "delegate container" will reference the container we are
-fetching the dependencies from.
-
-2. Specification
-----------------
-
-A container implementing the *delegate lookup* feature:
-
-- MUST implement the [`ContainerInterface`](ContainerInterface.md)
-- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
- or any possible way). The delegate container MUST implement the [`ContainerInterface`](ContainerInterface.md).
-
-When a container is configured to use a delegate container for dependencies:
-
-- Calls to the `get` method should only return an entry if the entry is part of the container.
- If the entry is not part of the container, an exception should be thrown
- (as requested by the [`ContainerInterface`](ContainerInterface.md)).
-- Calls to the `has` method should only return `true` if the entry is part of the container.
- If the entry is not part of the container, `false` should be returned.
-- If the fetched entry has dependencies, **instead** of performing
- the dependency lookup in the container, the lookup is performed on the *delegate container*.
-
-Important: By default, the dependency lookups SHOULD be performed on the delegate container **only**, not on the container itself.
-
-It is however allowed for containers to provide exception cases for special entries, and a way to lookup
-into the same container (or another container) instead of the delegate container.
-
-3. Package / Interface
-----------------------
-
-This feature is not tied to any code, interface or package.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png
deleted file mode 100644
index 1d3fdd0dd..000000000
Binary files a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png and /dev/null differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png
deleted file mode 100644
index d02cb7d1f..000000000
Binary files a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png and /dev/null differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png
deleted file mode 100644
index 87884bc29..000000000
Binary files a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png and /dev/null differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
deleted file mode 100644
index a75468f6a..000000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
-
-script:
- - cd ext/pimple
- - if [ "$PIMPLE_EXT" == "yes" ]; then yes n | make test | tee output ; grep -E 'Tests failed +. +0' output; fi
- - if [ "$PIMPLE_EXT" == "yes" ]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
- - cd ../..
- - ./vendor/bin/simple-phpunit
-
-matrix:
- include:
- - php: hhvm
- dist: trusty
- env: PIMPLE_EXT=no
- exclude:
- - php: 7.0
- env: PIMPLE_EXT=yes
- - php: 7.1
- env: PIMPLE_EXT=yes
diff --git a/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG b/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
deleted file mode 100644
index ba56760c1..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
+++ /dev/null
@@ -1,59 +0,0 @@
-* 3.2.3 (2017-XX-XX)
-
- * n/a
-
-* 3.2.2 (2017-07-23)
-
- * reverted extending a protected closure throws an exception (deprecated it instead)
-
-* 3.2.1 (2017-07-17)
-
- * fixed PHP error
-
-* 3.2.0 (2017-07-17)
-
- * added a PSR-11 service locator
- * added a PSR-11 wrapper
- * added ServiceIterator
- * fixed extending a protected closure (now throws InvalidServiceIdentifierException)
-
-* 3.1.0 (2017-07-03)
-
- * deprecated the C extension
- * added support for PSR-11 exceptions
-
-* 3.0.2 (2015-09-11)
-
- * refactored the C extension
- * minor non-significant changes
-
-* 3.0.1 (2015-07-30)
-
- * simplified some code
- * fixed a segfault in the C extension
-
-* 3.0.0 (2014-07-24)
-
- * removed the Pimple class alias (use Pimple\Container instead)
-
-* 2.1.1 (2014-07-24)
-
- * fixed compiler warnings for the C extension
- * fixed code when dealing with circular references
-
-* 2.1.0 (2014-06-24)
-
- * moved the Pimple to Pimple\Container (with a BC layer -- Pimple is now a
- deprecated alias which will be removed in Pimple 3.0)
- * added Pimple\ServiceProviderInterface (and Pimple::register())
-
-* 2.0.0 (2014-02-10)
-
- * changed extend to automatically re-assign the extended service and keep it as shared or factory
- (to keep BC, extend still returns the extended service)
- * changed services to be shared by default (use factory() for factory
- services)
-
-* 1.0.0
-
- * initial version
diff --git a/advancedcontentfilter/vendor/pimple/pimple/README.rst b/advancedcontentfilter/vendor/pimple/pimple/README.rst
deleted file mode 100644
index a03b6d3a4..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/README.rst
+++ /dev/null
@@ -1,326 +0,0 @@
-Pimple
-======
-
-.. caution::
-
- This is the documentation for Pimple 3.x. If you are using Pimple 1.x, read
- the `Pimple 1.x documentation`_. Reading the Pimple 1.x code is also a good
- way to learn more about how to create a simple Dependency Injection
- Container (recent versions of Pimple are more focused on performance).
-
-Pimple is a small Dependency Injection Container for PHP.
-
-Installation
-------------
-
-Before using Pimple in your project, add it to your ``composer.json`` file:
-
-.. code-block:: bash
-
- $ ./composer.phar require pimple/pimple "^3.0"
-
-Usage
------
-
-Creating a container is a matter of creating a ``Container`` instance:
-
-.. code-block:: php
-
- use Pimple\Container;
-
- $container = new Container();
-
-As many other dependency injection containers, Pimple manages two different
-kind of data: **services** and **parameters**.
-
-Defining Services
-~~~~~~~~~~~~~~~~~
-
-A service is an object that does something as part of a larger system. Examples
-of services: a database connection, a templating engine, or a mailer. Almost
-any **global** object can be a service.
-
-Services are defined by **anonymous functions** that return an instance of an
-object:
-
-.. code-block:: php
-
- // define some services
- $container['session_storage'] = function ($c) {
- return new SessionStorage('SESSION_ID');
- };
-
- $container['session'] = function ($c) {
- return new Session($c['session_storage']);
- };
-
-Notice that the anonymous function has access to the current container
-instance, allowing references to other services or parameters.
-
-As objects are only created when you get them, the order of the definitions
-does not matter.
-
-Using the defined services is also very easy:
-
-.. code-block:: php
-
- // get the session object
- $session = $container['session'];
-
- // the above call is roughly equivalent to the following code:
- // $storage = new SessionStorage('SESSION_ID');
- // $session = new Session($storage);
-
-Defining Factory Services
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, each time you get a service, Pimple returns the **same instance**
-of it. If you want a different instance to be returned for all calls, wrap your
-anonymous function with the ``factory()`` method
-
-.. code-block:: php
-
- $container['session'] = $container->factory(function ($c) {
- return new Session($c['session_storage']);
- });
-
-Now, each call to ``$container['session']`` returns a new instance of the
-session.
-
-Defining Parameters
-~~~~~~~~~~~~~~~~~~~
-
-Defining a parameter allows to ease the configuration of your container from
-the outside and to store global values:
-
-.. code-block:: php
-
- // define some parameters
- $container['cookie_name'] = 'SESSION_ID';
- $container['session_storage_class'] = 'SessionStorage';
-
-If you change the ``session_storage`` service definition like below:
-
-.. code-block:: php
-
- $container['session_storage'] = function ($c) {
- return new $c['session_storage_class']($c['cookie_name']);
- };
-
-You can now easily change the cookie name by overriding the
-``cookie_name`` parameter instead of redefining the service
-definition.
-
-Protecting Parameters
-~~~~~~~~~~~~~~~~~~~~~
-
-Because Pimple sees anonymous functions as service definitions, you need to
-wrap anonymous functions with the ``protect()`` method to store them as
-parameters:
-
-.. code-block:: php
-
- $container['random_func'] = $container->protect(function () {
- return rand();
- });
-
-Modifying Services after Definition
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In some cases you may want to modify a service definition after it has been
-defined. You can use the ``extend()`` method to define additional code to be
-run on your service just after it is created:
-
-.. code-block:: php
-
- $container['session_storage'] = function ($c) {
- return new $c['session_storage_class']($c['cookie_name']);
- };
-
- $container->extend('session_storage', function ($storage, $c) {
- $storage->...();
-
- return $storage;
- });
-
-The first argument is the name of the service to extend, the second a function
-that gets access to the object instance and the container.
-
-Extending a Container
-~~~~~~~~~~~~~~~~~~~~~
-
-If you use the same libraries over and over, you might want to reuse some
-services from one project to the next one; package your services into a
-**provider** by implementing ``Pimple\ServiceProviderInterface``:
-
-.. code-block:: php
-
- use Pimple\Container;
-
- class FooProvider implements Pimple\ServiceProviderInterface
- {
- public function register(Container $pimple)
- {
- // register some services and parameters
- // on $pimple
- }
- }
-
-Then, register the provider on a Container:
-
-.. code-block:: php
-
- $pimple->register(new FooProvider());
-
-Fetching the Service Creation Function
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When you access an object, Pimple automatically calls the anonymous function
-that you defined, which creates the service object for you. If you want to get
-raw access to this function, you can use the ``raw()`` method:
-
-.. code-block:: php
-
- $container['session'] = function ($c) {
- return new Session($c['session_storage']);
- };
-
- $sessionFunction = $container->raw('session');
-
-PSR-11 compatibility
---------------------
-
-For historical reasons, the ``Container`` class does not implement the PSR-11
-``ContainerInterface``. However, Pimple provides a helper class that will let
-you decouple your code from the Pimple container class.
-
-The PSR-11 container class
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ``Pimple\Psr11\Container`` class lets you access the content of an
-underlying Pimple container using ``Psr\Container\ContainerInterface``
-methods:
-
-.. code-block:: php
-
- use Pimple\Container;
- use Pimple\Psr11\Container as PsrContainer;
-
- $container = new Container();
- $container['service'] = function ($c) {
- return new Service();
- };
- $psr11 = new PsrContainer($container);
-
- $controller = function (PsrContainer $container) {
- $service = $container->get('service');
- };
- $controller($psr11);
-
-Using the PSR-11 ServiceLocator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sometimes, a service needs access to several other services without being sure
-that all of them will actually be used. In those cases, you may want the
-instantiation of the services to be lazy.
-
-The traditional solution is to inject the entire service container to get only
-the services really needed. However, this is not recommended because it gives
-services a too broad access to the rest of the application and it hides their
-actual dependencies.
-
-The ``ServiceLocator`` is intended to solve this problem by giving access to a
-set of predefined services while instantiating them only when actually needed.
-
-It also allows you to make your services available under a different name than
-the one used to register them. For instance, you may want to use an object
-that expects an instance of ``EventDispatcherInterface`` to be available under
-the name ``event_dispatcher`` while your event dispatcher has been
-registered under the name ``dispatcher``:
-
-.. code-block:: php
-
- use Monolog\Logger;
- use Pimple\Psr11\ServiceLocator;
- use Psr\Container\ContainerInterface;
- use Symfony\Component\EventDispatcher\EventDispatcher;
-
- class MyService
- {
- /**
- * "logger" must be an instance of Psr\Log\LoggerInterface
- * "event_dispatcher" must be an instance of Symfony\Component\EventDispatcher\EventDispatcherInterface
- */
- private $services;
-
- public function __construct(ContainerInterface $services)
- {
- $this->services = $services;
- }
- }
-
- $container['logger'] = function ($c) {
- return new Monolog\Logger();
- };
- $container['dispatcher'] = function () {
- return new EventDispatcher();
- };
-
- $container['service'] = function ($c) {
- $locator = new ServiceLocator($c, array('logger', 'event_dispatcher' => 'dispatcher'));
-
- return new MyService($locator);
- };
-
-Referencing a Collection of Services Lazily
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Passing a collection of services instances in an array may prove inefficient
-if the class that consumes the collection only needs to iterate over it at a
-later stage, when one of its method is called. It can also lead to problems
-if there is a circular dependency between one of the services stored in the
-collection and the class that consumes it.
-
-The ``ServiceIterator`` class helps you solve these issues. It receives a
-list of service names during instantiation and will retrieve the services
-when iterated over:
-
-.. code-block:: php
-
- use Pimple\Container;
- use Pimple\ServiceIterator;
-
- class AuthorizationService
- {
- private $voters;
-
- public function __construct($voters)
- {
- $this->voters = $voters;
- }
-
- public function canAccess($resource)
- {
- foreach ($this->voters as $voter) {
- if (true === $voter->canAccess($resource) {
- return true;
- }
- }
-
- return false;
- }
- }
-
- $container = new Container();
-
- $container['voter1'] = function ($c) {
- return new SomeVoter();
- }
- $container['voter2'] = function ($c) {
- return new SomeOtherVoter($c['auth']);
- }
- $container['auth'] = function ($c) {
- return new AuthorizationService(new ServiceIterator($c, array('voter1', 'voter2'));
- }
-
-.. _Pimple 1.x documentation: https://github.com/silexphp/Pimple/tree/1.1
diff --git a/advancedcontentfilter/vendor/pimple/pimple/composer.json b/advancedcontentfilter/vendor/pimple/pimple/composer.json
deleted file mode 100644
index dabf190a9..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "name": "pimple/pimple",
- "type": "library",
- "description": "Pimple, a simple Dependency Injection Container",
- "keywords": ["dependency injection", "container"],
- "homepage": "http://pimple.sensiolabs.org",
- "license": "MIT",
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "require": {
- "php": ">=5.3.0",
- "psr/container": "^1.0"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "^3.2"
- },
- "autoload": {
- "psr-0": { "Pimple": "src/" }
- },
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev"
- }
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
deleted file mode 100644
index 1861088ac..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-*.sw*
-.deps
-Makefile
-Makefile.fragments
-Makefile.global
-Makefile.objects
-acinclude.m4
-aclocal.m4
-build/
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.nice
-config.status
-config.sub
-configure
-configure.in
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-run-tests.php
-*.loT
-.libs/
-modules/
-*.la
-*.lo
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
deleted file mode 100644
index 7b39eb292..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This is Pimple 2 implemented in C
-
-* PHP >= 5.3
-* Not tested under Windows, might work
-
-Install
-=======
-
- > phpize
- > ./configure
- > make
- > make install
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
deleted file mode 100644
index 3a6e9aaeb..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension pimple
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-dnl If your extension references something external, use with:
-
-dnl PHP_ARG_WITH(pimple, for pimple support,
-dnl Make sure that the comment is aligned:
-dnl [ --with-pimple Include pimple support])
-
-dnl Otherwise use enable:
-
-PHP_ARG_ENABLE(pimple, whether to enable pimple support,
-dnl Make sure that the comment is aligned:
-[ --enable-pimple Enable pimple support])
-
-if test "$PHP_PIMPLE" != "no"; then
- dnl Write more examples of tests here...
-
- dnl # --with-pimple -> check with-path
- dnl SEARCH_PATH="/usr/local /usr" # you might want to change this
- dnl SEARCH_FOR="/include/pimple.h" # you most likely want to change this
- dnl if test -r $PHP_PIMPLE/$SEARCH_FOR; then # path given as parameter
- dnl PIMPLE_DIR=$PHP_PIMPLE
- dnl else # search default path list
- dnl AC_MSG_CHECKING([for pimple files in default path])
- dnl for i in $SEARCH_PATH ; do
- dnl if test -r $i/$SEARCH_FOR; then
- dnl PIMPLE_DIR=$i
- dnl AC_MSG_RESULT(found in $i)
- dnl fi
- dnl done
- dnl fi
- dnl
- dnl if test -z "$PIMPLE_DIR"; then
- dnl AC_MSG_RESULT([not found])
- dnl AC_MSG_ERROR([Please reinstall the pimple distribution])
- dnl fi
-
- dnl # --with-pimple -> add include path
- dnl PHP_ADD_INCLUDE($PIMPLE_DIR/include)
-
- dnl # --with-pimple -> check for lib and symbol presence
- dnl LIBNAME=pimple # you may want to change this
- dnl LIBSYMBOL=pimple # you most likely want to change this
-
- dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
- dnl [
- dnl PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $PIMPLE_DIR/lib, PIMPLE_SHARED_LIBADD)
- dnl AC_DEFINE(HAVE_PIMPLELIB,1,[ ])
- dnl ],[
- dnl AC_MSG_ERROR([wrong pimple lib version or lib not found])
- dnl ],[
- dnl -L$PIMPLE_DIR/lib -lm
- dnl ])
- dnl
- dnl PHP_SUBST(PIMPLE_SHARED_LIBADD)
-
- PHP_NEW_EXTENSION(pimple, pimple.c, $ext_shared)
-fi
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
deleted file mode 100644
index 39857b325..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-// If your extension references something external, use ARG_WITH
-// ARG_WITH("pimple", "for pimple support", "no");
-
-// Otherwise, use ARG_ENABLE
-// ARG_ENABLE("pimple", "enable pimple support", "no");
-
-if (PHP_PIMPLE != "no") {
- EXTENSION("pimple", "pimple.c");
-}
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
deleted file mode 100644
index eed7c1731..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef PHP_PIMPLE_H
-#define PHP_PIMPLE_H
-
-extern zend_module_entry pimple_module_entry;
-#define phpext_pimple_ptr &pimple_module_entry
-
-#ifdef PHP_WIN32
-# define PHP_PIMPLE_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-# define PHP_PIMPLE_API __attribute__ ((visibility("default")))
-#else
-# define PHP_PIMPLE_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#define PIMPLE_VERSION "3.2.3-DEV"
-
-#define PIMPLE_NS "Pimple"
-#define PSR_CONTAINER_NS "Psr\\Container"
-#define PIMPLE_EXCEPTION_NS "Pimple\\Exception"
-
-#define PIMPLE_DEFAULT_ZVAL_CACHE_NUM 5
-#define PIMPLE_DEFAULT_ZVAL_VALUES_NUM 10
-
-#define PIMPLE_DEPRECATE do { \
- int er = EG(error_reporting); \
- EG(error_reporting) = 0;\
- php_error(E_DEPRECATED, "The Pimple C extension is deprecated since version 3.1 and will be removed in 4.0."); \
- EG(error_reporting) = er; \
-} while (0);
-
-zend_module_entry *get_module(void);
-
-PHP_MINIT_FUNCTION(pimple);
-PHP_MINFO_FUNCTION(pimple);
-
-PHP_METHOD(FrozenServiceException, __construct);
-PHP_METHOD(InvalidServiceIdentifierException, __construct);
-PHP_METHOD(UnknownIdentifierException, __construct);
-
-PHP_METHOD(Pimple, __construct);
-PHP_METHOD(Pimple, factory);
-PHP_METHOD(Pimple, protect);
-PHP_METHOD(Pimple, raw);
-PHP_METHOD(Pimple, extend);
-PHP_METHOD(Pimple, keys);
-PHP_METHOD(Pimple, register);
-PHP_METHOD(Pimple, offsetSet);
-PHP_METHOD(Pimple, offsetUnset);
-PHP_METHOD(Pimple, offsetGet);
-PHP_METHOD(Pimple, offsetExists);
-
-PHP_METHOD(PimpleClosure, invoker);
-
-typedef struct _pimple_bucket_value {
- zval *value; /* Must be the first element */
- zval *raw;
- zend_object_handle handle_num;
- enum {
- PIMPLE_IS_PARAM = 0,
- PIMPLE_IS_SERVICE = 2
- } type;
- zend_bool initialized;
- zend_fcall_info_cache fcc;
-} pimple_bucket_value;
-
-typedef struct _pimple_object {
- zend_object zobj;
- HashTable values;
- HashTable factories;
- HashTable protected;
-} pimple_object;
-
-typedef struct _pimple_closure_object {
- zend_object zobj;
- zval *callable;
- zval *factory;
-} pimple_closure_object;
-
-static const char sensiolabs_logo[] = "![](\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAAAUCAMAAABvRTlyAAAAz1BMVEUAAAAAAAAAAAAsThWB5j4AAACD6T8AAACC6D+C6D6C6D+C6D4AAAAAAACC6D4AAAAAAACC6D8AAAAAAAAAAAAAAAAAAAAAAACC6D4AAAAAAAAAAACC6D4AAAAAAAAAAAAAAAAAAAAAAACC6D8AAACC6D4AAAAAAAAAAAAAAAAAAACC6D8AAACC6D6C6D+B6D+C6D+C6D+C6D8AAACC6D6C6D4AAACC6D/K/2KC6D+B6D6C6D6C6D+C6D8sTxUyWRhEeiEAAACC6D+C5z6B6D7drnEVAAAAQXRSTlMAE3oCNSUuDHFHzxaF9UFsu+irX+zlKzYimaJXktyOSFD6BolxqT7QGMMdarMIpuO28r9EolXKgR16OphfXYd4V14GtB4AAAMpSURBVEjHvVSJctowEF1jjME2RziMwUCoMfd9heZqG4n//6buLpJjkmYm03byZmxJa2nf6u2uQcG2bfhqRN4LoTKBzyGDm68M7mAwcOEdjo4zhA/Rf9Go/CVtTgiRhXfIC3EDH8F/eUX1/9KexRo+QgOdtHDsEe/sM7QT32/+K61Z1LFXcXJxN4pTbu1aTQUzuy2PIA0rDo0/0Aa5XFaJvKaVTrubywXvaa1Wq4Vu/Snr3Y7Aojh4VccwykW2N2oQ8wmjyut6+Q1t5ywIG5Npj1sh5E0B7YOzFDjfuRfaOh3O+MbbVNfTWS9COZk3Obd2su5d0a6IU9KLREbw8gEehWSr1r2sPWciXLG38r5NdW0xu9eioU87omjC9yNaMi5GNf6WppVSOqXCFkmCvMB3p9SROLoYQn5pDgQOujA1xjYvqH+plUdkwnmII8VxR/PKYkrfLLomhVlE3b/LhNbNr7hp0H2JaOc4v8dFB58HSsFTSafaqtY1sT3GO8wsy5rhokYPlRJdjPMajyYqTt1EHF/2uqSWQWmAjCUSmQ1MS3g8Btf1XOsy7YIC0CB1b5Xw1Vhba0zbxiCAQLH9TNPmHJXQUtJAN0KcDsoqLxsNvJrJExa7mKIdp2lRE2WexiS4pqWk/0jROlw6K6bV9YOBDGAuqMJ0bnuUKGB0L27bxgRhGEbzihbhxxXaQC88Vkwq8ldCi86RApWUb0Q+4VDosBCc+1s81lUdnBavH4Zp2mm3O44USwOfvSo9oBiwpFg71lMS1VKJLKljS3j9p+fOTvXXlsSNuEv6YPaZda9uRope0VJfKdo7fPiYfSmvFjXQbkhY0d9hCbBWIktRgEDieDhf1N3wbbkmNNgRy8hyl620yGQat/grV3HMpc2HDKTVmOPFz6ylPCKt/nXcAyV260jaAowwIW0YuBzrOgb/KrddZS9OmJaLgpWK4JX2DDuklcLZSDGcn8Vmx9YDNvT6UsjyBApRyFQVX7Vxm9TGxE16nmfRd8/zQoDmggQOTRh5Hv8pMt9Q/L2JmSwkMCE7dA4BuDjHJwfu0Om4QAhOjrN5XkIatglfiN/bUPdCQFjTYgAAAABJRU5ErkJggg==\")
";
-
-static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC);
-
-static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
-static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
-
-static void pimple_bucket_dtor(pimple_bucket_value *bucket);
-static void pimple_free_bucket(pimple_bucket_value *bucket);
-
-static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC);
-static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC);
-static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC);
-static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC);
-static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC);
-static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC);
-
-static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC);
-static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC);
-static zend_function *pimple_closure_get_constructor(zval * TSRMLS_DC);
-static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC);
-
-#ifdef ZTS
-#define PIMPLE_G(v) TSRMG(pimple_globals_id, zend_pimple_globals *, v)
-#else
-#define PIMPLE_G(v) (pimple_globals.v)
-#endif
-
-#endif /* PHP_PIMPLE_H */
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
deleted file mode 100644
index c80499b39..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
+++ /dev/null
@@ -1,1114 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_pimple.h"
-#include "pimple_compat.h"
-#include "zend_interfaces.h"
-#include "zend.h"
-#include "Zend/zend_closures.h"
-#include "ext/spl/spl_exceptions.h"
-#include "Zend/zend_exceptions.h"
-#include "main/php_output.h"
-#include "SAPI.h"
-
-static zend_class_entry *pimple_ce_PsrContainerInterface;
-static zend_class_entry *pimple_ce_PsrContainerExceptionInterface;
-static zend_class_entry *pimple_ce_PsrNotFoundExceptionInterface;
-
-static zend_class_entry *pimple_ce_ExpectedInvokableException;
-static zend_class_entry *pimple_ce_FrozenServiceException;
-static zend_class_entry *pimple_ce_InvalidServiceIdentifierException;
-static zend_class_entry *pimple_ce_UnknownIdentifierException;
-
-static zend_class_entry *pimple_ce;
-static zend_object_handlers pimple_object_handlers;
-static zend_class_entry *pimple_closure_ce;
-static zend_class_entry *pimple_serviceprovider_ce;
-static zend_object_handlers pimple_closure_object_handlers;
-static zend_internal_function pimple_closure_invoker_function;
-
-#define FETCH_DIM_HANDLERS_VARS pimple_object *pimple_obj = NULL; \
- ulong index; \
- pimple_obj = (pimple_object *)zend_object_store_get_object(object TSRMLS_CC); \
-
-#define PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS do { \
- if (ce != pimple_ce) { \
- zend_hash_find(&ce->function_table, ZEND_STRS("offsetget"), (void **)&function); \
- if (function->common.scope != ce) { /* if the function is not defined in this actual class */ \
- pimple_object_handlers.read_dimension = pimple_object_read_dimension; /* then overwrite the handler to use custom one */ \
- } \
- zend_hash_find(&ce->function_table, ZEND_STRS("offsetset"), (void **)&function); \
- if (function->common.scope != ce) { \
- pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
- } \
- zend_hash_find(&ce->function_table, ZEND_STRS("offsetexists"), (void **)&function); \
- if (function->common.scope != ce) { \
- pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
- } \
- zend_hash_find(&ce->function_table, ZEND_STRS("offsetunset"), (void **)&function); \
- if (function->common.scope != ce) { \
- pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
- } \
- } else { \
- pimple_object_handlers.read_dimension = pimple_object_read_dimension; \
- pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
- pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
- pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
- }\
- } while(0);
-
-#define PIMPLE_CALL_CB do { \
- zend_fcall_info_argn(&fci TSRMLS_CC, 1, &object); \
- fci.size = sizeof(fci); \
- fci.object_ptr = retval->fcc.object_ptr; \
- fci.function_name = retval->value; \
- fci.no_separation = 1; \
- fci.retval_ptr_ptr = &retval_ptr_ptr; \
-\
- zend_call_function(&fci, &retval->fcc TSRMLS_CC); \
- efree(fci.params); \
- if (EG(exception)) { \
- return EG(uninitialized_zval_ptr); \
- } \
- } while(0);
-
-
-/* Psr\Container\ContainerInterface */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_get, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_has, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_PsrContainerInterface_functions[] = {
- PHP_ABSTRACT_ME(ContainerInterface, get, arginfo_pimple_PsrContainerInterface_get)
- PHP_ABSTRACT_ME(ContainerInterface, has, arginfo_pimple_PsrContainerInterface_has)
- PHP_FE_END
-};
-
-/* Psr\Container\ContainerExceptionInterface */
-static const zend_function_entry pimple_ce_PsrContainerExceptionInterface_functions[] = {
- PHP_FE_END
-};
-
-/* Psr\Container\NotFoundExceptionInterface */
-static const zend_function_entry pimple_ce_PsrNotFoundExceptionInterface_functions[] = {
- PHP_FE_END
-};
-
-/* Pimple\Exception\FrozenServiceException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_FrozenServiceException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_FrozenServiceException_functions[] = {
- PHP_ME(FrozenServiceException, __construct, arginfo_FrozenServiceException___construct, ZEND_ACC_PUBLIC)
- PHP_FE_END
-};
-
-/* Pimple\Exception\InvalidServiceIdentifierException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_InvalidServiceIdentifierException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_InvalidServiceIdentifierException_functions[] = {
- PHP_ME(InvalidServiceIdentifierException, __construct, arginfo_InvalidServiceIdentifierException___construct, ZEND_ACC_PUBLIC)
- PHP_FE_END
-};
-
-/* Pimple\Exception\UnknownIdentifierException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_UnknownIdentifierException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_UnknownIdentifierException_functions[] = {
- PHP_ME(UnknownIdentifierException, __construct, arginfo_UnknownIdentifierException___construct, ZEND_ACC_PUBLIC)
- PHP_FE_END
-};
-
-/* Pimple\Container */
-ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, 0, 0, 0)
-ZEND_ARG_ARRAY_INFO(0, value, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetset, 0, 0, 2)
-ZEND_ARG_INFO(0, offset)
-ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetget, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetexists, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetunset, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_factory, 0, 0, 1)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_protect, 0, 0, 1)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_raw, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_extend, 0, 0, 2)
-ZEND_ARG_INFO(0, id)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_keys, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_register, 0, 0, 1)
-ZEND_ARG_OBJ_INFO(0, provider, Pimple\\ServiceProviderInterface, 0)
-ZEND_ARG_ARRAY_INFO(0, values, 1)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_functions[] = {
- PHP_ME(Pimple, __construct, arginfo___construct, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, factory, arginfo_factory, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, protect, arginfo_protect, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, raw, arginfo_raw, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, extend, arginfo_extend, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, keys, arginfo_keys, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, register, arginfo_register, ZEND_ACC_PUBLIC)
-
- PHP_ME(Pimple, offsetSet, arginfo_offsetset, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, offsetGet, arginfo_offsetget, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, offsetExists, arginfo_offsetexists, ZEND_ACC_PUBLIC)
- PHP_ME(Pimple, offsetUnset, arginfo_offsetunset, ZEND_ACC_PUBLIC)
- PHP_FE_END
-};
-
-/* Pimple\ServiceProviderInterface */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_serviceprovider_register, 0, 0, 1)
-ZEND_ARG_OBJ_INFO(0, pimple, Pimple\\Container, 0)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_serviceprovider_iface_ce_functions[] = {
- PHP_ABSTRACT_ME(ServiceProviderInterface, register, arginfo_serviceprovider_register)
- PHP_FE_END
-};
-
-/* parent::__construct(sprintf("Something with %s", $arg1)) */
-static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC)
-{
- zend_class_entry *ce = Z_OBJCE_P(this_ptr);
- char *message = NULL;
- int message_len;
- zval *constructor_arg;
-
- message_len = spprintf(&message, 0, format, arg1);
- ALLOC_INIT_ZVAL(constructor_arg);
- ZVAL_STRINGL(constructor_arg, message, message_len, 1);
-
- zend_call_method_with_1_params(&this_ptr, ce, &ce->parent->constructor, "__construct", NULL, constructor_arg);
-
- efree(message);
- zval_ptr_dtor(&constructor_arg);
-}
-
-/**
- * Pass a single string parameter to exception constructor and throw
- */
-static void pimple_throw_exception_string(zend_class_entry *ce, const char *message, zend_uint message_len TSRMLS_DC)
-{
- zval *exception, *param;
-
- ALLOC_INIT_ZVAL(exception);
- object_init_ex(exception, ce);
-
- ALLOC_INIT_ZVAL(param);
- ZVAL_STRINGL(param, message, message_len, 1);
-
- zend_call_method_with_1_params(&exception, ce, &ce->constructor, "__construct", NULL, param);
-
- zend_throw_exception_object(exception TSRMLS_CC);
-
- zval_ptr_dtor(¶m);
-}
-
-static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC)
-{
- zend_object_std_dtor(&obj->zobj TSRMLS_CC);
- if (obj->factory) {
- zval_ptr_dtor(&obj->factory);
- }
- if (obj->callable) {
- zval_ptr_dtor(&obj->callable);
- }
- efree(obj);
-}
-
-static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC)
-{
- zend_hash_destroy(&obj->factories);
- zend_hash_destroy(&obj->protected);
- zend_hash_destroy(&obj->values);
- zend_object_std_dtor(&obj->zobj TSRMLS_CC);
- efree(obj);
-}
-
-static void pimple_free_bucket(pimple_bucket_value *bucket)
-{
- if (bucket->raw) {
- zval_ptr_dtor(&bucket->raw);
- }
-}
-
-static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC)
-{
- zend_object_value retval;
- pimple_closure_object *pimple_closure_obj = NULL;
-
- pimple_closure_obj = ecalloc(1, sizeof(pimple_closure_object));
- ZEND_OBJ_INIT(&pimple_closure_obj->zobj, ce);
-
- pimple_closure_object_handlers.get_constructor = pimple_closure_get_constructor;
- retval.handlers = &pimple_closure_object_handlers;
- retval.handle = zend_objects_store_put(pimple_closure_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_closure_free_object_storage, NULL TSRMLS_CC);
-
- return retval;
-}
-
-static zend_function *pimple_closure_get_constructor(zval *obj TSRMLS_DC)
-{
- zend_error(E_ERROR, "Pimple\\ContainerClosure is an internal class and cannot be instantiated");
-
- return NULL;
-}
-
-static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC)
-{
- *zobj_ptr = obj;
- *ce_ptr = Z_OBJCE_P(obj);
- *fptr_ptr = (zend_function *)&pimple_closure_invoker_function;
-
- return SUCCESS;
-}
-
-static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC)
-{
- zend_object_value retval;
- pimple_object *pimple_obj = NULL;
- zend_function *function = NULL;
-
- pimple_obj = emalloc(sizeof(pimple_object));
- ZEND_OBJ_INIT(&pimple_obj->zobj, ce);
-
- PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS
-
- retval.handlers = &pimple_object_handlers;
- retval.handle = zend_objects_store_put(pimple_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_free_object_storage, NULL TSRMLS_CC);
-
- zend_hash_init(&pimple_obj->factories, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
- zend_hash_init(&pimple_obj->protected, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
- zend_hash_init(&pimple_obj->values, PIMPLE_DEFAULT_ZVAL_VALUES_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
-
- return retval;
-}
-
-static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)
-{
- FETCH_DIM_HANDLERS_VARS
-
- pimple_bucket_value pimple_value = {0}, *found_value = NULL;
- ulong hash;
-
- pimple_zval_to_pimpleval(value, &pimple_value TSRMLS_CC);
-
- if (!offset) {/* $p[] = 'foo' when not overloaded */
- zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
- Z_ADDREF_P(value);
- return;
- }
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- hash = zend_hash_func(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
- zend_hash_quick_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void **)&found_value);
- if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
- pimple_free_bucket(&pimple_value);
- pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- return;
- }
- if (zend_hash_quick_update(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
- pimple_free_bucket(&pimple_value);
- return;
- }
- Z_ADDREF_P(value);
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- zend_hash_index_find(&pimple_obj->values, index, (void **)&found_value);
- if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
- pimple_free_bucket(&pimple_value);
- convert_to_string(offset);
- pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- return;
- }
- if (zend_hash_index_update(&pimple_obj->values, index, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
- pimple_free_bucket(&pimple_value);
- return;
- }
- Z_ADDREF_P(value);
- break;
- case IS_NULL: /* $p[] = 'foo' when overloaded */
- zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
- Z_ADDREF_P(value);
- break;
- default:
- pimple_free_bucket(&pimple_value);
- zend_error(E_WARNING, "Unsupported offset type");
- }
-}
-
-static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC)
-{
- FETCH_DIM_HANDLERS_VARS
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- zend_symtable_del(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
- zend_symtable_del(&pimple_obj->factories, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
- zend_symtable_del(&pimple_obj->protected, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- zend_hash_index_del(&pimple_obj->values, index);
- zend_hash_index_del(&pimple_obj->factories, index);
- zend_hash_index_del(&pimple_obj->protected, index);
- break;
- default:
- zend_error(E_WARNING, "Unsupported offset type");
- }
-}
-
-static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC)
-{
- FETCH_DIM_HANDLERS_VARS
-
- pimple_bucket_value *retval = NULL;
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == SUCCESS) {
- switch (check_empty) {
- case 0: /* isset */
- return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;) */
- case 1: /* empty */
- default:
- return zend_is_true(retval->value);
- }
- }
- return 0;
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == SUCCESS) {
- switch (check_empty) {
- case 0: /* isset */
- return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;)*/
- case 1: /* empty */
- default:
- return zend_is_true(retval->value);
- }
- }
- return 0;
- break;
- default:
- zend_error(E_WARNING, "Unsupported offset type");
- return 0;
- }
-}
-
-static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
-{
- FETCH_DIM_HANDLERS_VARS
-
- pimple_bucket_value *retval = NULL;
- zend_fcall_info fci = {0};
- zval *retval_ptr_ptr = NULL;
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == FAILURE) {
- pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-
- return EG(uninitialized_zval_ptr);
- }
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == FAILURE) {
- return EG(uninitialized_zval_ptr);
- }
- break;
- case IS_NULL: /* $p[][3] = 'foo' first dim access */
- return EG(uninitialized_zval_ptr);
- break;
- default:
- zend_error(E_WARNING, "Unsupported offset type");
- return EG(uninitialized_zval_ptr);
- }
-
- if(retval->type == PIMPLE_IS_PARAM) {
- return retval->value;
- }
-
- if (zend_hash_index_exists(&pimple_obj->protected, retval->handle_num)) {
- /* Service is protected, return the value every time */
- return retval->value;
- }
-
- if (zend_hash_index_exists(&pimple_obj->factories, retval->handle_num)) {
- /* Service is a factory, call it every time and never cache its result */
- PIMPLE_CALL_CB
- Z_DELREF_P(retval_ptr_ptr); /* fetch dim addr will increment refcount */
- return retval_ptr_ptr;
- }
-
- if (retval->initialized == 1) {
- /* Service has already been called, return its cached value */
- return retval->value;
- }
-
- ALLOC_INIT_ZVAL(retval->raw);
- MAKE_COPY_ZVAL(&retval->value, retval->raw);
-
- PIMPLE_CALL_CB
-
- retval->initialized = 1;
- zval_ptr_dtor(&retval->value);
- retval->value = retval_ptr_ptr;
-
- return retval->value;
-}
-
-static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
-{
- if (Z_TYPE_P(_zval) != IS_OBJECT) {
- return FAILURE;
- }
-
- if (_pimple_bucket_value->fcc.called_scope) {
- return SUCCESS;
- }
-
- if (Z_OBJ_HANDLER_P(_zval, get_closure) && Z_OBJ_HANDLER_P(_zval, get_closure)(_zval, &_pimple_bucket_value->fcc.calling_scope, &_pimple_bucket_value->fcc.function_handler, &_pimple_bucket_value->fcc.object_ptr TSRMLS_CC) == SUCCESS) {
- _pimple_bucket_value->fcc.called_scope = _pimple_bucket_value->fcc.calling_scope;
- return SUCCESS;
- } else {
- return FAILURE;
- }
-}
-
-static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
-{
- _pimple_bucket_value->value = _zval;
-
- if (Z_TYPE_P(_zval) != IS_OBJECT) {
- return PIMPLE_IS_PARAM;
- }
-
- if (pimple_zval_is_valid_callback(_zval, _pimple_bucket_value TSRMLS_CC) == SUCCESS) {
- _pimple_bucket_value->type = PIMPLE_IS_SERVICE;
- _pimple_bucket_value->handle_num = Z_OBJ_HANDLE_P(_zval);
- }
-
- return PIMPLE_IS_SERVICE;
-}
-
-static void pimple_bucket_dtor(pimple_bucket_value *bucket)
-{
- zval_ptr_dtor(&bucket->value);
- pimple_free_bucket(bucket);
-}
-
-PHP_METHOD(FrozenServiceException, __construct)
-{
- char *id = NULL;
- int id_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
- return;
- }
- pimple_exception_call_parent_constructor(getThis(), "Cannot override frozen service \"%s\".", id TSRMLS_CC);
-}
-
-PHP_METHOD(InvalidServiceIdentifierException, __construct)
-{
- char *id = NULL;
- int id_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
- return;
- }
- pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" does not contain an object definition.", id TSRMLS_CC);
-}
-
-PHP_METHOD(UnknownIdentifierException, __construct)
-{
- char *id = NULL;
- int id_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
- return;
- }
- pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" is not defined.", id TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, protect)
-{
- zval *protected = NULL;
- pimple_object *pobj = NULL;
- pimple_bucket_value bucket = {0};
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &protected) == FAILURE) {
- return;
- }
-
- if (pimple_zval_is_valid_callback(protected, &bucket TSRMLS_CC) == FAILURE) {
- pimple_free_bucket(&bucket);
- zend_throw_exception(pimple_ce_ExpectedInvokableException, "Callable is not a Closure or invokable object.", 0 TSRMLS_CC);
- return;
- }
-
- pimple_zval_to_pimpleval(protected, &bucket TSRMLS_CC);
- pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
-
- if (zend_hash_index_update(&pobj->protected, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
- Z_ADDREF_P(protected);
- RETURN_ZVAL(protected, 1 , 0);
- } else {
- pimple_free_bucket(&bucket);
- }
- RETURN_FALSE;
-}
-
-PHP_METHOD(Pimple, raw)
-{
- zval *offset = NULL;
- pimple_object *pobj = NULL;
- pimple_bucket_value *value = NULL;
- ulong index;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
- return;
- }
-
- pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
- pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- RETURN_NULL();
- }
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
- RETURN_NULL();
- }
- break;
- case IS_NULL:
- default:
- zend_error(E_WARNING, "Unsupported offset type");
- }
-
- if (value->raw) {
- RETVAL_ZVAL(value->raw, 1, 0);
- } else {
- RETVAL_ZVAL(value->value, 1, 0);
- }
-}
-
-PHP_METHOD(Pimple, extend)
-{
- zval *offset = NULL, *callable = NULL, *pimple_closure_obj = NULL;
- pimple_bucket_value bucket = {0}, *value = NULL;
- pimple_object *pobj = NULL;
- pimple_closure_object *pcobj = NULL;
- ulong index;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &callable) == FAILURE) {
- return;
- }
-
- pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
- switch (Z_TYPE_P(offset)) {
- case IS_STRING:
- if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
- pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- RETURN_NULL();
- }
-
- if (value->type != PIMPLE_IS_SERVICE) {
- pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- RETURN_NULL();
- }
- if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
- int er = EG(error_reporting);
- EG(error_reporting) = 0;
- php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%s\" should be protected?", Z_STRVAL_P(offset));
- EG(error_reporting) = er;
- }
- break;
- case IS_DOUBLE:
- case IS_BOOL:
- case IS_LONG:
- if (Z_TYPE_P(offset) == IS_DOUBLE) {
- index = (ulong)Z_DVAL_P(offset);
- } else {
- index = Z_LVAL_P(offset);
- }
- if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
- convert_to_string(offset);
- pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- RETURN_NULL();
- }
- if (value->type != PIMPLE_IS_SERVICE) {
- convert_to_string(offset);
- pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
- RETURN_NULL();
- }
- if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
- int er = EG(error_reporting);
- EG(error_reporting) = 0;
- php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%ld\" should be protected?", index);
- EG(error_reporting) = er;
- }
- break;
- case IS_NULL:
- default:
- zend_error(E_WARNING, "Unsupported offset type");
- }
-
- if (pimple_zval_is_valid_callback(callable, &bucket TSRMLS_CC) == FAILURE) {
- pimple_free_bucket(&bucket);
- zend_throw_exception(pimple_ce_ExpectedInvokableException, "Extension service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
- RETURN_NULL();
- }
- pimple_free_bucket(&bucket);
-
- ALLOC_INIT_ZVAL(pimple_closure_obj);
- object_init_ex(pimple_closure_obj, pimple_closure_ce);
-
- pcobj = zend_object_store_get_object(pimple_closure_obj TSRMLS_CC);
- pcobj->callable = callable;
- pcobj->factory = value->value;
- Z_ADDREF_P(callable);
- Z_ADDREF_P(value->value);
-
- if (zend_hash_index_exists(&pobj->factories, value->handle_num)) {
- pimple_zval_to_pimpleval(pimple_closure_obj, &bucket TSRMLS_CC);
- zend_hash_index_del(&pobj->factories, value->handle_num);
- zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL);
- Z_ADDREF_P(pimple_closure_obj);
- }
-
- pimple_object_write_dimension(getThis(), offset, pimple_closure_obj TSRMLS_CC);
-
- RETVAL_ZVAL(pimple_closure_obj, 1, 1);
-}
-
-PHP_METHOD(Pimple, keys)
-{
- HashPosition pos;
- pimple_object *pobj = NULL;
- zval **value = NULL;
- zval *endval = NULL;
- char *str_index = NULL;
- int str_len;
- ulong num_index;
-
- if (zend_parse_parameters_none() == FAILURE) {
- return;
- }
-
- pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
- array_init_size(return_value, zend_hash_num_elements(&pobj->values));
-
- zend_hash_internal_pointer_reset_ex(&pobj->values, &pos);
-
- while(zend_hash_get_current_data_ex(&pobj->values, (void **)&value, &pos) == SUCCESS) {
- MAKE_STD_ZVAL(endval);
- switch (zend_hash_get_current_key_ex(&pobj->values, &str_index, (uint *)&str_len, &num_index, 0, &pos)) {
- case HASH_KEY_IS_STRING:
- ZVAL_STRINGL(endval, str_index, str_len - 1, 1);
- zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
- break;
- case HASH_KEY_IS_LONG:
- ZVAL_LONG(endval, num_index);
- zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
- break;
- }
- zend_hash_move_forward_ex(&pobj->values, &pos);
- }
-}
-
-PHP_METHOD(Pimple, factory)
-{
- zval *factory = NULL;
- pimple_object *pobj = NULL;
- pimple_bucket_value bucket = {0};
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &factory) == FAILURE) {
- return;
- }
-
- if (pimple_zval_is_valid_callback(factory, &bucket TSRMLS_CC) == FAILURE) {
- pimple_free_bucket(&bucket);
- zend_throw_exception(pimple_ce_ExpectedInvokableException, "Service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
- return;
- }
-
- pimple_zval_to_pimpleval(factory, &bucket TSRMLS_CC);
- pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
-
- if (zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
- Z_ADDREF_P(factory);
- RETURN_ZVAL(factory, 1 , 0);
- } else {
- pimple_free_bucket(&bucket);
- }
-
- RETURN_FALSE;
-}
-
-PHP_METHOD(Pimple, offsetSet)
-{
- zval *offset = NULL, *value = NULL;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &value) == FAILURE) {
- return;
- }
-
- pimple_object_write_dimension(getThis(), offset, value TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, offsetGet)
-{
- zval *offset = NULL, *retval = NULL;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
- return;
- }
-
- retval = pimple_object_read_dimension(getThis(), offset, 0 TSRMLS_CC);
-
- RETVAL_ZVAL(retval, 1, 0);
-}
-
-PHP_METHOD(Pimple, offsetUnset)
-{
- zval *offset = NULL;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
- return;
- }
-
- pimple_object_unset_dimension(getThis(), offset TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, offsetExists)
-{
- zval *offset = NULL;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
- return;
- }
-
- RETVAL_BOOL(pimple_object_has_dimension(getThis(), offset, 1 TSRMLS_CC));
-}
-
-PHP_METHOD(Pimple, register)
-{
- zval *provider;
- zval **data;
- zval *retval = NULL;
- zval key;
-
- HashTable *array = NULL;
- HashPosition pos;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|h", &provider, pimple_serviceprovider_ce, &array) == FAILURE) {
- return;
- }
-
- RETVAL_ZVAL(getThis(), 1, 0);
-
- zend_call_method_with_1_params(&provider, Z_OBJCE_P(provider), NULL, "register", &retval, getThis());
-
- if (retval) {
- zval_ptr_dtor(&retval);
- }
-
- if (!array) {
- return;
- }
-
- zend_hash_internal_pointer_reset_ex(array, &pos);
-
- while(zend_hash_get_current_data_ex(array, (void **)&data, &pos) == SUCCESS) {
- zend_hash_get_current_key_zval_ex(array, &key, &pos);
- pimple_object_write_dimension(getThis(), &key, *data TSRMLS_CC);
- zend_hash_move_forward_ex(array, &pos);
- }
-}
-
-PHP_METHOD(Pimple, __construct)
-{
- zval *values = NULL, **pData = NULL, offset;
- HashPosition pos;
- char *str_index = NULL;
- zend_uint str_length;
- ulong num_index;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &values) == FAILURE) {
- return;
- }
-
- PIMPLE_DEPRECATE
-
- if (!values) {
- return;
- }
-
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos);
- while (zend_hash_has_more_elements_ex(Z_ARRVAL_P(values), &pos) == SUCCESS) {
- zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&pData, &pos);
- zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &str_index, &str_length, &num_index, 0, &pos);
- INIT_ZVAL(offset);
- if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(values), &pos) == HASH_KEY_IS_LONG) {
- ZVAL_LONG(&offset, num_index);
- } else {
- ZVAL_STRINGL(&offset, str_index, (str_length - 1), 0);
- }
- pimple_object_write_dimension(getThis(), &offset, *pData TSRMLS_CC);
- zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos);
- }
-}
-
-/*
- * This is PHP code snippet handling extend()s calls :
-
- $extended = function ($c) use ($callable, $factory) {
- return $callable($factory($c), $c);
- };
-
- */
-PHP_METHOD(PimpleClosure, invoker)
-{
- pimple_closure_object *pcobj = NULL;
- zval *arg = NULL, *retval = NULL, *newretval = NULL;
- zend_fcall_info fci = {0};
- zval **args[2];
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) {
- return;
- }
-
- pcobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
- fci.function_name = pcobj->factory;
- args[0] = &arg;
- zend_fcall_info_argp(&fci TSRMLS_CC, 1, args);
- fci.retval_ptr_ptr = &retval;
- fci.size = sizeof(fci);
-
- if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
- efree(fci.params);
- return; /* Should here return default zval */
- }
-
- efree(fci.params);
- memset(&fci, 0, sizeof(fci));
- fci.size = sizeof(fci);
-
- fci.function_name = pcobj->callable;
- args[0] = &retval;
- args[1] = &arg;
- zend_fcall_info_argp(&fci TSRMLS_CC, 2, args);
- fci.retval_ptr_ptr = &newretval;
-
- if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
- efree(fci.params);
- zval_ptr_dtor(&retval);
- return;
- }
-
- efree(fci.params);
- zval_ptr_dtor(&retval);
-
- RETVAL_ZVAL(newretval, 1 ,1);
-}
-
-PHP_MINIT_FUNCTION(pimple)
-{
- zend_class_entry tmp_ce_PsrContainerInterface, tmp_ce_PsrContainerExceptionInterface, tmp_ce_PsrNotFoundExceptionInterface;
- zend_class_entry tmp_ce_ExpectedInvokableException, tmp_ce_FrozenServiceException, tmp_ce_InvalidServiceIdentifierException, tmp_ce_UnknownIdentifierException;
- zend_class_entry tmp_pimple_ce, tmp_pimple_closure_ce, tmp_pimple_serviceprovider_iface_ce;
-
- /* Psr\Container namespace */
- INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerInterface, PSR_CONTAINER_NS, "ContainerInterface", pimple_ce_PsrContainerInterface_functions);
- INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerExceptionInterface, PSR_CONTAINER_NS, "ContainerExceptionInterface", pimple_ce_PsrContainerExceptionInterface_functions);
- INIT_NS_CLASS_ENTRY(tmp_ce_PsrNotFoundExceptionInterface, PSR_CONTAINER_NS, "NotFoundExceptionInterface", pimple_ce_PsrNotFoundExceptionInterface_functions);
-
- pimple_ce_PsrContainerInterface = zend_register_internal_interface(&tmp_ce_PsrContainerInterface TSRMLS_CC);
- pimple_ce_PsrContainerExceptionInterface = zend_register_internal_interface(&tmp_ce_PsrContainerExceptionInterface TSRMLS_CC);
- pimple_ce_PsrNotFoundExceptionInterface = zend_register_internal_interface(&tmp_ce_PsrNotFoundExceptionInterface TSRMLS_CC);
-
- zend_class_implements(pimple_ce_PsrNotFoundExceptionInterface TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
-
- /* Pimple\Exception namespace */
- INIT_NS_CLASS_ENTRY(tmp_ce_ExpectedInvokableException, PIMPLE_EXCEPTION_NS, "ExpectedInvokableException", NULL);
- INIT_NS_CLASS_ENTRY(tmp_ce_FrozenServiceException, PIMPLE_EXCEPTION_NS, "FrozenServiceException", pimple_ce_FrozenServiceException_functions);
- INIT_NS_CLASS_ENTRY(tmp_ce_InvalidServiceIdentifierException, PIMPLE_EXCEPTION_NS, "InvalidServiceIdentifierException", pimple_ce_InvalidServiceIdentifierException_functions);
- INIT_NS_CLASS_ENTRY(tmp_ce_UnknownIdentifierException, PIMPLE_EXCEPTION_NS, "UnknownIdentifierException", pimple_ce_UnknownIdentifierException_functions);
-
- pimple_ce_ExpectedInvokableException = zend_register_internal_class_ex(&tmp_ce_ExpectedInvokableException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
- pimple_ce_FrozenServiceException = zend_register_internal_class_ex(&tmp_ce_FrozenServiceException, spl_ce_RuntimeException, NULL TSRMLS_CC);
- pimple_ce_InvalidServiceIdentifierException = zend_register_internal_class_ex(&tmp_ce_InvalidServiceIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
- pimple_ce_UnknownIdentifierException = zend_register_internal_class_ex(&tmp_ce_UnknownIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
-
- zend_class_implements(pimple_ce_ExpectedInvokableException TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
- zend_class_implements(pimple_ce_FrozenServiceException TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
- zend_class_implements(pimple_ce_InvalidServiceIdentifierException TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
- zend_class_implements(pimple_ce_UnknownIdentifierException TSRMLS_CC, 1, pimple_ce_PsrNotFoundExceptionInterface);
-
- /* Pimple namespace */
- INIT_NS_CLASS_ENTRY(tmp_pimple_ce, PIMPLE_NS, "Container", pimple_ce_functions);
- INIT_NS_CLASS_ENTRY(tmp_pimple_closure_ce, PIMPLE_NS, "ContainerClosure", NULL);
- INIT_NS_CLASS_ENTRY(tmp_pimple_serviceprovider_iface_ce, PIMPLE_NS, "ServiceProviderInterface", pimple_serviceprovider_iface_ce_functions);
-
- tmp_pimple_ce.create_object = pimple_object_create;
- tmp_pimple_closure_ce.create_object = pimple_closure_object_create;
-
- pimple_ce = zend_register_internal_class(&tmp_pimple_ce TSRMLS_CC);
- zend_class_implements(pimple_ce TSRMLS_CC, 1, zend_ce_arrayaccess);
-
- pimple_closure_ce = zend_register_internal_class(&tmp_pimple_closure_ce TSRMLS_CC);
- pimple_closure_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-
- pimple_serviceprovider_ce = zend_register_internal_interface(&tmp_pimple_serviceprovider_iface_ce TSRMLS_CC);
-
- memcpy(&pimple_closure_object_handlers, zend_get_std_object_handlers(), sizeof(*zend_get_std_object_handlers()));
- pimple_object_handlers = std_object_handlers;
- pimple_closure_object_handlers.get_closure = pimple_closure_get_closure;
-
- pimple_closure_invoker_function.function_name = "Pimple closure internal invoker";
- pimple_closure_invoker_function.fn_flags |= ZEND_ACC_CLOSURE;
- pimple_closure_invoker_function.handler = ZEND_MN(PimpleClosure_invoker);
- pimple_closure_invoker_function.num_args = 1;
- pimple_closure_invoker_function.required_num_args = 1;
- pimple_closure_invoker_function.scope = pimple_closure_ce;
- pimple_closure_invoker_function.type = ZEND_INTERNAL_FUNCTION;
- pimple_closure_invoker_function.module = &pimple_module_entry;
-
- return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(pimple)
-{
- php_info_print_table_start();
- php_info_print_table_header(2, "SensioLabs Pimple C support", "enabled");
- php_info_print_table_row(2, "Pimple supported version", PIMPLE_VERSION);
- php_info_print_table_end();
-
- php_info_print_box_start(0);
- php_write((void *)ZEND_STRL("SensioLabs Pimple C support developed by Julien Pauli") TSRMLS_CC);
- if (!sapi_module.phpinfo_as_text) {
- php_write((void *)ZEND_STRL(sensiolabs_logo) TSRMLS_CC);
- }
- php_info_print_box_end();
-}
-
-zend_module_entry pimple_module_entry = {
- STANDARD_MODULE_HEADER,
- "pimple",
- NULL,
- PHP_MINIT(pimple),
- NULL,
- NULL,
- NULL,
- PHP_MINFO(pimple),
- PIMPLE_VERSION,
- STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_PIMPLE
-ZEND_GET_MODULE(pimple)
-#endif
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
deleted file mode 100644
index d234e174d..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef PIMPLE_COMPAT_H_
-#define PIMPLE_COMPAT_H_
-
-#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
-
-#define PHP_5_0_X_API_NO 220040412
-#define PHP_5_1_X_API_NO 220051025
-#define PHP_5_2_X_API_NO 220060519
-#define PHP_5_3_X_API_NO 220090626
-#define PHP_5_4_X_API_NO 220100525
-#define PHP_5_5_X_API_NO 220121212
-#define PHP_5_6_X_API_NO 220131226
-
-#define IS_PHP_56 ZEND_EXTENSION_API_NO == PHP_5_6_X_API_NO
-#define IS_AT_LEAST_PHP_56 ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
-
-#define IS_PHP_55 ZEND_EXTENSION_API_NO == PHP_5_5_X_API_NO
-#define IS_AT_LEAST_PHP_55 ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO
-
-#define IS_PHP_54 ZEND_EXTENSION_API_NO == PHP_5_4_X_API_NO
-#define IS_AT_LEAST_PHP_54 ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO
-
-#define IS_PHP_53 ZEND_EXTENSION_API_NO == PHP_5_3_X_API_NO
-#define IS_AT_LEAST_PHP_53 ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
-
-#if IS_PHP_53
-#define object_properties_init(obj, ce) do { \
- zend_hash_copy(obj->properties, &ce->default_properties, zval_copy_property_ctor(ce), NULL, sizeof(zval *)); \
- } while (0);
-#endif
-
-#define ZEND_OBJ_INIT(obj, ce) do { \
- zend_object_std_init(obj, ce TSRMLS_CC); \
- object_properties_init((obj), (ce)); \
- } while(0);
-
-#if IS_PHP_53 || IS_PHP_54
-static void zend_hash_get_current_key_zval_ex(const HashTable *ht, zval *key, HashPosition *pos) {
- Bucket *p;
-
- p = pos ? (*pos) : ht->pInternalPointer;
-
- if (!p) {
- Z_TYPE_P(key) = IS_NULL;
- } else if (p->nKeyLength) {
- Z_TYPE_P(key) = IS_STRING;
- Z_STRVAL_P(key) = estrndup(p->arKey, p->nKeyLength - 1);
- Z_STRLEN_P(key) = p->nKeyLength - 1;
- } else {
- Z_TYPE_P(key) = IS_LONG;
- Z_LVAL_P(key) = p->h;
- }
-}
-#endif
-
-#endif /* PIMPLE_COMPAT_H_ */
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
deleted file mode 100644
index 0809ea232..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-Test for read_dim/write_dim handlers
---SKIPIF--
-
---FILE--
-
-
---EXPECTF--
-foo
-42
-foo2
-foo99
-baz
-strstr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
deleted file mode 100644
index 7b56d2c1f..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-Test for constructor
---SKIPIF--
-
---FILE--
-'foo'));
-var_dump($p[42]);
-?>
---EXPECT--
-NULL
-string(3) "foo"
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
deleted file mode 100644
index a22cfa352..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Test empty dimensions
---SKIPIF--
-
---FILE--
-
---EXPECT--
-int(42)
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
deleted file mode 100644
index 1e1d25136..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Test has/unset dim handlers
---SKIPIF--
-
---FILE--
-
---EXPECT--
-int(42)
-NULL
-bool(true)
-bool(false)
-bool(true)
-bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
deleted file mode 100644
index 0479ee055..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test simple class inheritance
---SKIPIF--
-
---FILE--
-someAttr;
-?>
---EXPECT--
-string(3) "hit"
-foo
-fooAttr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
deleted file mode 100644
index cfe8a119e..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-Test complex class inheritance
---SKIPIF--
-
---FILE--
- 'bar', 88 => 'baz');
-
-$p = new TestPimple($defaultValues);
-$p[42] = 'foo';
-var_dump($p[42]);
-var_dump($p[0]);
-?>
---EXPECT--
-string(13) "hit offsetset"
-string(27) "hit offsetget in TestPimple"
-string(25) "hit offsetget in MyPimple"
-string(3) "foo"
-string(27) "hit offsetget in TestPimple"
-string(25) "hit offsetget in MyPimple"
-string(3) "baz"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
deleted file mode 100644
index 5aac68380..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Test for read_dim/write_dim handlers
---SKIPIF--
-
---FILE--
-
---EXPECTF--
-foo
-42
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
deleted file mode 100644
index db7eeec4a..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-Test frozen services
---SKIPIF--
-
---FILE--
-
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
deleted file mode 100644
index bb05ea296..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Test service is called as callback, and only once
---SKIPIF--
-
---FILE--
-
---EXPECTF--
-bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
deleted file mode 100644
index badce0146..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-Test service is called as callback for every callback type
---SKIPIF--
-
---FILE--
-
---EXPECTF--
-callme
-called
-Foo::bar
-array(2) {
- [0]=>
- string(3) "Foo"
- [1]=>
- string(3) "bar"
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
deleted file mode 100644
index 6682ab8eb..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Test service callback throwing an exception
---SKIPIF--
-
---FILE--
-
---EXPECTF--
-all right!
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
deleted file mode 100644
index 4c6ac486d..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Test service factory
---SKIPIF--
-
---FILE--
-factory($f = function() { var_dump('called-1'); return 'ret-1';});
-
-$p[] = $f;
-
-$p[] = function () { var_dump('called-2'); return 'ret-2'; };
-
-var_dump($p[0]);
-var_dump($p[0]);
-var_dump($p[1]);
-var_dump($p[1]);
-?>
---EXPECTF--
-string(8) "called-1"
-string(5) "ret-1"
-string(8) "called-1"
-string(5) "ret-1"
-string(8) "called-2"
-string(5) "ret-2"
-string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
deleted file mode 100644
index f419958c5..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Test keys()
---SKIPIF--
-
---FILE--
-keys());
-
-$p['foo'] = 'bar';
-$p[] = 'foo';
-
-var_dump($p->keys());
-
-unset($p['foo']);
-
-var_dump($p->keys());
-?>
---EXPECTF--
-array(0) {
-}
-array(2) {
- [0]=>
- string(3) "foo"
- [1]=>
- int(0)
-}
-array(1) {
- [0]=>
- int(0)
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
deleted file mode 100644
index ac937213a..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Test raw()
---SKIPIF--
-
---FILE--
-raw('foo'));
-var_dump($p[42]);
-
-unset($p['foo']);
-
-try {
- $p->raw('foo');
- echo "expected exception";
-} catch (InvalidArgumentException $e) { }
---EXPECTF--
-string(8) "called-2"
-string(5) "ret-2"
-object(Closure)#%i (0) {
-}
-string(8) "called-2"
-string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
deleted file mode 100644
index 314f008ac..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test protect()
---SKIPIF--
-
---FILE--
-protect($f);
-
-var_dump($p['foo']);
---EXPECTF--
-object(Closure)#%i (0) {
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
deleted file mode 100644
index e55edb0a7..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test extend()
---SKIPIF--
-
---FILE--
-extend(12, function ($w) { var_dump($w); return 'bar'; }); /* $callable in code above */
-
-var_dump($c('param'));
---EXPECTF--
-string(5) "param"
-string(3) "foo"
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
deleted file mode 100644
index bac23ce09..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test extend() with exception in service extension
---SKIPIF--
-
---FILE--
-extend(12, function ($w) { throw new BadMethodCallException; });
-
-try {
- $p[12];
- echo "Exception expected";
-} catch (BadMethodCallException $e) { }
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
deleted file mode 100644
index 8f881d6eb..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test extend() with exception in service factory
---SKIPIF--
-
---FILE--
-extend(12, function ($w) { return 'foobar'; });
-
-try {
- $p[12];
- echo "Exception expected";
-} catch (BadMethodCallException $e) { }
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
deleted file mode 100644
index 27c12a14e..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Test register()
---SKIPIF--
-
---FILE--
-register(new Foo, array(42 => 'bar'));
-
-var_dump($p[42]);
---EXPECTF--
-object(Pimple\Container)#1 (0) {
-}
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
deleted file mode 100644
index 28a9aecac..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Test register() returns static and is a fluent interface
---SKIPIF--
-
---FILE--
-register(new Foo));
---EXPECTF--
-bool(true)
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
deleted file mode 100644
index 8f983e656..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
+++ /dev/null
@@ -1,51 +0,0 @@
-factory($factory);
-
-$p['factory'] = $factory;
-
-echo $p['factory'];
-echo $p['factory'];
-echo $p['factory'];
-
-}
-
-echo microtime(true) - $time;
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
deleted file mode 100644
index aec541f0b..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
+++ /dev/null
@@ -1,25 +0,0 @@
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist b/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
deleted file mode 100644
index 5c8d487fe..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- ./src/Pimple/Tests
-
-
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
deleted file mode 100644
index 707b92b82..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
+++ /dev/null
@@ -1,298 +0,0 @@
-factories = new \SplObjectStorage();
- $this->protected = new \SplObjectStorage();
-
- foreach ($values as $key => $value) {
- $this->offsetSet($key, $value);
- }
- }
-
- /**
- * Sets a parameter or an object.
- *
- * Objects must be defined as Closures.
- *
- * Allowing any PHP callable leads to difficult to debug problems
- * as function names (strings) are callable (creating a function with
- * the same name as an existing parameter would break your container).
- *
- * @param string $id The unique identifier for the parameter or object
- * @param mixed $value The value of the parameter or a closure to define an object
- *
- * @throws FrozenServiceException Prevent override of a frozen service
- */
- public function offsetSet($id, $value)
- {
- if (isset($this->frozen[$id])) {
- throw new FrozenServiceException($id);
- }
-
- $this->values[$id] = $value;
- $this->keys[$id] = true;
- }
-
- /**
- * Gets a parameter or an object.
- *
- * @param string $id The unique identifier for the parameter or object
- *
- * @return mixed The value of the parameter or an object
- *
- * @throws UnknownIdentifierException If the identifier is not defined
- */
- public function offsetGet($id)
- {
- if (!isset($this->keys[$id])) {
- throw new UnknownIdentifierException($id);
- }
-
- if (
- isset($this->raw[$id])
- || !\is_object($this->values[$id])
- || isset($this->protected[$this->values[$id]])
- || !\method_exists($this->values[$id], '__invoke')
- ) {
- return $this->values[$id];
- }
-
- if (isset($this->factories[$this->values[$id]])) {
- return $this->values[$id]($this);
- }
-
- $raw = $this->values[$id];
- $val = $this->values[$id] = $raw($this);
- $this->raw[$id] = $raw;
-
- $this->frozen[$id] = true;
-
- return $val;
- }
-
- /**
- * Checks if a parameter or an object is set.
- *
- * @param string $id The unique identifier for the parameter or object
- *
- * @return bool
- */
- public function offsetExists($id)
- {
- return isset($this->keys[$id]);
- }
-
- /**
- * Unsets a parameter or an object.
- *
- * @param string $id The unique identifier for the parameter or object
- */
- public function offsetUnset($id)
- {
- if (isset($this->keys[$id])) {
- if (\is_object($this->values[$id])) {
- unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
- }
-
- unset($this->values[$id], $this->frozen[$id], $this->raw[$id], $this->keys[$id]);
- }
- }
-
- /**
- * Marks a callable as being a factory service.
- *
- * @param callable $callable A service definition to be used as a factory
- *
- * @return callable The passed callable
- *
- * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
- */
- public function factory($callable)
- {
- if (!\method_exists($callable, '__invoke')) {
- throw new ExpectedInvokableException('Service definition is not a Closure or invokable object.');
- }
-
- $this->factories->attach($callable);
-
- return $callable;
- }
-
- /**
- * Protects a callable from being interpreted as a service.
- *
- * This is useful when you want to store a callable as a parameter.
- *
- * @param callable $callable A callable to protect from being evaluated
- *
- * @return callable The passed callable
- *
- * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
- */
- public function protect($callable)
- {
- if (!\method_exists($callable, '__invoke')) {
- throw new ExpectedInvokableException('Callable is not a Closure or invokable object.');
- }
-
- $this->protected->attach($callable);
-
- return $callable;
- }
-
- /**
- * Gets a parameter or the closure defining an object.
- *
- * @param string $id The unique identifier for the parameter or object
- *
- * @return mixed The value of the parameter or the closure defining an object
- *
- * @throws UnknownIdentifierException If the identifier is not defined
- */
- public function raw($id)
- {
- if (!isset($this->keys[$id])) {
- throw new UnknownIdentifierException($id);
- }
-
- if (isset($this->raw[$id])) {
- return $this->raw[$id];
- }
-
- return $this->values[$id];
- }
-
- /**
- * Extends an object definition.
- *
- * Useful when you want to extend an existing object definition,
- * without necessarily loading that object.
- *
- * @param string $id The unique identifier for the object
- * @param callable $callable A service definition to extend the original
- *
- * @return callable The wrapped callable
- *
- * @throws UnknownIdentifierException If the identifier is not defined
- * @throws FrozenServiceException If the service is frozen
- * @throws InvalidServiceIdentifierException If the identifier belongs to a parameter
- * @throws ExpectedInvokableException If the extension callable is not a closure or an invokable object
- */
- public function extend($id, $callable)
- {
- if (!isset($this->keys[$id])) {
- throw new UnknownIdentifierException($id);
- }
-
- if (isset($this->frozen[$id])) {
- throw new FrozenServiceException($id);
- }
-
- if (!\is_object($this->values[$id]) || !\method_exists($this->values[$id], '__invoke')) {
- throw new InvalidServiceIdentifierException($id);
- }
-
- if (isset($this->protected[$this->values[$id]])) {
- @\trigger_error(\sprintf('How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "%s" should be protected?', $id), \E_USER_DEPRECATED);
- }
-
- if (!\is_object($callable) || !\method_exists($callable, '__invoke')) {
- throw new ExpectedInvokableException('Extension service definition is not a Closure or invokable object.');
- }
-
- $factory = $this->values[$id];
-
- $extended = function ($c) use ($callable, $factory) {
- return $callable($factory($c), $c);
- };
-
- if (isset($this->factories[$factory])) {
- $this->factories->detach($factory);
- $this->factories->attach($extended);
- }
-
- return $this[$id] = $extended;
- }
-
- /**
- * Returns all defined value names.
- *
- * @return array An array of value names
- */
- public function keys()
- {
- return \array_keys($this->values);
- }
-
- /**
- * Registers a service provider.
- *
- * @param ServiceProviderInterface $provider A ServiceProviderInterface instance
- * @param array $values An array of values that customizes the provider
- *
- * @return static
- */
- public function register(ServiceProviderInterface $provider, array $values = array())
- {
- $provider->register($this);
-
- foreach ($values as $key => $value) {
- $this[$key] = $value;
- }
-
- return $this;
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
deleted file mode 100644
index 7228421b1..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- */
-class ExpectedInvokableException extends \InvalidArgumentException implements ContainerExceptionInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
deleted file mode 100644
index e4d2f6d36..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
-class FrozenServiceException extends \RuntimeException implements ContainerExceptionInterface
-{
- /**
- * @param string $id Identifier of the frozen service
- */
- public function __construct($id)
- {
- parent::__construct(\sprintf('Cannot override frozen service "%s".', $id));
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
deleted file mode 100644
index 91e82f98c..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
-class InvalidServiceIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
-{
- /**
- * @param string $id The invalid identifier
- */
- public function __construct($id)
- {
- parent::__construct(\sprintf('Identifier "%s" does not contain an object definition.', $id));
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
deleted file mode 100644
index fb6b626e2..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
-class UnknownIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
-{
- /**
- * @param string $id The unknown identifier
- */
- public function __construct($id)
- {
- parent::__construct(\sprintf('Identifier "%s" is not defined.', $id));
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
deleted file mode 100644
index cadbfffad..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- */
-final class Container implements ContainerInterface
-{
- private $pimple;
-
- public function __construct(PimpleContainer $pimple)
- {
- $this->pimple = $pimple;
- }
-
- public function get($id)
- {
- return $this->pimple[$id];
- }
-
- public function has($id)
- {
- return isset($this->pimple[$id]);
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
deleted file mode 100644
index 3361c6f19..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- */
-class ServiceLocator implements ContainerInterface
-{
- private $container;
- private $aliases = array();
-
- /**
- * @param PimpleContainer $container The Container instance used to locate services
- * @param array $ids Array of service ids that can be located. String keys can be used to define aliases
- */
- public function __construct(PimpleContainer $container, array $ids)
- {
- $this->container = $container;
-
- foreach ($ids as $key => $id) {
- $this->aliases[\is_int($key) ? $id : $key] = $id;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($id)
- {
- if (!isset($this->aliases[$id])) {
- throw new UnknownIdentifierException($id);
- }
-
- return $this->container[$this->aliases[$id]];
- }
-
- /**
- * {@inheritdoc}
- */
- public function has($id)
- {
- return isset($this->aliases[$id]) && isset($this->container[$this->aliases[$id]]);
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
deleted file mode 100644
index 5cde5188f..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- */
-final class ServiceIterator implements \Iterator
-{
- private $container;
- private $ids;
-
- public function __construct(Container $container, array $ids)
- {
- $this->container = $container;
- $this->ids = $ids;
- }
-
- public function rewind()
- {
- \reset($this->ids);
- }
-
- public function current()
- {
- return $this->container[\current($this->ids)];
- }
-
- public function key()
- {
- return \current($this->ids);
- }
-
- public function next()
- {
- \next($this->ids);
- }
-
- public function valid()
- {
- return null !== \key($this->ids);
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
deleted file mode 100644
index c004594ba..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-value = $value;
-
- return $service;
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
deleted file mode 100644
index 33cd4e548..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
+++ /dev/null
@@ -1,34 +0,0 @@
-factory(function () {
- return new Service();
- });
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
deleted file mode 100644
index d71b184dd..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- */
-class Service
-{
- public $value;
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
deleted file mode 100644
index 8e5c4c73d..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- */
-class PimpleServiceProviderInterfaceTest extends \PHPUnit_Framework_TestCase
-{
- public function testProvider()
- {
- $pimple = new Container();
-
- $pimpleServiceProvider = new Fixtures\PimpleServiceProvider();
- $pimpleServiceProvider->register($pimple);
-
- $this->assertEquals('value', $pimple['param']);
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
-
- $serviceOne = $pimple['factory'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
- $serviceTwo = $pimple['factory'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
- $this->assertNotSame($serviceOne, $serviceTwo);
- }
-
- public function testProviderWithRegisterMethod()
- {
- $pimple = new Container();
-
- $pimple->register(new Fixtures\PimpleServiceProvider(), array(
- 'anotherParameter' => 'anotherValue',
- ));
-
- $this->assertEquals('value', $pimple['param']);
- $this->assertEquals('anotherValue', $pimple['anotherParameter']);
-
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
-
- $serviceOne = $pimple['factory'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
- $serviceTwo = $pimple['factory'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
- $this->assertNotSame($serviceOne, $serviceTwo);
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
deleted file mode 100644
index acb66e000..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
+++ /dev/null
@@ -1,589 +0,0 @@
-
- */
-class PimpleTest extends \PHPUnit_Framework_TestCase
-{
- public function testWithString()
- {
- $pimple = new Container();
- $pimple['param'] = 'value';
-
- $this->assertEquals('value', $pimple['param']);
- }
-
- public function testWithClosure()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
-
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
- }
-
- public function testServicesShouldBeDifferent()
- {
- $pimple = new Container();
- $pimple['service'] = $pimple->factory(function () {
- return new Fixtures\Service();
- });
-
- $serviceOne = $pimple['service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
- $serviceTwo = $pimple['service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
- $this->assertNotSame($serviceOne, $serviceTwo);
- }
-
- public function testShouldPassContainerAsParameter()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $pimple['container'] = function ($container) {
- return $container;
- };
-
- $this->assertNotSame($pimple, $pimple['service']);
- $this->assertSame($pimple, $pimple['container']);
- }
-
- public function testIsset()
- {
- $pimple = new Container();
- $pimple['param'] = 'value';
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
-
- $pimple['null'] = null;
-
- $this->assertTrue(isset($pimple['param']));
- $this->assertTrue(isset($pimple['service']));
- $this->assertTrue(isset($pimple['null']));
- $this->assertFalse(isset($pimple['non_existent']));
- }
-
- public function testConstructorInjection()
- {
- $params = array('param' => 'value');
- $pimple = new Container($params);
-
- $this->assertSame($params['param'], $pimple['param']);
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testOffsetGetValidatesKeyIsPresent()
- {
- $pimple = new Container();
- echo $pimple['foo'];
- }
-
- /**
- * @group legacy
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testLegacyOffsetGetValidatesKeyIsPresent()
- {
- $pimple = new Container();
- echo $pimple['foo'];
- }
-
- public function testOffsetGetHonorsNullValues()
- {
- $pimple = new Container();
- $pimple['foo'] = null;
- $this->assertNull($pimple['foo']);
- }
-
- public function testUnset()
- {
- $pimple = new Container();
- $pimple['param'] = 'value';
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
-
- unset($pimple['param'], $pimple['service']);
- $this->assertFalse(isset($pimple['param']));
- $this->assertFalse(isset($pimple['service']));
- }
-
- /**
- * @dataProvider serviceDefinitionProvider
- */
- public function testShare($service)
- {
- $pimple = new Container();
- $pimple['shared_service'] = $service;
-
- $serviceOne = $pimple['shared_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
- $serviceTwo = $pimple['shared_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
- $this->assertSame($serviceOne, $serviceTwo);
- }
-
- /**
- * @dataProvider serviceDefinitionProvider
- */
- public function testProtect($service)
- {
- $pimple = new Container();
- $pimple['protected'] = $pimple->protect($service);
-
- $this->assertSame($service, $pimple['protected']);
- }
-
- public function testGlobalFunctionNameAsParameterValue()
- {
- $pimple = new Container();
- $pimple['global_function'] = 'strlen';
- $this->assertSame('strlen', $pimple['global_function']);
- }
-
- public function testRaw()
- {
- $pimple = new Container();
- $pimple['service'] = $definition = $pimple->factory(function () { return 'foo'; });
- $this->assertSame($definition, $pimple->raw('service'));
- }
-
- public function testRawHonorsNullValues()
- {
- $pimple = new Container();
- $pimple['foo'] = null;
- $this->assertNull($pimple->raw('foo'));
- }
-
- public function testFluentRegister()
- {
- $pimple = new Container();
- $this->assertSame($pimple, $pimple->register($this->getMockBuilder('Pimple\ServiceProviderInterface')->getMock()));
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testRawValidatesKeyIsPresent()
- {
- $pimple = new Container();
- $pimple->raw('foo');
- }
-
- /**
- * @group legacy
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testLegacyRawValidatesKeyIsPresent()
- {
- $pimple = new Container();
- $pimple->raw('foo');
- }
-
- /**
- * @dataProvider serviceDefinitionProvider
- */
- public function testExtend($service)
- {
- $pimple = new Container();
- $pimple['shared_service'] = function () {
- return new Fixtures\Service();
- };
- $pimple['factory_service'] = $pimple->factory(function () {
- return new Fixtures\Service();
- });
-
- $pimple->extend('shared_service', $service);
- $serviceOne = $pimple['shared_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
- $serviceTwo = $pimple['shared_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
- $this->assertSame($serviceOne, $serviceTwo);
- $this->assertSame($serviceOne->value, $serviceTwo->value);
-
- $pimple->extend('factory_service', $service);
- $serviceOne = $pimple['factory_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
- $serviceTwo = $pimple['factory_service'];
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
- $this->assertNotSame($serviceOne, $serviceTwo);
- $this->assertNotSame($serviceOne->value, $serviceTwo->value);
- }
-
- public function testExtendDoesNotLeakWithFactories()
- {
- if (extension_loaded('pimple')) {
- $this->markTestSkipped('Pimple extension does not support this test');
- }
- $pimple = new Container();
-
- $pimple['foo'] = $pimple->factory(function () { return; });
- $pimple['foo'] = $pimple->extend('foo', function ($foo, $pimple) { return; });
- unset($pimple['foo']);
-
- $p = new \ReflectionProperty($pimple, 'values');
- $p->setAccessible(true);
- $this->assertEmpty($p->getValue($pimple));
-
- $p = new \ReflectionProperty($pimple, 'factories');
- $p->setAccessible(true);
- $this->assertCount(0, $p->getValue($pimple));
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testExtendValidatesKeyIsPresent()
- {
- $pimple = new Container();
- $pimple->extend('foo', function () {});
- }
-
- /**
- * @group legacy
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testLegacyExtendValidatesKeyIsPresent()
- {
- $pimple = new Container();
- $pimple->extend('foo', function () {});
- }
-
- public function testKeys()
- {
- $pimple = new Container();
- $pimple['foo'] = 123;
- $pimple['bar'] = 123;
-
- $this->assertEquals(array('foo', 'bar'), $pimple->keys());
- }
-
- /** @test */
- public function settingAnInvokableObjectShouldTreatItAsFactory()
- {
- $pimple = new Container();
- $pimple['invokable'] = new Fixtures\Invokable();
-
- $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['invokable']);
- }
-
- /** @test */
- public function settingNonInvokableObjectShouldTreatItAsParameter()
- {
- $pimple = new Container();
- $pimple['non_invokable'] = new Fixtures\NonInvokable();
-
- $this->assertInstanceOf('Pimple\Tests\Fixtures\NonInvokable', $pimple['non_invokable']);
- }
-
- /**
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \Pimple\Exception\ExpectedInvokableException
- * @expectedExceptionMessage Service definition is not a Closure or invokable object.
- */
- public function testFactoryFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple->factory($service);
- }
-
- /**
- * @group legacy
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Service definition is not a Closure or invokable object.
- */
- public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple->factory($service);
- }
-
- /**
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \Pimple\Exception\ExpectedInvokableException
- * @expectedExceptionMessage Callable is not a Closure or invokable object.
- */
- public function testProtectFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple->protect($service);
- }
-
- /**
- * @group legacy
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Callable is not a Closure or invokable object.
- */
- public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple->protect($service);
- }
-
- /**
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \Pimple\Exception\InvalidServiceIdentifierException
- * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
- */
- public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple['foo'] = $service;
- $pimple->extend('foo', function () {});
- }
-
- /**
- * @group legacy
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
- */
- public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple['foo'] = $service;
- $pimple->extend('foo', function () {});
- }
-
- /**
- * @group legacy
- * @expectedDeprecation How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "foo" should be protected?
- */
- public function testExtendingProtectedClosureDeprecation()
- {
- $pimple = new Container();
- $pimple['foo'] = $pimple->protect(function () {
- return 'bar';
- });
-
- $pimple->extend('foo', function ($value) {
- return $value.'-baz';
- });
-
- $this->assertSame('bar-baz', $pimple['foo']);
- }
-
- /**
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \Pimple\Exception\ExpectedInvokableException
- * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
- */
- public function testExtendFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple['foo'] = function () {};
- $pimple->extend('foo', $service);
- }
-
- /**
- * @group legacy
- * @dataProvider badServiceDefinitionProvider
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
- */
- public function testLegacyExtendFailsForInvalidServiceDefinitions($service)
- {
- $pimple = new Container();
- $pimple['foo'] = function () {};
- $pimple->extend('foo', $service);
- }
-
- /**
- * @expectedException \Pimple\Exception\FrozenServiceException
- * @expectedExceptionMessage Cannot override frozen service "foo".
- */
- public function testExtendFailsIfFrozenServiceIsNonInvokable()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return new Fixtures\NonInvokable();
- };
- $foo = $pimple['foo'];
-
- $pimple->extend('foo', function () {});
- }
-
- /**
- * @expectedException \Pimple\Exception\FrozenServiceException
- * @expectedExceptionMessage Cannot override frozen service "foo".
- */
- public function testExtendFailsIfFrozenServiceIsInvokable()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return new Fixtures\Invokable();
- };
- $foo = $pimple['foo'];
-
- $pimple->extend('foo', function () {});
- }
-
- /**
- * Provider for invalid service definitions.
- */
- public function badServiceDefinitionProvider()
- {
- return array(
- array(123),
- array(new Fixtures\NonInvokable()),
- );
- }
-
- /**
- * Provider for service definitions.
- */
- public function serviceDefinitionProvider()
- {
- return array(
- array(function ($value) {
- $service = new Fixtures\Service();
- $service->value = $value;
-
- return $service;
- }),
- array(new Fixtures\Invokable()),
- );
- }
-
- public function testDefiningNewServiceAfterFreeze()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $foo = $pimple['foo'];
-
- $pimple['bar'] = function () {
- return 'bar';
- };
- $this->assertSame('bar', $pimple['bar']);
- }
-
- /**
- * @expectedException \Pimple\Exception\FrozenServiceException
- * @expectedExceptionMessage Cannot override frozen service "foo".
- */
- public function testOverridingServiceAfterFreeze()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $foo = $pimple['foo'];
-
- $pimple['foo'] = function () {
- return 'bar';
- };
- }
-
- /**
- * @group legacy
- * @expectedException \RuntimeException
- * @expectedExceptionMessage Cannot override frozen service "foo".
- */
- public function testLegacyOverridingServiceAfterFreeze()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $foo = $pimple['foo'];
-
- $pimple['foo'] = function () {
- return 'bar';
- };
- }
-
- public function testRemovingServiceAfterFreeze()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $foo = $pimple['foo'];
-
- unset($pimple['foo']);
- $pimple['foo'] = function () {
- return 'bar';
- };
- $this->assertSame('bar', $pimple['foo']);
- }
-
- public function testExtendingService()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
- return "$foo.bar";
- });
- $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
- return "$foo.baz";
- });
- $this->assertSame('foo.bar.baz', $pimple['foo']);
- }
-
- public function testExtendingServiceAfterOtherServiceFreeze()
- {
- $pimple = new Container();
- $pimple['foo'] = function () {
- return 'foo';
- };
- $pimple['bar'] = function () {
- return 'bar';
- };
- $foo = $pimple['foo'];
-
- $pimple['bar'] = $pimple->extend('bar', function ($bar, $app) {
- return "$bar.baz";
- });
- $this->assertSame('bar.baz', $pimple['bar']);
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
deleted file mode 100644
index 7ca2d7fff..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-assertSame($pimple['service'], $psr->get('service'));
- }
-
- /**
- * @expectedException \Psr\Container\NotFoundExceptionInterface
- * @expectedExceptionMessage Identifier "service" is not defined.
- */
- public function testGetThrowsExceptionIfServiceIsNotFound()
- {
- $pimple = new Container();
- $psr = new PsrContainer($pimple);
-
- $psr->get('service');
- }
-
- public function testHasReturnsTrueIfServiceExists()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Service();
- };
- $psr = new PsrContainer($pimple);
-
- $this->assertTrue($psr->has('service'));
- }
-
- public function testHasReturnsFalseIfServiceDoesNotExist()
- {
- $pimple = new Container();
- $psr = new PsrContainer($pimple);
-
- $this->assertFalse($psr->has('service'));
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
deleted file mode 100644
index c9a081259..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- */
-class ServiceLocatorTest extends TestCase
-{
- public function testCanAccessServices()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('service'));
-
- $this->assertSame($pimple['service'], $locator->get('service'));
- }
-
- public function testCanAccessAliasedServices()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
- $this->assertSame($pimple['service'], $locator->get('alias'));
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "service" is not defined.
- */
- public function testCannotAccessAliasedServiceUsingRealIdentifier()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
- $service = $locator->get('service');
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "foo" is not defined.
- */
- public function testGetValidatesServiceCanBeLocated()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
- $service = $locator->get('foo');
- }
-
- /**
- * @expectedException \Pimple\Exception\UnknownIdentifierException
- * @expectedExceptionMessage Identifier "invalid" is not defined.
- */
- public function testGetValidatesTargetServiceExists()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('alias' => 'invalid'));
-
- $service = $locator->get('alias');
- }
-
- public function testHasValidatesServiceCanBeLocated()
- {
- $pimple = new Container();
- $pimple['service1'] = function () {
- return new Fixtures\Service();
- };
- $pimple['service2'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('service1'));
-
- $this->assertTrue($locator->has('service1'));
- $this->assertFalse($locator->has('service2'));
- }
-
- public function testHasChecksIfTargetServiceExists()
- {
- $pimple = new Container();
- $pimple['service'] = function () {
- return new Fixtures\Service();
- };
- $locator = new ServiceLocator($pimple, array('foo' => 'service', 'bar' => 'invalid'));
-
- $this->assertTrue($locator->has('foo'));
- $this->assertFalse($locator->has('bar'));
- }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
deleted file mode 100644
index 5dd52f0d9..000000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-assertSame(array('service1' => $pimple['service1'], 'service2' => $pimple['service2']), iterator_to_array($iterator));
- }
-}
diff --git a/advancedcontentfilter/vendor/psr/container/README.md b/advancedcontentfilter/vendor/psr/container/README.md
index 084f6df51..1b9d9e570 100644
--- a/advancedcontentfilter/vendor/psr/container/README.md
+++ b/advancedcontentfilter/vendor/psr/container/README.md
@@ -1,5 +1,13 @@
-# PSR Container
+Container interface
+==============
-This repository holds all interfaces/classes/traits related to [PSR-11](https://github.com/container-interop/fig-standards/blob/master/proposed/container.md).
+This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url].
+
+Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-11/
+[package-url]: https://packagist.org/packages/psr/container
+[implementation-url]: https://packagist.org/providers/psr/container-implementation
-Note that this is not a container implementation of its own. See the specification for more details.
diff --git a/advancedcontentfilter/vendor/psr/container/composer.json b/advancedcontentfilter/vendor/psr/container/composer.json
index b8ee01265..baf6cd1a0 100644
--- a/advancedcontentfilter/vendor/psr/container/composer.json
+++ b/advancedcontentfilter/vendor/psr/container/composer.json
@@ -8,11 +8,11 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.4.0"
},
"autoload": {
"psr-4": {
@@ -21,7 +21,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
}
}
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
index d35c6b4d8..0f213f2fe 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
@@ -1,13 +1,12 @@
=7.0.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
new file mode 100644
index 000000000..cb39a08bf
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
@@ -0,0 +1,18 @@
+=5.3.0"
+ "php": "^7.2 || ^8.0"
},
"autoload": {
"psr-4": {
@@ -20,7 +20,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
}
}
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 000000000..3a7e7dda6
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. |
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()` | Retrieve HTTP protocol version | 1.0 or 1.1 |
+| `withProtocolVersion($version)` | Returns new message instance with given HTTP protocol version | |
+| `getHeaders()` | Retrieve all HTTP Headers | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields) |
+| `hasHeader($name)` | Checks if HTTP Header with given name exists | |
+| `getHeader($name)` | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)` | Retrieves a comma-separated string of the values for a single header | |
+| `withHeader($name, $value)` | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)` | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)` | Removes HTTP Header with given name| |
+| `getBody()` | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)` | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface` + the following methods:
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()` | Retrieves the message's request target | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target | |
+| `getMethod()` | Retrieves the HTTP method of the request. | GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)` | Returns a new message instance with the provided HTTP method | |
+| `getUri()` | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI | |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface` + the following methods:
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() ` | Retrieve server parameters | Typically derived from `$_SERVER` |
+| `getCookieParams()` | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` | Returns a new request instance with the specified cookies | |
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments | |
+| `getUploadedFiles()` | Retrieve normalized file upload data | |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files | |
+| `getParsedBody()` | Retrieve any parameters provided in the request body | |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters | |
+| `getAttributes()` | Retrieve attributes derived from the request | |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute | |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute | |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute | |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface` + the following methods:
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+## `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` | Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface` because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 000000000..b6d048a34
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface` because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed:
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return: "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return: ["My Custom Message", "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5');
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body);
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
index dd46e5ec8..8cdb4ed63 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
@@ -1,5 +1,7 @@
=7.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php b/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
new file mode 100644
index 000000000..83911e265
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
@@ -0,0 +1,22 @@
+=7.0",
+ "psr/http-message": "^1.0 || ^2.0",
+ "psr/http-server-handler": "^1.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php b/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
new file mode 100644
index 000000000..a6c14f8c7
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
@@ -0,0 +1,25 @@
+ true,
'null' => null,
@@ -110,6 +114,7 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
'nested' => array('with object' => new DummyTest),
'object' => new \DateTime,
'resource' => fopen('php://memory', 'r'),
+ 'closed' => $closed,
);
$this->getLogger()->warning('Crazy context data', $context);
@@ -131,10 +136,3 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $this->getLogs());
}
}
-
-class DummyTest
-{
- public function __toString()
- {
- }
-}
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
new file mode 100644
index 000000000..1be323049
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
@@ -0,0 +1,147 @@
+ $level,
+ 'message' => $message,
+ 'context' => $context,
+ ];
+
+ $this->recordsByLevel[$record['level']][] = $record;
+ $this->records[] = $record;
+ }
+
+ public function hasRecords($level)
+ {
+ return isset($this->recordsByLevel[$level]);
+ }
+
+ public function hasRecord($record, $level)
+ {
+ if (is_string($record)) {
+ $record = ['message' => $record];
+ }
+ return $this->hasRecordThatPasses(function ($rec) use ($record) {
+ if ($rec['message'] !== $record['message']) {
+ return false;
+ }
+ if (isset($record['context']) && $rec['context'] !== $record['context']) {
+ return false;
+ }
+ return true;
+ }, $level);
+ }
+
+ public function hasRecordThatContains($message, $level)
+ {
+ return $this->hasRecordThatPasses(function ($rec) use ($message) {
+ return strpos($rec['message'], $message) !== false;
+ }, $level);
+ }
+
+ public function hasRecordThatMatches($regex, $level)
+ {
+ return $this->hasRecordThatPasses(function ($rec) use ($regex) {
+ return preg_match($regex, $rec['message']) > 0;
+ }, $level);
+ }
+
+ public function hasRecordThatPasses(callable $predicate, $level)
+ {
+ if (!isset($this->recordsByLevel[$level])) {
+ return false;
+ }
+ foreach ($this->recordsByLevel[$level] as $i => $rec) {
+ if (call_user_func($predicate, $rec, $i)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public function __call($method, $args)
+ {
+ if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
+ $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
+ $level = strtolower($matches[2]);
+ if (method_exists($this, $genericMethod)) {
+ $args[] = $level;
+ return call_user_func_array([$this, $genericMethod], $args);
+ }
+ }
+ throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+ }
+
+ public function reset()
+ {
+ $this->records = [];
+ $this->recordsByLevel = [];
+ }
+}
diff --git a/advancedcontentfilter/vendor/psr/log/README.md b/advancedcontentfilter/vendor/psr/log/README.md
index 574bc1cb2..a9f20c437 100644
--- a/advancedcontentfilter/vendor/psr/log/README.md
+++ b/advancedcontentfilter/vendor/psr/log/README.md
@@ -7,6 +7,13 @@ This repository holds all interfaces/classes/traits related to
Note that this is not a logger of its own. It is merely an interface that
describes a logger. See the specification for more details.
+Installation
+------------
+
+```bash
+composer require psr/log
+```
+
Usage
-----
@@ -31,6 +38,12 @@ class Foo
if ($this->logger) {
$this->logger->info('Doing work');
}
+
+ try {
+ $this->doSomethingElse();
+ } catch (Exception $exception) {
+ $this->logger->error('Oh no!', array('exception' => $exception));
+ }
// do something useful
}
diff --git a/advancedcontentfilter/vendor/psr/log/composer.json b/advancedcontentfilter/vendor/psr/log/composer.json
index 87934d707..ca0569537 100644
--- a/advancedcontentfilter/vendor/psr/log/composer.json
+++ b/advancedcontentfilter/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"require": {
@@ -20,7 +20,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
}
}
diff --git a/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md b/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
new file mode 100644
index 000000000..6bcb127dd
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
@@ -0,0 +1,237 @@
+# Changelog
+
+# 4.11.0 - 2022-11-06
+- [3180: Declare types](https://github.com/slimphp/Slim/pull/3180) thanks to @nbayramberdiyev
+- [3181: Update laminas/laminas-diactoros requirement from ^2.8 to ^2.9](https://github.com/slimphp/Slim/pull/3181) thanks to @dependabot[bot]
+- [3182: Update guzzlehttp/psr7 requirement from ^2.1 to ^2.2](https://github.com/slimphp/Slim/pull/3182) thanks to @dependabot[bot]
+- [3183: Update phpstan/phpstan requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3183) thanks to @dependabot[bot]
+- [3184: Update adriansuter/php-autoload-override requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3184) thanks to @dependabot[bot]
+- [3189: Update phpstan/phpstan requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/3189) thanks to @dependabot[bot]
+- [3191: Adding property types to Middleware classes](https://github.com/slimphp/Slim/pull/3191) thanks to @ashleycoles
+- [3193: Handlers types](https://github.com/slimphp/Slim/pull/3193) thanks to @ashleycoles
+- [3194: Adding types to AbstractErrorRenderer](https://github.com/slimphp/Slim/pull/3194) thanks to @ashleycoles
+- [3195: Adding prop types for Exception classes](https://github.com/slimphp/Slim/pull/3195) thanks to @ashleycoles
+- [3196: Adding property type declarations for Factory classes](https://github.com/slimphp/Slim/pull/3196) thanks to @ashleycoles
+- [3197: Remove redundant docblock types](https://github.com/slimphp/Slim/pull/3197) thanks to @theodorejb
+- [3199: Update laminas/laminas-diactoros requirement from ^2.9 to ^2.11](https://github.com/slimphp/Slim/pull/3199) thanks to @dependabot[bot]
+- [3200: Update phpstan/phpstan requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3200) thanks to @dependabot[bot]
+- [3205: Update guzzlehttp/psr7 requirement from ^2.2 to ^2.4](https://github.com/slimphp/Slim/pull/3205) thanks to @dependabot[bot]
+- [3206: Update squizlabs/php_codesniffer requirement from ^3.6 to ^3.7](https://github.com/slimphp/Slim/pull/3206) thanks to @dependabot[bot]
+- [3207: Update phpstan/phpstan requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3207) thanks to @dependabot[bot]
+- [3211: Assign null coalescing to coalesce equal](https://github.com/slimphp/Slim/pull/3211) thanks to @MathiasReker
+- [3213: Void return](https://github.com/slimphp/Slim/pull/3213) thanks to @MathiasReker
+- [3214: Is null](https://github.com/slimphp/Slim/pull/3214) thanks to @MathiasReker
+- [3216: Refactor](https://github.com/slimphp/Slim/pull/3216) thanks to @mehdihasanpour
+- [3218: Refactor some code](https://github.com/slimphp/Slim/pull/3218) thanks to @mehdihasanpour
+- [3221: Cleanup](https://github.com/slimphp/Slim/pull/3221) thanks to @mehdihasanpour
+- [3225: Update laminas/laminas-diactoros requirement from ^2.11 to ^2.14](https://github.com/slimphp/Slim/pull/3225) thanks to @dependabot[bot]
+- [3228: Using assertSame to let assert equal be restricted](https://github.com/slimphp/Slim/pull/3228) thanks to @peter279k
+- [3229: Update laminas/laminas-diactoros requirement from ^2.14 to ^2.17](https://github.com/slimphp/Slim/pull/3229) thanks to @dependabot[bot]
+- [3235: Persist routes indexed by name in RouteCollector for improved performance.](https://github.com/slimphp/Slim/pull/3235) thanks to @BusterNeece
+
+# 4.10.0 - 2022-03-14
+- [3120: Add a new PSR-17 factory to Psr17FactoryProvider](https://github.com/slimphp/Slim/pull/3120) thanks to @solventt
+- [3123: Replace deprecated setMethods() in tests](https://github.com/slimphp/Slim/pull/3123) thanks to @solventt
+- [3126: Update guzzlehttp/psr7 requirement from ^2.0 to ^2.1](https://github.com/slimphp/Slim/pull/3126) thanks to @dependabot[bot]
+- [3127: PHPStan v1.0](https://github.com/slimphp/Slim/pull/3127) thanks to @t0mmy742
+- [3128: Update phpstan/phpstan requirement from ^1.0 to ^1.2](https://github.com/slimphp/Slim/pull/3128) thanks to @dependabot[bot]
+- [3129: Deprecate PHP 7.3](https://github.com/slimphp/Slim/pull/3129) thanks to @l0gicgate
+- [3130: Removed double defined PHP 7.4](https://github.com/slimphp/Slim/pull/3130) thanks to @flangofas
+- [3132: Add new `RequestResponseNamedArgs` route strategy](https://github.com/slimphp/Slim/pull/3132) thanks to @adoy
+- [3133: Improve typehinting for `RouteParserInterface`](https://github.com/slimphp/Slim/pull/3133) thanks to @jerowork
+- [3135: Update phpstan/phpstan requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3135) thanks to @dependabot[bot]
+- [3137: Update phpspec/prophecy requirement from ^1.14 to ^1.15](https://github.com/slimphp/Slim/pull/3137) thanks to @dependabot[bot]
+- [3138: Update license year](https://github.com/slimphp/Slim/pull/3138) thanks to @Awilum
+- [3139: Fixed #1730 (reintroduced in 4.x)](https://github.com/slimphp/Slim/pull/3139) thanks to @adoy
+- [3145: Update phpstan/phpstan requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3145) thanks to @dependabot[bot]
+- [3146: Inherit HttpException from RuntimeException](https://github.com/slimphp/Slim/pull/3146) thanks to @nbayramberdiyev
+- [3148: Upgrade to HTML5](https://github.com/slimphp/Slim/pull/3148) thanks to @nbayramberdiyev
+- [3172: Update nyholm/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3172) thanks to @dependabot[bot]
+
+# 4.9.0 - 2021-10-05
+- [3058: Implement exception class for Gone Http error](https://github.com/slimphp/Slim/pull/3058) thanks to @TheKernelPanic
+- [3086: Update slim/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3086) thanks to @dependabot[bot]
+- [3087: Update nyholm/psr7-server requirement from ^1.0.1 to ^1.0.2](https://github.com/slimphp/Slim/pull/3087) thanks to @dependabot[bot]
+- [3093: Update phpstan/phpstan requirement from ^0.12.85 to ^0.12.90](https://github.com/slimphp/Slim/pull/3093) thanks to @dependabot[bot]
+- [3099: Allow updated psr log](https://github.com/slimphp/Slim/pull/3099) thanks to @t0mmy742
+- [3104: Drop php7.2](https://github.com/slimphp/Slim/pull/3104) thanks to @t0mmy742
+- [3106: Use PSR-17 factory from Guzzle/psr7 2.0](https://github.com/slimphp/Slim/pull/3106) thanks to @t0mmy742
+- [3108: Update README file](https://github.com/slimphp/Slim/pull/3108) thanks to @t0mmy742
+- [3112: Update laminas/laminas-diactoros requirement from ^2.6 to ^2.8](https://github.com/slimphp/Slim/pull/3112) thanks to @dependabot[bot]
+- [3114: Update slim/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3114) thanks to @dependabot[bot]
+- [3115: Update phpstan/phpstan requirement from ^0.12.96 to ^0.12.99](https://github.com/slimphp/Slim/pull/3115) thanks to @dependabot[bot]
+- [3116: Remove Zend Diactoros references](https://github.com/slimphp/Slim/pull/3116) thanks to @l0gicgate
+
+# 4.8.0 - 2021-05-19
+- [3034: Fix phpunit dependency version](https://github.com/slimphp/Slim/pull/3034) thanks to @l0gicgate
+- [3037: Replace Travis by GitHub Actions](https://github.com/slimphp/Slim/pull/3037) thanks to @t0mmy742
+- [3043: Cover App creation from AppFactory with empty Container](https://github.com/slimphp/Slim/pull/3043) thanks to @t0mmy742
+- [3045: Update phpstan/phpstan requirement from ^0.12.58 to ^0.12.64](https://github.com/slimphp/Slim/pull/3045) thanks to @dependabot-preview[bot]
+- [3047: documentation: min php 7.2 required](https://github.com/slimphp/Slim/pull/3047) thanks to @Rotzbua
+- [3054: Update phpstan/phpstan requirement from ^0.12.64 to ^0.12.70](https://github.com/slimphp/Slim/pull/3054) thanks to @dependabot-preview[bot]
+- [3056: Fix docblock in ErrorMiddleware](https://github.com/slimphp/Slim/pull/3056) thanks to @piotr-cz
+- [3060: Update phpstan/phpstan requirement from ^0.12.70 to ^0.12.80](https://github.com/slimphp/Slim/pull/3060) thanks to @dependabot-preview[bot]
+- [3061: Update nyholm/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3061) thanks to @dependabot-preview[bot]
+- [3063: Allow ^1.0 || ^2.0 in psr/container](https://github.com/slimphp/Slim/pull/3063) thanks to @Ayesh
+- [3069: Classname/Method Callable Arrays](https://github.com/slimphp/Slim/pull/3069) thanks to @ddrv
+- [3078: Update squizlabs/php_codesniffer requirement from ^3.5 to ^3.6](https://github.com/slimphp/Slim/pull/3078) thanks to @dependabot[bot]
+- [3079: Update phpspec/prophecy requirement from ^1.12 to ^1.13](https://github.com/slimphp/Slim/pull/3079) thanks to @dependabot[bot]
+- [3080: Update guzzlehttp/psr7 requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3080) thanks to @dependabot[bot]
+- [3082: Update phpstan/phpstan requirement from ^0.12.80 to ^0.12.85](https://github.com/slimphp/Slim/pull/3082) thanks to @dependabot[bot]
+
+# 4.7.0 - 2020-11-30
+
+### Fixed
+- [3027: Fix: FastRoute dispatcher and data generator should match](https://github.com/slimphp/Slim/pull/3027) thanks to @edudobay
+
+### Added
+- [3015: PHP 8 support](https://github.com/slimphp/Slim/pull/3015) thanks to @edudobay
+
+### Optimizations
+- [3024: Randomize tests](https://github.com/slimphp/Slim/pull/3024) thanks to @pawel-slowik
+
+## 4.6.0 - 2020-11-15
+
+### Fixed
+- [2942: Fix PHPdoc for error handlers in ErrorMiddleware ](https://github.com/slimphp/Slim/pull/2942) thanks to @TiMESPLiNTER
+- [2944: Remove unused function in ErrorHandler](https://github.com/slimphp/Slim/pull/2944) thanks to @l0gicgate
+- [2960: Fix phpstan 0.12 errors](https://github.com/slimphp/Slim/pull/2960) thanks to @adriansuter
+- [2982: Removing cloning statements in tests](https://github.com/slimphp/Slim/pull/2982) thanks to @l0gicgate
+- [3017: Fix request creator factory test](https://github.com/slimphp/Slim/pull/3017) thanks to @pawel-slowik
+- [3022: Ensure RouteParser Always Present After Routing](https://github.com/slimphp/Slim/pull/3022) thanks to @l0gicgate
+
+### Added
+- [2949: Add the support in composer.json](https://github.com/slimphp/Slim/pull/2949) thanks to @ddrv
+- [2958: Strict empty string content type checking in BodyParsingMiddleware::getMediaType](https://github.com/slimphp/Slim/pull/2958) thanks to @Ayesh
+- [2997: Add hints to methods](https://github.com/slimphp/Slim/pull/2997) thanks to @evgsavosin - [3000: Fix route controller test](https://github.com/slimphp/Slim/pull/3000) thanks to @pawel-slowik
+- [3001: Add missing `$strategy` parameter in a Route test](https://github.com/slimphp/Slim/pull/3001) thanks to @pawel-slowik
+
+### Optimizations
+- [2951: Minor optimizations in if() blocks](https://github.com/slimphp/Slim/pull/2951) thanks to @Ayesh
+- [2959: Micro optimization: Declare closures in BodyParsingMiddleware as static](https://github.com/slimphp/Slim/pull/2959) thanks to @Ayesh
+- [2978: Split the routing results to its own function.](https://github.com/slimphp/Slim/pull/2978) thanks to @dlundgren
+
+### Dependencies Updated
+- [2953: Update nyholm/psr7-server requirement from ^0.4.1](https://github.com/slimphp/Slim/pull/2953) thanks to @dependabot-preview[bot]
+- [2954: Update laminas/laminas-diactoros requirement from ^2.1 to ^2.3](https://github.com/slimphp/Slim/pull/2954) thanks to @dependabot-preview[bot]
+- [2955: Update guzzlehttp/psr7 requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/2955) thanks to @dependabot-preview[bot]
+- [2956: Update slim/psr7 requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2956) thanks to @dependabot-preview[bot]
+- [2957: Update nyholm/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/2957) thanks to @dependabot-preview[bot]
+- [2963: Update phpstan/phpstan requirement from ^0.12.23 to ^0.12.25](https://github.com/slimphp/Slim/pull/2963) thanks to @dependabot-preview[bot]
+- [2965: Update adriansuter/php-autoload-override requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2965) thanks to @dependabot-preview[bot]
+- [2967: Update nyholm/psr7 requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/2967) thanks to @dependabot-preview[bot]
+- [2969: Update nyholm/psr7-server requirement from ^0.4.1 to ^1.0.0](https://github.com/slimphp/Slim/pull/2969) thanks to @dependabot-preview[bot]
+- [2970: Update phpstan/phpstan requirement from ^0.12.25 to ^0.12.26](https://github.com/slimphp/Slim/pull/2970) thanks to @dependabot-preview[bot]
+- [2971: Update phpstan/phpstan requirement from ^0.12.26 to ^0.12.27](https://github.com/slimphp/Slim/pull/2971) thanks to @dependabot-preview[bot]
+- [2972: Update phpstan/phpstan requirement from ^0.12.27 to ^0.12.28](https://github.com/slimphp/Slim/pull/2972) thanks to @dependabot-preview[bot]
+- [2973: Update phpstan/phpstan requirement from ^0.12.28 to ^0.12.29](https://github.com/slimphp/Slim/pull/2973) thanks to @dependabot-preview[bot]
+- [2975: Update phpstan/phpstan requirement from ^0.12.29 to ^0.12.30](https://github.com/slimphp/Slim/pull/2975) thanks to @dependabot-preview[bot]
+- [2976: Update phpstan/phpstan requirement from ^0.12.30 to ^0.12.31](https://github.com/slimphp/Slim/pull/2976) thanks to @dependabot-preview[bot]
+- [2980: Update phpstan/phpstan requirement from ^0.12.31 to ^0.12.32](https://github.com/slimphp/Slim/pull/2980) thanks to @dependabot-preview[bot]
+- [2981: Update phpspec/prophecy requirement from ^1.10 to ^1.11](https://github.com/slimphp/Slim/pull/2981) thanks to @dependabot-preview[bot]
+- [2986: Update phpstan/phpstan requirement from ^0.12.32 to ^0.12.33](https://github.com/slimphp/Slim/pull/2986) thanks to @dependabot-preview[bot]
+- [2990: Update phpstan/phpstan requirement from ^0.12.33 to ^0.12.34](https://github.com/slimphp/Slim/pull/2990) thanks to @dependabot-preview[bot]
+- [2991: Update phpstan/phpstan requirement from ^0.12.34 to ^0.12.35](https://github.com/slimphp/Slim/pull/2991) thanks to @dependabot-preview[bot]
+- [2993: Update phpstan/phpstan requirement from ^0.12.35 to ^0.12.36](https://github.com/slimphp/Slim/pull/2993) thanks to @dependabot-preview[bot]
+- [2995: Update phpstan/phpstan requirement from ^0.12.36 to ^0.12.37](https://github.com/slimphp/Slim/pull/2995) thanks to @dependabot-preview[bot]
+- [3010: Update guzzlehttp/psr7 requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3010) thanks to @dependabot-preview[bot]
+- [3011: Update phpspec/prophecy requirement from ^1.11 to ^1.12](https://github.com/slimphp/Slim/pull/3011) thanks to @dependabot-preview[bot]
+- [3012: Update slim/http requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/3012) thanks to @dependabot-preview[bot]
+- [3013: Update slim/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/3013) thanks to @dependabot-preview[bot]
+- [3014: Update laminas/laminas-diactoros requirement from ^2.3 to ^2.4](https://github.com/slimphp/Slim/pull/3014) thanks to @dependabot-preview[bot]
+- [3018: Update phpstan/phpstan requirement from ^0.12.37 to ^0.12.54](https://github.com/slimphp/Slim/pull/3018) thanks to @dependabot-preview[bot]
+
+## 4.5.0 - 2020-04-14
+
+### Added
+- [2928](https://github.com/slimphp/Slim/pull/2928) Test against PHP 7.4
+- [2937](https://github.com/slimphp/Slim/pull/2937) Add support for PSR-3
+
+### Fixed
+- [2916](https://github.com/slimphp/Slim/pull/2916) Rename phpcs.xml to phpcs.xml.dist
+- [2917](https://github.com/slimphp/Slim/pull/2917) Update .editorconfig
+- [2925](https://github.com/slimphp/Slim/pull/2925) ResponseEmitter: Don't remove Content-Type and Content-Length when body is empt
+- [2932](https://github.com/slimphp/Slim/pull/2932) Update the Tidelift enterprise language
+- [2938](https://github.com/slimphp/Slim/pull/2938) Modify usage of deprecated expectExceptionMessageRegExp() method
+
+## 4.4.0 - 2020-01-04
+
+### Added
+- [2862](https://github.com/slimphp/Slim/pull/2862) Optionally handle subclasses of exceptions in custom error handler
+- [2869](https://github.com/slimphp/Slim/pull/2869) php-di/php-di added in composer suggestion
+- [2874](https://github.com/slimphp/Slim/pull/2874) Add `null` to param type-hints
+- [2889](https://github.com/slimphp/Slim/pull/2889) Make `RouteContext` attributes customizable and change default to use private names
+- [2907](https://github.com/slimphp/Slim/pull/2907) Migrate to PSR-12 convention
+- [2910](https://github.com/slimphp/Slim/pull/2910) Migrate Zend to Laminas
+- [2912](https://github.com/slimphp/Slim/pull/2912) Add Laminas PSR17 Factory
+- [2913](https://github.com/slimphp/Slim/pull/2913) Update php-autoload-override version
+- [2914](https://github.com/slimphp/Slim/pull/2914) Added ability to add handled exceptions as an array
+
+### Fixed
+- [2864](https://github.com/slimphp/Slim/pull/2864) Optimize error message in error handling if displayErrorDetails was not set
+- [2876](https://github.com/slimphp/Slim/pull/2876) Update links from http to https
+- [2877](https://github.com/slimphp/Slim/pull/2877) Fix docblock for `Slim\Routing\RouteCollector::cacheFile`
+- [2878](https://github.com/slimphp/Slim/pull/2878) check body is writable only on ouput buffering append
+- [2896](https://github.com/slimphp/Slim/pull/2896) Render errors uniformly
+- [2902](https://github.com/slimphp/Slim/pull/2902) Fix prophecies
+- [2908](https://github.com/slimphp/Slim/pull/2908) Use autoload-dev for `Slim\Tests` namespace
+
+### Removed
+- [2871](https://github.com/slimphp/Slim/pull/2871) Remove explicit type-hint
+- [2872](https://github.com/slimphp/Slim/pull/2872) Remove type-hint
+
+## 4.3.0 - 2019-10-05
+
+### Added
+- [2819](https://github.com/slimphp/Slim/pull/2819) Added description to addRoutingMiddleware()
+- [2820](https://github.com/slimphp/Slim/pull/2820) Update link to homepage in composer.json
+- [2828](https://github.com/slimphp/Slim/pull/2828) Allow URIs with leading multi-slashes
+- [2832](https://github.com/slimphp/Slim/pull/2832) Refactor `FastRouteDispatcher`
+- [2835](https://github.com/slimphp/Slim/pull/2835) Rename `pathFor` to `urlFor` in docblock
+- [2846](https://github.com/slimphp/Slim/pull/2846) Correcting the branch name as per issue-2843
+- [2849](https://github.com/slimphp/Slim/pull/2849) Create class alias for FastRoute\RouteCollector
+- [2855](https://github.com/slimphp/Slim/pull/2855) Add list of allowed methods to HttpMethodNotAllowedException
+- [2860](https://github.com/slimphp/Slim/pull/2860) Add base path to `$request` and use `RouteContext` to read
+
+### Fixed
+- [2839](https://github.com/slimphp/Slim/pull/2839) Fix description for handler signature in phpdocs
+- [2844](https://github.com/slimphp/Slim/pull/2844) Handle base path by routeCollector instead of RouteCollectorProxy
+- [2845](https://github.com/slimphp/Slim/pull/2845) Fix composer scripts
+- [2851](https://github.com/slimphp/Slim/pull/2851) Fix example of 'Hello World' app
+- [2854](https://github.com/slimphp/Slim/pull/2854) Fix undefined property in tests
+
+### Removed
+- [2853](https://github.com/slimphp/Slim/pull/2853) Remove unused classes
+
+## 4.2.0 - 2019-08-20
+
+### Added
+- [2787](https://github.com/slimphp/Slim/pull/2787) Add an advanced callable resolver
+- [2791](https://github.com/slimphp/Slim/pull/2791) Add `inferPrivatePropertyTypeFromConstructor` to phpstan
+- [2793](https://github.com/slimphp/Slim/pull/2793) Add ability to configure application via a container in `AppFactory`
+- [2798](https://github.com/slimphp/Slim/pull/2798) Add PSR-7 Agnostic Body Parsing Middleware
+- [2801](https://github.com/slimphp/Slim/pull/2801) Add `setLogErrorRenderer()` method to `ErrorHandler`
+- [2807](https://github.com/slimphp/Slim/pull/2807) Add check for Slim callable notation if no resolver given
+- [2803](https://github.com/slimphp/Slim/pull/2803) Add ability to emit non seekable streams in `ResponseEmitter`
+- [2817](https://github.com/slimphp/Slim/pull/2817) Add the ability to pass in a custom `MiddlewareDispatcherInterface` to the `App`
+
+### Fixed
+- [2789](https://github.com/slimphp/Slim/pull/2789) Fix Cookie header detection in `ResponseEmitter`
+- [2796](https://github.com/slimphp/Slim/pull/2796) Fix http message format
+- [2800](https://github.com/slimphp/Slim/pull/2800) Fix null comparisons more clear in `ErrorHandler`
+- [2802](https://github.com/slimphp/Slim/pull/2802) Fix incorrect search of a header in stack
+- [2806](https://github.com/slimphp/Slim/pull/2806) Simplify `Route::prepare()` method argument preparation
+- [2809](https://github.com/slimphp/Slim/pull/2809) Eliminate a duplicate code via HOF in `MiddlewareDispatcher`
+- [2816](https://github.com/slimphp/Slim/pull/2816) Fix RouteCollectorProxy::redirect() bug
+
+### Removed
+- [2811](https://github.com/slimphp/Slim/pull/2811) Remove `DeferredCallable`
+
+## 4.1.0 - 2019-08-06
+
+### Added
+- [#2779](https://github.com/slimphp/Slim/pull/2774) Add support for Slim callables `Class:method` resolution & Container Closure auto-binding in `MiddlewareDispatcher`
+- [#2774](https://github.com/slimphp/Slim/pull/2774) Add possibility for custom `RequestHandler` invocation strategies
+
+### Fixed
+- [#2776](https://github.com/slimphp/Slim/pull/2774) Fix group middleware on multiple nested groups
diff --git a/advancedcontentfilter/vendor/slim/slim/LICENSE.md b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
index 682c21dc7..d6fd559c7 100644
--- a/advancedcontentfilter/vendor/slim/slim/LICENSE.md
+++ b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Josh Lockhart
+Copyright (c) 2011-2022 Josh Lockhart
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md b/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
new file mode 100644
index 000000000..2b8ad0496
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
@@ -0,0 +1,17 @@
+# Maintainers
+
+There aren't many rules for maintainers of Slim to remember; what we have is listed here.
+
+## We don't merge our own PRs
+
+Our code is better if more than one set of eyes looks at it. Therefore we do not merge our own pull requests unless there is an exceptional circumstance. This helps to spot errors in the patch and also enables us to share information about the project around the maintainer team.
+
+## PRs tagged `WIP` are not ready to be merged
+
+Sometimes it's helpful to collaborate on a patch before it's ready to be merged. We use the text `WIP` (for _Work in Progress_) in the title to mark these PRs.
+
+If a PR has `WIP` in its title, then it is not to be merged. The person who raised the PR will remove the `WIP` text when they are ready for a full review and merge.
+
+## Assign a merged PR to a milestone
+
+By ensuring that all merged PRs are assigned to a milestone, we can easily find which PRs were in which release.
diff --git a/advancedcontentfilter/vendor/slim/slim/SECURITY.md b/advancedcontentfilter/vendor/slim/slim/SECURITY.md
new file mode 100644
index 000000000..a5b6df0b4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/SECURITY.md
@@ -0,0 +1,14 @@
+# Security Policy
+
+### Supported Versions
+
+
+| Version | Supported |
+| ------- | ------------------ |
+| 3.x.x | :white_check_mark: |
+| 4.x.x | :white_check_mark: |
+
+
+### Reporting a Vulnerability
+
+To report a vulnerability please send an email to security@slimframework.com
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/App.php b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
index c5a0f2d3a..ebcc751f6 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/App.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
@@ -1,696 +1,216 @@
container = $container;
- }
+ public function __construct(
+ ResponseFactoryInterface $responseFactory,
+ ?ContainerInterface $container = null,
+ ?CallableResolverInterface $callableResolver = null,
+ ?RouteCollectorInterface $routeCollector = null,
+ ?RouteResolverInterface $routeResolver = null,
+ ?MiddlewareDispatcherInterface $middlewareDispatcher = null
+ ) {
+ parent::__construct(
+ $responseFactory,
+ $callableResolver ?? new CallableResolver($container),
+ $container,
+ $routeCollector
+ );
- /**
- * Enable access to the DI container by consumers of $app
- *
- * @return ContainerInterface
- */
- public function getContainer()
- {
- return $this->container;
- }
+ $this->routeResolver = $routeResolver ?? new RouteResolver($this->routeCollector);
+ $routeRunner = new RouteRunner($this->routeResolver, $this->routeCollector->getRouteParser(), $this);
- /**
- * Add middleware
- *
- * This method prepends new middleware to the app's middleware stack.
- *
- * @param callable|string $callable The callback routine
- *
- * @return static
- */
- public function add($callable)
- {
- return $this->addMiddleware(new DeferredCallable($callable, $this->container));
- }
-
- /**
- * Calling a non-existant method on App checks to see if there's an item
- * in the container that is callable and if so, calls it.
- *
- * @param string $method
- * @param array $args
- * @return mixed
- */
- public function __call($method, $args)
- {
- if ($this->container->has($method)) {
- $obj = $this->container->get($method);
- if (is_callable($obj)) {
- return call_user_func_array($obj, $args);
- }
+ if (!$middlewareDispatcher) {
+ $middlewareDispatcher = new MiddlewareDispatcher($routeRunner, $this->callableResolver, $container);
+ } else {
+ $middlewareDispatcher->seedMiddlewareStack($routeRunner);
}
- throw new \BadMethodCallException("Method $method is not a valid method");
- }
-
- /********************************************************************************
- * Router proxy methods
- *******************************************************************************/
-
- /**
- * Add GET route
- *
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
- *
- * @return \Slim\Interfaces\RouteInterface
- */
- public function get($pattern, $callable)
- {
- return $this->map(['GET'], $pattern, $callable);
+ $this->middlewareDispatcher = $middlewareDispatcher;
}
/**
- * Add POST route
- *
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
- *
- * @return \Slim\Interfaces\RouteInterface
+ * @return RouteResolverInterface
*/
- public function post($pattern, $callable)
+ public function getRouteResolver(): RouteResolverInterface
{
- return $this->map(['POST'], $pattern, $callable);
+ return $this->routeResolver;
}
/**
- * Add PUT route
- *
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
- *
- * @return \Slim\Interfaces\RouteInterface
+ * @return MiddlewareDispatcherInterface
*/
- public function put($pattern, $callable)
+ public function getMiddlewareDispatcher(): MiddlewareDispatcherInterface
{
- return $this->map(['PUT'], $pattern, $callable);
+ return $this->middlewareDispatcher;
}
/**
- * Add PATCH route
- *
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
- *
- * @return \Slim\Interfaces\RouteInterface
+ * @param MiddlewareInterface|string|callable $middleware
*/
- public function patch($pattern, $callable)
+ public function add($middleware): self
{
- return $this->map(['PATCH'], $pattern, $callable);
+ $this->middlewareDispatcher->add($middleware);
+ return $this;
}
/**
- * Add DELETE route
- *
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
- *
- * @return \Slim\Interfaces\RouteInterface
+ * @param MiddlewareInterface $middleware
*/
- public function delete($pattern, $callable)
+ public function addMiddleware(MiddlewareInterface $middleware): self
{
- return $this->map(['DELETE'], $pattern, $callable);
+ $this->middlewareDispatcher->addMiddleware($middleware);
+ return $this;
}
/**
- * Add OPTIONS route
+ * Add the Slim built-in routing middleware to the app middleware stack
*
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
+ * This method can be used to control middleware order and is not required for default routing operation.
*
- * @return \Slim\Interfaces\RouteInterface
+ * @return RoutingMiddleware
*/
- public function options($pattern, $callable)
+ public function addRoutingMiddleware(): RoutingMiddleware
{
- return $this->map(['OPTIONS'], $pattern, $callable);
+ $routingMiddleware = new RoutingMiddleware(
+ $this->getRouteResolver(),
+ $this->getRouteCollector()->getRouteParser()
+ );
+ $this->add($routingMiddleware);
+ return $routingMiddleware;
}
/**
- * Add route for any HTTP method
+ * Add the Slim built-in error middleware to the app middleware stack
*
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
+ * @param bool $displayErrorDetails
+ * @param bool $logErrors
+ * @param bool $logErrorDetails
+ * @param LoggerInterface|null $logger
*
- * @return \Slim\Interfaces\RouteInterface
+ * @return ErrorMiddleware
*/
- public function any($pattern, $callable)
- {
- return $this->map(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $pattern, $callable);
+ public function addErrorMiddleware(
+ bool $displayErrorDetails,
+ bool $logErrors,
+ bool $logErrorDetails,
+ ?LoggerInterface $logger = null
+ ): ErrorMiddleware {
+ $errorMiddleware = new ErrorMiddleware(
+ $this->getCallableResolver(),
+ $this->getResponseFactory(),
+ $displayErrorDetails,
+ $logErrors,
+ $logErrorDetails,
+ $logger
+ );
+ $this->add($errorMiddleware);
+ return $errorMiddleware;
}
/**
- * Add route with multiple methods
+ * Add the Slim body parsing middleware to the app middleware stack
*
- * @param string[] $methods Numeric array of HTTP method names
- * @param string $pattern The route URI pattern
- * @param callable|string $callable The route callback routine
+ * @param callable[] $bodyParsers
*
- * @return RouteInterface
+ * @return BodyParsingMiddleware
*/
- public function map(array $methods, $pattern, $callable)
+ public function addBodyParsingMiddleware(array $bodyParsers = []): BodyParsingMiddleware
{
- if ($callable instanceof Closure) {
- $callable = $callable->bindTo($this->container);
- }
-
- $route = $this->container->get('router')->map($methods, $pattern, $callable);
- if (is_callable([$route, 'setContainer'])) {
- $route->setContainer($this->container);
- }
-
- if (is_callable([$route, 'setOutputBuffering'])) {
- $route->setOutputBuffering($this->container->get('settings')['outputBuffering']);
- }
-
- return $route;
+ $bodyParsingMiddleware = new BodyParsingMiddleware($bodyParsers);
+ $this->add($bodyParsingMiddleware);
+ return $bodyParsingMiddleware;
}
- /**
- * Route Groups
- *
- * This method accepts a route pattern and a callback. All route
- * declarations in the callback will be prepended by the group(s)
- * that it is in.
- *
- * @param string $pattern
- * @param callable $callable
- *
- * @return RouteGroupInterface
- */
- public function group($pattern, $callable)
- {
- /** @var RouteGroup $group */
- $group = $this->container->get('router')->pushGroup($pattern, $callable);
- $group->setContainer($this->container);
- $group($this);
- $this->container->get('router')->popGroup();
- return $group;
- }
-
- /********************************************************************************
- * Runner
- *******************************************************************************/
-
/**
* Run application
*
* This method traverses the application middleware stack and then sends the
* resultant Response object to the HTTP client.
*
- * @param bool|false $silent
- * @return ResponseInterface
- *
- * @throws Exception
- * @throws MethodNotAllowedException
- * @throws NotFoundException
+ * @param ServerRequestInterface|null $request
+ * @return void
*/
- public function run($silent = false)
+ public function run(?ServerRequestInterface $request = null): void
{
- $response = $this->container->get('response');
-
- try {
- ob_start();
- $response = $this->process($this->container->get('request'), $response);
- } catch (InvalidMethodException $e) {
- $response = $this->processInvalidMethod($e->getRequest(), $response);
- } finally {
- $output = ob_get_clean();
+ if (!$request) {
+ $serverRequestCreator = ServerRequestCreatorFactory::create();
+ $request = $serverRequestCreator->createServerRequestFromGlobals();
}
- if (!empty($output) && $response->getBody()->isWritable()) {
- $outputBuffering = $this->container->get('settings')['outputBuffering'];
- if ($outputBuffering === 'prepend') {
- // prepend output buffer content
- $body = new Http\Body(fopen('php://temp', 'r+'));
- $body->write($output . $response->getBody());
- $response = $response->withBody($body);
- } elseif ($outputBuffering === 'append') {
- // append output buffer content
- $response->getBody()->write($output);
- }
- }
-
- $response = $this->finalize($response);
-
- if (!$silent) {
- $this->respond($response);
- }
-
- return $response;
+ $response = $this->handle($request);
+ $responseEmitter = new ResponseEmitter();
+ $responseEmitter->emit($response);
}
/**
- * Pull route info for a request with a bad method to decide whether to
- * return a not-found error (default) or a bad-method error, then run
- * the handler for that error, returning the resulting response.
- *
- * Used for cases where an incoming request has an unrecognized method,
- * rather than throwing an exception and not catching it all the way up.
- *
- * @param ServerRequestInterface $request
- * @param ResponseInterface $response
- * @return ResponseInterface
- */
- protected function processInvalidMethod(ServerRequestInterface $request, ResponseInterface $response)
- {
- $router = $this->container->get('router');
- if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
- $router->setBasePath($request->getUri()->getBasePath());
- }
-
- $request = $this->dispatchRouterAndPrepareRoute($request, $router);
- $routeInfo = $request->getAttribute('routeInfo', [RouterInterface::DISPATCH_STATUS => Dispatcher::NOT_FOUND]);
-
- if ($routeInfo[RouterInterface::DISPATCH_STATUS] === Dispatcher::METHOD_NOT_ALLOWED) {
- return $this->handleException(
- new MethodNotAllowedException($request, $response, $routeInfo[RouterInterface::ALLOWED_METHODS]),
- $request,
- $response
- );
- }
-
- return $this->handleException(new NotFoundException($request, $response), $request, $response);
- }
-
- /**
- * Process a request
+ * Handle a request
*
* This method traverses the application middleware stack and then returns the
* resultant Response object.
*
* @param ServerRequestInterface $request
- * @param ResponseInterface $response
* @return ResponseInterface
- *
- * @throws Exception
- * @throws MethodNotAllowedException
- * @throws NotFoundException
*/
- public function process(ServerRequestInterface $request, ResponseInterface $response)
+ public function handle(ServerRequestInterface $request): ResponseInterface
{
- // Ensure basePath is set
- $router = $this->container->get('router');
- if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
- $router->setBasePath($request->getUri()->getBasePath());
- }
+ $response = $this->middlewareDispatcher->handle($request);
- // Dispatch the Router first if the setting for this is on
- if ($this->container->get('settings')['determineRouteBeforeAppMiddleware'] === true) {
- // Dispatch router (note: you won't be able to alter routes after this)
- $request = $this->dispatchRouterAndPrepareRoute($request, $router);
- }
-
- // Traverse middleware stack
- try {
- $response = $this->callMiddlewareStack($request, $response);
- } catch (Exception $e) {
- $response = $this->handleException($e, $request, $response);
- } catch (Throwable $e) {
- $response = $this->handlePhpError($e, $request, $response);
+ /**
+ * This is to be in compliance with RFC 2616, Section 9.
+ * If the incoming request method is HEAD, we need to ensure that the response body
+ * is empty as the request may fall back on a GET route handler due to FastRoute's
+ * routing logic which could potentially append content to the response body
+ * https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4
+ */
+ $method = strtoupper($request->getMethod());
+ if ($method === 'HEAD') {
+ $emptyBody = $this->responseFactory->createResponse()->getBody();
+ return $response->withBody($emptyBody);
}
return $response;
}
-
- /**
- * Send the response to the client
- *
- * @param ResponseInterface $response
- */
- public function respond(ResponseInterface $response)
- {
- // Send response
- if (!headers_sent()) {
- // Headers
- foreach ($response->getHeaders() as $name => $values) {
- foreach ($values as $value) {
- header(sprintf('%s: %s', $name, $value), false);
- }
- }
-
- // Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
- // See https://github.com/slimphp/Slim/issues/1730
-
- // Status
- header(sprintf(
- 'HTTP/%s %s %s',
- $response->getProtocolVersion(),
- $response->getStatusCode(),
- $response->getReasonPhrase()
- ));
- }
-
- // Body
- if (!$this->isEmptyResponse($response)) {
- $body = $response->getBody();
- if ($body->isSeekable()) {
- $body->rewind();
- }
- $settings = $this->container->get('settings');
- $chunkSize = $settings['responseChunkSize'];
-
- $contentLength = $response->getHeaderLine('Content-Length');
- if (!$contentLength) {
- $contentLength = $body->getSize();
- }
-
-
- if (isset($contentLength)) {
- $amountToRead = $contentLength;
- while ($amountToRead > 0 && !$body->eof()) {
- $data = $body->read(min($chunkSize, $amountToRead));
- echo $data;
-
- $amountToRead -= strlen($data);
-
- if (connection_status() != CONNECTION_NORMAL) {
- break;
- }
- }
- } else {
- while (!$body->eof()) {
- echo $body->read($chunkSize);
- if (connection_status() != CONNECTION_NORMAL) {
- break;
- }
- }
- }
- }
- }
-
- /**
- * Invoke application
- *
- * This method implements the middleware interface. It receives
- * Request and Response objects, and it returns a Response object
- * after compiling the routes registered in the Router and dispatching
- * the Request object to the appropriate Route callback routine.
- *
- * @param ServerRequestInterface $request The most recent Request object
- * @param ResponseInterface $response The most recent Response object
- *
- * @return ResponseInterface
- * @throws MethodNotAllowedException
- * @throws NotFoundException
- */
- public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
- {
- // Get the route info
- $routeInfo = $request->getAttribute('routeInfo');
-
- /** @var \Slim\Interfaces\RouterInterface $router */
- $router = $this->container->get('router');
-
- // If router hasn't been dispatched or the URI changed then dispatch
- if (null === $routeInfo || ($routeInfo['request'] !== [$request->getMethod(), (string) $request->getUri()])) {
- $request = $this->dispatchRouterAndPrepareRoute($request, $router);
- $routeInfo = $request->getAttribute('routeInfo');
- }
-
- if ($routeInfo[0] === Dispatcher::FOUND) {
- $route = $router->lookupRoute($routeInfo[1]);
- return $route->run($request, $response);
- } elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
- if (!$this->container->has('notAllowedHandler')) {
- throw new MethodNotAllowedException($request, $response, $routeInfo[1]);
- }
- /** @var callable $notAllowedHandler */
- $notAllowedHandler = $this->container->get('notAllowedHandler');
- return $notAllowedHandler($request, $response, $routeInfo[1]);
- }
-
- if (!$this->container->has('notFoundHandler')) {
- throw new NotFoundException($request, $response);
- }
- /** @var callable $notFoundHandler */
- $notFoundHandler = $this->container->get('notFoundHandler');
- return $notFoundHandler($request, $response);
- }
-
- /**
- * Perform a sub-request from within an application route
- *
- * This method allows you to prepare and initiate a sub-request, run within
- * the context of the current request. This WILL NOT issue a remote HTTP
- * request. Instead, it will route the provided URL, method, headers,
- * cookies, body, and server variables against the set of registered
- * application routes. The result response object is returned.
- *
- * @param string $method The request method (e.g., GET, POST, PUT, etc.)
- * @param string $path The request URI path
- * @param string $query The request URI query string
- * @param array $headers The request headers (key-value array)
- * @param array $cookies The request cookies (key-value array)
- * @param string $bodyContent The request body
- * @param ResponseInterface $response The response object (optional)
- * @return ResponseInterface
- */
- public function subRequest(
- $method,
- $path,
- $query = '',
- array $headers = [],
- array $cookies = [],
- $bodyContent = '',
- ResponseInterface $response = null
- ) {
- $env = $this->container->get('environment');
- $uri = Uri::createFromEnvironment($env)->withPath($path)->withQuery($query);
- $headers = new Headers($headers);
- $serverParams = $env->all();
- $body = new Body(fopen('php://temp', 'r+'));
- $body->write($bodyContent);
- $body->rewind();
- $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body);
-
- if (!$response) {
- $response = $this->container->get('response');
- }
-
- return $this($request, $response);
- }
-
- /**
- * Dispatch the router to find the route. Prepare the route for use.
- *
- * @param ServerRequestInterface $request
- * @param RouterInterface $router
- * @return ServerRequestInterface
- */
- protected function dispatchRouterAndPrepareRoute(ServerRequestInterface $request, RouterInterface $router)
- {
- $routeInfo = $router->dispatch($request);
-
- if ($routeInfo[0] === Dispatcher::FOUND) {
- $routeArguments = [];
- foreach ($routeInfo[2] as $k => $v) {
- $routeArguments[$k] = urldecode($v);
- }
-
- $route = $router->lookupRoute($routeInfo[1]);
- $route->prepare($request, $routeArguments);
-
- // add route to the request's attributes in case a middleware or handler needs access to the route
- $request = $request->withAttribute('route', $route);
- }
-
- $routeInfo['request'] = [$request->getMethod(), (string) $request->getUri()];
-
- return $request->withAttribute('routeInfo', $routeInfo);
- }
-
- /**
- * Finalize response
- *
- * @param ResponseInterface $response
- * @return ResponseInterface
- */
- protected function finalize(ResponseInterface $response)
- {
- // stop PHP sending a Content-Type automatically
- ini_set('default_mimetype', '');
-
- if ($this->isEmptyResponse($response)) {
- return $response->withoutHeader('Content-Type')->withoutHeader('Content-Length');
- }
-
- // Add Content-Length header if `addContentLengthHeader` setting is set
- if (isset($this->container->get('settings')['addContentLengthHeader']) &&
- $this->container->get('settings')['addContentLengthHeader'] == true) {
- if (ob_get_length() > 0) {
- throw new \RuntimeException("Unexpected data in output buffer. " .
- "Maybe you have characters before an opening getBody()->getSize();
- if ($size !== null && !$response->hasHeader('Content-Length')) {
- $response = $response->withHeader('Content-Length', (string) $size);
- }
- }
-
- return $response;
- }
-
- /**
- * Helper method, which returns true if the provided response must not output a body and false
- * if the response could have a body.
- *
- * @see https://tools.ietf.org/html/rfc7231
- *
- * @param ResponseInterface $response
- * @return bool
- */
- protected function isEmptyResponse(ResponseInterface $response)
- {
- if (method_exists($response, 'isEmpty')) {
- return $response->isEmpty();
- }
-
- return in_array($response->getStatusCode(), [204, 205, 304]);
- }
-
- /**
- * Call relevant handler from the Container if needed. If it doesn't exist,
- * then just re-throw.
- *
- * @param Exception $e
- * @param ServerRequestInterface $request
- * @param ResponseInterface $response
- *
- * @return ResponseInterface
- * @throws Exception if a handler is needed and not found
- */
- protected function handleException(Exception $e, ServerRequestInterface $request, ResponseInterface $response)
- {
- if ($e instanceof MethodNotAllowedException) {
- $handler = 'notAllowedHandler';
- $params = [$e->getRequest(), $e->getResponse(), $e->getAllowedMethods()];
- } elseif ($e instanceof NotFoundException) {
- $handler = 'notFoundHandler';
- $params = [$e->getRequest(), $e->getResponse(), $e];
- } elseif ($e instanceof SlimException) {
- // This is a Stop exception and contains the response
- return $e->getResponse();
- } else {
- // Other exception, use $request and $response params
- $handler = 'errorHandler';
- $params = [$request, $response, $e];
- }
-
- if ($this->container->has($handler)) {
- $callable = $this->container->get($handler);
- // Call the registered handler
- return call_user_func_array($callable, $params);
- }
-
- // No handlers found, so just throw the exception
- throw $e;
- }
-
- /**
- * Call relevant handler from the Container if needed. If it doesn't exist,
- * then just re-throw.
- *
- * @param Throwable $e
- * @param ServerRequestInterface $request
- * @param ResponseInterface $response
- * @return ResponseInterface
- * @throws Throwable
- */
- protected function handlePhpError(Throwable $e, ServerRequestInterface $request, ResponseInterface $response)
- {
- $handler = 'phpErrorHandler';
- $params = [$request, $response, $e];
-
- if ($this->container->has($handler)) {
- $callable = $this->container->get($handler);
- // Call the registered handler
- return call_user_func_array($callable, $params);
- }
-
- // No handlers found, so just throw the exception
- throw $e;
- }
}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
index 2211a3291..66f225de8 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
@@ -1,110 +1,193 @@
container = $container;
}
/**
- * Resolve toResolve into a closure so that the router can dispatch.
+ * {@inheritdoc}
+ */
+ public function resolve($toResolve): callable
+ {
+ $toResolve = $this->prepareToResolve($toResolve);
+ if (is_callable($toResolve)) {
+ return $this->bindToContainer($toResolve);
+ }
+ $resolved = $toResolve;
+ if (is_string($toResolve)) {
+ $resolved = $this->resolveSlimNotation($toResolve);
+ $resolved[1] ??= '__invoke';
+ }
+ $callable = $this->assertCallable($resolved, $toResolve);
+ return $this->bindToContainer($callable);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function resolveRoute($toResolve): callable
+ {
+ return $this->resolveByPredicate($toResolve, [$this, 'isRoute'], 'handle');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function resolveMiddleware($toResolve): callable
+ {
+ return $this->resolveByPredicate($toResolve, [$this, 'isMiddleware'], 'process');
+ }
+
+ /**
+ * @param string|callable $toResolve
*
- * If toResolve is of the format 'class:method', then try to extract 'class'
- * from the container otherwise instantiate it and then dispatch 'method'.
+ * @throws RuntimeException
+ */
+ private function resolveByPredicate($toResolve, callable $predicate, string $defaultMethod): callable
+ {
+ $toResolve = $this->prepareToResolve($toResolve);
+ if (is_callable($toResolve)) {
+ return $this->bindToContainer($toResolve);
+ }
+ $resolved = $toResolve;
+ if ($predicate($toResolve)) {
+ $resolved = [$toResolve, $defaultMethod];
+ }
+ if (is_string($toResolve)) {
+ [$instance, $method] = $this->resolveSlimNotation($toResolve);
+ if ($method === null && $predicate($instance)) {
+ $method = $defaultMethod;
+ }
+ $resolved = [$instance, $method ?? '__invoke'];
+ }
+ $callable = $this->assertCallable($resolved, $toResolve);
+ return $this->bindToContainer($callable);
+ }
+
+ /**
+ * @param mixed $toResolve
+ */
+ private function isRoute($toResolve): bool
+ {
+ return $toResolve instanceof RequestHandlerInterface;
+ }
+
+ /**
+ * @param mixed $toResolve
+ */
+ private function isMiddleware($toResolve): bool
+ {
+ return $toResolve instanceof MiddlewareInterface;
+ }
+
+ /**
+ * @throws RuntimeException
*
+ * @return array{object, string|null} [Instance, Method Name]
+ */
+ private function resolveSlimNotation(string $toResolve): array
+ {
+ preg_match(CallableResolver::$callablePattern, $toResolve, $matches);
+ [$class, $method] = $matches ? [$matches[1], $matches[2]] : [$toResolve, null];
+
+ /** @var string $class */
+ /** @var string|null $method */
+ if ($this->container && $this->container->has($class)) {
+ $instance = $this->container->get($class);
+ if (!is_object($instance)) {
+ throw new RuntimeException(sprintf('%s container entry is not an object', $class));
+ }
+ } else {
+ if (!class_exists($class)) {
+ if ($method) {
+ $class .= '::' . $method . '()';
+ }
+ throw new RuntimeException(sprintf('Callable %s does not exist', $class));
+ }
+ $instance = new $class($this->container);
+ }
+ return [$instance, $method];
+ }
+
+ /**
+ * @param mixed $resolved
* @param mixed $toResolve
*
- * @return callable
- *
- * @throws RuntimeException if the callable does not exist
- * @throws RuntimeException if the callable is not resolvable
+ * @throws RuntimeException
*/
- public function resolve($toResolve)
+ private function assertCallable($resolved, $toResolve): callable
{
- if (is_callable($toResolve)) {
- return $toResolve;
+ if (!is_callable($resolved)) {
+ if (is_callable($toResolve) || is_object($toResolve) || is_array($toResolve)) {
+ $formatedToResolve = ($toResolveJson = json_encode($toResolve)) !== false ? $toResolveJson : '';
+ } else {
+ $formatedToResolve = is_string($toResolve) ? $toResolve : '';
+ }
+ throw new RuntimeException(sprintf('%s is not resolvable', $formatedToResolve));
}
-
- if (!is_string($toResolve)) {
- $this->assertCallable($toResolve);
- }
-
- // check for slim callable as "class:method"
- if (preg_match(self::CALLABLE_PATTERN, $toResolve, $matches)) {
- $resolved = $this->resolveCallable($matches[1], $matches[2]);
- $this->assertCallable($resolved);
-
- return $resolved;
- }
-
- $resolved = $this->resolveCallable($toResolve);
- $this->assertCallable($resolved);
-
return $resolved;
}
- /**
- * Check if string is something in the DIC
- * that's callable or is a class name which has an __invoke() method.
- *
- * @param string $class
- * @param string $method
- * @return callable
- *
- * @throws \RuntimeException if the callable does not exist
- */
- protected function resolveCallable($class, $method = '__invoke')
+ private function bindToContainer(callable $callable): callable
{
- if ($this->container->has($class)) {
- return [$this->container->get($class), $method];
+ if (is_array($callable) && $callable[0] instanceof Closure) {
+ $callable = $callable[0];
}
-
- if (!class_exists($class)) {
- throw new RuntimeException(sprintf('Callable %s does not exist', $class));
+ if ($this->container && $callable instanceof Closure) {
+ /** @var Closure $callable */
+ $callable = $callable->bindTo($this->container);
}
-
- return [new $class($this->container), $method];
+ return $callable;
}
/**
- * @param Callable $callable
- *
- * @throws \RuntimeException if the callable is not resolvable
+ * @param string|callable $toResolve
+ * @return string|callable
*/
- protected function assertCallable($callable)
+ private function prepareToResolve($toResolve)
{
- if (!is_callable($callable)) {
- throw new RuntimeException(sprintf(
- '%s is not resolvable',
- is_array($callable) || is_object($callable) ? json_encode($callable) : $callable
- ));
+ if (!is_array($toResolve)) {
+ return $toResolve;
}
+ $candidate = $toResolve;
+ $class = array_shift($candidate);
+ $method = array_shift($candidate);
+ if (is_string($class) && is_string($method)) {
+ return $class . ':' . $method;
+ }
+ return $toResolve;
}
}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
deleted file mode 100644
index ffb4eb28a..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
+++ /dev/null
@@ -1,47 +0,0 @@
-container instanceof ContainerInterface) {
- return $callable;
- }
-
- /** @var CallableResolverInterface $resolver */
- $resolver = $this->container->get('callableResolver');
-
- return $resolver->resolve($callable);
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php b/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
deleted file mode 100644
index 728bb73e0..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
+++ /dev/null
@@ -1,202 +0,0 @@
-replace($items);
- }
-
- /********************************************************************************
- * Collection interface
- *******************************************************************************/
-
- /**
- * Set collection item
- *
- * @param string $key The data key
- * @param mixed $value The data value
- */
- public function set($key, $value)
- {
- $this->data[$key] = $value;
- }
-
- /**
- * Get collection item for key
- *
- * @param string $key The data key
- * @param mixed $default The default value to return if data key does not exist
- *
- * @return mixed The key's value, or the default value
- */
- public function get($key, $default = null)
- {
- return $this->has($key) ? $this->data[$key] : $default;
- }
-
- /**
- * Add item to collection, replacing existing items with the same data key
- *
- * @param array $items Key-value array of data to append to this collection
- */
- public function replace(array $items)
- {
- foreach ($items as $key => $value) {
- $this->set($key, $value);
- }
- }
-
- /**
- * Get all items in collection
- *
- * @return array The collection's source data
- */
- public function all()
- {
- return $this->data;
- }
-
- /**
- * Get collection keys
- *
- * @return array The collection's source data keys
- */
- public function keys()
- {
- return array_keys($this->data);
- }
-
- /**
- * Does this collection have a given key?
- *
- * @param string $key The data key
- *
- * @return bool
- */
- public function has($key)
- {
- return array_key_exists($key, $this->data);
- }
-
- /**
- * Remove item from collection
- *
- * @param string $key The data key
- */
- public function remove($key)
- {
- unset($this->data[$key]);
- }
-
- /**
- * Remove all items from collection
- */
- public function clear()
- {
- $this->data = [];
- }
-
- /********************************************************************************
- * ArrayAccess interface
- *******************************************************************************/
-
- /**
- * Does this collection have a given key?
- *
- * @param string $key The data key
- *
- * @return bool
- */
- public function offsetExists($key)
- {
- return $this->has($key);
- }
-
- /**
- * Get collection item for key
- *
- * @param string $key The data key
- *
- * @return mixed The key's value, or the default value
- */
- public function offsetGet($key)
- {
- return $this->get($key);
- }
-
- /**
- * Set collection item
- *
- * @param string $key The data key
- * @param mixed $value The data value
- */
- public function offsetSet($key, $value)
- {
- $this->set($key, $value);
- }
-
- /**
- * Remove item from collection
- *
- * @param string $key The data key
- */
- public function offsetUnset($key)
- {
- $this->remove($key);
- }
-
- /**
- * Get number of items in collection
- *
- * @return int
- */
- public function count()
- {
- return count($this->data);
- }
-
- /********************************************************************************
- * IteratorAggregate interface
- *******************************************************************************/
-
- /**
- * Get collection iterator
- *
- * @return \ArrayIterator
- */
- public function getIterator()
- {
- return new ArrayIterator($this->data);
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Container.php b/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
deleted file mode 100644
index 1f713ac4e..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
+++ /dev/null
@@ -1,179 +0,0 @@
- '1.1',
- 'responseChunkSize' => 4096,
- 'outputBuffering' => 'append',
- 'determineRouteBeforeAppMiddleware' => false,
- 'displayErrorDetails' => false,
- 'addContentLengthHeader' => true,
- 'routerCacheFile' => false,
- ];
-
- /**
- * Create new container
- *
- * @param array $values The parameters or objects.
- */
- public function __construct(array $values = [])
- {
- parent::__construct($values);
-
- $userSettings = isset($values['settings']) ? $values['settings'] : [];
- $this->registerDefaultServices($userSettings);
- }
-
- /**
- * This function registers the default services that Slim needs to work.
- *
- * All services are shared - that is, they are registered such that the
- * same instance is returned on subsequent calls.
- *
- * @param array $userSettings Associative array of application settings
- *
- * @return void
- */
- private function registerDefaultServices($userSettings)
- {
- $defaultSettings = $this->defaultSettings;
-
- /**
- * This service MUST return an array or an
- * instance of \ArrayAccess.
- *
- * @return array|\ArrayAccess
- */
- $this['settings'] = function () use ($userSettings, $defaultSettings) {
- return new Collection(array_merge($defaultSettings, $userSettings));
- };
-
- $defaultProvider = new DefaultServicesProvider();
- $defaultProvider->register($this);
- }
-
- /********************************************************************************
- * Methods to satisfy Psr\Container\ContainerInterface
- *******************************************************************************/
-
- /**
- * Finds an entry of the container by its identifier and returns it.
- *
- * @param string $id Identifier of the entry to look for.
- *
- * @throws ContainerValueNotFoundException No entry was found for this identifier.
- * @throws ContainerException Error while retrieving the entry.
- *
- * @return mixed Entry.
- */
- public function get($id)
- {
- if (!$this->offsetExists($id)) {
- throw new ContainerValueNotFoundException(sprintf('Identifier "%s" is not defined.', $id));
- }
- try {
- return $this->offsetGet($id);
- } catch (\InvalidArgumentException $exception) {
- if ($this->exceptionThrownByContainer($exception)) {
- throw new SlimContainerException(
- sprintf('Container error while retrieving "%s"', $id),
- null,
- $exception
- );
- } else {
- throw $exception;
- }
- }
- }
-
- /**
- * Tests whether an exception needs to be recast for compliance with Container-Interop. This will be if the
- * exception was thrown by Pimple.
- *
- * @param \InvalidArgumentException $exception
- *
- * @return bool
- */
- private function exceptionThrownByContainer(\InvalidArgumentException $exception)
- {
- $trace = $exception->getTrace()[0];
-
- return $trace['class'] === PimpleContainer::class && $trace['function'] === 'offsetGet';
- }
-
- /**
- * Returns true if the container can return an entry for the given identifier.
- * Returns false otherwise.
- *
- * @param string $id Identifier of the entry to look for.
- *
- * @return boolean
- */
- public function has($id)
- {
- return $this->offsetExists($id);
- }
-
-
- /********************************************************************************
- * Magic methods for convenience
- *******************************************************************************/
-
- public function __get($name)
- {
- return $this->get($name);
- }
-
- public function __isset($name)
- {
- return $this->has($name);
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php b/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
deleted file mode 100644
index 13fe1fb31..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
+++ /dev/null
@@ -1,211 +0,0 @@
-get('environment'));
- };
- }
-
- if (!isset($container['response'])) {
- /**
- * PSR-7 Response object
- *
- * @param Container $container
- *
- * @return ResponseInterface
- */
- $container['response'] = function ($container) {
- $headers = new Headers(['Content-Type' => 'text/html; charset=UTF-8']);
- $response = new Response(200, $headers);
-
- return $response->withProtocolVersion($container->get('settings')['httpVersion']);
- };
- }
-
- if (!isset($container['router'])) {
- /**
- * This service MUST return a SHARED instance
- * of \Slim\Interfaces\RouterInterface.
- *
- * @param Container $container
- *
- * @return RouterInterface
- */
- $container['router'] = function ($container) {
- $routerCacheFile = false;
- if (isset($container->get('settings')['routerCacheFile'])) {
- $routerCacheFile = $container->get('settings')['routerCacheFile'];
- }
-
-
- $router = (new Router)->setCacheFile($routerCacheFile);
- if (method_exists($router, 'setContainer')) {
- $router->setContainer($container);
- }
-
- return $router;
- };
- }
-
- if (!isset($container['foundHandler'])) {
- /**
- * This service MUST return a SHARED instance
- * of \Slim\Interfaces\InvocationStrategyInterface.
- *
- * @return InvocationStrategyInterface
- */
- $container['foundHandler'] = function () {
- return new RequestResponse;
- };
- }
-
- if (!isset($container['phpErrorHandler'])) {
- /**
- * This service MUST return a callable
- * that accepts three arguments:
- *
- * 1. Instance of \Psr\Http\Message\ServerRequestInterface
- * 2. Instance of \Psr\Http\Message\ResponseInterface
- * 3. Instance of \Error
- *
- * The callable MUST return an instance of
- * \Psr\Http\Message\ResponseInterface.
- *
- * @param Container $container
- *
- * @return callable
- */
- $container['phpErrorHandler'] = function ($container) {
- return new PhpError($container->get('settings')['displayErrorDetails']);
- };
- }
-
- if (!isset($container['errorHandler'])) {
- /**
- * This service MUST return a callable
- * that accepts three arguments:
- *
- * 1. Instance of \Psr\Http\Message\ServerRequestInterface
- * 2. Instance of \Psr\Http\Message\ResponseInterface
- * 3. Instance of \Exception
- *
- * The callable MUST return an instance of
- * \Psr\Http\Message\ResponseInterface.
- *
- * @param Container $container
- *
- * @return callable
- */
- $container['errorHandler'] = function ($container) {
- return new Error(
- $container->get('settings')['displayErrorDetails']
- );
- };
- }
-
- if (!isset($container['notFoundHandler'])) {
- /**
- * This service MUST return a callable
- * that accepts two arguments:
- *
- * 1. Instance of \Psr\Http\Message\ServerRequestInterface
- * 2. Instance of \Psr\Http\Message\ResponseInterface
- *
- * The callable MUST return an instance of
- * \Psr\Http\Message\ResponseInterface.
- *
- * @return callable
- */
- $container['notFoundHandler'] = function () {
- return new NotFound;
- };
- }
-
- if (!isset($container['notAllowedHandler'])) {
- /**
- * This service MUST return a callable
- * that accepts three arguments:
- *
- * 1. Instance of \Psr\Http\Message\ServerRequestInterface
- * 2. Instance of \Psr\Http\Message\ResponseInterface
- * 3. Array of allowed HTTP methods
- *
- * The callable MUST return an instance of
- * \Psr\Http\Message\ResponseInterface.
- *
- * @return callable
- */
- $container['notAllowedHandler'] = function () {
- return new NotAllowed;
- };
- }
-
- if (!isset($container['callableResolver'])) {
- /**
- * Instance of \Slim\Interfaces\CallableResolverInterface
- *
- * @param Container $container
- *
- * @return CallableResolverInterface
- */
- $container['callableResolver'] = function ($container) {
- return new CallableResolver($container);
- };
- }
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php b/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
deleted file mode 100644
index 22887c0fc..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
+++ /dev/null
@@ -1,45 +0,0 @@
-callable = $callable;
- $this->container = $container;
- }
-
- public function __invoke()
- {
- $callable = $this->resolveCallable($this->callable);
- if ($callable instanceof Closure) {
- $callable = $callable->bindTo($this->container);
- }
-
- $args = func_get_args();
-
- return call_user_func_array($callable, $args);
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
new file mode 100644
index 000000000..90b290d41
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
@@ -0,0 +1,46 @@
+getTitle();
+ }
+
+ return $this->defaultErrorTitle;
+ }
+
+ protected function getErrorDescription(Throwable $exception): string
+ {
+ if ($exception instanceof HttpException) {
+ return $exception->getDescription();
+ }
+
+ return $this->defaultErrorDescription;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
new file mode 100644
index 000000000..e030522aa
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
@@ -0,0 +1,84 @@
+The application could not run because of the following error:';
+ $html .= 'Details
';
+ $html .= $this->renderExceptionFragment($exception);
+ } else {
+ $html = "{$this->getErrorDescription($exception)}
";
+ }
+
+ return $this->renderHtmlBody($this->getErrorTitle($exception), $html);
+ }
+
+ private function renderExceptionFragment(Throwable $exception): string
+ {
+ $html = sprintf('Type: %s
', get_class($exception));
+
+ /** @var int|string $code */
+ $code = $exception->getCode();
+ $html .= sprintf('Code: %s
', $code);
+
+ $html .= sprintf('Message: %s
', htmlentities($exception->getMessage()));
+
+ $html .= sprintf('File: %s
', $exception->getFile());
+
+ $html .= sprintf('Line: %s
', $exception->getLine());
+
+ $html .= 'Trace
';
+ $html .= sprintf('%s
', htmlentities($exception->getTraceAsString()));
+
+ return $html;
+ }
+
+ public function renderHtmlBody(string $title = '', string $html = ''): string
+ {
+ return sprintf(
+ '' .
+ '' .
+ ' ' .
+ ' ' .
+ ' ' .
+ ' %s' .
+ ' ' .
+ ' ' .
+ ' ' .
+ ' %s
' .
+ ' %s
' .
+ ' Go Back' .
+ ' ' .
+ '',
+ $title,
+ $title,
+ $html
+ );
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
new file mode 100644
index 000000000..63d905b3c
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
@@ -0,0 +1,56 @@
+ $this->getErrorTitle($exception)];
+
+ if ($displayErrorDetails) {
+ $error['exception'] = [];
+ do {
+ $error['exception'][] = $this->formatExceptionFragment($exception);
+ } while ($exception = $exception->getPrevious());
+ }
+
+ return (string) json_encode($error, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+ }
+
+ /**
+ * @return array
+ */
+ private function formatExceptionFragment(Throwable $exception): array
+ {
+ /** @var int|string $code */
+ $code = $exception->getCode();
+ return [
+ 'type' => get_class($exception),
+ 'code' => $code,
+ 'message' => $exception->getMessage(),
+ 'file' => $exception->getFile(),
+ 'line' => $exception->getLine(),
+ ];
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
new file mode 100644
index 000000000..3d80c74be
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
@@ -0,0 +1,59 @@
+getErrorTitle($exception)}\n";
+
+ if ($displayErrorDetails) {
+ $text .= $this->formatExceptionFragment($exception);
+
+ while ($exception = $exception->getPrevious()) {
+ $text .= "\nPrevious Error:\n";
+ $text .= $this->formatExceptionFragment($exception);
+ }
+ }
+
+ return $text;
+ }
+
+ private function formatExceptionFragment(Throwable $exception): string
+ {
+ $text = sprintf("Type: %s\n", get_class($exception));
+
+ $code = $exception->getCode();
+ /** @var int|string $code */
+ $text .= sprintf("Code: %s\n", $code);
+
+ $text .= sprintf("Message: %s\n", htmlentities($exception->getMessage()));
+
+ $text .= sprintf("File: %s\n", $exception->getFile());
+
+ $text .= sprintf("Line: %s\n", $exception->getLine());
+
+ $text .= sprintf('Trace: %s', $exception->getTraceAsString());
+
+ return $text;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
new file mode 100644
index 000000000..1171b79b2
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
@@ -0,0 +1,54 @@
+\n";
+ $xml .= "\n " . $this->createCdataSection($this->getErrorTitle($exception)) . "\n";
+
+ if ($displayErrorDetails) {
+ do {
+ $xml .= " \n";
+ $xml .= ' ' . get_class($exception) . "\n";
+ $xml .= ' ' . $exception->getCode() . "\n";
+ $xml .= ' ' . $this->createCdataSection($exception->getMessage()) . "\n";
+ $xml .= ' ' . $exception->getFile() . "\n";
+ $xml .= ' ' . $exception->getLine() . "\n";
+ $xml .= " \n";
+ } while ($exception = $exception->getPrevious());
+ }
+
+ $xml .= '';
+
+ return $xml;
+ }
+
+ /**
+ * Returns a CDATA section with the given content.
+ */
+ private function createCdataSection(string $content): string
+ {
+ return sprintf('', str_replace(']]>', ']]]]>', $content));
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
deleted file mode 100644
index 06163f1da..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-request = $request;
+ }
+
+ public function getRequest(): ServerRequestInterface
+ {
+ return $this->request;
+ }
+
+ public function getTitle(): string
+ {
+ return $this->title;
+ }
+
+ public function setTitle(string $title): self
+ {
+ $this->title = $title;
+ return $this;
+ }
+
+ public function getDescription(): string
+ {
+ return $this->description;
+ }
+
+ public function setDescription(string $description): self
+ {
+ $this->description = $description;
+ return $this;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
new file mode 100644
index 000000000..dd3bb230a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
@@ -0,0 +1,27 @@
+allowedMethods;
+ }
+
+ /**
+ * @param string[] $methods
+ */
+ public function setAllowedMethods(array $methods): self
+ {
+ $this->allowedMethods = $methods;
+ $this->message = 'Method not allowed. Must be one of: ' . implode(', ', $methods);
+ return $this;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
new file mode 100644
index 000000000..865146d68
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
@@ -0,0 +1,27 @@
+message = $message;
+ }
+
+ parent::__construct($request, $this->message, $this->code, $previous);
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
new file mode 100644
index 000000000..07bd70d01
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
@@ -0,0 +1,27 @@
+request = $request;
- parent::__construct(sprintf('Unsupported HTTP method "%s" provided', $method));
- }
-
- public function getRequest()
- {
- return $this->request;
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
deleted file mode 100644
index 951f5dfbe..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-allowedMethods = $allowedMethods;
- }
-
- /**
- * Get allowed methods
- *
- * @return string[]
- */
- public function getAllowedMethods()
- {
- return $this->allowedMethods;
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
deleted file mode 100644
index 9e72e14e6..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-request = $request;
- $this->response = $response;
- }
-
- /**
- * Get request
- *
- * @return ServerRequestInterface
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Get response
- *
- * @return ResponseInterface
- */
- public function getResponse()
- {
- return $this->response;
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
new file mode 100644
index 000000000..6fc5f86ea
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
@@ -0,0 +1,206 @@
+has(ResponseFactoryInterface::class)
+ && (
+ $responseFactoryFromContainer = $container->get(ResponseFactoryInterface::class)
+ ) instanceof ResponseFactoryInterface
+ ? $responseFactoryFromContainer
+ : self::determineResponseFactory();
+
+ $callableResolver = $container->has(CallableResolverInterface::class)
+ && (
+ $callableResolverFromContainer = $container->get(CallableResolverInterface::class)
+ ) instanceof CallableResolverInterface
+ ? $callableResolverFromContainer
+ : null;
+
+ $routeCollector = $container->has(RouteCollectorInterface::class)
+ && (
+ $routeCollectorFromContainer = $container->get(RouteCollectorInterface::class)
+ ) instanceof RouteCollectorInterface
+ ? $routeCollectorFromContainer
+ : null;
+
+ $routeResolver = $container->has(RouteResolverInterface::class)
+ && (
+ $routeResolverFromContainer = $container->get(RouteResolverInterface::class)
+ ) instanceof RouteResolverInterface
+ ? $routeResolverFromContainer
+ : null;
+
+ $middlewareDispatcher = $container->has(MiddlewareDispatcherInterface::class)
+ && (
+ $middlewareDispatcherFromContainer = $container->get(MiddlewareDispatcherInterface::class)
+ ) instanceof MiddlewareDispatcherInterface
+ ? $middlewareDispatcherFromContainer
+ : null;
+
+ return new App(
+ $responseFactory,
+ $container,
+ $callableResolver,
+ $routeCollector,
+ $routeResolver,
+ $middlewareDispatcher
+ );
+ }
+
+ /**
+ * @throws RuntimeException
+ */
+ public static function determineResponseFactory(): ResponseFactoryInterface
+ {
+ if (static::$responseFactory) {
+ if (static::$streamFactory) {
+ return static::attemptResponseFactoryDecoration(static::$responseFactory, static::$streamFactory);
+ }
+ return static::$responseFactory;
+ }
+
+ $psr17FactoryProvider = static::$psr17FactoryProvider ?? new Psr17FactoryProvider();
+
+ /** @var Psr17Factory $psr17factory */
+ foreach ($psr17FactoryProvider->getFactories() as $psr17factory) {
+ if ($psr17factory::isResponseFactoryAvailable()) {
+ $responseFactory = $psr17factory::getResponseFactory();
+
+ if (static::$streamFactory || $psr17factory::isStreamFactoryAvailable()) {
+ $streamFactory = static::$streamFactory ?? $psr17factory::getStreamFactory();
+ return static::attemptResponseFactoryDecoration($responseFactory, $streamFactory);
+ }
+
+ return $responseFactory;
+ }
+ }
+
+ throw new RuntimeException(
+ "Could not detect any PSR-17 ResponseFactory implementations. " .
+ "Please install a supported implementation in order to use `AppFactory::create()`. " .
+ "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
+ );
+ }
+
+ protected static function attemptResponseFactoryDecoration(
+ ResponseFactoryInterface $responseFactory,
+ StreamFactoryInterface $streamFactory
+ ): ResponseFactoryInterface {
+ if (
+ static::$slimHttpDecoratorsAutomaticDetectionEnabled
+ && SlimHttpPsr17Factory::isResponseFactoryAvailable()
+ ) {
+ return SlimHttpPsr17Factory::createDecoratedResponseFactory($responseFactory, $streamFactory);
+ }
+
+ return $responseFactory;
+ }
+
+ public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
+ {
+ static::$psr17FactoryProvider = $psr17FactoryProvider;
+ }
+
+ public static function setResponseFactory(ResponseFactoryInterface $responseFactory): void
+ {
+ static::$responseFactory = $responseFactory;
+ }
+
+ public static function setStreamFactory(StreamFactoryInterface $streamFactory): void
+ {
+ static::$streamFactory = $streamFactory;
+ }
+
+ public static function setContainer(ContainerInterface $container): void
+ {
+ static::$container = $container;
+ }
+
+ public static function setCallableResolver(CallableResolverInterface $callableResolver): void
+ {
+ static::$callableResolver = $callableResolver;
+ }
+
+ public static function setRouteCollector(RouteCollectorInterface $routeCollector): void
+ {
+ static::$routeCollector = $routeCollector;
+ }
+
+ public static function setRouteResolver(RouteResolverInterface $routeResolver): void
+ {
+ static::$routeResolver = $routeResolver;
+ }
+
+ public static function setMiddlewareDispatcher(MiddlewareDispatcherInterface $middlewareDispatcher): void
+ {
+ static::$middlewareDispatcher = $middlewareDispatcher;
+ }
+
+ public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
+ {
+ static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
new file mode 100644
index 000000000..32a548a67
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
@@ -0,0 +1,19 @@
+serverRequestCreator = $serverRequestCreator;
+ $this->serverRequestCreatorMethod = $serverRequestCreatorMethod;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function createServerRequestFromGlobals(): ServerRequestInterface
+ {
+ /** @var callable $callable */
+ $callable = [$this->serverRequestCreator, $this->serverRequestCreatorMethod];
+ return (Closure::fromCallable($callable))();
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
new file mode 100644
index 000000000..5d636318b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
@@ -0,0 +1,39 @@
+serverRequestCreator = $serverRequestCreator;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function createServerRequestFromGlobals(): ServerRequestInterface
+ {
+ if (!static::isServerRequestDecoratorAvailable()) {
+ throw new RuntimeException('The Slim-Http ServerRequest decorator is not available.');
+ }
+
+ $request = $this->serverRequestCreator->createServerRequestFromGlobals();
+
+ if (
+ !((
+ $decoratedServerRequest = new static::$serverRequestDecoratorClass($request)
+ ) instanceof ServerRequestInterface)
+ ) {
+ throw new RuntimeException(get_called_class() . ' could not instantiate a decorated server request.');
+ }
+
+ return $decoratedServerRequest;
+ }
+
+ public static function isServerRequestDecoratorAvailable(): bool
+ {
+ return class_exists(static::$serverRequestDecoratorClass);
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
new file mode 100644
index 000000000..46c46f9ce
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
@@ -0,0 +1,19 @@
+getFactories() as $psr17Factory) {
+ if ($psr17Factory::isServerRequestCreatorAvailable()) {
+ $serverRequestCreator = $psr17Factory::getServerRequestCreator();
+ return static::attemptServerRequestCreatorDecoration($serverRequestCreator);
+ }
+ }
+
+ throw new RuntimeException(
+ "Could not detect any ServerRequest creator implementations. " .
+ "Please install a supported implementation in order to use `App::run()` " .
+ "without having to pass in a `ServerRequest` object. " .
+ "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
+ );
+ }
+
+ protected static function attemptServerRequestCreatorDecoration(
+ ServerRequestCreatorInterface $serverRequestCreator
+ ): ServerRequestCreatorInterface {
+ if (
+ static::$slimHttpDecoratorsAutomaticDetectionEnabled
+ && SlimHttpServerRequestCreator::isServerRequestDecoratorAvailable()
+ ) {
+ return new SlimHttpServerRequestCreator($serverRequestCreator);
+ }
+
+ return $serverRequestCreator;
+ }
+
+ public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
+ {
+ static::$psr17FactoryProvider = $psr17FactoryProvider;
+ }
+
+ public static function setServerRequestCreator(ServerRequestCreatorInterface $serverRequestCreator): void
+ {
+ self::$serverRequestCreator = $serverRequestCreator;
+ }
+
+ public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
+ {
+ static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
deleted file mode 100644
index 42f8dde3d..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
+++ /dev/null
@@ -1,99 +0,0 @@
-displayErrorDetails = (bool) $displayErrorDetails;
- }
-
- /**
- * Write to the error log if displayErrorDetails is false
- *
- * @param \Exception|\Throwable $throwable
- *
- * @return void
- */
- protected function writeToErrorLog($throwable)
- {
- if ($this->displayErrorDetails) {
- return;
- }
-
- $message = 'Slim Application Error:' . PHP_EOL;
- $message .= $this->renderThrowableAsText($throwable);
- while ($throwable = $throwable->getPrevious()) {
- $message .= PHP_EOL . 'Previous error:' . PHP_EOL;
- $message .= $this->renderThrowableAsText($throwable);
- }
-
- $message .= PHP_EOL . 'View in rendered output by enabling the "displayErrorDetails" setting.' . PHP_EOL;
-
- $this->logError($message);
- }
-
- /**
- * Render error as Text.
- *
- * @param \Exception|\Throwable $throwable
- *
- * @return string
- */
- protected function renderThrowableAsText($throwable)
- {
- $text = sprintf('Type: %s' . PHP_EOL, get_class($throwable));
-
- if ($code = $throwable->getCode()) {
- $text .= sprintf('Code: %s' . PHP_EOL, $code);
- }
-
- if ($message = $throwable->getMessage()) {
- $text .= sprintf('Message: %s' . PHP_EOL, htmlentities($message));
- }
-
- if ($file = $throwable->getFile()) {
- $text .= sprintf('File: %s' . PHP_EOL, $file);
- }
-
- if ($line = $throwable->getLine()) {
- $text .= sprintf('Line: %s' . PHP_EOL, $line);
- }
-
- if ($trace = $throwable->getTraceAsString()) {
- $text .= sprintf('Trace: %s', $trace);
- }
-
- return $text;
- }
-
- /**
- * Wraps the error_log function so that this can be easily tested
- *
- * @param $message
- */
- protected function logError($message)
- {
- error_log($message);
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
deleted file mode 100644
index b166a1564..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-getHeaderLine('Accept');
- $selectedContentTypes = array_intersect(explode(',', $acceptHeader), $this->knownContentTypes);
-
- if (count($selectedContentTypes)) {
- return current($selectedContentTypes);
- }
-
- // handle +json and +xml specially
- if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
- $mediaType = 'application/' . $matches[1];
- if (in_array($mediaType, $this->knownContentTypes)) {
- return $mediaType;
- }
- }
-
- return 'text/html';
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
deleted file mode 100644
index dd0bc8d4e..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
+++ /dev/null
@@ -1,224 +0,0 @@
-determineContentType($request);
- switch ($contentType) {
- case 'application/json':
- $output = $this->renderJsonErrorMessage($exception);
- break;
-
- case 'text/xml':
- case 'application/xml':
- $output = $this->renderXmlErrorMessage($exception);
- break;
-
- case 'text/html':
- $output = $this->renderHtmlErrorMessage($exception);
- break;
-
- default:
- throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
- }
-
- $this->writeToErrorLog($exception);
-
- $body = new Body(fopen('php://temp', 'r+'));
- $body->write($output);
-
- return $response
- ->withStatus(500)
- ->withHeader('Content-type', $contentType)
- ->withBody($body);
- }
-
- /**
- * Render HTML error page
- *
- * @param \Exception $exception
- *
- * @return string
- */
- protected function renderHtmlErrorMessage(\Exception $exception)
- {
- $title = 'Slim Application Error';
-
- if ($this->displayErrorDetails) {
- $html = 'The application could not run because of the following error:
';
- $html .= 'Details
';
- $html .= $this->renderHtmlException($exception);
-
- while ($exception = $exception->getPrevious()) {
- $html .= 'Previous exception
';
- $html .= $this->renderHtmlExceptionOrError($exception);
- }
- } else {
- $html = 'A website error has occurred. Sorry for the temporary inconvenience.
';
- }
-
- $output = sprintf(
- "" .
- "%s%s
%s",
- $title,
- $title,
- $html
- );
-
- return $output;
- }
-
- /**
- * Render exception as HTML.
- *
- * Provided for backwards compatibility; use renderHtmlExceptionOrError().
- *
- * @param \Exception $exception
- *
- * @return string
- */
- protected function renderHtmlException(\Exception $exception)
- {
- return $this->renderHtmlExceptionOrError($exception);
- }
-
- /**
- * Render exception or error as HTML.
- *
- * @param \Exception|\Error $exception
- *
- * @return string
- */
- protected function renderHtmlExceptionOrError($exception)
- {
- if (!$exception instanceof \Exception && !$exception instanceof \Error) {
- throw new \RuntimeException("Unexpected type. Expected Exception or Error.");
- }
-
- $html = sprintf('Type: %s
', get_class($exception));
-
- if (($code = $exception->getCode())) {
- $html .= sprintf('Code: %s
', $code);
- }
-
- if (($message = $exception->getMessage())) {
- $html .= sprintf('Message: %s
', htmlentities($message));
- }
-
- if (($file = $exception->getFile())) {
- $html .= sprintf('File: %s
', $file);
- }
-
- if (($line = $exception->getLine())) {
- $html .= sprintf('Line: %s
', $line);
- }
-
- if (($trace = $exception->getTraceAsString())) {
- $html .= 'Trace
';
- $html .= sprintf('%s
', htmlentities($trace));
- }
-
- return $html;
- }
-
- /**
- * Render JSON error
- *
- * @param \Exception $exception
- *
- * @return string
- */
- protected function renderJsonErrorMessage(\Exception $exception)
- {
- $error = [
- 'message' => 'Slim Application Error',
- ];
-
- if ($this->displayErrorDetails) {
- $error['exception'] = [];
-
- do {
- $error['exception'][] = [
- 'type' => get_class($exception),
- 'code' => $exception->getCode(),
- 'message' => $exception->getMessage(),
- 'file' => $exception->getFile(),
- 'line' => $exception->getLine(),
- 'trace' => explode("\n", $exception->getTraceAsString()),
- ];
- } while ($exception = $exception->getPrevious());
- }
-
- return json_encode($error, JSON_PRETTY_PRINT);
- }
-
- /**
- * Render XML error
- *
- * @param \Exception $exception
- *
- * @return string
- */
- protected function renderXmlErrorMessage(\Exception $exception)
- {
- $xml = "\n Slim Application Error\n";
- if ($this->displayErrorDetails) {
- do {
- $xml .= " \n";
- $xml .= " " . get_class($exception) . "\n";
- $xml .= " " . $exception->getCode() . "\n";
- $xml .= " " . $this->createCdataSection($exception->getMessage()) . "\n";
- $xml .= " " . $exception->getFile() . "\n";
- $xml .= " " . $exception->getLine() . "\n";
- $xml .= " " . $this->createCdataSection($exception->getTraceAsString()) . "\n";
- $xml .= " \n";
- } while ($exception = $exception->getPrevious());
- }
- $xml .= "";
-
- return $xml;
- }
-
- /**
- * Returns a CDATA section with the given content.
- *
- * @param string $content
- * @return string
- */
- private function createCdataSection($content)
- {
- return sprintf('', str_replace(']]>', ']]]]>', $content));
- }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
new file mode 100644
index 000000000..f9606e364
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
@@ -0,0 +1,308 @@
+
+ */
+ protected array $errorRenderers = [
+ 'application/json' => JsonErrorRenderer::class,
+ 'application/xml' => XmlErrorRenderer::class,
+ 'text/xml' => XmlErrorRenderer::class,
+ 'text/html' => HtmlErrorRenderer::class,
+ 'text/plain' => PlainTextErrorRenderer::class,
+ ];
+
+ protected bool $displayErrorDetails = false;
+
+ protected bool $logErrors;
+
+ protected bool $logErrorDetails = false;
+
+ protected ?string $contentType = null;
+
+ protected ?string $method = null;
+
+ protected ServerRequestInterface $request;
+
+ protected Throwable $exception;
+
+ protected int $statusCode;
+
+ protected CallableResolverInterface $callableResolver;
+
+ protected ResponseFactoryInterface $responseFactory;
+
+ protected LoggerInterface $logger;
+
+ public function __construct(
+ CallableResolverInterface $callableResolver,
+ ResponseFactoryInterface $responseFactory,
+ ?LoggerInterface $logger = null
+ ) {
+ $this->callableResolver = $callableResolver;
+ $this->responseFactory = $responseFactory;
+ $this->logger = $logger ?: $this->getDefaultLogger();
+ }
+
+ /**
+ * Invoke error handler
+ *
+ * @param ServerRequestInterface $request The most recent Request object
+ * @param Throwable $exception The caught Exception object
+ * @param bool $displayErrorDetails Whether or not to display the error details
+ * @param bool $logErrors Whether or not to log errors
+ * @param bool $logErrorDetails Whether or not to log error details
+ */
+ public function __invoke(
+ ServerRequestInterface $request,
+ Throwable $exception,
+ bool $displayErrorDetails,
+ bool $logErrors,
+ bool $logErrorDetails
+ ): ResponseInterface {
+ $this->displayErrorDetails = $displayErrorDetails;
+ $this->logErrors = $logErrors;
+ $this->logErrorDetails = $logErrorDetails;
+ $this->request = $request;
+ $this->exception = $exception;
+ $this->method = $request->getMethod();
+ $this->statusCode = $this->determineStatusCode();
+ if ($this->contentType === null) {
+ $this->contentType = $this->determineContentType($request);
+ }
+
+ if ($logErrors) {
+ $this->writeToErrorLog();
+ }
+
+ return $this->respond();
+ }
+
+ /**
+ * Force the content type for all error handler responses.
+ *
+ * @param string|null $contentType The content type
+ */
+ public function forceContentType(?string $contentType): void
+ {
+ $this->contentType = $contentType;
+ }
+
+ protected function determineStatusCode(): int
+ {
+ if ($this->method === 'OPTIONS') {
+ return 200;
+ }
+
+ if ($this->exception instanceof HttpException) {
+ return $this->exception->getCode();
+ }
+
+ return 500;
+ }
+
+ /**
+ * Determine which content type we know about is wanted using Accept header
+ *
+ * Note: This method is a bare-bones implementation designed specifically for
+ * Slim's error handling requirements. Consider a fully-feature solution such
+ * as willdurand/negotiation for any other situation.
+ */
+ protected function determineContentType(ServerRequestInterface $request): ?string
+ {
+ $acceptHeader = $request->getHeaderLine('Accept');
+ $selectedContentTypes = array_intersect(
+ explode(',', $acceptHeader),
+ array_keys($this->errorRenderers)
+ );
+ $count = count($selectedContentTypes);
+
+ if ($count) {
+ $current = current($selectedContentTypes);
+
+ /**
+ * Ensure other supported content types take precedence over text/plain
+ * when multiple content types are provided via Accept header.
+ */
+ if ($current === 'text/plain' && $count > 1) {
+ $next = next($selectedContentTypes);
+ if (is_string($next)) {
+ return $next;
+ }
+ }
+
+ if (is_string($current)) {
+ return $current;
+ }
+ }
+
+ if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
+ $mediaType = 'application/' . $matches[1];
+ if (array_key_exists($mediaType, $this->errorRenderers)) {
+ return $mediaType;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Determine which renderer to use based on content type
+ *
+ * @throws RuntimeException
+ */
+ protected function determineRenderer(): callable
+ {
+ if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
+ $renderer = $this->errorRenderers[$this->contentType];
+ } else {
+ $renderer = $this->defaultErrorRenderer;
+ }
+
+ return $this->callableResolver->resolve($renderer);
+ }
+
+ /**
+ * Register an error renderer for a specific content-type
+ *
+ * @param string $contentType The content-type this renderer should be registered to
+ * @param ErrorRendererInterface|string|callable $errorRenderer The error renderer
+ */
+ public function registerErrorRenderer(string $contentType, $errorRenderer): void
+ {
+ $this->errorRenderers[$contentType] = $errorRenderer;
+ }
+
+ /**
+ * Set the default error renderer
+ *
+ * @param string $contentType The content type of the default error renderer
+ * @param ErrorRendererInterface|string|callable $errorRenderer The default error renderer
+ */
+ public function setDefaultErrorRenderer(string $contentType, $errorRenderer): void
+ {
+ $this->defaultErrorRendererContentType = $contentType;
+ $this->defaultErrorRenderer = $errorRenderer;
+ }
+
+ /**
+ * Set the renderer for the error logger
+ *
+ * @param ErrorRendererInterface|string|callable $logErrorRenderer
+ */
+ public function setLogErrorRenderer($logErrorRenderer): void
+ {
+ $this->logErrorRenderer = $logErrorRenderer;
+ }
+
+ /**
+ * Write to the error log if $logErrors has been set to true
+ */
+ protected function writeToErrorLog(): void
+ {
+ $renderer = $this->callableResolver->resolve($this->logErrorRenderer);
+ $error = $renderer($this->exception, $this->logErrorDetails);
+ if (!$this->displayErrorDetails) {
+ $error .= "\nTips: To display error details in HTTP response ";
+ $error .= 'set "displayErrorDetails" to true in the ErrorHandler constructor.';
+ }
+ $this->logError($error);
+ }
+
+ /**
+ * Wraps the error_log function so that this can be easily tested
+ */
+ protected function logError(string $error): void
+ {
+ $this->logger->error($error);
+ }
+
+ /**
+ * Returns a default logger implementation.
+ */
+ protected function getDefaultLogger(): LoggerInterface
+ {
+ return new Logger();
+ }
+
+ protected function respond(): ResponseInterface
+ {
+ $response = $this->responseFactory->createResponse($this->statusCode);
+ if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
+ $response = $response->withHeader('Content-type', $this->contentType);
+ } else {
+ $response = $response->withHeader('Content-type', $this->defaultErrorRendererContentType);
+ }
+
+ if ($this->exception instanceof HttpMethodNotAllowedException) {
+ $allowedMethods = implode(', ', $this->exception->getAllowedMethods());
+ $response = $response->withHeader('Allow', $allowedMethods);
+ }
+
+ $renderer = $this->determineRenderer();
+ $body = call_user_func($renderer, $this->exception, $this->displayErrorDetails);
+ if ($body !== false) {
+ /** @var string $body */
+ $response->getBody()->write($body);
+ }
+
+ return $response;
+ }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
deleted file mode 100644
index 345f0ff8c..000000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
+++ /dev/null
@@ -1,147 +0,0 @@
-getMethod() === 'OPTIONS') {
- $status = 200;
- $contentType = 'text/plain';
- $output = $this->renderPlainOptionsMessage($methods);
- } else {
- $status = 405;
- $contentType = $this->determineContentType($request);
- switch ($contentType) {
- case 'application/json':
- $output = $this->renderJsonNotAllowedMessage($methods);
- break;
-
- case 'text/xml':
- case 'application/xml':
- $output = $this->renderXmlNotAllowedMessage($methods);
- break;
-
- case 'text/html':
- $output = $this->renderHtmlNotAllowedMessage($methods);
- break;
- default:
- throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
- }
- }
-
- $body = new Body(fopen('php://temp', 'r+'));
- $body->write($output);
- $allow = implode(', ', $methods);
-
- return $response
- ->withStatus($status)
- ->withHeader('Content-type', $contentType)
- ->withHeader('Allow', $allow)
- ->withBody($body);
- }
-
- /**
- * Render PLAIN message for OPTIONS response
- *
- * @param array $methods
- * @return string
- */
- protected function renderPlainOptionsMessage($methods)
- {
- $allow = implode(', ', $methods);
-
- return 'Allowed methods: ' . $allow;
- }
-
- /**
- * Render JSON not allowed message
- *
- * @param array $methods
- * @return string
- */
- protected function renderJsonNotAllowedMessage($methods)
- {
- $allow = implode(', ', $methods);
-
- return '{"message":"Method not allowed. Must be one of: ' . $allow . '"}';
- }
-
- /**
- * Render XML not allowed message
- *
- * @param array $methods
- * @return string
- */
- protected function renderXmlNotAllowedMessage($methods)
- {
- $allow = implode(', ', $methods);
-
- return "Method not allowed. Must be one of: $allow";
- }
-
- /**
- * Render HTML not allowed message
- *
- * @param array $methods
- * @return string
- */
- protected function renderHtmlNotAllowedMessage($methods)
- {
- $allow = implode(', ', $methods);
- $output = <<
-
- Method not allowed
-
-
-
- Method not allowed
- Method not allowed. Must be one of: $allow
-
-