From acce253d8e4db12757f349d016b963c4f07e0ce3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 17 Apr 2018 07:17:25 -0400 Subject: [PATCH] [advancedcontentfilter] Fix formatting in src/middlewares and doc/advancedcontentfilter --- .../doc/advancedcontentfilter.md | 15 +++++---------- advancedcontentfilter/src/middlewares.php | 18 +++++++++--------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/advancedcontentfilter/doc/advancedcontentfilter.md b/advancedcontentfilter/doc/advancedcontentfilter.md index 4fcaf68aa..26fa330bf 100644 --- a/advancedcontentfilter/doc/advancedcontentfilter.md +++ b/advancedcontentfilter/doc/advancedcontentfilter.md @@ -45,14 +45,11 @@ A post will be collapsed if at least one rule matches, but all matching rule nam - **booleans** - `true` and `false`. - **null** - `null`. -A backslash (``\``) must be escaped by 4 backslashes (``\\\\``) in a string -and 8 backslashes (``\\\\\\\\``) in a regex:: +A backslash (``\``) must be escaped by 4 backslashes (``\\\\``) in a string and 8 backslashes (``\\\\\\\\``) in a regex:: `"a\\\\b" matches "/^a\\\\\\\\b$/"` -Control characters (e.g. ``\n``) in expressions are replaced with -whitespace. To avoid this, escape the sequence with a single backslash -(e.g. ``\\n``). +Control characters (e.g. ``\n``) in expressions are replaced with whitespace. To avoid this, escape the sequence with a single backslash (e.g. ``\\n``). ### Supported Operators @@ -85,13 +82,11 @@ The component comes with a lot of operators: * ``>=`` (greater than or equal to) * ``matches`` (regex match) - To test if a string does *not* match a regex, use the logical ``not`` - operator in combination with the ``matches`` operator: +To test if a string does *not* match a regex, use the logical ``not`` operator in combination with the ``matches`` operator: - 'not ("foo" matches "/bar/")' +`not ("foo" matches "/bar/")` - You must use parenthesis because the unary operator ``not`` has precedence - over the binary operator ``matches``. +You must use parenthesis because the unary operator ``not`` has precedence over the binary operator ``matches``. #### Logical Operators diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php index 4cc4a1556..35153a210 100644 --- a/advancedcontentfilter/src/middlewares.php +++ b/advancedcontentfilter/src/middlewares.php @@ -5,8 +5,8 @@ $container = $slim->getContainer(); // 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; + { + $responseCode = 500; if (is_a($exception, 'Friendica\Network\HTTPException')) { $responseCode = $exception->httpcode; @@ -14,17 +14,17 @@ $container['errorHandler'] = function () { $errors['message'] = $exception->getMessage(); - $errors['responseCode'] = $responseCode; + $errors['responseCode'] = $responseCode; - return $response - ->withStatus($responseCode) - ->withJson($errors); - }; + return $response + ->withStatus($responseCode) + ->withJson($errors); + }; }; $container['notFoundHandler'] = function () { - return function () + return function () { throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Method not found')); - }; + }; };