Fix documentation errors

Merge branch 'csfixer3'
Code style cleanup to mostly conform to PSR-12
240 changed files with 1412 additions and 1648 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,6 +11,7 @@
 /arsse.db*
 /config.php
 /.php_cs.cache
+/.php-cs-fixer.cache
 /tests/.phpunit.result.cache

 # Dependencies
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 const BASE = __DIR__.DIRECTORY_SEPARATOR;
@ -13,7 +14,10 @@ $paths = [
    BASE."arsse.php",
    BASE."RoboFile.php",
    BASE."lib",
-    BASE."tests",
+    BASE."tests/cases",
+    BASE."tests/lib",
+    BASE."tests/bootstrap.php",
+    BASE."tests/server.php",
 ];
 $rules = [
    // house rules where PSR series is silent
@ -35,6 +39,7 @@ $rules = [
    'no_blank_lines_after_phpdoc'               => true,
    'no_empty_comment'                          => true,
    'no_empty_phpdoc'                           => true,
+    'no_empty_statement'                        => true,
    'no_extra_blank_lines'                      => true, // this could probably use more configuration
    'no_mixed_echo_print'                       => ['use' => "echo"],
    'no_short_bool_cast'                        => true,
@ -48,26 +53,11 @@ $rules = [
    'pow_to_exponentiation'                     => true,
    'set_type_to_cast'                          => true,
    'standardize_not_equals'                    => true,
-    'trailing_comma_in_multiline_array'         => true,
+    'trailing_comma_in_multiline'               => ['elements' => ["arrays"]],
    'unary_operator_spaces'                     => true,
    'yoda_style'                                => false,
    // PSR standard to apply
-    '@PSR2' => true,
-    // PSR-12 rules; php-cs-fixer does not yet support PSR-12 natively
-    'compact_nullable_typehint'                 => true,
-    'declare_equal_normalize'                   => ['space' => "none"],
-    'function_typehint_space'                   => true,
-    'lowercase_cast'                            => true,
-    'lowercase_static_reference'                => true,
-    'no_alternative_syntax'                     => true,
-    'no_empty_statement'                        => true,
-    'no_leading_import_slash'                   => true,
-    'no_leading_namespace_whitespace'           => true,
-    'no_whitespace_in_blank_line'               => true,
-    'return_type_declaration'                   => ['space_before' => "none"],
-    'single_trait_insert_per_statement'         => true,
-    'short_scalar_cast'                         => true,
-    'visibility_required'                       => ['elements' => ["const", "property", "method"]],
+    '@PSR12' => true,
    // house exceptions to PSR rules
    'braces'                                    => ['position_after_functions_and_oop_constructs' => "same"],
    'function_declaration'                      => ['closure_function_spacing' => "none"],
@ -82,4 +72,4 @@ foreach ($paths as $path) {
        $finder = $finder->in($path);
    }
 }
-return \PhpCsFixer\Config::create()->setRiskyAllowed(true)->setRules($rules)->setFinder($finder);
+return (new \PhpCsFixer\Config)->setRiskyAllowed(true)->setRules($rules)->setFinder($finder);
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+Version 0.??.? (????-??-??)
+===========================
+
+Changes:
+- Require PHP 7.3
+
+Version 0.10.4 (2023-01-24)
+===========================
+
+Changes:
+- Support PHP 8.2
+
 Version 0.10.3 (2022-09-14)
 ===========================

--- a/README.md
+++ b/README.md
@ -122,5 +122,3 @@ Producing release packages is done by running `./robo package`. This performs th
 - Deletes numerous unneeded files
 - Exports the default configuration of The Arsse to a file
 - Compresses the remaining files into a tarball
- Produces a binary package for Arch Linux, if possible
- Produces source and binary packages for Debian using [pbuilder](https://pbuilder-team.pages.debian.net/pbuilder/), if possible
--- a/RoboFile.php
+++ b/RoboFile.php
@ -82,7 +82,7 @@ class RoboFile extends \Robo\Tasks {

    /** Runs the coding standards fixer */
    public function clean($opts = ['demo|d' => false]): Result {
-        $t = $this->taskExec(norm(BASE."vendor/bin/php-cs-fixer"));
+        $t = $this->taskExec(norm(BASE."vendor-bin/csfixer/vendor/bin/php-cs-fixer"));
        $t->arg("fix");
        if ($opts['demo']) {
            $t->args("--dry-run", "--diff")->option("--diff-format", "udiff");
@ -164,7 +164,7 @@ class RoboFile extends \Robo\Tasks {
            if (
                (IS_WIN && (!exec(escapeshellarg($bin)." --help $blackhole", $junk, $status) || $status))
                || (!IS_WIN && (!exec("which ".escapeshellarg($bin)." $blackhole", $junk, $status) || $status))
-             ) {
+            ) {
                return false;
            }
        }
@ -405,7 +405,7 @@ class RoboFile extends \Robo\Tasks {
     * The resultant files are suitable for offline viewing and inclusion into release builds
     */
    public function manual(array $args): Result {
-        $execpath = escapeshellarg(norm(BASE."vendor/bin/daux"));
+        $execpath = escapeshellarg(norm(BASE."vendor-bin/daux/vendor/bin/daux"));
        $t = $this->collectionBuilder();
        $t->taskExec($execpath)->arg("generate")->option("-d", BASE."manual")->args($args);
        $t->taskDeleteDir(BASE."manual/daux_libraries");
@ -416,7 +416,7 @@ class RoboFile extends \Robo\Tasks {

    /** Serves a live view of the manual using the built-in Web server */
    public function manualLive(array $args): Result {
-        $execpath = escapeshellarg(norm(BASE."vendor/bin/daux"));
+        $execpath = escapeshellarg(norm(BASE."vendor-bin/daux/vendor/bin/daux"));
        return $this->taskExec($execpath)->arg("serve")->args($args)->run();
    }

--- a/6
+++ b/6
@ -11,6 +11,12 @@ usually prudent:
  `composer install -o --no-dev`
    

+Upgrading from 0.10.4 to 0.10.?
+=============================
+
+- PHP 7.3 is now required
+
+
 Upgrading from 0.10.2 to 0.10.3
 =============================

--- a/arsse.php
+++ b/arsse.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 const BASE = __DIR__.DIRECTORY_SEPARATOR;
@ -13,7 +14,7 @@ require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
 ignore_user_abort(true);
 ini_set("memory_limit", "-1");
 ini_set("max_execution_time", "0");
-// FIXME: This is required because various dependencies have yet to adjust to PHP 8.1
+// NOTE: While running in the wild we don't want to spew deprecation warnings if users are ahead of us in PHP versions
 error_reporting(\E_ALL & ~\E_DEPRECATED);

 if (\PHP_SAPI === "cli") {
--- a/composer.json
+++ b/composer.json
@ -24,7 +24,7 @@
        "ext-hash": "*",
        "ext-filter": "*",
        "ext-dom": "*",
-        "nicolus/picofeed": "^0.1.43",
+        "nicolus/picofeed": "dev-patch-3",
        "hosteurope/password-generator": "1.*",
        "docopt/docopt": "1.*",
        "jkingweb/druuid": "3.*",
@ -35,19 +35,21 @@
        "bamarni/composer-bin-plugin": "*"
    },
    "suggest": {
-        "ext-pcntl": "To respond to signals, particular to reload configuration via SIGHUP"
+        "ext-pcntl": "To respond to signals, particularly to reload configuration via SIGHUP"
    },
    "config": {
        "platform": {
-            "php": "7.1.33"
+            "php": "7.3.33"
        },
        "allow-plugins": {
            "bamarni/composer-bin-plugin": true
        }
    },
-    "scripts": {
-        "post-install-cmd": ["@composer bin all install"],
-        "post-update-cmd": ["@composer bin all update"]
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": false,
+            "forward-command": true
+        }
    },
    "autoload": {
        "psr-4": {
@ -59,5 +61,11 @@
            "JKingWeb\\Arsse\\Test\\": "tests/lib/",
            "JKingWeb\\Arsse\\TestCase\\": "tests/cases/"
        }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/JKingweb/picoFeed-1/"
+        }
+    ]
 }
--- a/composer.lock
+++ b/composer.lock
@ -4,28 +4,25 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "2671d9010a4ac73e877838baf3586df2",
+    "content-hash": "0020e84a746531294de6556d7b35fa7a",
    "packages": [
        {
            "name": "docopt/docopt",
-            "version": "1.0.4",
+            "version": "1.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/docopt/docopt.php.git",
-                "reference": "bf3683a16e09fa1665e493eb4d5a29469e132a4f"
+                "reference": "0e3db660cf2f2eb07a83253790b7d97cdb398826"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/docopt/docopt.php/zipball/bf3683a16e09fa1665e493eb4d5a29469e132a4f",
-                "reference": "bf3683a16e09fa1665e493eb4d5a29469e132a4f",
+                "url": "https://api.github.com/repos/docopt/docopt.php/zipball/0e3db660cf2f2eb07a83253790b7d97cdb398826",
+                "reference": "0e3db660cf2f2eb07a83253790b7d97cdb398826",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.0"
            },
-            "require-dev": {
-                "phpunit/phpunit": "4.1.*"
-            },
            "type": "library",
            "autoload": {
                "classmap": [
@ -52,43 +49,55 @@
            ],
            "support": {
                "issues": "https://github.com/docopt/docopt.php/issues",
-                "source": "https://github.com/docopt/docopt.php/tree/1.0.4"
+                "source": "https://github.com/docopt/docopt.php/tree/1.0.5"
            },
-            "time": "2019-12-03T02:48:46+00:00"
+            "time": "2023-03-22T12:31:48+00:00"
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.5.8",
+            "version": "7.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.9",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17"
+                "guzzlehttp/promises": "^1.5",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
            },
            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.1",
                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.1"
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
            },
            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                "psr/log": "Required for using the Log middleware"
            },
            "type": "library",
            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                "branch-alias": {
-                    "dev-master": "6.5-dev"
+                    "dev-master": "7.5-dev"
                }
            },
            "autoload": {
@ -141,19 +150,20 @@
                }
            ],
            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
            "keywords": [
                "client",
                "curl",
                "framework",
                "http",
                "http client",
+                "psr-18",
+                "psr-7",
                "rest",
                "web service"
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
            },
            "funding": [
                {
@ -169,20 +179,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-06-20T22:16:07+00:00"
+            "time": "2022-08-28T15:39:27+00:00"
        },
        {
            "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "1.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                "shasum": ""
            },
            "require": {
@ -237,7 +247,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
            },
            "funding": [
                {
@ -253,7 +263,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
        },
        {
            "name": "guzzlehttp/psr7",
@ -539,21 +549,21 @@
        },
        {
            "name": "laminas/laminas-httphandlerrunner",
-            "version": "1.2.0",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-httphandlerrunner.git",
-                "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1"
+                "reference": "5f94e55d93f756e8ad07b9049aeb3d6d84582d0e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/e1a5dad040e0043135e8095ee27d1fbf6fb640e1",
-                "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1",
+                "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/5f94e55d93f756e8ad07b9049aeb3d6d84582d0e",
+                "reference": "5f94e55d93f756e8ad07b9049aeb3d6d84582d0e",
                "shasum": ""
            },
            "require": {
                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.1",
+                "php": "^7.3 || ~8.0.0 || ~8.1.0",
                "psr/http-message": "^1.0",
                "psr/http-message-implementation": "^1.0",
                "psr/http-server-handler": "^1.0"
@ -563,15 +573,13 @@
            },
            "require-dev": {
                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-diactoros": "^1.7 || ^2.1.1",
-                "phpunit/phpunit": "^7.0.2"
+                "laminas/laminas-diactoros": "^2.8.0",
+                "phpunit/phpunit": "^9.5.9",
+                "psalm/plugin-phpunit": "^0.16.1",
+                "vimeo/psalm": "^4.10.0"
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev",
-                    "dev-develop": "1.3.x-dev"
-                },
                "laminas": {
                    "config-provider": "Laminas\\HttpHandlerRunner\\ConfigProvider"
                }
@ -608,40 +616,37 @@
                    "type": "community_bridge"
                }
            ],
-            "time": "2020-06-03T15:52:17+00:00"
+            "time": "2021-09-22T09:17:54+00:00"
        },
        {
            "name": "laminas/laminas-xml",
-            "version": "1.2.0",
+            "version": "1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-xml.git",
-                "reference": "879cc66d1bba6a37705e98074f52a6960c220020"
+                "reference": "dcadeefdb6d7ed6b39d772b47e3845003d6ea60f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-xml/zipball/879cc66d1bba6a37705e98074f52a6960c220020",
-                "reference": "879cc66d1bba6a37705e98074f52a6960c220020",
+                "url": "https://api.github.com/repos/laminas/laminas-xml/zipball/dcadeefdb6d7ed6b39d772b47e3845003d6ea60f",
+                "reference": "dcadeefdb6d7ed6b39d772b47e3845003d6ea60f",
                "shasum": ""
            },
            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "ext-dom": "*",
+                "ext-simplexml": "*",
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
            },
-            "replace": {
-                "zendframework/zendxml": "self.version"
+            "conflict": {
+                "zendframework/zendxml": "*"
            },
            "require-dev": {
+                "ext-iconv": "*",
                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+                "phpunit/phpunit": "^9.5.8",
+                "squizlabs/php_codesniffer": "3.6.1 as 2.9999999.9999999"
            },
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev",
-                    "dev-develop": "1.3.x-dev"
-                }
-            },
            "autoload": {
                "psr-4": {
                    "Laminas\\Xml\\": "src/"
@ -660,34 +665,41 @@
            ],
            "support": {
                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-xml/",
                "forum": "https://discourse.laminas.dev",
                "issues": "https://github.com/laminas/laminas-xml/issues",
                "rss": "https://github.com/laminas/laminas-xml/releases.atom",
                "source": "https://github.com/laminas/laminas-xml"
            },
-            "time": "2019-12-31T18:05:42+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2021-11-30T02:16:35+00:00"
        },
        {
            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.1.1",
+            "version": "1.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642"
+                "reference": "88bf037259869891afce6504cacc4f8a07b24d0f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/88bf037259869891afce6504cacc4f8a07b24d0f",
+                "reference": "88bf037259869891afce6504cacc4f8a07b24d0f",
                "shasum": ""
            },
            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "squizlabs/php_codesniffer": "^3.5"
+                "phpunit/phpunit": "^9.3",
+                "psalm/plugin-phpunit": "^0.15.1",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.6"
            },
            "type": "library",
            "extra": {
@ -726,20 +738,20 @@
                    "type": "community_bridge"
                }
            ],
-            "time": "2020-09-14T14:23:00+00:00"
+            "time": "2021-12-21T14:34:37+00:00"
        },
        {
            "name": "nicolus/picofeed",
-            "version": "0.1.43",
+            "version": "dev-patch-3",
            "source": {
                "type": "git",
-                "url": "https://github.com/nicolus/picoFeed.git",
-                "reference": "e6bfe8d30009603702d1bff46a7abf8bfb25f8a8"
+                "url": "https://github.com/JKingweb/picoFeed-1.git",
+                "reference": "536911c180651fea79d6e1894a826fff6ab87a52"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nicolus/picoFeed/zipball/e6bfe8d30009603702d1bff46a7abf8bfb25f8a8",
-                "reference": "e6bfe8d30009603702d1bff46a7abf8bfb25f8a8",
+                "url": "https://api.github.com/repos/JKingweb/picoFeed-1/zipball/536911c180651fea79d6e1894a826fff6ab87a52",
+                "reference": "536911c180651fea79d6e1894a826fff6ab87a52",
                "shasum": ""
            },
            "require": {
@ -748,7 +760,7 @@
                "ext-libxml": "*",
                "ext-simplexml": "*",
                "ext-xml": "*",
-                "guzzlehttp/guzzle": "~6.0",
+                "guzzlehttp/guzzle": "^6.0|^7.0",
                "kevinrob/guzzle-cache-middleware": "^2.1",
                "laminas/laminas-xml": "^1.0",
                "php": ">=7.1",
@ -774,7 +786,6 @@
                    "PicoFeed": "lib/"
                }
            },
-            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
@ -789,9 +800,61 @@
            "description": "RSS/Atom parsing library",
            "homepage": "https://github.com/nicolus/picoFeed",
            "support": {
-                "source": "https://github.com/nicolus/picoFeed/tree/0.1.43"
+                "source": "https://github.com/JKingweb/picoFeed-1/tree/patch-3"
+            },
+            "time": "2023-03-23T01:54:27+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
            },
-            "time": "2020-09-15T07:28:23+00:00"
+            "time": "2020-06-29T06:28:15+00:00"
        },
        {
            "name": "psr/http-message",
@ -998,131 +1061,35 @@
            "time": "2019-03-08T08:55:37+00:00"
        },
        {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.26.0",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
-                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
-                },
-                {
-                    "name": "Trevor Rowbotham",
-                    "email": "trevor.rowbotham@pm.me"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "idn",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
-            },
-            "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": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "2.5-dev"
                },
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                }
            },
            "autoload": {
                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
+                    "function.php"
                ]
            },
            "notification-url": "https://packagist.org/downloads/",
@ -1139,18 +1106,10 @@
                    "homepage": "https://symfony.com/contributors"
                }
            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
            },
            "funding": [
                {
@ -1166,111 +1125,42 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
-                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "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.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
-            },
-            "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": "2022-05-24T11:49:31+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
        }
    ],
    "packages-dev": [
        {
            "name": "bamarni/composer-bin-plugin",
-            "version": "v1.5.0",
+            "version": "1.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/bamarni/composer-bin-plugin.git",
-                "reference": "49934ffea764864788334c1485fbb08a4b852031"
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/49934ffea764864788334c1485fbb08a4b852031",
-                "reference": "49934ffea764864788334c1485fbb08a4b852031",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
                "shasum": ""
            },
            "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
-                "php": "^5.5.9 || ^7.0 || ^8.0"
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2.5 || ^8.0"
            },
            "require-dev": {
-                "composer/composer": "^1.0 || ^2.0",
-                "symfony/console": "^2.5 || ^3.0 || ^4.0"
+                "composer/composer": "^2.0",
+                "ext-json": "*",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
            },
            "type": "composer-plugin",
            "extra": {
-                "class": "Bamarni\\Composer\\Bin\\Plugin"
+                "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin"
            },
            "autoload": {
                "psr-4": {
@ -1292,14 +1182,16 @@
            ],
            "support": {
                "issues": "https://github.com/bamarni/composer-bin-plugin/issues",
-                "source": "https://github.com/bamarni/composer-bin-plugin/tree/v1.5.0"
+                "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2"
            },
-            "time": "2022-02-22T21:01:25+00:00"
+            "time": "2022-10-31T08:38:03+00:00"
        }
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "nicolus/picofeed": 20
+    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
@ -1312,7 +1204,7 @@
    },
    "platform-dev": [],
    "platform-overrides": {
-        "php": "7.1.33"
+        "php": "7.3.33"
    },
    "plugin-api-version": "2.3.0"
 }
--- a/dist/arch/PKGBUILD
+++ b/dist/arch/PKGBUILD
@ -1,6 +1,6 @@
 # Maintainer: J. King <jking@jkingweb.ca>
 pkgname="arsse"
-pkgver=0.9.2
+pkgver=0.10.4
 pkgrel=1
 epoch=
 pkgdesc="Multi-protocol RSS/Atom newsfeed synchronization server"
@ -14,7 +14,7 @@ optdepends=("nginx: HTTP server"
            "apache>=2.4: HTTP server"
            "percona-server: Alternate database"
            "postgresql>=10: Alternate database"
-            "php-pgsql>=7.1: PostgreSQL database support")
+            "php-pgsql>=7.3: PostgreSQL database support")
 backup=("etc/webapps/arsse/config.php"
        "etc/php/php-fpm.d/arsse.conf"
        "etc/webapps/arsse/nginx/example.conf"
@ -24,12 +24,12 @@ backup=("etc/webapps/arsse/config.php"
        "etc/webapps/arsse/apache/example.conf"
        "etc/webapps/arsse/apache/arsse.conf"
        "etc/webapps/arsse/apache/arsse-loc.conf")
-source=("arsse-0.9.2.tar.gz")
+source=("arsse-0.10.4.tar.gz")
 md5sums=("SKIP")

 package() {
    # define runtime dependencies
-    depends=("php>=7.1" "php-intl>=7.1" "php-sqlite>=7.1" "php-fpm>=7.1")
+    depends=("php>=7.3" "php-intl>=7.3" "php-sqlite>=7.3" "php-fpm>=7.3")
    # create most directories necessary for the final package
    cd "$pkgdir"
    mkdir -p "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "usr/lib/tmpfiles.d" "etc/php/php-fpm.d" "etc/webapps/arsse"
--- a/dist/arch/PKGBUILD-git
+++ b/dist/arch/PKGBUILD-git
@ -1,6 +1,6 @@
 # Maintainer: J. King <jking@jkingweb.ca>
 pkgname="arsse-git"
-pkgver=0.9.2
+pkgver=0.10.4
 pkgrel=1
 epoch=
 pkgdesc="Multi-protocol RSS/Atom newsfeed synchronization server, bugfix-testing version"
@ -9,14 +9,14 @@ url="https://thearsse.com/"
 license=("MIT")
 provides=("arsse")
 conflicts=("arsse")
-depends=("php>=7.1" "php-intl>=7.1" "php-sqlite>=7.1")
+depends=("php>=7.3" "php-intl>=7.3" "php-sqlite>=7.3")
 makedepends=("composer" "pandoc")
 checkdepends=()
 optdepends=("nginx: HTTP server"
            "apache>=2.4: HTTP server"
            "percona-server: Alternate database"
            "postgresql>=10: Alternate database"
-            "php-pgsql>=7.1: PostgreSQL database support")
+            "php-pgsql>=7.3: PostgreSQL database support")
 backup=("etc/webapps/arsse/config.php"
        "etc/php/php-fpm.d/arsse.conf"
        "etc/webapps/arsse/nginx/example.conf"
@ -46,7 +46,7 @@ build() {

 package() {
    # define runtime dependencies
-    depends=("php>=7.1" "php-intl>=7.1" "php-sqlite>=7.1" "php-fpm>=7.1")
+    depends=("php>=7.3" "php-intl>=7.3" "php-sqlite>=7.3" "php-fpm>=7.3")
    # create most directories necessary for the final package
    cd "$pkgdir"
    mkdir -p "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "usr/lib/tmpfiles.d" "etc/php/php-fpm.d" "etc/webapps/arsse"
--- a/dist/debian/control
+++ b/dist/debian/control
@ -20,7 +20,7 @@ Description: Multi-protocol RSS/Atom newsfeed synchronization server
 server.
 Depends: ${misc:Depends},
         dbconfig-sqlite3 | dbconfig-pgsql | dbconfig-mysql | dbconfig-no-thanks,
-         php (>= 7.1.0),
+         php (>= 7.3.0),
         php-cli,
         php-intl,
         php-json,
--- a/docs/en/020_Getting_Started/020_Download_and_Installation/999_
+++ b/docs/en/020_Getting_Started/020_Download_and_Installation/999_
@ -11,7 +11,7 @@ The Arsse has the following requirements:
 - A Web server such as:
    - [Nginx](https://nginx.org)
    - [Apache HTTP server](https://httpd.apache.org) 2.4 or later
- PHP 7.1.0 or later with the following extensions:
+- PHP 7.3.0 or later with the following extensions:
    - [intl](https://php.net/manual/en/book.intl.php), [json](https://php.net/manual/en/book.json.php), [hash](https://php.net/manual/en/book.hash.php), [filter](https://php.net/manual/en/book.filter.php), and [dom](https://php.net/manual/en/book.dom.php)
    - [simplexml](https://php.net/manual/en/book.simplexml.php), and [iconv](https://php.net/manual/en/book.iconv.php)
    - One of:
--- a/lib/AbstractException.php
+++ b/lib/AbstractException.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 abstract class AbstractException extends \Exception {
--- a/lib/Arsse.php
+++ b/lib/Arsse.php
@ -4,10 +4,11 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 class Arsse {
-    public const VERSION = "0.10.3";
+    public const VERSION = "0.10.4";
    public const REQUIRED_EXTENSIONS = [
        "intl",      // as this extension is required to prepare formatted messages, its absence will throw a distinct English-only exception
        "dom",
--- a/lib/CLI.php
+++ b/lib/CLI.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 use JKingWeb\Arsse\REST\Fever\User as Fever;
--- a/lib/Conf.php
+++ b/lib/Conf.php
@ -5,14 +5,17 @@

 /** Conf class */
 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

+use AllowDynamicProperties;
 use JKingWeb\Arsse\Misc\ValueInfo as Value;

 /** Class for loading, saving, and querying configuration
 *
 * The Conf class serves both as a means of importing and querying configuration information, as well as a source for default parameters when a configuration file does not specify a value.
 * All public properties are configuration parameters that may be set by the server administrator. */
+#[AllowDynamicProperties]
 class Conf {
    /** @var string Default language to use for logging and errors */
    public $lang = "en";
--- a/lib/Conf/Exception.php
+++ b/lib/Conf/Exception.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Conf;

 class Exception extends \JKingWeb\Arsse\AbstractException {
--- a/lib/Context/AbstractContext.php
+++ b/lib/Context/AbstractContext.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 abstract class AbstractContext {
--- a/lib/Context/BooleanMembers.php
+++ b/lib/Context/BooleanMembers.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 trait BooleanMembers {
--- a/lib/Context/Context.php
+++ b/lib/Context/Context.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 class Context extends RootContext {
--- a/lib/Context/ExclusionContext.php
+++ b/lib/Context/ExclusionContext.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 class ExclusionContext extends AbstractContext {
--- a/lib/Context/ExclusionMembers.php
+++ b/lib/Context/ExclusionMembers.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 use JKingWeb\Arsse\Misc\ValueInfo;
@ -243,7 +244,6 @@ trait ExclusionMembers {
        return $this->act(__FUNCTION__, func_num_args(), $spec);
    }

-
    public function markedRange($start = null, $end = null) {
        if ($start === null && $end === null) {
            $spec = null;
--- a/lib/Context/RootContext.php
+++ b/lib/Context/RootContext.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 abstract class RootContext extends AbstractContext {
--- a/lib/Context/UnionContext.php
+++ b/lib/Context/UnionContext.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Context;

 class UnionContext extends RootContext implements \ArrayAccess, \Countable, \IteratorAggregate {
--- a/lib/Database.php
+++ b/lib/Database.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse;

 use JKingWeb\DrUUID\UUID;
@ -280,7 +281,7 @@ class Database {
    }

    /** Renames a user
-     * 
+     *
     * This does not have an effect on their numeric ID, but has a cascading effect on many tables
     */
    public function userRename(string $user, string $name): bool {
@ -337,7 +338,7 @@ class Database {
    }

    /** Retrieves any metadata associated with a user
-     * 
+     *
     * @param string $user The user whose metadata is to be retrieved
     * @param bool $includeLarge Whether to include values which can be arbitrarily large text
     */
@ -855,8 +856,8 @@ class Database {
                        sum(case when \"read\" = 1 and hidden = 0 then 1 else 0 end) as marked
                    from arsse_marks group by subscription
                ) as mark_stats on mark_stats.subscription = s.id",
-                ["str", "int"],
-                [$user, $folder]
+            ["str", "int"],
+            [$user, $folder]
        );
        $q->setWhere("s.owner = ?", ["str"], [$user]);
        $nocase = $this->db->sqlToken("nocase");
@ -1335,12 +1336,12 @@ class Database {
            "UPDATE arsse_feeds SET title = ?, source = ?, updated = CURRENT_TIMESTAMP, modified = ?, etag = ?, err_count = 0, err_msg = '', next_fetch = ?, size = ?, icon = ? WHERE id = ?",
            ["str", "str", "datetime", "strict str", "datetime", "int", "int", "int"]
        )->run(
-            $feed->data->title,
-            $feed->data->siteUrl,
+            $feed->title,
+            $feed->siteUrl,
            $feed->lastModified,
-            $feed->resource->getEtag(),
+            $feed->etag,
            $feed->nextFetch,
-            sizeof($feed->data->items),
+            sizeof($feed->items),
            $icon,
            $feedID
        );
@ -1613,26 +1614,26 @@ class Database {
            }
            // ensure any used array-type context options contain at least one member
            foreach ([
-                "articles", 
+                "articles",
                "editions",
                "subscriptions",
-                "folders", 
-                "foldersShallow", 
-                "labels", 
-                "labelNames", 
-                "tags", 
-                "tagNames", 
-                "searchTerms", 
-                "titleTerms", 
-                "authorTerms", 
+                "folders",
+                "foldersShallow",
+                "labels",
+                "labelNames",
+                "tags",
+                "tagNames",
+                "searchTerms",
+                "titleTerms",
+                "authorTerms",
                "annotationTerms",
                "modifiedRanges",
                "markedRanges",
                ] as $m) {
-                    if ($context->$m() && !$context->$m) {
-                        throw new Db\ExceptionInput("tooShort", ['field' => $m, 'action' => $this->caller(), 'min' => 1]);
-                    }
+                if ($context->$m() && !$context->$m) {
+                    throw new Db\ExceptionInput("tooShort", ['field' => $m, 'action' => $this->caller(), 'min' => 1]);
                }
+            }
            // next compute the context, supplying the query to manipulate directly
            $this->articleFilter($context, $q);
        }
@ -1921,8 +1922,8 @@ class Database {
                    touched = 1 
                where 
                    article in (select article from target_articles) 
-                    and subscription in (select distinct subscription from target_articles)", 
-                [$subq->getTypes(), "bool"], 
+                    and subscription in (select distinct subscription from target_articles)",
+                [$subq->getTypes(), "bool"],
                [$subq->getValues(), $data['read']]
            );
            $this->db->prepare($q->getQuery(), $q->getTypes())->run($q->getValues());
@ -1952,7 +1953,7 @@ class Database {
                    where 
                        article in (select article from target_articles) 
                        and subscription in (select distinct subscription from target_articles)",
-                    [$subq->getTypes(), $setTypes], 
+                    [$subq->getTypes(), $setTypes],
                    [$subq->getValues(), $setValues]
                );
                $this->db->prepare($q->getQuery(), $q->getTypes())->run($q->getValues());
--- a/lib/Db/AbstractDriver.php
+++ b/lib/Db/AbstractDriver.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 use JKingWeb\Arsse\Arsse;
--- a/lib/Db/AbstractResult.php
+++ b/lib/Db/AbstractResult.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 abstract class AbstractResult implements Result {
--- a/lib/Db/AbstractStatement.php
+++ b/lib/Db/AbstractStatement.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 use JKingWeb\Arsse\Misc\Date;
--- a/lib/Db/Driver.php
+++ b/lib/Db/Driver.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 interface Driver {
--- a/lib/Db/Exception.php
+++ b/lib/Db/Exception.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 class Exception extends \JKingWeb\Arsse\AbstractException {
--- a/lib/Db/ExceptionInput.php
+++ b/lib/Db/ExceptionInput.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 class ExceptionInput extends \JKingWeb\Arsse\AbstractException {
--- a/lib/Db/ExceptionRetry.php
+++ b/lib/Db/ExceptionRetry.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 class ExceptionRetry extends \JKingWeb\Arsse\AbstractException {
--- a/lib/Db/ExceptionTimeout.php
+++ b/lib/Db/ExceptionTimeout.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db;

 class ExceptionTimeout extends \JKingWeb\Arsse\AbstractException {
--- a/lib/Db/MySQL/Driver.php
+++ b/lib/Db/MySQL/Driver.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db\MySQL;

 use JKingWeb\Arsse\Arsse;
--- a/lib/Db/MySQL/ExceptionBuilder.php
+++ b/lib/Db/MySQL/ExceptionBuilder.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db\MySQL;

 use JKingWeb\Arsse\Db\Exception;
@ -27,7 +28,7 @@ trait ExceptionBuilder {
    public static function buildConnectionException($code, string $msg): array {
        switch ($code) {
            case 1045:
-            // @codeCoverageIgnoreStart
+                // @codeCoverageIgnoreStart
            case 1043:
            case 1044:
            case 1046:
@ -48,7 +49,7 @@ trait ExceptionBuilder {
            case 2018:
            case 2026:
            case 2028:
-            // @codeCoverageIgnoreEnd
+                // @codeCoverageIgnoreEnd
                return [Exception::class, 'connectionFailure', ['engine' => "MySQL", 'message' => $msg]];
            default:
                return [Exception::class, 'engineErrorGeneral', $msg]; // @codeCoverageIgnore
--- a/lib/Db/MySQL/PDODriver.php
+++ b/lib/Db/MySQL/PDODriver.php
@ -4,6 +4,7 @@
 * See LICENSE and AUTHORS files for details */

 declare(strict_types=1);
+
 namespace JKingWeb\Arsse\Db\MySQL;

 use JKingWeb\Arsse\Arsse;
--- a/1
+++ b/1
Author	SHA1	Message	Date
J. King	eb371b75fe	Fix documentation errors	7 hours ago
J. King	1b80ad37bc	Merge branch 'csfixer3' Code style cleanup to mostly conform to PSR-12	7 hours ago
J. King	3c83fc9139	Update php-cs-fixer rules	7 hours ago
J. King	711f87aad8	Housekeeping - Update Docopt - Switch toin-house Picofeed branch for now - Update composer-bin - Update php-cs-fixer Daux has been left as-is for now even though we're using an old version	8 hours ago
J. King	0a8d19d37d	Require PHP 7.3 This addresses the last of the deprecation warnings in PHP 8.2	2 months ago
J. King	fe06ffc176	Avoid dynamic property creation with PicoFeed This only leaves the Laminas XML deprecated behaviour to handle	2 months ago
J. King	0d6f8d2921	Avoid most deprecation warnings The Feed class sets dynamic properties on Picofeed classes; this will need to be completely rewritten. Version 1.2 of the Laminas XML class also uses a deprecated function, but upgrading it to 1.3 will require PHP 7.3.	2 months ago
J. King	92b1a840a1	Support PHP 8.2 properly	2 months ago
J. King	4080b2d09d	Apply new rules	2 years ago
J. King	73731fa9db	Fix up CS config file	2 years ago
J. King	18d296dcd6	Clean up CS fixer rules	2 years ago