From 62791119e02bbfb686d7d931706156da99d1872d Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Mon, 20 Feb 2023 14:25:18 -0800
Subject: [PATCH 01/17] Add advanced tools for adding clients/tokens

---
 CHANGELOG.md                                |   7 +
 ProcessIndieAuth.module.php                 | 592 +++++++++++++++++++-
 extras/templates/introspection-endpoint.php |  14 +
 views/execute-add-token.php                 |  23 +
 views/execute-clients.php                   |  31 +
 views/execute-revoke.php                    |  29 +-
 views/execute.php                           |  32 +-
 7 files changed, 698 insertions(+), 30 deletions(-)
 create mode 100644 extras/templates/introspection-endpoint.php
 create mode 100644 views/execute-add-token.php
 create mode 100644 views/execute-clients.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03be70c..9e31a4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Introspection Endpoint with HTTP Basic Authentication support
+- Admin: add clients and generate client_secrets for use with Client Credentials Flow
+- Admin: manually add a token with client_id and scopes -- for developer testing
+
+### Changed
+- Noted refresh token expiration in the list of approved applications
 
 ## [0.2.1] - 2022-08-06
 ### Added
diff --git a/ProcessIndieAuth.module.php b/ProcessIndieAuth.module.php
index 09cbaeb..647f8cb 100644
--- a/ProcessIndieAuth.module.php
+++ b/ProcessIndieAuth.module.php
@@ -85,6 +85,15 @@ public function ___install(): void
                 PRIMARY KEY (`id`)
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
 
+        $this->database->query("
+            CREATE TABLE IF NOT EXISTS `indieauth_clients` (
+                `id` int unsigned NOT NULL AUTO_INCREMENT,
+                `client_id` varchar(255) NOT NULL DEFAULT '',
+                `client_secret` varchar(255) NOT NULL DEFAULT '',
+                `redirect_uri` varchar(255) NOT NULL DEFAULT '',
+                PRIMARY KEY (`id`)
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
+
         $templates = file_get_contents(__DIR__ . '/data/templates.json');
         $this->importTemplates($templates);
 
@@ -157,6 +166,7 @@ public function ___uninstall(): void
     {
         $this->database->query("DROP TABLE IF EXISTS `indieauth_authorization_codes`");
         $this->database->query("DROP TABLE IF EXISTS `indieauth_tokens`");
+        $this->database->query("DROP TABLE IF EXISTS `indieauth_clients`");
 
         # attempt to un-publish the indieauth-metadata page
         $endpoint = $this->pages->get('template=indieauth-metadata-endpoint');
@@ -197,13 +207,13 @@ public function ___uninstall(): void
         $this->uninstallPage();
     }
 
-    public function ___execute(): array
+    public function execute(): array
     {
         $table = null;
         try {
             # get total tokens
             $statement = $this->database->query('
-                SELECT COUNT(*) FROm indieauth_tokens');
+                SELECT COUNT(*) FROM indieauth_tokens');
             $total = $statement->fetchColumn();
 
             if ($total == 0) {
@@ -233,6 +243,7 @@ public function ___execute(): array
                     ,issued_at
                     ,last_accessed
                     ,expiration
+                    ,refresh_expiration
                 FROM
                     indieauth_tokens
                 LIMIT
@@ -272,12 +283,22 @@ public function ___execute(): array
 
                 $date_expiration = '—';
                 if ($row['expiration']) {
-                    $dt = new DateTime($row['expiration']);
+                    $dt_expires = new DateTime($row['expiration']);
                     $date_expiration = sprintf('<time datetime="%s" title="%s">%s</time>',
-                        $dt->format('c'),
-                        $dt->format('F j, Y g:ia'),
-                        $dt->format('F j, Y')
+                        $dt_expires->format('c'),
+                        $dt_expires->format('F j, Y g:ia'),
+                        $dt_expires->format('F j, Y')
                     );
+
+                    if ($row['refresh_expiration']) {
+                        $dt = new DateTime($row['refresh_expiration']);
+                        $date_expiration = sprintf('<b>R:</b> <time datetime="%s" title="Expired %s but can be refreshed until %s">%s</time>',
+                            $dt->format('c'),
+                            $dt_expires->format('F j, Y g:ia'),
+                            $dt->format('F j, Y g:ia'),
+                            $dt->format('F j, Y')
+                        );
+                    }
                 }
 
                 $dt = new DateTime($row['issued_at']);
@@ -441,6 +462,352 @@ public function ___executeRevoke(): array
         }
     }
 
+    public function executeClients(): array
+    {
+        Wire::setFuel('processHeadline', 'Clients');
+        $this->breadcrumbs->add(new Breadcrumb($this->page->url, 'IndieAuth'));
+
+        $table = null;
+        try {
+            # get total clients
+            $statement = $this->database->query('
+                SELECT COUNT(*) FROM indieauth_tokens');
+            $total = $statement->fetchColumn();
+
+            if ($total == 0) {
+                return compact('table');
+            }
+
+            $input = $this->wire('input');
+
+            # set up base PageArray, used for pagination links
+            $items_per_page = 20;
+            $start = ($input->pageNum - 1) * $items_per_page;
+            $end = $input->pageNum * $items_per_page;
+
+            $results = new PageArray();
+            $results->setTotal($total);
+            $results->setLimit($items_per_page);
+            $results->setStart($start);
+
+            $statement = $this->database->query("
+                SELECT
+                    id
+                    ,client_id
+                    ,redirect_uri
+                FROM
+                    indieauth_clients
+                LIMIT
+                    {$start}, {$end}");
+
+            if ($statement->rowCount() == 0) {
+                return compact('table');
+            }
+
+            $table = $this->modules->get('MarkupAdminDataTable');
+            $table->setEncodeEntities(false);
+            $table->setResizable(true);
+            $table->headerRow([
+                'client_id',
+                'redirect_uri',
+            ]);
+
+            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+                $table->row([
+                    $row['client_id'],
+                    $row['redirect_uri'],
+                    'Regenerate Secret' => $this->page->url . 'regenerate-client-secret/' . $row['id'],
+                    'Delete' => $this->page->url . 'delete-client/' . $row['id'],
+                ]);
+            }
+
+            return compact('table', 'results');
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error getting clients overview: %s', $e->getMessage()));
+            return [];
+        }
+    }
+
+    public function executeAddClient(): string
+    {
+        Wire::setFuel('processHeadline', 'Add Client');
+        $this->breadcrumbs->add(new Breadcrumb($this->page->url, 'IndieAuth'));
+
+        $form = $this->modules->get('InputfieldForm');
+        $form->attr('action', $this->page->url . 'add-client');
+
+        $wrapper = new InputfieldWrapper();
+        $wrapper->columnWidth = 50;
+        $wrapper->importArray(
+            [
+                [
+                    'type' => 'URL',
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'description' => 'URL of client',
+                    'placeholder' => 'https://',
+                    'required' => true,
+                ],
+                [
+                    'type' => 'URL',
+                    'name' => 'redirect_uri',
+                    'label' => 'Redirect URI',
+                    'description' => 'Not currently used; may be used in the future',
+                    'placeholder' => 'https://',
+                ],
+                [
+                    'type' => 'submit',
+                    'value' => 'Submit',
+                ],
+            ]
+        );
+        $form->append($wrapper);
+
+        if ($this->input->requestMethod('POST')) {
+            $form->processInput($this->input->post);
+
+            if ($form->getErrors()) {
+                $this->error('Unable to save record. Please review the error messages below.');
+                return $form->render();
+            }
+
+            $client_id = $form->get('client_id')->value;
+
+            if ($this->doesClientIdExist($client_id)) {
+                $this->error('There is already a record for that client_id');
+                $this->session->redirect($this->page->url . 'clients', 302);
+            }
+
+            if ($client_secret = $this->addClient(compact('client_id'))) {
+                return sprintf('<h2> Client added successfully </h2> <p> Copy this secret and provide it to the client to use for authentication. This secret cannot be retrieved later, only regenerated. </p> client_secret: <code>%s</code>',
+                    $client_secret
+                );
+            }
+
+            $this->error('An unexpected error occurred');
+            $this->session->redirect($this->page->url . 'clients', 302);
+        }
+
+        return $form->render();
+    }
+
+    public function executeDeleteClient()
+    {
+        Wire::setFuel('processHeadline', 'Delete Client');
+        $this->breadcrumbs->add(new Breadcrumb($this->page->url, 'IndieAuth'));
+
+        $defaults = [];
+        if ($this->input->requestMethod('GET')) {
+            $record = $this->getClient((int) $this->input->urlSegment2);
+            if (!$record) {
+                $this->error('Invalid or missing ID in URL');
+                $this->session->redirect($this->page->url, 302);
+            }
+
+            $defaults = $record;
+        }
+
+        $form = $this->modules->get('InputfieldForm');
+        $form->attr('action', $this->page->url . 'delete-client');
+
+        $wrapper = new InputfieldWrapper();
+        $wrapper->columnWidth = 50;
+        $wrapper->importArray(
+            [
+                [
+                    'type' => 'URL',
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'collapsed' => Inputfield::collapsedNoLocked,
+                ],
+                [
+                    'type' => 'checkbox',
+                    'name' => 'delete',
+                    'label' => 'Delete this client',
+                    'required' => true,
+                ],
+                [
+                    'type' => 'hidden',
+                    'name' => 'id',
+                ],
+                [
+                    'type' => 'submit',
+                    'value' => 'Submit',
+                ],
+            ]
+        );
+
+        if ($defaults) {
+            $wrapper->populateValues($defaults);
+        }
+
+        $form->append($wrapper);
+
+        if ($this->input->requestMethod('POST')) {
+            $form->processInput($this->input->post);
+
+            if ($form->getErrors()) {
+                $this->error('Unable to delete record. Please review the error messages below.');
+                return $form->render();
+            }
+
+            if ($this->deleteClient((int) $form->get('id')->value)) {
+                $this->message('Client deleted successfully');
+                $this->session->redirect($this->page->url . 'clients', 302);
+            }
+
+            $this->error('An unexpected error occurred');
+            $this->session->redirect($this->page->url . 'clients', 302);
+        }
+
+        return $form->render();
+    }
+
+    public function executeAddToken(): array
+    {
+        Wire::setFuel('processHeadline', 'Manually Add a Token');
+        $this->breadcrumbs->add(new Breadcrumb($this->page->url, 'IndieAuth'));
+
+        $form = $this->modules->get('InputfieldForm');
+        $form->attr('action', $this->page->url . 'add-token');
+
+        $wrapper = new InputfieldWrapper();
+        $wrapper->columnWidth = 50;
+        $wrapper->importArray(
+            [
+                [
+                    'type' => 'URL',
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'description' => 'URL of client',
+                    'placeholder' => 'https://',
+                    'required' => true,
+                ],
+                [
+                    'type' => 'text',
+                    'name' => 'scope',
+                    'label' => 'Scope',
+                    'description' => 'Space-separated list of scopes',
+                    'value' => 'create',
+                    'required' => true,
+                ],
+                [
+                    'type' => 'hidden',
+                    'name' => 'id',
+                    'value' => '',
+                ],
+                [
+                    'type' => 'submit',
+                    'value' => 'Submit',
+                ],
+            ]
+        );
+        $form->append($wrapper);
+
+        if ($this->input->requestMethod('POST')) {
+            $form->processInput($this->input->post);
+
+            if ($form->getErrors()) {
+                $this->error('Unable to save record. Please review the error messages below.');
+                return $form->render();
+            }
+
+            $token_data = $this->addToken([
+                'id' => $form->get('id')->value,
+                'client_id' => $form->get('client_id')->value,
+                'scope' => $form->get('scope')->value,
+            ]);
+
+            if ($token_data) {
+                $this->message(sprintf('Access token added: %s',
+                    json_encode($token_data, JSON_PRETTY_PRINT)
+                ));
+                $this->session->redirect($this->page->url, 302);
+            }
+
+            $this->error('An unexpected error occurred');
+            $this->session->redirect($this->page->url, 302);
+        }
+
+        return compact('form');
+    }
+
+    public function executeRegenerateClientSecret()
+    {
+        Wire::setFuel('processHeadline', 'Regenerate Client Secret');
+        $this->breadcrumbs->add(new Breadcrumb($this->page->url, 'IndieAuth'));
+
+        $defaults = [];
+        if ($this->input->requestMethod('GET')) {
+            $record = $this->getClient((int) $this->input->urlSegment2);
+            if (!$record) {
+                $this->error('Invalid or missing ID in URL');
+                $this->session->redirect($this->page->url, 302);
+            }
+
+            $defaults = $record;
+        }
+
+        $form = $this->modules->get('InputfieldForm');
+        $form->attr('action', $this->page->url . 'regenerate-client-secret');
+
+        $wrapper = new InputfieldWrapper();
+        $wrapper->columnWidth = 50;
+        $wrapper->importArray(
+            [
+                [
+                    'type' => 'URL',
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'collapsed' => Inputfield::collapsedNoLocked,
+                ],
+                [
+                    'type' => 'checkbox',
+                    'name' => 'regenerate',
+                    'label' => 'Regnerate the secret for this client',
+                    'description' => 'The current client secret will stop working immediately',
+                    'required' => true,
+                ],
+                [
+                    'type' => 'hidden',
+                    'name' => 'id',
+                ],
+                [
+                    'type' => 'submit',
+                    'value' => 'Submit',
+                ],
+            ]
+        );
+
+        if ($defaults) {
+            $wrapper->populateValues($defaults);
+        }
+
+        $form->append($wrapper);
+
+        if ($this->input->requestMethod('POST')) {
+            $form->processInput($this->input->post);
+
+            if ($form->getErrors()) {
+                $this->error('Unable to save record. Please review the error messages below.');
+                return $form->render();
+            }
+
+            $id = (int) $form->get('id')->value;
+
+            if ($client_secret = $this->regenerateClientSecret($id)) {
+                return sprintf('<h2> Client secret regenerated </h2> <p> Copy this secret and provide it to the client to use for authentication. This secret cannot be retrieved later, only regenerated. </p> client_secret: <code>%s</code>',
+                    $client_secret
+                );
+            }
+
+            $this->error('An unexpected error occurred');
+            $this->session->redirect($this->page->url . 'clients', 302);
+        }
+
+        return $form->render();
+    }
+
     /**
      * Get the HTML <link> elements for authorization and token endpoints
      */
@@ -657,6 +1024,52 @@ public function tokenEndpoint(): void
         }
     }
 
+    /**
+     * Handle introspection endpoint requests
+     */
+    public function introspectionEndpoint(): void
+    {
+        $input = $this->wire('input');
+
+        if ($input->requestMethod('GET')) {
+            $this->httpResponse('Method not supported', 405, ['Allow' => 'POST']);
+        }
+
+        $client_id = $_SERVER['PHP_AUTH_USER'] ?? null;
+        $client_secret = $_SERVER['PHP_AUTH_PW'] ?? null;
+
+        if (!($client_id && $client_secret)) {
+            $this->httpResponse([
+                'error' => 'unauthorized',
+                'error_description' => 'Request must be authenticated',
+            ], 401, $this->authenticateHeaders('Basic'));
+        }
+
+        if (!$this->authenticateClient($client_id, $client_secret)) {
+            $this->httpResponse([
+                'error' => 'unauthorized',
+                'error_description' => 'Invalid authentication',
+            ], 401, $this->authenticateHeaders('Basic'));
+        }
+
+        $request = $input->post()->getArray();
+
+        $token_request = $request['token'] ?? null;
+        if (!$token_request) {
+            $this->httpResponse([
+                'error' => 'invalid_request',
+                'error_description' => 'Missing `token` parameter',
+            ]);
+        }
+
+        $response = $this->verifyToken($token_request);
+        if (!$response) {
+            $this->httpResponse(['active' => false], 200);
+        }
+
+        $this->httpResponse($response, 200);
+    }
+
     /**
      * Handle token revocation requests
      * This endpoint does not currently require authorization
@@ -1166,7 +1579,7 @@ private function addToken(array $authorization): ?array
                     ,refresh_token = ?');
 
             $statement->execute([
-                $authorization['id'],
+                $authorization['id'] ?? '',
                 substr($token, -7),
                 $authorization['client_name'] ?? '',
                 $authorization['client_logo'] ?? '',
@@ -1384,6 +1797,154 @@ public function revokeExpiredTokens()
         }
     }
 
+    /**
+     * Note: since HTTP Basic Authentication uses ":" as user/pass
+     * separator, servers cannot send their URL with scheme as part
+     * of authenticated requests. Instead they'll send just the
+     * hostname and this method will assume https:// scheme.
+     *
+     * Hopefully this is fine, since ideally no one should be using
+     * unsecure (http://) clients or endpoints.
+     */
+    private function authenticateClient(
+        string $client_id,
+        string $client_secret
+    ): bool {
+        try {
+            $client_id = 'https://' . $client_id;
+
+            $statement = $this->database->prepare('
+                SELECT
+                    id
+                FROM
+                    indieauth_clients
+                WHERE
+                    client_id = ?
+                    AND client_secret = ?');
+
+            $statement->execute([
+                $client_id,
+                hash('sha256', $client_secret)
+            ]);
+
+            if ($statement->rowCount() == 0) {
+                return false;
+            }
+
+            return true;
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error authenticating client: %s', $e->getMessage()));
+            return null;
+        }
+    }
+
+    private function doesClientIdExist(string $client_id): bool
+    {
+        try {
+            $client_id = Server::canonizeUrl($client_id);
+            $statement = $this->database->prepare('
+                SELECT
+                    id
+                FROM
+                    indieauth_clients
+                WHERE
+                    client_id = ?');
+            $statement->execute([$client_id]);
+
+            return ($statement->rowCount() > 0);
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error checking if client_id exists: %s', $e->getMessage()));
+            return false;
+        }
+    }
+
+    private function addClient(array $data): ?string
+    {
+        try {
+            $client_secret = bin2hex(random_bytes(32));
+
+            $statement = $this->database->prepare('
+                INSERT INTO indieauth_clients SET
+                    client_id = ?
+                    ,client_secret = ?
+                    ,redirect_uri = ?');
+
+            $statement->execute([
+                Server::canonizeUrl($data['client_id']),
+                hash('sha256', $client_secret),
+                $data['redirect_uri'] ?? '',
+            ]);
+
+            return $client_secret;
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error adding client: %s', $e->getMessage()));
+            return null;
+        }
+    }
+
+    private function getClient(int $id): ?array
+    {
+        try {
+            $statement = $this->database->prepare('
+                SELECT
+                    id
+                    ,client_id
+                    ,redirect_uri
+                FROM
+                    indieauth_clients
+                WHERE
+                    id = ?');
+
+            $statement->execute([$id]);
+            if ($statement->rowCount() > 0) {
+                return $statement->fetch(PDO::FETCH_ASSOC);
+            }
+
+            return null;
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error getting client: %s', $e->getMessage()));
+            return null;
+        }
+    }
+
+    private function regenerateClientSecret(int $id): ?string
+    {
+        try {
+            $client_secret = bin2hex(random_bytes(32));
+
+            $statement = $this->database->prepare('
+                UPDATE indieauth_clients SET
+                    client_secret = ?
+                WHERE
+                    id = ?');
+
+            $statement->execute([
+                hash('sha256', $client_secret),
+                $id,
+            ]);
+
+            return $client_secret;
+        } catch (PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error regenerating client secret: %s', $e->getMessage()));
+            return null;
+        }
+    }
+
+    private function deleteClient(int $id): bool
+    {
+        try {
+            $statement = $this->database->prepare('
+                DELETE FROM indieauth_clients
+                WHERE
+                    id = ?');
+
+            return $statement->execute([$id]);
+        } catch(PDOException $e) {
+            $this->log->save('indieauth', sprintf('Error deleting client: %s', $e->getMessage()));
+            return false;
+        }
+    }
+
     /**
      * Reset the IndieAuth session and redirect to the redirect_uri
      * with an access_denied error.
@@ -1437,6 +1998,19 @@ private function redirectHttpResponse(string $redirect_uri, array $queryParams):
         $this->session->redirect($url, 302);
     }
 
+    private function authenticateHeaders(string $type = 'Bearer'): array
+    {
+        return [
+            'WWW-Authenticate' => sprintf('%s realm="%s"',
+                $type,
+                $this->urls->httpRoot
+            ),
+        ];
+    }
+
+    /**
+     * @see authenticateHeaders() for 401/403 responses
+     */
     private function httpResponse($response, int $http_status = 400, array $headers = []): void
     {
         foreach ($headers as $key => $value) {
@@ -1444,10 +2018,6 @@ private function httpResponse($response, int $http_status = 400, array $headers
             header($header);
         }
 
-        if ($http_status === 401) {
-            header(sprintf('WWW-Authenticate: Bearer realm="%s"', $this->urls->httpRoot));
-        }
-
         http_response_code($http_status);
 
         if (is_array($response)) {
diff --git a/extras/templates/introspection-endpoint.php b/extras/templates/introspection-endpoint.php
new file mode 100644
index 0000000..b1c0643
--- /dev/null
+++ b/extras/templates/introspection-endpoint.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This template is part of the IndieAuth for ProcessWire module.
+ * The module should handle everything, so you should not need to
+ * modify this template.
+ */
+
+declare(strict_types=1);
+
+namespace ProcessWire;
+
+$IndieAuth = $modules->get('ProcessIndieAuth');
+$IndieAuth->introspectionEndpoint();
+
diff --git a/views/execute-add-token.php b/views/execute-add-token.php
new file mode 100644
index 0000000..08ce5c4
--- /dev/null
+++ b/views/execute-add-token.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Template for IndieAuth add token (admin)
+ *
+ * @author gRegor Morrill, https://gregorlove.com
+ * @copyright 2023 gRegor Morrill
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+declare(strict_types=1);
+
+namespace ProcessWire;
+
+?>
+
+<p> <b>Advanced:</b> only use this tool if you need to manually add and test an access token. The un-encrypted access token will be displayed on the next page. </p>
+
+<p> The access token will still encrypted in the database and cannot be retrieved later. </p>
+
+<p> This should only be used by developers while debugging. </p>
+
+<?=$form->render();?>
+
diff --git a/views/execute-clients.php b/views/execute-clients.php
new file mode 100644
index 0000000..0ef3318
--- /dev/null
+++ b/views/execute-clients.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Template for IndieAuth clients list (admin)
+ *
+ * @author gRegor Morrill, https://gregorlove.com
+ * @copyright 2023 gRegor Morrill
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+declare(strict_types=1);
+
+namespace ProcessWire;
+
+if ($table):
+?>
+
+    <p> <b>Advanced:</b> use this page if you need to set up <a href="https://www.oauth.com/oauth2-servers/access-tokens/client-credentials/" target="_blank" rel="noopener">Client Credentials</a> allowing a client to authenticate as itself instead of a user. </p>
+
+    <p> You do not need to add anything here to use IndieAuth to sign in with your domain name. </p>
+
+    <?=$table->render();?>
+    <?=$results->renderPager();?>
+
+<?php else: ?>
+
+    <p> There are no clients currently. </p>
+
+<?php endif; ?>
+
+<a href="<?=$this->page->url?>add-client" class="ui-button">Add Client</a>
+
diff --git a/views/execute-revoke.php b/views/execute-revoke.php
index 32bb87c..b881490 100644
--- a/views/execute-revoke.php
+++ b/views/execute-revoke.php
@@ -7,20 +7,25 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
+namespace ProcessWire;
+
 $client_name = ($client_name)
-	? $client_name
-	: $client_id;
+    ? $client_name
+    : $client_id;
 ?>
 
-	<p> <b>Are you sure you want to revoke this access token?</b> </p>
+<p> <b>Are you sure you want to revoke this access token?</b> </p>
+
+<p> Client:<br> <a href="<?=$client_id;?>" target="_blank" rel="noopener"><?=$client_name;?></a> </p>
+<p> Token Ending With:<br> <?=$ending;?> </p>
+<p> Scope:<br> <?=$scope;?> </p>
+<p> Issued:<br> <?=$issued_at;?> </p>
 
-	<p> Client:<br> <a href="<?=$client_id;?>" target="_blank" rel="noopener"><?=$client_name;?></a> </p>
-	<p> Token Ending With:<br> <?=$ending;?> </p>
-	<p> Scope:<br> <?=$scope;?> </p>
-	<p> Issued:<br> <?=$issued_at;?> </p>
+<form method="post" action="<?=$this->page->url;?>revoke">
+    <input type="hidden" name="id" value="<?=$id;?>">
+    <input type="submit" value="Revoke Token" class="ui-button">
+    <a href="<?=$this->page->url;?>" class="ui-button ui-priority-secondary">Cancel</a>
+</form>
 
-	<form method="post" action="<?=$this->page->url;?>revoke">
-		<input type="hidden" name="id" value="<?=$id;?>">
-		<input type="submit" value="Revoke Token" class="ui-button">
-		<a href="<?=$this->page->url;?>" class="ui-button ui-priority-secondary">Cancel</a>
-	</form>
\ No newline at end of file
diff --git a/views/execute.php b/views/execute.php
index a80f308..224b18b 100644
--- a/views/execute.php
+++ b/views/execute.php
@@ -7,11 +7,29 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-if ($table) {
-	echo '<p> You have granted access to the following applications. </p>';
-	echo $table->render();
-	echo $results->renderPager();
-} else {
-	echo '<p> There are no access tokens currently. </p>';
-}
+declare(strict_types=1);
+
+namespace ProcessWire;
+
+if ($table):
+?>
+
+    <p> You have granted access to the following applications. </p>
+    <p> An <b>R</b> in the expiration column means the access has expired, but the application can still refresh the access until the listed date. </p>
+    <?=$table->render();?>
+    <?=$results->renderPager();?>
+
+<?php else: ?>
+
+    <p> There are no access tokens currently. </p>
+
+<?php endif; ?>
+
+<details>
+    <summary>Advanced:</summary>
+    <ul>
+        <li> <a href="<?=$this->page->url?>clients">Manage Client Credentials</a> </li>
+        <li> <a href="<?=$this->page->url?>add-token">Developers: Manually Add a Token</a> </li>
+    </ul>
+</details>
 

From ed6d635868fe7a5a3b457cd5f9a2004fbf6cae4e Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Mon, 20 Feb 2023 14:36:16 -0800
Subject: [PATCH 02/17] Update firebase/php-jwt dependency

---
 composer.json                       |  2 +-
 composer.lock                       | 26 ++++++++++++++++----------
 src/IndieAuth/AuthorizationCode.php | 12 ++++++------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 4382b51..08498f8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "firebase/php-jwt": "^5.0",
+        "firebase/php-jwt": "^6.0",
         "mf2/mf2": "^0.4.6",
         "barnabywalters/mf-cleaner": "^0.1.4"
     },
diff --git a/composer.lock b/composer.lock
index 84d4591..823cb77 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eb8ecc4f7646f5206acf363f791f3868",
+    "content-hash": "062e0afbe1b2dc5ba178eec1b766f65e",
     "packages": [
         {
             "name": "barnabywalters/mf-cleaner",
@@ -52,25 +52,31 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v5.4.0",
+            "version": "v6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "d2113d9b2e0e349796e72d2a63cf9319100382d2"
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d2113d9b2e0e349796e72d2a63cf9319100382d2",
-                "reference": "d2113d9b2e0e349796e72d2a63cf9319100382d2",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.1||^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=4.8 <=9"
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^1.1",
+                "phpunit/phpunit": "^7.5||^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
             },
             "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
                 "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
             },
             "type": "library",
@@ -103,9 +109,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v5.4.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
             },
-            "time": "2021-06-23T19:00:23+00:00"
+            "time": "2023-02-09T21:01:23+00:00"
         },
         {
             "name": "mf2/mf2",
@@ -1950,5 +1956,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/IndieAuth/AuthorizationCode.php b/src/IndieAuth/AuthorizationCode.php
index 8a65855..f15b860 100644
--- a/src/IndieAuth/AuthorizationCode.php
+++ b/src/IndieAuth/AuthorizationCode.php
@@ -13,10 +13,10 @@
 namespace IndieAuth;
 
 use Exception;
-use Firebase\JWT\BeforeValidException;
-use Firebase\JWT\ExpiredException;
-use Firebase\JWT\JWT;
-use Firebase\JWT\SignatureInvalidException;
+use Firebase\JWT\{
+    JWT,
+    Key
+};
 use function ProcessWire\wire;
 
 final class AuthorizationCode
@@ -75,14 +75,14 @@ private function generate(string $secret): void
             $data['token_lifetime'] = $token_lifetime;
         }
 
-        $this->value = JWT::encode($data, $secret);
+        $this->value = JWT::encode($data, $secret, 'HS256');
     }
 
     public static function decode(string $code, string $secret): ?array
     {
         try {
             JWT::$leeway = 30;
-            $decoded = (array) JWT::decode($code, $secret, ['HS256']);
+            $decoded = (array) JWT::decode($code, new Key($secret, 'HS256'));
             return $decoded;
         } catch (Exception $e) {
             return null;

From 3f1f8ee5cbc5e6e319642a43f637577f1f987ba4 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Mon, 20 Feb 2023 14:44:10 -0800
Subject: [PATCH 03/17] Update mf2 dependencies

---
 composer.json |  4 ++--
 composer.lock | 45 +++++++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 08498f8..10d2fe4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "require": {
         "firebase/php-jwt": "^6.0",
-        "mf2/mf2": "^0.4.6",
-        "barnabywalters/mf-cleaner": "^0.1.4"
+        "mf2/mf2": "^0.5",
+        "barnabywalters/mf-cleaner": "^0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.4"
diff --git a/composer.lock b/composer.lock
index 823cb77..e47f40f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,25 +4,28 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "062e0afbe1b2dc5ba178eec1b766f65e",
+    "content-hash": "7479127af8d779a219373339e0b96058",
     "packages": [
         {
             "name": "barnabywalters/mf-cleaner",
-            "version": "v0.1.4",
+            "version": "v0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
-                "reference": "ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4"
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4",
-                "reference": "ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4",
+                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/bf86945ccb24093294bd266ee9e874917e762680",
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=7.3"
+            },
             "require-dev": {
-                "php": ">=5.3",
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "~9",
+                "vimeo/psalm": "~4"
             },
             "suggest": {
                 "mf2/mf2": "To parse microformats2 structures from (X)HTML"
@@ -30,7 +33,7 @@
             "type": "library",
             "autoload": {
                 "files": [
-                    "src/BarnabyWalters/Mf2/Functions.php"
+                    "src/functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -46,9 +49,9 @@
             "description": "Cleans up microformats2 array structures",
             "support": {
                 "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
-                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.1.4"
+                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.2.0"
             },
-            "time": "2014-10-06T23:11:15+00:00"
+            "time": "2022-11-15T20:04:09+00:00"
         },
         {
             "name": "firebase/php-jwt",
@@ -115,25 +118,27 @@
         },
         {
             "name": "mf2/mf2",
-            "version": "0.4.6",
+            "version": "v0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/microformats/php-mf2.git",
-                "reference": "00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23"
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23",
-                "reference": "00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23",
+                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/ddc56de6be62ed4a21f569de9b80e17af678ca50",
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "mf2/tests": "@dev",
-                "phpdocumentor/phpdocumentor": "v2.8.4",
-                "phpunit/phpunit": "4.8.*"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.6.2"
             },
             "suggest": {
                 "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
@@ -169,9 +174,9 @@
             ],
             "support": {
                 "issues": "https://github.com/microformats/php-mf2/issues",
-                "source": "https://github.com/microformats/php-mf2/tree/master"
+                "source": "https://github.com/microformats/php-mf2/tree/v0.5.0"
             },
-            "time": "2018-08-24T14:47:04+00:00"
+            "time": "2022-02-10T01:05:27+00:00"
         }
     ],
     "packages-dev": [

From a08455ffb97874346a32cfd6c3852633d127c8f9 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sat, 4 Nov 2023 13:34:22 -0700
Subject: [PATCH 04/17] Update tests/ClientIdTest.php

---
 tests/ClientIdTest.php | 282 ++++++++++++++++++++---------------------
 1 file changed, 138 insertions(+), 144 deletions(-)

diff --git a/tests/ClientIdTest.php b/tests/ClientIdTest.php
index 7d27fb0..5038b0d 100644
--- a/tests/ClientIdTest.php
+++ b/tests/ClientIdTest.php
@@ -2,155 +2,149 @@
 
 declare(strict_types=1);
 
-namespace ProcessWire;
+namespace IndieAuth\Tests;
 
 use PHPUnit\Framework\TestCase;
+use IndieAuth\Server;
 
 class ClientIdTest extends TestCase
 {
-	private $module;
-
-	protected function setUp(): void
-	{
-		$this->module = wire('modules')->get('IndieAuth');
-	}
-
-	public function test_has_scheme()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('example.com')
-		);
-	}
-
-	public function test_scheme_http()
-	{
-		$this->assertTrue(
-			$this->module->is_client_id_valid('http://example.com')
-		);
-	}
-
-	public function test_scheme_https()
-	{
-		$this->assertTrue(
-			$this->module->is_client_id_valid('https://example.com')
-		);
-	}
-
-	public function test_scheme_other()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('ftp://example.com')
-		);
-	}
-
-	public function test_user()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('http://user@example.com')
-		);
-	}
-
-	public function test_user_pass()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://user:pass@example.com')
-		);
-	}
-
-	public function test_dot_path()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://example.com/./')
-		);
-	}
-
-	public function test_double_dot_path()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://example.com/../')
-		);
-	}
-
-	public function test_fragment()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://example.com/#id')
-		);
-	}
-
-	public function test_ipv4()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://1.1.1.1')
-		);
-	}
-
-	public function test_ipv6()
-	{
-		$this->assertFalse(
-			$this->module->is_client_id_valid('https://[2606:4700:4700::1111]')
-		);
-	}
-
-	public function test_ipv4_loopback()
-	{
-		$this->assertTrue(
-			$this->module->is_client_id_valid('https://127.0.0.1')
-		);
-	}
-
-	public function test_ipv6_loopback()
-	{
-		$this->assertTrue(
-			$this->module->is_client_id_valid('https://[0000:0000:0000:0000:0000:0000:0000:0001]')
-		);
-	}
-
-	public function test_canonized_path()
-	{
-		$this->assertEquals(
-			$this->module->canonize_url('https://example.com'),
-			'https://example.com/'
-		);
-	}
-
-	public function test_canonized_scheme_host()
-	{
-		$this->assertEquals(
-			$this->module->canonize_url('Https://Example.Com/Path'),
-			'https://example.com/Path'
-		);
-	}
-
-	public function test_redirect_uri_scheme_mismatch()
-	{
-		$this->assertFalse(
-			$this->module->is_redirect_uri_whitelisted(
-				'http://client.example/callback',
-				'https://client.example'
-			)
-		);
-	}
-
-	public function test_redirect_uri_host_mismatch()
-	{
-		$this->assertFalse(
-			$this->module->is_redirect_uri_whitelisted(
-				'https://client.example/redirect',
-				'https://example.com'
-			)
-		);
-	}
-
-	public function test_redirect_uri_port_mismatch()
-	{
-		$this->assertFalse(
-			$this->module->is_redirect_uri_whitelisted(
-				'https://client.example/redirect',
-				'https://client.example:2083'
-			)
-		);
-	}
+    public function test_has_scheme()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('example.com')
+        );
+    }
+
+    public function test_scheme_http()
+    {
+        $this->assertTrue(
+            Server::isClientIdValid('http://example.com')
+        );
+    }
+
+    public function test_scheme_https()
+    {
+        $this->assertTrue(
+            Server::isClientIdValid('https://example.com')
+        );
+    }
+
+    public function test_scheme_other()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('ftp://example.com')
+        );
+    }
+
+    public function test_user()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('http://user@example.com')
+        );
+    }
+
+    public function test_user_pass()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://user:pass@example.com')
+        );
+    }
+
+    public function test_dot_path()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://example.com/./')
+        );
+    }
+
+    public function test_double_dot_path()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://example.com/../')
+        );
+    }
+
+    public function test_fragment()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://example.com/#id')
+        );
+    }
+
+    public function test_ipv4()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://1.1.1.1')
+        );
+    }
+
+    public function test_ipv6()
+    {
+        $this->assertFalse(
+            Server::isClientIdValid('https://[2606:4700:4700::1111]')
+        );
+    }
+
+    public function test_ipv4_loopback()
+    {
+        $this->assertTrue(
+            Server::isClientIdValid('https://127.0.0.1')
+        );
+    }
+
+    public function test_ipv6_loopback()
+    {
+        $this->assertTrue(
+            Server::isClientIdValid('https://[0000:0000:0000:0000:0000:0000:0000:0001]')
+        );
+    }
+
+    public function test_canonized_path()
+    {
+        $this->assertEquals(
+            Server::canonizeUrl('https://example.com'),
+            'https://example.com/'
+        );
+    }
+
+    public function test_canonized_scheme_host()
+    {
+        $this->assertEquals(
+            Server::canonizeUrl('Https://Example.Com/Path'),
+            'https://example.com/Path'
+        );
+    }
+
+    public function test_redirect_uri_scheme_mismatch()
+    {
+        $this->assertFalse(
+            Server::isRedirectUriAllowed(
+                'http://client.example/callback',
+                'https://client.example'
+            )
+        );
+    }
+
+    public function test_redirect_uri_host_mismatch()
+    {
+        $this->assertFalse(
+            Server::isRedirectUriAllowed(
+                'https://client.example/redirect',
+                'https://example.com'
+            )
+        );
+    }
+
+    public function test_redirect_uri_port_mismatch()
+    {
+        $this->assertFalse(
+            Server::isRedirectUriAllowed(
+                'https://client.example/redirect',
+                'https://client.example:2083'
+            )
+        );
+    }
 
 }
 

From d8af6717d1a368b39e39fc1e08996528ae743c20 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sat, 4 Nov 2023 13:35:53 -0700
Subject: [PATCH 05/17] Remove tests/ClientIdTest.php

See ServerTest.php
---
 tests/ClientIdTest.php | 150 -----------------------------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 tests/ClientIdTest.php

diff --git a/tests/ClientIdTest.php b/tests/ClientIdTest.php
deleted file mode 100644
index 5038b0d..0000000
--- a/tests/ClientIdTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace IndieAuth\Tests;
-
-use PHPUnit\Framework\TestCase;
-use IndieAuth\Server;
-
-class ClientIdTest extends TestCase
-{
-    public function test_has_scheme()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('example.com')
-        );
-    }
-
-    public function test_scheme_http()
-    {
-        $this->assertTrue(
-            Server::isClientIdValid('http://example.com')
-        );
-    }
-
-    public function test_scheme_https()
-    {
-        $this->assertTrue(
-            Server::isClientIdValid('https://example.com')
-        );
-    }
-
-    public function test_scheme_other()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('ftp://example.com')
-        );
-    }
-
-    public function test_user()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('http://user@example.com')
-        );
-    }
-
-    public function test_user_pass()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://user:pass@example.com')
-        );
-    }
-
-    public function test_dot_path()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://example.com/./')
-        );
-    }
-
-    public function test_double_dot_path()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://example.com/../')
-        );
-    }
-
-    public function test_fragment()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://example.com/#id')
-        );
-    }
-
-    public function test_ipv4()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://1.1.1.1')
-        );
-    }
-
-    public function test_ipv6()
-    {
-        $this->assertFalse(
-            Server::isClientIdValid('https://[2606:4700:4700::1111]')
-        );
-    }
-
-    public function test_ipv4_loopback()
-    {
-        $this->assertTrue(
-            Server::isClientIdValid('https://127.0.0.1')
-        );
-    }
-
-    public function test_ipv6_loopback()
-    {
-        $this->assertTrue(
-            Server::isClientIdValid('https://[0000:0000:0000:0000:0000:0000:0000:0001]')
-        );
-    }
-
-    public function test_canonized_path()
-    {
-        $this->assertEquals(
-            Server::canonizeUrl('https://example.com'),
-            'https://example.com/'
-        );
-    }
-
-    public function test_canonized_scheme_host()
-    {
-        $this->assertEquals(
-            Server::canonizeUrl('Https://Example.Com/Path'),
-            'https://example.com/Path'
-        );
-    }
-
-    public function test_redirect_uri_scheme_mismatch()
-    {
-        $this->assertFalse(
-            Server::isRedirectUriAllowed(
-                'http://client.example/callback',
-                'https://client.example'
-            )
-        );
-    }
-
-    public function test_redirect_uri_host_mismatch()
-    {
-        $this->assertFalse(
-            Server::isRedirectUriAllowed(
-                'https://client.example/redirect',
-                'https://example.com'
-            )
-        );
-    }
-
-    public function test_redirect_uri_port_mismatch()
-    {
-        $this->assertFalse(
-            Server::isRedirectUriAllowed(
-                'https://client.example/redirect',
-                'https://client.example:2083'
-            )
-        );
-    }
-
-}
-

From 7687e0e770c96dda7337318e5c0ba259787957a8 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sun, 5 Nov 2023 14:25:17 -0800
Subject: [PATCH 06/17] Scope dependencies

---
 ProcessIndieAuth.module.php         |   16 +-
 README.md                           |   23 +
 composer.json                       |   32 +-
 composer.lock                       | 2405 ++++++++++++++++++++-------
 config/php-scoper/scoper.inc.php    |   18 +
 src/IndieAuth/AuthorizationCode.php |    2 +-
 tests/AuthorizationCodeTest.php     |   67 +
 tests/ServerTest.php                |    2 +-
 8 files changed, 1920 insertions(+), 645 deletions(-)
 create mode 100644 config/php-scoper/scoper.inc.php
 create mode 100644 tests/AuthorizationCodeTest.php

diff --git a/ProcessIndieAuth.module.php b/ProcessIndieAuth.module.php
index 647f8cb..4664e2a 100644
--- a/ProcessIndieAuth.module.php
+++ b/ProcessIndieAuth.module.php
@@ -17,10 +17,16 @@
 use Exception;
 use PDO;
 use PDOException;
-use Barnabywalters\Mf2 as Mf2Helper;
-use IndieAuth\AuthorizationCode;
-use IndieAuth\Server;
-use Mf2;
+use IndieAuth\{
+    AuthorizationCode,
+    Server
+};
+use IndieAuth\Libs\{
+    Barnabywalters\Mf2 as Mf2Helper,
+    Mf2
+};
+// use IndieAuth\Libs\;
+// use function IndieAuth\Libs\Mf2\parse;
 
 class ProcessIndieAuth extends Process implements Module, ConfigurableModule
 {
@@ -48,6 +54,8 @@ public static function getModuleInfo(): array
     public function init(): void
     {
         require_once 'vendor/autoload.php';
+        // require_once 'build/vendor/scoper-autoload.php';
+        // require_once 'libs/vendor/autoload.php';
         $this->addHookAfter('Session::loginSuccess', $this, 'loginSuccess');
         if ($this->auto_revoke) {
             $this->addHook('LazyCron::every12Hours', $this, 'revokeExpiredTokens');
diff --git a/README.md b/README.md
index fbc6e9f..c1472eb 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,29 @@ If you prefer to manually install:
 
 Continue with the [Setup](#setup) steps.
 
+## Updating Dependencies
+
+This section is intended for developers. Follow these steps when preparing a new release of the module. If you run into an issue with the dependencies on your server, you can also follow these steps. Please consider filing an issue as well, in case the conflict is something I can improve in the module.
+
+1. Delete the `vendor` folder
+2. Run `composer install`
+3. Check that `libs` folder is created and not empty
+4. Run `composer install --no-dev` to remove dev dependencies
+5. Check that the `vendor` folder only has composer autoload files, no dev dependencies
+
+Thanks to [this PR](https://github.com/Automattic/sensei/pull/6614) for help setting up this process.
+
+### Testing
+
+To run unit tests, you can use a globally installed version of phpunit, or run `composer require phpunit/phpunit ^8.4` to install it temporarily.
+
+After running tests, be sure to remove phpunit and dev dependencies again:
+
+1. Run `composer remove phpunit/phpunit`
+2. Run `composer install --no-dev`
+
+This gets you back to step step 4 above.
+
 ## Changelog
 * [Changelog](CHANGELOG.md)
 
diff --git a/composer.json b/composer.json
index 10d2fe4..accbc99 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,35 @@
 {
-    "require": {
-        "firebase/php-jwt": "^6.0",
-        "mf2/mf2": "^0.5",
-        "barnabywalters/mf-cleaner": "^0.2"
-    },
     "require-dev": {
-        "phpunit/phpunit": "^8.4"
+        "mf2/mf2": "^0.5",
+        "barnabywalters/mf-cleaner": "^0.2",
+        "firebase/php-jwt": "^6.0",
+        "humbug/php-scoper": "^0.18.3"
     },
     "autoload": {
+        "classmap": [
+            "libs/"
+        ],
+        "files": [
+            "libs/mf2/mf2/Mf2/Parser.php",
+            "libs/barnabywalters/mf-cleaner/src/functions.php"
+        ],
         "psr-4": {
             "IndieAuth\\": "src/IndieAuth/"
         }
+    },
+    "scripts": {
+        "prefix-dependencies": [
+            "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --output-dir=./libs --config=config/php-scoper/scoper.inc.php --force --quiet"
+        ],
+        "pre-install-cmd": [
+            "mkdir -p libs"
+        ],
+        "pre-update-cmd": [
+            "mkdir -p libs"
+        ],
+        "post-autoload-dump": [
+            "@prefix-dependencies",
+            "composer dump-autoload --no-scripts"
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
index e47f40f..70789f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,207 +4,34 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7479127af8d779a219373339e0b96058",
+    "content-hash": "b21caa02d4ea82487e911aea860f2628",
     "packages": [
-        {
-            "name": "barnabywalters/mf-cleaner",
-            "version": "v0.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
-                "reference": "bf86945ccb24093294bd266ee9e874917e762680"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/bf86945ccb24093294bd266ee9e874917e762680",
-                "reference": "bf86945ccb24093294bd266ee9e874917e762680",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~9",
-                "vimeo/psalm": "~4"
-            },
-            "suggest": {
-                "mf2/mf2": "To parse microformats2 structures from (X)HTML"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barnaby Walters",
-                    "email": "barnaby@waterpigs.co.uk"
-                }
-            ],
-            "description": "Cleans up microformats2 array structures",
-            "support": {
-                "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
-                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.2.0"
-            },
-            "time": "2022-11-15T20:04:09+00:00"
-        },
-        {
-            "name": "firebase/php-jwt",
-            "version": "v6.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
-                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1||^8.0"
-            },
-            "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
-                "phpspec/prophecy-phpunit": "^1.1",
-                "phpunit/phpunit": "^7.5||^9.5",
-                "psr/cache": "^1.0||^2.0",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0"
-            },
-            "suggest": {
-                "ext-sodium": "Support EdDSA (Ed25519) signatures",
-                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Firebase\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Neuman Vong",
-                    "email": "neuman+pear@twilio.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Anant Narayanan",
-                    "email": "anant@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-            "homepage": "https://github.com/firebase/php-jwt",
-            "keywords": [
-                "jwt",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
-            },
-            "time": "2023-02-09T21:01:23+00:00"
-        },
-        {
-            "name": "mf2/mf2",
-            "version": "v0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/microformats/php-mf2.git",
-                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/ddc56de6be62ed4a21f569de9b80e17af678ca50",
-                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
-                "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpunit/phpunit": "^5.7",
-                "squizlabs/php_codesniffer": "^3.6.2"
-            },
-            "suggest": {
-                "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
-                "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
-            },
-            "bin": [
-                "bin/fetch-mf2",
-                "bin/parse-mf2"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Mf2/Parser.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "CC0-1.0"
-            ],
-            "authors": [
-                {
-                    "name": "Barnaby Walters",
-                    "homepage": "http://waterpigs.co.uk"
-                }
-            ],
-            "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
-            "keywords": [
-                "html",
-                "microformats",
-                "microformats 2",
-                "parser",
-                "semantic"
-            ],
-            "support": {
-                "issues": "https://github.com/microformats/php-mf2/issues",
-                "source": "https://github.com/microformats/php-mf2/tree/v0.5.0"
-            },
-            "time": "2022-02-10T01:05:27+00:00"
-        }
-    ],
-    "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -231,7 +58,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -247,41 +74,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -297,7 +125,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
             },
             "funding": [
                 {
@@ -305,20 +133,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -363,22 +191,22 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
@@ -414,384 +242,159 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2021-02-23T14:00:09+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
+            "name": "phpunit/php-code-coverage",
+            "version": "7.0.15",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "819f92bba8b001d4363065928088de22f25a3a48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48",
+                "reference": "819f92bba8b001d4363065928088de22f25a3a48",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=7.2",
+                "phpunit/php-file-iterator": "^2.0.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^3.1.3 || ^4.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^4.2.2",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.2.2"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.7.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-2.x": "2.x-dev"
+                    "dev-master": "7.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
             "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
+                "coverage",
+                "testing",
+                "xunit"
             ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15"
             },
-            "time": "2020-06-27T09:03:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-26T12:20:09+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
+            "name": "phpunit/php-file-iterator",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
+                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
                 "shasum": ""
             },
             "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
             },
-            "time": "2020-09-03T19:13:55+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-02T12:42:26+00:00"
         },
         {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
-            },
-            "time": "2020-09-17T18:55:26+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.1",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.11.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
-            },
-            "time": "2021-03-17T13:42:18+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "7.0.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c",
-                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.1 || ^4.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.7.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-12-02T13:39:03+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357",
-                "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-30T08:25:21+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "autoload": {
@@ -942,16 +545,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.17",
+            "version": "8.5.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da"
+                "reference": "622d0186707f39a4ae71df3bcf42d759bb868854"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79067856d85421c56d413bd238d4e2cd6b0e54da",
-                "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/622d0186707f39a4ae71df3bcf42d759bb868854",
+                "reference": "622d0186707f39a4ae71df3bcf42d759bb868854",
                 "shasum": ""
             },
             "require": {
@@ -963,31 +566,27 @@
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.10.0",
-                "phar-io/manifest": "^2.0.1",
+                "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.2",
-                "phpspec/prophecy": "^1.10.3",
                 "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.2",
+                "phpunit/php-file-iterator": "^2.0.4",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.2",
+                "sebastian/comparator": "^3.0.5",
                 "sebastian/diff": "^3.0.2",
                 "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.2",
+                "sebastian/exporter": "^3.1.5",
                 "sebastian/global-state": "^3.0.0",
                 "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^2.0.1",
                 "sebastian/type": "^1.1.3",
                 "sebastian/version": "^2.0.1"
             },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0.0"
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage",
+                "phpunit/php-invoker": "To allow enforcing time limits"
             },
             "bin": [
                 "phpunit"
@@ -1023,19 +622,24 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.17"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.34"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/donate.html",
+                    "url": "https://phpunit.de/sponsors.html",
                     "type": "custom"
                 },
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2021-06-23T05:12:43+00:00"
+            "time": "2023-09-19T05:20:51+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -1094,16 +698,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
+                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
                 "shasum": ""
             },
             "require": {
@@ -1156,7 +760,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5"
             },
             "funding": [
                 {
@@ -1164,20 +768,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2022-09-14T12:31:48+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae",
+                "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae",
                 "shasum": ""
             },
             "require": {
@@ -1222,7 +826,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4"
             },
             "funding": [
                 {
@@ -1230,7 +834,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2023-05-07T05:30:20+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1297,16 +901,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.3",
+            "version": "3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
                 "shasum": ""
             },
             "require": {
@@ -1315,7 +919,7 @@
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -1362,7 +966,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
             },
             "funding": [
                 {
@@ -1370,20 +974,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:47:53+00:00"
+            "time": "2022-09-14T06:00:17+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b"
+                "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b",
-                "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/66783ce213de415b451b904bfef9dda0cf9aeae0",
+                "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0",
                 "shasum": ""
             },
             "require": {
@@ -1426,7 +1030,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.3"
             },
             "funding": [
                 {
@@ -1434,7 +1038,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:43:24+00:00"
+            "time": "2023-08-02T09:23:32+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -1767,71 +1371,1182 @@
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "name": "theseer/tokenizer",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 }
             ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
-                    "url": "https://symfony.com/sponsor",
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-28T10:34:58+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "barnabywalters/mf-cleaner",
+            "version": "v0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/bf86945ccb24093294bd266ee9e874917e762680",
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~9",
+                "vimeo/psalm": "~4"
+            },
+            "suggest": {
+                "mf2/mf2": "To parse microformats2 structures from (X)HTML"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barnaby Walters",
+                    "email": "barnaby@waterpigs.co.uk"
+                }
+            ],
+            "description": "Cleans up microformats2 array structures",
+            "support": {
+                "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
+                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.2.0"
+            },
+            "time": "2022-11-15T20:04:09+00:00"
+        },
+        {
+            "name": "fidry/console",
+            "version": "0.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/console.git",
+                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/console/zipball/bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
+                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4.0 || ^8.0.0",
+                "symfony/console": "^4.4 || ^5.4 || ^6.1",
+                "symfony/event-dispatcher-contracts": "^1.0 || ^2.5 || ^3.0",
+                "symfony/service-contracts": "^1.0 || ^2.5 || ^3.0",
+                "thecodingmachine/safe": "^1.3 || ^2.0",
+                "webmozart/assert": "^1.11"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.3.0",
+                "symfony/framework-bundle": "<5.3.0",
+                "symfony/http-kernel": "<5.3.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4",
+                "composer/semver": "^3.3",
+                "ergebnis/composer-normalize": "^2.28",
+                "infection/infection": "^0.26",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.4.3",
+                "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.1",
+                "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.1",
+                "symfony/http-kernel": "^4.4 || ^5.4 || ^6.1",
+                "symfony/phpunit-bridge": "^4.4.47 || ^5.4 || ^6.0",
+                "symfony/yaml": "^4.4 || ^5.4 || ^6.1",
+                "webmozarts/strict-phpunit": "^7.3"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\Console\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Library to create CLI applications",
+            "keywords": [
+                "cli",
+                "console",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/console/issues",
+                "source": "https://github.com/theofidry/console/tree/0.5.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-18T10:49:34+00:00"
+        },
+        {
+            "name": "fidry/filesystem",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/filesystem.git",
+                "reference": "1dd372ab3eb8b84ffe9578bff576b00c9a44ee46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/filesystem/zipball/1dd372ab3eb8b84ffe9578bff576b00c9a44ee46",
+                "reference": "1dd372ab3eb8b84ffe9578bff576b00c9a44ee46",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1",
+                "symfony/filesystem": "^6.3",
+                "thecodingmachine/safe": "^2.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4",
+                "ergebnis/composer-normalize": "^2.28",
+                "infection/infection": "^0.26",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^10.3",
+                "symfony/finder": "^6.3",
+                "symfony/phpunit-bridge": "^6.2"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\FileSystem\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Symfony Filesystem with a few more utilities.",
+            "keywords": [
+                "filesystem"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/filesystem/issues",
+                "source": "https://github.com/theofidry/filesystem/tree/1.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-07T07:32:54+00:00"
+        },
+        {
+            "name": "firebase/php-jwt",
+            "version": "v6.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "f03270e63eaccf3019ef0f32849c497385774e11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11",
+                "reference": "f03270e63eaccf3019ef0f32849c497385774e11",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4||^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.9.0"
+            },
+            "time": "2023-10-05T00:24:42+00:00"
+        },
+        {
+            "name": "humbug/php-scoper",
+            "version": "0.18.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/humbug/php-scoper.git",
+                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/humbug/php-scoper/zipball/9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
+                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
+                "shasum": ""
+            },
+            "require": {
+                "fidry/console": "^0.5.0",
+                "fidry/filesystem": "^1.1",
+                "jetbrains/phpstorm-stubs": "^v2022.2",
+                "nikic/php-parser": "^4.12",
+                "php": "^8.1",
+                "symfony/console": "^5.2 || ^6.0",
+                "symfony/filesystem": "^5.2 || ^6.0",
+                "symfony/finder": "^5.2 || ^6.0",
+                "thecodingmachine/safe": "^2.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.1",
+                "ergebnis/composer-normalize": "^2.28",
+                "fidry/makefile": "^1.0",
+                "humbug/box": "^4.5.1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0",
+                "symfony/yaml": "^6.1"
+            },
+            "bin": [
+                "bin/php-scoper"
+            ],
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Humbug\\PhpScoper\\": "src/"
+                },
+                "classmap": [
+                    "vendor-hotfix/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                },
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                },
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com"
+                }
+            ],
+            "description": "Prefixes all PHP namespaces in a file or directory.",
+            "support": {
+                "issues": "https://github.com/humbug/php-scoper/issues",
+                "source": "https://github.com/humbug/php-scoper/tree/0.18.7"
+            },
+            "time": "2023-11-04T18:01:12+00:00"
+        },
+        {
+            "name": "jetbrains/phpstorm-stubs",
+            "version": "v2022.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JetBrains/phpstorm-stubs.git",
+                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/6b568c153cea002dc6fad96285c3063d07cab18d",
+                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d",
+                "shasum": ""
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "@stable",
+                "nikic/php-parser": "@stable",
+                "php": "^8.0",
+                "phpdocumentor/reflection-docblock": "@stable",
+                "phpunit/phpunit": "@stable"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "PhpStormStubsMap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "PHP runtime & extensions header files for PhpStorm",
+            "homepage": "https://www.jetbrains.com/phpstorm",
+            "keywords": [
+                "autocomplete",
+                "code",
+                "inference",
+                "inspection",
+                "jetbrains",
+                "phpstorm",
+                "stubs",
+                "type"
+            ],
+            "support": {
+                "source": "https://github.com/JetBrains/phpstorm-stubs/tree/v2022.3"
+            },
+            "time": "2022-10-17T09:21:37+00:00"
+        },
+        {
+            "name": "mf2/mf2",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/microformats/php-mf2.git",
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/ddc56de6be62ed4a21f569de9b80e17af678ca50",
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.6.2"
+            },
+            "suggest": {
+                "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
+                "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
+            },
+            "bin": [
+                "bin/fetch-mf2",
+                "bin/parse-mf2"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Mf2/Parser.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "CC0-1.0"
+            ],
+            "authors": [
+                {
+                    "name": "Barnaby Walters",
+                    "homepage": "http://waterpigs.co.uk"
+                }
+            ],
+            "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
+            "keywords": [
+                "html",
+                "microformats",
+                "microformats 2",
+                "parser",
+                "semantic"
+            ],
+            "support": {
+                "issues": "https://github.com/microformats/php-mf2/issues",
+                "source": "https://github.com/microformats/php-mf2/tree/v0.5.0"
+            },
+            "time": "2022-02-10T01:05:27+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
+            },
+            "time": "2023-08-13T19:53:39+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v6.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/lock": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v6.3.4"
+            },
+            "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-08-16T10:10:12+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "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": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "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": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v6.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+            },
+            "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-06-01T08:30:39+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v6.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v6.3.5"
+            },
+            "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-09-26T12:56:25+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.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": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "875e90aeea2777b6f135677f618529449334a612"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
+                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "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 for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
                     "type": "custom"
                 },
                 {
@@ -1843,75 +2558,499 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
-            "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.2 || ^8.0"
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
-                    "src/"
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/theseer",
+                    "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-mbstring",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "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 for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.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": "2023-07-28T09:04:16+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^2.0"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "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": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v6.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/intl": "^6.2",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v6.3.5"
+            },
+            "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-09-18T10:38:32+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "thecodingmachine/phpstan-strict-rules": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
                 }
+            },
+            "autoload": {
+                "files": [
+                    "deprecated/apc.php",
+                    "deprecated/array.php",
+                    "deprecated/datetime.php",
+                    "deprecated/libevent.php",
+                    "deprecated/misc.php",
+                    "deprecated/password.php",
+                    "deprecated/mssql.php",
+                    "deprecated/stats.php",
+                    "deprecated/strings.php",
+                    "lib/special_cases.php",
+                    "deprecated/mysqli.php",
+                    "generated/apache.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/calendar.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gettext.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/inotify.php",
+                    "generated/json.php",
+                    "generated/ldap.php",
+                    "generated/libxml.php",
+                    "generated/lzf.php",
+                    "generated/mailparse.php",
+                    "generated/mbstring.php",
+                    "generated/misc.php",
+                    "generated/mysql.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php"
+                ],
+                "classmap": [
+                    "lib/DateTime.php",
+                    "lib/DateTimeImmutable.php",
+                    "lib/Exceptions/",
+                    "deprecated/Exceptions/",
+                    "generated/Exceptions/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "support": {
+                "issues": "https://github.com/thecodingmachine/safe/issues",
+                "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0"
+            },
+            "time": "2023-04-05T11:54:14+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
@@ -1949,9 +3088,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
             },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2022-06-03T18:03:27+00:00"
         }
     ],
     "aliases": [],
diff --git a/config/php-scoper/scoper.inc.php b/config/php-scoper/scoper.inc.php
new file mode 100644
index 0000000..702f3ff
--- /dev/null
+++ b/config/php-scoper/scoper.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types = 1);
+
+// scoper.inc.php
+
+use Isolated\Symfony\Component\Finder\Finder;
+
+return [
+    'prefix'  => 'IndieAuth\\Libs',
+
+    'finders' => [
+        Finder::create()->files()->in( 'vendor/mf2/mf2' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+        Finder::create()->files()->in( 'vendor/barnabywalters/mf-cleaner' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+        Finder::create()->files()->in( 'vendor/firebase/php-jwt' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+    ],
+];
+
diff --git a/src/IndieAuth/AuthorizationCode.php b/src/IndieAuth/AuthorizationCode.php
index f15b860..c5f6af7 100644
--- a/src/IndieAuth/AuthorizationCode.php
+++ b/src/IndieAuth/AuthorizationCode.php
@@ -13,7 +13,7 @@
 namespace IndieAuth;
 
 use Exception;
-use Firebase\JWT\{
+use IndieAuth\Libs\Firebase\JWT\{
     JWT,
     Key
 };
diff --git a/tests/AuthorizationCodeTest.php b/tests/AuthorizationCodeTest.php
new file mode 100644
index 0000000..9b3a3f7
--- /dev/null
+++ b/tests/AuthorizationCodeTest.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IndieAuth\Tests;
+
+use IndieAuth\AuthorizationCode;
+use PHPUnit\Framework\TestCase;
+
+class AuthorizationCodeTest extends TestCase
+{
+    public function testGenerate()
+    {
+        $client_id = 'https://example.com/';
+        $redirect_uri = 'https://example.com/redirect';
+        $scope = 'read';
+
+    	$AuthorizationCode = AuthorizationCode::fromRequest([
+    		'client_id' => $client_id,
+    		'redirect_uri' => $redirect_uri,
+            'scope' => $scope,
+    	], 'secret');
+
+        # code_id is 8 bytes, returned in hex, so expect 16 bytes
+        $this->assertEquals(16, mb_strlen($AuthorizationCode->code_id));
+
+        $this->assertArrayHasKey('client_id', $AuthorizationCode->request);
+        $this->assertArrayHasKey('redirect_uri', $AuthorizationCode->request);
+        $this->assertArrayHasKey('scope', $AuthorizationCode->request);
+
+        $this->assertEquals($client_id, $AuthorizationCode->request['client_id']);
+        $this->assertEquals($redirect_uri, $AuthorizationCode->request['redirect_uri']);
+        $this->assertEquals($scope, $AuthorizationCode->request['scope']);
+
+        $this->assertNotEmpty($AuthorizationCode->value);
+    }
+
+    public function testDecode()
+    {
+        $client_id = 'https://another.example.com/';
+        $redirect_uri = 'https://another.example.com/redirect';
+        $scope = 'read';
+        $secret = 'secret2';
+
+        $AuthorizationCode = AuthorizationCode::fromRequest([
+            'client_id' => $client_id,
+            'redirect_uri' => $redirect_uri,
+            'scope' => $scope,
+        ], $secret);
+
+        $decoded = AuthorizationCode::decode(
+            $AuthorizationCode->value,
+            $secret);
+
+        # code_id is 8 bytes, returned in hex, so expect 16 bytes
+        $this->assertEquals(16, mb_strlen($decoded['id']));
+
+        $this->assertArrayHasKey('client_id', $decoded);
+        $this->assertArrayHasKey('redirect_uri', $decoded);
+        $this->assertArrayHasKey('scope', $decoded);
+
+        $this->assertEquals($client_id, $decoded['client_id']);
+        $this->assertEquals($redirect_uri, $decoded['redirect_uri']);
+        $this->assertEquals($scope, $decoded['scope']);
+    }
+}
+
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 0e22281..8eabfa2 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ProcessWire;
+namespace IndieAuth\Tests;
 
 use IndieAuth\Server;
 use PHPUnit\Framework\TestCase;

From 416ab00d34e6781a044b10dbed2892969286a0d9 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sun, 5 Nov 2023 14:30:26 -0800
Subject: [PATCH 07/17] Add scoped dependencies

Remove previous dependencies from /vendor
---
 libs/barnabywalters/mf-cleaner/composer.json  |   27 +
 .../mf-cleaner/src/functions.php              |  712 ++++
 .../mf-cleaner/tests/CleanerTest.php          |  434 ++
 {vendor => libs}/firebase/php-jwt/LICENSE     |    0
 .../firebase/php-jwt/composer.json            |   20 +-
 .../php-jwt/src/BeforeValidException.php      |   17 +
 libs/firebase/php-jwt/src/CachedKeySet.php    |  227 ++
 .../firebase/php-jwt/src/ExpiredException.php |   17 +
 libs/firebase/php-jwt/src/JWK.php             |  268 ++
 libs/firebase/php-jwt/src/JWT.php             |  572 +++
 .../src/JWTExceptionWithPayloadInterface.php  |   21 +
 libs/firebase/php-jwt/src/Key.php             |   51 +
 .../php-jwt/src/SignatureInvalidException.php |    3 +-
 libs/mf2/mf2/Mf2/Parser.php                   | 1800 ++++++++
 libs/mf2/mf2/composer.json                    |   45 +
 .../mf2/tests/Mf2/ClassicMicroformatsTest.php |  962 +++++
 .../tests/Mf2/CombinedMicroformatsTest.php    |  415 ++
 .../tests/Mf2/MicroformatsTestSuiteTest.php   |  140 +
 .../Mf2/MicroformatsWikiExamplesTest.php      |  196 +
 libs/mf2/mf2/tests/Mf2/ParseDTTest.php        |  510 +++
 libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php    |   40 +
 libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php   |  389 ++
 libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php  |  253 ++
 libs/mf2/mf2/tests/Mf2/ParsePTest.php         |  131 +
 libs/mf2/mf2/tests/Mf2/ParseUTest.php         |  319 ++
 .../tests/Mf2/ParseValueClassTitleTest.php    |  100 +
 libs/mf2/mf2/tests/Mf2/ParserTest.php         |  791 ++++
 libs/mf2/mf2/tests/Mf2/PlainTextTest.php      |   24 +
 libs/mf2/mf2/tests/Mf2/RelTest.php            |  211 +
 libs/mf2/mf2/tests/Mf2/URLTest.php            |  187 +
 libs/mf2/mf2/tests/Mf2/bootstrap.php          |    5 +
 phpunit.xml                                   |    4 +
 vendor/autoload.php                           |   20 +-
 vendor/barnabywalters/mf-cleaner/.gitignore   |    6 -
 vendor/barnabywalters/mf-cleaner/README.md    |  111 -
 .../barnabywalters/mf-cleaner/composer.json   |   23 -
 .../barnabywalters/mf-cleaner/composer.lock   |  601 ---
 .../mf-cleaner/nbproject/project.properties   |   11 -
 .../mf-cleaner/nbproject/project.xml          |    9 -
 vendor/barnabywalters/mf-cleaner/phpunit.xml  |   29 -
 .../src/BarnabyWalters/Mf2/Functions.php      |  330 --
 .../mf-cleaner/test/CleanerTest.php           |  386 --
 .../mf-cleaner/test/bootstrap.php             |    5 -
 vendor/bin/fetch-mf2                          |   40 -
 vendor/bin/parse-mf2                          |   37 -
 vendor/composer/ClassLoader.php               |  198 +-
 vendor/composer/InstalledVersions.php         |  585 +--
 vendor/composer/autoload_classmap.php         |   28 +-
 vendor/composer/autoload_files.php            |    6 +-
 vendor/composer/autoload_namespaces.php       |    2 +-
 vendor/composer/autoload_psr4.php             |    3 +-
 vendor/composer/autoload_real.php             |   57 +-
 vendor/composer/autoload_static.php           |   46 +-
 vendor/composer/installed.json                |  173 +-
 vendor/composer/installed.php                 |   68 +-
 vendor/composer/platform_check.php            |   26 -
 vendor/firebase/php-jwt/README.md             |  282 --
 .../php-jwt/src/BeforeValidException.php      |    7 -
 .../firebase/php-jwt/src/ExpiredException.php |    7 -
 vendor/firebase/php-jwt/src/JWK.php           |  172 -
 vendor/firebase/php-jwt/src/JWT.php           |  544 ---
 vendor/mf2/mf2/.editorconfig                  |    7 -
 vendor/mf2/mf2/.gitignore                     |    7 -
 vendor/mf2/mf2/.travis.yml                    |   15 -
 vendor/mf2/mf2/LICENSE.md                     |   36 -
 vendor/mf2/mf2/Mf2/Parser.php                 | 2313 -----------
 vendor/mf2/mf2/README.md                      |  645 ---
 vendor/mf2/mf2/bin/fetch-mf2                  |   40 -
 vendor/mf2/mf2/bin/parse-mf2                  |   37 -
 vendor/mf2/mf2/composer.json                  |   29 -
 vendor/mf2/mf2/composer.lock                  | 3619 -----------------
 vendor/mf2/mf2/phpunit.xml                    |    8 -
 72 files changed, 9517 insertions(+), 9942 deletions(-)
 create mode 100644 libs/barnabywalters/mf-cleaner/composer.json
 create mode 100644 libs/barnabywalters/mf-cleaner/src/functions.php
 create mode 100644 libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
 rename {vendor => libs}/firebase/php-jwt/LICENSE (100%)
 rename {vendor => libs}/firebase/php-jwt/composer.json (52%)
 create mode 100644 libs/firebase/php-jwt/src/BeforeValidException.php
 create mode 100644 libs/firebase/php-jwt/src/CachedKeySet.php
 create mode 100644 libs/firebase/php-jwt/src/ExpiredException.php
 create mode 100644 libs/firebase/php-jwt/src/JWK.php
 create mode 100644 libs/firebase/php-jwt/src/JWT.php
 create mode 100644 libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
 create mode 100644 libs/firebase/php-jwt/src/Key.php
 rename {vendor => libs}/firebase/php-jwt/src/SignatureInvalidException.php (58%)
 create mode 100644 libs/mf2/mf2/Mf2/Parser.php
 create mode 100644 libs/mf2/mf2/composer.json
 create mode 100644 libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseDTTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParsePTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseUTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/ParserTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/PlainTextTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/RelTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/URLTest.php
 create mode 100644 libs/mf2/mf2/tests/Mf2/bootstrap.php
 create mode 100644 phpunit.xml
 delete mode 100644 vendor/barnabywalters/mf-cleaner/.gitignore
 delete mode 100644 vendor/barnabywalters/mf-cleaner/README.md
 delete mode 100644 vendor/barnabywalters/mf-cleaner/composer.json
 delete mode 100644 vendor/barnabywalters/mf-cleaner/composer.lock
 delete mode 100644 vendor/barnabywalters/mf-cleaner/nbproject/project.properties
 delete mode 100644 vendor/barnabywalters/mf-cleaner/nbproject/project.xml
 delete mode 100644 vendor/barnabywalters/mf-cleaner/phpunit.xml
 delete mode 100644 vendor/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php
 delete mode 100644 vendor/barnabywalters/mf-cleaner/test/CleanerTest.php
 delete mode 100644 vendor/barnabywalters/mf-cleaner/test/bootstrap.php
 delete mode 100644 vendor/bin/fetch-mf2
 delete mode 100644 vendor/bin/parse-mf2
 delete mode 100644 vendor/composer/platform_check.php
 delete mode 100644 vendor/firebase/php-jwt/README.md
 delete mode 100644 vendor/firebase/php-jwt/src/BeforeValidException.php
 delete mode 100644 vendor/firebase/php-jwt/src/ExpiredException.php
 delete mode 100644 vendor/firebase/php-jwt/src/JWK.php
 delete mode 100644 vendor/firebase/php-jwt/src/JWT.php
 delete mode 100644 vendor/mf2/mf2/.editorconfig
 delete mode 100644 vendor/mf2/mf2/.gitignore
 delete mode 100644 vendor/mf2/mf2/.travis.yml
 delete mode 100644 vendor/mf2/mf2/LICENSE.md
 delete mode 100644 vendor/mf2/mf2/Mf2/Parser.php
 delete mode 100644 vendor/mf2/mf2/README.md
 delete mode 100644 vendor/mf2/mf2/bin/fetch-mf2
 delete mode 100644 vendor/mf2/mf2/bin/parse-mf2
 delete mode 100644 vendor/mf2/mf2/composer.json
 delete mode 100644 vendor/mf2/mf2/composer.lock
 delete mode 100644 vendor/mf2/mf2/phpunit.xml

diff --git a/libs/barnabywalters/mf-cleaner/composer.json b/libs/barnabywalters/mf-cleaner/composer.json
new file mode 100644
index 0000000..717afcf
--- /dev/null
+++ b/libs/barnabywalters/mf-cleaner/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "barnabywalters\/mf-cleaner",
+    "description": "Cleans up microformats2 array structures",
+    "require": {
+        "php": ">=7.3"
+    },
+    "require-dev": {
+        "phpunit\/phpunit": "~9",
+        "vimeo\/psalm": "~4"
+    },
+    "autoload": {
+        "files": [
+            "src\/functions.php"
+        ]
+    },
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Barnaby Walters",
+            "email": "barnaby@waterpigs.co.uk"
+        }
+    ],
+    "suggest": {
+        "mf2\/mf2": "To parse microformats2 structures from (X)HTML"
+    },
+    "minimum-stability": "dev"
+}
\ No newline at end of file
diff --git a/libs/barnabywalters/mf-cleaner/src/functions.php b/libs/barnabywalters/mf-cleaner/src/functions.php
new file mode 100644
index 0000000..7073a2c
--- /dev/null
+++ b/libs/barnabywalters/mf-cleaner/src/functions.php
@@ -0,0 +1,712 @@
+<?php
+
+/**
+ * @file functions.php provides utility functions for processing and validating microformats
+ * $mf is generally expected to be an array although some functions can verify this, as well.
+ * @link microformats.org/wiki/microformats2
+ */
+namespace IndieAuth\Libs\BarnabyWalters\Mf2;
+
+use DateTime;
+use Exception;
+/**
+ * Iterates over array keys, returns true if has numeric keys.
+ * @param array $arr
+ * @return bool
+ * @internal
+ */
+function hasNumericKeys(array $arr) : bool
+{
+    foreach ($arr as $key => $val) {
+        if (\is_numeric($key)) {
+            return \true;
+        }
+    }
+    return \false;
+}
+/**
+ * Verifies if $mf is an array without numeric keys, and has a 'properties' key.
+ * @param $mf
+ * @return bool
+ * @internal
+ */
+function isMicroformat($mf) : bool
+{
+    return \is_array($mf) and !hasNumericKeys($mf) and !empty($mf['type']) and isset($mf['properties']);
+}
+/**
+ * Verifies if $mf has an 'items' key which is also an array, returns true.
+ * @param $mf
+ * @return bool
+ * @internal
+ */
+function isMicroformatCollection($mf) : bool
+{
+    return \is_array($mf) and isset($mf['items']) and \is_array($mf['items']);
+}
+/**
+ * Verifies if $p is an array without numeric keys and has key 'value' and 'html' set.
+ * @param $p
+ * @return bool
+ * @internal
+ */
+function isEmbeddedHtml($p) : bool
+{
+    return \is_array($p) and !hasNumericKeys($p) and isset($p['value']) and isset($p['html']);
+}
+/**
+ * Checks to see if the passed value is an img-alt structure.
+ * @param $p
+ * @return bool
+ * @internal
+ */
+function isImgAlt($p) : bool
+{
+    return \is_array($p) and !hasNumericKeys($p) and isset($p['value']) and isset($p['alt']);
+}
+/**
+ * Verifies if property named $propName is in array $mf.
+ * @param array $mf
+ * @param $propName
+ * @return bool
+ * @internal
+ */
+function hasProp(array $mf, $propName) : bool
+{
+    return !empty($mf['properties'][$propName]) and \is_array($mf['properties'][$propName]);
+}
+/**
+ * shortcut for getPlaintext.
+ * @deprecated use getPlaintext from now on
+ * @param array $mf
+ * @param $propName
+ * @param null|string $fallback
+ * @return mixed|null
+ * @internal
+ */
+function getProp(array $mf, $propName, $fallback = null)
+{
+    return getPlaintext($mf, $propName, $fallback);
+}
+/**
+ * If $v is a microformat, embedded html, or img-alt structure, return $v['value']. Else return v.
+ * @param $v
+ * @return mixed
+ * @internal
+ */
+function toPlaintext($v)
+{
+    if (isMicroformat($v) or isEmbeddedHtml($v) or isImgAlt($v)) {
+        return $v['value'];
+    }
+    return $v;
+}
+/**
+ * Returns plaintext of $propName with optional $fallback
+ * @param array $mf
+ * @param $propName
+ * @param null|string $fallback
+ * @return mixed|null
+ * @link http://php.net/manual/en/function.current.php
+ * @internal
+ */
+function getPlaintext(array $mf, $propName, $fallback = null)
+{
+    if (!empty($mf['properties'][$propName]) and \is_array($mf['properties'][$propName])) {
+        return toPlaintext(\current($mf['properties'][$propName]));
+    }
+    return $fallback;
+}
+/**
+ * Converts $propName in $mf into array_map plaintext, or $fallback if not valid.
+ * @param array $mf
+ * @param $propName
+ * @param mixed $fallback default null
+ * @return mixed
+ * @internal
+ */
+function getPlaintextArray(array $mf, $propName, $fallback = null)
+{
+    if (!empty($mf['properties'][$propName]) and \is_array($mf['properties'][$propName])) {
+        return \array_map(__NAMESPACE__ . '\\toPlaintext', $mf['properties'][$propName]);
+    }
+    return $fallback;
+}
+/**
+ * Returns ['html'] element of $v, or ['value'] or just $v, in order of availablility.
+ * @param $v
+ * @return mixed
+ * @internal
+ */
+function toHtml($v)
+{
+    if (isEmbeddedHtml($v)) {
+        return $v['html'];
+    } elseif (isMicroformat($v)) {
+        return \htmlspecialchars($v['value']);
+    }
+    return \htmlspecialchars($v);
+}
+/**
+ * Gets HTML of $propName or if not, $fallback
+ * @param array $mf
+ * @param $propName
+ * @param null|string $fallback
+ * @return mixed|null
+ * @internal
+ */
+function getHtml(array $mf, $propName, $fallback = null)
+{
+    if (!empty($mf['properties'][$propName]) and \is_array($mf['properties'][$propName])) {
+        return toHtml(\current($mf['properties'][$propName]));
+    }
+    return $fallback;
+}
+/**
+ * To img-alt
+ * 
+ * Converts a value to an img-alt `{'value': '', 'alt': ''}` structure. Passes through existing
+ * img-alt structures unchanged. For anything else, converts it to its plaintext representation,
+ * put that in the `value` key, and adds an empty `alt` key.
+ * 
+ * @param $v
+ * @return array
+ * @internal
+ */
+function toImgAlt($v)
+{
+    if (isImgAlt($v)) {
+        return $v;
+    }
+    return ['value' => toPlaintext($v), 'alt' => ''];
+}
+/**
+ * Get img-alt
+ * 
+ * If `$propName` exists on `$mf`, return an img-alt representation of it (via `toImgAlt`). If the
+ * property does not exist, return `$fallback` (default null)
+ * 
+ * @param array $mf
+ * @param string $propName
+ * @param mixed $fallback
+ * @return array|mixed
+ * @internal
+ */
+function getImgAlt(array $mf, string $propName, $fallback = null)
+{
+    if (isMicroformat($mf) and !empty($mf['properties'][$propName]) and \is_array($mf['properties'][$propName])) {
+        return toImgAlt(\current($mf['properties'][$propName]));
+    }
+    return $fallback;
+}
+/**
+ * Returns 'summary' element of $mf or a truncated Plaintext of $mf['properties']['content'] with 19 chars and ellipsis.
+ * @deprecated as not often used
+ * @param array $mf
+ * @return mixed|null|string
+ * @internal
+ */
+function getSummary(array $mf)
+{
+    if (hasProp($mf, 'summary')) {
+        return getPlaintext($mf, 'summary');
+    }
+    if (!empty($mf['properties']['content'])) {
+        return \substr(\strip_tags(getPlaintext($mf, 'content') ?? ''), 0, 19) . '…';
+    }
+}
+/**
+ * Gets the date published of $mf array.
+ * @param array $mf
+ * @param bool $ensureValid
+ * @param null|string $fallback optional result if date not available
+ * @return mixed|null
+ * @internal
+ */
+function getPublished(array $mf, $ensureValid = \false, $fallback = null)
+{
+    return getDateTimeProperty('published', $mf, $ensureValid, $fallback);
+}
+/**
+ * Gets the date updated of $mf array.
+ * @param array $mf
+ * @param bool $ensureValid
+ * @param null $fallback
+ * @return mixed|null
+ * @internal
+ */
+function getUpdated(array $mf, $ensureValid = \false, $fallback = null)
+{
+    return getDateTimeProperty('updated', $mf, $ensureValid, $fallback);
+}
+/**
+ * Gets the DateTime properties including published or updated, depending on params.
+ * @param $name string updated or published
+ * @param array $mf
+ * @param bool $ensureValid
+ * @param null|string $fallback
+ * @return mixed|null
+ * @internal
+ */
+function getDateTimeProperty($name, array $mf, $ensureValid = \false, $fallback = null)
+{
+    $compliment = 'published' === $name ? 'updated' : 'published';
+    if (hasProp($mf, $name)) {
+        $return = getPlaintext($mf, $name);
+    } elseif (hasProp($mf, $compliment)) {
+        $return = getPlaintext($mf, $compliment);
+    } else {
+        return $fallback;
+    }
+    if (!$ensureValid) {
+        return $return;
+    } else {
+        try {
+            new DateTime($return ?? '');
+            return $return;
+        } catch (Exception $e) {
+            return $fallback;
+        }
+    }
+}
+/**
+ * True if same hostname is parsed on both
+ * @param $u1 string url
+ * @param $u2 string url
+ * @return bool
+ * @link http://php.net/manual/en/function.parse-url.php
+ * @internal
+ */
+function sameHostname($u1, $u2)
+{
+    return \parse_url($u1, \PHP_URL_HOST) === \parse_url($u2, \PHP_URL_HOST);
+}
+/**
+ * Large function for fishing out author of $mf from various possible array elements.
+ * @param array $mf
+ * @param array|null $context
+ * @param null $url
+ * @param bool $matchName
+ * @param bool $matchHostname
+ * @return mixed|null
+ * @todo: this needs to be just part of an indiewebcamp.com/authorship algorithm, at the moment it tries to do too much
+ * @todo: maybe split some bits of this out into separate functions
+ *
+ * @internal
+ */
+function getAuthor(array $mf, array $context = null, $url = null, $matchName = \true, $matchHostname = \true)
+{
+    $entryAuthor = null;
+    if (null === $url and hasProp($mf, 'url')) {
+        $url = getPlaintext($mf, 'url');
+    }
+    if (hasProp($mf, 'author') and isMicroformat(\current($mf['properties']['author']))) {
+        $entryAuthor = \current($mf['properties']['author']);
+    } elseif (hasProp($mf, 'reviewer') and isMicroformat(\current($mf['properties']['author']))) {
+        $entryAuthor = \current($mf['properties']['reviewer']);
+    } elseif (hasProp($mf, 'author')) {
+        $entryAuthor = getPlaintext($mf, 'author');
+    }
+    // If we have no context that’s the best we can do
+    if (null === $context) {
+        return $entryAuthor;
+    }
+    // Whatever happens after this we’ll need these
+    $flattenedMf = flattenMicroformats($context);
+    $hCards = findMicroformatsByType($flattenedMf, 'h-card', \false);
+    if (\is_string($entryAuthor)) {
+        // look through all page h-cards for one with this URL
+        $authorHCards = findMicroformatsByProperty($hCards, 'url', $entryAuthor, \false);
+        if (!empty($authorHCards)) {
+            $entryAuthor = \current($authorHCards);
+        }
+    }
+    if (\is_string($entryAuthor) and $matchName) {
+        // look through all page h-cards for one with this name
+        $authorHCards = findMicroformatsByProperty($hCards, 'name', $entryAuthor, \false);
+        if (!empty($authorHCards)) {
+            $entryAuthor = \current($authorHCards);
+        }
+    }
+    if (null !== $entryAuthor) {
+        return $entryAuthor;
+    }
+    // Look for an "author" property on the top-level "h-feed" if present
+    $feed = findMicroformatsByType($flattenedMf, 'h-feed', \false);
+    if ($feed) {
+        $feed = \current($feed);
+        if ($feed && isMicroformat($feed) && !empty($feed['properties']) && !empty($feed['properties']['author'])) {
+            return \current($feed['properties']['author']);
+        }
+    }
+    // look for page-wide rel-author, h-card with that
+    if (!empty($context['rels']) and !empty($context['rels']['author'])) {
+        // Grab first href with rel=author
+        $relAuthorHref = \current($context['rels']['author']);
+        $relAuthorHCards = findMicroformatsByProperty($hCards, 'url', $relAuthorHref);
+        if (!empty($relAuthorHCards)) {
+            return \current($relAuthorHCards);
+        }
+    }
+    // look for h-card with same hostname as $url if given
+    if (null !== $url and $matchHostname) {
+        $sameHostnameHCards = findMicroformatsByCallable($hCards, function ($mf) use($url) {
+            if (!hasProp($mf, 'url')) {
+                return \false;
+            }
+            foreach ($mf['properties']['url'] as $u) {
+                if (sameHostname($url, $u)) {
+                    return \true;
+                }
+            }
+        }, \false);
+        if (!empty($sameHostnameHCards)) {
+            return \current($sameHostnameHCards);
+        }
+    }
+    // Without fetching, this is the best we can do. Return the found string value, or null.
+    return empty($relAuthorHref) ? null : $relAuthorHref;
+}
+/**
+ * Returns array per parse_url standard with pathname key added.
+ * @param $url
+ * @return mixed
+ * @link http://php.net/manual/en/function.parse-url.php
+ * @internal
+ */
+function parseUrl($url)
+{
+    $r = \parse_url($url);
+    if (empty($r['path'])) {
+        $r['path'] = '/';
+    }
+    return $r;
+}
+/**
+ * See if urls match for each component of parsed urls. Return true if so.
+ * @param $url1
+ * @param $url2
+ * @return bool
+ * @see parseUrl()
+ * @internal
+ */
+function urlsMatch($url1, $url2)
+{
+    $u1 = parseUrl($url1);
+    $u2 = parseUrl($url2);
+    foreach (\array_unique(\array_merge(\array_keys($u1), \array_keys($u2))) as $component) {
+        if (!\array_key_exists($component, $u1) or !\array_key_exists($component, $u2)) {
+            return \false;
+        }
+        if ($u1[$component] != $u2[$component]) {
+            return \false;
+        }
+    }
+    return \true;
+}
+/**
+ * Given two arrays of URLs, determine if any of them match
+ * @return bool
+ * @internal
+ */
+function anyUrlsMatch($array1, $array2)
+{
+    if (!(\is_array($array1) && \is_array($array2))) {
+        throw new \InvalidArgumentException('anyUrlsMatch must be called with two arrays');
+    }
+    foreach ($array1 as $url1) {
+        foreach ($array2 as $url2) {
+            if (urlsMatch($url1, $url2)) {
+                return \true;
+            }
+        }
+    }
+    return \false;
+}
+/**
+ * Representative h-card
+ *
+ * Given the microformats on a page representing a person or organisation (h-card), find the single h-card which is
+ * representative of the page, or null if none is found.
+ *
+ * @see http://microformats.org/wiki/representative-h-card-parsing
+ *
+ * @param array $mfs The parsed microformats of a page to search for a representative h-card
+ * @param string $url The URL the microformats were fetched from
+ * @return array|null Either a single h-card array structure, or null if none was found
+ * @internal
+ */
+function getRepresentativeHCard(array $mfs, $url)
+{
+    $hCards = findMicroformatsByType($mfs, 'h-card');
+    /**
+     * If the page contains an h-card with uid and url properties
+     * both matching the page URL, the first such h-card is the
+     * representative h-card
+     */
+    $hCardMatches = findMicroformatsByCallable($hCards, function ($hCard) use($url) {
+        $hCardUid = getPlaintext($hCard, 'uid');
+        $hCardUrls = getPlaintextArray($hCard, 'url');
+        # h-card must have uid and url properties
+        if (!($hCardUid && $hCardUrls)) {
+            return \false;
+        }
+        # uid must match the page URL
+        if (!urlsMatch($hCardUid, $url)) {
+            return \false;
+        }
+        # at least one h-card.url property must match the page URL
+        if (anyUrlsMatch($hCardUrls, [$url])) {
+            return \true;
+        }
+        return \false;
+    });
+    if (\count($hCardMatches) > 0) {
+        return $hCardMatches[0];
+    }
+    /**
+     * If no representative h-card was found, if the page contains an h-card
+     * with a url property value which also has a rel=me relation
+     * (i.e. matches a URL in parse_results.rels.me), the first such h-card
+     * is the representative h-card
+     */
+    if (!empty($mfs['rels']['me'])) {
+        $hCardMatches = findMicroformatsByCallable($hCards, function ($hCard) use($mfs) {
+            $hCardUrls = getPlaintextArray($hCard, 'url');
+            # h-card must have url property
+            if (!$hCardUrls) {
+                return \false;
+            }
+            # at least one h-card.url property must match a rel-me URL
+            if (anyUrlsMatch($hCardUrls, $mfs['rels']['me'])) {
+                return \true;
+            }
+            return \false;
+        });
+        if (\count($hCardMatches) > 0) {
+            return $hCardMatches[0];
+        }
+    }
+    /**
+     * If no representative h-card was found, if the page contains
+     * one single h-card, and the h-card has a url property matching
+     * the page URL, that h-card is the representative h-card
+     */
+    $hCardMatches = [];
+    if (\count($hCards) == 1) {
+        $hCardMatches = findMicroformatsByCallable($hCards, function ($hCard) use($url) {
+            $hCardUrls = getPlaintextArray($hCard, 'url');
+            # h-card must have url property
+            if (!$hCardUrls) {
+                return \false;
+            }
+            # at least one h-card.url property must match the page URL
+            if (anyUrlsMatch($hCardUrls, [$url])) {
+                return \true;
+            }
+            return \false;
+        });
+        if (\count($hCardMatches) === 1) {
+            return $hCardMatches[0];
+        }
+    }
+    // Otherwise, no representative h-card could be found.
+    return null;
+}
+/**
+ * Makes microformat properties into a flattened array, returned.
+ * @param array $mf
+ * @return array
+ * @internal
+ */
+function flattenMicroformatProperties(array $mf)
+{
+    $items = array();
+    if (!isMicroformat($mf)) {
+        return $items;
+    }
+    foreach ($mf['properties'] as $propArray) {
+        foreach ($propArray as $prop) {
+            if (isMicroformat($prop)) {
+                $items[] = $prop;
+                $items = \array_merge($items, flattenMicroformatProperties($prop));
+            }
+        }
+    }
+    return $items;
+}
+/**
+ * Flattens microformats. Can intake multiple Microformats including possible MicroformatCollection.
+ * @param array $mfs
+ * @return array
+ * @internal
+ */
+function flattenMicroformats(array $mfs)
+{
+    if (isMicroformatCollection($mfs)) {
+        $mfs = $mfs['items'];
+    } elseif (isMicroformat($mfs)) {
+        $mfs = array($mfs);
+    }
+    $items = array();
+    foreach ($mfs as $mf) {
+        $items[] = $mf;
+        $items = \array_merge($items, flattenMicroformatProperties($mf));
+        if (empty($mf['children'])) {
+            continue;
+        }
+        foreach ($mf['children'] as $child) {
+            $items[] = $child;
+            $items = \array_merge($items, flattenMicroformatProperties($child));
+        }
+    }
+    return $items;
+}
+/**
+ * Find Microformats By Type
+ * 
+ * Traverses a mf2 tree and returns all microformats objects whose type matches the one
+ * given. 
+ * 
+ * @param array $mfs
+ * @param $name
+ * @param bool $flatten
+ * @return mixed
+ * @internal
+ */
+function findMicroformatsByType(array $mfs, $name, $flatten = \true)
+{
+    return findMicroformatsByCallable($mfs, function ($mf) use($name) {
+        return \in_array($name, $mf['type']);
+    }, $flatten);
+}
+/**
+ *
+ * @param array $mfs
+ * @param $propName
+ * @param $propValue
+ * @param bool $flatten
+ * @return mixed
+ * @see findMicroformatsByCallable()
+ * @internal
+ */
+function findMicroformatsByProperty(array $mfs, $propName, $propValue, $flatten = \true)
+{
+    return findMicroformatsByCallable($mfs, function ($mf) use($propName, $propValue) {
+        if (!hasProp($mf, $propName)) {
+            return \false;
+        }
+        if (\in_array($propValue, $mf['properties'][$propName])) {
+            return \true;
+        }
+        return \false;
+    }, $flatten);
+}
+/**
+ * $callable should be a function or an exception will be thrown. $mfs can accept microformat collections.
+ * If $flatten is true then the result will be flattened.
+ * @param array $mfs
+ * @param $callable
+ * @param bool $flatten
+ * @return mixed
+ * @link http://php.net/manual/en/function.is-callable.php
+ * @see flattenMicroformats()
+ * @internal
+ */
+function findMicroformatsByCallable(array $mfs, $callable, $flatten = \true)
+{
+    if (!\is_callable($callable)) {
+        throw new \InvalidArgumentException('$callable must be callable');
+    }
+    if ($flatten and (isMicroformat($mfs) or isMicroformatCollection($mfs))) {
+        $mfs = flattenMicroformats($mfs);
+    }
+    return \array_values(\array_filter($mfs, $callable));
+}
+/**
+ * Remove False Positive Root Microformats
+ * 
+ * Unfortunately, a well-known CSS framework uses some non-semantic classnames which look like root
+ * classnames to the microformats2 parsing algorithm. This function takes either a single microformat
+ * or a mf2 tree and restructures it as if the false positive classnames had never been there.
+ * 
+ * Always returns a microformat collection (`{"items": []}`) even when passed a single microformat, as
+ * if the single microformat was a false positive, it may be replaced with more than one child.
+ * 
+ * The default list of known false positives is stored in `FALSE_POSITIVE_ROOT_CLASSNAME_REGEXES` and
+ * is used by default. You can provide your own list if you want. Some of the known false positives are
+ * prefixes, so the values of `$classnamesToRemove` must all be regexes (e.g. `'/h-wrong/'`).
+ * @internal
+ */
+function removeFalsePositiveRootMicroformats(array $mfs, ?array $classnamesToRemove = null)
+{
+    if (\is_null($classnamesToRemove)) {
+        $classnamesToRemove = FALSE_POSITIVE_ROOT_CLASSNAME_REGEXES;
+    }
+    if (!isMicroformatCollection($mfs)) {
+        if (isMicroformat($mfs)) {
+            $mfs = ['items' => [$mfs]];
+        }
+        // Nothing we can do with this, return it as-is.
+        return $mfs;
+    }
+    $correctedTree = ['items' => []];
+    $recurse = function ($mf) use(&$recurse, $classnamesToRemove) {
+        foreach ($mf['properties'] as $prop => $values) {
+            $newPropVals = [];
+            foreach ($values as $value) {
+                if (isMicroformat($value)) {
+                    $newPropVals = \array_merge($newPropVals, $recurse($value));
+                } else {
+                    $newPropVals[] = $value;
+                }
+            }
+            $mf['properties'][$prop] = $newPropVals;
+        }
+        if (!empty($mf['children'])) {
+            $correctedChildren = [];
+            foreach ($mf['children'] as $child) {
+                $correctedChildren = \array_merge($correctedChildren, $recurse($child));
+            }
+            $mf['children'] = $correctedChildren;
+        }
+        // If this mf structure’s types are all false-positive classnames, replace it with its children.
+        $hasOnlyFalsePositiveRootClassnames = \true;
+        foreach ($mf['type'] as $mft) {
+            $currentTypeIsFalsePositive = \false;
+            foreach ($classnamesToRemove as $ctr) {
+                if (1 === \preg_match($ctr, $mft)) {
+                    $currentTypeIsFalsePositive = \true;
+                    break;
+                }
+            }
+            if (\false === $currentTypeIsFalsePositive) {
+                $hasOnlyFalsePositiveRootClassnames = \false;
+                break;
+            }
+        }
+        if ($hasOnlyFalsePositiveRootClassnames) {
+            return \array_key_exists('children', $mf) ? $mf['children'] : [];
+        } else {
+            return [$mf];
+        }
+    };
+    foreach ($mfs['items'] as $mf) {
+        $correctedTree['items'] = \array_merge($correctedTree['items'], $recurse($mf));
+    }
+    return $correctedTree;
+}
+/** @internal */
+const FALSE_POSITIVE_ROOT_CLASSNAME_REGEXES = [
+    // https://tailwindcss.com/docs/height
+    '/h-px/',
+    '/h-auto/',
+    '/h-full/',
+    '/h-screen/',
+    '/h-min/',
+    '/h-max/',
+    '/h-fit/',
+    // https://chat.indieweb.org/dev/2022-11-14/1668463558928800
+    '/h-screen-[a-zA-Z0-9\\-\\_]+/',
+    '/h-full-[a-zA-Z0-9\\-\\_]+/',
+];
diff --git a/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php b/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
new file mode 100644
index 0000000..1dcf645
--- /dev/null
+++ b/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
@@ -0,0 +1,434 @@
+<?php
+
+namespace IndieAuth\Libs\BarnabyWalters\Mf2;
+
+use InvalidArgumentException;
+use IndieAuth\Libs\PHPUnit\Framework\TestCase;
+/**
+ * CleanerTest
+ *
+ * @author barnabywalters
+ * @internal
+ */
+class CleanerTest extends TestCase
+{
+    protected function mf($name, array $properties, $value = '')
+    {
+        if (\is_array($name)) {
+            $type = $name;
+        } else {
+            $type = [$name];
+        }
+        foreach ($properties as $name => $arg) {
+            if (\is_array($arg) and !isMicroformat($arg) and !isEmbeddedHtml($arg)) {
+                $properties[$name] = $arg;
+            } else {
+                $properties[$name] = [$arg];
+            }
+        }
+        return ['type' => $type, 'properties' => $properties, 'value' => $value];
+    }
+    public function testIsMicroformatReturnsFalseIfNotArray()
+    {
+        $this->assertFalse(isMicroformat(''));
+    }
+    public function testIsMicroformatReturnsFalseIfTypeMissing()
+    {
+        $this->assertFalse(isMicroformat(['properties' => []]));
+    }
+    public function testIsMicroformatReturnsFalseIfPropertiesMissing()
+    {
+        $this->assertFalse(isMicroformat(['type' => ['h-thing']]));
+    }
+    public function testIsMicroformatReturnsFalseIfHasNumericKeys()
+    {
+        $this->assertFalse(isMicroformat([[], 'thing' => []]));
+    }
+    public function testIsMicroformatReturnsTrueIfValueIsSet()
+    {
+        $this->assertTrue(isMicroformat(['type' => ['h-card'], 'properties' => [], 'value' => 'a string']));
+    }
+    public function testHasNumericKeysWorks()
+    {
+        $withNumericKeys = ['a', 'b', 'c'];
+        $noNumericKeys = ['key' => 'value'];
+        $this->assertTrue(hasNumericKeys($withNumericKeys));
+        $this->assertFalse(hasNumericKeys($noNumericKeys));
+    }
+    public function testIsMicroformatCollectionChecksForItemsKey()
+    {
+        $this->assertTrue(isMicroformatCollection(['items' => []]));
+        $this->assertFalse(isMicroformatCollection(['notItems' => []]));
+    }
+    public function testGetSummaryPassesIfSummaryPresent()
+    {
+        $mf = $this->mf('h-entry', ['summary' => 'Hello Summary']);
+        $result = getSummary($mf);
+        $this->assertEquals($mf['properties']['summary'][0], $result);
+    }
+    public function testGetSummaryUsesStrippedFirstCharactersOfContent()
+    {
+        $result = getSummary(['type' => ['h-entry'], 'properties' => ['content' => ['<p>Hello hello hello there indeed</p>']]]);
+        $this->assertEquals('Hello hello hello t…', $result);
+    }
+    public function testGetPublishedPassesIfPublishedPresent()
+    {
+        $mf = $this->mf('h-entry', ['published' => '2013-12-06']);
+        $result = getPublished($mf);
+        $this->assertEquals(getPlaintext($mf, 'published'), $result);
+    }
+    public function testGetPublishedFallsBackToUpdated()
+    {
+        $mf = $this->mf('h-entry', ['updated' => '2013-12-06']);
+        $result = getPublished($mf);
+        $this->assertEquals(getPlaintext($mf, 'updated'), $result);
+    }
+    public function testGetPublishedReturnsNullIfValidDatetimeRequested()
+    {
+        $mf = $this->mf('h-entry', ['published' => 'werty']);
+        $this->assertNull(getPublished($mf, \true));
+        $mf = $this->mf('h-entry', ['published' => '2022-01-01 10:00:00']);
+        $this->assertEquals('2022-01-01 10:00:00', getPublished($mf, \true));
+    }
+    public function testGetPublishedReturnsNullIfNoPotentialValueFound()
+    {
+        $mf = $this->mf('h-entry', []);
+        $result = getPublished($mf);
+        $this->assertNull($result);
+    }
+    public function testGetPublishedReturnsFallbackIfProvided()
+    {
+        $mf = $this->mf('h-entry', []);
+        $this->assertEquals('fallback', getPublished($mf, \true, 'fallback'));
+    }
+    public function testGetUpdated()
+    {
+        $mf = $this->mf('h-entry', ['updated' => '2013-12-06']);
+        $this->assertEquals('2013-12-06', getUpdated($mf));
+    }
+    public function testGetAuthorPassesIfAuthorPresent()
+    {
+        $mf = $this->mf('h-entry', ['author' => [$this->mf('h-card', ['name' => 'Me'])]]);
+        $this->assertEquals('Me', getPlaintext(getAuthor($mf), 'name'));
+    }
+    public function testGetAuthorFindsSeparateHCardWithSameName()
+    {
+        $nonAuthorCard = $this->mf('h-card', ['name' => 'Someone Else', 'url' => 'http://example.org']);
+        $card = $this->mf('h-card', ['name' => 'Me', 'url' => 'http://waterpigs.co.uk']);
+        $entry = $this->mf('h-entry', ['name' => 'Entry', 'author' => 'Me']);
+        $mfs = ['items' => [$nonAuthorCard, $card, $entry]];
+        $result = getAuthor($entry, $mfs);
+        $this->assertEquals('http://waterpigs.co.uk', getPlaintext($result, 'url'));
+    }
+    public function testGetAuthorFindsSeparateHCardWithSameDomain()
+    {
+        $card = $this->mf('h-card', ['name' => 'Me', 'url' => 'http://waterpigs.co.uk']);
+        $entry = $this->mf('h-entry', ['name' => 'The Entry']);
+        $mfs = ['items' => [$entry, $card]];
+        $result = getAuthor($entry, $mfs, 'http://waterpigs.co.uk/notes/1234');
+        $this->assertEquals('Me', getPlaintext($result, 'name'));
+    }
+    public function testGetAuthorDerivesMissingUrlFromMf()
+    {
+        $card = $this->mf('h-card', ['name' => 'Me', 'url' => 'https://waterpigs.co.uk']);
+        $entry = $this->mf('h-entry', ['name' => 'The Entry', 'url' => 'https://waterpigs.co.uk/posts/1']);
+        $mfs = ['items' => [$entry, $card]];
+        $this->assertEquals('Me', getPlaintext(getAuthor($entry, $mfs), 'name'));
+    }
+    public function testGetAuthorDoesntFallBackToFirstHCard()
+    {
+        $cards = [$this->mf('h-card', ['name' => 'Bill']), $this->mf('h-card', ['name' => 'James'])];
+        $entry = $this->mf('h-entry', ['name' => 'Entry']);
+        $mfs = ['items' => $cards];
+        $result = getAuthor($entry, $mfs);
+        $this->assertEquals(null, $result);
+    }
+    public function testGetAuthorFindsAuthorWithUrlOfPageRelAuthor()
+    {
+        $cards = [$this->mf('h-card', ['name' => 'N. T. Author']), $this->mf('h-card', ['name' => 'The Author', 'url' => 'http://example.com'])];
+        $entry = $this->mf('h-entry', ['name' => 'Entry']);
+        $mfs = ['items' => $cards, 'rels' => ['author' => ['http://example.com']]];
+        $result = getAuthor($entry, $mfs);
+        $this->assertEquals($cards[1], $result);
+    }
+    public function testFindMicroformatsByTypeFindsRootMicroformats()
+    {
+        $mfs = ['items' => [['type' => ['h-card'], 'properties' => ['name' => ['me']]]]];
+        $result = findMicroformatsByType($mfs, 'h-card');
+        $this->assertEquals('me', getPlaintext($result[0], 'name'));
+    }
+    public function testFlattenMicroformatsReturnsFlatArrayOfMicroformats()
+    {
+        $org = $this->mf('h-card', ['name' => 'organisation']);
+        $card = $this->mf('h-card', ['name' => 'me', 'org' => [$org]]);
+        $entry = $this->mf('h-entry', ['name' => 'blog posting']);
+        $card['children'] = [$entry];
+        $mfs = ['items' => [$card]];
+        $result = flattenMicroformats($mfs);
+        $this->assertTrue(\in_array($org, $result));
+        $this->assertTrue(\in_array($card, $result));
+        $this->assertTrue(\in_array($entry, $result));
+    }
+    public function testFindMicroformatsByProperty()
+    {
+        $mfs = ['items' => [$this->mf('h-card', ['name' => 'Me'])]];
+        $results = findMicroformatsByProperty($mfs, 'name', 'Me');
+        $this->assertEquals(1, \count($results));
+    }
+    public function testFindMicroformatsByCallable()
+    {
+        $mfs = ['items' => [$this->mf('h-card', ['url' => 'http://waterpigs.co.uk/'])]];
+        $results = findMicroformatsByCallable($mfs, function ($mf) {
+            if (!hasProp($mf, 'url')) {
+                return \false;
+            }
+            $urls = $mf['properties']['url'];
+            foreach ($urls as $url) {
+                if (\parse_url($url, \PHP_URL_HOST) === \parse_url('http://waterpigs.co.uk', \PHP_URL_HOST)) {
+                    return \true;
+                }
+            }
+            return \false;
+        });
+        $this->assertEquals(1, \count($results));
+        try {
+            findMicroformatsByCallable($mfs, 'not a callable :P');
+            $this->fail('No InvalidArgumentException thrown when a non-callable was passed to findMicroformatsByCallable');
+        } catch (InvalidArgumentException $e) {
+            // Pass!
+        }
+    }
+    public function testFindMicroformatsSearchesSingleMicroformatStructure()
+    {
+        $card = $this->mf('h-card', ['name' => 'Me']);
+        $entry = $this->mf('h-entry', ['author' => [$card], 'name' => 'entry']);
+        $results = findMicroformatsByType($entry, 'h-card');
+        $this->assertEquals(1, \count($results));
+    }
+    public function testIsEmbeddedHtml()
+    {
+        $e = array('value' => '', 'html' => '');
+        $this->assertTrue(isEmbeddedHtml($e));
+        $this->assertFalse(isEmbeddedHtml(array()));
+    }
+    public function testIsImgAlt()
+    {
+        $this->assertFalse(isImgAlt(\false));
+        $this->assertFalse(isImgAlt('string'));
+        $this->assertFalse(isImgAlt(['value' => 'no alt key tho']));
+        $this->assertFalse(isImgAlt(['alt' => 'no value key tho']));
+        $this->assertFalse(isImgAlt(['value' => 'yup', 'alt' => 'yup', 0 => 'got numeric keys tho']));
+        $this->assertTrue(isImgAlt(['value' => 'yup', 'alt' => 'yup']));
+    }
+    public function testGetPlaintextProperty()
+    {
+        $e = $this->mf('h-entry', ['name' => 'text', 'content' => ['text' => 'content', 'html' => '<b>content</b>'], 'author' => [$this->mf('h-card', [], 'name')], 'photo' => [['value' => 'value', 'alt' => 'alt']]]);
+        $this->assertEquals('text', getPlaintext($e, 'name'));
+        $this->assertEquals('content', getPlaintext($e, 'content'));
+        $this->assertEquals('name', getPlaintext($e, 'author'));
+        $this->assertNull(getPlaintext($e, 'badprop'));
+        $this->assertEquals('fallback', getPlaintext($e, 'badprop', 'fallback'));
+        $this->assertEquals('value', getPlaintext($e, 'photo'));
+        // Deprecated, tested here to prevent regression and for coverage
+        $this->assertEquals('text', getProp($e, 'name'));
+    }
+    public function testGetPlaintextArray()
+    {
+        $e = $this->mf('h-entry', ['category' => ['text', 'more'], 'photo' => ['value1', ['value' => 'value2', 'alt' => 'alt']]]);
+        $this->assertEquals(['text', 'more'], getPlaintextArray($e, 'category'));
+        $this->assertNull(getPlaintextArray($e, 'badprop'));
+        $this->assertEquals('fallback', getPlaintextArray($e, 'badprop', 'fallback'));
+    }
+    public function testGetHtmlProperty()
+    {
+        $e = $this->mf('h-entry', ['name' => ['"text"<>'], 'content' => ['value' => 'content', 'html' => '<b>content</b>'], 'author' => [$this->mf('h-card', [], '"name"<>')], 'photo' => [['value' => 'value', 'alt' => 'alt']]]);
+        $this->assertEquals('&quot;text&quot;&lt;&gt;', getHtml($e, 'name'));
+        $this->assertEquals('<b>content</b>', getHtml($e, 'content'));
+        $this->assertEquals('&quot;name&quot;&lt;&gt;', getHtml($e, 'author'));
+        $this->assertNull(getHtml($e, 'badprop'));
+        $this->assertEquals('fallback', getHtml($e, 'badprop', 'fallback'));
+    }
+    public function testGetImgAlt()
+    {
+        $e = $this->mf('h-entry', ['photo' => ['pval'], 'featured' => [['value' => 'fval', 'alt' => 'falt']], 'html' => [['value' => 'plain', 'html' => 'html']], 'embedded' => [$this->mf('h-card', [], 'epval')]]);
+        $this->assertEquals(['value' => 'pval', 'alt' => ''], getImgAlt($e, 'photo'));
+        $this->assertEquals(['value' => 'fval', 'alt' => 'falt'], getImgAlt($e, 'featured'));
+        $this->assertEquals(['value' => 'plain', 'alt' => ''], getImgAlt($e, 'html'));
+        $this->assertEquals(['value' => 'epval', 'alt' => ''], getImgAlt($e, 'embedded'));
+    }
+    public function testExpandAuthorExpandsFromLargerHCardsInContext()
+    {
+        $this->markTestSkipped();
+    }
+    public function testMergeMicroformatsRecursivelyMerges()
+    {
+        $this->markTestSkipped();
+    }
+    public function testGetAuthorDoesntReturnNonHCards()
+    {
+        $mf = ['items' => [['type' => ['h-entry'], 'properties' => ['url' => ['http://example.com/post/100'], 'name' => ['Some Entry']]], ['type' => ['h-card'], 'properties' => ['url' => ['http://example.com/'], 'name' => ['Mrs. Example']]]]];
+        $author = getAuthor($mf['items'][0], $mf, 'http://example.com/post/100');
+        $this->assertContains('h-card', $author['type']);
+    }
+    /**
+     * Test that URL path / and empty path match
+     */
+    public function testUrlsMatchEmptyPath()
+    {
+        $url1 = 'https://example.com';
+        $url2 = 'https://example.com/';
+        $this->assertTrue(urlsMatch($url1, $url2));
+        $this->assertTrue(urlsMatch($url2, $url1));
+    }
+    /**
+     * Test that URL paths with different trailing slash don't match
+     */
+    public function testUrlsTrailingSlashDontMatch()
+    {
+        $url1 = 'https://example.com/path';
+        $url2 = 'https://example.com/path/';
+        $this->assertFalse(urlsMatch($url1, $url2));
+        $this->assertFalse(urlsMatch($url2, $url1));
+    }
+    /**
+     * Test that URLs with different schemes don't match
+     */
+    public function testUrlsDifferentSchemeDontMatch()
+    {
+        $url1 = 'http://example.com/path/post/';
+        $url2 = 'https://example.com/path/post/';
+        $this->assertFalse(urlsMatch($url1, $url2));
+        $this->assertFalse(urlsMatch($url2, $url1));
+    }
+    /**
+     * Test anyUrlsMatch() method comparing arrays of URLs
+     */
+    public function testAnyUrlsMatchParameter1()
+    {
+        $this->expectException('InvalidArgumentException');
+        $array = ['https://example.com/'];
+        anyUrlsMatch('string', $array);
+    }
+    public function testAnyUrlsMatchParameter2()
+    {
+        $this->expectException('InvalidArgumentException');
+        $array = ['https://example.com/'];
+        anyUrlsMatch($array, 'string');
+    }
+    public function testAnyUrlsMatchNoMatch()
+    {
+        $array1 = ['https://example.com/'];
+        $array2 = ['https://example.com/profile'];
+        $this->assertFalse(anyUrlsMatch($array1, $array2));
+        $this->assertFalse(anyUrlsMatch($array2, $array1));
+    }
+    public function testAnyUrlsMatch1()
+    {
+        $array1 = ['https://example.com/'];
+        $array2 = ['https://example.com/'];
+        $this->assertTrue(anyUrlsMatch($array1, $array2));
+        $this->assertTrue(anyUrlsMatch($array2, $array1));
+    }
+    public function testAnyUrlsMatch2()
+    {
+        $array1 = ['https://example.com/profile1', 'https://example.com/profile2', 'https://example.com/profile3'];
+        $array2 = ['https://example.com/profile3', 'https://example.com/profile2', 'https://example.com/profile5'];
+        $this->assertTrue(anyUrlsMatch($array1, $array2));
+        $this->assertTrue(anyUrlsMatch($array2, $array1));
+    }
+    /**
+     * Test the h-card `url` == `uid` == page URL method
+     * Use the first h-card that meets the criteria
+     */
+    public function testGetRepresentativeHCardUrlUidSourceMethod()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-card'], 'properties' => ['url' => ['https://example.com'], 'uid' => ['https://example.com'], 'name' => ['Correct h-card']]], ['type' => ['h-card'], 'properties' => ['url' => ['https://example.com'], 'uid' => ['https://example.com'], 'name' => ['Second h-card']]]]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNotNull($repHCard);
+        $this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
+    }
+    /**
+     * Test the h-card `url` == `rel-me` method
+     * Use the first h-card that meets the criteria
+     */
+    public function testGetRepresentativeHCardUrlRelMeMethod()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-card'], 'properties' => ['url' => ['https://example.org'], 'name' => ['Correct h-card']]], ['type' => ['h-card'], 'properties' => ['url' => ['https://example.org'], 'name' => ['Second h-card']]]], 'rels' => ['me' => ['https://example.org']]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNotNull($repHCard);
+        $this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
+    }
+    /**
+     * Test the *single* h-card with `url` == page URL method
+     */
+    public function testGetRepresentativeHCardSingleHCardUrlSourceMethod()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-card'], 'properties' => ['url' => ['https://example.com'], 'name' => ['Correct h-card']]]]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNotNull($repHCard);
+        $this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
+    }
+    /**
+     * Test no representative h-card when *multiple* h-card with `url` == page URL method
+     */
+    public function testGetRepresentativeHCardMultipleHCardUrlSourceMethod()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-card'], 'properties' => ['url' => ['https://example.com'], 'name' => ['First h-card']]], ['type' => ['h-card'], 'properties' => ['url' => ['https://example.com/user'], 'name' => ['Second h-card']]]]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNull($repHCard);
+    }
+    /**
+     * The getRepresentativeHCard() method used to return other h-* roots.
+     * Modified this previous test to ensure the h-entry is not returned
+     * even when its `url` == `uid` == page URL
+     */
+    public function testGetRepresentativeHCardOnlyFindsHCard1()
+    {
+        $url = 'https://example.com';
+        $mf = ['items' => [['type' => ['h-entry'], 'properties' => ['url' => ['https://example.com'], 'uid' => ['https://example.com'], 'name' => ['Not an h-card']]]]];
+        $repHCard = getRepresentativeHCard($mf, $url);
+        $this->assertNull($repHCard);
+    }
+    /**
+     * The getRepresentativeHCard() method used to return other h-* roots.
+     * Modified this previous test to ensure the h-entry is not returned
+     * even when `url` == `rel-me`
+     */
+    public function testGetRepresentativeHCardOnlyFindsHCard2()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-entry'], 'properties' => ['url' => ['https://example.org'], 'name' => ['Not an h-card']]]], 'rels' => ['me' => ['https://example.org']]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNull($repHCard);
+    }
+    /**
+     * The getRepresentativeHCard() method used to return other h-* roots.
+     * Modified this previous test to ensure the h-entry is not returned
+     * even when *single* h-* with `url` == page URL
+     */
+    public function testGetRepresentativeHCardOnlyFindsHCard3()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-entry'], 'properties' => ['url' => ['https://example.com'], 'name' => ['Not an h-card']]]]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNull($repHCard);
+    }
+    public function testGetRepresentativeHCardIgnoresMultipleUrlPageUrlMatching()
+    {
+        $url = 'https://example.com';
+        $mfs = ['items' => [['type' => ['h-entry'], 'properties' => ['url' => ['https://example.com'], 'name' => ['Not an h-card']]], ['type' => ['h-entry'], 'properties' => ['url' => ['https://example.com'], 'name' => ['Also not an h-card']]]]];
+        $repHCard = getRepresentativeHCard($mfs, $url);
+        $this->assertNull($repHCard);
+    }
+    public function testRemoveFalsePositiveRootMicroformats()
+    {
+        // Based on https://www.lifelog.be/ninety-days-in-a-new-country as of 2022-11-15
+        $test = ['items' => [['type' => ['h-full'], 'properties' => [], 'children' => [['type' => ['h-auto'], 'properties' => ['name' => ['']]], ['type' => ['h-entry'], 'properties' => ['name' => ['Ninety days in a new country"']]]]]]];
+        $expected = ['items' => [['type' => ['h-entry'], 'properties' => ['name' => ['Ninety days in a new country"']]]]];
+        $this->assertEquals($expected, removeFalsePositiveRootMicroformats($test));
+    }
+}
diff --git a/vendor/firebase/php-jwt/LICENSE b/libs/firebase/php-jwt/LICENSE
similarity index 100%
rename from vendor/firebase/php-jwt/LICENSE
rename to libs/firebase/php-jwt/LICENSE
diff --git a/vendor/firebase/php-jwt/composer.json b/libs/firebase/php-jwt/composer.json
similarity index 52%
rename from vendor/firebase/php-jwt/composer.json
rename to libs/firebase/php-jwt/composer.json
index 6146e2d..062f239 100644
--- a/vendor/firebase/php-jwt/composer.json
+++ b/libs/firebase/php-jwt/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "firebase/php-jwt",
+    "name": "firebase\/php-jwt",
     "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-    "homepage": "https://github.com/firebase/php-jwt",
+    "homepage": "https:\/\/github.com\/firebase\/php-jwt",
     "keywords": [
         "php",
         "jwt"
@@ -20,17 +20,23 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.4||^8.0"
     },
     "suggest": {
-        "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+        "paragonie\/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present",
+        "ext-sodium": "Support EdDSA (Ed25519) signatures"
     },
     "autoload": {
         "psr-4": {
-            "Firebase\\JWT\\": "src"
+            "IndieAuth\\Libs\\Firebase\\JWT\\": "src"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.8 <=9"
+        "guzzlehttp\/guzzle": "^6.5||^7.4",
+        "phpspec\/prophecy-phpunit": "^2.0",
+        "phpunit\/phpunit": "^9.5",
+        "psr\/cache": "^1.0||^2.0",
+        "psr\/http-client": "^1.0",
+        "psr\/http-factory": "^1.0"
     }
-}
+}
\ No newline at end of file
diff --git a/libs/firebase/php-jwt/src/BeforeValidException.php b/libs/firebase/php-jwt/src/BeforeValidException.php
new file mode 100644
index 0000000..c39d607
--- /dev/null
+++ b/libs/firebase/php-jwt/src/BeforeValidException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+/** @internal */
+class BeforeValidException extends \UnexpectedValueException implements JWTExceptionWithPayloadInterface
+{
+    private object $payload;
+    public function setPayload(object $payload) : void
+    {
+        $this->payload = $payload;
+    }
+    public function getPayload() : object
+    {
+        return $this->payload;
+    }
+}
diff --git a/libs/firebase/php-jwt/src/CachedKeySet.php b/libs/firebase/php-jwt/src/CachedKeySet.php
new file mode 100644
index 0000000..b3e271d
--- /dev/null
+++ b/libs/firebase/php-jwt/src/CachedKeySet.php
@@ -0,0 +1,227 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+use ArrayAccess;
+use InvalidArgumentException;
+use LogicException;
+use OutOfBoundsException;
+use IndieAuth\Libs\Psr\Cache\CacheItemInterface;
+use IndieAuth\Libs\Psr\Cache\CacheItemPoolInterface;
+use IndieAuth\Libs\Psr\Http\Client\ClientInterface;
+use IndieAuth\Libs\Psr\Http\Message\RequestFactoryInterface;
+use RuntimeException;
+use UnexpectedValueException;
+/**
+ * @implements ArrayAccess<string, Key>
+ * @internal
+ */
+class CachedKeySet implements ArrayAccess
+{
+    /**
+     * @var string
+     */
+    private $jwksUri;
+    /**
+     * @var ClientInterface
+     */
+    private $httpClient;
+    /**
+     * @var RequestFactoryInterface
+     */
+    private $httpFactory;
+    /**
+     * @var CacheItemPoolInterface
+     */
+    private $cache;
+    /**
+     * @var ?int
+     */
+    private $expiresAfter;
+    /**
+     * @var ?CacheItemInterface
+     */
+    private $cacheItem;
+    /**
+     * @var array<string, array<mixed>>
+     */
+    private $keySet;
+    /**
+     * @var string
+     */
+    private $cacheKey;
+    /**
+     * @var string
+     */
+    private $cacheKeyPrefix = 'jwks';
+    /**
+     * @var int
+     */
+    private $maxKeyLength = 64;
+    /**
+     * @var bool
+     */
+    private $rateLimit;
+    /**
+     * @var string
+     */
+    private $rateLimitCacheKey;
+    /**
+     * @var int
+     */
+    private $maxCallsPerMinute = 10;
+    /**
+     * @var string|null
+     */
+    private $defaultAlg;
+    public function __construct(string $jwksUri, ClientInterface $httpClient, RequestFactoryInterface $httpFactory, CacheItemPoolInterface $cache, int $expiresAfter = null, bool $rateLimit = \false, string $defaultAlg = null)
+    {
+        $this->jwksUri = $jwksUri;
+        $this->httpClient = $httpClient;
+        $this->httpFactory = $httpFactory;
+        $this->cache = $cache;
+        $this->expiresAfter = $expiresAfter;
+        $this->rateLimit = $rateLimit;
+        $this->defaultAlg = $defaultAlg;
+        $this->setCacheKeys();
+    }
+    /**
+     * @param string $keyId
+     * @return Key
+     */
+    public function offsetGet($keyId) : Key
+    {
+        if (!$this->keyIdExists($keyId)) {
+            throw new OutOfBoundsException('Key ID not found');
+        }
+        return JWK::parseKey($this->keySet[$keyId], $this->defaultAlg);
+    }
+    /**
+     * @param string $keyId
+     * @return bool
+     */
+    public function offsetExists($keyId) : bool
+    {
+        return $this->keyIdExists($keyId);
+    }
+    /**
+     * @param string $offset
+     * @param Key $value
+     */
+    public function offsetSet($offset, $value) : void
+    {
+        throw new LogicException('Method not implemented');
+    }
+    /**
+     * @param string $offset
+     */
+    public function offsetUnset($offset) : void
+    {
+        throw new LogicException('Method not implemented');
+    }
+    /**
+     * @return array<mixed>
+     */
+    private function formatJwksForCache(string $jwks) : array
+    {
+        $jwks = \json_decode($jwks, \true);
+        if (!isset($jwks['keys'])) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+        if (empty($jwks['keys'])) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+        $keys = [];
+        foreach ($jwks['keys'] as $k => $v) {
+            $kid = isset($v['kid']) ? $v['kid'] : $k;
+            $keys[(string) $kid] = $v;
+        }
+        return $keys;
+    }
+    private function keyIdExists(string $keyId) : bool
+    {
+        if (null === $this->keySet) {
+            $item = $this->getCacheItem();
+            // Try to load keys from cache
+            if ($item->isHit()) {
+                // item found! retrieve it
+                $this->keySet = $item->get();
+                // If the cached item is a string, the JWKS response was cached (previous behavior).
+                // Parse this into expected format array<kid, jwk> instead.
+                if (\is_string($this->keySet)) {
+                    $this->keySet = $this->formatJwksForCache($this->keySet);
+                }
+            }
+        }
+        if (!isset($this->keySet[$keyId])) {
+            if ($this->rateLimitExceeded()) {
+                return \false;
+            }
+            $request = $this->httpFactory->createRequest('GET', $this->jwksUri);
+            $jwksResponse = $this->httpClient->sendRequest($request);
+            if ($jwksResponse->getStatusCode() !== 200) {
+                throw new UnexpectedValueException(\sprintf('HTTP Error: %d %s for URI "%s"', $jwksResponse->getStatusCode(), $jwksResponse->getReasonPhrase(), $this->jwksUri), $jwksResponse->getStatusCode());
+            }
+            $this->keySet = $this->formatJwksForCache((string) $jwksResponse->getBody());
+            if (!isset($this->keySet[$keyId])) {
+                return \false;
+            }
+            $item = $this->getCacheItem();
+            $item->set($this->keySet);
+            if ($this->expiresAfter) {
+                $item->expiresAfter($this->expiresAfter);
+            }
+            $this->cache->save($item);
+        }
+        return \true;
+    }
+    private function rateLimitExceeded() : bool
+    {
+        if (!$this->rateLimit) {
+            return \false;
+        }
+        $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
+        if (!$cacheItem->isHit()) {
+            $cacheItem->expiresAfter(1);
+            // # of calls are cached each minute
+        }
+        $callsPerMinute = (int) $cacheItem->get();
+        if (++$callsPerMinute > $this->maxCallsPerMinute) {
+            return \true;
+        }
+        $cacheItem->set($callsPerMinute);
+        $this->cache->save($cacheItem);
+        return \false;
+    }
+    private function getCacheItem() : CacheItemInterface
+    {
+        if (\is_null($this->cacheItem)) {
+            $this->cacheItem = $this->cache->getItem($this->cacheKey);
+        }
+        return $this->cacheItem;
+    }
+    private function setCacheKeys() : void
+    {
+        if (empty($this->jwksUri)) {
+            throw new RuntimeException('JWKS URI is empty');
+        }
+        // ensure we do not have illegal characters
+        $key = \preg_replace('|[^a-zA-Z0-9_\\.!]|', '', $this->jwksUri);
+        // add prefix
+        $key = $this->cacheKeyPrefix . $key;
+        // Hash keys if they exceed $maxKeyLength of 64
+        if (\strlen($key) > $this->maxKeyLength) {
+            $key = \substr(\hash('sha256', $key), 0, $this->maxKeyLength);
+        }
+        $this->cacheKey = $key;
+        if ($this->rateLimit) {
+            // add prefix
+            $rateLimitKey = $this->cacheKeyPrefix . 'ratelimit' . $key;
+            // Hash keys if they exceed $maxKeyLength of 64
+            if (\strlen($rateLimitKey) > $this->maxKeyLength) {
+                $rateLimitKey = \substr(\hash('sha256', $rateLimitKey), 0, $this->maxKeyLength);
+            }
+            $this->rateLimitCacheKey = $rateLimitKey;
+        }
+    }
+}
diff --git a/libs/firebase/php-jwt/src/ExpiredException.php b/libs/firebase/php-jwt/src/ExpiredException.php
new file mode 100644
index 0000000..aebb23c
--- /dev/null
+++ b/libs/firebase/php-jwt/src/ExpiredException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+/** @internal */
+class ExpiredException extends \UnexpectedValueException implements JWTExceptionWithPayloadInterface
+{
+    private object $payload;
+    public function setPayload(object $payload) : void
+    {
+        $this->payload = $payload;
+    }
+    public function getPayload() : object
+    {
+        return $this->payload;
+    }
+}
diff --git a/libs/firebase/php-jwt/src/JWK.php b/libs/firebase/php-jwt/src/JWK.php
new file mode 100644
index 0000000..c16037a
--- /dev/null
+++ b/libs/firebase/php-jwt/src/JWK.php
@@ -0,0 +1,268 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+/**
+ * JSON Web Key implementation, based on this spec:
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Bui Sy Nguyen <nguyenbs@gmail.com>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ * @internal
+ */
+class JWK
+{
+    private const OID = '1.2.840.10045.2.1';
+    private const ASN1_OBJECT_IDENTIFIER = 0x6;
+    private const ASN1_SEQUENCE = 0x10;
+    // also defined in JWT
+    private const ASN1_BIT_STRING = 0x3;
+    private const EC_CURVES = [
+        'P-256' => '1.2.840.10045.3.1.7',
+        // Len: 64
+        'secp256k1' => '1.3.132.0.10',
+        // Len: 64
+        'P-384' => '1.3.132.0.34',
+    ];
+    // For keys with "kty" equal to "OKP" (Octet Key Pair), the "crv" parameter must contain the key subtype.
+    // This library supports the following subtypes:
+    private const OKP_SUBTYPES = ['Ed25519' => \true];
+    /**
+     * Parse a set of JWK keys
+     *
+     * @param array<mixed> $jwks The JSON Web Key Set as an associative array
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return array<string, Key> An associative array of key IDs (kid) to Key objects
+     *
+     * @throws InvalidArgumentException     Provided JWK Set is empty
+     * @throws UnexpectedValueException     Provided JWK Set was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses parseKey
+     */
+    public static function parseKeySet(array $jwks, string $defaultAlg = null) : array
+    {
+        $keys = [];
+        if (!isset($jwks['keys'])) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+        if (empty($jwks['keys'])) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+        foreach ($jwks['keys'] as $k => $v) {
+            $kid = isset($v['kid']) ? $v['kid'] : $k;
+            if ($key = self::parseKey($v, $defaultAlg)) {
+                $keys[(string) $kid] = $key;
+            }
+        }
+        if (0 === \count($keys)) {
+            throw new UnexpectedValueException('No supported algorithms found in JWK Set');
+        }
+        return $keys;
+    }
+    /**
+     * Parse a JWK key
+     *
+     * @param array<mixed> $jwk An individual JWK
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return Key The key object for the JWK
+     *
+     * @throws InvalidArgumentException     Provided JWK is empty
+     * @throws UnexpectedValueException     Provided JWK was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses createPemFromModulusAndExponent
+     */
+    public static function parseKey(array $jwk, string $defaultAlg = null) : ?Key
+    {
+        if (empty($jwk)) {
+            throw new InvalidArgumentException('JWK must not be empty');
+        }
+        if (!isset($jwk['kty'])) {
+            throw new UnexpectedValueException('JWK must contain a "kty" parameter');
+        }
+        if (!isset($jwk['alg'])) {
+            if (\is_null($defaultAlg)) {
+                // The "alg" parameter is optional in a KTY, but an algorithm is required
+                // for parsing in this library. Use the $defaultAlg parameter when parsing the
+                // key set in order to prevent this error.
+                // @see https://datatracker.ietf.org/doc/html/rfc7517#section-4.4
+                throw new UnexpectedValueException('JWK must contain an "alg" parameter');
+            }
+            $jwk['alg'] = $defaultAlg;
+        }
+        switch ($jwk['kty']) {
+            case 'RSA':
+                if (!empty($jwk['d'])) {
+                    throw new UnexpectedValueException('RSA private keys are not supported');
+                }
+                if (!isset($jwk['n']) || !isset($jwk['e'])) {
+                    throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
+                }
+                $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']);
+                $publicKey = \openssl_pkey_get_public($pem);
+                if (\false === $publicKey) {
+                    throw new DomainException('OpenSSL error: ' . \openssl_error_string());
+                }
+                return new Key($publicKey, $jwk['alg']);
+            case 'EC':
+                if (isset($jwk['d'])) {
+                    // The key is actually a private key
+                    throw new UnexpectedValueException('Key data must be for a public key');
+                }
+                if (empty($jwk['crv'])) {
+                    throw new UnexpectedValueException('crv not set');
+                }
+                if (!isset(self::EC_CURVES[$jwk['crv']])) {
+                    throw new DomainException('Unrecognised or unsupported EC curve');
+                }
+                if (empty($jwk['x']) || empty($jwk['y'])) {
+                    throw new UnexpectedValueException('x and y not set');
+                }
+                $publicKey = self::createPemFromCrvAndXYCoordinates($jwk['crv'], $jwk['x'], $jwk['y']);
+                return new Key($publicKey, $jwk['alg']);
+            case 'OKP':
+                if (isset($jwk['d'])) {
+                    // The key is actually a private key
+                    throw new UnexpectedValueException('Key data must be for a public key');
+                }
+                if (!isset($jwk['crv'])) {
+                    throw new UnexpectedValueException('crv not set');
+                }
+                if (empty(self::OKP_SUBTYPES[$jwk['crv']])) {
+                    throw new DomainException('Unrecognised or unsupported OKP key subtype');
+                }
+                if (empty($jwk['x'])) {
+                    throw new UnexpectedValueException('x not set');
+                }
+                // This library works internally with EdDSA keys (Ed25519) encoded in standard base64.
+                $publicKey = JWT::convertBase64urlToBase64($jwk['x']);
+                return new Key($publicKey, $jwk['alg']);
+            default:
+                break;
+        }
+        return null;
+    }
+    /**
+     * Converts the EC JWK values to pem format.
+     *
+     * @param   string  $crv The EC curve (only P-256 & P-384 is supported)
+     * @param   string  $x   The EC x-coordinate
+     * @param   string  $y   The EC y-coordinate
+     *
+     * @return  string
+     */
+    private static function createPemFromCrvAndXYCoordinates(string $crv, string $x, string $y) : string
+    {
+        $pem = self::encodeDER(self::ASN1_SEQUENCE, self::encodeDER(self::ASN1_SEQUENCE, self::encodeDER(self::ASN1_OBJECT_IDENTIFIER, self::encodeOID(self::OID)) . self::encodeDER(self::ASN1_OBJECT_IDENTIFIER, self::encodeOID(self::EC_CURVES[$crv]))) . self::encodeDER(self::ASN1_BIT_STRING, \chr(0x0) . \chr(0x4) . JWT::urlsafeB64Decode($x) . JWT::urlsafeB64Decode($y)));
+        return \sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n", \wordwrap(\base64_encode($pem), 64, "\n", \true));
+    }
+    /**
+     * Create a public key represented in PEM format from RSA modulus and exponent information
+     *
+     * @param string $n The RSA modulus encoded in Base64
+     * @param string $e The RSA exponent encoded in Base64
+     *
+     * @return string The RSA public key represented in PEM format
+     *
+     * @uses encodeLength
+     */
+    private static function createPemFromModulusAndExponent(string $n, string $e) : string
+    {
+        $mod = JWT::urlsafeB64Decode($n);
+        $exp = JWT::urlsafeB64Decode($e);
+        $modulus = \pack('Ca*a*', 2, self::encodeLength(\strlen($mod)), $mod);
+        $publicExponent = \pack('Ca*a*', 2, self::encodeLength(\strlen($exp)), $exp);
+        $rsaPublicKey = \pack('Ca*a*a*', 48, self::encodeLength(\strlen($modulus) + \strlen($publicExponent)), $modulus, $publicExponent);
+        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500');
+        // hex version of MA0GCSqGSIb3DQEBAQUA
+        $rsaPublicKey = \chr(0) . $rsaPublicKey;
+        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
+        $rsaPublicKey = \pack('Ca*a*', 48, self::encodeLength(\strlen($rsaOID . $rsaPublicKey)), $rsaOID . $rsaPublicKey);
+        return "-----BEGIN PUBLIC KEY-----\r\n" . \chunk_split(\base64_encode($rsaPublicKey), 64) . '-----END PUBLIC KEY-----';
+    }
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @param int $length
+     * @return string
+     */
+    private static function encodeLength(int $length) : string
+    {
+        if ($length <= 0x7f) {
+            return \chr($length);
+        }
+        $temp = \ltrim(\pack('N', $length), \chr(0));
+        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
+    }
+    /**
+     * Encodes a value into a DER object.
+     * Also defined in Firebase\JWT\JWT
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value) : string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+        // Type
+        $der = \chr($tag_header | $type);
+        // Length
+        $der .= \chr(\strlen($value));
+        return $der . $value;
+    }
+    /**
+     * Encodes a string into a DER-encoded OID.
+     *
+     * @param   string $oid the OID string
+     * @return  string the binary DER-encoded OID
+     */
+    private static function encodeOID(string $oid) : string
+    {
+        $octets = \explode('.', $oid);
+        // Get the first octet
+        $first = (int) \array_shift($octets);
+        $second = (int) \array_shift($octets);
+        $oid = \chr($first * 40 + $second);
+        // Iterate over subsequent octets
+        foreach ($octets as $octet) {
+            if ($octet == 0) {
+                $oid .= \chr(0x0);
+                continue;
+            }
+            $bin = '';
+            while ($octet) {
+                $bin .= \chr(0x80 | $octet & 0x7f);
+                $octet >>= 7;
+            }
+            $bin[0] = $bin[0] & \chr(0x7f);
+            // Convert to big endian if necessary
+            if (\pack('V', 65534) == \pack('L', 65534)) {
+                $oid .= \strrev($bin);
+            } else {
+                $oid .= $bin;
+            }
+        }
+        return $oid;
+    }
+}
diff --git a/libs/firebase/php-jwt/src/JWT.php b/libs/firebase/php-jwt/src/JWT.php
new file mode 100644
index 0000000..d2f27ed
--- /dev/null
+++ b/libs/firebase/php-jwt/src/JWT.php
@@ -0,0 +1,572 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+use ArrayAccess;
+use DateTime;
+use DomainException;
+use Exception;
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use stdClass;
+use UnexpectedValueException;
+/**
+ * JSON Web Token implementation, based on this spec:
+ * https://tools.ietf.org/html/rfc7519
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Neuman Vong <neuman@twilio.com>
+ * @author   Anant Narayanan <anant@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ * @internal
+ */
+class JWT
+{
+    private const ASN1_INTEGER = 0x2;
+    private const ASN1_SEQUENCE = 0x10;
+    private const ASN1_BIT_STRING = 0x3;
+    /**
+     * When checking nbf, iat or expiration times,
+     * we want to provide some extra leeway time to
+     * account for clock skew.
+     *
+     * @var int
+     */
+    public static $leeway = 0;
+    /**
+     * Allow the current timestamp to be specified.
+     * Useful for fixing a value within unit testing.
+     * Will default to PHP time() value if null.
+     *
+     * @var ?int
+     */
+    public static $timestamp = null;
+    /**
+     * @var array<string, string[]>
+     */
+    public static $supported_algs = ['ES384' => ['openssl', 'SHA384'], 'ES256' => ['openssl', 'SHA256'], 'ES256K' => ['openssl', 'SHA256'], 'HS256' => ['hash_hmac', 'SHA256'], 'HS384' => ['hash_hmac', 'SHA384'], 'HS512' => ['hash_hmac', 'SHA512'], 'RS256' => ['openssl', 'SHA256'], 'RS384' => ['openssl', 'SHA384'], 'RS512' => ['openssl', 'SHA512'], 'EdDSA' => ['sodium_crypto', 'EdDSA']];
+    /**
+     * Decodes a JWT string into a PHP object.
+     *
+     * @param string                 $jwt            The JWT
+     * @param Key|ArrayAccess<string,Key>|array<string,Key> $keyOrKeyArray  The Key or associative array of key IDs
+     *                                                                      (kid) to Key objects.
+     *                                                                      If the algorithm used is asymmetric, this is
+     *                                                                      the public key.
+     *                                                                      Each Key object contains an algorithm and
+     *                                                                      matching key.
+     *                                                                      Supported algorithms are 'ES384','ES256',
+     *                                                                      'HS256', 'HS384', 'HS512', 'RS256', 'RS384'
+     *                                                                      and 'RS512'.
+     * @param stdClass               $headers                               Optional. Populates stdClass with headers.
+     *
+     * @return stdClass The JWT's payload as a PHP object
+     *
+     * @throws InvalidArgumentException     Provided key/key-array was empty or malformed
+     * @throws DomainException              Provided JWT is malformed
+     * @throws UnexpectedValueException     Provided JWT was invalid
+     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
+     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
+     *
+     * @uses jsonDecode
+     * @uses urlsafeB64Decode
+     */
+    public static function decode(string $jwt, $keyOrKeyArray, stdClass &$headers = null) : stdClass
+    {
+        // Validate JWT
+        $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp;
+        if (empty($keyOrKeyArray)) {
+            throw new InvalidArgumentException('Key may not be empty');
+        }
+        $tks = \explode('.', $jwt);
+        if (\count($tks) !== 3) {
+            throw new UnexpectedValueException('Wrong number of segments');
+        }
+        list($headb64, $bodyb64, $cryptob64) = $tks;
+        $headerRaw = static::urlsafeB64Decode($headb64);
+        if (null === ($header = static::jsonDecode($headerRaw))) {
+            throw new UnexpectedValueException('Invalid header encoding');
+        }
+        if ($headers !== null) {
+            $headers = $header;
+        }
+        $payloadRaw = static::urlsafeB64Decode($bodyb64);
+        if (null === ($payload = static::jsonDecode($payloadRaw))) {
+            throw new UnexpectedValueException('Invalid claims encoding');
+        }
+        if (\is_array($payload)) {
+            // prevent PHP Fatal Error in edge-cases when payload is empty array
+            $payload = (object) $payload;
+        }
+        if (!$payload instanceof stdClass) {
+            throw new UnexpectedValueException('Payload must be a JSON object');
+        }
+        $sig = static::urlsafeB64Decode($cryptob64);
+        if (empty($header->alg)) {
+            throw new UnexpectedValueException('Empty algorithm');
+        }
+        if (empty(static::$supported_algs[$header->alg])) {
+            throw new UnexpectedValueException('Algorithm not supported');
+        }
+        $key = self::getKey($keyOrKeyArray, \property_exists($header, 'kid') ? $header->kid : null);
+        // Check the algorithm
+        if (!self::constantTimeEquals($key->getAlgorithm(), $header->alg)) {
+            // See issue #351
+            throw new UnexpectedValueException('Incorrect key for this algorithm');
+        }
+        if (\in_array($header->alg, ['ES256', 'ES256K', 'ES384'], \true)) {
+            // OpenSSL expects an ASN.1 DER sequence for ES256/ES256K/ES384 signatures
+            $sig = self::signatureToDER($sig);
+        }
+        if (!self::verify("{$headb64}.{$bodyb64}", $sig, $key->getKeyMaterial(), $header->alg)) {
+            throw new SignatureInvalidException('Signature verification failed');
+        }
+        // Check the nbf if it is defined. This is the time that the
+        // token can actually be used. If it's not yet that time, abort.
+        if (isset($payload->nbf) && \floor($payload->nbf) > $timestamp + static::$leeway) {
+            $ex = new BeforeValidException('Cannot handle token with nbf prior to ' . \date(DateTime::ISO8601, (int) $payload->nbf));
+            $ex->setPayload($payload);
+            throw $ex;
+        }
+        // Check that this token has been created before 'now'. This prevents
+        // using tokens that have been created for later use (and haven't
+        // correctly used the nbf claim).
+        if (!isset($payload->nbf) && isset($payload->iat) && \floor($payload->iat) > $timestamp + static::$leeway) {
+            $ex = new BeforeValidException('Cannot handle token with iat prior to ' . \date(DateTime::ISO8601, (int) $payload->iat));
+            $ex->setPayload($payload);
+            throw $ex;
+        }
+        // Check if this token has expired.
+        if (isset($payload->exp) && $timestamp - static::$leeway >= $payload->exp) {
+            $ex = new ExpiredException('Expired token');
+            $ex->setPayload($payload);
+            throw $ex;
+        }
+        return $payload;
+    }
+    /**
+     * Converts and signs a PHP array into a JWT string.
+     *
+     * @param array<mixed>          $payload PHP array
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $key The secret key.
+     * @param string                $alg     Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     *                                       'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     * @param string                $keyId
+     * @param array<string, string> $head    An array with header elements to attach
+     *
+     * @return string A signed JWT
+     *
+     * @uses jsonEncode
+     * @uses urlsafeB64Encode
+     */
+    public static function encode(array $payload, $key, string $alg, string $keyId = null, array $head = null) : string
+    {
+        $header = ['typ' => 'JWT', 'alg' => $alg];
+        if ($keyId !== null) {
+            $header['kid'] = $keyId;
+        }
+        if (isset($head) && \is_array($head)) {
+            $header = \array_merge($head, $header);
+        }
+        $segments = [];
+        $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($header));
+        $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($payload));
+        $signing_input = \implode('.', $segments);
+        $signature = static::sign($signing_input, $key, $alg);
+        $segments[] = static::urlsafeB64Encode($signature);
+        return \implode('.', $segments);
+    }
+    /**
+     * Sign a string with a given key and algorithm.
+     *
+     * @param string $msg  The message to sign
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
+     * @param string $alg  Supported algorithms are 'EdDSA', 'ES384', 'ES256', 'ES256K', 'HS256',
+     *                    'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     *
+     * @return string An encrypted message
+     *
+     * @throws DomainException Unsupported algorithm or bad key was specified
+     */
+    public static function sign(string $msg, $key, string $alg) : string
+    {
+        if (empty(static::$supported_algs[$alg])) {
+            throw new DomainException('Algorithm not supported');
+        }
+        list($function, $algorithm) = static::$supported_algs[$alg];
+        switch ($function) {
+            case 'hash_hmac':
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
+                }
+                return \hash_hmac($algorithm, $msg, $key, \true);
+            case 'openssl':
+                $signature = '';
+                $success = \openssl_sign($msg, $signature, $key, $algorithm);
+                // @phpstan-ignore-line
+                if (!$success) {
+                    throw new DomainException('OpenSSL unable to sign data');
+                }
+                if ($alg === 'ES256' || $alg === 'ES256K') {
+                    $signature = self::signatureFromDER($signature, 256);
+                } elseif ($alg === 'ES384') {
+                    $signature = self::signatureFromDER($signature, 384);
+                }
+                return $signature;
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = \array_filter(\explode("\n", $key));
+                    $key = \base64_decode((string) \end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    return \sodium_crypto_sign_detached($msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
+                }
+        }
+        throw new DomainException('Algorithm not supported');
+    }
+    /**
+     * Verify a signature with the message, key and method. Not all methods
+     * are symmetric, so we must have a separate verify and sign method.
+     *
+     * @param string $msg         The original message (header and body)
+     * @param string $signature   The original signature
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For Ed*, ES*, HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
+     * @param string $alg         The algorithm
+     *
+     * @return bool
+     *
+     * @throws DomainException Invalid Algorithm, bad key, or OpenSSL failure
+     */
+    private static function verify(string $msg, string $signature, $keyMaterial, string $alg) : bool
+    {
+        if (empty(static::$supported_algs[$alg])) {
+            throw new DomainException('Algorithm not supported');
+        }
+        list($function, $algorithm) = static::$supported_algs[$alg];
+        switch ($function) {
+            case 'openssl':
+                $success = \openssl_verify($msg, $signature, $keyMaterial, $algorithm);
+                // @phpstan-ignore-line
+                if ($success === 1) {
+                    return \true;
+                }
+                if ($success === 0) {
+                    return \false;
+                }
+                // returns 1 on success, 0 on failure, -1 on error.
+                throw new DomainException('OpenSSL error: ' . \openssl_error_string());
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_verify_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = \array_filter(\explode("\n", $keyMaterial));
+                    $key = \base64_decode((string) \end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    if (\strlen($signature) === 0) {
+                        throw new DomainException('Signature cannot be empty string');
+                    }
+                    return \sodium_crypto_sign_verify_detached($signature, $msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
+                }
+            case 'hash_hmac':
+            default:
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
+                }
+                $hash = \hash_hmac($algorithm, $msg, $keyMaterial, \true);
+                return self::constantTimeEquals($hash, $signature);
+        }
+    }
+    /**
+     * Decode a JSON string into a PHP object.
+     *
+     * @param string $input JSON string
+     *
+     * @return mixed The decoded JSON string
+     *
+     * @throws DomainException Provided string was invalid JSON
+     */
+    public static function jsonDecode(string $input)
+    {
+        $obj = \json_decode($input, \false, 512, \JSON_BIGINT_AS_STRING);
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
+        } elseif ($obj === null && $input !== 'null') {
+            throw new DomainException('Null result with non-null input');
+        }
+        return $obj;
+    }
+    /**
+     * Encode a PHP array into a JSON string.
+     *
+     * @param array<mixed> $input A PHP array
+     *
+     * @return string JSON representation of the PHP array
+     *
+     * @throws DomainException Provided object could not be encoded to valid JSON
+     */
+    public static function jsonEncode(array $input) : string
+    {
+        if (\PHP_VERSION_ID >= 50400) {
+            $json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
+        } else {
+            // PHP 5.3 only
+            $json = \json_encode($input);
+        }
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
+        } elseif ($json === 'null') {
+            throw new DomainException('Null result with non-null input');
+        }
+        if ($json === \false) {
+            throw new DomainException('Provided object could not be encoded to valid JSON');
+        }
+        return $json;
+    }
+    /**
+     * Decode a string with URL-safe Base64.
+     *
+     * @param string $input A Base64 encoded string
+     *
+     * @return string A decoded string
+     *
+     * @throws InvalidArgumentException invalid base64 characters
+     */
+    public static function urlsafeB64Decode(string $input) : string
+    {
+        return \base64_decode(self::convertBase64UrlToBase64($input));
+    }
+    /**
+     * Convert a string in the base64url (URL-safe Base64) encoding to standard base64.
+     *
+     * @param string $input A Base64 encoded string with URL-safe characters (-_ and no padding)
+     *
+     * @return string A Base64 encoded string with standard characters (+/) and padding (=), when
+     * needed.
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc4648
+     */
+    public static function convertBase64UrlToBase64(string $input) : string
+    {
+        $remainder = \strlen($input) % 4;
+        if ($remainder) {
+            $padlen = 4 - $remainder;
+            $input .= \str_repeat('=', $padlen);
+        }
+        return \strtr($input, '-_', '+/');
+    }
+    /**
+     * Encode a string with URL-safe Base64.
+     *
+     * @param string $input The string you want encoded
+     *
+     * @return string The base64 encode of what you passed in
+     */
+    public static function urlsafeB64Encode(string $input) : string
+    {
+        return \str_replace('=', '', \strtr(\base64_encode($input), '+/', '-_'));
+    }
+    /**
+     * Determine if an algorithm has been provided for each Key
+     *
+     * @param Key|ArrayAccess<string,Key>|array<string,Key> $keyOrKeyArray
+     * @param string|null            $kid
+     *
+     * @throws UnexpectedValueException
+     *
+     * @return Key
+     */
+    private static function getKey($keyOrKeyArray, ?string $kid) : Key
+    {
+        if ($keyOrKeyArray instanceof Key) {
+            return $keyOrKeyArray;
+        }
+        if (empty($kid) && $kid !== '0') {
+            throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
+        }
+        if ($keyOrKeyArray instanceof CachedKeySet) {
+            // Skip "isset" check, as this will automatically refresh if not set
+            return $keyOrKeyArray[$kid];
+        }
+        if (!isset($keyOrKeyArray[$kid])) {
+            throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
+        }
+        return $keyOrKeyArray[$kid];
+    }
+    /**
+     * @param string $left  The string of known length to compare against
+     * @param string $right The user-supplied string
+     * @return bool
+     */
+    public static function constantTimeEquals(string $left, string $right) : bool
+    {
+        if (\function_exists('hash_equals')) {
+            return \hash_equals($left, $right);
+        }
+        $len = \min(self::safeStrlen($left), self::safeStrlen($right));
+        $status = 0;
+        for ($i = 0; $i < $len; $i++) {
+            $status |= \ord($left[$i]) ^ \ord($right[$i]);
+        }
+        $status |= self::safeStrlen($left) ^ self::safeStrlen($right);
+        return $status === 0;
+    }
+    /**
+     * Helper method to create a JSON error.
+     *
+     * @param int $errno An error number from json_last_error()
+     *
+     * @throws DomainException
+     *
+     * @return void
+     */
+    private static function handleJsonError(int $errno) : void
+    {
+        $messages = [\JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', \JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON', \JSON_ERROR_CTRL_CHAR => 'Unexpected control character found', \JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON', \JSON_ERROR_UTF8 => 'Malformed UTF-8 characters'];
+        throw new DomainException(isset($messages[$errno]) ? $messages[$errno] : 'Unknown JSON error: ' . $errno);
+    }
+    /**
+     * Get the number of bytes in cryptographic strings.
+     *
+     * @param string $str
+     *
+     * @return int
+     */
+    private static function safeStrlen(string $str) : int
+    {
+        if (\function_exists('mb_strlen')) {
+            return \mb_strlen($str, '8bit');
+        }
+        return \strlen($str);
+    }
+    /**
+     * Convert an ECDSA signature to an ASN.1 DER sequence
+     *
+     * @param   string $sig The ECDSA signature to convert
+     * @return  string The encoded DER object
+     */
+    private static function signatureToDER(string $sig) : string
+    {
+        // Separate the signature into r-value and s-value
+        $length = \max(1, (int) (\strlen($sig) / 2));
+        list($r, $s) = \str_split($sig, $length);
+        // Trim leading zeros
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+        // Convert r-value and s-value from unsigned big-endian integers to
+        // signed two's complement
+        if (\ord($r[0]) > 0x7f) {
+            $r = "\x00" . $r;
+        }
+        if (\ord($s[0]) > 0x7f) {
+            $s = "\x00" . $s;
+        }
+        return self::encodeDER(self::ASN1_SEQUENCE, self::encodeDER(self::ASN1_INTEGER, $r) . self::encodeDER(self::ASN1_INTEGER, $s));
+    }
+    /**
+     * Encodes a value into a DER object.
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     *
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value) : string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+        // Type
+        $der = \chr($tag_header | $type);
+        // Length
+        $der .= \chr(\strlen($value));
+        return $der . $value;
+    }
+    /**
+     * Encodes signature from a DER object.
+     *
+     * @param   string  $der binary signature in DER format
+     * @param   int     $keySize the number of bits in the key
+     *
+     * @return  string  the signature
+     */
+    private static function signatureFromDER(string $der, int $keySize) : string
+    {
+        // OpenSSL returns the ECDSA signatures as a binary ASN.1 DER SEQUENCE
+        list($offset, $_) = self::readDER($der);
+        list($offset, $r) = self::readDER($der, $offset);
+        list($offset, $s) = self::readDER($der, $offset);
+        // Convert r-value and s-value from signed two's compliment to unsigned
+        // big-endian integers
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+        // Pad out r and s so that they are $keySize bits long
+        $r = \str_pad($r, $keySize / 8, "\x00", \STR_PAD_LEFT);
+        $s = \str_pad($s, $keySize / 8, "\x00", \STR_PAD_LEFT);
+        return $r . $s;
+    }
+    /**
+     * Reads binary DER-encoded data and decodes into a single object
+     *
+     * @param string $der the binary data in DER format
+     * @param int $offset the offset of the data stream containing the object
+     * to decode
+     *
+     * @return array{int, string|null} the new offset and the decoded object
+     */
+    private static function readDER(string $der, int $offset = 0) : array
+    {
+        $pos = $offset;
+        $size = \strlen($der);
+        $constructed = \ord($der[$pos]) >> 5 & 0x1;
+        $type = \ord($der[$pos++]) & 0x1f;
+        // Length
+        $len = \ord($der[$pos++]);
+        if ($len & 0x80) {
+            $n = $len & 0x1f;
+            $len = 0;
+            while ($n-- && $pos < $size) {
+                $len = $len << 8 | \ord($der[$pos++]);
+            }
+        }
+        // Value
+        if ($type === self::ASN1_BIT_STRING) {
+            $pos++;
+            // Skip the first contents octet (padding indicator)
+            $data = \substr($der, $pos, $len - 1);
+            $pos += $len - 1;
+        } elseif (!$constructed) {
+            $data = \substr($der, $pos, $len);
+            $pos += $len;
+        } else {
+            $data = null;
+        }
+        return [$pos, $data];
+    }
+}
diff --git a/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php b/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
new file mode 100644
index 0000000..08f21aa
--- /dev/null
+++ b/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+/** @internal */
+interface JWTExceptionWithPayloadInterface
+{
+    /**
+     * Get the payload that caused this exception.
+     *
+     * @return object
+     */
+    public function getPayload() : object;
+    /**
+     * Get the payload that caused this exception.
+     *
+     * @param object $payload
+     * @return void
+     */
+    public function setPayload(object $payload) : void;
+}
diff --git a/libs/firebase/php-jwt/src/Key.php b/libs/firebase/php-jwt/src/Key.php
new file mode 100644
index 0000000..a6309cd
--- /dev/null
+++ b/libs/firebase/php-jwt/src/Key.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace IndieAuth\Libs\Firebase\JWT;
+
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use TypeError;
+/** @internal */
+class Key
+{
+    /** @var string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate */
+    private $keyMaterial;
+    /** @var string */
+    private $algorithm;
+    /**
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $keyMaterial
+     * @param string $algorithm
+     */
+    public function __construct($keyMaterial, string $algorithm)
+    {
+        if (!\is_string($keyMaterial) && !$keyMaterial instanceof OpenSSLAsymmetricKey && !$keyMaterial instanceof OpenSSLCertificate && !\is_resource($keyMaterial)) {
+            throw new TypeError('Key material must be a string, resource, or OpenSSLAsymmetricKey');
+        }
+        if (empty($keyMaterial)) {
+            throw new InvalidArgumentException('Key material must not be empty');
+        }
+        if (empty($algorithm)) {
+            throw new InvalidArgumentException('Algorithm must not be empty');
+        }
+        // TODO: Remove in PHP 8.0 in favor of class constructor property promotion
+        $this->keyMaterial = $keyMaterial;
+        $this->algorithm = $algorithm;
+    }
+    /**
+     * Return the algorithm valid for this key
+     *
+     * @return string
+     */
+    public function getAlgorithm() : string
+    {
+        return $this->algorithm;
+    }
+    /**
+     * @return string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate
+     */
+    public function getKeyMaterial()
+    {
+        return $this->keyMaterial;
+    }
+}
diff --git a/vendor/firebase/php-jwt/src/SignatureInvalidException.php b/libs/firebase/php-jwt/src/SignatureInvalidException.php
similarity index 58%
rename from vendor/firebase/php-jwt/src/SignatureInvalidException.php
rename to libs/firebase/php-jwt/src/SignatureInvalidException.php
index d35dee9..937fecd 100644
--- a/vendor/firebase/php-jwt/src/SignatureInvalidException.php
+++ b/libs/firebase/php-jwt/src/SignatureInvalidException.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Firebase\JWT;
+namespace IndieAuth\Libs\Firebase\JWT;
 
+/** @internal */
 class SignatureInvalidException extends \UnexpectedValueException
 {
 }
diff --git a/libs/mf2/mf2/Mf2/Parser.php b/libs/mf2/mf2/Mf2/Parser.php
new file mode 100644
index 0000000..8e46f75
--- /dev/null
+++ b/libs/mf2/mf2/Mf2/Parser.php
@@ -0,0 +1,1800 @@
+<?php
+
+namespace IndieAuth\Libs\Mf2;
+
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
+use DOMNode;
+use DOMNodeList;
+use Exception;
+use SplObjectStorage;
+use stdClass;
+/**
+ * Parse Microformats2
+ *
+ * Functional shortcut for the commonest cases of parsing microformats2 from HTML.
+ *
+ * Example usage:
+ *
+ *     use Mf2;
+ *     $output = Mf2\parse('<span class="h-card">Barnaby Walters</span>');
+ *     echo json_encode($output, JSON_PRETTY_PRINT);
+ *
+ * Produces:
+ *
+ *     {
+ *      "items": [
+ *       {
+ *        "type": ["h-card"],
+ *        "properties": {
+ *         "name": ["Barnaby Walters"]
+ *        }
+ *       }
+ *      ],
+ *      "rels": {}
+ *     }
+ *
+ * @param string|DOMDocument $input The HTML string or DOMDocument object to parse
+ * @param string $url The URL the input document was found at, for relative URL resolution
+ * @param bool $convertClassic whether or not to convert classic microformats
+ * @return array Canonical MF2 array structure
+ * @internal
+ */
+function parse($input, $url = null, $convertClassic = \true)
+{
+    $parser = new Parser($input, $url);
+    return $parser->parse($convertClassic);
+}
+/**
+ * Fetch microformats2
+ *
+ * Given a URL, fetches it (following up to 5 redirects) and, if the content-type appears to be HTML, returns the parsed
+ * microformats2 array structure.
+ *
+ * Not that even if the response code was a 4XX or 5XX error, if the content-type is HTML-like then it will be parsed
+ * all the same, as there are legitimate cases where error pages might contain useful microformats (for example a deleted
+ * h-entry resulting in a 410 Gone page with a stub h-entry explaining the reason for deletion). Look in $curlInfo['http_code']
+ * for the actual value.
+ *
+ * @param string $url The URL to fetch
+ * @param bool $convertClassic (optional, default true) whether or not to convert classic microformats
+ * @param &array $curlInfo (optional) the results of curl_getinfo will be placed in this variable for debugging
+ * @return array|null canonical microformats2 array structure on success, null on failure
+ * @internal
+ */
+function fetch($url, $convertClassic = \true, &$curlInfo = null)
+{
+    $ch = \curl_init();
+    \curl_setopt($ch, \CURLOPT_URL, $url);
+    \curl_setopt($ch, \CURLOPT_RETURNTRANSFER, 1);
+    \curl_setopt($ch, \CURLOPT_HEADER, 0);
+    \curl_setopt($ch, \CURLOPT_FOLLOWLOCATION, 1);
+    \curl_setopt($ch, \CURLOPT_MAXREDIRS, 5);
+    \curl_setopt($ch, \CURLOPT_HTTPHEADER, array('Accept: text/html'));
+    $html = \curl_exec($ch);
+    $info = $curlInfo = \curl_getinfo($ch);
+    \curl_close($ch);
+    if (\strpos(\strtolower($info['content_type']), 'html') === \false) {
+        // The content was not delivered as HTML, do not attempt to parse it.
+        return null;
+    }
+    # ensure the final URL is used to resolve relative URLs
+    $url = $info['url'];
+    return parse($html, $url, $convertClassic);
+}
+/**
+ * Unicode to HTML Entities
+ * @param string $input String containing characters to convert into HTML entities
+ * @return string
+ * @internal
+ */
+function unicodeToHtmlEntities($input)
+{
+    return \mb_convert_encoding($input, 'HTML-ENTITIES', \mb_detect_encoding($input));
+}
+/**
+ * Collapse Whitespace
+ *
+ * Collapses any sequences of whitespace within a string into a single space
+ * character.
+ *
+ * @deprecated since v0.2.3
+ * @param string $str
+ * @return string
+ * @internal
+ */
+function collapseWhitespace($str)
+{
+    return \preg_replace('/[\\s|\\n]+/', ' ', $str);
+}
+/** @internal */
+function unicodeTrim($str)
+{
+    // this is cheating. TODO: find a better way if this causes any problems
+    $str = \str_replace(\mb_convert_encoding('&nbsp;', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);
+    $str = \preg_replace('/^\\s+/', '', $str);
+    return \preg_replace('/\\s+$/', '', $str);
+}
+/**
+ * Microformat Name From Class string
+ *
+ * Given the value of @class, get the relevant mf classnames (e.g. h-card,
+ * p-name).
+ *
+ * @param string $class A space delimited list of classnames
+ * @param string $prefix The prefix to look for
+ * @return string|array The prefixed name of the first microfomats class found or false
+ * @internal
+ */
+function mfNamesFromClass($class, $prefix = 'h-')
+{
+    $class = \str_replace(array(' ', '	', "\n"), ' ', $class);
+    $classes = \explode(' ', $class);
+    $classes = \preg_grep('#^(h|p|u|dt|e)-([a-z0-9]+-)?[a-z]+(-[a-z]+)*$#', $classes);
+    $matches = array();
+    foreach ($classes as $classname) {
+        $compare_classname = ' ' . $classname;
+        $compare_prefix = ' ' . $prefix;
+        if (\strstr($compare_classname, $compare_prefix) !== \false && $compare_classname != $compare_prefix) {
+            $matches[] = $prefix === 'h-' ? $classname : \substr($classname, \strlen($prefix));
+        }
+    }
+    return $matches;
+}
+/**
+ * Get Nested µf Property Name From Class
+ *
+ * Returns all the p-, u-, dt- or e- prefixed classnames it finds in a
+ * space-separated string.
+ *
+ * @param string $class
+ * @return array
+ * @internal
+ */
+function nestedMfPropertyNamesFromClass($class)
+{
+    $prefixes = array('p-', 'u-', 'dt-', 'e-');
+    $propertyNames = array();
+    $class = \str_replace(array(' ', '	', "\n"), ' ', $class);
+    foreach (\explode(' ', $class) as $classname) {
+        foreach ($prefixes as $prefix) {
+            // Check if $classname is a valid property classname for $prefix.
+            if (\mb_substr($classname, 0, \mb_strlen($prefix)) == $prefix && $classname != $prefix) {
+                $propertyName = \mb_substr($classname, \mb_strlen($prefix));
+                $propertyNames[$propertyName][] = $prefix;
+            }
+        }
+    }
+    foreach ($propertyNames as $property => $prefixes) {
+        $propertyNames[$property] = \array_unique($prefixes);
+    }
+    return $propertyNames;
+}
+/**
+ * Wraps mfNamesFromClass to handle an element as input (common)
+ *
+ * @param DOMElement $e The element to get the classname for
+ * @param string $prefix The prefix to look for
+ * @return mixed See return value of mf2\Parser::mfNameFromClass()
+ * @internal
+ */
+function mfNamesFromElement(\DOMElement $e, $prefix = 'h-')
+{
+    $class = $e->getAttribute('class');
+    return mfNamesFromClass($class, $prefix);
+}
+/**
+ * Wraps nestedMfPropertyNamesFromClass to handle an element as input
+ * @internal
+ */
+function nestedMfPropertyNamesFromElement(\DOMElement $e)
+{
+    $class = $e->getAttribute('class');
+    return nestedMfPropertyNamesFromClass($class);
+}
+/**
+ * Converts various time formats to HH:MM
+ * @param string $time The time to convert
+ * @return string
+ * @internal
+ */
+function convertTimeFormat($time)
+{
+    $hh = $mm = $ss = '';
+    \preg_match('/(\\d{1,2}):?(\\d{2})?:?(\\d{2})?(a\\.?m\\.?|p\\.?m\\.?)?/i', $time, $matches);
+    // If no am/pm is specified:
+    if (empty($matches[4])) {
+        return $time;
+    } else {
+        // Otherwise, am/pm is specified.
+        $meridiem = \strtolower(\str_replace('.', '', $matches[4]));
+        // Hours.
+        $hh = $matches[1];
+        // Add 12 to hours if pm applies.
+        if ($meridiem == 'pm' && $hh < 12) {
+            $hh += 12;
+        }
+        $hh = \str_pad($hh, 2, '0', \STR_PAD_LEFT);
+        // Minutes.
+        $mm = empty($matches[2]) ? '00' : $matches[2];
+        // Seconds, only if supplied.
+        if (!empty($matches[3])) {
+            $ss = $matches[3];
+        }
+        if (empty($ss)) {
+            return \sprintf('%s:%s', $hh, $mm);
+        } else {
+            return \sprintf('%s:%s:%s', $hh, $mm, $ss);
+        }
+    }
+}
+/**
+ * Normalize an ordinal date to YYYY-MM-DD
+ * This function should only be called after validating the $dtValue
+ * matches regex \d{4}-\d{2}
+ * @param string $dtValue
+ * @return string
+ * @internal
+ */
+function normalizeOrdinalDate($dtValue)
+{
+    list($year, $day) = \explode('-', $dtValue, 2);
+    $day = \intval($day);
+    if ($day < 367 && $day > 0) {
+        $date = \DateTime::createFromFormat('Y-z', $dtValue);
+        $date->modify('-1 day');
+        # 'z' format is zero-based so need to adjust
+        if ($date->format('Y') === $year) {
+            return $date->format('Y-m-d');
+        }
+    }
+    return '';
+}
+/**
+ * If a date value has a timezone offset, normalize it.
+ * @param string $dtValue
+ * @return string isolated, normalized TZ offset for implied TZ for other dt- properties
+ * @internal
+ */
+function normalizeTimezoneOffset(&$dtValue)
+{
+    \preg_match('/Z|[+-]\\d{1,2}:?(\\d{2})?$/i', $dtValue, $matches);
+    if (empty($matches)) {
+        return null;
+    }
+    $timezoneOffset = null;
+    if ($matches[0] != 'Z') {
+        $timezoneString = \str_replace(':', '', $matches[0]);
+        $plus_minus = \substr($timezoneString, 0, 1);
+        $timezoneOffset = \substr($timezoneString, 1);
+        if (\strlen($timezoneOffset) <= 2) {
+            $timezoneOffset .= '00';
+        }
+        $timezoneOffset = \str_pad($timezoneOffset, 4, 0, \STR_PAD_LEFT);
+        $timezoneOffset = $plus_minus . $timezoneOffset;
+        $dtValue = \preg_replace('/Z?[+-]\\d{1,2}:?(\\d{2})?$/i', $timezoneOffset, $dtValue);
+    }
+    return $timezoneOffset;
+}
+/** @internal */
+function applySrcsetUrlTransformation($srcset, $transformation)
+{
+    return \implode(', ', \array_filter(\array_map(function ($srcsetPart) use($transformation) {
+        $parts = \explode(" \t\n\r\x00\v", \trim($srcsetPart), 2);
+        $parts[0] = \rtrim($parts[0]);
+        if (empty($parts[0])) {
+            return \false;
+        }
+        $parts[0] = \call_user_func($transformation, $parts[0]);
+        return $parts[0] . (empty($parts[1]) ? '' : ' ' . $parts[1]);
+    }, \explode(',', \trim($srcset)))));
+}
+/**
+ * Microformats2 Parser
+ *
+ * A class which holds state for parsing microformats2 from HTML.
+ *
+ * Example usage:
+ *
+ *     use Mf2;
+ *     $parser = new Mf2\Parser('<p class="h-card">Barnaby Walters</p>');
+ *     $output = $parser->parse();
+ * @internal
+ */
+class Parser
+{
+    /** @var string The baseurl (if any) to use for this parse */
+    public $baseurl;
+    /** @var DOMXPath object which can be used to query over any fragment*/
+    public $xpath;
+    /** @var DOMDocument */
+    public $doc;
+    /** @var SplObjectStorage */
+    protected $parsed;
+    /**
+     * @var bool
+     */
+    public $jsonMode;
+    /** @var boolean Whether to include experimental language parsing in the result */
+    public $lang = \false;
+    /** @var bool Whether to include alternates object (dropped from spec in favor of rel-urls) */
+    public $enableAlternates = \false;
+    /**
+     * Elements upgraded to mf2 during backcompat
+     * @var SplObjectStorage
+     */
+    protected $upgraded;
+    /**
+     * Whether to convert classic microformats
+     * @var bool
+     */
+    public $convertClassic;
+    /**
+     * Constructor
+     *
+     * @param DOMDocument|string $input The data to parse. A string of HTML or a DOMDocument
+     * @param string $url The URL of the parsed document, for relative URL resolution
+     * @param boolean $jsonMode Whether or not to use a stdClass instance for an empty `rels` dictionary. This breaks PHP looping over rels, but allows the output to be correctly serialized as JSON.
+     */
+    public function __construct($input, $url = null, $jsonMode = \false)
+    {
+        \libxml_use_internal_errors(\true);
+        if (\is_string($input)) {
+            if (\class_exists('IndieAuth\\Libs\\Masterminds\\HTML5')) {
+                $doc = new \IndieAuth\Libs\Masterminds\HTML5(array('disable_html_ns' => \true));
+                $doc = $doc->loadHTML($input);
+            } else {
+                $doc = new DOMDocument();
+                @$doc->loadHTML(unicodeToHtmlEntities($input), \LIBXML_NOWARNING);
+            }
+        } elseif (\is_a($input, 'DOMDocument')) {
+            $doc = clone $input;
+        } else {
+            $doc = new DOMDocument();
+            @$doc->loadHTML('');
+        }
+        $this->xpath = new DOMXPath($doc);
+        $baseurl = $url;
+        foreach ($this->xpath->query('//base[@href]') as $base) {
+            $baseElementUrl = $base->getAttribute('href');
+            if (\parse_url($baseElementUrl, \PHP_URL_SCHEME) === null) {
+                /* The base element URL is relative to the document URL.
+                 *
+                 * :/
+                 *
+                 * Perhaps the author was high? */
+                $baseurl = resolveUrl($url, $baseElementUrl);
+            } else {
+                $baseurl = $baseElementUrl;
+            }
+            break;
+        }
+        // Ignore <template> elements as per the HTML5 spec
+        foreach ($this->xpath->query('//template') as $templateEl) {
+            $templateEl->parentNode->removeChild($templateEl);
+        }
+        $this->baseurl = $baseurl;
+        $this->doc = $doc;
+        $this->parsed = new SplObjectStorage();
+        $this->upgraded = new SplObjectStorage();
+        $this->jsonMode = $jsonMode;
+    }
+    private function elementPrefixParsed(\DOMElement $e, $prefix)
+    {
+        if (!$this->parsed->contains($e)) {
+            $this->parsed->attach($e, array());
+        }
+        $prefixes = $this->parsed[$e];
+        $prefixes[] = $prefix;
+        $this->parsed[$e] = $prefixes;
+    }
+    /**
+     * Determine if the element has already been parsed
+     * @param DOMElement $e
+     * @param string $prefix
+     * @return bool
+     */
+    private function isElementParsed(\DOMElement $e, $prefix)
+    {
+        if (!$this->parsed->contains($e)) {
+            return \false;
+        }
+        $prefixes = $this->parsed[$e];
+        if (!\in_array($prefix, $prefixes)) {
+            return \false;
+        }
+        return \true;
+    }
+    /**
+     * Determine if the element's specified property has already been upgraded during backcompat
+     * @param DOMElement $el
+     * @param string $property
+     * @return bool
+     */
+    private function isElementUpgraded(\DOMElement $el, $property)
+    {
+        if ($this->upgraded->contains($el)) {
+            if (\in_array($property, $this->upgraded[$el])) {
+                return \true;
+            }
+        }
+        return \false;
+    }
+    private function resolveChildUrls(DOMElement $el)
+    {
+        $hyperlinkChildren = $this->xpath->query('.//*[@src or @href or @data]', $el);
+        foreach ($hyperlinkChildren as $child) {
+            if ($child->hasAttribute('href')) {
+                $child->setAttribute('href', $this->resolveUrl($child->getAttribute('href')));
+            }
+            if ($child->hasAttribute('src')) {
+                $child->setAttribute('src', $this->resolveUrl($child->getAttribute('src')));
+            }
+            if ($child->hasAttribute('srcset')) {
+                $child->setAttribute('srcset', applySrcsetUrlTransformation($child->getAttribute('href'), array($this, 'resolveUrl')));
+            }
+            if ($child->hasAttribute('data')) {
+                $child->setAttribute('data', $this->resolveUrl($child->getAttribute('data')));
+            }
+        }
+    }
+    /**
+     * The following two methods implements plain text parsing.
+     * @param DOMElement $element
+     * @param bool $implied
+     * @see https://wiki.zegnat.net/media/textparsing.html
+     **/
+    public function textContent(DOMElement $element, $implied = \false)
+    {
+        return \preg_replace('/(^[\\t\\n\\f\\r ]+| +(?=\\n)|(?<=\\n) +| +(?= )|[\\t\\n\\f\\r ]+$)/', '', $this->elementToString($element, $implied));
+    }
+    private function elementToString(DOMElement $input, $implied = \false)
+    {
+        $output = '';
+        foreach ($input->childNodes as $child) {
+            if ($child->nodeType === \XML_TEXT_NODE) {
+                $output .= \str_replace(array("\t", "\n", "\r"), ' ', $child->textContent);
+            } else {
+                if ($child->nodeType === \XML_ELEMENT_NODE) {
+                    $tagName = \strtoupper($child->tagName);
+                    if (\in_array($tagName, array('SCRIPT', 'STYLE'))) {
+                        continue;
+                    } else {
+                        if ($tagName === 'IMG') {
+                            if ($child->hasAttribute('alt')) {
+                                $output .= ' ' . \trim($child->getAttribute('alt'), "\t\n\f\r ") . ' ';
+                            } else {
+                                if (!$implied && $child->hasAttribute('src')) {
+                                    $output .= ' ' . $this->resolveUrl(\trim($child->getAttribute('src'), "\t\n\f\r ")) . ' ';
+                                }
+                            }
+                        } else {
+                            if ($tagName === 'BR') {
+                                $output .= "\n";
+                            } else {
+                                if ($tagName === 'P') {
+                                    $output .= "\n" . $this->elementToString($child);
+                                } else {
+                                    $output .= $this->elementToString($child);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return $output;
+    }
+    /**
+     * Given an img property, parse its value and/or alt text
+     * @param DOMElement $el
+     * @access public
+     * @return string|array
+     */
+    public function parseImg(DOMElement $el)
+    {
+        if ($el->hasAttribute('alt')) {
+            return ['value' => $this->resolveUrl($el->getAttribute('src')), 'alt' => $el->getAttribute('alt')];
+        }
+        return $el->getAttribute('src');
+    }
+    /**
+     * This method parses the language of an element
+     * @param DOMElement $el
+     * @access public
+     * @return string
+     */
+    public function language(DOMElement $el)
+    {
+        // element has a lang attribute; use it
+        if ($el->hasAttribute('lang')) {
+            return unicodeTrim($el->getAttribute('lang'));
+        }
+        if ($el->tagName == 'html') {
+            // we're at the <html> element and no lang; check <meta> http-equiv Content-Language
+            foreach ($this->xpath->query('.//meta[@http-equiv]') as $node) {
+                if ($node->hasAttribute('http-equiv') && $node->hasAttribute('content') && \strtolower($node->getAttribute('http-equiv')) == 'content-language') {
+                    return unicodeTrim($node->getAttribute('content'));
+                }
+            }
+        } elseif ($el->parentNode instanceof DOMElement) {
+            // check the parent node
+            return $this->language($el->parentNode);
+        }
+        return '';
+    }
+    # end method language()
+    // TODO: figure out if this has problems with sms: and geo: URLs
+    public function resolveUrl($url)
+    {
+        // If not a string then return.
+        if (!\is_string($url)) {
+            return $url;
+        }
+        // If the URL is seriously malformed it’s probably beyond the scope of this
+        // parser to try to do anything with it.
+        if (\parse_url($url) === \false) {
+            return $url;
+        }
+        // per issue #40 valid URLs could have a space on either side
+        $url = \trim($url);
+        $scheme = \parse_url($url, \PHP_URL_SCHEME);
+        if (empty($scheme) and !empty($this->baseurl)) {
+            return resolveUrl($this->baseurl, $url);
+        } else {
+            return $url;
+        }
+    }
+    // Parsing Functions
+    /**
+     * Parse value-class/value-title on an element, joining with $separator if
+     * there are multiple.
+     *
+     * @param \DOMElement $e
+     * @param string $separator = '' if multiple value-title elements, join with this string
+     * @return string|null the parsed value or null if value-class or -title aren’t in use
+     */
+    public function parseValueClassTitle(\DOMElement $e, $separator = '')
+    {
+        $valueClassElements = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value ")]', $e);
+        if ($valueClassElements->length !== 0) {
+            // Process value-class stuff
+            $val = '';
+            foreach ($valueClassElements as $el) {
+                $val .= $this->textContent($el);
+            }
+            return unicodeTrim($val);
+        }
+        $valueTitleElements = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value-title ")]', $e);
+        if ($valueTitleElements->length !== 0) {
+            // Process value-title stuff
+            $val = '';
+            foreach ($valueTitleElements as $el) {
+                $val .= $el->getAttribute('title');
+            }
+            return unicodeTrim($val);
+        }
+        // No value-title or -class in this element
+        return null;
+    }
+    /**
+     * Given an element with class="p-*", get its value
+     *
+     * @param DOMElement $p The element to parse
+     * @return string The plaintext value of $p, dependant on type
+     * @todo Make this adhere to value-class
+     */
+    public function parseP(\DOMElement $p)
+    {
+        $classTitle = $this->parseValueClassTitle($p, ' ');
+        if ($classTitle !== null) {
+            return $classTitle;
+        }
+        $this->resolveChildUrls($p);
+        if ($p->tagName == 'img' and $p->hasAttribute('alt')) {
+            $pValue = $p->getAttribute('alt');
+        } elseif ($p->tagName == 'area' and $p->hasAttribute('alt')) {
+            $pValue = $p->getAttribute('alt');
+        } elseif (($p->tagName == 'abbr' or $p->tagName == 'link') and $p->hasAttribute('title')) {
+            $pValue = $p->getAttribute('title');
+        } elseif (\in_array($p->tagName, array('data', 'input')) and $p->hasAttribute('value')) {
+            $pValue = $p->getAttribute('value');
+        } else {
+            $pValue = $this->textContent($p);
+        }
+        return $pValue;
+    }
+    /**
+     * Given an element with class="u-*", get the value of the URL
+     *
+     * @param DOMElement $u The element to parse
+     * @return string The plaintext value of $u, dependant on type
+     * @todo make this adhere to value-class
+     */
+    public function parseU(\DOMElement $u)
+    {
+        if (($u->tagName == 'a' or $u->tagName == 'area' or $u->tagName == 'link') and $u->hasAttribute('href')) {
+            $uValue = $u->getAttribute('href');
+        } elseif ($u->tagName == 'img' and $u->hasAttribute('src')) {
+            $uValue = $this->parseImg($u);
+        } elseif (\in_array($u->tagName, array('audio', 'video', 'source', 'iframe')) and $u->hasAttribute('src')) {
+            $uValue = $u->getAttribute('src');
+        } elseif ($u->tagName == 'video' and !$u->hasAttribute('src') and $u->hasAttribute('poster')) {
+            $uValue = $u->getAttribute('poster');
+        } elseif ($u->tagName == 'object' and $u->hasAttribute('data')) {
+            $uValue = $u->getAttribute('data');
+        } elseif (($classTitle = $this->parseValueClassTitle($u)) !== null) {
+            $uValue = $classTitle;
+        } elseif (($u->tagName == 'abbr' or $u->tagName == 'link') and $u->hasAttribute('title')) {
+            $uValue = $u->getAttribute('title');
+        } elseif (\in_array($u->tagName, array('data', 'input')) and $u->hasAttribute('value')) {
+            $uValue = $u->getAttribute('value');
+        } else {
+            $uValue = $this->textContent($u);
+        }
+        return $this->resolveUrl($uValue);
+    }
+    /**
+     * Given an element with class="dt-*", get the value of the datetime as a php date object
+     *
+     * @param DOMElement $dt The element to parse
+     * @param array $dates Array of dates processed so far
+     * @param string $impliedTimezone
+     * @return string The datetime string found
+     */
+    public function parseDT(\DOMElement $dt, &$dates = array(), &$impliedTimezone = null)
+    {
+        // Check for value-class pattern
+        $valueClassChildren = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value ") or contains(concat(" ", @class, " "), " value-title ")]', $dt);
+        $dtValue = \false;
+        if ($valueClassChildren->length > 0) {
+            // They’re using value-class
+            $dateParts = array();
+            foreach ($valueClassChildren as $e) {
+                if (\strstr(' ' . $e->getAttribute('class') . ' ', ' value-title ')) {
+                    $title = $e->getAttribute('title');
+                    if (!empty($title)) {
+                        $dateParts[] = $title;
+                    }
+                } elseif ($e->tagName == 'img' or $e->tagName == 'area') {
+                    // Use @alt
+                    $alt = $e->getAttribute('alt');
+                    if (!empty($alt)) {
+                        $dateParts[] = $alt;
+                    }
+                } elseif ($e->tagName == 'data') {
+                    // Use @value, otherwise innertext
+                    $value = $e->hasAttribute('value') ? $e->getAttribute('value') : unicodeTrim($e->nodeValue);
+                    if (!empty($value)) {
+                        $dateParts[] = $value;
+                    }
+                } elseif ($e->tagName == 'abbr') {
+                    // Use @title, otherwise innertext
+                    $title = $e->hasAttribute('title') ? $e->getAttribute('title') : unicodeTrim($e->nodeValue);
+                    if (!empty($title)) {
+                        $dateParts[] = $title;
+                    }
+                } elseif ($e->tagName == 'del' or $e->tagName == 'ins' or $e->tagName == 'time') {
+                    // Use @datetime if available, otherwise innertext
+                    $dtAttr = $e->hasAttribute('datetime') ? $e->getAttribute('datetime') : unicodeTrim($e->nodeValue);
+                    if (!empty($dtAttr)) {
+                        $dateParts[] = $dtAttr;
+                    }
+                } else {
+                    if (!empty($e->nodeValue)) {
+                        $dateParts[] = unicodeTrim($e->nodeValue);
+                    }
+                }
+            }
+            // Look through dateParts
+            $datePart = '';
+            $timePart = '';
+            $timezonePart = '';
+            foreach ($dateParts as $part) {
+                // Is this part a full ISO8601 datetime?
+                if (\preg_match('/^\\d{4}-\\d{2}-\\d{2}[ T]\\d{2}:\\d{2}(:\\d{2})?(Z|[+-]\\d{2}:?\\d{2})?$/', $part)) {
+                    // Break completely, we’ve got our value.
+                    $dtValue = $part;
+                    break;
+                } else {
+                    // Is the current part a valid time(+TZ?) AND no other time representation has been found?
+                    if ((\preg_match('/^\\d{1,2}:\\d{2}(:\\d{2})?(Z|[+-]\\d{1,2}:?\\d{2})?$/', $part) or \preg_match('/^\\d{1,2}(:\\d{2})?(:\\d{2})?[ap]\\.?m\\.?$/i', $part)) and empty($timePart)) {
+                        $timePart = $part;
+                        $timezoneOffset = normalizeTimezoneOffset($timePart);
+                        if (!$impliedTimezone && $timezoneOffset) {
+                            $impliedTimezone = $timezoneOffset;
+                        }
+                        // Is the current part a valid date AND no other date representation has been found?
+                    } elseif (\preg_match('/^\\d{4}-\\d{2}-\\d{2}$/', $part) and empty($datePart)) {
+                        $datePart = $part;
+                        // Is the current part a valid ordinal date AND no other date representation has been found?
+                    } elseif (\preg_match('/^\\d{4}-\\d{3}$/', $part) and empty($datePart)) {
+                        $datePart = normalizeOrdinalDate($part);
+                        // Is the current part a valid timezone offset AND no other timezone part has been found?
+                    } elseif (\preg_match('/^(Z|[+-]\\d{1,2}:?(\\d{2})?)$/', $part) and empty($timezonePart)) {
+                        $timezonePart = $part;
+                        $timezoneOffset = normalizeTimezoneOffset($timezonePart);
+                        if (!$impliedTimezone && $timezoneOffset) {
+                            $impliedTimezone = $timezoneOffset;
+                        }
+                        // Current part already represented by other VCP parts; do nothing with it
+                    } else {
+                        continue;
+                    }
+                    if (!empty($datePart) && !\in_array($datePart, $dates)) {
+                        $dates[] = $datePart;
+                    }
+                    if (!empty($timezonePart) && !empty($timePart)) {
+                        $timePart .= $timezonePart;
+                    }
+                    $dtValue = '';
+                    if (empty($datePart) && !empty($timePart)) {
+                        $timePart = convertTimeFormat($timePart);
+                        $dtValue = unicodeTrim($timePart);
+                    } else {
+                        if (!empty($datePart) && empty($timePart)) {
+                            $dtValue = \rtrim($datePart, 'T');
+                        } else {
+                            $timePart = convertTimeFormat($timePart);
+                            $dtValue = \rtrim($datePart, 'T') . ' ' . unicodeTrim($timePart);
+                        }
+                    }
+                }
+            }
+        } else {
+            // Not using value-class (phew).
+            if ($dt->tagName == 'img' or $dt->tagName == 'area') {
+                // Use @alt
+                // Is it an entire dt?
+                $alt = $dt->getAttribute('alt');
+                if (!empty($alt)) {
+                    $dtValue = $alt;
+                }
+            } elseif (\in_array($dt->tagName, array('data'))) {
+                // Use @value, otherwise innertext
+                // Is it an entire dt?
+                $value = $dt->getAttribute('value');
+                if (!empty($value)) {
+                    $dtValue = $value;
+                } else {
+                    $dtValue = $this->textContent($dt);
+                }
+            } elseif ($dt->tagName == 'abbr') {
+                // Use @title, otherwise innertext
+                // Is it an entire dt?
+                $title = $dt->getAttribute('title');
+                if (!empty($title)) {
+                    $dtValue = $title;
+                } else {
+                    $dtValue = $this->textContent($dt);
+                }
+            } elseif ($dt->tagName == 'del' or $dt->tagName == 'ins' or $dt->tagName == 'time') {
+                // Use @datetime if available, otherwise innertext
+                // Is it an entire dt?
+                $dtAttr = $dt->getAttribute('datetime');
+                if (!empty($dtAttr)) {
+                    $dtValue = $dtAttr;
+                } else {
+                    $dtValue = $this->textContent($dt);
+                }
+            } else {
+                $dtValue = $this->textContent($dt);
+            }
+            // if the dtValue is not just YYYY-MM-DD
+            if (!\preg_match('/^(\\d{4}-\\d{2}-\\d{2})$/', $dtValue)) {
+                // no implied timezone set and dtValue has a TZ offset, use un-normalized TZ offset
+                \preg_match('/Z|[+-]\\d{1,2}:?(\\d{2})?$/i', $dtValue, $matches);
+                if (!$impliedTimezone && !empty($matches[0])) {
+                    $impliedTimezone = $matches[0];
+                }
+            }
+            $dtValue = unicodeTrim($dtValue);
+            // Store the date part so that we can use it when assembling the final timestamp if the next one is missing a date part
+            if (\preg_match('/(\\d{4}-\\d{2}-\\d{2})/', $dtValue, $matches)) {
+                $dates[] = $matches[0];
+            }
+        }
+        /**
+         * if $dtValue is only a time and there are recently parsed dates,
+         * form the full date-time using the most recently parsed dt- value
+         */
+        if ((\preg_match('/^\\d{1,2}:\\d{2}(:\\d{2})?(Z|[+-]\\d{2}:?\\d{2}?)?$/', $dtValue) or \preg_match('/^\\d{1,2}(:\\d{2})?(:\\d{2})?[ap]\\.?m\\.?$/i', $dtValue)) && !empty($dates)) {
+            $timezoneOffset = normalizeTimezoneOffset($dtValue);
+            if (!$impliedTimezone && $timezoneOffset) {
+                $impliedTimezone = $timezoneOffset;
+            }
+            $dtValue = convertTimeFormat($dtValue);
+            $dtValue = \end($dates) . ' ' . unicodeTrim($dtValue);
+        }
+        return $dtValue;
+    }
+    /**
+     * 	Given the root element of some embedded markup, return a string representing that markup
+     *
+     * 	@param DOMElement $e The element to parse
+     * 	@return string $e’s innerHTML
+     *
+     * @todo need to mark this element as e- parsed so it doesn’t get parsed as it’s parent’s e-* too
+     */
+    public function parseE(\DOMElement $e)
+    {
+        $classTitle = $this->parseValueClassTitle($e);
+        if ($classTitle !== null) {
+            return $classTitle;
+        }
+        // Expand relative URLs within children of this element
+        // TODO: as it is this is not relative to only children, make this .// and rerun tests
+        $this->resolveChildUrls($e);
+        // Temporarily move all descendants into a separate DocumentFragment.
+        // This way we can DOMDocument::saveHTML on the entire collection at once.
+        // Running DOMDocument::saveHTML per node may add whitespace that isn't in source.
+        // See https://stackoverflow.com/q/38317903
+        if ($innerNodes = $e->ownerDocument->createDocumentFragment()) {
+            while ($e->hasChildNodes()) {
+                $innerNodes->appendChild($e->firstChild);
+            }
+            $html = $e->ownerDocument->saveHtml($innerNodes);
+            // Put the nodes back in place.
+            if ($innerNodes->hasChildNodes()) {
+                $e->appendChild($innerNodes);
+            }
+        }
+        $return = array('html' => unicodeTrim($html), 'value' => $this->textContent($e));
+        if ($this->lang) {
+            // Language
+            if ($html_lang = $this->language($e)) {
+                $return['lang'] = $html_lang;
+            }
+        }
+        return $return;
+    }
+    private function removeTags(\DOMElement &$e, $tagName)
+    {
+        while (($r = $e->getElementsByTagName($tagName)) && $r->length) {
+            $r->item(0)->parentNode->removeChild($r->item(0));
+        }
+    }
+    /**
+     * Recursively parse microformats
+     *
+     * @param DOMElement $e The element to parse
+     * @param bool $is_backcompat Whether using backcompat parsing or not
+     * @param bool $has_nested_mf Whether this microformat has a nested microformat
+     * @return array A representation of the values contained within microformat $e
+     */
+    public function parseH(\DOMElement $e, $is_backcompat = \false, $has_nested_mf = \false)
+    {
+        // If it’s already been parsed (e.g. is a child mf), skip
+        if ($this->parsed->contains($e)) {
+            return null;
+        }
+        // Get current µf name
+        $mfTypes = mfNamesFromElement($e, 'h-');
+        if (!$mfTypes) {
+            return null;
+        }
+        // Initalise var to store the representation in
+        $return = array();
+        $children = array();
+        $dates = array();
+        $prefixes = array();
+        $impliedTimezone = null;
+        if ($e->tagName == 'area') {
+            $coords = $e->getAttribute('coords');
+            $shape = $e->getAttribute('shape');
+        }
+        // Handle p-*
+        foreach ($this->xpath->query('.//*[contains(concat(" ", @class) ," p-")]', $e) as $p) {
+            // element is already parsed
+            if ($this->isElementParsed($p, 'p')) {
+                continue;
+                // backcompat parsing and element was not upgraded; skip it
+            } else {
+                if ($is_backcompat && empty($this->upgraded[$p])) {
+                    $this->elementPrefixParsed($p, 'p');
+                    continue;
+                }
+            }
+            $prefixes[] = 'p-';
+            $pValue = $this->parseP($p);
+            // Add the value to the array for it’s p- properties
+            foreach (mfNamesFromElement($p, 'p-') as $propName) {
+                if (!empty($propName)) {
+                    $return[$propName][] = $pValue;
+                }
+            }
+            // Make sure this sub-mf won’t get parsed as a top level mf
+            $this->elementPrefixParsed($p, 'p');
+        }
+        // Handle u-*
+        foreach ($this->xpath->query('.//*[contains(concat(" ",  @class)," u-")]', $e) as $u) {
+            // element is already parsed
+            if ($this->isElementParsed($u, 'u')) {
+                continue;
+                // backcompat parsing and element was not upgraded; skip it
+            } else {
+                if ($is_backcompat && empty($this->upgraded[$u])) {
+                    $this->elementPrefixParsed($u, 'u');
+                    continue;
+                }
+            }
+            $prefixes[] = 'u-';
+            $uValue = $this->parseU($u);
+            // Add the value to the array for it’s property types
+            foreach (mfNamesFromElement($u, 'u-') as $propName) {
+                $return[$propName][] = $uValue;
+            }
+            // Make sure this sub-mf won’t get parsed as a top level mf
+            $this->elementPrefixParsed($u, 'u');
+        }
+        $temp_dates = array();
+        // Handle dt-*
+        foreach ($this->xpath->query('.//*[contains(concat(" ", @class), " dt-")]', $e) as $dt) {
+            // element is already parsed
+            if ($this->isElementParsed($dt, 'dt')) {
+                continue;
+                // backcompat parsing and element was not upgraded; skip it
+            } else {
+                if ($is_backcompat && empty($this->upgraded[$dt])) {
+                    $this->elementPrefixParsed($dt, 'dt');
+                    continue;
+                }
+            }
+            $prefixes[] = 'dt-';
+            $dtValue = $this->parseDT($dt, $dates, $impliedTimezone);
+            if ($dtValue) {
+                // Add the value to the array for dt- properties
+                foreach (mfNamesFromElement($dt, 'dt-') as $propName) {
+                    $temp_dates[$propName][] = $dtValue;
+                }
+            }
+            // Make sure this sub-mf won’t get parsed as a top level mf
+            $this->elementPrefixParsed($dt, 'dt');
+        }
+        foreach ($temp_dates as $propName => $data) {
+            foreach ($data as $dtValue) {
+                // var_dump(preg_match('/[+-]\d{2}(\d{2})?$/i', $dtValue));
+                if ($impliedTimezone && \preg_match('/(Z|[+-]\\d{2}:?(\\d{2})?)$/i', $dtValue, $matches) == 0) {
+                    $dtValue .= $impliedTimezone;
+                }
+                $return[$propName][] = $dtValue;
+            }
+        }
+        // Handle e-*
+        foreach ($this->xpath->query('.//*[contains(concat(" ", @class)," e-")]', $e) as $em) {
+            // element is already parsed
+            if ($this->isElementParsed($em, 'e')) {
+                continue;
+                // backcompat parsing and element was not upgraded; skip it
+            } else {
+                if ($is_backcompat && empty($this->upgraded[$em])) {
+                    $this->elementPrefixParsed($em, 'e');
+                    continue;
+                }
+            }
+            $prefixes[] = 'e-';
+            $eValue = $this->parseE($em);
+            if ($eValue) {
+                // Add the value to the array for e- properties
+                foreach (mfNamesFromElement($em, 'e-') as $propName) {
+                    $return[$propName][] = $eValue;
+                }
+            }
+            // Make sure this sub-mf won’t get parsed as a top level mf
+            $this->elementPrefixParsed($em, 'e');
+        }
+        // Do we need to imply a name property?
+        // if no explicit "name" property, and no other p-* or e-* properties, and no nested microformats,
+        if (!\array_key_exists('name', $return) && !\in_array('p-', $prefixes) && !\in_array('e-', $prefixes) && !$has_nested_mf && !$is_backcompat && empty($this->upgraded[$e])) {
+            $name = \false;
+            // img.h-x[alt] or area.h-x[alt]
+            if (($e->tagName === 'img' || $e->tagName === 'area') && $e->hasAttribute('alt')) {
+                $name = $e->getAttribute('alt');
+                // abbr.h-x[title]
+            } elseif ($e->tagName === 'abbr' && $e->hasAttribute('title')) {
+                $name = $e->getAttribute('title');
+            } else {
+                $xpaths = array(
+                    // .h-x>img:only-child[alt]:not([alt=""]):not[.h-*]
+                    './img[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @alt and string-length(@alt) != 0]',
+                    // .h-x>area:only-child[alt]:not([alt=""]):not[.h-*]
+                    './area[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @alt and string-length(@alt) != 0]',
+                    // .h-x>abbr:only-child[title]:not([title=""]):not[.h-*]
+                    './abbr[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @title and string-length(@title) != 0]',
+                    // .h-x>:only-child:not[.h-*]>img:only-child[alt]:not([alt=""]):not[.h-*]
+                    './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/img[not(contains(concat(" ", @class), " h-")) and @alt and string-length(@alt) != 0]',
+                    // .h-x>:only-child:not[.h-*]>area:only-child[alt]:not([alt=""]):not[.h-*]
+                    './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/area[not(contains(concat(" ", @class), " h-")) and @alt and string-length(@alt) != 0]',
+                    // .h-x>:only-child:not[.h-*]>abbr:only-child[title]:not([title=""]):not[.h-*]
+                    './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/abbr[not(contains(concat(" ", @class), " h-")) and @title and string-length(@title) != 0]',
+                );
+                foreach ($xpaths as $xpath) {
+                    $nameElement = $this->xpath->query($xpath, $e);
+                    if ($nameElement !== \false && $nameElement->length === 1) {
+                        $nameElement = $nameElement->item(0);
+                        if ($nameElement->tagName === 'img' || $nameElement->tagName === 'area') {
+                            $name = $nameElement->getAttribute('alt');
+                        } else {
+                            $name = $nameElement->getAttribute('title');
+                        }
+                        break;
+                    }
+                }
+            }
+            if ($name === \false) {
+                $name = $this->textContent($e, \true);
+            }
+            $return['name'][] = unicodeTrim($name);
+        }
+        // Check for u-photo
+        if (!\array_key_exists('photo', $return) && !\in_array('u-', $prefixes) && !$has_nested_mf && !$is_backcompat) {
+            $photo = $this->parseImpliedPhoto($e);
+            if ($photo !== \false) {
+                $return['photo'][] = $photo;
+            }
+        }
+        // Do we need to imply a url property?
+        // if no explicit "url" property, and no other explicit u-* properties, and no nested microformats
+        if (!\array_key_exists('url', $return) && !\in_array('u-', $prefixes) && !$has_nested_mf && !$is_backcompat) {
+            // a.h-x[href] or area.h-x[href]
+            if (($e->tagName === 'a' || $e->tagName === 'area') && $e->hasAttribute('href')) {
+                $return['url'][] = $this->resolveUrl($e->getAttribute('href'));
+            } else {
+                $xpaths = array(
+                    // .h-x>a[href]:only-of-type:not[.h-*]
+                    './a[not(contains(concat(" ", @class), " h-")) and count(../a) = 1 and @href]',
+                    // .h-x>area[href]:only-of-type:not[.h-*]
+                    './area[not(contains(concat(" ", @class), " h-")) and count(../area) = 1 and @href]',
+                    // .h-x>:only-child:not[.h-*]>a[href]:only-of-type:not[.h-*]
+                    './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(a) = 1]/a[not(contains(concat(" ", @class), " h-")) and @href]',
+                    // .h-x>:only-child:not[.h-*]>area[href]:only-of-type:not[.h-*]
+                    './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(area) = 1]/area[not(contains(concat(" ", @class), " h-")) and @href]',
+                );
+                foreach ($xpaths as $xpath) {
+                    $url = $this->xpath->query($xpath, $e);
+                    if ($url !== \false && $url->length === 1) {
+                        $return['url'][] = $this->resolveUrl($url->item(0)->getAttribute('href'));
+                        break;
+                    }
+                }
+            }
+        }
+        // Make sure things are unique and in alphabetical order
+        $mfTypes = \array_unique($mfTypes);
+        \sort($mfTypes);
+        // Properties should be an object when JSON serialised
+        if (empty($return) and $this->jsonMode) {
+            $return = new stdClass();
+        }
+        // Phew. Return the final result.
+        $parsed = array('type' => $mfTypes, 'properties' => $return);
+        if (\trim($e->getAttribute('id')) !== '') {
+            $parsed['id'] = \trim($e->getAttribute("id"));
+        }
+        if ($this->lang) {
+            // Language
+            if ($html_lang = $this->language($e)) {
+                $parsed['lang'] = $html_lang;
+            }
+        }
+        if (!empty($shape)) {
+            $parsed['shape'] = $shape;
+        }
+        if (!empty($coords)) {
+            $parsed['coords'] = $coords;
+        }
+        if (!empty($children)) {
+            $parsed['children'] = \array_values(\array_filter($children));
+        }
+        return $parsed;
+    }
+    /**
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+     */
+    public function parseImpliedPhoto(\DOMElement $e)
+    {
+        // img.h-x[src]
+        if ($e->tagName == 'img') {
+            return $this->resolveUrl($this->parseImg($e));
+        }
+        // object.h-x[data]
+        if ($e->tagName == 'object' && $e->hasAttribute('data')) {
+            return $this->resolveUrl($e->getAttribute('data'));
+        }
+        $xpaths = array(
+            // .h-x>img[src]:only-of-type:not[.h-*]
+            './img[not(contains(concat(" ", @class), " h-")) and count(../img) = 1 and @src]',
+            // .h-x>object[data]:only-of-type:not[.h-*]
+            './object[not(contains(concat(" ", @class), " h-")) and count(../object) = 1 and @data]',
+            // .h-x>:only-child:not[.h-*]>img[src]:only-of-type:not[.h-*]
+            './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(img) = 1]/img[not(contains(concat(" ", @class), " h-")) and @src]',
+            // .h-x>:only-child:not[.h-*]>object[data]:only-of-type:not[.h-*]
+            './*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(object) = 1]/object[not(contains(concat(" ", @class), " h-")) and @data]',
+        );
+        foreach ($xpaths as $path) {
+            $els = $this->xpath->query($path, $e);
+            if ($els !== \false && $els->length === 1) {
+                $el = $els->item(0);
+                if ($el->tagName == 'img') {
+                    $return = $this->parseImg($el);
+                    return $this->resolveUrl($return);
+                } else {
+                    if ($el->tagName == 'object') {
+                        return $this->resolveUrl($el->getAttribute('data'));
+                    }
+                }
+            }
+        }
+        // no implied photo
+        return \false;
+    }
+    /**
+     * Parse rels and alternates
+     *
+     * Returns [$rels, $rel_urls, $alternates].
+     * For $rels and $rel_urls, if they are empty and $this->jsonMode = true, they will be returned as stdClass,
+     * optimizing for JSON serialization. Otherwise they will be returned as an empty array.
+     * Note that $alternates is deprecated in the microformats spec in favor of $rel_urls. $alternates only appears
+     * in parsed results if $this->enableAlternates = true.
+     * @return array|stdClass
+     */
+    public function parseRelsAndAlternates()
+    {
+        $rels = array();
+        $rel_urls = array();
+        $alternates = array();
+        // Iterate through all a, area and link elements with rel attributes
+        foreach ($this->xpath->query('//a[@rel and @href] | //link[@rel and @href] | //area[@rel and @href]') as $hyperlink) {
+            // Parse the set of rels for the current link
+            $linkRels = \array_unique(\array_filter(\preg_split('/[\\t\\n\\f\\r ]/', $hyperlink->getAttribute('rel'))));
+            if (\count($linkRels) === 0) {
+                continue;
+            }
+            // Resolve the href
+            $href = $this->resolveUrl($hyperlink->getAttribute('href'));
+            $rel_attributes = array();
+            if ($hyperlink->hasAttribute('media')) {
+                $rel_attributes['media'] = $hyperlink->getAttribute('media');
+            }
+            if ($hyperlink->hasAttribute('hreflang')) {
+                $rel_attributes['hreflang'] = $hyperlink->getAttribute('hreflang');
+            }
+            if ($hyperlink->hasAttribute('title')) {
+                $rel_attributes['title'] = $hyperlink->getAttribute('title');
+            }
+            if ($hyperlink->hasAttribute('type')) {
+                $rel_attributes['type'] = $hyperlink->getAttribute('type');
+            }
+            if (\strlen($hyperlink->textContent) > 0) {
+                $rel_attributes['text'] = $hyperlink->textContent;
+            }
+            if ($this->enableAlternates) {
+                // If 'alternate' in rels, create 'alternates' structure, append
+                if (\in_array('alternate', $linkRels)) {
+                    $alternates[] = \array_merge($rel_attributes, array('url' => $href, 'rel' => \implode(' ', \array_diff($linkRels, array('alternate')))));
+                }
+            }
+            foreach ($linkRels as $rel) {
+                if (!\array_key_exists($rel, $rels)) {
+                    $rels[$rel] = array($href);
+                } elseif (!\in_array($href, $rels[$rel])) {
+                    $rels[$rel][] = $href;
+                }
+            }
+            if (!\array_key_exists($href, $rel_urls)) {
+                $rel_urls[$href] = array('rels' => array());
+            }
+            // Add the attributes collected only if they were not already set
+            $rel_urls[$href] = \array_merge($rel_attributes, $rel_urls[$href]);
+            // Merge current rels with those already set
+            $rel_urls[$href]['rels'] = \array_merge($rel_urls[$href]['rels'], $linkRels);
+        }
+        // Alphabetically sort the rels arrays after removing duplicates
+        foreach ($rel_urls as $href => $object) {
+            $rel_urls[$href]['rels'] = \array_unique($rel_urls[$href]['rels']);
+            \sort($rel_urls[$href]['rels']);
+        }
+        if (empty($rels) and $this->jsonMode) {
+            $rels = new stdClass();
+        }
+        if (empty($rel_urls) and $this->jsonMode) {
+            $rel_urls = new stdClass();
+        }
+        return array($rels, $rel_urls, $alternates);
+    }
+    /**
+     * Find rel=tag elements that don't have class=category and have an href.
+     * For each element, get the last non-empty URL segment. Append a <data>
+     * element with that value as the category. Uses the mf1 class 'category'
+     * which will then be upgraded to p-category during backcompat.
+     * @param DOMElement $el
+     */
+    public function upgradeRelTagToCategory(DOMElement $el)
+    {
+        $rel_tag = $this->xpath->query('.//a[contains(concat(" ",normalize-space(@rel)," ")," tag ") and not(contains(concat(" ", normalize-space(@class), " "), " category ")) and @href]', $el);
+        if ($rel_tag->length) {
+            foreach ($rel_tag as $tempEl) {
+                $path = \trim(\parse_url($tempEl->getAttribute('href'), \PHP_URL_PATH), ' /');
+                $segments = \explode('/', $path);
+                $value = \array_pop($segments);
+                # build the <data> element
+                $dataEl = $tempEl->ownerDocument->createElement('data');
+                $dataEl->setAttribute('class', 'category');
+                $dataEl->setAttribute('value', $value);
+                # append as child of input element. this should ensure added element does get parsed inside e-*
+                $el->appendChild($dataEl);
+            }
+        }
+    }
+    /**
+     * Kicks off the parsing routine
+     * @param bool $convertClassic whether to do backcompat parsing on microformats1. Defaults to true.
+     * @param DOMElement $context optionally specify an element from which to parse microformats
+     * @return array An array containing all the microformats found in the current document
+     */
+    public function parse($convertClassic = \true, DOMElement $context = null)
+    {
+        $this->convertClassic = $convertClassic;
+        $mfs = $this->parse_recursive($context);
+        // Parse rels
+        list($rels, $rel_urls, $alternates) = $this->parseRelsAndAlternates();
+        $top = array('items' => \array_values(\array_filter($mfs)), 'rels' => $rels, 'rel-urls' => $rel_urls);
+        if ($this->enableAlternates && \count($alternates)) {
+            $top['alternates'] = $alternates;
+        }
+        return $top;
+    }
+    /**
+     * Parse microformats recursively
+     * Keeps track of whether inside a backcompat root or not
+     * @param DOMElement $context: node to start with
+     * @param int $depth: recursion depth
+     * @return array
+     */
+    public function parse_recursive(DOMElement $context = null, $depth = 0)
+    {
+        $mfs = array();
+        $mfElements = $this->getRootMF($context);
+        foreach ($mfElements as $node) {
+            $is_backcompat = !$this->hasRootMf2($node);
+            if ($this->convertClassic && $is_backcompat) {
+                $this->backcompat($node);
+            }
+            $recurse = $this->parse_recursive($node, $depth + 1);
+            // set bool flag for nested mf
+            $has_nested_mf = (bool) $recurse;
+            // parse for root mf
+            $result = $this->parseH($node, $is_backcompat, $has_nested_mf);
+            // TODO: Determine if clearing this is required?
+            $this->elementPrefixParsed($node, 'h');
+            $this->elementPrefixParsed($node, 'p');
+            $this->elementPrefixParsed($node, 'u');
+            $this->elementPrefixParsed($node, 'dt');
+            $this->elementPrefixParsed($node, 'e');
+            // parseH returned a parsed result
+            if ($result) {
+                // merge recursive results into current results
+                if ($recurse) {
+                    $result = \array_merge_recursive($result, $recurse);
+                }
+                // currently a nested mf; check if node is an mf property of parent
+                if ($depth > 0) {
+                    $temp_properties = nestedMfPropertyNamesFromElement($node);
+                    // properties found; set up parsed result in 'properties'
+                    if (!empty($temp_properties)) {
+                        foreach ($temp_properties as $property => $prefixes) {
+                            // Note: handling microformat nesting under multiple conflicting prefixes is not currently specified by the mf2 parsing spec.
+                            $prefixSpecificResult = $result;
+                            if (\in_array('p-', $prefixes)) {
+                                $prefixSpecificResult['value'] = !\is_array($prefixSpecificResult['properties']) || empty($prefixSpecificResult['properties']['name'][0]) ? $this->parseP($node) : $prefixSpecificResult['properties']['name'][0];
+                            } elseif (\in_array('e-', $prefixes)) {
+                                $eParsedResult = $this->parseE($node);
+                                $prefixSpecificResult['html'] = $eParsedResult['html'];
+                                $prefixSpecificResult['value'] = $eParsedResult['value'];
+                            } elseif (\in_array('u-', $prefixes)) {
+                                $prefixSpecificResult['value'] = !\is_array($result['properties']) || empty($result['properties']['url']) ? $this->parseU($node) : \reset($result['properties']['url']);
+                            } elseif (\in_array('dt-', $prefixes)) {
+                                $parsed_property = $this->parseDT($node);
+                                $prefixSpecificResult['value'] = $parsed_property ? $parsed_property : '';
+                            }
+                            $prefixSpecificResult['value'] = \is_array($prefixSpecificResult['value']) ? $prefixSpecificResult['value']['value'] : $prefixSpecificResult['value'];
+                            $mfs['properties'][$property][] = $prefixSpecificResult;
+                        }
+                        // otherwise, set up in 'children'
+                    } else {
+                        $mfs['children'][] = $result;
+                    }
+                    // otherwise, top-level mf
+                } else {
+                    $mfs[] = $result;
+                }
+            }
+        }
+        return $mfs;
+    }
+    /**
+     * Parse From ID
+     *
+     * Given an ID, parse all microformats which are children of the element with
+     * that ID.
+     *
+     * Note that rel values are still document-wide.
+     *
+     * If an element with the ID is not found, an empty skeleton mf2 array structure
+     * will be returned.
+     *
+     * @param string $id
+     * @param bool $htmlSafe = false whether or not to HTML-encode angle brackets in non e-* properties
+     * @return array
+     */
+    public function parseFromId($id, $convertClassic = \true)
+    {
+        $matches = $this->xpath->query("//*[@id='{$id}']");
+        if (empty($matches)) {
+            return array('items' => array(), 'rels' => array(), 'alternates' => array());
+        }
+        return $this->parse($convertClassic, $matches->item(0));
+    }
+    /**
+     * Get the root microformat elements
+     * @param DOMElement $context
+     * @return DOMNodeList
+     */
+    public function getRootMF(DOMElement $context = null)
+    {
+        // start with mf2 root class name xpath
+        $xpaths = array('contains(concat(" ",normalize-space(@class)), " h-")');
+        // add mf1 root class names
+        foreach ($this->classicRootMap as $old => $new) {
+            $xpaths[] = '( contains(concat(" ",normalize-space(@class), " "), " ' . $old . ' ") )';
+        }
+        // final xpath with OR
+        $xpath = '//*[' . \implode(' or ', $xpaths) . ']';
+        $mfElements = null === $context ? $this->xpath->query($xpath) : $this->xpath->query('.' . $xpath, $context);
+        return $mfElements;
+    }
+    /**
+     * Apply the backcompat algorithm to upgrade mf1 classes to mf2.
+     * This method is called recursively.
+     * @param DOMElement $el
+     * @param string $context
+     * @param bool $isParentMf2
+     * @see http://microformats.org/wiki/microformats2-parsing#algorithm
+     */
+    public function backcompat(DOMElement $el, $context = '', $isParentMf2 = \false)
+    {
+        if ($context) {
+            $mf1Classes = array($context);
+        } else {
+            $class = \str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
+            $classes = \array_filter(\explode(' ', $class));
+            $mf1Classes = \array_intersect($classes, \array_keys($this->classicRootMap));
+        }
+        $elHasMf2 = $this->hasRootMf2($el);
+        foreach ($mf1Classes as $classname) {
+            // special handling for specific properties
+            switch ($classname) {
+                case 'hentry':
+                    $this->upgradeRelTagToCategory($el);
+                    $rel_bookmark = $this->xpath->query('.//a[contains(concat(" ",normalize-space(@rel)," ")," bookmark ") and @href]', $el);
+                    if ($rel_bookmark->length) {
+                        foreach ($rel_bookmark as $tempEl) {
+                            $this->addMfClasses($tempEl, 'u-url');
+                            $this->addUpgraded($tempEl, array('bookmark'));
+                        }
+                    }
+                    break;
+                case 'hreview':
+                    $item_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
+                    if ($item_and_vcard->length) {
+                        foreach ($item_and_vcard as $tempEl) {
+                            if (!$this->hasRootMf2($tempEl)) {
+                                $this->backcompat($tempEl, 'vcard');
+                                $this->addMfClasses($tempEl, 'p-item h-card');
+                                $this->addUpgraded($tempEl, array('item', 'vcard'));
+                            }
+                        }
+                    }
+                    $item_and_vevent = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vevent ")]', $el);
+                    if ($item_and_vevent->length) {
+                        foreach ($item_and_vevent as $tempEl) {
+                            if (!$this->hasRootMf2($tempEl)) {
+                                $this->addMfClasses($tempEl, 'p-item h-event');
+                                $this->backcompat($tempEl, 'vevent');
+                                $this->addUpgraded($tempEl, array('item', 'vevent'));
+                            }
+                        }
+                    }
+                    $item_and_hproduct = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " hproduct ")]', $el);
+                    if ($item_and_hproduct->length) {
+                        foreach ($item_and_hproduct as $tempEl) {
+                            if (!$this->hasRootMf2($tempEl)) {
+                                $this->addMfClasses($tempEl, 'p-item h-product');
+                                $this->backcompat($tempEl, 'vevent');
+                                $this->addUpgraded($tempEl, array('item', 'hproduct'));
+                            }
+                        }
+                    }
+                    $this->upgradeRelTagToCategory($el);
+                    break;
+                case 'vevent':
+                    $location = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ")]', $el);
+                    if ($location->length) {
+                        foreach ($location as $tempEl) {
+                            if (!$this->hasRootMf2($tempEl)) {
+                                $this->addMfClasses($tempEl, 'h-card');
+                                $this->backcompat($tempEl, 'vcard');
+                            }
+                        }
+                    }
+                    break;
+            }
+            // root class has mf1 properties to be upgraded
+            if (isset($this->classicPropertyMap[$classname])) {
+                // loop through each property of the mf1 root
+                foreach ($this->classicPropertyMap[$classname] as $property => $data) {
+                    $propertyElements = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " ' . $property . ' ")]', $el);
+                    // loop through each element with the property
+                    foreach ($propertyElements as $propertyEl) {
+                        $hasRootMf2 = $this->hasRootMf2($propertyEl);
+                        // if the element has not been upgraded and we're not inside an mf2 root, recurse
+                        if (!$this->isElementUpgraded($propertyEl, $property) && !$isParentMf2) {
+                            $temp_context = isset($data['context']) ? $data['context'] : null;
+                            $this->backcompat($propertyEl, $temp_context, $hasRootMf2);
+                            $this->addMfClasses($propertyEl, $data['replace']);
+                        }
+                        $this->addUpgraded($propertyEl, $property);
+                    }
+                }
+            }
+            if (empty($context) && isset($this->classicRootMap[$classname]) && !$elHasMf2) {
+                $this->addMfClasses($el, $this->classicRootMap[$classname]);
+            }
+        }
+        return;
+    }
+    /**
+     * Add element + property as upgraded during backcompat
+     * @param DOMElement $el
+     * @param string|array $property
+     */
+    public function addUpgraded(DOMElement $el, $property)
+    {
+        if (!\is_array($property)) {
+            $property = array($property);
+        }
+        // add element to list of upgraded elements
+        if (!$this->upgraded->contains($el)) {
+            $this->upgraded->attach($el, $property);
+        } else {
+            $this->upgraded[$el] = \array_merge($this->upgraded[$el], $property);
+        }
+    }
+    /**
+     * Add the provided classes to an element.
+     * Does not add duplicate if class name already exists.
+     * @param DOMElement $el
+     * @param string $classes
+     */
+    public function addMfClasses(DOMElement $el, $classes)
+    {
+        $existingClasses = \str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
+        $existingClasses = \array_filter(\explode(' ', $existingClasses));
+        $addClasses = \array_diff(\explode(' ', $classes), $existingClasses);
+        if ($addClasses) {
+            $el->setAttribute('class', $el->getAttribute('class') . ' ' . \implode(' ', $addClasses));
+        }
+    }
+    /**
+     * Check an element for mf2 h-* class, typically to determine if backcompat should be used
+     * @param DOMElement $el
+     */
+    public function hasRootMf2(\DOMElement $el)
+    {
+        $class = \str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
+        $classes = \array_filter(\explode(' ', $class));
+        foreach ($classes as $classname) {
+            if (\strpos($classname, 'h-') === 0) {
+                return \true;
+            }
+        }
+        return \false;
+    }
+    /**
+     * Convert Legacy Classnames
+     *
+     * Adds microformats2 classnames into a document containing only legacy
+     * semantic classnames.
+     *
+     * @return Parser $this
+     */
+    public function convertLegacy()
+    {
+        $doc = $this->doc;
+        $xp = new DOMXPath($doc);
+        // replace all roots
+        foreach ($this->classicRootMap as $old => $new) {
+            foreach ($xp->query('//*[contains(concat(" ", @class, " "), " ' . $old . ' ") and not(contains(concat(" ", @class, " "), " ' . $new . ' "))]') as $el) {
+                $el->setAttribute('class', $el->getAttribute('class') . ' ' . $new);
+            }
+        }
+        foreach ($this->classicPropertyMap as $oldRoot => $properties) {
+            $newRoot = $this->classicRootMap[$oldRoot];
+            foreach ($properties as $old => $data) {
+                foreach ($xp->query('//*[contains(concat(" ", @class, " "), " ' . $oldRoot . ' ")]//*[contains(concat(" ", @class, " "), " ' . $old . ' ") and not(contains(concat(" ", @class, " "), " ' . $data['replace'] . ' "))]') as $el) {
+                    $el->setAttribute('class', $el->getAttribute('class') . ' ' . $data['replace']);
+                }
+            }
+        }
+        return $this;
+    }
+    /**
+     * XPath Query
+     *
+     * Runs an XPath query over the current document. Works in exactly the same
+     * way as DOMXPath::query.
+     *
+     * @param string $expression
+     * @param DOMNode $context
+     * @return DOMNodeList
+     */
+    public function query($expression, $context = null)
+    {
+        return $this->xpath->query($expression, $context);
+    }
+    /**
+     * Classic Root Classname map
+     * @var array
+     */
+    public $classicRootMap = array('vcard' => 'h-card', 'hfeed' => 'h-feed', 'hentry' => 'h-entry', 'hrecipe' => 'h-recipe', 'hresume' => 'h-resume', 'vevent' => 'h-event', 'hreview' => 'h-review', 'hproduct' => 'h-product', 'adr' => 'h-adr');
+    /**
+     * Mapping of mf1 properties to mf2 and the context they're parsed with
+     * @var array
+     */
+    public $classicPropertyMap = array('vcard' => array('fn' => array('replace' => 'p-name'), 'honorific-prefix' => array('replace' => 'p-honorific-prefix'), 'given-name' => array('replace' => 'p-given-name'), 'additional-name' => array('replace' => 'p-additional-name'), 'family-name' => array('replace' => 'p-family-name'), 'honorific-suffix' => array('replace' => 'p-honorific-suffix'), 'nickname' => array('replace' => 'p-nickname'), 'email' => array('replace' => 'u-email'), 'logo' => array('replace' => 'u-logo'), 'photo' => array('replace' => 'u-photo'), 'url' => array('replace' => 'u-url'), 'uid' => array('replace' => 'u-uid'), 'category' => array('replace' => 'p-category'), 'adr' => array('replace' => 'p-adr'), 'extended-address' => array('replace' => 'p-extended-address'), 'street-address' => array('replace' => 'p-street-address'), 'locality' => array('replace' => 'p-locality'), 'region' => array('replace' => 'p-region'), 'postal-code' => array('replace' => 'p-postal-code'), 'country-name' => array('replace' => 'p-country-name'), 'label' => array('replace' => 'p-label'), 'geo' => array('replace' => 'p-geo h-geo', 'context' => 'geo'), 'latitude' => array('replace' => 'p-latitude'), 'longitude' => array('replace' => 'p-longitude'), 'tel' => array('replace' => 'p-tel'), 'note' => array('replace' => 'p-note'), 'bday' => array('replace' => 'dt-bday'), 'key' => array('replace' => 'u-key'), 'org' => array('replace' => 'p-org'), 'organization-name' => array('replace' => 'p-organization-name'), 'organization-unit' => array('replace' => 'p-organization-unit'), 'title' => array('replace' => 'p-job-title'), 'role' => array('replace' => 'p-role'), 'tz' => array('replace' => 'p-tz'), 'rev' => array('replace' => 'dt-rev')), 'hfeed' => array(), 'hentry' => array('entry-title' => array('replace' => 'p-name'), 'entry-summary' => array('replace' => 'p-summary'), 'entry-content' => array('replace' => 'e-content'), 'published' => array('replace' => 'dt-published'), 'updated' => array('replace' => 'dt-updated'), 'author' => array('replace' => 'p-author h-card', 'context' => 'vcard'), 'category' => array('replace' => 'p-category')), 'hrecipe' => array('fn' => array('replace' => 'p-name'), 'ingredient' => array('replace' => 'p-ingredient'), 'yield' => array('replace' => 'p-yield'), 'instructions' => array('replace' => 'e-instructions'), 'duration' => array('replace' => 'dt-duration'), 'photo' => array('replace' => 'u-photo'), 'summary' => array('replace' => 'p-summary'), 'author' => array('replace' => 'p-author h-card', 'context' => 'vcard'), 'nutrition' => array('replace' => 'p-nutrition'), 'category' => array('replace' => 'p-category')), 'hresume' => array('summary' => array('replace' => 'p-summary'), 'contact' => array('replace' => 'p-contact h-card', 'context' => 'vcard'), 'education' => array('replace' => 'p-education h-event', 'context' => 'vevent'), 'experience' => array('replace' => 'p-experience h-event', 'context' => 'vevent'), 'skill' => array('replace' => 'p-skill'), 'affiliation' => array('replace' => 'p-affiliation h-card', 'context' => 'vcard')), 'vevent' => array('summary' => array('replace' => 'p-name'), 'dtstart' => array('replace' => 'dt-start'), 'dtend' => array('replace' => 'dt-end'), 'duration' => array('replace' => 'dt-duration'), 'description' => array('replace' => 'p-description'), 'url' => array('replace' => 'u-url'), 'category' => array('replace' => 'p-category'), 'location' => array('replace' => 'h-card', 'context' => 'vcard'), 'geo' => array('replace' => 'p-location h-geo')), 'hreview' => array(
+        'summary' => array('replace' => 'p-name'),
+        # fn: see item.fn below
+        # photo: see item.photo below
+        # url: see item.url below
+        'item' => array('replace' => 'p-item h-item', 'context' => 'item'),
+        'reviewer' => array('replace' => 'p-author h-card', 'context' => 'vcard'),
+        'dtreviewed' => array('replace' => 'dt-published'),
+        'rating' => array('replace' => 'p-rating'),
+        'best' => array('replace' => 'p-best'),
+        'worst' => array('replace' => 'p-worst'),
+        'description' => array('replace' => 'e-content'),
+        'category' => array('replace' => 'p-category'),
+    ), 'hproduct' => array('fn' => array('replace' => 'p-name'), 'photo' => array('replace' => 'u-photo'), 'brand' => array('replace' => 'p-brand'), 'category' => array('replace' => 'p-category'), 'description' => array('replace' => 'p-description'), 'identifier' => array('replace' => 'u-identifier'), 'url' => array('replace' => 'u-url'), 'review' => array('replace' => 'p-review h-review'), 'price' => array('replace' => 'p-price')), 'item' => array('fn' => array('replace' => 'p-name'), 'url' => array('replace' => 'u-url'), 'photo' => array('replace' => 'u-photo')), 'adr' => array('post-office-box' => array('replace' => 'p-post-office-box'), 'extended-address' => array('replace' => 'p-extended-address'), 'street-address' => array('replace' => 'p-street-address'), 'locality' => array('replace' => 'p-locality'), 'region' => array('replace' => 'p-region'), 'postal-code' => array('replace' => 'p-postal-code'), 'country-name' => array('replace' => 'p-country-name')), 'geo' => array('latitude' => array('replace' => 'p-latitude'), 'longitude' => array('replace' => 'p-longitude')));
+}
+/** @internal */
+function parseUriToComponents($uri)
+{
+    $result = array('scheme' => null, 'authority' => null, 'path' => null, 'query' => null, 'fragment' => null);
+    $u = @\parse_url($uri);
+    if (\array_key_exists('scheme', $u)) {
+        $result['scheme'] = $u['scheme'];
+    }
+    if (\array_key_exists('host', $u)) {
+        if (\array_key_exists('user', $u)) {
+            $result['authority'] = $u['user'];
+        }
+        if (\array_key_exists('pass', $u)) {
+            $result['authority'] .= ':' . $u['pass'];
+        }
+        if (\array_key_exists('user', $u) || \array_key_exists('pass', $u)) {
+            $result['authority'] .= '@';
+        }
+        $result['authority'] .= $u['host'];
+        if (\array_key_exists('port', $u)) {
+            $result['authority'] .= ':' . $u['port'];
+        }
+    }
+    if (\array_key_exists('path', $u)) {
+        $result['path'] = $u['path'];
+    }
+    if (\array_key_exists('query', $u)) {
+        $result['query'] = $u['query'];
+    }
+    if (\array_key_exists('fragment', $u)) {
+        $result['fragment'] = $u['fragment'];
+    }
+    return $result;
+}
+/** @internal */
+function resolveUrl($baseURI, $referenceURI)
+{
+    $target = array('scheme' => null, 'authority' => null, 'path' => null, 'query' => null, 'fragment' => null);
+    # 5.2.1 Pre-parse the Base URI
+    # The base URI (Base) is established according to the procedure of
+    # Section 5.1 and parsed into the five main components described in
+    # Section 3
+    $base = parseUriToComponents($baseURI);
+    # If base path is blank (http://example.com) then set it to /
+    # (I can't tell if this is actually in the RFC or not, but seems like it makes sense)
+    if ($base['path'] == null) {
+        $base['path'] = '/';
+    }
+    # 5.2.2. Transform References
+    # The URI reference is parsed into the five URI components
+    # (R.scheme, R.authority, R.path, R.query, R.fragment) = parse(R);
+    $reference = parseUriToComponents($referenceURI);
+    # A non-strict parser may ignore a scheme in the reference
+    # if it is identical to the base URI's scheme.
+    # TODO
+    if ($reference['scheme']) {
+        $target['scheme'] = $reference['scheme'];
+        $target['authority'] = $reference['authority'];
+        $target['path'] = removeDotSegments($reference['path']);
+        $target['query'] = $reference['query'];
+    } else {
+        if ($reference['authority']) {
+            $target['authority'] = $reference['authority'];
+            $target['path'] = removeDotSegments($reference['path']);
+            $target['query'] = $reference['query'];
+        } else {
+            if ($reference['path'] == '') {
+                $target['path'] = $base['path'];
+                if ($reference['query']) {
+                    $target['query'] = $reference['query'];
+                } else {
+                    $target['query'] = $base['query'];
+                }
+            } else {
+                if (\substr($reference['path'], 0, 1) == '/') {
+                    $target['path'] = removeDotSegments($reference['path']);
+                } else {
+                    $target['path'] = mergePaths($base, $reference);
+                    $target['path'] = removeDotSegments($target['path']);
+                }
+                $target['query'] = $reference['query'];
+            }
+            $target['authority'] = $base['authority'];
+        }
+        $target['scheme'] = $base['scheme'];
+    }
+    $target['fragment'] = $reference['fragment'];
+    # 5.3 Component Recomposition
+    $result = '';
+    if ($target['scheme']) {
+        $result .= $target['scheme'] . ':';
+    }
+    if ($target['authority']) {
+        $result .= '//' . $target['authority'];
+    }
+    $result .= $target['path'];
+    if ($target['query']) {
+        $result .= '?' . $target['query'];
+    }
+    if ($target['fragment']) {
+        $result .= '#' . $target['fragment'];
+    } elseif ($referenceURI == '#') {
+        $result .= '#';
+    }
+    return $result;
+}
+# 5.2.3 Merge Paths
+/** @internal */
+function mergePaths($base, $reference)
+{
+    # If the base URI has a defined authority component and an empty
+    # path,
+    if ($base['authority'] && $base['path'] == null) {
+        # then return a string consisting of "/" concatenated with the
+        # reference's path; otherwise,
+        $merged = '/' . $reference['path'];
+    } else {
+        if (($pos = \strrpos($base['path'], '/')) !== \false) {
+            # return a string consisting of the reference's path component
+            # appended to all but the last segment of the base URI's path (i.e.,
+            # excluding any characters after the right-most "/" in the base URI
+            # path,
+            $merged = \substr($base['path'], 0, $pos + 1) . $reference['path'];
+        } else {
+            # or excluding the entire base URI path if it does not contain
+            # any "/" characters).
+            $merged = $base['path'];
+        }
+    }
+    return $merged;
+}
+# 5.2.4.A Remove leading ../ or ./
+/** @internal */
+function removeLeadingDotSlash(&$input)
+{
+    if (\substr($input, 0, 3) == '../') {
+        $input = \substr($input, 3);
+    } elseif (\substr($input, 0, 2) == './') {
+        $input = \substr($input, 2);
+    }
+}
+# 5.2.4.B Replace leading /. with /
+/** @internal */
+function removeLeadingSlashDot(&$input)
+{
+    if (\substr($input, 0, 3) == '/./') {
+        $input = '/' . \substr($input, 3);
+    } else {
+        $input = '/' . \substr($input, 2);
+    }
+}
+# 5.2.4.C Given leading /../ remove component from output buffer
+/** @internal */
+function removeOneDirLevel(&$input, &$output)
+{
+    if (\substr($input, 0, 4) == '/../') {
+        $input = '/' . \substr($input, 4);
+    } else {
+        $input = '/' . \substr($input, 3);
+    }
+    $output = \substr($output, 0, \strrpos($output, '/'));
+}
+# 5.2.4.D Remove . and .. if it's the only thing in the input
+/** @internal */
+function removeLoneDotDot(&$input)
+{
+    if ($input == '.') {
+        $input = \substr($input, 1);
+    } else {
+        $input = \substr($input, 2);
+    }
+}
+# 5.2.4.E Move one segment from input to output
+/** @internal */
+function moveOneSegmentFromInput(&$input, &$output)
+{
+    if (\substr($input, 0, 1) != '/') {
+        $pos = \strpos($input, '/');
+    } else {
+        $pos = \strpos($input, '/', 1);
+    }
+    if ($pos === \false) {
+        $output .= $input;
+        $input = '';
+    } else {
+        $output .= \substr($input, 0, $pos);
+        $input = \substr($input, $pos);
+    }
+}
+# 5.2.4 Remove Dot Segments
+/** @internal */
+function removeDotSegments($path)
+{
+    # 1.  The input buffer is initialized with the now-appended path
+    #     components and the output buffer is initialized to the empty
+    #     string.
+    $input = $path;
+    $output = '';
+    $step = 0;
+    # 2.  While the input buffer is not empty, loop as follows:
+    while ($input) {
+        $step++;
+        if (\substr($input, 0, 3) == '../' || \substr($input, 0, 2) == './') {
+            #     A.  If the input buffer begins with a prefix of "../" or "./",
+            #         then remove that prefix from the input buffer; otherwise,
+            removeLeadingDotSlash($input);
+        } elseif (\substr($input, 0, 3) == '/./' || $input == '/.') {
+            #     B.  if the input buffer begins with a prefix of "/./" or "/.",
+            #         where "." is a complete path segment, then replace that
+            #         prefix with "/" in the input buffer; otherwise,
+            removeLeadingSlashDot($input);
+        } elseif (\substr($input, 0, 4) == '/../' || $input == '/..') {
+            #     C.  if the input buffer begins with a prefix of "/../" or "/..",
+            #          where ".." is a complete path segment, then replace that
+            #          prefix with "/" in the input buffer and remove the last
+            #          segment and its preceding "/" (if any) from the output
+            #          buffer; otherwise,
+            removeOneDirLevel($input, $output);
+        } elseif ($input == '.' || $input == '..') {
+            #     D.  if the input buffer consists only of "." or "..", then remove
+            #         that from the input buffer; otherwise,
+            removeLoneDotDot($input);
+        } else {
+            #     E.  move the first path segment in the input buffer to the end of
+            #         the output buffer and any subsequent characters up to, but not including,
+            #         the next "/" character or the end of the input buffer
+            moveOneSegmentFromInput($input, $output);
+        }
+    }
+    return $output;
+}
diff --git a/libs/mf2/mf2/composer.json b/libs/mf2/mf2/composer.json
new file mode 100644
index 0000000..7242aaa
--- /dev/null
+++ b/libs/mf2/mf2/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "mf2\/mf2",
+    "type": "library",
+    "description": "A pure, generic microformats2 parser \u2014 makes HTML as easy to consume as a JSON API",
+    "keywords": [
+        "microformats",
+        "microformats 2",
+        "parser",
+        "semantic",
+        "html"
+    ],
+    "authors": [
+        {
+            "name": "Barnaby Walters",
+            "homepage": "http:\/\/waterpigs.co.uk"
+        }
+    ],
+    "bin": [
+        "bin\/fetch-mf2",
+        "bin\/parse-mf2"
+    ],
+    "require": {
+        "php": ">=5.6.0"
+    },
+    "config": {
+        "platform": {}
+    },
+    "require-dev": {
+        "phpunit\/phpunit": "^5.7",
+        "mf2\/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
+        "squizlabs\/php_codesniffer": "^3.6.2",
+        "dealerdirect\/phpcodesniffer-composer-installer": "^0.7",
+        "phpcompatibility\/php-compatibility": "^9.3"
+    },
+    "autoload": {
+        "files": [
+            "Mf2\/Parser.php"
+        ]
+    },
+    "license": "CC0-1.0",
+    "suggest": {
+        "barnabywalters\/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
+        "masterminds\/html5": "Alternative HTML parser for PHP, for better HTML5 support."
+    }
+}
\ No newline at end of file
diff --git a/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php b/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
new file mode 100644
index 0000000..f47f985
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
@@ -0,0 +1,962 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * Classic Microformats Test
+ *
+ * Contains tests of the classic microformat => µf2 functionality.
+ *
+ * Mainly based off BC tables on http://microformats.org/wiki/microformats2#v2_vocabularies
+ * @internal
+ */
+class ClassicMicroformatsTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testParsesClassicHcard()
+    {
+        $input = '<div class="vcard"><span class="fn n">Barnaby Walters</span> is a person.</div>';
+        $expected = '{"items": [{"type": ["h-card"], "properties": {"name": ["Barnaby Walters"]}}], "rels": {}, "rel-urls": {}}';
+        $parser = new Parser($input, '', \true);
+        $this->assertJsonStringEqualsJsonString(\json_encode($parser->parse()), $expected);
+    }
+    public function testParsesClassicHEntry()
+    {
+        $input = '<div class="hentry"><h1 class="entry-title">microformats2 Is Great</h1> <p class="entry-summary">yes yes it is.</p></div>';
+        $expected = '{"items": [{"type": ["h-entry"], "properties": {"name": ["microformats2 Is Great"], "summary": ["yes yes it is."]}}], "rels": {}, "rel-urls": {}}';
+        $parser = new Parser($input, '', \true);
+        $this->assertJsonStringEqualsJsonString(\json_encode($parser->parse()), $expected);
+    }
+    public function testIgnoresClassicClassnamesUnderMf2Root()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<p class="author">Not Me</p>
+\t<p class="p-author h-card">I wrote this</p>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertEquals('I wrote this', $result['items'][0]['properties']['author'][0]['properties']['name'][0]);
+    }
+    public function testIgnoresClassicPropertyClassnamesOutsideClassicRoots()
+    {
+        $input = <<<EOT
+<p class="author">Mr. Invisible</p>
+EOT;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertCount(0, $result['items']);
+    }
+    public function testParsesFBerrimanClassicHEntry()
+    {
+        $input = <<<EOT
+<article id="post-976" class="post-976 post type-post status-publish format-standard hentry category-speaking category-web-dev tag-conferences tag-front-trends tag-fronttrends tag-speaking tag-txjs">
+\t<header class="entry-header">
+\t\t<h1 class="entry-title">
+\t\t\t<a href="http://fberriman.com/2013/05/14/april-recap-txjs-front-trends/" rel="bookmark">April recap &#8211; TXJS &#038; Front-Trends</a>
+\t\t</h1>
+
+\t\t<div class="entry-meta">
+\t\t\t<span class="date">
+\t\t\t\t<a href="http://fberriman.com/2013/05/14/april-recap-txjs-front-trends/" title="Permalink to April recap &#8211; TXJS &amp; Front-Trends" rel="bookmark">
+\t\t\t\t\t<time class="entry-date" datetime="2013-05-14T11:54:06+00:00">May 14, 2013</time>
+\t\t\t\t</a>
+\t\t\t</span>
+\t\t\t<span class="categories-links">
+\t\t\t\t<a href="http://fberriman.com/category/speaking/" title="View all posts in Speaking" rel="category tag">Speaking</a>,
+\t\t\t\t<a href="http://fberriman.com/category/web-dev/" title="View all posts in Web Dev" rel="category tag">Web Dev</a>
+\t\t\t</span>
+\t\t\t<span class="tags-links">
+\t\t\t\t<a href="http://fberriman.com/tag/conferences/" rel="tag">conferences</a>,
+\t\t\t\t<a href="http://fberriman.com/tag/front-trends/" rel="tag">front-trends</a>,
+\t\t\t\t<a href="http://fberriman.com/tag/fronttrends/" rel="tag">fronttrends</a>,
+\t\t\t\t<a href="http://fberriman.com/tag/speaking/" rel="tag">Speaking</a>,
+\t\t\t\t<a href="http://fberriman.com/tag/txjs/" rel="tag">txjs</a>
+\t\t\t</span>
+\t\t\t<span class="author vcard"><a class="url fn n" href="http://fberriman.com/author/admin/" title="View all posts by Frances" rel="author">Frances</a></span>\t\t\t\t\t</div>
+\t</header>
+
+\t\t<div class="entry-content">
+\t\t<p>April was pretty decent.  I got to attend two very good conferences <strong>and</strong> I got to speak at them.</p>
+\t\t\t</div>
+
+\t<footer class="entry-meta">
+\t\t<div class="comments-link">
+\t\t\t<a href="http://fberriman.com/2013/05/14/april-recap-txjs-front-trends/#respond" title="Comment on April recap &#8211; TXJS &amp; Front-Trends"><span class="leave-reply">Leave a comment</span></a>
+\t\t</div>
+
+\t</footer><!-- .entry-meta -->
+</article><!-- #post -->
+EOT;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $e = $result['items'][0];
+        $this->assertContains('h-entry', $e['type']);
+        $this->assertArrayHasKey('category', $e['properties']);
+        $this->assertCount(7, $e['properties']['category']);
+        $this->assertContains('speaking', $e['properties']['category']);
+        $this->assertContains('web-dev', $e['properties']['category']);
+        $this->assertContains('conferences', $e['properties']['category']);
+        $this->assertContains('front-trends', $e['properties']['category']);
+        $this->assertContains('fronttrends', $e['properties']['category']);
+        $this->assertContains('speaking', $e['properties']['category']);
+        $this->assertContains('txjs', $e['properties']['category']);
+    }
+    public function testParsesSnarfedOrgArticleCorrectly()
+    {
+        $input = \file_get_contents(__DIR__ . '/snarfed.org.html');
+        $result = Mf2\parse($input, 'http://snarfed.org/2013-10-23_oauth-dropins');
+    }
+    public function testParsesHProduct()
+    {
+        $input = <<<'EOT'
+<xml id="skufilterbrowse" class="slide">
+<productcatalog><labels><label key="skuset.deliverypolicyurl">Delivery policy content URL</label><label key="price.save">Save</label><label key="skuset.seemoredetails">See more details</label><label key="price.additionaloffers">Additional Offers</label><label key="price.freeitem">Includes Free Item*</label><label key="price.instsaving">Instant Savings</label><label key="skuset.eddieseedetails">See details </label><label key="price.rebateurl">RebateURL</label><label key="skuset.freedelivery">FREE SHIPPING, plus 5% back for Rewards Members</label><label key="price.printableCoupons">Click here for Printable Coupon</label><label key="price.value">Value</label><label key="skuset.eddieshipdetails">Estimated to arrive no later than </label><label key="price.qty">Qty.</label><label key="price.chooseyouritems">Choose your Items</label><label key="price.true">true</label><label key="skuset.clearancemessage">&lt;strong&gt;CLEARANCE ITEM:&lt;/strong&gt; </label><label key="price.ERF">Eco Fee</label><label key="skuset.viewlargerimage">View larger</label><label key="common.next">Next</label><label key="price.addtocart">Add to Cart</label><label key="common.reviews">reviews</label><label key="common.previous">Previous</label><label key="skuset.instockonline">In Stock Online</label><label key="price.priceafterrebate">Price &lt;strong&gt;after&lt;/strong&gt; rebate</label><label key="btn.bopis">PICK UP TODAY</label><label key="common.share">SHARE</label><label key="skuset.freedeliverytostore">FREE Shipping to store</label><label key="erf.popup.label">Environmental fee notice:</label><label key="price.details">Details</label><label key="common.stars">stars</label><label key="skuset.learnmore1">Learn more.</label><label key="common.share.twitter">Share on Twitter</label><label key="price.instorespecial">Available In Store Only</label><label key="price.priceincart">See Price in Cart</label><label key="skuset.giftcards">Orders containing this item are not eligible for Gift cards or certain other methods of payment.</label><label key="skuset.mysoftwaredownloads">"My Software Downloads"</label><label key="price.bmsmerf">Buy More Save More prices do not include eco fee.</label><label key="price.now">Now</label><label key="price.collapse">Collapse</label><label key="classpage.getstarted">Get Started</label><label key="skuset.printpage">Print this page</label><label key="price.learnmore">Learn More</label><label key="common.item">Item</label><label key="common.icon.path">/sbdpas/img/ico/</label><label key="skuset.selectcomponent">Select another component below</label><label key="skuset.freeshippingentireorder">Item qualifies entire order for free delivery</label><label key="skuset.eddieincart">in cart. </label><label key="common.selected">selected</label><label key="price.priceaftersavings">Price &lt;strong&gt;after&lt;/strong&gt; savings</label><label key="skuset.inktoner">Ink and toner</label><label key="classpage.comingsoon">Coming Soon</label><label key="price.before">Before</label><label key="price.was">Was</label><label key="skuset.viewfulldetails">View Full Details</label><label key="skuset.expdelivery">Expected Delivery:</label><label key="common.share.pinterest">Share on Pinterest</label><label key="skuset.deliveryonly">Online Only</label><label key="common.share.email">Email it</label><label key="price.seedetails">See Details</label><label key="skuset.expdelpopup">/sbd/content/help-center/shipping-and-delivery.html</label><label key="skuset.softwaredownload">Software Download</label><label key="erf.popup.url">/sbd/content/help/environmental_fee_popup.html</label><label key="price.finalprice">Final Price</label><label key="common.share.facebook">Share on Facebook</label><label key="skuset.eddiesaveproduct">on this product! </label><label key="skuset.suppliedandshippedby">Supplied and Shipped by</label><label key="common.addtofavorites">Add to Favorites</label><label key="skuset.esdnotepart1">Note: Shortly after purchase you will be able to access your Software Downloads in the </label><label key="skuset.esdnotepart2">section of your staples.com&#174; account. It's easy and secure!</label><label key="skuset.software1">/sbd/cre/marketing/technology-research-centers/software/software-downloads.html#z_faq</label><label key="price.instantcoupon">Instant Coupon</label><label key="skuset.eddieshipdetails1">to </label><label key="price.pricebefore">Price &lt;strong&gt;before&lt;/strong&gt;</label><label key="skuset.eddieoffer">Offer valid for 20 minutes. </label><label key="price.price">Price</label><label key="common.model">Model</label><label key="skuset.supplierhover">We have partnered with this trusted supplier to offer you a wider assortment of products and brands for all of your business needs, with the same great level of service you can expect from Staples.com.</label><label key="skuset.forceshiptostore">Item can be shipped only to a retail store location. </label><label key="price.rebate">Rebate</label><label key="price.bmsm">Buy More Save More</label><label key="common.print">print</label><label key="skuset.viewvideo">View video</label><label key="skuset.instoreavailability">Check in Store Availability</label><label key="price.aslowas">As low as</label><label key="price.reg">Reg</label><label key="price.free">FREE</label><label key="erf.message">Provincial recycling or deposit fees may be applicable upon checkout.</label><label key="skuset.eddiesave">Save an extra </label><label key="skuset.deferredfinancemessage">Special Financing Available </label><label key="price.promotions">Promotions</label><label key="price.availableinstore">Available In-Store Only</label><label key="skuset.outofstock">Currently Out of Stock.</label><label key="price.totalsavings">Total Savings</label><label key="price.beforePresentation">Before continuing, please select an item</label></labels>
+
+<product bss="ON" envfeeflag="0" comingsoonflag="0" price="18.35" name="Swingline® 747® Classic Desktop Staplers" bopispilot="true" mss="ON" zipcode="01701" comp="0" presnvalue="Select an Item" snum="SS264184" leadtimedescription="1 - 30 Business Days" expandedpromo="0" alttext="Swingline® 747® Classic Desktop Staplers" prdtypeid="0" presntype="D" review="4.5" class="hproduct" type="skuset" skubopswitch="ON" id="609548" bopisenableflag="0"><descs><desc typeid="2">All-steel construction with non-skid rubber base</desc><desc typeid="2">Spring-loaded inner channel prevents jams</desc><desc typeid="2">Available in black, burgundy and beige &lt;br /&gt; &lt;li&gt;Staples up to 20 sheets&lt;/li&gt;</desc><desc typeid="38">Select an Item</desc><desc typeid="39">All-steel construction with non-skid rubber base</desc><desc typeid="39">Spring-loaded inner channel prevents jams</desc><desc typeid="39">Available in black, burgundy and beige &lt;br /&gt; &lt;li&gt;Staples up to 20 sheets&lt;/li&gt;</desc><desc class="fn">Swingline® 747® Classic Desktop Staplers</desc></descs><price is="18.35" uom="Each"></price><span class="price">18.35</span><span class="currency">USD</span><imgs><pic class="photo" id="1">http://www.staples-3p.com/s7/is/image/Staples/s0021414_sc7?$std$</pic><pic altimg="Y" id="2">http://www.staples-3p.com/s7/is/image/Staples/s0021414_sc7?$thb$</pic><pic id="6">http://www.staples-3p.com/s7/is/image/Staples/s0021414</pic></imgs><producturl class="url">/Swingline-747-Classic-Desktop-Staplers/product_SS264184</producturl><review rating="4.5" count="99" css="45"></review><delivery shiptostore="true" free="false" instore="2" forceshiptostore="false"></delivery></product>
+
+<product bss="ON" envfeeflag="0" comingsoonflag="0" price="18.35" name="Swingline® 747® Classic Desktop Full Strip Stapler, 20 Sheet Capacity, Black" bopispilot="true" mss="ON" zipcode="01701" comp="1" snum="264184" leadtimedescription="1 Business Day" expandedpromo="0" alttext="Swingline® 747® Classic Desktop Full Strip Stapler, 20 Sheet Capacity, Black" prdtypeid="0" review="4.5" class="hproduct" mnum="S7074771G" type="sku" skubopswitch="ON" id="609315" bopisenableflag="1"><descs><desc typeid="2">All-steel construction with non-skid rubber base</desc><desc typeid="2">Full strip</desc><desc typeid="2">Staples up to 20 sheets</desc><desc typeid="19">Each</desc><desc typeid="39">All-steel construction with non-skid rubber base</desc><desc typeid="39">Full strip</desc><desc typeid="39">Staples up to 20 sheets</desc><desc class="fn">Swingline® 747® Classic Desktop Full Strip Stapler, 20 Sheet Capacity, Black</desc></descs><price is="18.35" uom="Each"></price><span class="price">18.35</span><span class="currency">USD</span><imgs><pic class="photo" id="1">http://www.staples-3p.com/s7/is/image/Staples/s0021412_sc7?$std$</pic><pic altimg="Y" id="2">http://www.staples-3p.com/s7/is/image/Staples/s0021412_sc7?$thb$</pic><pic id="6">http://www.staples-3p.com/s7/is/image/Staples/s0021412</pic><pic id="120"></pic></imgs><producturl class="url">/Swingline-747-Classic-Desktop-Full-Strip-Stapler-20-Sheet-Capacity-Black/product_264184</producturl><review rating="4.5" count="99" css="45"></review><delivery shiptostore="true" free="false" instore="1" forceshiptostore="false"></delivery></product>
+
+<product bss="ON" envfeeflag="0" comingsoonflag="0" price="19.59" name="Swingline® 747® Classic Desktop Stapler, Burgundy" bopispilot="true" mss="ON" zipcode="01701" comp="1" snum="413732" leadtimedescription="1 Business Day" expandedpromo="0" alttext="Swingline® 747® Classic Desktop Stapler, Burgundy" prdtypeid="0" review="3.5" class="hproduct" mnum="74718/74782" type="sku" skubopswitch="ON" id="1460639" bopisenableflag="0"><descs><desc typeid="2">All-steel construction with non-skid rubber base</desc><desc typeid="2">Spring-loaded inner channel prevents jams</desc><desc typeid="2">Burgundy &lt;br /&gt; &lt;li&gt;Staples up to 20 sheets&lt;/li&gt;</desc><desc typeid="19">Each</desc><desc typeid="39">All-steel construction with non-skid rubber base</desc><desc typeid="39">Spring-loaded inner channel prevents jams</desc><desc typeid="39">Burgundy &lt;br /&gt; &lt;li&gt;Staples up to 20 sheets&lt;/li&gt;</desc><desc class="fn">Swingline® 747® Classic Desktop Stapler, Burgundy</desc></descs><price is="19.59" uom="Each"></price><span class="price">19.59</span><span class="currency">USD</span><imgs><pic class="photo" id="1">http://www.staples-3p.com/s7/is/image/Staples/m000240695_sc7?$std$</pic><pic altimg="Y" id="2">http://www.staples-3p.com/s7/is/image/Staples/m000240695_sc7?$thb$</pic><pic id="6">http://www.staples-3p.com/s7/is/image/Staples/m000240695</pic></imgs><producturl class="url">/Swingline-747-Classic-Desktop-Stapler-Burgundy/product_413732</producturl><review rating="3.5" count="7" css="35"></review><delivery shiptostore="true" free="false" instore="2" forceshiptostore="false"></delivery></product>
+
+<product bss="ON" envfeeflag="0" comingsoonflag="0" price="39.49" name="Swingline® 747® Rio Red Stapler, 20 Sheet Capacity" bopispilot="true" mss="ON" zipcode="01701" comp="1" brandname="Swingline" snum="562485" leadtimedescription="1 - 4 Business Days" expandedpromo="0" alttext="Swingline® 747® Rio Red Stapler, 20 Sheet Capacity" prdtypeid="0" review="4.5" class="hproduct" mnum="74736" type="sku" skubopswitch="ON" id="1093798" bopisenableflag="0"><descs><desc typeid="2">20 sheet capacity with Swingline S.F.® 4® Staples</desc><desc typeid="2">Durable metal construction</desc><desc typeid="2">Stapler opens for tacking ability</desc><desc typeid="19">Each</desc><desc typeid="39">20 sheet capacity with Swingline S.F.® 4® Staples</desc><desc typeid="39">Durable metal construction</desc><desc typeid="39">Stapler opens for tacking ability</desc><desc class="fn">Swingline® 747® Rio Red Stapler, 20 Sheet Capacity</desc></descs><price is="39.49" uom="Each"></price><span class="price">39.49</span><span class="currency">USD</span><imgs><pic class="photo" id="1">http://www.staples-3p.com/s7/is/image/Staples/s0446269_sc7?$std$</pic><pic altimg="Y" id="2">http://www.staples-3p.com/s7/is/image/Staples/s0446269_sc7?$thb$</pic><pic id="6">http://www.staples-3p.com/s7/is/image/Staples/s0446269</pic></imgs><producturl class="url">/Swingline-747-Rio-Red-Stapler-20-Sheet-Capacity/product_562485</producturl><review rating="4.5" count="76" css="45"></review><delivery shiptostore="true" free="true" instore="2" forceshiptostore="false"></delivery></product>
+</productcatalog>
+</xml>
+EOT;
+        $result = Mf2\parse($input, 'http://www.staples.com/Swingline-747-Rio-Red-Stapler-20-Sheet-Capacity/product_562485');
+        $this->assertCount(4, $result['items']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/81
+     */
+    public function test_vevent()
+    {
+        $input = <<<EOT
+<div class="vevent">
+<h3 class="summary">XYZ Project Review</h3>
+<p class="description">Project XYZ Review Meeting</p>
+<p> <a class="url" href="http://example.com/xyz-meeting">http://example.com/xyz-meeting</a> </p>
+<p>To be held on
+ <span class="dtstart">
+  <abbr class="value" title="1998-03-12">the 12th of March</abbr>
+  from <span class="value">8:30am</span> <abbr class="value" title="-0500">EST</abbr>
+ </span> until
+ <span class="dtend">
+  <span class="value">9:30am</span> <abbr class="value" title="-0500">EST</abbr>
+ </span>
+</p>
+<p>Location: <span class="location">1CP Conference Room 4350</span></p>
+<small>Booked by: <span class="uid">guid-1.host1.com</span> on
+ <span class="dtstamp">
+  <abbr class="value" title="1998-03-09">the 9th</abbr> at <span class="value">6:00pm</span>
+ </span>
+</small>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('description', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('end', $output['items'][0]['properties']);
+        $this->assertEquals('XYZ Project Review', $output['items'][0]['properties']['name'][0]);
+        $this->assertEquals('Project XYZ Review Meeting', $output['items'][0]['properties']['description'][0]);
+        $this->assertEquals('http://example.com/xyz-meeting', $output['items'][0]['properties']['url'][0]);
+        $this->assertEquals('1998-03-12 08:30-0500', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('1998-03-12 09:30-0500', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/57
+     * @see https://github.com/kartikprabhu/mf2py/pull/50/
+     */
+    public function testRelBookmarkUrl()
+    {
+        $input = <<<END
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Backcompat test for hEntry with nested rel=bookmark</title>
+    <!-- This should not affect parsing elsewhere -->
+    <link rel="bookmark" href="/about">
+  </head>
+  <body>
+    <!-- This should not affect parsing elsewhere -->
+    <a rel="bookmark" href="/"></a>
+
+    <article class="hentry">
+      <span class="author">Lee Adama</span>
+      <span class="entry-title"><a rel="bookmark" class="something" href="/2014/11/24/jump-rope">Jumping Rope for Weight Loss</a></span>
+      <div class="entry-content">Some Content</div>
+      Nov 24, 2014
+    </article>
+
+    <article class="hentry">
+      <span class="author">Kara Thrace</span>
+      <span class="entry-title"><a rel="bookmark" class="" href="/2014/11/23/graffiti">Abstract Art in Graffiti</a></span>
+      <div class="entry-content">More Content</div>
+      Nov 23, 2014
+    </article>
+
+    <article class="hentry">
+      <span class="author">President Roslyn</span>
+      <span class="entry-title"><a rel="something bookmark" href="/2014/11/21/earth">Dreams of Earth</a></span>
+      <div class="entry-content">Additional Content</div>
+      Nov 21, 2014
+    </article>
+
+    <article class="hentry">
+      <span class="author">Chief Tyrrol</span>
+      <span class="entry-title"><a rel="something bookmark somethingelse" class="somethingelse" href="/2014/11/19/labor">Organized Labor in Mining Colonies</a></span>
+      <div class="entry-content">More Content</div>
+      Nov 19, 2014
+    </article>
+
+  </body>
+</html>
+END;
+        $output = Mf2\parse($input);
+        $u_urls = array('/2014/11/24/jump-rope', '/2014/11/23/graffiti', '/2014/11/21/earth', '/2014/11/19/labor');
+        foreach ($u_urls as $key => $url) {
+            $this->assertEquals('h-entry', $output['items'][$key]['type'][0]);
+            $this->assertArrayHasKey('url', $output['items'][$key]['properties']);
+            $this->assertEquals($url, $output['items'][$key]['properties']['url'][0]);
+        }
+    }
+    /**
+     * @see http://microformats.org/wiki/microformats2-parsing-issues#any_h-_root_class_name_overrides_and_stops_backcompat_root
+     */
+    public function testMf2RootStopsBackcompatRoot()
+    {
+        $input = '<div class="adr h-adr">
+  <div class="locality">MF1 adr locality</div>
+  <div class="p-locality">MF2 adr locality</div>
+</div>';
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertCount(1, $result['items'][0]['type']);
+        $this->assertEquals('h-adr', $result['items'][0]['type'][0]);
+        $this->assertCount(1, $result['items'][0]['properties']['locality']);
+        $this->assertEquals('MF2 adr locality', $result['items'][0]['properties']['locality'][0]);
+    }
+    /**
+     * @see http://microformats.org/wiki/microformats2-parsing-issues#any_h-_root_class_name_overrides_and_stops_backcompat_root
+     */
+    public function testMf2CustomRootStopsBackcompatRoot()
+    {
+        $input = '<div class="adr h-acme-address">
+  <div class="locality">MF1 acme locality</div>
+  <div class="p-locality">MF2 acme locality</div>
+</div>';
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertCount(1, $result['items'][0]['type']);
+        $this->assertEquals('h-acme-address', $result['items'][0]['type'][0]);
+        $this->assertCount(1, $result['items'][0]['properties']['locality']);
+        $this->assertEquals('MF2 acme locality', $result['items'][0]['properties']['locality'][0]);
+    }
+    /**
+     * @see http://microformats.org/wiki/microformats2-parsing-issues#uf2_children_on_backcompat_properties
+     */
+    public function testMf2ChildrenOnBackcompatProperties()
+    {
+        $input = '<div class="vcard">
+  <div class="adr h-acme-some-acme-object">
+    <div class="locality">MF1 some acme locality</div>
+    <div class="p-locality">MF2 some acme locality</div>
+  </div>
+</div>';
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertCount(1, $result['items'][0]['properties']['adr'][0]['type']);
+        $this->assertEquals('h-acme-some-acme-object', $result['items'][0]['properties']['adr'][0]['type'][0]);
+        $this->assertCount(1, $result['items'][0]['properties']['adr'][0]['properties']['locality']);
+        $this->assertEquals('MF2 some acme locality', $result['items'][0]['properties']['adr'][0]['properties']['locality'][0]);
+    }
+    /**
+     * Test mixed microformats2 with mf1 roots + properties
+     * Technically covered by other tests, but this is an additional test with @pfefferle's content
+     * 		after improvements were made to the backcompat parsing.
+     * @see https://github.com/indieweb/php-mf2/issues/45#issue-33893491
+     */
+    public function testMixedMf2andMf1Case1()
+    {
+        $input = <<<END
+<body class="h-entry hentry h-as-article" itemscope="" itemtype="http://schema.org/BlogPosting">
+<div id="page">
+ <article id="post-7546" class="post-7546 post type-post status-publish format-standard category-web tag-dezentral tag-email-to-id tag-facebook tag-whatsapp tag-xmpp">
+  <header class="entry-header">
+    <h1 class="entry-title p-name" itemprop="name headline"><a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/" class="u-url url" title="Permalink to Wir brauchen Metadaten für Telefonnummern" rel="bookmark" itemprop="url">Wir brauchen Metadaten für Telefonnummern</a></h1>
+
+        <div class="entry-meta">
+      <span class="sep">Ver&ouml;ffentlicht am </span><a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/" title="10:30" rel="bookmark" class="url u-url"><time class="entry-date updated published dt-updated dt-published" datetime="2014-02-20T10:30:40+00:00" itemprop="dateModified">20. Februar 2014</time></a><address class="byline"> <span class="sep"> von </span> <span class="author p-author vcard hcard h-card" itemprop="author" itemscope itemtype="http://schema.org/Person"><img alt='' src='http://1.gravatar.com/avatar/b36983a5651df2c413e264ad4d5cc1a1?s=40&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D40&amp;r=G' class='u-photo avatar avatar-40 photo' height='40' width='40' /> <a class="url uid u-url u-uid fn p-name" href="http://notizblog.org/author/matthias-pfefferle/" title="Alle Beitr&auml;ge von Matthias Pfefferle ansehen" rel="author" itemprop="url"><span itemprop="name">Matthias Pfefferle</span></a></span></address>    </div><!-- .entry-meta -->
+      </header><!-- .entry-header -->
+
+      <div class="entry-content e-content" itemprop="description articleBody">
+    <p><a href="http://netzwertig.com/2014/02/19/zuckerberg-bekommt-wieder-was-er-will-facebook-uebernimmt-whatsapp-fuer-bis-zu-19-milliarden-dollar/">Facebook kauft WhatsApp</a> und ich hab nur wenig Möglichkeiten meine Konsequenzen daraus zu ziehen. Leider sind alle aktuell populären &#8220;Chat&#8221; Systeme direkt an die App gekoppelt und ich &#8220;muss&#8221; zwangsläufig die App benutzen die mein Freundeskreis bevorzugt.</p>
+<p><a href="http://www.whatsapp.com/">WhatsApp</a> benutzt intern das <a href="http://de.wikipedia.org/wiki/WhatsApp#cite_note-10">XMPP-Protokoll</a> und arbeitet dadurch ja theoretisch dezentral und auch <a href="https://telegram.org">Telegram</a> hat beispielsweise <a href="https://core.telegram.org/mtproto">eine Art offenes Protokoll</a> gebaut&#8230; Das Problem: Woher wissen auf welchem Server der Andere angemeldet ist.</p>
+<p>Seit WhatsApp die Identifizierung über die Telefonnummer (statt einer z.B. E-Mail Adresse) eingeführt hat, sind viele anderen diesem Beispiel gefolgt und es gibt nichts Verwerfliches daran. Jeder der eine solche App nutzt hat zwangsläufig ein Telefon, was bedeutet dass er auch eine Telefonnummer hat und die Wahrscheinlichkeit dass in seinem (Telefon-)Adressbuch mehr Telefonnummern als E-Mail Adressen stehen ist auch sehr hoch. Prinzipiell also eine gute Idee! Leider kann man aber anhand einer Telefonnummer nicht auf einen Server (mal abgesehen vom Telekommunikations-unternehmen) schließen und das bedeutet, dass das Verfahren leider auch nur zentral funktionieren kann. Nutze ich WhatsApp, kann man mich nur über die WhatsApp-Server erreichen, für Telegram läuft die Kommunikation nur über die Telegram-Server usw.</p>
+<p>Um mit XMPP oder anderen Protokollen wirklich dezentral arbeiten zu können, müsste man über die Telefonnummer erfahren können welchen Chat-Server der Andere benutzt. Vielleicht über so eine Art <a href="http://notizblog.org/2008/07/27/email-address-to-url-transformation/"><em>Tel to Id</em></a> &#8211; Service oder über andere Protokolle wie z.B. SMS. Damit könnte sich jeder selbst den Client seines Vertrauens aussuchen und alles wäre <del datetime="2014-02-20T08:59:56+00:00">gut</del> <ins datetime="2014-02-20T08:59:56+00:00">besser</ins> <img src="http://notizblog.org/wp-includes/images/smilies/icon_wink.gif" alt=";)" class="wp-smiley" /> </p>
+
+<div class="social-buttons">
+  <a class="FlattrButton" style="display:none;"
+     data-flattr-button="compact"
+     data-flattr-uid="pfefferle"
+     data-flattr-category="text"
+     data-flattr-language="de_DE"
+     href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/"
+     rel="donation payment"></a>
+
+  <div class="g-plusone" data-size="medium" data-lang="de-DE" data-href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/"></div>
+</div>      </div><!-- .entry-content -->
+
+  <footer class="entry-meta">
+  Ver&ouml;ffentlicht    <span class="cat-links">
+    in <a href="http://notizblog.org/category/web/" title="Alle Beiträge in Open Web ansehen" rel="category tag">Open Web</a>  </span>
+
+    <span class="sep"> | </span>
+  <span class="tag-links" itemprop="keywords">
+    Tags: <a href="http://notizblog.org/tag/dezentral/" rel="tag">dezentral</a>, <a href="http://notizblog.org/tag/email-to-id/" rel="tag">Email to ID</a>, <a href="http://notizblog.org/tag/facebook/" rel="tag">Facebook</a>, <a href="http://notizblog.org/tag/whatsapp/" rel="tag">WhatsApp</a>, <a href="http://notizblog.org/tag/xmpp/" rel="tag">XMPP</a>  </span>
+
+    <span class="sep"> | </span>
+  <span class="comments-link"><a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comments" title="Kommentiere Wir brauchen Metadaten für Telefonnummern">7 Meinungen</a></span>
+
+  </footer><!-- #entry-meta --></article><!-- #post-7546 -->
+          <nav id="nav-below">
+    <h1 class="assistive-text section-heading">Beitragsnavigation</h1>
+
+
+    <div class="nav-previous"><a href="http://notizblog.org/2014/02/13/amber-case-ueber-privacy-und-das-indieweb/" rel="prev"><span class="meta-nav">&larr;</span> Amber Case über Privacy und das IndieWeb</a></div>
+
+  </nav><!-- #nav-below -->
+
+          <div id="comments">
+
+
+      <h2 id="comments-title">
+      7 Gedanken zu &ldquo;<span>Wir brauchen Metadaten für Telefonnummern</span>&rdquo;    </h2>
+
+
+    <ol class="commentlist">
+        <li class="comment even thread-even depth-1 h-as-comment p-comment h-entry" id="li-comment-466758">
+    <article id="comment-466758" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://1.gravatar.com/avatar/1d6a0566df7760e7d1507810b71a363e?s=50&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://dentaku.wazong.de' rel='external' class='u-url url'>Dentaku</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-466758"><time class="updated published u-updated u-published" datetime="2014-02-20T10:36:01+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 10:36          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>ENUM (<a href="https://tools.ietf.org/html/rfc6116">RFC6116</a>) macht genau das. Ist zwar für SIP gedacht, passt aber auch auf diese Anforderung.</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=466758#respond' onclick='return addComment.moveForm("comment-466758", "466758", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  <ul class="children">
+  <li class="comment byuser comment-author-matthias-pfefferle bypostauthor odd alt depth-2 h-as-comment p-comment h-entry" id="li-comment-466780">
+    <article id="comment-466780" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://1.gravatar.com/avatar/b36983a5651df2c413e264ad4d5cc1a1?s=50&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://notizblog.org' rel='external' class='u-url openid_link url'>Matthias Pfefferle</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-466780"><time class="updated published u-updated u-published" datetime="2014-02-20T10:41:31+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 10:41          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>Das war ne schnelle Antwort <img src="http://notizblog.org/wp-includes/images/smilies/icon_smile.gif" alt=":)" class="wp-smiley" /> </p>
+<p>Vielen Dank für den Tipp mit ENUM (noch nie davon gehört) und den Link&#8230; werde mich später mal durch das RFC kämpfen&#8230;</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=466780#respond' onclick='return addComment.moveForm("comment-466780", "466780", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  </li><!-- #comment-## -->
+</ul><!-- .children -->
+</li><!-- #comment-## -->
+  <li class="comment even thread-odd thread-alt depth-1 h-as-comment p-comment h-entry" id="li-comment-466867">
+    <article id="comment-466867" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://0.gravatar.com/avatar/2d4d94afbc593569446625c02e7a2f73?s=50&amp;d=http%3A%2F%2F0.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://lukasrosenstock.net/' rel='external' class='u-url url'>Lukas Rosenstock</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-466867"><time class="updated published u-updated u-published" datetime="2014-02-20T11:04:26+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 11:04          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>Wollte auch gerade ENUM sagen. Dabei wird die Telefonnummer in einen DNS-Namen konvertiert. Wenn du damit spielen willst, kannst du dir unter <a href="http://www.portunity.de/access/produkte/telefonie/enum-domains.html" >http://www.portunity.de/access/produkte/telefonie/enum-domains.html</a> kostenlos eine deutsche Nummer in ENUM eintragen lassen.</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=466867#respond' onclick='return addComment.moveForm("comment-466867", "466867", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  <ul class="children">
+  <li class="comment byuser comment-author-matthias-pfefferle bypostauthor odd alt depth-2 h-as-comment p-comment h-entry" id="li-comment-466932">
+    <article id="comment-466932" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://1.gravatar.com/avatar/b36983a5651df2c413e264ad4d5cc1a1?s=50&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://notizblog.org' rel='external' class='u-url openid_link url'>Matthias Pfefferle</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-466932"><time class="updated published u-updated u-published" datetime="2014-02-20T11:18:25+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 11:18          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>Krass dass das so vollkommen an mit vorbei gegangen ist&#8230; Gibt es da produktive Anwendungen die ENUM zum Beispiel für Chats o.Ä. verwenden?</p>
+<p>&#8230;ich sollte echt mehr bloggen!</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=466932#respond' onclick='return addComment.moveForm("comment-466932", "466932", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  <ul class="children">
+  <li class="comment even depth-3 h-as-comment p-comment h-entry" id="li-comment-467106">
+    <article id="comment-467106" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://0.gravatar.com/avatar/2d4d94afbc593569446625c02e7a2f73?s=50&amp;d=http%3A%2F%2F0.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://lukasrosenstock.net/' rel='external' class='u-url url'>Lukas Rosenstock</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-467106"><time class="updated published u-updated u-published" datetime="2014-02-20T12:01:54+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 12:01          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>ENUM wurde bisher nur als Möglichkeit zur Umgehung der Carrier/Kostenersparnis gesehen, dementsprechend natürlich von Carriern und nahestehenden Hard-/Softwareherstellern nicht unterstützt. Somit kommt es nicht in den Mainstream. Ich sehe es zur Zeit (leider) als reines &#8220;Nerd-Tool&#8221;, genau wie Diaspora, OpenID, IndieWeb &#8230;<br />
+Aber der Gedanke eines &#8220;dezentralen WhatsApp&#8221; auf ENUM-Basis kam mir auch schon. Interessantes Projekt, aber auch nicht massentauglich wegen Huhn&amp;Ei-Problemen.</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=467106#respond' onclick='return addComment.moveForm("comment-467106", "467106", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  <ul class="children">
+  <li class="comment byuser comment-author-matthias-pfefferle bypostauthor odd alt depth-4 h-as-comment p-comment h-entry" id="li-comment-467346">
+    <article id="comment-467346" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://1.gravatar.com/avatar/b36983a5651df2c413e264ad4d5cc1a1?s=50&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://notizblog.org' rel='external' class='u-url openid_link url'>Matthias Pfefferle</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-467346"><time class="updated published u-updated u-published" datetime="2014-02-20T13:22:57+00:00" itemprop="commentTime">
+          20. Februar 2014 bei 13:22          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>Hmmm&#8230; Eine Unterstützung von Seiten aller Carrier wäre natürlich wirklich notwendig um massentaugliche Produkte zu bauen&#8230;</p>
+<p>Wäre großartig wenn jede Nummer automatisch ne URI bekäme und unter dieser URI ne Art &#8220;Registry&#8221; zu finden wäre, die auch von Apps erweitert werden kann. So ne Art WebFinger für Telefonnummern quasi&#8230;</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=467346#respond' onclick='return addComment.moveForm("comment-467346", "467346", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  </li><!-- #comment-## -->
+</ul><!-- .children -->
+</li><!-- #comment-## -->
+</ul><!-- .children -->
+</li><!-- #comment-## -->
+</ul><!-- .children -->
+</li><!-- #comment-## -->
+  <li class="comment even thread-even depth-1 h-as-comment p-comment h-entry" id="li-comment-505365">
+    <article id="comment-505365" class="comment " itemprop="comment" itemscope itemtype="http://schema.org/UserComments">
+      <footer>
+        <address class="comment-author p-author author vcard hcard h-card" itemprop="creator" itemscope itemtype="http://schema.org/Person">
+          <img alt='' src='http://1.gravatar.com/avatar/f7a7b6a59e64d4b8c4a3ded1f85a9879?s=50&amp;d=http%3A%2F%2F1.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D50&amp;r=G' class='u-photo avatar avatar-50 photo' height='50' width='50' />          <cite class="fn p-name" itemprop="name"><a href='http://www.maexoticde/' rel='external' class='u-url url'>Markus Stumpf</a></cite> <span class="says">meant:</span>        </address><!-- .comment-author .vcard -->
+
+        <div class="comment-meta commentmetadata">
+          <a href="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#comment-505365"><time class="updated published u-updated u-published" datetime="2014-03-08T21:45:26+00:00" itemprop="commentTime">
+          8. März 2014 bei 21:45          </time></a>
+                  </div><!-- .comment-meta .commentmetadata -->
+      </footer>
+
+      <div class="comment-content e-content p-summary p-name" itemprop="commentText name description"><p>Diese Interoperabilität nennt sich gemeinhin &#8220;Federation&#8221;: <a href="http://en.wikipedia.org/wiki/Federation_(information_technology)" >http://en.wikipedia.org/wiki/Federation_(information_technology)</a></p>
+<p>WhatsApp verwendet kein XMPP. XMPP ist für Mobiles der absolute Horror, denn es basiert auf TCP und damit braucht der Client eine stehende TCP-Verbindung, was massiv auf den Akku geht. Außerdem kommt es permanent zu reconnects, wenn sich laufend die IP-Adresse des Clients ändert.<br />
+Aus diesem Grund will man ein verbindungsloses Push-System dahinter haben.</p>
+<p>Google und Facebook verwenden XMPP, Facebook hat sich aber noch nie an s2s (Server to Server) Verbindungen beteiligt, Google hat es vor ca 1 Jahr abgeschaltet, damit kann man sich zB. von eigenen XMPP-Servern und damit eigenen XMPP-Accounts nicht mehr mit Google-Usern unterhalten, sonern muss den Google Account verwenden.<br />
+Ich habe zB. sowohl meine Facebook als auch Google-Account in meinem pidgin konfiguriert.</p>
+<p>TextSecure (clients momentan nur für Android) ist momentan das IMHO beste System in diesem Bereich:<br />
+- open source<br />
+- harte crypto<br />
+- multi device (man kann einen Account auf meheren Devices nutzen)<br />
+- bald für iOS und Desktop<br />
+und: es unterstützt Federation, man kann sich also seinen eigenen Server hinstellen und es darüber machen.<br />
+Siehe: <a href="https://whispersystems.org/blog/the-new-textsecure/" >https://whispersystems.org/blog/the-new-textsecure/</a></p>
+<p>Ich muss natürlich immer noch den Account des anderen Teilnehmers kennen &#8230;</p>
+</div>
+
+      <div class="reply">
+        <a class='comment-reply-link' href='/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/?replytocom=505365#respond' onclick='return addComment.moveForm("comment-505365", "505365", "respond", "7546")'>Antworten</a>      </div><!-- .reply -->
+    </article><!-- #comment-## -->
+  </li><!-- #comment-## -->
+    </ol>
+
+
+
+
+                                <div id="respond" class="comment-respond">
+                <h3 id="reply-title" class="comment-reply-title">Hinterlasse eine Antwort <small><a rel="nofollow" id="cancel-comment-reply-link" href="/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/#respond" style="display:none;">Antworten abbrechen</a></small></h3>
+                                    <form action="http://notizblog.org/wp-comments-post.php" method="post" id="commentform" class="comment-form" novalidate>
+                                                                            <p class="comment-notes">Deine E-Mail-Adresse wird nicht veröffentlicht. Erforderliche Felder sind markiert <span class="required">*</span></p>                            <p class="comment-form-author"><label for="author">Name <span class="required">*</span></label> <input autocomplete="nickname name"  id="author" name="author" type="text" value="" size="30" aria-required='true' /></p>
+<p class="comment-form-email"><label for="email">E-Mail <span class="required">*</span></label> <input autocomplete="email"  id="email" name="email" type="email" value="" size="30" aria-required='true' /></p>
+<p class="comment-form-url"><label for="url">Website</label> <input autocomplete="url"  id="url" name="url" type="url" value="" size="30" /></p>
+                                                <p class="comment-form-comment"><label for="comment">Kommentar</label> <textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>                        <p class="form-allowed-tags">Du kannst folgende <abbr title="HyperText Markup Language">HTML</abbr>-Tags benutzen:  <code>&lt;a href=&quot;&quot; title=&quot;&quot;&gt; &lt;abbr title=&quot;&quot;&gt; &lt;acronym title=&quot;&quot;&gt; &lt;b&gt; &lt;blockquote cite=&quot;&quot;&gt; &lt;cite&gt; &lt;code&gt; &lt;del datetime=&quot;&quot;&gt; &lt;em&gt; &lt;i&gt; &lt;q cite=&quot;&quot;&gt; &lt;strike&gt; &lt;strong&gt; </code></p>                       <p class="form-submit">
+                            <input name="submit" type="submit" id="submit" value="Kommentar abschicken" />
+                            <input type='hidden' name='comment_post_ID' value='7546' id='comment_post_ID' />
+<input type='hidden' name='comment_parent' id='comment_parent' value='0' />
+                        </p>
+                        <p style="display: none;"><input type="hidden" id="akismet_comment_nonce" name="akismet_comment_nonce" value="9552e566de" /></p><p class="comment-subscription-form"><input type="checkbox" name="subscribe_comments" id="subscribe_comments" value="subscribe" style="width: auto; -moz-appearance: checkbox; -webkit-appearance: checkbox;" /> <label class="subscribe-label" id="subscribe-label" for="subscribe_comments">Benachrichtige mich über nachfolgende Kommentare via E-Mail.</label></p><p class="comment-subscription-form"><input type="checkbox" name="subscribe_blog" id="subscribe_blog" value="subscribe" style="width: auto; -moz-appearance: checkbox; -webkit-appearance: checkbox;" /> <label class="subscribe-label" id="subscribe-blog-label" for="subscribe_blog">Benachrichtige mich über neue Beiträge via E-Mail.</label></p><script type='text/javascript' src='http://notizblog.org/wp-content/plugins/akismet/_inc/form.js?ver=3.0.0'></script>
+<p style="display: none;"><input type="hidden" id="ak_js" name="ak_js" value="76"/></p>                 </form>
+                            </div><!-- #respond -->
+                <form id="webmention-form" action="http://notizblog.org/?webmention=endpoint" method="post">
+      <p>
+        <label for="webmention-source">Responding with a post on your own blog? Send me a <a href="http://indiewebcamp.com/webmention">WebMention</a> <sup>(<a href="http://adactio.com/journal/6469/">?</a>)</sup></label>
+        <input id="webmention-source" type="url" name="source" placeholder="URL/Permalink of your article" />
+      </p>
+      <p>
+        <input id="webmention-submit" type="submit" name="submit" value="Ping me!" />
+      </p>
+      <input id="webmention-target" type="hidden" name="target" value="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/" />
+    </form>
+    <p>
+    <label for="cite-shortlink">Shortlink</label>
+    <input id="cite-shortlink" class="u-url url shortlink" type="text" value="http://notizblog.org/b/25m" />
+  </p>
+  <p>
+    <label for="cite-permalink">Permalink</label>
+    <input id="cite-permalink" class="u-url url u-uid uid bookmark" type="text" value="http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/" />
+  </p>
+  <p>
+    <label for="cite-cite">HTML</label>
+    <input id="cite-cite" class="code" type="text" size="70" value="&lt;cite class=&quot;h-cite&quot;&gt;&lt;a class=&quot;u-url p-name&quot; href=&quot;http://notizblog.org/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/&quot;&gt;Wir brauchen Metadaten für Telefonnummern&lt;/a&gt; (&lt;span class=&quot;p-author h-card&quot; title=&quot;Matthias Pfefferle&quot;&gt;Matthias Pfefferle&lt;/span&gt; &lt;time class=&quot;dt-published&quot; datetime=&quot;2014-02-20T10:30:40+00:00&quot;&gt;20. Februar 2014&lt;/time&gt;)&lt;/cite&gt;">
+  </p>
+
+</div><!-- #comments -->
+</body>
+END;
+        $parser = new Parser($input, 'http://notiz.blog/2014/02/20/wir-brauchen-metadaten-fuer-telefonnummern/');
+        $result = $parser->parse();
+        $this->assertCount(1, $result['items'][0]['properties']['author']);
+        $this->assertCount(1, $result['items'][0]['properties']['author'][0]['type']);
+        $this->assertEquals('h-card', $result['items'][0]['properties']['author'][0]['type'][0]);
+        $this->assertArrayNotHasKey('category', $result['items'][0]['properties']);
+    }
+    /**
+     * Test mixed microformats2 with mf1 roots + properties
+     * Technically covered by other tests, but this is an additional test with @aaronpk's content
+     * 		after improvements were made to the backcompat parsing.
+     * @see https://github.com/indieweb/php-mf2/issues/45#issuecomment-267621041
+     */
+    public function testMixedMf2andMf1Case2()
+    {
+        $input = <<<END
+<li class="h-review post-review  hreview  post" id="post-id-28640">
+      <div style="" class="content-area   has-responses ">
+  <div class="pad">
+    <div class="item">
+      <h3><a href="http://www.irradiatedsoftware.com/dropvox/" class="url fn p-item h-product">Dropvox</a></h3>
+    </div>
+
+    <div class="rating-stars">
+              <span class="selected"></span>
+              <span class="selected"></span>
+              <span class="selected"></span>
+              <span class="selected"></span>
+              <span class="selected"></span>
+                </div>
+    <span class="rating hidden"><span class="value">5</span> out of <span class="best">5</span></span>
+  </div>
+    <div class="hidden">
+    <!-- provide p-name as fallback for mf2 consumers -->
+    <span class="p-name">Dropvox</span>
+    <span class="reviewer vcard"><a class="url fn" href="https://aaronparecki.com/">Aaron Parecki</a></span>
+    <span class="dtreviewed">2016-12-15T18:01:31-08:00</span>
+    <!-- permalink for the review -->
+    <a href="https://aaronparecki.com/2016/12/15/16/dropvox" class="permalink">permalink</a>
+  </div>
+            <div class="pad">
+      <div class="post-text e-content description content-type-plain">Voice memos that record straight to your Dropbox account.</div>
+    </div>
+        <div class="metaline pad">
+  <i class="marker icon"></i>
+      <span class="p-location h-adr">
+          <span class="p-locality">Portland</span>,
+        <span class="p-region">Oregon</span>
+                <data class="p-latitude" value="45.535432705698"></data>
+      <data class="p-longitude" value="-122.62130255822"></data>
+      </span>
+  </div>
+
+          <div class="metaline pad">
+      <a href="https://aaronparecki.com/2016/12/15/16/dropvox" class="u-url">
+      <time class="dt-published" datetime="2016-12-15T18:01:31-08:00">
+        Thu, Dec 15, 2016 6:01pm -08:00
+      </time>
+    </a>
+      </div>
+<a class="u-author" href="/"></a>
+
+  <div style="clear:both;"></div>
+</div>
+  <div class="responses">
+
+
+
+    <form class="webmention-form ui form" action="https://webmention.io/aaronpk/webmention" method="post">
+    <div class="fields">
+      <div class="twelve wide field">
+        <label>Have you written a <a href="https://indieweb.org/responses">response</a> to this? Let me know the URL:</label>
+        <input type="url" name="source" class="url">
+      </div>
+      <div class="four wide field">
+        <label>&nbsp;</label>
+        <input type="submit" class="ui submit button" value="Send Webmention">
+      </div>
+    </div>
+    <div class="status hidden">
+      <div class="ui message"></div>
+    </div>
+    <input type="hidden" name="target" value="https://aaronparecki.com/2016/12/15/16/dropvox">
+  </form>
+
+
+
+
+</div>
+  </li>
+END;
+        $parser = new Parser($input, 'https://aaronparecki.com/2016/12/15/16/dropvox');
+        $result = $parser->parse();
+        $this->assertCount(1, $result['items'][0]['properties']['item']);
+        $this->assertCount(1, $result['items'][0]['properties']['item'][0]['type']);
+        $this->assertCount(1, $result['items'][0]['properties']['name']);
+        $this->assertCount(1, $result['items'][0]['properties']['url']);
+        $this->assertCount(1, $result['items'][0]['properties']['author']);
+        $this->assertArrayNotHasKey('reviewer', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('description', $result['items'][0]['properties']);
+        # The following two are correct per backcompat algorithm: classic properties are ignored inside the mf2 root.
+        $this->assertArrayNotHasKey('rating', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('best', $result['items'][0]['properties']);
+        $this->assertEquals('h-product', $result['items'][0]['properties']['item'][0]['type'][0]);
+        $this->assertEquals('Dropvox', $result['items'][0]['properties']['name'][0]);
+        $this->assertEquals('https://aaronparecki.com/2016/12/15/16/dropvox', $result['items'][0]['properties']['url'][0]);
+        $this->assertEquals('https://aaronparecki.com/', $result['items'][0]['properties']['author'][0]);
+    }
+    /**
+     * Test mixed microformats2 with mf1 roots + properties
+     * @see https://github.com/microformats/microformats2-parsing/issues/11#issue-246579526
+     */
+    public function testMixedMf2andMf1Case3()
+    {
+        $input = <<<END
+<span class="h-card vcard">
+<a href="http://cherryreds.com">
+  <span class="p-name fn p-org org">Cherry Red's</span>
+</a>,
+<span class="adr">
+  <span class="street-address p-street-address">88-92 John Bright St</span>,
+  <span class="p-locality locality">Birmingham</span>,
+  <abbr class="p-country-name country-name">UK</abbr>
+</span></span>
+END;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertCount(2, $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('street-address', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('locality', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('country-name', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('children', $result['items'][0]);
+        $this->assertEquals('h-adr', $result['items'][0]['children'][0]['type'][0]);
+        $this->assertArrayHasKey('street-address', $result['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('locality', $result['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('country-name', $result['items'][0]['children'][0]['properties']);
+    }
+    /**
+     * Test mixed microformats2 with mf1 roots + properties
+     * @see https://github.com/microformats/microformats2-parsing/issues/11#issuecomment-352281134
+     */
+    public function testMixedMf2andMf1Case4()
+    {
+        $input = <<<END
+<body class="h-entry">
+  <div id="page" class="hfeed site wrap">
+    <h1 class="entry-title"><span class='p-name'>title</span></h1>
+    other content
+    <div class="entry-content">
+      <div class="e-content">this is a test for indieweb post </div> <span class="syn-text">Also on:</span>
+<!--syndication links -->
+    </div>
+  </div>
+</body>
+END;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        // p-name is no longer implied for this test due to nested microformat
+        // see https://github.com/microformats/microformats2-parsing/issues/6
+        $this->assertArrayNotHasKey('name', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('content', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('children', $result['items'][0]);
+        $this->assertEquals('h-feed', $result['items'][0]['children'][0]['type'][0]);
+        $this->assertEmpty($result['items'][0]['children'][0]['properties']);
+    }
+    /**
+     * @see http://microformats.org/wiki/hReview#Examples
+     */
+    public function testParsesClassicHreview()
+    {
+        $input = <<<END
+<div class="hreview">
+\t<span><span class="rating">5</span> out of 5 stars</span>
+\t<h4 class="summary">Crepes on Cole is awesome</h4>
+\t<span class="reviewer vcard">Reviewer: <span class="fn">Tantek</span> -
+\t<abbr class="dtreviewed" title="2005-04-18">April 18, 2005</abbr></span>
+\t<div class="description item vcard">
+\t\t<p> <span class="fn org">Crepes on Cole</span> is one of the best little creperies in <span class="adr"><span class="locality">San Francisco</span></span>. Excellent food and service. Plenty of tables in a variety of sizes for parties large and small.  Window seating makes for excellent people watching to/from the N-Judah which stops right outside. I've had many fun social gatherings here, as well as gotten plenty of work done thanks to neighborhood WiFi. </p>
+\t</div>
+\t<p>Visit date: <span>April 2005</span></p>
+\t<p>Food eaten: <span>Florentine crepe</span></p>
+</div>
+END;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertArrayNotHasKey('reviewer', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('description', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('summary', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('author', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('item', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('content', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('rating', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('name', $result['items'][0]['properties']);
+        $this->assertCount(1, $result['items'][0]['properties']['author'][0]['type']);
+        $this->assertCount(1, $result['items'][0]['properties']['item'][0]['type']);
+        $this->assertCount(1, $result['items'][0]['properties']['content'][0]['type']);
+        $this->assertEquals('h-card', $result['items'][0]['properties']['item'][0]['type'][0]);
+        $this->assertEquals('h-card', $result['items'][0]['properties']['content'][0]['type'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/137
+     */
+    public function testIgnoreMf2PropertiesUnderClassicRoot()
+    {
+        $input = <<<END
+<div id="page" class="hfeed site wrap">
+\t<h1 class="entry-title"><span class='p-name'>title</span></h1>
+\tother content
+\t<div class="entry-content">
+\t\t<div class="e-content">this is a test for indieweb post </div> <span class="syn-text">Also on:</span>
+\t\t<!--syndication links -->
+\t</div>
+</div>
+END;
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertEmpty($result['items'][0]['properties']);
+    }
+    /**
+     *
+     */
+    public function testParsesHfeed()
+    {
+        $input = <<<END
+<div class="hfeed">
+\t<article class="hentry">
+\t\t<h1 class="entry-title">Microformats are amazing</h1>
+\t\t<p>Published by <span class="author vcard"><span class="fn">W. Developer</span></span>
+\t\ton <time class="published" datetime="2013-06-13 12:00:00">13<sup>th</sup> June 2013</time>
+
+\t\t<p class="entry-summary">In which I extoll the virtues of using microformats.</p>
+
+\t\t<div class="entry-content">
+\t\t\t<p>Blah blah blah</p>
+\t\t</div>
+\t</article>
+</div>
+END;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('type', $output['items'][0]);
+        $this->assertEquals('h-feed', $output['items'][0]['type'][0]);
+        $this->assertArrayHasKey('children', $output['items'][0]);
+        $this->assertArrayHasKey('type', $output['items'][0]['children'][0]);
+        $this->assertEquals('h-entry', $output['items'][0]['children'][0]['type'][0]);
+        $this->assertArrayHasKey('properties', $output['items'][0]['children'][0]);
+        $this->assertArrayHasKey('name', $output['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('summary', $output['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('published', $output['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('content', $output['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('author', $output['items'][0]['children'][0]['properties']);
+        $this->assertArrayHasKey('type', $output['items'][0]['children'][0]['properties']['author'][0]);
+        $this->assertEquals('h-card', $output['items'][0]['children'][0]['properties']['author'][0]['type'][0]);
+        $this->assertArrayHasKey('properties', $output['items'][0]['children'][0]['properties']['author'][0]);
+        $this->assertArrayHasKey('value', $output['items'][0]['children'][0]['properties']['author'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/157
+     * @see source: http://www.manton.org/2018/03/indieweb-generation-4-and-hosted-domains.html
+     */
+    public function testHEntryRelTag()
+    {
+        $input = '<article id="post-6586" class="post-6586 post type-post status-publish format-standard hentry category-technology tag-domains tag-indiewebcamp tag-microblog tag-wordpress">
+				<header class="entry-header">
+
+						<h1 class="entry-title">IndieWeb generation 4 and hosted domains</h1>
+								</header><!-- .entry-header -->
+
+				<div class="entry-content">
+			<p>Naturally because of the goals of Micro.blog, I see a lot of discussion about “owning your content”. It’s an important part of the mission for Micro.blog to take control back from closed, ad-supported social networks and instead embrace posting on our own blogs again.</p>
+<p>But what does it mean to own our content? Do we have to install WordPress or some home-grown blogging system for it to be considered true content ownership, where we have the source code and direct SFTP access to the server? No. If that’s our definition, then content ownership will be permanently reserved for programmers and technical folks who have hours to spend on server configuration.</p>
+<p><a href="https://indieweb.org/generations">IndieWebCamp has a generations chart</a> to illustrate the path from early adopters to mainstream users. Eli Mellen highlighted it <a href="https://eli.li/entry.php?id=20180318015703">in a recent post</a> about the need to bridge the gap between the technical aspects of IndieWeb tools and more approachable platforms. With Micro.blog specifically, the goal is “generation 4”, and I think we’re on track to get there.</p>
+<p>I want blogging to be as easy as tweeting. Anything short of that isn’t good enough for Micro.blog. You’ll notice when you use Twitter that they never ask you to SFTP into twitter.com to configure your account. They don’t ask you to install anything.</p>
+<p>More powerful software that you can endlessly customize will always have its place. It’s good to have a range of options, including open source to tinker with. That’s often where some of the best ideas start. But too often I see people get lost in the weeds of plugins and themes, lured in by the myth that you have to self-host with WordPress to be part of the IndieWeb.</p>
+<p>Owning your content isn’t about portable software. It’s about portable URLs and data. It’s about domain names.</p>
+<p>When you write and post photos at your own domain name, your content can outlive any one blogging platform. This month marked the 16th anniversary of blogging at manton.org, and in that time I’ve switched blogging platforms and hosting providers a few times. The posts and URLs can all be preserved through those changes because it’s my own domain name.</p>
+<p>I was disappointed when Medium announced they were <a href="http://web.archive.org/web/20180301231401/https://help.medium.com/hc/en-us/articles/115005579728-Get-started-with-custom-domains">discontinuing support for custom domain names</a>. I’m linking to the Internet Archive copy because Medium’s help page about this is no longer available. If “no custom domains” is still their policy, it’s a setback for the open web, and dooms Medium to the same dead-end as twitter.com/username URLs.</p>
+<p>If you can’t use your own domain name, you can’t own it. Your content will be forever stuck at those silo URLs, beholden to the whims of the algorithmic timeline and shifting priorities of the executive team.</p>
+<p>For hosted blogs on Micro.blog, we encourage everyone to map a custom domain to their content, and we throw in free SSL and preserve redirects for old posts on imported WordPress content. There’s more we can do.</p>
+<p>I’m working on the next version of the macOS app for Micro.blog now, which features multiple accounts and even multiple blogs under the same account. Here’s a screenshot of the settings screen:</p>
+<p><img src="https://manton.org/images/2018/prefs_accounts.png" width="512" height="415" alt="Mac screenshot" scale="0"></p>
+<p>The goal with Micro.blog is not to be a stop-gap hosting provider, with truly “serious” users eventually moving on to something else (although we make that easy). We want Micro.blog hosting to be the best platform for owning your content and participating in the Micro.blog and IndieWeb communities.</p>
+					</div><!-- .entry-content -->
+
+		<footer class="entry-meta">
+			This entry was posted in <a href="http://www.manton.org/category/technology" rel="category tag">Technology</a> and tagged <a href="http://www.manton.org/tag/domains" rel="tag">domains</a>, <a href="http://www.manton.org/tag/indiewebcamp" rel="tag">indiewebcamp</a>, <a href="http://www.manton.org/tag/microblog" rel="tag">microblog</a>, <a href="http://www.manton.org/tag/wordpress" rel="tag">wordpress</a> on <a href="http://www.manton.org/2018/03/indieweb-generation-4-and-hosted-domains.html" title="9:24 am" rel="bookmark"><time class="entry-date" datetime="2018-03-23T09:24:36+00:00">2018/03/23</time></a><span class="by-author"> by <span class="author vcard"><a class="url fn n" href="http://www.manton.org/author/manton" title="View all posts by manton" rel="author">manton</a></span></span>.								</footer><!-- .entry-meta -->
+	</article>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('category', $output['items'][0]['properties']);
+        $this->assertCount(5, $output['items'][0]['properties']['category']);
+        $this->assertContains('technology', $output['items'][0]['properties']['category']);
+        $this->assertContains('domains', $output['items'][0]['properties']['category']);
+        $this->assertContains('indiewebcamp', $output['items'][0]['properties']['category']);
+        $this->assertContains('microblog', $output['items'][0]['properties']['category']);
+        $this->assertContains('wordpress', $output['items'][0]['properties']['category']);
+    }
+    public function testHEntryRelTagInContent()
+    {
+        $input = <<<END
+<article class="hentry">
+  <div class="entry-content">
+    Entry content should not include the generated <code>data</code> element for rel tag backcompat <a href="/tag/test" rel="tag">test</a>
+  </div>
+</article>
+END;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $item = $output['items'][0];
+        $this->assertEquals(['test'], $item['properties']['category']);
+        $this->assertEquals('Entry content should not include the generated data element for rel tag backcompat test', $item['properties']['content'][0]['value']);
+        $this->assertEquals('Entry content should not include the generated <code>data</code> element for rel tag backcompat <a href="/tag/test" rel="tag">test</a>', $item['properties']['content'][0]['html']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/157
+     * @see source: http://jg.typepad.com/ciel/2006/02/daniel_bouluds_.html
+     */
+    public function testHReviewRelTag()
+    {
+        $input = '<div class="hreview">
+<span class="version" style="display:none">0.2</span>
+  <h2 class="summary">
+    Divine Brunch!
+  </h2>
+  <abbr class="dtreviewed" title="20060219T1919-0800">
+    Feb 19, 2006
+  </abbr>
+  by <span class="reviewer fn"><a href="http://jg.typepad.com/ciel">Joan Gelfand</a></span>
+<span class="type" style="display:none">business</span>
+  <div class="item vcard">
+    <a href="http://www.garconsf.com" class="url fn">
+  Garçon
+    </a>
+    <div class="adr">
+      <div class="street-address">1101 Valencia Street</div>
+      <span class="locality">San Francisco</span>,
+      <span class="region">CA</span>
+    </div>
+  </div>
+  <blockquote class="description"><p>
+  <abbr class="rating" title="3">★★★ </abbr>
+Best Benedicts!
+Two perfectly poached eggs and a thin slice of tasty, French ham rest on a circle of warm brioche. Drizzled on top is a light, slightly tangy sauce. Seamless! The sophisticated room and great wine list added to the whole experience - Super!</p></blockquote>
+<p style="text-align:right;font-size:10px;">Technorati Tags: <a href="http://www.technorati.com/tag/Garcon" rel="tag">Garcon</a>, <a href="http://www.technorati.com/tag/Garçon" rel="tag">Garçon</a></p>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('category', $output['items'][0]['properties']);
+        $this->assertCount(2, $output['items'][0]['properties']['category']);
+        $this->assertContains('Garcon', $output['items'][0]['properties']['category']);
+        $this->assertContains('Garçon', $output['items'][0]['properties']['category']);
+    }
+    /**
+     * Should return the last non-empty URL segment
+     * @see https://github.com/indieweb/php-mf2/issues/157
+     */
+    public function testRelTagTrailingSlash()
+    {
+        $input = '<div class="hentry">
+<a rel="tag" href="/tags/testing/">Testing</a>,
+<a rel="tag" href="/tags/microformats">Microformats</a>
+</div>
+
+<div class="hreview">
+<a rel="tag" href="/tags/phpmf2/">php-mf2</a>,
+<a rel="tag" href="/tags/mf2py">mf2py</a>
+</div>
+';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('category', $output['items'][0]['properties']);
+        $this->assertContains('testing', $output['items'][0]['properties']['category']);
+        $this->assertContains('microformats', $output['items'][0]['properties']['category']);
+        $this->assertArrayHasKey('category', $output['items'][1]['properties']);
+        $this->assertContains('phpmf2', $output['items'][1]['properties']['category']);
+        $this->assertContains('mf2py', $output['items'][1]['properties']['category']);
+    }
+    /**
+     * Upgrade multiple mf1 roots on the same element
+     * @see https://github.com/indieweb/php-mf2/issues/156
+     */
+    public function testBackcompatMultipleRoots()
+    {
+        $input = '<article class="vevent hentry">
+    <span class="entry-title">h-entry name</span>
+    <span class="summary">h-event name</span>
+</article>';
+        $result = Mf2\parse($input);
+        $this->assertCount(2, $result['items'][0]['type']);
+        $this->assertContains('h-event', $result['items'][0]['type']);
+        $this->assertContains('h-entry', $result['items'][0]['type']);
+        $this->assertArrayHasKey('name', $result['items'][0]['properties']);
+        $this->assertCount(2, $result['items'][0]['properties']['name']);
+        $this->assertContains('h-event name', $result['items'][0]['properties']['name']);
+        $this->assertContains('h-entry name', $result['items'][0]['properties']['name']);
+    }
+    /**
+     * @see https://github.com/microformats/php-mf2/issues/195
+     */
+    public function testVcardGeoNoImpliedName()
+    {
+        $input = '<div class="vcard">
+	<div class="fn">John Doe</div>
+	<div>Location: <abbr class="geo" title="30.267991;-97.739568">Brighton</abbr></div>
+</div>';
+        $parser = new Parser($input, 'https://example.com');
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']['geo'][0]['properties']);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php b/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
new file mode 100644
index 0000000..129b387
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
@@ -0,0 +1,415 @@
+<?php
+
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * Combined Microformats Test
+ *
+ * Tests the ability of Parser::parse() to handle nested microformats correctly.
+ * More info at http://microformats.org/wiki/microformats-2#combining_microformats
+ *
+ * @todo implement
+ * @internal
+ */
+class CombinedMicroformatsTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    /**
+     * From http://microformats.org/wiki/microformats2#combining_microformats
+     */
+    public function testHEventLocationHCard()
+    {
+        $input = '<div class="h-event">
+	<a class="p-name u-url" href="http://indiewebcamp.com/2012">
+	IndieWebCamp 2012
+	</a>
+	from <time class="dt-start">2012-06-30</time>
+	to <time class="dt-end">2012-07-01</time> at
+	<span class="p-location h-card">
+	<a class="p-name p-org u-url" href="http://geoloqi.com/">
+	Geoloqi</a>, <span class="p-street-address">920 SW 3rd Ave. Suite 400</span>, <span class="p-locality">Portland</span>, <abbr class="p-region" title="Oregon">OR</abbr>
+  </span>
+</div>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": [{
+		"type": ["h-event"],
+		"properties": {
+			"name": ["IndieWebCamp 2012"],
+			"url": ["http://indiewebcamp.com/2012"],
+			"start": ["2012-06-30"],
+			"end": ["2012-07-01"],
+			"location": [{
+				"value": "Geoloqi",
+				"type": ["h-card"],
+				"properties": {
+					"name": ["Geoloqi"],
+					"org": ["Geoloqi"],
+					"url": ["http://geoloqi.com/"],
+					"street-address": ["920 SW 3rd Ave. Suite 400"],
+					"locality": ["Portland"],
+					"region": ["Oregon"]
+				}
+			}]
+		}
+	}]
+}';
+        $parser = new Parser($input, '', \true);
+        $parser->stringDateTimes = \true;
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats2#combining_microformats
+     */
+    public function testHCardOrgPOrg()
+    {
+        $input = '<div class="h-card">
+  <a class="p-name u-url"
+	 href="http://blog.lizardwrangler.com/"
+	>Mitchell Baker</a>
+  (<span class="p-org">Mozilla Foundation</span>)
+</div>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "name": ["Mitchell Baker"],
+	  "url": ["http://blog.lizardwrangler.com/"],
+	  "org": ["Mozilla Foundation"]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $parser->stringDateTimes = \true;
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats2#combining_microformats
+     */
+    public function testHCardOrgHCard()
+    {
+        $input = '<div class="h-card">
+  <a class="p-name u-url"
+	 href="http://blog.lizardwrangler.com/"
+	>Mitchell Baker</a>
+  (<a class="p-org h-card"
+	  href="http://mozilla.org/"
+	 >Mozilla Foundation</a>)
+</div>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "name": ["Mitchell Baker"],
+	  "url": ["http://blog.lizardwrangler.com/"],
+	  "org": [{
+		"value": "Mozilla Foundation",
+		"type": ["h-card"],
+		"properties": {
+		  "name": ["Mozilla Foundation"],
+		  "url": ["http://mozilla.org/"]
+		 }
+	  }]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $parser->stringDateTimes = \true;
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats2#combining_microformats
+     */
+    public function testHCardPOrgHCardHOrg()
+    {
+        $input = '<div class="h-card">
+  <a class="p-name u-url"
+	 href="http://blog.lizardwrangler.com/"
+	>Mitchell Baker</a>
+  (<a class="p-org h-card h-org"
+	  href="http://mozilla.org/"
+	 >Mozilla Foundation</a>)
+</div>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "name": ["Mitchell Baker"],
+	  "url": ["http://blog.lizardwrangler.com/"],
+	  "org": [{
+		"value": "Mozilla Foundation",
+		"type": ["h-card", "h-org"],
+		"properties": {
+		  "name": ["Mozilla Foundation"],
+		  "url": ["http://mozilla.org/"]
+		}
+	  }]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats2#combining_microformats
+     */
+    public function testHCardChildHCard()
+    {
+        $input = '<div class="h-card">
+	<a class="p-name u-url"
+	href="http://blog.lizardwrangler.com/">
+	Mitchell Baker</a>
+	(<a class="h-card h-org" href="http://mozilla.org/">
+	Mozilla Foundation</a>)
+</div>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+		"type": ["h-card"],
+		"properties": {
+			"name": ["Mitchell Baker"],
+			"url": ["http://blog.lizardwrangler.com/"]
+		},
+		"children": [{
+			"type": ["h-card","h-org"],
+			"properties": {
+				"name": ["Mozilla Foundation"],
+				"url": ["http://mozilla.org/"]
+			}
+		}]
+	}]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * Regression test for https://github.com/indieweb/php-mf2/issues/42
+     *
+     * This was occurring because mfPropertyNamesFromClass was only ever returning the first property name
+     * rather than all of them.
+     */
+    public function testNestedMicroformatUnderMultipleProperties()
+    {
+        $input = '<article class="h-entry"><div class="p-like-of p-in-reply-to h-cite"></div></article>';
+        $mf = Mf2\parse($input);
+        $this->assertCount(1, $mf['items'][0]['properties']['like-of']);
+        $this->assertCount(1, $mf['items'][0]['properties']['in-reply-to']);
+    }
+    /**
+     * Test microformats nested under e-* property classnames retain html: key in structure
+     *
+     * @see https://github.com/indieweb/php-mf2/issues/64
+     */
+    public function testMicroformatsNestedUnderEPropertyClassnamesRetainHtmlKey()
+    {
+        $input = '<div class="h-entry"><div class="h-card e-content"><p>Hello</p></div></div>';
+        $mf = Mf2\parse($input);
+        $this->assertArrayHasKey('value', $mf['items'][0]['properties']['content'][0]);
+        $this->assertEquals($mf['items'][0]['properties']['content'][0]['value'], 'Hello');
+        $this->assertArrayHasKey('html', $mf['items'][0]['properties']['content'][0]);
+        $this->assertEquals($mf['items'][0]['properties']['content'][0]['html'], '<p>Hello</p>');
+    }
+    /**
+     * Test microformats nested under u-* property classnames derive value: key from parsing as u-*
+     */
+    public function testMicroformatsNestedUnderUPropertyClassnamesDeriveValueCorrectly()
+    {
+        $input = '<div class="h-entry"><img class="u-url h-card" alt="This should not be the value" src="This should be the value" /></div>';
+        $mf = Mf2\parse($input);
+        $this->assertEquals($mf['items'][0]['properties']['url'][0]['value'], 'This should be the value', \json_encode($mf['items'][0]['properties']['url'][0]));
+    }
+    public function testMicroformatsNestedUnderUPropertyClassnamesDeriveValueFromURL()
+    {
+        $input = '<div class="h-entry">
+		  <h1 class="p-name">Name</h1>
+		  <p class="e-content">Hello World</p>
+		  <ul>
+		    <li class="u-comment h-cite">
+		    	<a class="u-author h-card" href="http://jane.example.com/">Jane Bloggs</a>
+		    	<p class="p-content p-name">lol</p>
+		    	<a class="u-url" href="http://example.org/post1234"><time class="dt-published">2015-07-12 12:03</time></a>
+		    </li>
+		  </ul>
+		</div>';
+        $expected = '{
+		  "items": [{
+    	  "type": ["h-entry"],
+	      "properties": {
+	        "name": ["Name"],
+	        "content": [{
+	          "html": "Hello World",
+	          "value": "Hello World"
+	        }],
+	        "comment": [{
+            "type": ["h-cite"],
+            "properties": {
+              "author": [{
+                "type": ["h-card"],
+                "properties": {
+                  "name": ["Jane Bloggs"],
+                  "url": ["http:\\/\\/jane.example.com\\/"]
+                },
+                "value": "http:\\/\\/jane.example.com\\/"
+              }],
+              "content": ["lol"],
+              "name": ["lol"],
+              "url": ["http:\\/\\/example.org\\/post1234"],
+              "published": ["2015-07-12 12:03"]
+            },
+            "value": "http:\\/\\/example.org\\/post1234"
+          }]
+	      }
+	    }],
+	    "rels":[],
+	    "rel-urls": []
+	  }';
+        $mf = Mf2\parse($input);
+        $this->assertJsonStringEqualsJsonString(\json_encode($mf), $expected);
+        $this->assertEquals($mf['items'][0]['properties']['comment'][0]['value'], 'http://example.org/post1234');
+        $this->assertEquals($mf['items'][0]['properties']['comment'][0]['properties']['author'][0]['value'], 'http://jane.example.com/');
+    }
+    public function testMicroformatsNestedUnderPPropertyClassnamesDeriveValueFromFirstPName()
+    {
+        $input = '<div class="h-entry"><div class="p-author h-card">This post was written by <span class="p-name">Zoe</span>.</div></div>';
+        $mf = Mf2\parse($input);
+        $this->assertEquals($mf['items'][0]['properties']['author'][0]['value'], 'Zoe');
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/98
+     * @see https://github.com/microformats/tests/issues/58
+     */
+    public function testNoValueForNestedMicroformatWithoutProperty()
+    {
+        $input = '<div class="h-card" ><a class="h-card" href="jane.html">Jane Doe</a><p></p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('children', $output['items'][0]);
+        $this->assertArrayNotHasKey('value', $output['items'][0]['children'][0]);
+    }
+    /**
+     * With the backcompat changes I worked on in this PR, I ran into a case where
+     * nested mf1 without properties were not added to the 'children' property properly.
+     * I fixed that but then wanted to ensure it worked beyond 1-level deep. This example
+     * is contrived, but lets me test to confirm 'children' is set correctly. - Gregor Morrill
+     */
+    public function testNestedMf1()
+    {
+        $input = '<div class="hentry"> <div class="vcard"><span class="fn">Jane Doe</span> and <div class="vcard"><span class="fn">John Doe</span></div> </div> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEmpty($output['items'][0]['properties']);
+        $this->assertArrayHasKey('children', $output['items'][0]);
+        $this->assertEquals('h-card', $output['items'][0]['children'][0]['type'][0]);
+        $this->assertEquals('Jane Doe', $output['items'][0]['children'][0]['properties']['name'][0]);
+        $child_mf = $output['items'][0]['children'][0];
+        $this->assertArrayHasKey('children', $child_mf);
+        $this->assertEquals('h-card', $child_mf['children'][0]['type'][0]);
+        $this->assertEquals('John Doe', $child_mf['children'][0]['properties']['name'][0]);
+    }
+    public function testNoUrlFromRelOnMf2()
+    {
+        $input = <<<END
+<div class="h-entry">
+<p> <a href="/article" rel="bookmark" class="p-name">Title of Post</a> </p>
+<div class="e-content"><p> This is the post </p> </div>
+</div>
+END;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('content', $output['items'][0]['properties']);
+        $this->assertArrayNotHasKey('url', $output['items'][0]['properties']);
+    }
+    /**
+     * Simplified h-entry with `p-location h-adr` from https://aaronparecki.com/2018/03/14/3/
+     * Whitespace cleaned up for easier test assertion
+     * @see https://github.com/indieweb/php-mf2/issues/151
+     */
+    public function testNestedValuePProperty()
+    {
+        $input = <<<END
+<div class="h-entry">
+<span class="p-location h-adr">
+<span class="p-locality">Portland</span>, <span class="p-region">Oregon</span> <span class="weather"><span>&bull;</span><i class="wi wi-night-alt-cloudy" title="Mostly Cloudy"></i> 44&deg;F</span>
+<data class="p-latitude" value="45.535623"></data>
+<data class="p-longitude" value="-122.621209"></data>
+</span>
+</div>
+END;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('value', $output['items'][0]['properties']['location'][0]);
+        $this->assertEquals("Portland, Oregon • 44°F", $output['items'][0]['properties']['location'][0]['value']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/151
+     */
+    public function testNestedValueDTProperty()
+    {
+        $input = <<<END
+<div class="h-entry">
+\t<div class="dt-acme h-acme-object">1997-12-12</div>
+</div>
+END;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('value', $output['items'][0]['properties']['acme'][0]);
+        $this->assertEquals('1997-12-12', $output['items'][0]['properties']['acme'][0]['value']);
+    }
+    /**
+     * rel=tag should not be upgraded within microformats2
+     * @see https://github.com/indieweb/php-mf2/issues/157
+     */
+    public function testMf2DoesNotParseRelTag()
+    {
+        $input = '<div class="h-entry">
+<a rel="tag" href="/tags/tests">Tests</a>
+</div>
+
+<div class="h-review">
+<a rel="tag" href="/tags/reviews">Reviews</a>
+</div>
+';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('category', $output['items'][0]['properties']);
+        $this->assertArrayNotHasKey('category', $output['items'][1]['properties']);
+    }
+    /**
+     * JSON-mode should return an empty stdClass when a microformat has no properties.
+     * @see https://github.com/indieweb/php-mf2/issues/171
+     */
+    public function testEmptyPropertiesObjectInJSONMode()
+    {
+        $input = '<div class="h-feed"><div class="h-entry"></div></div>';
+        // Try in JSON-mode: expect the raw PHP to be an stdClass instance that serializes to an empty object.
+        $parser = new Parser($input, null, \true);
+        $output = $parser->parse();
+        $this->assertInstanceOf('\\stdClass', $output['items'][0]['properties']);
+        $this->assertSame('{}', \json_encode($output['items'][0]['properties']));
+        // Repeat in non-JSON-mode: expect the raw PHP to be an array. Check that its serialization is not what we need for mf2 JSON.
+        $parser = new Parser($input, null, \false);
+        $output = $parser->parse();
+        $this->assertInternalType('array', $output['items'][0]['properties']);
+        $this->assertSame('[]', \json_encode($output['items'][0]['properties']));
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php b/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
new file mode 100644
index 0000000..d914860
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+/** @internal */
+final class TestSuiteParser extends \IndieAuth\Libs\Mf2\Parser
+{
+    /** Actually textContent from before the whitespace normalisation merge (e8da04f93d548d26287a8980eca4216639cbc61d) */
+    public function textContent(\DOMElement $el, $dummy = \false)
+    {
+        $excludeTags = array('noframe', 'noscript', 'script', 'style', 'frames', 'frameset');
+        if (isset($el->tagName) and \in_array(\strtolower($el->tagName), $excludeTags)) {
+            return '';
+        }
+        $this->_resolveChildUrls($el);
+        $clonedEl = $el->cloneNode(\true);
+        foreach ($this->xpath->query('.//img', $clonedEl) as $imgEl) {
+            if ($imgEl->hasAttribute('alt')) {
+                $replacement = $imgEl->getAttribute('alt');
+            } else {
+                if ($imgEl->hasAttribute('src')) {
+                    $replacement = ' ' . $imgEl->getAttribute('src') . ' ';
+                } else {
+                    $replacement = '';
+                    // Bye bye IMG element.
+                }
+            }
+            $newNode = $this->doc->createTextNode($replacement);
+            $imgEl->parentNode->replaceChild($newNode, $imgEl);
+        }
+        foreach ($excludeTags as $tagName) {
+            foreach ($this->xpath->query(".//{$tagName}", $clonedEl) as $elToRemove) {
+                $elToRemove->parentNode->removeChild($elToRemove);
+            }
+        }
+        return \IndieAuth\Libs\Mf2\unicodeTrim($clonedEl->textContent);
+    }
+    // Hack. Old textContent requires "resolveChildUrls", but that method is private.
+    private $__resolveChildUrls = null;
+    private function _resolveChildUrls(\DOMElement $element)
+    {
+        if (null === $this->__resolveChildUrls) {
+            $reflectUpon = new \ReflectionClass($this);
+            $this->__resolveChildUrls = $reflectUpon->getMethod('resolveChildUrls');
+            $this->__resolveChildUrls->setAccessible(\true);
+        }
+        return $this->__resolveChildUrls->invoke($this, $element);
+    }
+}
+/** @internal */
+class MicroformatsTestSuiteTest extends \IndieAuth\Libs\PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider mf1TestsProvider
+     * @group microformats/tests/mf1
+     */
+    public function testMf1FromTestSuite($input, $expectedOutput)
+    {
+        $parser = new TestSuiteParser($input, 'http://example.com/');
+        $this->assertEquals($this->makeComparible(\json_decode($expectedOutput, \true)), $this->makeComparible(\json_decode(\json_encode($parser->parse()), \true)));
+    }
+    /**
+     * @dataProvider mf2TestsProvider
+     * @group microformats/tests/mf2
+     */
+    public function testMf2FromTestSuite($input, $expectedOutput, $test)
+    {
+        if ($test === 'h-event/time') {
+            $this->markTestIncomplete('This test does not match because we implement a proposed spec: https://github.com/microformats/microformats2-parsing/issues/4#issuecomment-373457720.');
+        }
+        $parser = new TestSuiteParser($input, 'http://example.com/');
+        $this->assertEquals($this->makeComparible(\json_decode($expectedOutput, \true)), $this->makeComparible(\json_decode(\json_encode($parser->parse()), \true)));
+    }
+    /**
+     * @dataProvider mixedTestsProvider
+     * @group microformats/tests/mixed
+     */
+    public function testMixedFromTestSuite($input, $expectedOutput)
+    {
+        $parser = new TestSuiteParser($input, 'http://example.com/');
+        $this->assertEquals($this->makeComparible(\json_decode($expectedOutput, \true)), $this->makeComparible(\json_decode(\json_encode($parser->parse()), \true)));
+    }
+    /**
+     * To make arrays coming from JSON more easily comparible by PHPUnit:
+     * * We sort arrays by key, normalising them, because JSON objects are unordered.
+     * * We json_encode strings, and cut the starting and ending ", so PHPUnit better
+     *   shows whitespace characters like tabs and newlines.
+     **/
+    public function makeComparible($array)
+    {
+        \ksort($array);
+        foreach ($array as $key => $value) {
+            if (\gettype($value) === 'array') {
+                $array[$key] = $this->makeComparible($value);
+            } else {
+                if (\gettype($value) === 'string') {
+                    $array[$key] = \substr(\json_encode($value), 1, -1);
+                }
+            }
+        }
+        return $array;
+    }
+    /**
+     * Data provider lists all tests from a specific directory in mf2/tests.
+     **/
+    public function htmlAndJsonProvider($subFolder = '')
+    {
+        // Get the actual wanted subfolder.
+        $subFolder = '/mf2/tests/tests' . $subFolder;
+        // Ripped out of the test-suite.php code:
+        $finder = new \RegexIterator(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(\dirname(__FILE__) . '/../../vendor/' . $subFolder, \RecursiveDirectoryIterator::SKIP_DOTS)), '/^.+\\.html$/i', \RecursiveRegexIterator::GET_MATCH);
+        // Build the array of separate tests:
+        $tests = array();
+        foreach ($finder as $key => $value) {
+            $dir = \realpath(\pathinfo($key, \PATHINFO_DIRNAME));
+            $testname = \substr($dir, \strpos($dir, $subFolder) + \strlen($subFolder) + 1) . '/' . \pathinfo($key, \PATHINFO_FILENAME);
+            $test = \pathinfo($key, \PATHINFO_BASENAME);
+            $result = \pathinfo($key, \PATHINFO_FILENAME) . '.json';
+            if (\is_file($dir . '/' . $result)) {
+                $tests[$testname] = array('input' => \file_get_contents($dir . '/' . $test), 'expectedOutput' => \file_get_contents($dir . '/' . $result), 'name' => $testname);
+            }
+        }
+        return $tests;
+    }
+    /**
+     * Following three functions are the actual dataProviders used by the test methods.
+     */
+    public function mf1TestsProvider()
+    {
+        return $this->htmlAndJsonProvider('/microformats-v1');
+    }
+    public function mf2TestsProvider()
+    {
+        return $this->htmlAndJsonProvider('/microformats-v2');
+    }
+    public function mixedTestsProvider()
+    {
+        return $this->htmlAndJsonProvider('/microformats-mixed');
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php b/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
new file mode 100644
index 0000000..b463be9
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * Microformats Wiki Examples
+ *
+ * Contains tests built directly from examples given on the microformats wiki pages about µf2.
+ *
+ * These tend to compare the JSON-encoded output of Parser::parse() with the JSON strings given on the wiki.
+ * If the given JSON is not within an `items` key of the root object, I add it and mark as so.
+ *
+ * @author Barnaby Walters waterpigs.co.uk <barnaby@waterpigs.co.uk>
+ * @internal
+ */
+class MicroformatsWikiExamplesTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testHandlesEmptyStringsCorrectly()
+    {
+        $input = '';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": []
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    public function testHandlesNullCorrectly()
+    {
+        $input = Null;
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": []
+}';
+        $parser = new Parser($input, '', \true);
+        $parser->jsonMode = \true;
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats-2
+     */
+    public function testSimplePersonReference()
+    {
+        $input = '<span class="h-card">Frances Berriman</span>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "name": ["Frances Berriman"]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats-2
+     */
+    public function testSimpleHyperlinkedPersonReference()
+    {
+        $input = '<a class="h-card" href="http://benward.me">Ben Ward</a>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+  "items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "name": ["Ben Ward"],
+	  "url": ["http://benward.me"]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats-2-implied-properties
+     */
+    public function testSimplePersonImage()
+    {
+        $input = '<img class="h-card" src="http://example.org/pic.jpg" alt="Chris Messina" />';
+        // Added root items key
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": [{
+  "type": ["h-card"],
+  "properties": {
+	"name": ["Chris Messina"],
+	"photo": [{
+		"value": "http://example.org/pic.jpg",
+		"alt": "Chris Messina"
+	}]
+  }
+}]}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats-2-implied-properties
+     */
+    public function testHyperlinkedImageNameAndPhotoProperties()
+    {
+        $input = '<a class="h-card" href="http://rohit.khare.org/">
+ <img alt="Rohit Khare"
+	  src="https://s3.amazonaws.com/twitter_production/profile_images/53307499/180px-Rohit-sq_bigger.jpg" />
+</a>';
+        // Added root items key
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": [{
+  "type": ["h-card"],
+  "properties": {
+	"name": ["Rohit Khare"],
+	"url": ["http://rohit.khare.org/"],
+	"photo": [{
+		"value": "https://s3.amazonaws.com/twitter_production/profile_images/53307499/180px-Rohit-sq_bigger.jpg",
+		"alt": "Rohit Khare"
+	}]
+  }
+}]}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /**
+     * From http://microformats.org/wiki/microformats-2
+     */
+    public function testMoreDetailedPerson()
+    {
+        $input = '<div class="h-card">
+  <img class="u-photo" alt="photo of Mitchell"
+	   src="https://webfwd.org/content/about-experts/300.mitchellbaker/mentor_mbaker.jpg"/>
+  <a class="p-name u-url"
+	 href="http://blog.lizardwrangler.com/"
+	>Mitchell Baker</a>
+ (<a class="u-url"
+	 href="https://twitter.com/MitchellBaker"
+	>@MitchellBaker</a>)
+  <span class="p-org">Mozilla Foundation</span>
+  <p class="p-note">
+	Mitchell is responsible for setting the direction and scope of the Mozilla Foundation and its activities.
+  </p>
+  <span class="p-category">Strategy</span>
+  <span class="p-category">Leadership</span>
+</div>';
+        $expected = '{
+  "rels": {},
+  "rel-urls": {},
+	"items": [{
+	"type": ["h-card"],
+	"properties": {
+	  "photo": [
+	     {  
+		"value": "https://webfwd.org/content/about-experts/300.mitchellbaker/mentor_mbaker.jpg",
+		"alt": "photo of Mitchell"
+	     }
+	  ],
+	  "name": ["Mitchell Baker"],
+	  "url": [
+		"http://blog.lizardwrangler.com/",
+		"https://twitter.com/MitchellBaker"
+	  ],
+	  "org": ["Mozilla Foundation"],
+	  "note": ["Mitchell is responsible for setting the direction and scope of the Mozilla Foundation and its activities."],
+	  "category": [
+		"Strategy",
+		"Leadership"
+	  ]
+	}
+  }]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseDTTest.php b/libs/mf2/mf2/tests/Mf2/ParseDTTest.php
new file mode 100644
index 0000000..3121a49
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseDTTest.php
@@ -0,0 +1,510 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class ParseDTTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    // Note that value-class tests for dt-* attributes are stored elsewhere, as there are so many of the bloody things
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesImg()
+    {
+        $input = '<div class="h-event"><img class="dt-start" alt="2012-08-05T14:50"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesDataValueAttr()
+    {
+        $input = '<div class="h-event"><data class="dt-start" value="2012-08-05T14:50"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesDataInnerHTML()
+    {
+        $input = '<div class="h-event"><data class="dt-start">2012-08-05T14:50</data></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesAbbrValueAttr()
+    {
+        $input = '<div class="h-event"><abbr class="dt-start" title="2012-08-05T14:50"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesAbbrInnerHTML()
+    {
+        $input = '<div class="h-event"><abbr class="dt-start">2012-08-05T14:50</abbr></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesTimeDatetimeAttr()
+    {
+        $input = '<div class="h-event"><time class="dt-start" datetime="2012-08-05T14:50"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesTimeDatetimeAttrWithZ()
+    {
+        $input = '<div class="h-event"><time class="dt-start" datetime="2012-08-05T14:50:00Z"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50:00Z', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesTimeDatetimeAttrWithTZOffset()
+    {
+        $input = '<div class="h-event"><time class="dt-start" datetime="2012-08-05T14:50:00-0700"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50:00-0700', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesTimeDatetimeAttrWithTZOffset2()
+    {
+        $input = '<div class="h-event"><time class="dt-start" datetime="2012-08-05T14:50:00-07:00"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50:00-07:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesTimeInnerHTML()
+    {
+        $input = '<div class="h-event"><time class="dt-start">2012-08-05T14:50</time></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     */
+    public function testParseDTHandlesInsDelDatetime()
+    {
+        $input = '<div class="h-event"><ins class="dt-start" datetime="2012-08-05T14:50"></ins><del class="dt-end" datetime="2012-08-05T18:00"></del></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('end', $output['items'][0]['properties']);
+        $this->assertEquals('2012-08-05T14:50', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2012-08-05T18:00', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testYYYY_MM_DD__HH_MM()
+    {
+        $input = '<div class="h-event"><span class="dt-start"><span class="value">2012-10-07</span> at <span class="value">21:18</span></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-10-07 21:18', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testAbbrYYYY_MM_DD__HH_MM()
+    {
+        $input = '<div class="h-event"><span class="dt-start"><abbr class="value" title="2012-10-07">some day</abbr> at <span class="value">21:18</span></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-10-07 21:18', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testYYYY_MM_DD__HHpm()
+    {
+        $input = '<div class="h-event"><span class="dt-start"><span class="value">2012-10-07</span> at <span class="value">9pm</span></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-10-07 21:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testYYYY_MM_DD__HH_MMpm()
+    {
+        $input = '<div class="h-event"><span class="dt-start"><span class="value">2012-10-07</span> at <span class="value">9:00pm</span></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-10-07 21:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testYYYY_MM_DD__HH_MM_SSpm()
+    {
+        $input = '<div class="h-event"><span class="dt-start"><span class="value">2012-10-07</span> at <span class="value">9:00:00pm</span></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2012-10-07 21:00:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * This test name refers to the value-class used within the dt-end.
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testImpliedDTEndWithValueClass()
+    {
+        $input = '<div class="h-event"> <span class="dt-start"><span class="value">2014-06-04</span> at <span class="value">18:30</span> <span class="dt-end"><span class="value">19:30</span></span></span> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('end', $output['items'][0]['properties']);
+        $this->assertEquals('2014-06-04 18:30', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-06-04 19:30', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * This test name refers to the lack of value-class within the dt-end.
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testImpliedDTEndWithoutValueClass()
+    {
+        $input = '<div class="h-event"> <span class="dt-start"><span class="value">2014-06-05</span> at <span class="value">18:31</span> <span class="dt-end">19:31</span></span> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('end', $output['items'][0]['properties']);
+        $this->assertEquals('2014-06-05 18:31', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-06-05 19:31', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/pull/46
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testImpliedDTEndUsingNonValueClassDTStart()
+    {
+        $input = '<div class="h-event"> <time class="dt-start">2014-06-05T18:31</time> until <span class="dt-end">19:31</span></span> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('end', $output['items'][0]['properties']);
+        $this->assertEquals('2014-06-05T18:31', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-06-05 19:31', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testDTStartOnly()
+    {
+        $input = '<div class="h-event"> <span class="dt-start"><span class="value">2014-06-06</span> at <span class="value">18:32</span> </span> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2014-06-06 18:32', $output['items'][0]['properties']['start'][0]);
+        $this->assertArrayNotHasKey('end', $output['items'][0]['properties']);
+    }
+    /**
+     * @group parseDT
+     * @group valueClass
+     */
+    public function testDTStartDateOnly()
+    {
+        $input = '<div class="h-event"> <span class="dt-start"><span class="value">2014-06-07</span> </span> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('start', $output['items'][0]['properties']);
+        $this->assertEquals('2014-06-07', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * TZ offsets normalized only for VCP.
+     * This behavior is implied from "However the colons ":" separating the hours and minutes of any timezone offset are optional and discouraged in order to make it less likely that a timezone offset will be confused for a time."
+     * @see http://microformats.org/wiki/index.php?title=value-class-pattern&oldid=66473##However+the+colons
+     */
+    public function testNormalizeTZOffsetVCP()
+    {
+        $input = '<div class="h-event">
+            <span class="dt-start"> <time class="value" datetime="2017-05-27">May 27</time>, from
+            <time class="value">20:57-07:00</time> </span>
+        </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-05-27 20:57-0700', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * TZ offsets *not* normalized for non-VCP dates
+     */
+    public function testNoNormalizeTZOffset()
+    {
+        $input = '<div class="h-entry"> <time class="dt-start" datetime="2018-03-13 15:30-07:00">March 13, 2018 3:30PM</time> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2018-03-13 15:30-07:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/115
+     */
+    public function testDoNotAddT()
+    {
+        $input = '<div class="h-entry">
+  <span class="dt-start">
+    <time class="value" datetime="2009-06-26">26 July</time>, from
+    <time class="value">19:00:00-08:00</time>
+  </span>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2009-06-26 19:00:00-0800', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/115
+     */
+    public function testPreserrveTIfAuthored()
+    {
+        $input = '<div class="h-entry"> <time class="dt-start" datetime="2009-06-26T19:01-08:00">26 July, 7:01pm</time> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2009-06-26T19:01-08:00', $output['items'][0]['properties']['start'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/126
+     */
+    public function testDtVCPTimezone()
+    {
+        $input = '<div class="h-event">
+ <span class="e-summary">HomebrewWebsiteClub Berlin</span> will be next on
+ <span class="dt-start">
+  <span class="value">2017-05-31</span>, from
+  <span class="value">19:00</span> (UTC<span class="value">+02:00</span>)
+</span> to  <span class="dt-end">21:00</span>.</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-05-31 19:00+0200', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-05-31 21:00+0200', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/126
+     */
+    public function testDtVCPTimezoneShort()
+    {
+        $input = '<div class="h-event">
+ <span class="e-summary">HomebrewWebsiteClub Berlin</span> will be next on
+ <span class="dt-start">
+  <span class="value">2017-05-31</span>, from
+  <span class="value">19:00</span> (UTC<span class="value">+2</span>)
+</span> to  <span class="dt-end">21:00</span>.</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-05-31 19:00+0200', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-05-31 21:00+0200', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/126
+     */
+    public function testDtVCPTimezoneNoLeadingZero()
+    {
+        $input = '<div class="h-event">
+	<span class="dt-start">
+		<span class="value">2017-06-17</span>
+		<span class="value">22:00-700</span>
+	</span>
+	<span class="dt-end">
+		<span class="value">2017-06-17</span>
+		<span class="value">23:00-700</span>
+	</span>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-06-17 22:00-0700', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-06-17 23:00-0700', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/4
+     */
+    public function testImplyTimezoneFromStart()
+    {
+        $input = '<div class="h-event"> <time class="dt-start" datetime="2014-09-11 13:30-0700">13:30</time> to <time class="dt-end">15:30</time> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2014-09-11 13:30-0700', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-09-11 15:30-0700', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/4
+     */
+    public function testImplyTimezoneFromEnd()
+    {
+        $input = '<div class="h-event"> <time class="dt-start" datetime="2014-09-11 13:30">13:30</time> to <time class="dt-end">15:30-0700</time> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2014-09-11 13:30-0700', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-09-11 15:30-0700', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     *
+     */
+    public function testAMPMWithPeriods()
+    {
+        $input = '<div class="h-event">
+	<span class="dt-start">
+		<span class="value">2017-06-11</span>
+		<span class="value">10:00P.M.</span>
+	</span>
+	<span class="dt-end">
+		<span class="value">2017-06-12</span>
+		<span class="value">02:00a.m.</span>
+	</span>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-06-11 22:00', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-06-12 02:00', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     *
+     */
+    public function testAMPMWithoutPeriods()
+    {
+        $input = '<div class="h-event">
+	<span class="dt-start">
+		<span class="value">2017-06-17</span>
+		<span class="value">10:30pm</span>
+	</span>
+	<span class="dt-end">
+		<span class="value">2017-06-18</span>
+		<span class="value">02:30AM</span>
+	</span>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-06-17 22:30', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-06-18 02:30', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     *
+     */
+    public function testDtVCPTimeAndTimezone()
+    {
+        $input = '<div class="h-event">
+	<span class="dt-start">
+		<span class="value">2017-06-17</span>
+		<span class="value">13:30-07:00</span>
+	</span>
+	<span class="dt-end">
+		<span class="value">2017-06-17</span>
+		<span class="value">15:30-0700</span>
+	</span>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2017-06-17 13:30-0700', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2017-06-17 15:30-0700', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/147
+     */
+    public function testDtVCPMultipleDatesAndTimezones()
+    {
+        $input = '<div class="h-event">
+  <h1 class="p-name">Multiple date and time values</h1>
+
+  <p> When:
+    <span class="dt-start">
+    <span class="value" title="June 1, 2014">2014-06-01</span>
+    <span class="value" title="June 1, 3014">3014-06-01</span>
+    <span class="value" title="12:30">12:30</span>
+    (UTC<span class="value">-06:00</span>)
+    <span class="value" title="23:00">23:00</span>
+    (UTC<span class="value">+01:00</span>)
+    –
+    <span class="dt-end">19:30</span>
+  </p>
+
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2014-06-01 12:30-0600', $output['items'][0]['properties']['start'][0]);
+        $this->assertEquals('2014-06-01 19:30-0600', $output['items'][0]['properties']['end'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/149
+     */
+    public function testDtWithoutYear()
+    {
+        $input = '<div class="h-card"> <time class="dt-bday" datetime="--12-28"></time> </div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('--12-28', $output['items'][0]['properties']['bday'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/167
+     * @see https://github.com/microformats/mf2py/blob/master/test/examples/datetimes.html
+     */
+    public function testNormalizeOrdinalDate()
+    {
+        $input = '<div class="h-event">
+	<h1 class="p-name">Ordinal date</h1>
+	<p> When:
+		<span class="dt-start">
+			<span class="value">2016-062</span>
+			<span class="value">12:30AM</span>
+			(UTC<span class="value">-06:00</span>)
+	</p>
+</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2016-03-02 12:30-0600', $output['items'][0]['properties']['start'][0]);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php b/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
new file mode 100644
index 0000000..76e694e
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * 
+ * @internal
+ */
+class ParseHtmlIdTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    /** as per https://github.com/microformats/microformats2-parsing/issues/44 */
+    public function testParserIdAttribute()
+    {
+        $test = '<div class="h-feed" id="recentArticles"><h2 class="p-name">Recent Articles</h2><div class="hentry" id="article">Lorem Ipsum</div>
+		<div class="p-author h-card" id="theAuthor">Max Mustermann</div>
+		<div class="h-entry" id="">empty id should not be parsed</div>
+		<div class="h-entry" id="0">id=0 should work and not be treated false-y</div>
+		</div>';
+        $result = Mf2\parse($test);
+        $this->assertArrayHasKey('id', $result['items'][0]);
+        $this->assertEquals('recentArticles', $result['items'][0]['id']);
+        $this->assertArrayHasKey('id', $result['items'][0]['children'][0]);
+        $this->assertEquals('article', $result['items'][0]['children'][0]['id']);
+        $this->assertArrayHasKey('id', $result['items'][0]['properties']['author'][0]);
+        $this->assertEquals('theAuthor', $result['items'][0]['properties']['author'][0]['id']);
+        $this->assertArrayNotHasKey('id', $result['items'][0]['children'][1]);
+        $this->assertArrayHasKey('id', $result['items'][0]['children'][2]);
+        $this->assertEquals('0', $result['items'][0]['children'][2]['id']);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php b/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
new file mode 100644
index 0000000..6919313
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
@@ -0,0 +1,389 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * @todo some of these can be made into single tests with dataProviders
+ * @internal
+ */
+class ParseImpliedTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testParsesImpliedPNameFromNodeValue()
+    {
+        $input = '<span class="h-card">The Name</span>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testParsesImpliedPNameFromImgAlt()
+    {
+        $input = '<img class="h-card" src="" alt="The Name" />';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testParsesImpliedPNameFromNestedImgAlt()
+    {
+        $input = '<div class="h-card"><img src="" alt="The Name" /></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testParsesImpliedPNameFromDoublyNestedImgAlt()
+    {
+        $input = '<div class="h-card"><span><img src="" alt="The Name" /></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testParsesImpliedUPhotoFromImgSrcWithoutAlt()
+    {
+        $input = '<img class="h-card" src="http://example.com/img.png" />';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    public function testParsesImpliedUPhotoFromImgSrcWithEmptyAlt()
+    {
+        $input = '<img class="h-card" src="http://example.com/img.png" alt="" />';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]['value']);
+        $this->assertEquals('', $output['items'][0]['properties']['photo'][0]['alt']);
+    }
+    public function testParsesImpliedUPhotoFromImgSrcWithAlt()
+    {
+        $input = '<img class="h-card" src="http://example.com/img.png" alt="Example" />';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]['value']);
+        $this->assertEquals('Example', $output['items'][0]['properties']['photo'][0]['alt']);
+    }
+    public function testParsesImpliedUPhotoFromNestedImgSrc()
+    {
+        $input = '<div class="h-card"><img src="http://example.com/img.png" alt="" /></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $return = ['value' => 'http://example.com/img.png', 'alt' => ''];
+        $this->assertEquals($return, $output['items'][0]['properties']['photo'][0]);
+    }
+    public function testParsesImpliedUPhotoFromDoublyNestedImgSrc()
+    {
+        $input = '<div class="h-card"><span><img src="http://example.com/img.png" alt="" /></span></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $result = ['alt' => '', 'value' => 'http://example.com/img.png'];
+        $this->assertEquals($result, $output['items'][0]['properties']['photo'][0]);
+    }
+    /*
+     * see testImpliedPhotoFromNestedObject() and testImpliedPhotoFromNestedObject()
+    public function testIgnoresImgIfNotOnlyChild() {
+    	$input = '<div class="h-card"><img src="http://example.com/img.png" /> <p>Moar text</p></div>';
+    	$parser = new Parser($input);
+    	$output = $parser->parse();
+    
+    	$this->assertArrayNotHasKey('photo', $output['items'][0]['properties']);
+    }
+    
+    public function testIgnoresDoublyNestedImgIfNotOnlyDoublyNestedChild() {
+    	$input = '<div class="h-card"><span><img src="http://example.com/img.png" /> <p>Moar text</p></span></div>';
+    	$parser = new Parser($input);
+    	$output = $parser->parse();
+    
+    	$this->assertArrayNotHasKey('photo', $output['items'][0]['properties']);
+    }
+    */
+    public function testParsesImpliedUUrlFromAHref()
+    {
+        $input = '<a class="h-card" href="http://example.com/">Some Name</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+    }
+    public function testParsesImpliedUUrlFromNestedAHref()
+    {
+        $input = '<span class="h-card"><a href="http://example.com/">Some Name</a></span>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+    }
+    public function testParsesImpliedUUrlWithExplicitName()
+    {
+        $input = '<span class="h-card"><a href="http://example.com/" class="p-name">Some Name</a></span>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+    }
+    public function testParsesImpliedNameWithExplicitURL()
+    {
+        $input = '<span class="h-card"><a href="http://example.com/" class="u-url">Some Name</a></span>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+        $this->assertEquals('Some Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testMultipleImpliedHCards()
+    {
+        $input = '<span class="h-card">Frances Berriman</span>
+
+<a class="h-card" href="http://benward.me">Ben Ward</a>
+
+<img class="h-card" alt="Sally Ride"
+	 src="http://upload.wikimedia.org/wikipedia/commons/a/a4/Ride-s.jpg"/>
+
+<a class="h-card" href="http://tantek.com">
+ <img alt="Tantek Çelik" src="http://ttk.me/logo.jpg"/>
+</a>';
+        $expected = '{
+	"rels": {},
+	"rel-urls": {},
+	"items": [{
+		"type": ["h-card"],
+		"properties": {
+			"name": ["Frances Berriman"]
+		}
+	},
+	{
+		"type": ["h-card"],
+		"properties": {
+			"name": ["Ben Ward"],
+			"url": ["http://benward.me"]
+		}
+	},
+	{
+		"type": ["h-card"],
+		"properties": {
+			"name": ["Sally Ride"],
+			"photo": [{
+				"value": "http://upload.wikimedia.org/wikipedia/commons/a/a4/Ride-s.jpg",
+				"alt": "Sally Ride"
+			}]
+		}
+	},
+	{
+		"type": ["h-card"],
+		"properties": {
+			"name": ["Tantek Çelik"],
+			"url": ["http://tantek.com"],
+			"photo": [{
+				"value": "http://ttk.me/logo.jpg",
+				"alt": "Tantek Çelik"
+			}]
+		}
+	}]
+}';
+        $parser = new Parser($input, '', \true);
+        $output = $parser->parse();
+        $this->assertJsonStringEqualsJsonString(\json_encode($output), $expected);
+    }
+    /** as per https://github.com/indieweb/php-mf2/issues/37 */
+    public function testParsesImpliedNameConsistentWithPName()
+    {
+        $inner = "Name\t\nand more";
+        $test = '<span class="h-card"> ' . $inner . ' </span><span class="h-card"><span class="p-name"> ' . $inner . ' </span></span>';
+        $result = Mf2\parse($test);
+        $this->assertEquals('Name and more', $result['items'][0]['properties']['name'][0]);
+        $this->assertEquals('Name and more', $result['items'][1]['properties']['name'][0]);
+    }
+    /** @see https://github.com/indieweb/php-mf2/issues/6 */
+    public function testParsesImpliedNameFromAbbrTitle()
+    {
+        $input = '<abbr class="h-card" title="Barnaby Walters">BJW</abbr>';
+        $result = Mf2\parse($input);
+        $this->assertEquals('Barnaby Walters', $result['items'][0]['properties']['name'][0]);
+    }
+    public function testImpliedPhotoFromObject()
+    {
+        $input = '<object class="h-card" data="http://example/photo1.jpg">John Doe</object>';
+        $result = Mf2\parse($input);
+        $this->assertArrayHasKey('photo', $result['items'][0]['properties']);
+        $this->assertEquals('http://example/photo1.jpg', $result['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * Correcting previous test testIgnoresImgIfNotOnlyChild()
+     * This *should* return the photo since h-x>img[src]:only-of-type:not[.h-*]
+     * @see https://indiewebcamp.com/User:Tantek.com
+     */
+    public function testImpliedPhotoFromNestedImg()
+    {
+        $input = '<span class="h-card"><a href="http://tantek.com/" class="external text" style="border: 0px none;"><img src="https://pbs.twimg.com/profile_images/423350922408767488/nlA_m2WH.jpeg" style="width:128px;float:right;margin-left:1em"><b><span style="font-size:2em">Tantek Çelik</span></b></a></span>';
+        $result = Mf2\parse($input);
+        $this->assertArrayHasKey('photo', $result['items'][0]['properties']);
+        $this->assertEquals('https://pbs.twimg.com/profile_images/423350922408767488/nlA_m2WH.jpeg', $result['items'][0]['properties']['photo'][0]);
+    }
+    public function testIgnoredPhotoIfMultipleImg()
+    {
+        $input = '<div class="h-card"><img src="http://example/photo2.jpg" /> <img src="http://example/photo3.jpg" /> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * Correcting previous test testIgnoresDoublyNestedImgIfNotOnlyDoublyNestedChild()
+     * This *should* return the photo since .h-x>object[data]:only-of-type:not[.h-*]
+     */
+    public function testImpliedPhotoFromNestedObject()
+    {
+        $input = '<div class="h-card"><object data="http://example/photo3.jpg">John Doe</object> <p>Moar text</p></div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayHasKey('photo', $result['items'][0]['properties']);
+        $this->assertEquals('http://example/photo3.jpg', $result['items'][0]['properties']['photo'][0]);
+    }
+    public function testIgnoredPhotoIfMultipleObject()
+    {
+        $input = '<div class="h-card"><object data="http://example/photo3.jpg">John Doe</object> <object data="http://example/photo4.jpg"></object> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    public function testIgnoredPhotoIfNestedImgH()
+    {
+        $input = '<div class="h-entry"> <img src="http://example/photo2.jpg" class="h-card" /> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    public function testIgnoredPhotoIfNestedImgHasHClass()
+    {
+        $input = '<div class="h-entry"> <img src="http://example/photo2.jpg" alt="John Doe" class="h-card" /> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    public function testIgnoredPhotoIfNestedObjectHasHClass()
+    {
+        $input = '<div class="h-entry"> <object data="http://example/photo3.jpg" class="h-card">John Doe</object> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/176
+     */
+    public function testIgnoredPhotoImgInNestedH()
+    {
+        $input = '<div class="h-entry"> <div class="u-comment h-cite"> <img src="/image.jpg"> </div> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/176
+     */
+    public function testIgnoredPhotoObjectInNestedH()
+    {
+        $input = '<div class="h-entry"> <div class="u-comment h-cite"> <object data="/image2.jpg">John Doe</object> </div> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/190
+     */
+    public function testIgnoredMultiChildrenWithNestedPhotoImg()
+    {
+        $input = '<div class="h-card"> <a href="https://example.com"><img src="https://example.com/photo.jpg"></a> <span class="p-name"><a href="/User:Example.com">Max Mustermann</a></span> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/190
+     */
+    public function testIgnoredMultiChildrenWithNestedPhotoObject()
+    {
+        $input = '<div class="h-card"> <a href="https://example.com"><object data="https://example.com/photo.jpg"></object></a> <span class="p-name"><a href="/User:Example.com">Max Mustermann</a></span> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * Imply properties only on explicit h-x class name root microformat element (no backcompat roots)
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+     */
+    public function testBackcompatNoImpliedName()
+    {
+        $input = '<div class="hentry"> <div class="entry-content"> <p> blah blah blah </p> </div> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('name', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('content', $result['items'][0]['properties']);
+    }
+    /**
+     * Imply properties only on explicit h-x class name root microformat element (no backcompat roots)
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+     */
+    public function testBackcompatNoImpliedPhoto()
+    {
+        $input = '<div class="hentry"> <img src="https://example.com/photo.jpg" alt="photo" /> </div>';
+        $result = Mf2\parse($input);
+        $this->assertEmpty($result['items'][0]['properties']);
+    }
+    /**
+     * Imply properties only on explicit h-x class name root microformat element (no backcompat roots)
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+     */
+    public function testBackcompatNoImpliedUrl()
+    {
+        $input = '<div class="hentry"> <a href="https://example.com/this-post" class="entry-title">Title</a> <div class="entry-content"> <p> blah blah blah </p> </div> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('url', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('name', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('content', $result['items'][0]['properties']);
+    }
+    /**
+     * Don't imply u-url if there are other u-*
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+     * @see https://github.com/microformats/php-mf2/issues/183
+     */
+    public function testNoImpliedUrl()
+    {
+        $input = '<div class="h-entry"> <h1 class="p-name"><a href="https://example.com/this-post">Title</a></h1> <div class="e-content"> <p> blah blah blah </p> </div> <a href="https://example.org/syndicate" class="u-syndication"></a> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('url', $result['items'][0]['properties']);
+    }
+    /**
+     * Do not use img src in implied p-name
+     * @see https://github.com/microformats/php-mf2/issues/180
+     */
+    public function testNoImgSrcImpliedName()
+    {
+        $input = '<p class="h-card">My Name <img src="http://xyz" /></p>';
+        $result = Mf2\parse($input);
+        $this->assertArrayHasKey('name', $result['items'][0]['properties']);
+        $this->assertEquals('My Name', $result['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @see https://github.com/microformats/php-mf2/issues/198
+     */
+    public function testNoImpliedPhotoWhenExplicitUProperty()
+    {
+        $input = '<div class="h-card"> <span class="p-org">Organization Name</span> <img src="/logo.png" class="u-logo" alt=""> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/microformats/php-mf2/issues/198
+     */
+    public function testNoImpliedPhotoWhenNestedMicroformat()
+    {
+        $input = '<div class="h-entry"> <img src="/photo.jpg" alt=""> <div class="p-author h-card"> <span class="p-name">Alice</span> <span class="p-org">Organization Name</span> <img src="/logo.png" class="u-logo" alt=""> </div> </div>';
+        $result = Mf2\parse($input);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('author', $result['items'][0]['properties']);
+        $this->assertArrayNotHasKey('photo', $result['items'][0]['properties']['author'][0]['properties']);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php b/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
new file mode 100644
index 0000000..a7fd7ca
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
@@ -0,0 +1,253 @@
+<?php
+
+/**
+ * Tests of the language parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class ParseLanguageTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    /**
+     * Test with only <html lang>
+     */
+    public function testHtmlLangOnly()
+    {
+        $input = '<html lang="en"> <div class="h-entry">This test is in English.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('en', $result['items'][0]['lang']);
+    }
+    # end method testHtmlLangOnly()
+    /**
+     * Test with only h-entry lang
+     */
+    public function testHEntryLangOnly()
+    {
+        $input = '<html> <div class="h-entry" lang="en">This test is in English.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('en', $result['items'][0]['lang']);
+    }
+    # end method testHEntryLangOnly()
+    /**
+     * Test with different <html lang> and h-entry lang
+     */
+    public function testHtmlAndHEntryLang()
+    {
+        $input = '<html lang="en"> <div class="h-entry" lang="es">Esta prueba está en español.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('es', $result['items'][0]['lang']);
+    }
+    # end method testHtmlAndHEntryLang()
+    /**
+     * Test HTML fragment with only h-entry lang
+     */
+    public function testFragmentHEntryLangOnly()
+    {
+        $input = '<div class="h-entry" lang="en">This test is in English.</div>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('en', $result['items'][0]['lang']);
+    }
+    # end method testFragmentHEntryLangOnly()
+    /**
+     * Test HTML fragment with no lang
+     */
+    public function testFragmentHEntryNoLang()
+    {
+        $input = '<div class="h-entry">This test is in English.</div>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayNotHasKey('lang', $result['items'][0]);
+    }
+    # end method testFragmentHEntryNoLang()
+    /**
+     * Test HTML fragment with no lang, loaded with loadXML()
+     */
+    public function testFragmentHEntryNoLangXML()
+    {
+        $input = new \DOMDocument();
+        $input->loadXML('<div class="h-entry">This test is in English.</div>');
+        $parser = new Parser($input);
+        $result = $parser->parse();
+        $this->assertArrayNotHasKey('lang', $result['items'][0]);
+    }
+    # end method testFragmentHEntryNoLangXML()
+    /**
+     * Test with different <html lang>, h-entry lang, and h-entry without lang,
+     * which should inherit from the <html lang>
+     */
+    public function testMultiLanguageInheritance()
+    {
+        $input = '<html lang="en"> <div class="h-entry">This test is in English.</div> <div class="h-entry" lang="es">Esta prueba está en español.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertArrayHasKey('lang', $result['items'][1]);
+        $this->assertEquals('en', $result['items'][0]['lang']);
+        $this->assertEquals('es', $result['items'][1]['lang']);
+    }
+    # end method testMultiLanguageInheritance()
+    /**
+     * Test feed with .h-feed lang which contains multiple h-entries of different languages
+     * (or none specified), which should inherit from the .h-feed lang.
+     */
+    public function testMultiLanguageFeed()
+    {
+        $input = '<html> <div class="h-feed" lang="en"> <h1 class="p-name">Test Feed</h1> <div class="h-entry">This test is in English.</div> <div class="h-entry" lang="es">Esta prueba está en español.</div> <div class="h-entry" lang="fr">Ce test est en français.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('en', $result['items'][0]['lang']);
+        $this->assertArrayHasKey('lang', $result['items'][0]['children'][0]);
+        $this->assertEquals('en', $result['items'][0]['children'][0]['lang']);
+        $this->assertArrayHasKey('lang', $result['items'][0]['children'][1]);
+        $this->assertEquals('es', $result['items'][0]['children'][1]['lang']);
+        $this->assertArrayHasKey('lang', $result['items'][0]['children'][2]);
+        $this->assertEquals('fr', $result['items'][0]['children'][2]['lang']);
+    }
+    # end method testMultiLanguageFeed()
+    /**
+     * Test with language specified in <meta> http-equiv Content-Language
+     */
+    public function testMetaContentLanguage()
+    {
+        $input = '<html> <meta http-equiv="Content-Language" content="es"/> <div class="h-entry">Esta prueba está en español.</div> </html>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('es', $result['items'][0]['lang']);
+    }
+    # end method testMetaContentLanguage()
+    /**
+     * Test with real-world post on voxpelli.com
+     * @see http://voxpelli.com/2015/09/oberoende-sociala-webben-2015/
+     */
+    public function testVoxpelliCom()
+    {
+        $input = <<<END
+<!DOCTYPE html>
+<html class="no-js" lang="en">
+<head>
+<meta charset="utf-8">
+<title>Den oberoende sociala webben 2015 – Pelle Wessman</title>
+
+<script>
+    document.documentElement.className = document.documentElement.className.replace(/\\bno-js\\b/,'js');
+</script>
+<meta content="width=device-width, initial-scale=1" name="viewport">
+<link href="/css/style.css" media="all" rel="stylesheet" type="text/css">
+<link href="/all.xml" rel="home alternate" title="All posts" type="application/atom+xml">
+<link href="/english.xml" rel="home alternate" title="English posts" type="application/atom+xml">
+<link href="http://voxpelli.com/2015/09/oberoende-sociala-webben-2015/" rel="canonical">
+<meta content="@voxpelli" name="twitter:site">
+<link href="/" rel="author" title="Pelle Wessman" type="text/html">
+<link href="https://flattr.com/submit/auto?url=http%3A%2F%2Fvoxpelli.com%2F2015%2F09%2Foberoende-sociala-webben-2015%2F&amp;user_id=voxpelli&amp;title=Den+oberoende+sociala+webben+2015&amp;category=text&amp;tags=blog&amp;language=sv" rel="payment" title="Flattr this post" type="text/html">
+<link href="https://webmention.herokuapp.com/api/webmention" rel="webmention">
+<script src="/js/indieconfig.js" type="text/javascript"></script>
+<script src="/js/webaction.js" type="text/javascript"></script>
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-6823873-1', 'auto');
+    ga('send', 'pageview');
+</script>
+</head>
+<body>
+<div class="page">
+<header>
+<h1><a href="/">Pelle Wessman</a></h1>
+<div class="subtitle">Things <a href="/about/">about me</a> and the world around us</div>
+</header>
+<article class="h-entry" lang="sv">
+<header>
+<h2 class="p-name">Den oberoende sociala webben 2015</h2>
+</header>
+<div class="e-content">
+<p>Sociala medier. Synonymt med Facebook, Twitter, Instagram. Vad händer <a href="http://digital.di.se/artikel/vad-hander-nar-twitter-forsvinner">när en av dem försvinner</a>? Är det game over då? <a href="http://jardenberg.se/mindpark-16-natten-da-mikrobloggen-blev-av-med-oskulden/">Jaiku</a> i repris, fast denna gång utan livlina?</p>
+<p>Framtiden för sociala medier kan låta dyster. Om de inte läggs ner helt så kan de ju i alla fall ha moraliska frågetecken kring <a href="http://www.svt.se/kultur/konst/facebook-censurerar-zorns-fotografier">konst</a>, <a href="https://en.wikipedia.org/wiki/Free_the_Nipple_%28campaign%29">aktivism</a> eller annat. Men i det fördolda har många länge ställt frågan: <strong>Om webben är öppen, varför måste det sociala vara stängt?</strong> Och nu börjar det röra sig där.</p>
+<p>Att ställa en fråga har alltid varit bra. Att fixa en lösning har ofta varit bättre. Att fixa lösningar har dock <a href="http://voxpelli.com/2012/10/tent-ostatus-historielektionen/">inte lyckats lika bra</a> som alla frågor som ställts. Många fina lösningar har tänkts ut, men de flesta har ignorerat den verklighet och det sammanhang vi lever i och framförallt den <a href="https://en.wikipedia.org/wiki/Network_effect">nätverkseffekt</a> som ger de sociala medierna sitt största värde idag. Men – turligt nog rättar sig inte alla i det ledet och nu börjar det bli spännande.</p>
+<p><a href="https://indiewebcamp.com/founders">IndieWebCamp startade 2010</a> av <a href="http://aaronparecki.com">Aaron Parecki</a> och <a href="https://indiewebcamp.com/User:Tantek.com">Tantek Çelik</a> för att de <strong>ville se ett annat fokus</strong> än det tanke-centrerade, små-akademiska som varit innan. <strong>Ett fokus på att skapa snarare än att prata.</strong> Ett fokus på att lösa ens egna problem. Och ett fokus på att äga sin egna data i praktiken, inte bara i teorin. Sedan dess har många anslutit sig och flertalet verktyg och tjänster växt fram – IndieWebben har blivit en rörelse.</p>
+<p>Idag är i princip alla komponenter redo för att kunna återföra det som en gång i tiden kallades för mikrobloggar tillbaka till sina bloggrötter. Och det <strong>utan att bryta med de stora sociala medierna</strong> så som många tidigare lösningar krävt. Det finns de som redan gör så idag, bl.a. grundarna av IndieWebCamp, och även min blogg är väl nästan redo att sälla sig dit.</p>
+<p>Så – idag kan man alltså i princip både vara sin egen och vara en del i de stora sociala plattformarna – och de skarpa hörnen som ännu finns blir mer och mer rundade för var dag som går.</p>
+<p>För att vara mer konkret så har det ur IndieWeb-rörelsen kommit möjligheter att:</p>
+<ul>
+<li>Ta emot replies, likes m.m. på sina inlägg direkt från andra bloggar via en teknik som kallas <a href="http://indiewebcamp.com/Webmention">WebMentions</a>. Bl.a. jag själv <a href="http://voxpelli.com/2013/12/webmentions-for-static-pages/">tillhandahåller en Disqus-liknande tjänst</a> som gör det lätt att ta emot sådana reaktioner i realtid på vilken sida som helst – något flera <a href="http://www.kevinmarks.com/">har valt</a> <a href="http://www.kryogenix.org/days/2014/11/29/enabling-webmentions/">att nyttja</a>.</li>
+<li>Posta poster från ens egna sajt till existerande sociala medier via vad som kallas <a href="https://indiewebcamp.com/POSSE">POSSE</a> (<em>Publish (on your) Own Site, Syndicate Elsewhere</em>) och få tillbaka reaktioner därifrån som WebMentions genom tjänster såsom <a href="https://www.brid.gy">Brid.gy</a> – så att de som ännu hänger kvar i klassiska sociala medier kan fortsatt vara lika delaktiga som de är idag.</li>
+<li>Svara på inlägg direkt från någon annans sajt genom <a href="https://indiewebcamp.com/webactions">Webactions</a> och <a href="https://indiewebcamp.com/indie-config">Indie-Config</a> (se mitt <a href="http://voxpelli.com/2014/10/indie-config-overview/">tidigare inlägg</a>). Sådana knappar finns t.ex. på denna posten, men i nuläget har jag inte själv kopplat in reaktioner från Twitter så de kommentarer som postas via Twitter syns tyvärr inte här ännu.</li>
+<li>Posta nytt innehåll via ett standardiserat API, <a href="https://indiewebcamp.com/Micropub">Micropub</a>. Det möjliggör t.ex. för mobila klienter (har spelat in <a href="https://www.youtube.com/watch?v=CBPmSpD2jN4">en screencast</a> som visar en prototyp på ett flöde som man kan få till redan idag) liksom för automatisk import från existerande medier såsom från Instagram via <a href="http://ownyourgram.com">OwnYourGram</a>. Mitt nuvarande IndieWeb-projekt som i princip är klart exponerar till och med ett sådant API för statiska <a href="http://jekyllrb.com/">Jekyll</a>-sajter på <a href="https://pages.github.com/">GitHub Pages</a> eftersom jag <a href="http://voxpelli.com/2011/08/moving-to-jekyll-and-english/">själv kör en sådan</a>. Kommer blogga mer om det längre fram.</li>
+<li>En inloggningsmekanism, <a href="https://indiewebcamp.com/IndieAuth">IndieAuth</a>, som gör att man kan logga in på alla olika tjänster med sin egna sajt och ge tillgång till olika saker där – likt ”Sign in with Twitter” och liknande – fast som allt annat inom IndieWebben helt distribuerat.</li>
+<li>Olika <a href="https://indiewebcamp.com/reader">läsare för oberoende innehåll</a> om man vill följa dem och interagera med dem oberoende av existerande medier. Vissa av dessa kan också användas för att interagera med poster och publicera nya vilket i princip gör dem till fullgoda sociala medie-alternativ, med enda skillnaden att alla poster och aktiviteter postas på individuella och helt separata bloggar. Hittills efterliknar tyvärr de flesta sådana läsarna RSS-läsare snarare än sociala medier, men det är mer av en designutmaning än en teknisk utmaning – grunden är densamma oavsett.</li>
+</ul>
+<p>Så I stort sett täcker IndieWebben idag åtminstone allt det en plattform som Twitter behöver kunna – och i stort så kan det göras lika smidigt där som det kan på Twitter.</p>
+<p>IndieWeb-rörelsen tog dessutom för någon månad sedan och demonstrerade att de kunde genomföra det så kallade <a href="http://indiewebcamp.com/SWAT0">SWAT0-testet</a> som är tänkt att vara ett implementationsoberoende test för att visa att ens tjänster distribuerat klarar av att hantera ett måttligt vanligt sociala medier scenario. Tre aktörer med tre olika implementationer deltog i testet och många fler är på gång att kunna demonstrera detsamma, däribland min <a href="https://webmention.herokuapp.com/">egna WebMentions-tjänst</a> som <a href="https://github.com/voxpelli/webpage-webmentions/milestones/SWAT0">nästan har alla bitar på plats</a>.</p>
+<p>Så – vad är slutsatsen med allt detta Indie-hit och Indie-dit? Är det inte ändå till syvende och sist bara massa tekniknördar som flippar loss med sina älskade tekniska termer och som saknar varje liten verklighetsförankring man skulle kunna önska? Nej. Denna gången är det annorlunda. Denna gången är fokus på verkstad. Denna gången bevisas att något funkar innan det dokumenteras som en standard. Denna gången löser något ett verkligt behov före att det lyfts fram som frälsaren för alla de andra. Ingen IndieWeb-standard har kommit till utan att också ha haft en fungerade använd implementation i verkligheten från dag ett.</p>
+<p>Eftersom fokuset varit på verkstad så har indiewebben byggts för att kunna samexistera med dagens sociala webb och i takt med att de stora sociala mediernas roll därmed så sakteliga kan minska i takt med att oberoende lösningar börjar användas så kan ett gradvis överflyttande ske i takt med att allt fler upptäcker fördelarna – ett hyfsat realistiskt scenario alltså till skillnad mot många tidigare drömmar.</p>
+<p>Allt är såklart inte guld och gröna skogar ännu. Det finns fortfarande svårigheter kvar och alla varken kan, bör eller kommer att byta över idag eller imorgon. Men det viktiga är: Det finns en lovande start som det är lätt att börja nosa på och i takt med att allt fler nosar så fås allt mer erfarenhet och med mer erfarenhet byggs än bättre upplevelser och plötsligt finns där en klar väg framåt (en väg som dessutom öppnar för många nya spännande innovationer inom området).</p>
+<p>Så när Twitter kanske så småningom försvinner så kanske den inte blir ett nytt Jaiku. För då kanske vi flyttat tillbaka hem. Vi kanske då har vår bas på den egna bloggen igen. Och då kan <em>ingen</em> någonsin stänga ner oss igen. Då är vi våra egna och ingen annans. Oberoende på riktigt. Så som webben är ment att vara.</p>
+</div>
+<div class="submitted-to linklist">
+<h3>Inskickad till:</h3>
+<ul>
+<li><a class="u-category" href="http://news.indiewebcamp.com/sv">news.indiewebcamp</a></li>
+</ul>
+</div>
+<footer lang="en"><time class="dt-published" datetime="2015-09-18T19:00:00+00:00" pubdate=""><a class="u-url u-uid" href="/2015/09/oberoende-sociala-webben-2015/">18 September 2015</a></time> by <a class="p-author h-card" href="/"><img alt="" class="u-photo" src="/avatar.jpg"> Pelle Wessman</a>
+<div class="indie-actions"><a class="action like" href="https://plus.google.com/share?url={url}" target="_blank">Like</a> <a class="action repost" href="https://twitter.com/intent/tweet?url={url}" target="_blank">Share</a> <a class="action reply" href="https://twitter.com/intent/tweet?url={url}" target="_blank">Reply</a> </div>
+</footer>
+<a class="u-responses" href="https://webmention.herokuapp.com/api/mentions?format=html&url=http%3A%2F%2Fvoxpelli.com%2F2015%2F09%2Foberoende-sociala-webben-2015%2F">See mentions of this post</a></article>
+<div>Have you written a response to this? Let me know the URL:
+<form action="https://webmention.herokuapp.com/api/webmention" method="post"><input name="source" placeholder="http://example.com/my-cool-post" type="url"> <input name="target" type="hidden" value="http://voxpelli.com/2015/09/oberoende-sociala-webben-2015/"> <input type="submit" value="Send Webmention"></form>
+</div>
+<script src="https://webmention.herokuapp.com/js/cutting-edge.js"></script></div>
+</body>
+</html>
+END;
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+        $this->assertEquals('sv', $result['items'][0]['lang']);
+    }
+    # end method testVoxpelliCom()
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/96#issuecomment-304457341
+     */
+    public function testNoLangInParsedProperties()
+    {
+        $input = '<div class="h-entry" lang="sv" id="postfrag123">
+  <h1 class="p-name">En svensk titel</h1>
+  <div class="e-content" lang="en">With an <em>english</em> summary</div>
+  <div class="e-content">Och <em>svensk</em> huvudtext</div>
+</div>';
+        $parser = new Parser($input);
+        $parser->lang = \true;
+        $result = $parser->parse();
+        $this->assertArrayNotHasKey('lang', $result['items'][0]['properties']);
+        $this->assertArrayHasKey('lang', $result['items'][0]);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParsePTest.php b/libs/mf2/mf2/tests/Mf2/ParsePTest.php
new file mode 100644
index 0000000..d974a76
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParsePTest.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class ParsePTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePHandlesInnerText()
+    {
+        $input = '<div class="h-card"><p class="p-name">Example User</p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Example User', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePHandlesImg()
+    {
+        $input = '<div class="h-card"><img class="p-name" alt="Example User"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Example User', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePHandlesAbbr()
+    {
+        $input = '<div class="h-card h-person"><abbr class="p-name" title="Example User">@example</abbr></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Example User', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePHandlesData()
+    {
+        $input = '<div class="h-card"><data class="p-name" value="Example User"></data></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Example User', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePHandlesDataWithBlankValueAttribute()
+    {
+        $input = '<div class="h-card"><data class="p-name" value="">Example User</data></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group parseP
+     */
+    public function testParsePReturnsEmptyStringForBrHr()
+    {
+        $input = '<div class="h-card"><br class="p-name"/></div><div class="h-card"><hr class="p-name"/></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('', $output['items'][0]['properties']['name'][0]);
+        $this->assertEquals('', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testParsesInputValue()
+    {
+        $input = '<span class="h-card"><input class="u-url" value="http://example.com" /></span>';
+        $result = Mf2\parse($input);
+        $this->assertEquals('http://example.com', $result['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/53
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_an_e-_property
+     */
+    public function testConvertsNestedImgElementToAltOrSrc()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<p class="p-name">The day I saw a <img alt="five legged elephant" src="/photos/five-legged-elephant.jpg" /></p>
+\t<p class="p-summary">Blah blah <img src="/photos/five-legged-elephant.jpg" /></p>
+</div>
+EOT;
+        $result = Mf2\parse($input, 'http://waterpigs.co.uk/articles/five-legged-elephant');
+        $this->assertEquals('The day I saw a five legged elephant', $result['items'][0]['properties']['name'][0]);
+        $this->assertEquals('Blah blah http://waterpigs.co.uk/photos/five-legged-elephant.jpg', $result['items'][0]['properties']['summary'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/69
+     */
+    public function testBrWhitespaceIssue69()
+    {
+        $input = '<div class="h-card"><p class="p-adr"><span class="p-street-address">Street Name 9</span><br/><span class="p-locality">12345 NY, USA</span></p></div>';
+        $result = Mf2\parse($input);
+        $this->assertEquals('Street Name 9' . "\n" . '12345 NY, USA', $result['items'][0]['properties']['adr'][0]);
+        $this->assertEquals('Street Name 9', $result['items'][0]['properties']['street-address'][0]);
+        $this->assertEquals('12345 NY, USA', $result['items'][0]['properties']['locality'][0]);
+        // p-name is no longer implied for this test due to other p-*
+        // see https://github.com/microformats/microformats2-parsing/issues/6
+        $this->assertArrayNotHasKey('name', $result['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/89
+     */
+    public function testEmptyAlt()
+    {
+        $input = '<div class="p-author h-card"><a href="/" class="p-org p-name"><img class="u-logo" src="/static/logo.jpg" alt="" />mention.tech</a></div>';
+        $result = Mf2\parse($input);
+        $this->assertEquals('mention.tech', $result['items'][0]['properties']['org'][0]);
+        $this->assertEquals('mention.tech', $result['items'][0]['properties']['name'][0]);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseUTest.php b/libs/mf2/mf2/tests/Mf2/ParseUTest.php
new file mode 100644
index 0000000..173834f
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseUTest.php
@@ -0,0 +1,319 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class ParseUTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesA()
+    {
+        $input = '<div class="h-card"><a class="u-url" href="http://example.com">Awesome example website</a></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com', $output['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesEmptyHrefAttribute()
+    {
+        $input = '<div class="h-card"><a class="u-url" href="">Awesome example website</a></div>';
+        $parser = new Parser($input, "http://example.com/");
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesMissingHrefAttribute()
+    {
+        $input = '<div class="h-card"><a class="u-url">Awesome example website</a></div>';
+        $parser = new Parser($input, "http://example.com/");
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/Awesome example website', $output['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesImg()
+    {
+        $input = '<div class="h-card"><img class="u-photo" src="http://example.com/someimage.png"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesImgwithAlt()
+    {
+        $input = '<div class="h-card"><img class="u-photo" src="http://example.com/someimage.png" alt="Test Alt"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $result = array('value' => 'http://example.com/someimage.png', 'alt' => 'Test Alt');
+        $this->assertEquals($result, $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesImgwithoutAlt()
+    {
+        $input = '<div class="h-card"><img class="u-photo" src="http://example.com/someimage.png"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesArea()
+    {
+        $input = '<div class="h-card"><area class="u-photo" href="http://example.com/someimage.png"></area></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesObject()
+    {
+        $input = '<div class="h-card"><object class="u-photo" data="http://example.com/someimage.png"></object></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesAbbr()
+    {
+        $input = '<div class="h-card"><abbr class="u-photo" title="http://example.com/someimage.png"></abbr></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesAbbrNoTitle()
+    {
+        $input = '<div class="h-card"><abbr class="u-photo">no title attribute</abbr></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('no title attribute', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesData()
+    {
+        $input = '<div class="h-card"><data class="u-photo" value="http://example.com/someimage.png"></data></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('photo', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group baseUrl
+     */
+    public function testResolvesRelativeUrlsFromDocumentUrl()
+    {
+        $input = '<div class="h-card"><img class="u-photo" src="../image.png" /></div>';
+        $parser = new Parser($input, 'http://example.com/things/more/more.html');
+        $output = $parser->parse();
+        $this->assertEquals('http://example.com/things/image.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group baseUrl
+     */
+    public function testResolvesRelativeUrlsFromBaseUrl()
+    {
+        $input = '<head><base href="http://example.com/things/more/andmore/" /></head><body><div class="h-card"><img class="u-photo" src="../image.png" /></div></body>';
+        $parser = new Parser($input, 'http://example.com/things/more.html');
+        $output = $parser->parse();
+        $this->assertEquals('http://example.com/things/more/image.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group baseUrl
+     */
+    public function testResolvesRelativeUrlsInImpliedMicroformats()
+    {
+        $input = '<a class="h-card"><img src="image.png" /></a>';
+        $parser = new Parser($input, 'http://example.com/things/more.html');
+        $output = $parser->parse();
+        $this->assertEquals('http://example.com/things/image.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group baseUrl
+     */
+    public function testResolvesRelativeBaseRelativeUrlsInImpliedMicroformats()
+    {
+        $input = '<base href="things/"/><a class="h-card"><img src="image.png" /></a>';
+        $parser = new Parser($input, 'http://example.com/');
+        $output = $parser->parse();
+        $this->assertEquals('http://example.com/things/image.png', $output['items'][0]['properties']['photo'][0]);
+    }
+    /** @see https://github.com/indieweb/php-mf2/issues/33 */
+    public function testParsesHrefBeforeValueClass()
+    {
+        $input = '<span class="h-card"><a class="u-url" href="http://example.com/right"><span class="value">WRONG</span></a></span>';
+        $result = Mf2\parse($input);
+        $this->assertEquals('http://example.com/right', $result['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesAudio()
+    {
+        $input = '<div class="h-entry"><audio class="u-audio" src="http://example.com/audio.mp3"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('audio', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/audio.mp3', $output['items'][0]['properties']['audio'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesVideo()
+    {
+        $input = '<div class="h-entry"><video class="u-video" src="http://example.com/video.mp4"></video></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('video', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/video.mp4', $output['items'][0]['properties']['video'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesVideoNoSrc()
+    {
+        $input = '<div class="h-entry"><video class="u-video">no video support</video></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('video', $output['items'][0]['properties']);
+        $this->assertEquals('no video support', $output['items'][0]['properties']['video'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesSource()
+    {
+        $input = '<div class="h-entry"><video><source class="u-video" src="http://example.com/video.mp4" type="video/mp4"><source class="u-video" src="http://example.com/video.ogg" type="video/ogg"></video></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('video', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/video.mp4', $output['items'][0]['properties']['video'][0]);
+        $this->assertEquals('http://example.com/video.ogg', $output['items'][0]['properties']['video'][1]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUHandlesVideoPoster()
+    {
+        $input = '<div class="h-entry"><video class="u-photo" poster="http://example.com/posterimage.jpg"><source class="u-video" src="http://example.com/video.mp4" type="video/mp4"></video></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('video', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/video.mp4', $output['items'][0]['properties']['video'][0]);
+        $this->assertEquals('http://example.com/posterimage.jpg', $output['items'][0]['properties']['photo'][0]);
+    }
+    /**
+     * @group parseU
+     */
+    public function testParseUWithSpaces()
+    {
+        $input = '<div class="h-card"><a class="u-url" href=" http://example.com ">Awesome example website</a></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com', $output['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/130
+     */
+    public function testImpliedUWithEmptyHref()
+    {
+        $input = '<a class="h-card" href="">Jane Doe</a>
+<area class="h-card" href="" alt="Jane Doe"/ >
+<div class="h-card" ><a href="">Jane Doe</a><p></p></div>
+<div class="h-card" ><area href="">Jane Doe</area><p></p></div>
+<div class="h-card" ><a class="h-card" href="">Jane Doe</a><p></p></div>';
+        $parser = new Parser($input, 'http://example.com');
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+        $this->assertArrayHasKey('url', $output['items'][1]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][1]['properties']['url'][0]);
+        $this->assertArrayHasKey('url', $output['items'][2]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][2]['properties']['url'][0]);
+        $this->assertArrayHasKey('url', $output['items'][3]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][3]['properties']['url'][0]);
+        $this->assertArrayHasKey('url', $output['items'][4]['children'][0]['properties']);
+        $this->assertEquals('http://example.com/', $output['items'][4]['children'][0]['properties']['url'][0]);
+    }
+    public function testValueFromLinkTag()
+    {
+        $input = <<<END
+<!doctype html>
+<html class="h-entry">
+\t<head>
+\t\t<link rel="canonical" class="u-url p-name" href="https://example.com/" title="Example.com homepage">
+\t</head>
+\t<body></body>
+</html>
+END;
+        $parser = new Parser($input, 'https://example.com');
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('https://example.com/', $output['items'][0]['properties']['url'][0]);
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Example.com homepage', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testResolveFromDataElement()
+    {
+        $parser = new Parser('<div class="h-test"><data class="u-url" value="relative.html"></data></div>', 'https://example.com/index.html');
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('https://example.com/relative.html', $output['items'][0]['properties']['url'][0]);
+    }
+    /**
+     * @see https://github.com/microformats/php-mf2/issues/182
+     */
+    public function testResolveFromIframeElement()
+    {
+        $input = '<div class="h-entry">
+<h1 class="p-name">Title</h1>
+<iframe src="https://example.com/index.html" class="u-url">
+  <p>Your browser does not support iframes.</p>
+</iframe>
+</div>';
+        $parser = new Parser($input, 'https://example.com');
+        $output = $parser->parse();
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertEquals('https://example.com/index.html', $output['items'][0]['properties']['url'][0]);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php b/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
new file mode 100644
index 0000000..48f375e
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class ParseValueClassTitleTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testValueClassTitleHandlesSingleValueClass()
+    {
+        $input = '<div class="h-card"><p class="p-name"><span class="value">Name</span> (this should not be included)</p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testValueClassTitleHandlesMultipleValueClass()
+    {
+        $input = '<div class="h-card"><p class="p-name"><span class="value">Name</span> (this should not be included) <span class="value">Endname</span></p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('NameEndname', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testValueClassTitleHandlesSingleValueTitle()
+    {
+        $input = '<div class="h-card"><p class="p-name"><span class="value-title" title="Real Name">Wrong Name</span> (this should not be included)</p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Real Name', $output['items'][0]['properties']['name'][0]);
+    }
+    public function testValueClassTitleHandlesMultipleValueTitle()
+    {
+        $input = '<div class="h-card"><p class="p-name"><span class="value-title" title="Real ">Wrong Name</span> <span class="value-title" title="Name">(this should not be included)</span></p></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('Real Name', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/25
+     */
+    public function testValueClassDatetimeWorksWithUrlProperties()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<a href="2013/178/t1/surreal-meeting-dpdpdp-trondisc"
+\t\trel="bookmark"
+\t\tclass="dt-published published dt-updated updated u-url u-uid">
+\t\t\t<time class="value">10:17</time>
+\t\t\ton <time class="value">2013-06-27</time>
+\t</a>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('published', $output['items'][0]['properties']);
+        $this->assertEquals('2013-06-27 10:17', $output['items'][0]['properties']['published'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/27
+     */
+    public function testParsesValueTitleDatetimes()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+ <h1 class="p-name">test</h1>
+ <span class="dt-published"><span class="value-title" title="2012-02-16T16:14:47+00:00"> </span>16.02.2012</span>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('2012-02-16T16:14:47+00:00', $output['items'][0]['properties']['published'][0]);
+    }
+    /** @see https://github.com/indieweb/php-mf2/issues/34 */
+    public function testIgnoresValueClassNestedFurtherThanChild()
+    {
+        $test = '<div class="h-card"><span class="p-tel"><span class="value">1234</span><span class="h-card"><span class="p-tel"><span class="value">5678</span>';
+        $result = Mf2\parse($test);
+        $this->assertEquals('1234', $result['items'][0]['properties']['tel'][0]);
+        $this->assertEquals('5678', $result['items'][0]['children'][0]['properties']['tel'][0]);
+    }
+    /** @see https://github.com/indieweb/php-mf2/issues/38 */
+    public function testValueClassDtMatchesSingleDigitTimeComponent()
+    {
+        $test = '<div class="h-entry"><span class="dt-published"><time class="value">6:01</time>, <time class="value">2013-02-01</time></span></div>';
+        $result = Mf2\parse($test);
+        $this->assertEquals('2013-02-01 6:01', $result['items'][0]['properties']['published'][0]);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/ParserTest.php b/libs/mf2/mf2/tests/Mf2/ParserTest.php
new file mode 100644
index 0000000..ac7291e
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/ParserTest.php
@@ -0,0 +1,791 @@
+<?php
+
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/**
+ * Parser Test
+ *
+ * Contains tests for internal parsing functions and stuff which doesn’t go anywhere else, i.e.
+ * isn’t related to a particular property as such.
+ *
+ * Stuff for parsing E goes in here until there is enough of it to go elsewhere (like, never?)
+ * @internal
+ */
+class ParserTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testUnicodeTrim()
+    {
+        $this->assertEquals('thing', Mf2\unicodeTrim('  thing  '));
+        $this->assertEquals('thing', Mf2\unicodeTrim('			thing			'));
+        $this->assertEquals('thing', Mf2\unicodeTrim(\mb_convert_encoding(' &nbsp; thing &nbsp; ', 'UTF-8', 'HTML-ENTITIES')));
+    }
+    public function testMicroformatNameFromClassReturnsFullRootName()
+    {
+        $expected = array('h-card');
+        $actual = Mf2\mfNamesFromClass('someclass h-card someotherclass', 'h-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testMicroformatNameFromClassHandlesMultipleHNames()
+    {
+        $expected = array('h-card', 'h-person');
+        $actual = Mf2\mfNamesFromClass('someclass h-card someotherclass h-person yetanotherclass', 'h-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testMicroformatStripsPrefixFromPropertyClassname()
+    {
+        $expected = array('name');
+        $actual = Mf2\mfNamesFromClass('someclass p-name someotherclass', 'p-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testNestedMicroformatPropertyNameWorks()
+    {
+        $expected = array('location' => array('p-'), 'author' => array('u-', 'p-'));
+        $test = 'someclass p-location someotherclass u-author p-author';
+        $actual = Mf2\nestedMfPropertyNamesFromClass($test);
+        $this->assertEquals($expected, $actual);
+    }
+    public function testMicroformatNamesFromClassIgnoresPrefixesWithoutNames()
+    {
+        $expected = array();
+        $actual = Mf2\mfNamesFromClass('someclass h- someotherclass', 'h-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testMicroformatNamesFromClassHandlesExcessiveWhitespace()
+    {
+        $expected = array('h-card');
+        $actual = Mf2\mfNamesFromClass('  someclass
+				h-card 	 someotherclass		   	 ', 'h-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testMicroformatNamesFromClassIgnoresUppercaseClassnames()
+    {
+        $expected = array();
+        $actual = Mf2\mfNamesFromClass('H-ENTRY', 'h-');
+        $this->assertEquals($expected, $actual);
+    }
+    public function testParseE()
+    {
+        $input = '<div class="h-entry"><div class="e-content">Here is a load of <strong>embedded markup</strong></div></div>';
+        //$parser = new Parser($input);
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('content', $output['items'][0]['properties']);
+        $this->assertEquals('Here is a load of <strong>embedded markup</strong>', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertEquals('Here is a load of embedded markup', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    public function testParseEmptyE()
+    {
+        $input = '<div class="h-entry"><div class="p-name">Name</div> <div class="e-content"></div></div>';
+        //$parser = new Parser($input);
+        $output = Mf2\parse($input);
+        $this->assertEquals('Name', $output['items'][0]['properties']['name'][0]);
+        $this->assertArrayHasKey('content', $output['items'][0]['properties']);
+        $this->assertEquals('', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertEquals('', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    public function testParseEResolvesRelativeLinks()
+    {
+        $input = '<div class="h-entry"><p class="e-content">Blah blah <a href="/a-url">thing</a>. <object data="/object"></object> <img src="/img" /></p></div>';
+        $parser = new Parser($input, 'http://example.com');
+        $output = $parser->parse();
+        $this->assertEquals('Blah blah <a href="http://example.com/a-url">thing</a>. <object data="http://example.com/object"></object> <img src="http://example.com/img">', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertEquals('Blah blah thing. http://example.com/img', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    public function testParseEWithBR()
+    {
+        $input = '<div class="h-entry"><div class="e-content">Here is content with two lines.<br>The br tag should not be converted to an XML br/br element.</div></div>';
+        //$parser = new Parser($input);
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('content', $output['items'][0]['properties']);
+        $this->assertEquals('Here is content with two lines.<br>The br tag should not be converted to an XML br/br element.', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertEquals('Here is content with two lines.' . "\n" . 'The br tag should not be converted to an XML br/br element.', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    public function testParseEWithWhitespace()
+    {
+        $input = '<div class="h-entry">
+	<div class="e-content">
+		This <strong>leading and trailing whitespace</strong> should be removed from the HTML and text values.
+	</div>
+</div>';
+        //$parser = new Parser($input);
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('content', $output['items'][0]['properties']);
+        $this->assertEquals('This <strong>leading and trailing whitespace</strong> should be removed from the HTML and text values.', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertEquals('This leading and trailing whitespace should be removed from the HTML and text values.', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    /**
+     * @group parseH
+     */
+    public function testInvalidClassnamesContainingHAreIgnored()
+    {
+        $input = '<div class="asdfgh-jkl"></div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        // Look through $output for an item which indicate failure
+        foreach ($output['items'] as $item) {
+            if (\in_array('asdfgh-jkl', $item['type'])) {
+                $this->fail();
+            }
+        }
+    }
+    public function testHtmlSpecialCharactersWorks()
+    {
+        $this->assertEquals('&lt;&gt;', \htmlspecialchars('<>'));
+    }
+    public function testHtmlEncodesNonEProperties()
+    {
+        $input = '<div class="h-card">
+			<span class="p-name">&lt;p&gt;</span>
+			<span class="dt-published">&lt;dt&gt;</span>
+			<span class="u-url">&lt;u&gt;</span>
+			</div>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('<p>', $output['items'][0]['properties']['name'][0]);
+        $this->assertEquals('<dt>', $output['items'][0]['properties']['published'][0]);
+        $this->assertEquals('<u>', $output['items'][0]['properties']['url'][0]);
+    }
+    public function testHtmlEncodesImpliedProperties()
+    {
+        $input = '<a class="h-card" href="&lt;url&gt;"><img src="&lt;img&gt;" alt="" />&lt;name&gt;</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals('<name>', $output['items'][0]['properties']['name'][0]);
+        $this->assertEquals('<url>', $output['items'][0]['properties']['url'][0]);
+        $result = ['value' => '<img>', 'alt' => ''];
+        $this->assertEquals($result, $output['items'][0]['properties']['photo'][0]);
+    }
+    public function testParsesRelValues()
+    {
+        $input = '<a rel="author" href="http://example.com">Mr. Author</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('rels', $output);
+        $this->assertEquals('http://example.com', $output['rels']['author'][0]);
+    }
+    public function testParsesRelAlternateValues()
+    {
+        $input = '<a rel="alternate home" href="http://example.org" hreflang="de", media="screen" type="text/html" title="German Homepage Link">German Homepage</a>';
+        $parser = new Parser($input);
+        $parser->enableAlternates = \true;
+        $output = $parser->parse();
+        $this->assertArrayHasKey('alternates', $output);
+        $this->assertEquals('http://example.org', $output['alternates'][0]['url']);
+        $this->assertEquals('home', $output['alternates'][0]['rel']);
+        $this->assertEquals('de', $output['alternates'][0]['hreflang']);
+        $this->assertEquals('screen', $output['alternates'][0]['media']);
+        $this->assertEquals('text/html', $output['alternates'][0]['type']);
+        $this->assertEquals('German Homepage Link', $output['alternates'][0]['title']);
+        $this->assertEquals('German Homepage', $output['alternates'][0]['text']);
+    }
+    public function testParseFromIdOnlyReturnsMicroformatsWithinThatId()
+    {
+        $input = <<<EOT
+<div class="h-entry"><span class="p-name">Not Included</span></div>
+
+<div id="parse-here">
+\t<span class="h-card">Included</span>
+</div>
+
+<div class="h-entry"><span class="p-name">Not Included</span></div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parseFromId('parse-here');
+        $this->assertCount(1, $output['items']);
+        $this->assertEquals('Included', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * Issue #21 github.com/indieweb/php-mf2/issues/21
+     */
+    public function testDoesntAddArraysWithOnlyValueForAlreadyParsedNestedMicroformats()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<div class="p-in-reply-to h-entry">
+\t\t<span class="p-author h-card">Nested Author</span>
+\t</div>
+
+\t<span class="p-author h-card">Real Author</span>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertCount(1, $output['items'][0]['properties']['author']);
+    }
+    public function testParsesNestedMicroformatsWithClassnamesInAnyOrder()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<div class="note- p-in-reply-to h-entry">Name</div>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertCount(1, $output['items'][0]['properties']['in-reply-to']);
+        $this->assertEquals('Name', $output['items'][0]['properties']['in-reply-to'][0]['properties']['name'][0]);
+    }
+    /**
+     * @group internet
+     */
+    public function testFetchMicroformats()
+    {
+        $mf = Mf2\fetch('http://waterpigs.co.uk/');
+        $this->assertArrayHasKey('items', $mf);
+        $mf = Mf2\fetch('http://waterpigs.co.uk/photo.jpg', null, $curlInfo);
+        $this->assertNull($mf);
+        $this->assertContains('jpeg', $curlInfo['content_type']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/48
+     */
+    public function testIgnoreClassesEndingInHyphen()
+    {
+        $input = '<span class="h-entry"> <span class="e-">foo</span> </span>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('0', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/52
+     * @see https://github.com/tommorris/mf2py/commit/92740deb7e19b8f1e7fbf6bec001cf52f2b07e99
+     */
+    public function testIgnoresTemplateElements()
+    {
+        $result = Mf2\parse('<template class="h-card"><span class="p-name">Tom Morris</span></template>');
+        $this->assertCount(0, $result['items']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/53
+     * @see http://microformats.org/wiki/microformats2-parsing#parsing_an_e-_property
+     */
+    public function testConvertsNestedImgElementToAltOrSrc()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<p class="e-content">It is a strange thing to see a <img alt="five legged elephant" src="/photos/five-legged-elephant.jpg" /></p>
+</div>
+EOT;
+        $result = Mf2\parse($input, 'http://waterpigs.co.uk/articles/five-legged-elephant');
+        $this->assertEquals('It is a strange thing to see a five legged elephant', $result['items'][0]['properties']['content'][0]['value']);
+    }
+    // parser not respecting not[h-*] in rule  "else if .h-x>a[href]:only-of-type:not[.h-*] then use that [href] for url"
+    public function testNotImpliedUrlFromHCard()
+    {
+        $input = <<<EOT
+<span class="h-entry">
+\t<a class="h-card" href="http://test.com">John Q</a>
+</span>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('url', $output['items'][0]['properties']);
+    }
+    public function testAreaTag()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<area class="p-category h-card" href="http://personB.example.com" alt="Person Bee" shape="rect" coords="100,100,120,120">
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        // p-name is no longer implied for this test due to nested microformat
+        // see https://github.com/microformats/microformats2-parsing/issues/6
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']);
+        $this->assertEquals('rect', $output['items'][0]['properties']['category'][0]['shape']);
+        $this->assertEquals('100,100,120,120', $output['items'][0]['properties']['category'][0]['coords']);
+        $this->assertEquals('Person Bee', $output['items'][0]['properties']['category'][0]['value']);
+    }
+    public function testParseHcardInCategory()
+    {
+        $input = <<<EOT
+<span class="h-entry">
+\t<a class="p-author h-card" href="http://a.example.com/">Alice</a> tagged
+\t<a href="http://b.example.com/" class="u-category h-card">Bob Smith</a> in
+\t<a class="u-tag-of u-in-reply-to" href="http://s.example.com/permalink47">
+\t\t<img src="http://s.example.com/photo47.png" alt="a photo of Bob and Cole" />
+\t</a>
+</span>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertContains('h-entry', $output['items'][0]['type']);
+        $this->assertArrayHasKey('category', $output['items'][0]['properties']);
+        $this->assertContains('h-card', $output['items'][0]['properties']['category'][0]['type']);
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']['category'][0]['properties']);
+        $this->assertEquals('Bob Smith', $output['items'][0]['properties']['category'][0]['properties']['name'][0]);
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']['category'][0]['properties']);
+        $this->assertEquals('http://b.example.com/', $output['items'][0]['properties']['category'][0]['properties']['url'][0]);
+    }
+    public function testApplyTransformationToSrcset()
+    {
+        $transformation = function ($url) {
+            return 'https://example.com/' . \ltrim($url, '/');
+        };
+        // Example from https://developers.whatwg.org/edits.html#attr-img-srcset
+        $srcset = 'banner-HD.jpeg 2x, banner-phone.jpeg 100w, banner-phone-HD.jpeg 100w 2x';
+        $result = Mf2\applySrcsetUrlTransformation($srcset, $transformation);
+        $this->assertEquals('https://example.com/banner-HD.jpeg 2x, https://example.com/banner-phone.jpeg 100w, https://example.com/banner-phone-HD.jpeg 100w 2x', $result);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/84
+     * @group internet
+     */
+    public function testRelativeURLResolvedWithFinalURL()
+    {
+        $mf = Mf2\fetch('http://aaron.pk/4Zn5');
+        $this->assertEquals('https://aaronparecki.com/img/1240x0/2014/12/23/5/photo.jpeg', $mf['items'][0]['properties']['photo'][0]);
+    }
+    public function testScriptTagContentsRemovedFromTextValue()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<div class="p-content">
+\t\t<b>Hello World</b>
+\t\t<script>alert("hi");</script>
+\t</div>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertContains('h-entry', $output['items'][0]['type']);
+        $this->assertContains('Hello World', $output['items'][0]['properties']['content'][0]);
+        $this->assertNotContains('alert', $output['items'][0]['properties']['content'][0]);
+    }
+    public function testScriptElementContentsRemovedFromAllPlaintextValues()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<span class="dt-published">contained<script>not contained</script><style>not contained</style></span>
+\t<span class="u-url">contained<script>not contained</script><style>not contained</style></span>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertNotContains('not contained', $output['items'][0]['properties']['published'][0]);
+        $this->assertNotContains('not contained', $output['items'][0]['properties']['url'][0]);
+    }
+    public function testScriptTagContentsNotRemovedFromHTMLValue()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<div class="e-content">
+\t\t<b>Hello World</b>
+\t\t<script>alert("hi");</script>
+\t\t<style>body{ visibility: hidden; }</style>
+\t\t<p>
+\t\t\t<script>alert("hi");</script>
+\t\t\t<style>body{ visibility: hidden; }</style>
+\t\t</p>
+\t</div>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertContains('h-entry', $output['items'][0]['type']);
+        $this->assertContains('Hello World', $output['items'][0]['properties']['content'][0]['value']);
+        $this->assertContains('<b>Hello World</b>', $output['items'][0]['properties']['content'][0]['html']);
+        # The script and style tags should be removed from plaintext results but left in HTML results.
+        $this->assertContains('alert', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertNotContains('alert', $output['items'][0]['properties']['content'][0]['value']);
+        $this->assertContains('visibility', $output['items'][0]['properties']['content'][0]['html']);
+        $this->assertNotContains('visibility', $output['items'][0]['properties']['content'][0]['value']);
+    }
+    public function testWhitespaceBetweenElements()
+    {
+        $input = <<<EOT
+<div class="h-entry">
+\t<data class="p-rsvp" value="yes">I'm attending</data>
+\t<a class="u-in-reply-to" href="https://snarfed.org/2014-06-16_homebrew-website-club-at-quip">Homebrew Website Club at Quip</a>
+\t<div class="p-content">Thanks for hosting!</div>
+</div>
+EOT;
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertContains('h-entry', $output['items'][0]['type']);
+        // p-name is no longer implied for this test due to other p-*
+        // see https://github.com/microformats/microformats2-parsing/issues/6
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']);
+    }
+    /**
+     * @see http://www.kevinmarks.com/twitterutils.html
+     */
+    public function testCamelCaseClassNames()
+    {
+        $input = <<<EOT
+<div class="EmbeddedTweet js-clickToOpenTarget" data-click-to-open-target="https://twitter.com/kevinmarks/status/700752598123433985" data-iframe-title="Twitter Tweet" data-dt-full="%{hours12}:%{minutes} %{amPm} - %{day} %{month} %{year}" data-dt-months="Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec" data-dt-am="AM" data-dt-pm="PM" data-dt-now="now" data-dt-s="s" data-dt-m="m" data-dt-h="h" data-dt-second="second" data-dt-seconds="seconds" data-dt-minute="minute" data-dt-minutes="minutes" data-dt-hour="hour" data-dt-hours="hours" data-dt-abbr="%{number}%{symbol}" data-dt-short="%{day} %{month}" data-dt-long="%{day} %{month} %{year}" data-scribe="page:tweet" id="twitter-widget-0" lang="en" data-twitter-event-id="0">
+
+\t\t<div class="EmbeddedTweet-tweet">
+<blockquote class="Tweet h-entry js-tweetIdInfo subject expanded
+\t\t\t\t\t\t\t\t\t is-deciderHtmlWhitespace" cite="https://twitter.com/kevinmarks/status/700752598123433985" data-tweet-id="700752598123433985" data-scribe="section:subject">
+\t<div class="Tweet-header u-cf">
+\t\t<div class="Tweet-brand u-floatRight">
+\t\t\t<span class="u-hiddenInNarrowEnv">
+<a class="FollowButton follow-button profile" data-scribe="component:followbutton" href="https://twitter.com/kevinmarks" role="button" title="Follow Kevin Marks on Twitter"><span class="FollowButton-bird"><div class="Icon Icon--twitter " aria-label="" title="" role="presentation"></div></span> Follow</a>
+</span>
+\t\t\t<span class="u-hiddenInWideEnv"><a href="https://twitter.com/download" data-scribe="element:logo"><div class="Icon Icon--twitter " aria-label="Get Twitter app" title="Get Twitter app" role="img"></div></a></span>
+\t\t</div>
+
+<div class="TweetAuthor" data-scribe="component:author">
+\t<a class="TweetAuthor-link Identity u-linkBlend" data-scribe="element:user_link" href="https://twitter.com/kevinmarks" aria-label="Kevin Marks (screen name: kevinmarks)">
+\t\t<span class="TweetAuthor-avatar Identity-avatar">
+\t\t\t<img class="Avatar" data-scribe="element:avatar" data-src-2x="https://pbs.twimg.com/profile_images/553009683087114240/tU5HkXEI_bigger.jpeg" alt="" data-src-1x="https://pbs.twimg.com/profile_images/553009683087114240/tU5HkXEI_normal.jpeg" src="https://pbs.twimg.com/profile_images/553009683087114240/tU5HkXEI_normal.jpeg">
+\t\t</span>
+\t\t<span class="TweetAuthor-name Identity-name customisable-highlight" title="Kevin Marks" data-scribe="element:name">Kevin Marks</span>
+
+\t\t<span class="TweetAuthor-screenName Identity-screenName" title="@kevinmarks" data-scribe="element:screen_name">@kevinmarks</span>
+\t</a>
+</div>
+
+\t</div>
+
+\t<div class="Tweet-body e-entry-content" data-scribe="component:tweet">
+\t\t<p class="Tweet-text e-entry-title" lang="en" dir="ltr">I wish people would stop using u- as a prefix for utility classes in CSS. Use util- instead. You're messing with my microformats.</p>
+
+
+\t\t<div class="Tweet-metadata dateline">
+
+
+<a class="u-linkBlend u-url customisable-highlight long-permalink" data-datetime="2016-02-19T18:43:33+0000" data-scribe="element:full_timestamp" href="https://twitter.com/kevinmarks/status/700752598123433985">
+<time class="dt-updated" datetime="2016-02-19T18:43:33+0000" pubdate="" title="Time posted: 19 Feb 2016, 18:43:33 (UTC)">10:43 AM - 19 Feb 2016</time></a>
+\t\t</div>
+
+
+\t\t<ul class="Tweet-actions" data-scribe="component:actions" role="menu" aria-label="Tweet actions">
+\t\t\t<li class="Tweet-action">
+<a class="TweetAction TweetAction--reply web-intent" href="https://twitter.com/intent/tweet?in_reply_to=700752598123433985" data-scribe="element:reply"><div class="Icon Icon--reply TweetAction-icon" aria-label="Reply" title="Reply" role="img"></div></a></li>
+\t\t\t<li class="Tweet-action">
+<a class="TweetAction TweetAction--retweet web-intent" href="https://twitter.com/intent/retweet?tweet_id=700752598123433985" data-scribe="element:retweet"><div class="Icon Icon--retweet TweetAction-icon" aria-label="Retweet" title="Retweet" role="img"></div>    <span class="TweetAction-stat" data-scribe="element:retweet_count" aria-hidden="true">1</span>
+\t\t<span class="u-hiddenVisually">1 Retweet</span>
+</a></li>
+\t\t\t<li class="Tweet-action">
+<a class="TweetAction TweetAction--heart web-intent" href="https://twitter.com/intent/like?tweet_id=700752598123433985" data-scribe="element:heart"><div class="Icon Icon--heart TweetAction-icon" aria-label="Like" title="Like" role="img"></div>    <span class="TweetAction-stat" data-scribe="element:heart_count" aria-hidden="true">4</span>
+\t\t<span class="u-hiddenVisually">4 likes</span>
+</a></li>
+\t\t</ul>
+\t</div>
+</blockquote>
+</div>
+\t</div>
+EOT;
+        $output = Mf2\parse($input);
+        $this->assertArrayNotHasKey('linkBlend', $output['items'][0]['properties']);
+        $this->assertArrayNotHasKey('hiddenInNarrowEnv', $output['items'][0]['properties']);
+        $this->assertArrayNotHasKey('floatRight', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/127
+     */
+    public function testCamelCaseRootClassNames()
+    {
+        $input = '<div class="h-Entry"> <a href="https://example.com" class="u-url">content</a> </div>';
+        $output = Mf2\parse($input);
+        $this->assertEmpty($output['items']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/127
+     */
+    public function testMisTypedRootClassNames()
+    {
+        $input = '<div class="h-entry>"> <a href="https://example.com" class="u-url">content</a></div>
+		<div class="h-entry1>"> <a href="https://example.com" class="u-url">content</a></div>
+		<div class="h-👍"> <a href="https://example.com" class="u-url">content</a></div>
+		<div class="h-hentry_"> <a href="https://example.com" class="u-url">content</a></div>
+		<div class="h-"> <a href="https://example.com" class="u-url">content</a></div>';
+        $output = Mf2\parse($input);
+        $this->assertEmpty($output['items']);
+    }
+    public function testClassNameNumbers()
+    {
+        $input = '<div class="h-entry"> <div class="u-column1"> <p class="p-title">Test</p> </div> </div>';
+        $output = Mf2\parse($input);
+        $this->assertArrayNotHasKey('column1', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/6#issuecomment-366473390
+     */
+    public function testNoImpliedNameWhenE()
+    {
+        $input = '<article class="h-entry">
+	<div class="e-content">
+		<p>Wanted content.</p>
+	</div>
+	<footer>
+		<p>Footer to be ignored.</p>
+	</footer>
+</article>';
+        $output = Mf2\parse($input);
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/6#issuecomment-366473390
+     */
+    public function testNoImpliedNameWhenP()
+    {
+        $input = '<article class="h-entry">
+	<div class="p-content">
+		<p>Wanted content.</p>
+	</div>
+	<footer>
+		<p>Footer to be ignored.</p>
+	</footer>
+</article>';
+        $output = Mf2\parse($input);
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/6#issuecomment-366473390
+     */
+    public function testNoImpliedNameWhenNestedMicroformat()
+    {
+        $input = '<article class="h-entry">
+	<div class="u-like-of h-cite">
+		<p>I really like <a class="p-name u-url" href="http://microformats.org/">Microformats</a></p>
+	</div>
+	<footer>
+		<p>Footer to be ignored.</p>
+	</footer>
+</article>';
+        $output = Mf2\parse($input);
+        $this->assertArrayNotHasKey('name', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/143
+     */
+    public function testChildObjects()
+    {
+        $input = <<<END
+<html>
+\t<head>
+\t\t<title>Test</title>
+\t</head>
+\t<body>
+
+\t\t<div class="h-feed">
+\t\t\t<a href="/author" class="p-author h-card">Author Name</a>
+
+\t\t\t<ul>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/1" class="u-url p-name">One</a>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/2" class="u-url p-name">Two</a>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/3" class="u-url p-name">Three</a>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/4" class="u-url p-name">Four</a>
+\t\t\t\t</li>
+\t\t\t</ul>
+\t\t</div>
+
+\t</body>
+</html>
+END;
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('author', $output['items'][0]['properties']);
+        $this->assertEquals('Author Name', $output['items'][0]['properties']['author'][0]['properties']['name'][0]);
+        $this->assertCount(4, $output['items'][0]['children']);
+        $this->assertEquals('One', $output['items'][0]['children'][0]['properties']['name'][0]);
+        $this->assertEquals('Two', $output['items'][0]['children'][1]['properties']['name'][0]);
+        $this->assertEquals('Three', $output['items'][0]['children'][2]['properties']['name'][0]);
+        $this->assertEquals('Four', $output['items'][0]['children'][3]['properties']['name'][0]);
+    }
+    public function testMultiLevelRecursion()
+    {
+        $input = <<<END
+<html>
+\t<head>
+\t\t<title>Test</title>
+\t</head>
+\t<body>
+
+\t\t<div class="h-feed">
+\t\t\t<a href="/author" class="p-author h-card">Author Name</a>
+
+\t\t\t<ul>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/1" class="u-url p-name">One</a>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/2" class="u-url p-name">Two</a>
+\t\t\t\t\t<ul>
+\t\t\t\t\t\t<li class="p-comment h-entry"><a href="/a" class="u-url p-name">Comment A</a></li>
+\t\t\t\t\t\t<li class="p-comment h-entry"><a href="/b" class="u-url p-name">Comment B</a></li>
+\t\t\t\t\t</ul>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/3" class="u-url p-name">Three</a>
+\t\t\t\t\t<ul>
+\t\t\t\t\t\t<li class="h-entry"><a href="/c" class="u-url p-name">Comment C</a></li>
+\t\t\t\t\t\t<li class="h-entry"><a href="/d" class="u-url p-name">Comment D</a></li>
+\t\t\t\t\t</ul>
+\t\t\t\t</li>
+\t\t\t\t<li class="h-entry">
+\t\t\t\t\t<a href="/4" class="u-url p-name">Four</a>
+\t\t\t\t</li>
+\t\t\t</ul>
+\t\t</div>
+
+\t</body>
+</html>
+END;
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('author', $output['items'][0]['properties']);
+        $this->assertEquals('Author Name', $output['items'][0]['properties']['author'][0]['properties']['name'][0]);
+        $this->assertCount(4, $output['items'][0]['children']);
+        $this->assertEquals('One', $output['items'][0]['children'][0]['properties']['name'][0]);
+        $this->assertEquals('Two', $output['items'][0]['children'][1]['properties']['name'][0]);
+        $this->assertEquals('Comment A', $output['items'][0]['children'][1]['properties']['comment'][0]['properties']['name'][0]);
+        $this->assertEquals('Comment B', $output['items'][0]['children'][1]['properties']['comment'][1]['properties']['name'][0]);
+        $three = $output['items'][0]['children'][2];
+        $this->assertEquals('Three', $three['properties']['name'][0]);
+        $this->assertEquals('Comment C', $three['children'][0]['properties']['name'][0]);
+        $this->assertEquals('Comment D', $three['children'][1]['properties']['name'][0]);
+        $this->assertEquals('Four', $output['items'][0]['children'][3]['properties']['name'][0]);
+    }
+    public function testNoErrantWhitespaceOnEHtml()
+    {
+        $input = '<div class="h-entry"><div class="e-content"><p>1</p><p>2</p></div></div>';
+        $output = Mf2\parse($input);
+        $this->assertEquals('<p>1</p><p>2</p>', $output['items'][0]['properties']['content'][0]['html']);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/158
+     */
+    public function testPrefixWithNumbers()
+    {
+        $input = '<li class="h-entry">
+	<data class="p-name" value="Coffee"></data>
+	<div class="p-p3k-drank h-p3k-food">
+		<span class="value">Coffee</span>
+	</div>
+</li>';
+        $output = Mf2\parse($input);
+        $this->assertArrayHasKey('p3k-drank', $output['items'][0]['properties']);
+        $this->assertCount(1, $output['items'][0]['properties']['p3k-drank']);
+        $this->assertEquals('h-p3k-food', $output['items'][0]['properties']['p3k-drank'][0]['type'][0]);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/160
+     */
+    public function testConsecutiveDashes()
+    {
+        $input = '<div class="h-entry h-----">
+<p> <a href="http://example.com/post" class="u-in-reply--to">http://example.com/post posted:</a> </p>
+<span class="p-name">Too many dashes</span>
+<span class="p--acme-leading">leading dash</span>
+<span class="p-acme--middle">middle dash</span>
+<span class="p-acme-trailing-">trailing dash</span>
+</div>';
+        $output = Mf2\parse($input);
+        $this->assertCount(1, $output['items'][0]['type']);
+        $this->assertEquals('h-entry', $output['items'][0]['type'][0]);
+        $this->assertCount(1, $output['items'][0]['properties']);
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+    }
+    /**
+     * Additional test from mf2py. Covers consecutive dashes, numbers in vendor prefix, and capital letters.
+     * Added markup for numbers-only prefix and capital letter in prefix
+     * @see https://github.com/kartikprabhu/mf2py/blob/experimental/test/examples/class_names_format.html
+     * @see https://github.com/indieweb/php-mf2/issues/160
+     * @see https://github.com/indieweb/php-mf2/issues/158
+     */
+    public function testMfClassRegex()
+    {
+        $input = '<article class="h-x-test h-p3k-entry h-feed h-Entry h-p3k-fEed h--d h-test-">
+		<a class="u-url u-Url u-p3k-url u--url u-url- u-123-url u-123A-url" href="example.com" >URL </a>
+		<span class="p-name p-nAme p-p3k-name p--name p-name-" >name</span>
+</article>';
+        $output = Mf2\parse($input);
+        $this->assertCount(3, $output['items'][0]['type']);
+        $this->assertContains('h-feed', $output['items'][0]['type']);
+        $this->assertContains('h-p3k-entry', $output['items'][0]['type']);
+        $this->assertContains('h-x-test', $output['items'][0]['type']);
+        $this->assertCount(5, $output['items'][0]['properties']);
+        $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('p3k-url', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('name', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('p3k-name', $output['items'][0]['properties']);
+        $this->assertArrayHasKey('123-url', $output['items'][0]['properties']);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/30
+     */
+    public function testUniqueAndAlphabeticalMfClasses()
+    {
+        $input = '<div class="h-entry h-cite h-entry"></div>';
+        $output = Mf2\parse($input);
+        $this->assertEquals(array('h-cite', 'h-entry'), $output['items'][0]['type']);
+    }
+    /**
+     * The default DOMDocument parser will trip here because it does not know HTML5 elements.
+     * @see https://html.spec.whatwg.org/#optional-tags:the-p-element
+     **/
+    public function testHtml5OptionalPEndTag()
+    {
+        if (!\class_exists('IndieAuth\\Libs\\Masterminds\\HTML5')) {
+            $this->markTestSkipped('masterminds/html5 is required for this test.');
+        }
+        $input = '<div class="h-entry"><p class="p-name">Name<article>Not Name</article></div>';
+        $output = Mf2\parse($input);
+        $this->assertEquals('Name', $output['items'][0]['properties']['name'][0]);
+    }
+    /**
+     * Make sure the parser does not mutate any DOMDocument instances passed to the constructor.
+     * @see https://github.com/indieweb/php-mf2/issues/174
+     * @see https://github.com/microformats/mf2py/issues/104
+     */
+    public function testNotMutatingPassedInDOM()
+    {
+        $input = \file_get_contents(__DIR__ . '/snarfed.org.html');
+        // Use same parsing as Parser::__construct(), twice to have a comparison object.
+        \libxml_use_internal_errors(\true);
+        $refDoc = new \DOMDocument();
+        @$refDoc->loadHTML(Mf2\unicodeToHtmlEntities($input), \LIBXML_NOWARNING);
+        $inputDoc = new \DOMDocument();
+        @$inputDoc->loadHTML(Mf2\unicodeToHtmlEntities($input), \LIBXML_NOWARNING);
+        // For completion sake, test PHP itself.
+        $this->assertEquals($refDoc, $inputDoc, 'PHP could not create identical DOMDocument instances.');
+        // Parse one DOMDocument instance, and test if it is still the same as the other.
+        Mf2\parse($inputDoc, 'http://snarfed.org/2013-10-23_oauth-dropins');
+        $this->assertEquals($refDoc, $inputDoc, 'Parsing mutated the DOMDocument.');
+    }
+    public function testNoImpliedURLForEmptyProperties()
+    {
+        // In the 0.4.5 release, this caused an error
+        // https://github.com/microformats/php-mf2/issues/196
+        $input = <<<EOD
+<div class="h-entry">
+  <li class="h-cite u-comment">
+    <div class="vcard"></div>
+  </li>
+</div>
+EOD;
+        $output = Mf2\parse($input);
+        $this->assertInternalType('array', $output['items'][0]['properties']['comment'][0]['properties']);
+        $this->assertInternalType('array', $output['items'][0]['properties']['comment'][0]['children'][0]['properties']);
+        $this->assertEmpty($output['items'][0]['properties']['comment'][0]['properties']);
+        $this->assertEmpty($output['items'][0]['properties']['comment'][0]['children'][0]['properties']);
+    }
+    /**
+     * Make sure day of year passed to normalizeOrdinalDate() is valid
+     * @see https://github.com/indieweb/php-mf2/issues/167
+     */
+    public function testInvalidOrdinalDate()
+    {
+        # 365 days in non-leap years
+        $this->assertEquals('2018-12-31', Mf2\normalizeOrdinalDate('2018-365'));
+        $this->assertEquals('', Mf2\normalizeOrdinalDate('2018-366'));
+        # 366 days in leap years
+        $this->assertEquals('2016-12-31', Mf2\normalizeOrdinalDate('2016-366'));
+        $this->assertEquals('', Mf2\normalizeOrdinalDate('2016-367'));
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/PlainTextTest.php b/libs/mf2/mf2/tests/Mf2/PlainTextTest.php
new file mode 100644
index 0000000..3bce7ac
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/PlainTextTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+/** @internal */
+class PlainTextTest extends \IndieAuth\Libs\PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider aaronpkExpectations
+     */
+    public function testAaronpkExpectations($input, $pName, $eValue, $eHtml)
+    {
+        $parser = new \IndieAuth\Libs\Mf2\Parser($input);
+        $output = $parser->parse();
+        $entryProperties = $output['items'][0]['properties'];
+        $this->assertEquals($pName, $entryProperties['name'][0]);
+        $this->assertEquals($eValue, $entryProperties['content'][0]['value']);
+        $this->assertEquals($eHtml, $entryProperties['content'][0]['html']);
+    }
+    public function aaronpkExpectations()
+    {
+        return array(1 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\"><p>Hello World</p></div>\n</div>", "Hello World", "Hello World", "<p>Hello World</p>"), 2 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\"><p>Hello<br>World</p></div>\n</div>", "Hello\nWorld", "Hello\nWorld", "<p>Hello<br>World</p>"), 3 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\"><p>Hello<br>\nWorld</p></div>\n</div>", "Hello\nWorld", "Hello\nWorld", "<p>Hello<br>\nWorld</p>"), 4 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\">\n    <p>Hello World</p>\n  </div>\n</div>", "Hello World", "Hello World", "<p>Hello World</p>"), 5 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\">Hello\nWorld</div>\n</div>", "Hello World", "Hello World", "Hello\nWorld"), 6 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\"><p>Hello</p><p>World</p></div>\n</div>", "Hello\nWorld", "Hello\nWorld", "<p>Hello</p><p>World</p>"), 7 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\">Hello<br>\n    World</div>\n</div>", "Hello\nWorld", "Hello\nWorld", "Hello<br>\n    World"), 8 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\"><br>Hello<br>World<br></div>\n</div>", "Hello\nWorld", "Hello\nWorld", "<br>Hello<br>World<br>"), 9 => array("<div class=\"h-entry\">\n  <div class=\"e-content p-name\">\n    <p>One</p>\n    <p>Two</p>\n    <p>Three</p>\n  </div>\n</div>", "One\nTwo\nThree", "One\nTwo\nThree", "<p>One</p>\n    <p>Two</p>\n    <p>Three</p>"));
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/RelTest.php b/libs/mf2/mf2/tests/Mf2/RelTest.php
new file mode 100644
index 0000000..116b749
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/RelTest.php
@@ -0,0 +1,211 @@
+<?php
+
+/**
+ * Tests of the parsing methods within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\Mf2\Parser;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class RelTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testRelValueOnLinkTag()
+    {
+        $input = '<link rel="webmention" href="http://example.com/webmention">';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/webmention', $output['rels']['webmention'][0]);
+    }
+    public function testRelValueOnATag()
+    {
+        $input = '<a rel="webmention" href="http://example.com/webmention">webmention me</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/webmention', $output['rels']['webmention'][0]);
+    }
+    public function testRelValueOnAreaTag()
+    {
+        $input = '<map><area rel="webmention" href="http://example.com/webmention"/></map>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/webmention', $output['rels']['webmention'][0]);
+    }
+    public function testRelValueOrder()
+    {
+        $input = '<map><area rel="webmention" href="http://example.com/area"/></map>
+      <a rel="webmention" href="http://example.com/a">webmention me</a>
+      <link rel="webmention" href="http://example.com/link">';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/area', $output['rels']['webmention'][0]);
+        $this->assertEquals('http://example.com/a', $output['rels']['webmention'][1]);
+        $this->assertEquals('http://example.com/link', $output['rels']['webmention'][2]);
+    }
+    public function testRelValueOrder2()
+    {
+        $input = '<map><area rel="webmention" href="http://example.com/area"/></map>
+      <link rel="webmention" href="http://example.com/link">
+      <a rel="webmention" href="http://example.com/a">webmention me</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/area', $output['rels']['webmention'][0]);
+        $this->assertEquals('http://example.com/link', $output['rels']['webmention'][1]);
+        $this->assertEquals('http://example.com/a', $output['rels']['webmention'][2]);
+    }
+    public function testRelValueOrder3()
+    {
+        $input = '<html>
+      <head>
+        <link rel="webmention" href="http://example.com/link">
+      </head>
+      <body>
+        <a rel="webmention" href="http://example.com/a">webmention me</a>
+        <map><area rel="webmention" href="http://example.com/area"/></map>
+      </body>
+    </html>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('webmention', $output['rels']);
+        $this->assertEquals('http://example.com/link', $output['rels']['webmention'][0]);
+        $this->assertEquals('http://example.com/a', $output['rels']['webmention'][1]);
+        $this->assertEquals('http://example.com/area', $output['rels']['webmention'][2]);
+    }
+    public function testRelValueOnBTag()
+    {
+        $input = '<b rel="webmention" href="http://example.com/webmention">this makes no sense</b>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('webmention', $output['rels']);
+    }
+    public function testEnableAlternatesFlagTrue()
+    {
+        $input = '<a rel="author" href="http://example.com/a">author a</a>
+<a rel="author" href="http://example.com/b">author b</a>
+<a rel="in-reply-to" href="http://example.com/1">post 1</a>
+<a rel="in-reply-to" href="http://example.com/2">post 2</a>
+<a rel="alternate home"
+   href="http://example.com/fr"
+   media="handheld"
+   hreflang="fr">French mobile homepage</a>';
+        $parser = new Parser($input);
+        $parser->enableAlternates = \true;
+        $output = $parser->parse();
+        $this->assertArrayHasKey('alternates', $output);
+    }
+    public function testEnableAlternatesFlagFalse()
+    {
+        $input = '<a rel="author" href="http://example.com/a">author a</a>
+<a rel="author" href="http://example.com/b">author b</a>
+<a rel="in-reply-to" href="http://example.com/1">post 1</a>
+<a rel="in-reply-to" href="http://example.com/2">post 2</a>
+<a rel="alternate home"
+   href="http://example.com/fr"
+   media="handheld"
+   hreflang="fr">French mobile homepage</a>';
+        $parser = new Parser($input);
+        $parser->enableAlternates = \false;
+        $output = $parser->parse();
+        $this->assertArrayNotHasKey('alternates', $output);
+    }
+    /**
+     * @see https://github.com/indieweb/php-mf2/issues/112
+     * @see http://microformats.org/wiki/microformats2-parsing#rel_parse_examples
+     */
+    public function testRelURLs()
+    {
+        $input = '<a rel="author" href="http://example.com/a">author a</a>
+<a rel="author" href="http://example.com/b">author b</a>
+<a rel="in-reply-to" href="http://example.com/1">post 1</a>
+<a rel="in-reply-to" href="http://example.com/2">post 2</a>
+<a rel="alternate home"
+   href="http://example.com/fr"
+   media="handheld"
+   hreflang="fr">French mobile homepage</a>
+<link rel="alternate" type="application/atom+xml" href="http://example.com/articles.atom" title="Atom Feed" />';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('rels', $output);
+        $this->assertCount(4, $output['rels']);
+        $this->assertArrayHasKey('author', $output['rels']);
+        $this->assertArrayHasKey('in-reply-to', $output['rels']);
+        $this->assertArrayHasKey('alternate', $output['rels']);
+        $this->assertArrayHasKey('home', $output['rels']);
+        $this->assertArrayHasKey('rel-urls', $output);
+        $this->assertCount(6, $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/a', $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/b', $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/1', $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/2', $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/fr', $output['rel-urls']);
+        $this->assertArrayHasKey('http://example.com/articles.atom', $output['rel-urls']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/a']);
+        $this->assertArrayHasKey('text', $output['rel-urls']['http://example.com/a']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/b']);
+        $this->assertArrayHasKey('text', $output['rel-urls']['http://example.com/b']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/1']);
+        $this->assertArrayHasKey('text', $output['rel-urls']['http://example.com/1']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/2']);
+        $this->assertArrayHasKey('text', $output['rel-urls']['http://example.com/2']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/fr']);
+        $this->assertArrayHasKey('text', $output['rel-urls']['http://example.com/fr']);
+        $this->assertArrayHasKey('media', $output['rel-urls']['http://example.com/fr']);
+        $this->assertArrayHasKey('hreflang', $output['rel-urls']['http://example.com/fr']);
+        $this->assertArrayHasKey('title', $output['rel-urls']['http://example.com/articles.atom']);
+        $this->assertArrayHasKey('type', $output['rel-urls']['http://example.com/articles.atom']);
+        $this->assertArrayHasKey('rels', $output['rel-urls']['http://example.com/articles.atom']);
+    }
+    /**
+     * @see https://github.com/microformats/microformats2-parsing/issues/29
+     * @see https://github.com/microformats/microformats2-parsing/issues/30
+     */
+    public function testRelURLsRelsUniqueAndSorted()
+    {
+        $input = '<a href="#" rel="me bookmark"></a>
+<a href="#" rel="bookmark archived"></a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals($output['rel-urls']['#']['rels'], array('archived', 'bookmark', 'me'));
+    }
+    public function testRelURLsInfoMergesCorrectly()
+    {
+        $input = '<a href="#" rel="a">This nodeValue</a>
+<a href="#" rel="a" hreflang="en">Not this nodeValue</a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals($output['rel-urls']['#']['hreflang'], 'en');
+        $this->assertArrayNotHasKey('media', $output['rel-urls']['#']);
+        $this->assertArrayNotHasKey('title', $output['rel-urls']['#']);
+        $this->assertArrayNotHasKey('type', $output['rel-urls']['#']);
+        $this->assertEquals($output['rel-urls']['#']['text'], 'This nodeValue');
+    }
+    public function testRelURLsNoDuplicates()
+    {
+        $input = '<a href="#a" rel="a"></a>
+<a href="#b" rel="a"></a>
+<a href="#a" rel="a"></a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertEquals($output['rels']['a'], array('#a', '#b'));
+    }
+    public function testRelURLsFalsyTextVSEmpty()
+    {
+        $input = '<a href="#a" rel="a">0</a>
+<a href="#b" rel="b"></a>';
+        $parser = new Parser($input);
+        $output = $parser->parse();
+        $this->assertArrayHasKey('text', $output['rel-urls']['#a']);
+        $this->assertEquals($output['rel-urls']['#a']['text'], '0');
+        $this->assertArrayNotHasKey('text', $output['rel-urls']['#b']);
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/URLTest.php b/libs/mf2/mf2/tests/Mf2/URLTest.php
new file mode 100644
index 0000000..73730f1
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/URLTest.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * Tests of the URL resolver within mf2\Parser
+ */
+namespace IndieAuth\Libs\Mf2\Parser\Test;
+
+use IndieAuth\Libs\Mf2;
+use IndieAuth\Libs\PHPUnit_Framework_TestCase;
+/** @internal */
+class UrlTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        \date_default_timezone_set('Europe/London');
+    }
+    public function testRemoveLeadingDotSlash()
+    {
+        $input = '../one/two';
+        mf2\removeLeadingDotSlash($input);
+        $this->assertEquals('one/two', $input);
+        $input = './one/two';
+        mf2\removeLeadingDotSlash($input);
+        $this->assertEquals('one/two', $input);
+    }
+    public function testRemoveLeadingSlashDot()
+    {
+        $input = '/./one/two';
+        mf2\removeLeadingSlashDot($input);
+        $this->assertEquals('/one/two', $input);
+        $input = '/.';
+        mf2\removeLeadingSlashDot($input);
+        $this->assertEquals('/', $input);
+        $input = '/./../';
+        mf2\removeLeadingSlashDot($input);
+        $this->assertEquals('/../', $input);
+        $input = '/./../../g';
+        mf2\removeLeadingSlashDot($input);
+        $this->assertEquals('/../../g', $input);
+    }
+    public function testRemoveOneDirLevel()
+    {
+        $input = '/../../g';
+        $output = '/a/b/c';
+        mf2\removeOneDirLevel($input, $output);
+        $this->assertEquals('/../g', $input);
+        $this->assertEquals('/a/b', $output);
+        $input = '/..';
+        $output = '/a/b/c';
+        mf2\removeOneDirLevel($input, $output);
+        $this->assertEquals('/', $input);
+        $this->assertEquals('/a/b', $output);
+    }
+    public function testRemoveLoneDotDot()
+    {
+        $input = '.';
+        mf2\removeLoneDotDot($input);
+        $this->assertEquals('', $input);
+        $input = '..';
+        mf2\removeLoneDotDot($input);
+        $this->assertEquals('', $input);
+    }
+    public function testMoveOneSegmentFromInput()
+    {
+        $input = '/a/b/c/./../../g';
+        $output = '';
+        mf2\moveOneSegmentFromInput($input, $output);
+        $this->assertEquals('/b/c/./../../g', $input);
+        $this->assertEquals('/a', $output);
+        $input = '/b/c/./../../g';
+        $output = '/a';
+        mf2\moveOneSegmentFromInput($input, $output);
+        $this->assertEquals('/c/./../../g', $input);
+        $this->assertEquals('/a/b', $output);
+        $input = '/c/./../../g';
+        $output = '/a/b';
+        mf2\moveOneSegmentFromInput($input, $output);
+        $this->assertEquals('/./../../g', $input);
+        $this->assertEquals('/a/b/c', $output);
+        $input = '/g';
+        $output = '/a';
+        mf2\moveOneSegmentFromInput($input, $output);
+        $this->assertEquals('', $input);
+        $this->assertEquals('/a/g', $output);
+    }
+    /**
+     * @dataProvider removeDotSegmentsData
+     */
+    public function testRemoveDotSegments($assert, $path, $expected)
+    {
+        $actual = mf2\removeDotSegments($path);
+        $this->assertEquals($expected, $actual, $assert);
+    }
+    public function removeDotSegmentsData()
+    {
+        return array(array('Should remove .. and .', '/a/b/c/./../../g', '/a/g'), array('Should remove ../..', '/a/b/c/d/../../../g', '/a/g'), array('Should not add leading slash', 'a/b/c', 'a/b/c'));
+    }
+    public function testNoPathOnBase()
+    {
+        $actual = mf2\resolveUrl('http://example.com', '');
+        $this->assertEquals('http://example.com/', $actual);
+        $actual = mf2\resolveUrl('http://example.com', '#');
+        $this->assertEquals('http://example.com/#', $actual);
+        $actual = mf2\resolveUrl('http://example.com', '#thing');
+        $this->assertEquals('http://example.com/#thing', $actual);
+    }
+    public function testMisc()
+    {
+        $expected = 'http://a/b/c/g';
+        $actual = mf2\resolveUrl('http://a/b/c/d;p?q', './g');
+        $this->assertEquals($expected, $actual);
+        $expected = 'http://a/b/c/g/';
+        $actual = mf2\resolveUrl('http://a/b/c/d;p?q', './g/');
+        $this->assertEquals($expected, $actual);
+        $expected = 'http://a/b/';
+        $actual = mf2\resolveUrl('http://a/b/c/d;p?q', '..');
+        $this->assertEquals($expected, $actual);
+    }
+    /** as per https://github.com/indieweb/php-mf2/issues/35 */
+    public function testResolvesProtocolRelativeUrlsCorrectly()
+    {
+        $expected = 'http://cdn.example.org/thing/asset.css';
+        $actual = Mf2\resolveUrl('http://example.com', '//cdn.example.org/thing/asset.css');
+        $this->assertEquals($expected, $actual);
+        $expected = 'https://cdn.example.org/thing/asset.css';
+        $actual = Mf2\resolveUrl('https://example.com', '//cdn.example.org/thing/asset.css');
+        $this->assertEquals($expected, $actual);
+    }
+    /**
+     * @dataProvider testData
+     */
+    public function testReturnsUrlIfAbsolute($assert, $base, $url, $expected)
+    {
+        $actual = mf2\resolveUrl($base, $url);
+        $this->assertEquals($expected, $actual, $assert);
+    }
+    public function testData()
+    {
+        // seriously, please update to PHP 5.4 so I can use nice array syntax ;)
+        // fail message, base, url, expected
+        $cases = array(
+            array('Should return absolute URL unchanged', 'http://example.com', 'http://example.com', 'http://example.com'),
+            array('Should return root given blank path', 'http://example.com', '', 'http://example.com/'),
+            array('Should return input unchanged given full URL and blank path', 'http://example.com/something', '', 'http://example.com/something'),
+            array('Should handle blank base URL', '', 'http://example.com', 'http://example.com'),
+            array('Should resolve fragment ID', 'http://example.com', '#thing', 'http://example.com/#thing'),
+            array('Should resolve blank fragment ID', 'http://example.com', '#', 'http://example.com/#'),
+            array('Should resolve same level URL', 'http://example.com', 'thing', 'http://example.com/thing'),
+            array('Should resolve directory level URL', 'http://example.com', './thing', 'http://example.com/thing'),
+            array('Should resolve parent level URL at root level', 'http://example.com', '../thing', 'http://example.com/thing'),
+            array('Should resolve nested URL', 'http://example.com/something', 'another', 'http://example.com/another'),
+            array('Should ignore query strings in base url', 'http://example.com/index.php?url=http://example.org', '/thing', 'http://example.com/thing'),
+            array('Should resolve query strings', 'http://example.com/thing', '?stuff=yes', 'http://example.com/thing?stuff=yes'),
+            array('Should resolve dir level query strings', 'http://example.com', './?thing=yes', 'http://example.com/?thing=yes'),
+            array('Should resolve up one level from root domain', 'http://example.com', 'path/to/the/../file', 'http://example.com/path/to/file'),
+            array('Should resolve up one level from base with path', 'http://example.com/path/the', 'to/the/../file', 'http://example.com/path/to/file'),
+            // Tests from webignition library
+            array('relative add host from base', 'http://www.example.com', 'server.php', 'http://www.example.com/server.php'),
+            array('relative add scheme host pass from base', 'http://:pass@www.example.com', 'server.php', 'http://:pass@www.example.com/server.php'),
+            array('relative add scheme host user pass from base', 'http://user:pass@www.example.com', 'server.php', 'http://user:pass@www.example.com/server.php'),
+            array('relative base has file path', 'http://example.com/index.html', 'example.html', 'http://example.com/example.html'),
+            array('input has absolute path', 'http://www.example.com/pathOne/pathTwo/pathThree', '/server.php?param1=value1', 'http://www.example.com/server.php?param1=value1'),
+            array('test absolute url with path', 'http://www.example.com/', 'http://www.example.com/pathOne', 'http://www.example.com/pathOne'),
+            array('testRelativePathIsTransformedIntoCorrectAbsoluteUrl', 'http://www.example.com/pathOne/pathTwo/pathThree', 'server.php?param1=value1', 'http://www.example.com/pathOne/pathTwo/server.php?param1=value1'),
+            array('testAbsolutePathHasDotDotDirecoryAndSourceHasFileName', 'http://www.example.com/pathOne/index.php', '../jquery.js', 'http://www.example.com/jquery.js'),
+            array('testAbsolutePathHasDotDotDirecoryAndSourceHasDirectoryWithTrailingSlash', 'http://www.example.com/pathOne/', '../jquery.js', 'http://www.example.com/jquery.js'),
+            array('testAbsolutePathHasDotDotDirecoryAndSourceHasDirectoryWithoutTrailingSlash', 'http://www.example.com/pathOne', '../jquery.js', 'http://www.example.com/jquery.js'),
+            array('testAbsolutePathHasDotDirecoryAndSourceHasFilename', 'http://www.example.com/pathOne/index.php', './jquery.js', 'http://www.example.com/pathOne/jquery.js'),
+            array('testAbsolutePathHasDotDirecoryAndSourceHasDirectoryWithTrailingSlash', 'http://www.example.com/pathOne/', './jquery.js', 'http://www.example.com/pathOne/jquery.js'),
+            array('testAbsolutePathHasDotDirecoryAndSourceHasDirectoryWithoutTrailingSlash', 'http://www.example.com/pathOne', './jquery.js', 'http://www.example.com/jquery.js'),
+            array('testAbsolutePathIncludesPortNumber', 'http://example.com:8080/index.html', '/photo.jpg', 'http://example.com:8080/photo.jpg'),
+        );
+        // PHP 5.4 and before returns a different result, but either are acceptable
+        if (\PHP_MAJOR_VERSION <= 5 && \PHP_MINOR_VERSION <= 4) {
+            $cases[] = array('relative add scheme host user from base', 'http://user:@www.example.com', 'server.php', 'http://user@www.example.com/server.php');
+        } else {
+            $cases[] = array('relative add scheme host user from base', 'http://user:@www.example.com', 'server.php', 'http://user:@www.example.com/server.php');
+        }
+        // Test cases from RFC
+        // http://tools.ietf.org/html/rfc3986#section-5.4
+        $rfcTests = array(array("g:h", "g:h"), array("g", "http://a/b/c/g"), array("./g", "http://a/b/c/g"), array("g/", "http://a/b/c/g/"), array("/g", "http://a/g"), array("//g", "http://g"), array("?y", "http://a/b/c/d;p?y"), array("g?y", "http://a/b/c/g?y"), array("#s", "http://a/b/c/d;p?q#s"), array("g#s", "http://a/b/c/g#s"), array("g?y#s", "http://a/b/c/g?y#s"), array(";x", "http://a/b/c/;x"), array("g;x", "http://a/b/c/g;x"), array("g;x?y#s", "http://a/b/c/g;x?y#s"), array("", "http://a/b/c/d;p?q"), array(".", "http://a/b/c/"), array("./", "http://a/b/c/"), array("..", "http://a/b/"), array("../", "http://a/b/"), array("../g", "http://a/b/g"), array("../..", "http://a/"), array("../../", "http://a/"), array("../../g", "http://a/g"));
+        foreach ($rfcTests as $i => $test) {
+            $cases[] = array('test rfc ' . $i, 'http://a/b/c/d;p?q', $test[0], $test[1]);
+        }
+        return $cases;
+    }
+}
diff --git a/libs/mf2/mf2/tests/Mf2/bootstrap.php b/libs/mf2/mf2/tests/Mf2/bootstrap.php
new file mode 100644
index 0000000..4a2de9d
--- /dev/null
+++ b/libs/mf2/mf2/tests/Mf2/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace IndieAuth\Libs;
+
+require \dirname(__DIR__) . '/../vendor/autoload.php';
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..ea5f257
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<phpunit bootstrap="tests/bootstrap.php">
+</phpunit>
+
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 6eec407..cf719d4 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInita3f135fc7ff74331d581d4d9b4d9ea9c::getLoader();
+return ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3::getLoader();
diff --git a/vendor/barnabywalters/mf-cleaner/.gitignore b/vendor/barnabywalters/mf-cleaner/.gitignore
deleted file mode 100644
index 7d7f29a..0000000
--- a/vendor/barnabywalters/mf-cleaner/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/nbproject/private/
-/vendor/
-.DS_Store
-tmp
-composer.phar
-.idea/
diff --git a/vendor/barnabywalters/mf-cleaner/README.md b/vendor/barnabywalters/mf-cleaner/README.md
deleted file mode 100644
index 5477893..0000000
--- a/vendor/barnabywalters/mf-cleaner/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# php-mf-cleaner
-
-Lots of little helpers for processing canonical [microformats2](http://microformats.org/wiki/microformats2) array structures. Counterpart to indieweb/php-mf2
-
-## Installation
-
-Install using [Composer](https://getcomposer.org) by adding `barnabywalters/mf-cleaner` to your composer.json:
-
-```json
-{
-	"require: {
-		"barnabywalters/mf-cleaner": "0.*"
-	}
-}
-```
-
-Then require `vendor/autoload.php` as usual, and you’re ready to go.
-
-## Usage
-
-Should be pretty much self-documenting, you can always look in the tests to see 
-exactly what a function is supposed to do. Here are some common examples:
-
-```php
-<?php
-
-require __DIR__ . '/vendor/autoload.php';
-
-// Alias the namespace to ”Mf2” for convenience
-use BarnabyWalters\Mf2;
-
-// Check if an array structure is a microformat
-
-$hCard = [
-	'type' => ['h-card'],
-	'properties' => [
-		'name' => ['Mr. Bran']
-	]
-];
-
-Mf2\isMicroformat($hCard); // true
-Mf2\isMicroformat([1, 2, 3, 4, 'key' => 'value']); // false
-
-Mf2\hasProp($hCard, 'name'); // true
-
-Mf2\getPlaintext($hCard, 'name'); // 'Mr. Bran'
-
-$hEntry = [
-	'type' => ['h-entry'],
-	'properties' => [
-		'published' => ['2013-06-12 12:00:00'],
-		'author' => $hCard
-	]
-];
-
-Mf2\flattenMicroformats($hEntry); // returns array with $hEntry followed by $hCard
-Mf2\getAuthor($hEntry); // returns $hCard, can do all sorts of handy searching
-
-// Get the published datetime, fall back to updated if that’s present check that
-// it can be parsed by \DateTime, return null if it can’t be found or is invalid
-Mf2\getPublished($hEntry, true, null); // '2013-06-12 12:00:00'
-
-$microformats = [
-	'items' => [$hEntry, $hCard]
-];
-
-Mf2\isMicroformatCollection($microformats); // true
-
-Mf2\findMicroformatsByType($microformats, 'h-card'); // [$hCard]
-
-Mf2\findMicroformatsByProperty($microformats, 'published'); // [$hEntry]
-
-Mf2\findMicroformatsByCallable($microformats, function ($mf) {
-	return Mf2\hasProp($mf, 'published') and Mf2\hasProp($mf, 'author');
-}); // [$hEntry]
-
-```
-
-## Contributing
-
-Pull requests very welcome, please try to maintain stylistic, structural
-and naming consistency with the existing codebase, and don’t be too upset if I 
-make naming changes :)
-
-Please add tests which cover changes you plan to make or have made. I use PHPUnit,
-which is the de-facto standard for modern PHP development.
-
-At the very least, run the test suite before and after making your changes to 
-make sure you haven’t broken anything.
-
-Issues/bug reports welcome. If you know how to write tests then please do so as
-code always expresses problems and intent much better than English, and gives me
-a way of measuring whether or not fixes have actually solved your problem. If you
-don’t know how to write tests, don’t worry :) Just include as much useful information
-in the issue as you can.
-
-## Changelog
-
-### v0.1.3 2014-10-06
-* Improved getAuthor() algorithm, made non-standard portions optional
-* Added getRepresentativeHCard() function implementing http://microformats.org/wiki/representative-h-card-parsing
-
-### v0.1.3 2014-05-16
-* Fixed issue causing getAuthor to return non-h-card microformats
-
-### v0.1.2
-
-### v0.1.1
-
-### v0.1.0
-* Initial version
\ No newline at end of file
diff --git a/vendor/barnabywalters/mf-cleaner/composer.json b/vendor/barnabywalters/mf-cleaner/composer.json
deleted file mode 100644
index fc8955d..0000000
--- a/vendor/barnabywalters/mf-cleaner/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "barnabywalters/mf-cleaner",
-    "description": "Cleans up microformats2 array structures",
-    "require": {},
-    "require-dev": {
-        "phpunit/phpunit": "*",
-				"php": ">=5.3"
-    },
-	  "autoload": {
-			"files": ["src/BarnabyWalters/Mf2/Functions.php"]
-		},
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Barnaby Walters",
-            "email": "barnaby@waterpigs.co.uk"
-        }
-    ],
-		"suggest": {
-			"mf2/mf2": "To parse microformats2 structures from (X)HTML"
-		},
-    "minimum-stability": "dev"
-}
diff --git a/vendor/barnabywalters/mf-cleaner/composer.lock b/vendor/barnabywalters/mf-cleaner/composer.lock
deleted file mode 100644
index 5471bad..0000000
--- a/vendor/barnabywalters/mf-cleaner/composer.lock
+++ /dev/null
@@ -1,601 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "2f749075feeae07b1377efd707633138",
-    "packages": [
-
-    ],
-    "packages-dev": [
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "dff200806109072c6f2f788b9499492fd73cae02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/dff200806109072c6f2f788b9499492fd73cae02",
-                "reference": "dff200806109072c6f2f788b9499492fd73cae02",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.7",
-                "phpunit/php-file-iterator": ">=1.3.0",
-                "phpunit/php-text-template": ">=1.1.1",
-                "phpunit/php-token-stream": ">=1.1.3",
-                "sebastian/version": ">=1.0.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.2.1",
-                "phpunit/phpunit": "dev-master"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2013-10-04 20:11:09"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2013-10-10 15:34:57"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18",
-                "reference": "1eeef106193d2f8c539728e566bb4793071a9e18",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2013-01-07 10:56:17"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2013-08-02 07:42:54"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "292f4d5772dad5a12775be69f4a8dd663b20f103"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/292f4d5772dad5a12775be69f4a8dd663b20f103",
-                "reference": "292f4d5772dad5a12775be69f4a8dd663b20f103",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2013-10-21 14:03:39"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5efcfe5bb670fcfaf072c5567f7b7ec7b8e06956"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5efcfe5bb670fcfaf072c5567f7b7ec7b8e06956",
-                "reference": "5efcfe5bb670fcfaf072c5567f7b7ec7b8e06956",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.4.7",
-                "phpunit/php-code-coverage": "1.3.*@dev",
-                "phpunit/php-file-iterator": ">=1.3.1",
-                "phpunit/php-text-template": ">=1.1.1",
-                "phpunit/php-timer": ">=1.0.2",
-                "phpunit/phpunit-mock-objects": "1.3.*@dev",
-                "sebastian/diff": ">=1.1.0",
-                "sebastian/exporter": ">=1.0.0",
-                "sebastian/version": ">=1.0.0",
-                "symfony/yaml": "~2.0"
-            },
-            "require-dev": {
-                "pear-pear/pear": "1.9.4"
-            },
-            "suggest": {
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "phpunit/php-invoker": ">=1.1.0"
-            },
-            "bin": [
-                "composer/bin/phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHPUnit/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2013-10-30 07:57:43"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "346591b047bc04e22c0f608110087579f7518dba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/346591b047bc04e22c0f608110087579f7518dba",
-                "reference": "346591b047bc04e22c0f608110087579f7518dba",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.7",
-                "phpunit/php-text-template": ">=1.1.1"
-            },
-            "require-dev": {
-                "pear-pear/pear": "1.9.4",
-                "phpunit/phpunit": "dev-master"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHPUnit/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2013-08-31 07:18:20"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2013-08-03 16:46:33"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "7c801c2db02018e00a91026994eadb9fae51701f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7c801c2db02018e00a91026994eadb9fae51701f",
-                "reference": "7c801c2db02018e00a91026994eadb9fae51701f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2013-07-09 05:47:49"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "b5ed060223916b485002b02605e20ba04a741f03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b5ed060223916b485002b02605e20ba04a741f03",
-                "reference": "b5ed060223916b485002b02605e20ba04a741f03",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2013-07-31 05:26:57"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "dev-master",
-            "target-dir": "Symfony/Component/Yaml",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "1f7cabb841e62ec49615bd965ac780fd994b3f64"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/1f7cabb841e62ec49615bd965ac780fd994b3f64",
-                "reference": "1f7cabb841e62ec49615bd965ac780fd994b3f64",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-10-17 11:48:11"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "dev",
-    "stability-flags": [
-
-    ],
-    "platform": [
-
-    ],
-    "platform-dev": {
-        "php": ">=5.3"
-    }
-}
diff --git a/vendor/barnabywalters/mf-cleaner/nbproject/project.properties b/vendor/barnabywalters/mf-cleaner/nbproject/project.properties
deleted file mode 100644
index 69270ff..0000000
--- a/vendor/barnabywalters/mf-cleaner/nbproject/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-file.reference.php-mf-cleaner-vendor=vendor
-ignore.path=\
-    ${file.reference.php-mf-cleaner-vendor}
-include.path=${php.global.include.path}
-php.version=PHP_54
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=true
-test.src.dir=test
-web.root=.
diff --git a/vendor/barnabywalters/mf-cleaner/nbproject/project.xml b/vendor/barnabywalters/mf-cleaner/nbproject/project.xml
deleted file mode 100644
index 697a673..0000000
--- a/vendor/barnabywalters/mf-cleaner/nbproject/project.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>php-mf-cleaner</name>
-        </data>
-    </configuration>
-</project>
diff --git a/vendor/barnabywalters/mf-cleaner/phpunit.xml b/vendor/barnabywalters/mf-cleaner/phpunit.xml
deleted file mode 100644
index 227f654..0000000
--- a/vendor/barnabywalters/mf-cleaner/phpunit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<phpunit backupGlobals="true"
-         bootstrap="test/bootstrap.php"
-         backupStaticAttributes="false"
-         cacheTokens="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         strict="false"
-         verbose="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix="Test.php">test/</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <log type="coverage-html" target="tmp/report" charset="UTF-8"
-                     highlight="true"/>
-        <log type="testdox-html" target="tmp/index.html"/>
-    </logging>
-</phpunit>
diff --git a/vendor/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php b/vendor/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php
deleted file mode 100644
index 57d61d5..0000000
--- a/vendor/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-
-namespace BarnabyWalters\Mf2;
-
-use DateTime;
-use Exception;
-
-function hasNumericKeys(array $arr) {
-	foreach ($arr as $key=>$val) if (is_numeric($key)) return true;
-	return false;
-}
-
-function isMicroformat($mf) {
-	return (is_array($mf) and !hasNumericKeys($mf) and !empty($mf['type']) and isset($mf['properties']));
-}
-
-function isMicroformatCollection($mf) {
-	return (is_array($mf) and isset($mf['items']) and is_array($mf['items']));
-}
-
-function isEmbeddedHtml($p) {
-	return is_array($p) and !hasNumericKeys($p) and isset($p['value']) and isset($p['html']);
-}
-
-function hasProp(array $mf, $propName) {
-	return !empty($mf['properties'][$propName]) and is_array($mf['properties'][$propName]);
-}
-
-/** shortcut for getPlaintext, use getPlaintext from now on */
-function getProp(array $mf, $propName, $fallback = null) {
-	return getPlaintext($mf, $propName, $fallback);
-}
-
-function toPlaintext($v) {
-	if (isMicroformat($v) or isEmbeddedHtml($v))
-		return $v['value'];
-	return $v;
-}
-
-function getPlaintext(array $mf, $propName, $fallback = null) {
-	if (!empty($mf['properties'][$propName]) and is_array($mf['properties'][$propName])) {
-		return toPlaintext(current($mf['properties'][$propName]));
-	}
-
-	return $fallback;
-}
-
-function getPlaintextArray(array $mf, $propName, $fallback = null) {
-	if (!empty($mf['properties'][$propName]) and is_array($mf['properties'][$propName]))
-		return array_map(__NAMESPACE__ . '\toPlaintext', $mf['properties'][$propName]);
-
-	return $fallback;
-}
-
-function toHtml($v) {
-	if (isEmbeddedHtml($v))
-		return $v['html'];
-	elseif (isMicroformat($v))
-		return htmlspecialchars($v['value']);
-	return htmlspecialchars($v);
-}
-
-function getHtml(array $mf, $propName, $fallback = null) {
-	if (!empty($mf['properties'][$propName]) and is_array($mf['properties'][$propName]))
-		return toHtml(current($mf['properties'][$propName]));
-
-	return $fallback;
-}
-
-/** @deprecated as not often used **/
-function getSummary(array $mf) {
-	if (hasProp($mf, 'summary'))
-		return getProp($mf, 'summary');
-
-	if (!empty($mf['properties']['content']))
-		return substr(strip_tags(getPlaintext($mf, 'content')), 0, 19) . '…';
-}
-
-function getPublished(array $mf, $ensureValid = false, $fallback = null) {
-	return getDateTimeProperty('published', $mf, $ensureValid, $fallback);
-}
-
-function getUpdated(array $mf, $ensureValid = false, $fallback = null) {
-	return getDateTimeProperty('updated', $mf, $ensureValid, $fallback);
-}
-
-function getDateTimeProperty($name, array $mf, $ensureValid = false, $fallback = null) {
-	$compliment = 'published' === $name ? 'updated' : 'published';
-
-	if (hasProp($mf, $name))
-		$return = getProp($mf, $name);
-	elseif (hasProp($mf, $compliment))
-		$return = getProp($mf, $compliment);
-	else
-		return $fallback;
-
-	if (!$ensureValid)
-		return $return;
-	else {
-		try {
-			new DateTime($return);
-			return $return;
-		} catch (Exception $e) {
-			return $fallback;
-		}
-	}
-}
-
-function sameHostname($u1, $u2) {
-	return parse_url($u1, PHP_URL_HOST) === parse_url($u2, PHP_URL_HOST);
-}
-
-// TODO: maybe split some bits of this out into separate functions
-// TODO: this needs to be just part of an indiewebcamp.com/authorship algorithm, at the moment it tries to do too much
-function getAuthor(array $mf, array $context = null, $url = null, $matchName = true, $matchHostname = true) {
-	$entryAuthor = null;
-	
-	if (null === $url and hasProp($mf, 'url'))
-		$url = getProp($mf, 'url');
-	
-	if (hasProp($mf, 'author') and isMicroformat(current($mf['properties']['author'])))
-		$entryAuthor = current($mf['properties']['author']);
-	elseif (hasProp($mf, 'reviewer') and isMicroformat(current($mf['properties']['author'])))
-		$entryAuthor = current($mf['properties']['reviewer']);
-	elseif (hasProp($mf, 'author'))
-		$entryAuthor = getPlaintext($mf, 'author');
-	
-	// If we have no context that’s the best we can do
-	if (null === $context)
-		return $entryAuthor;
-	
-	// Whatever happens after this we’ll need these
-	$flattenedMf = flattenMicroformats($context);
-	$hCards = findMicroformatsByType($flattenedMf, 'h-card', false);
-
-	if (is_string($entryAuthor)) {
-		// look through all page h-cards for one with this URL
-		$authorHCards = findMicroformatsByProperty($hCards, 'url', $entryAuthor, false);
-
-		if (!empty($authorHCards))
-			$entryAuthor = current($authorHCards);
-	}
-
-	if (is_string($entryAuthor) and $matchName) {
-		// look through all page h-cards for one with this name
-		$authorHCards = findMicroformatsByProperty($hCards, 'name', $entryAuthor, false);
-		
-		if (!empty($authorHCards))
-			$entryAuthor = current($authorHCards);
-	}
-	
-	if (null !== $entryAuthor)
-		return $entryAuthor;
-	
-	// look for page-wide rel-author, h-card with that
-	if (!empty($context['rels']) and !empty($context['rels']['author'])) {
-		// Grab first href with rel=author
-		$relAuthorHref = current($context['rels']['author']);
-		
-		$relAuthorHCards = findMicroformatsByProperty($hCards, 'url', $relAuthorHref);
-		
-		if (!empty($relAuthorHCards))
-			return current($relAuthorHCards);
-	}
-
-	// look for h-card with same hostname as $url if given
-	if (null !== $url and $matchHostname) {
-		$sameHostnameHCards = findMicroformatsByCallable($hCards, function ($mf) use ($url) {
-			if (!hasProp($mf, 'url'))
-				return false;
-
-			foreach ($mf['properties']['url'] as $u) {
-				if (sameHostname($url, $u))
-					return true;
-			}
-		}, false);
-
-		if (!empty($sameHostnameHCards))
-			return current($sameHostnameHCards);
-	}
-
-	// Without fetching, this is the best we can do. Return the found string value, or null.
-	return empty($relAuthorHref)
-		? null
-		: $relAuthorHref;
-}
-
-function parseUrl($url) {
-	$r = parse_url($url);
-	$r['pathname'] = empty($r['path']) ? '/' : $r['path'];
-	return $r;
-}
-
-function urlsMatch($url1, $url2) {
-	$u1 = parseUrl($url1);
-	$u2 = parseUrl($url2);
-
-	foreach (array_merge(array_keys($u1), array_keys($u2)) as $component) {
-		if (!array_key_exists($component, $u1) or !array_key_exists($component, $u1)) {
-			return false;
-		}
-
-		if ($u1[$component] != $u2[$component]) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/**
- * Representative h-card
- *
- * Given the microformats on a page representing a person or organisation (h-card), find the single h-card which is
- * representative of the page, or null if none is found.
- *
- * @see http://microformats.org/wiki/representative-h-card-parsing
- *
- * @param array $mfs The parsed microformats of a page to search for a representative h-card
- * @param string $url The URL the microformats were fetched from
- * @return array|null Either a single h-card array structure, or null if none was found
- */
-function getRepresentativeHCard(array $mfs, $url) {
-	$hCardsMatchingUidUrlPageUrl = findMicroformatsByCallable($mfs, function ($hCard) use ($url) {
-		return hasProp($hCard, 'uid') and hasProp($hCard, 'url')
-			and urlsMatch(getPlaintext($hCard, 'uid'), $url)
-			and count(array_filter($hCard['properties']['url'], function ($u) use ($url) {
-				return urlsMatch($u, $url);
-			})) > 0;
-	});
-	if (!empty($hCardsMatchingUidUrlPageUrl)) return $hCardsMatchingUidUrlPageUrl[0];
-
-	if (!empty($mfs['rels']['me'])) {
-		$hCardsMatchingUrlRelMe = findMicroformatsByCallable($mfs, function ($hCard) use ($mfs) {
-			if (hasProp($hCard, 'url')) {
-				foreach ($mfs['rels']['me'] as $relUrl) {
-					foreach ($hCard['properties']['url'] as $url) {
-						if (urlsMatch($url, $relUrl)) {
-							return true;
-						}
-					}
-				}
-			}
-			return false;
-		});
-		if (!empty($hCardsMatchingUrlRelMe)) return $hCardsMatchingUrlRelMe[0];
-	}
-
-	$hCardsMatchingUrlPageUrl = findMicroformatsByCallable($mfs, function ($hCard) use ($url) {
-		return hasProp($hCard, 'url')
-			and count(array_filter($hCard['properties']['url'], function ($u) use ($url) {
-				return urlsMatch($u, $url);
-			})) > 0;
-	});
-	if (count($hCardsMatchingUrlPageUrl) === 1) return $hCardsMatchingUrlPageUrl[0];
-
-	// Otherwise, no representative h-card could be found.
-	return null;
-}
-
-function flattenMicroformatProperties(array $mf) {
-	$items = array();
-	
-	if (!isMicroformat($mf))
-		return $items;
-	
-	foreach ($mf['properties'] as $propArray) {
-		foreach ($propArray as $prop) {
-			if (isMicroformat($prop)) {
-				$items[] = $prop;
-				$items = array_merge($items, flattenMicroformatProperties($prop));
-			}
-		}
-	}
-	
-	return $items;
-}
-
-function flattenMicroformats(array $mfs) {
-	if (isMicroformatCollection($mfs))
-		$mfs = $mfs['items'];
-	elseif (isMicroformat($mfs))
-		$mfs = array($mfs);
-	
-	$items = array();
-	
-	foreach ($mfs as $mf) {
-		$items[] = $mf;
-		
-		$items = array_merge($items, flattenMicroformatProperties($mf));
-		
-		if (empty($mf['children']))
-			continue;
-		
-		foreach ($mf['children'] as $child) {
-			$items[] = $child;
-			$items = array_merge($items, flattenMicroformatProperties($child));
-		}
-	}
-	
-	return $items;
-}
-
-function findMicroformatsByType(array $mfs, $name, $flatten = true) {
-	return findMicroformatsByCallable($mfs, function ($mf) use ($name) {
-		return in_array($name, $mf['type']);
-	}, $flatten);
-}
-
-function findMicroformatsByProperty(array $mfs, $propName, $propValue, $flatten = true) {
-	return findMicroformatsByCallable($mfs, function ($mf) use ($propName, $propValue) {
-		if (!hasProp($mf, $propName))
-			return false;
-		
-		if (in_array($propValue, $mf['properties'][$propName]))
-			return true;
-		
-		return false;
-	}, $flatten);
-}
-
-function findMicroformatsByCallable(array $mfs, $callable, $flatten = true) {
-	if (!is_callable($callable))
-		throw new \InvalidArgumentException('$callable must be callable');
-	
-	if ($flatten and (isMicroformat($mfs) or isMicroformatCollection($mfs)))
-		$mfs = flattenMicroformats($mfs);
-	
-	return array_values(array_filter($mfs, $callable));
-}
diff --git a/vendor/barnabywalters/mf-cleaner/test/CleanerTest.php b/vendor/barnabywalters/mf-cleaner/test/CleanerTest.php
deleted file mode 100644
index 4d2529c..0000000
--- a/vendor/barnabywalters/mf-cleaner/test/CleanerTest.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-
-namespace BarnabyWalters\Mf2;
-
-use PHPUnit_Framework_TestCase;
-
-/**
- * CleanerTest
- *
- * @author barnabywalters
- */
-class CleanerTest extends PHPUnit_Framework_TestCase {
-	protected function mf($name, array $properties, $value='') {
-		if (is_array($name))
-			$type = $name;
-		else
-			$type = [$name];
-		
-		foreach ($properties as $name => $arg) {
-			if (is_array($arg) and !isMicroformat($arg) and !isEmbeddedHtml($arg))
-				$properties[$name] = $arg;
-			else
-				$properties[$name] = [$arg];
-		}
-		
-		return [
-			'type' => $type,
-			'properties' => $properties,
-			'value' => $value
-		];
-	}
-	
-	public function testIsMicroformatReturnsFalseIfNotArray() {
-		$this->assertFalse(isMicroformat(''));
-	}
-	
-	public function testIsMicroformatReturnsFalseIfTypeMissing() {
-		$this->assertFalse(isMicroformat(['properties' => []]));
-	}
-	
-	public function testIsMicroformatReturnsFalseIfPropertiesMissing() {
-		$this->assertFalse(isMicroformat(['type' => ['h-thing']]));
-	}
-	
-	public function testIsMicroformatReturnsFalseIfHasNumericKeys() {
-		$this->assertFalse(isMicroformat([[], 'thing' => []]));
-	}
-	
-	public function testIsMicroformatReturnsTrueIfValueIsSet() {
-		$this->assertTrue(isMicroformat([
-			'type' => ['h-card'],
-			'properties' => [],
-			'value' => 'a string'
-		]));
-	}
-	
-	public function testHasNumericKeysWorks() {
-		$withNumericKeys = ['a', 'b', 'c'];
-		$noNumericKeys = ['key' => 'value'];
-		
-		$this->assertTrue(hasNumericKeys($withNumericKeys));
-		$this->assertFalse(hasNumericKeys($noNumericKeys));
-	}
-	
-	public function testIsMicroformatCollectionChecksForItemsKey() {
-		$this->assertTrue(isMicroformatCollection(['items' => []]));
-		$this->assertFalse(isMicroformatCollection(['notItems' => []]));
-	}
-	
-	public function testGetSummaryPassesIfSummaryPresent() {
-		$mf = $this->mf('h-entry', ['summary' => 'Hello Summary']);
-		$result = getSummary($mf);
-		$this->assertEquals($mf['properties']['summary'][0], $result);
-	}
-	
-	public function testGetSummaryUsesStrippedFirstCharactersOfContent() {
-		$result = getSummary([
-			'type' => ['h-entry'],
-			'properties' => [
-				'content' => ['<p>Hello hello hello there indeed</p>']
-			]
-		]);
-		
-		$this->assertEquals('Hello hello hello t…', $result);
-	}
-	
-	public function testGetPublishedPassesIfPublishedPresent() {
-		$mf = $this->mf('h-entry', ['published' => '2013-12-06']);
-		$result = getPublished($mf);
-		$this->assertEquals(getProp($mf, 'published'), $result);
-	}
-	
-	public function testGetPublishedFallsBackToUpdated() {
-		$mf = $this->mf('h-entry', ['updated' => '2013-12-06']);
-		$result = getPublished($mf);
-		$this->assertEquals(getProp($mf, 'updated'), $result);
-	}
-	
-	public function testGetPublishedReturnsNullIfValidDatetimeRequested() {
-		$mf = $this->mf('h-entry', ['published' => 'werty']);
-		$result = getPublished($mf, true);
-		$this->assertNull($result);
-	}
-	
-	public function testGetPublishedReturnsNullIfNoPotentialValueFound() {
-		$mf = $this->mf('h-entry', []);
-		$result = getPublished($mf);
-		$this->assertNull($result);
-	}
-	
-	public function testGetPublishedReturnsFallbackIfProvided() {
-		$mf = $this->mf('h-entry', []);
-		$this->assertEquals('fallback', getPublished($mf, true, 'fallback'));
-	}
-	
-	public function testGetAuthorPassesIfAuthorPresent() {
-		$mf = $this->mf('h-entry', ['author' => [$this->mf('h-card', ['name' => 'Me'])]]);
-		$result = getAuthor($mf);
-		$this->assertEquals('Me', getProp($result, 'name'));
-	}
-	
-	public function testGetAuthorFindsSeparateHCardWithSameName() {
-		$nonAuthorCard = $this->mf('h-card', ['name' => 'Someone Else', 'url' => 'http://example.org']);
-		$card = $this->mf('h-card', ['name' => 'Me', 'url' => 'http://waterpigs.co.uk']);
-		$entry = $this->mf('h-entry', ['name' => 'Entry', 'author' => 'Me']);
-		$mfs = [
-			'items' => [$nonAuthorCard, $card, $entry]
-		];
-		
-		$result = getAuthor($entry, $mfs);
-		
-		$this->assertEquals('http://waterpigs.co.uk', getProp($result, 'url'));
-	}
-	
-	public function testGetAuthorFindsSeparateHCardWithSameDomain() {
-		$card = $this->mf('h-card', ['name' => 'Me', 'url' => 'http://waterpigs.co.uk']);
-		$entry = $this->mf('h-entry', ['name' => 'The Entry']);
-		$mfs = ['items' => [$entry, $card]];
-		
-		$result = getAuthor($entry, $mfs, 'http://waterpigs.co.uk/notes/1234');
-		
-		$this->assertEquals('Me', getProp($result, 'name'));
-	}
-	
-	public function testGetAuthorDoesntFallBackToFirstHCard() {
-		$cards = [$this->mf('h-card', ['name' => 'Bill']), $this->mf('h-card', ['name' => 'James'])];
-		$entry = $this->mf('h-entry', ['name' => 'Entry']);
-		$mfs = ['items' => $cards];
-		
-		$result = getAuthor($entry, $mfs);
-		
-		$this->assertEquals(null, $result);
-	}
-	
-	public function testGetAuthorFindsAuthorWithUrlOfPageRelAuthor() {
-		$cards = [$this->mf('h-card', ['name' => 'N. T. Author']), $this->mf('h-card', ['name' => 'The Author', 'url' => 'http://example.com'])];
-		$entry = $this->mf('h-entry', ['name' => 'Entry']);
-		$mfs = [
-			'items' => $cards,
-			'rels' => [
-				'author' => ['http://example.com']
-			]
-		];
-		
-		$result = getAuthor($entry, $mfs);
-		
-		$this->assertEquals($cards[1], $result);
-	}
-	
-	public function testFindMicroformatsByTypeFindsRootMicroformats() {
-		$mfs = [
-			'items' => [[
-				'type' => ['h-card'],
-				'properties' => [
-					'name' => ['me']
-				]
-			]]
-		];
-		
-		$result = findMicroformatsByType($mfs, 'h-card');
-		$this->assertEquals('me', getProp($result[0], 'name'));
-	}
-	
-	public function testFlattenMicroformatsReturnsFlatArrayOfMicroformats() {
-		$org = $this->mf('h-card', ['name' => 'organisation']);
-		$card = $this->mf('h-card', ['name' => 'me', 'org' => [$org]]);
-		$entry = $this->mf('h-entry', ['name' => 'blog posting']);
-		$card['children'] = [$entry];
-		
-		$mfs = [
-			'items' => [$card]
-		];
-		
-		$result = flattenMicroformats($mfs);
-		
-		$this->assertTrue(in_array($org, $result));
-		$this->assertTrue(in_array($card, $result));
-		$this->assertTrue(in_array($entry, $result));
-	}
-	
-	public function testFindMicroformatsByProperty() {
-		$mfs = [
-			'items' => [$this->mf('h-card', ['name' => 'Me'])]
-		];
-		
-		$results = findMicroformatsByProperty($mfs, 'name', 'Me');
-		$this->assertEquals(1, count($results));
-	}
-	
-	public function testFindMicroformatsByCallable() {
-		$mfs = [
-			'items' => [$this->mf('h-card', ['url' => 'http://waterpigs.co.uk/'])]
-		];
-		
-		$results = findMicroformatsByCallable($mfs, function ($mf) {
-			if (!hasProp($mf, 'url'))
-				return false;
-			
-			$urls = $mf['properties']['url'];
-			
-			foreach ($urls as $url) {
-				if (parse_url($url, PHP_URL_HOST) === parse_url('http://waterpigs.co.uk', PHP_URL_HOST))
-					return true;
-			}
-			
-			return false;
-		});
-		
-		$this->assertEquals(1, count($results));
-	}
-	
-	public function testFindMicroformatsSearchesSingleMicroformatStructure() {
-		$card = $this->mf('h-card', ['name' => 'Me']);
-		$entry = $this->mf('h-entry', ['author' => [$card], 'name' => 'entry']);
-		
-		$results = findMicroformatsByType($entry, 'h-card');
-		$this->assertEquals(1, count($results));
-	}	
-	
-	public function testIsEmbeddedHtml() {
-		$e = array('value' => '', 'html' => '');
-		$this->assertTrue(isEmbeddedHtml($e));
-		$this->assertFalse(isEmbeddedHtml(array()));
-	}
-	
-	public function testGetPlaintextProperty() {
-		$e = $this->mf('h-entry', [
-			'name' => 'text',
-			'content' => ['text' => 'content', 'html' => '<b>content</b>'],
-			'author' => [$this->mf('h-card', [], 'name')]
-		]);
-		$this->assertEquals('text', getPlaintext($e, 'name'));
-		$this->assertEquals('content', getPlaintext($e, 'content'));
-		$this->assertEquals('name', getPlaintext($e, 'author'));
-	}
-	
-	public function testGetPlaintextArray() {
-		$e = $this->mf('h-entry', [
-			'category' => ['text', 'more']
-		]);
-		$this->assertEquals(['text', 'more'], getPlaintextArray($e, 'category'));
-	}
-	
-	public function testGetHtmlProperty() {
-		$e = $this->mf('h-entry', [
-			'name' => ['"text"<>'],
-			'content' => ['value' => 'content', 'html' => '<b>content</b>'],
-			'author' => [$this->mf('h-card', [], '"name"<>')]
-		]);
-		$this->assertEquals('&quot;text&quot;&lt;&gt;', getHtml($e, 'name'));
-		$this->assertEquals('<b>content</b>', getHtml($e, 'content'));
-		$this->assertEquals('&quot;name&quot;&lt;&gt;', getHtml($e, 'author'));
-	}
-	
-	public function testExpandAuthorExpandsFromLargerHCardsInContext() {
-		$this->markTestSkipped();
-	}
-	
-	public function testMergeMicroformatsRecursivelyMerges() {
-		$this->markTestSkipped();
-	}
-
-	public function testGetAuthorDoesntReturnNonHCards() {
-		$mf = [
-			'items' => [[
-				'type' => ['h-entry'],
-				'properties' => [
-					'url' => ['http://example.com/post/100'],
-					'name' => ['Some Entry']
-				]
-			],
-			[
-				'type' => ['h-card'],
-				'properties' => [
-					'url' => ['http://example.com/'],
-					'name' => ['Mrs. Example']
-				]
-			]]
-		];
-
-		$author = getAuthor($mf['items'][0], $mf, 'http://example.com/post/100');
-
-		$this->assertContains('h-card', $author['type']);
-	}
-
-	public function testGetRepresentativeHCardFindsUidUrlPageUrlAllMatching() {
-		$url = 'https://example.com';
-		$mf = [
-			'items' => [[
-				'type' => ['h-entry'],
-				'properties' => [
-					'url' => ['https://example.com'],
-					'uid' => ['https://example.com'],
-					'name' => ['Correct h-card']
-				]
-			]]
-		];
-
-		$repHCard = getRepresentativeHCard($mf, $url);
-
-		$this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
-	}
-
-	public function testGetRepresentativeHCardFindsUrlRelMeMatching() {
-		$url = 'https://example.com';
-		$mf = [
-			'items' => [[
-					'type' => ['h-entry'],
-					'properties' => [
-							'url' => ['https://example.org'],
-							'name' => ['Correct h-card']
-					]
-			]],
-			'rels' => [
-				'me' => ['https://example.org']
-			]
-		];
-
-		$repHCard = getRepresentativeHCard($mf, $url);
-
-		$this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
-	}
-
-	public function testGetRepresentativeHCardFindsSingleUrlPageUrlMatching() {
-		$url = 'https://example.com';
-		$mf = [
-				'items' => [[
-						'type' => ['h-entry'],
-						'properties' => [
-								'url' => ['https://example.com'],
-								'name' => ['Correct h-card']
-						]
-				]],
-				'rels' => [
-						'me' => ['https://example.org']
-				]
-		];
-
-		$repHCard = getRepresentativeHCard($mf, $url);
-
-		$this->assertEquals('Correct h-card', getPlaintext($repHCard, 'name'));
-	}
-
-	public function testGetRepresentativeHCardIgnoresMultipleUrlPageUrlMatching() {
-		$url = 'https://example.com';
-		$mf = [
-				'items' => [[
-						'type' => ['h-entry'],
-						'properties' => [
-								'url' => ['https://example.com'],
-								'name' => ['Incorrect h-card']
-						]
-				], [
-						'type' => ['h-entry'],
-						'properties' => [
-								'url' => ['https://example.com'],
-								'name' => ['Another Incorrect h-card']
-						]
-				]]
-		];
-
-		$repHCard = getRepresentativeHCard($mf, $url);
-
-		$this->assertEquals(null, $repHCard);
-	}
-}
diff --git a/vendor/barnabywalters/mf-cleaner/test/bootstrap.php b/vendor/barnabywalters/mf-cleaner/test/bootstrap.php
deleted file mode 100644
index 6d6ca70..0000000
--- a/vendor/barnabywalters/mf-cleaner/test/bootstrap.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-date_default_timezone_set('UTC');
-
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/vendor/bin/fetch-mf2 b/vendor/bin/fetch-mf2
deleted file mode 100644
index 2e8e578..0000000
--- a/vendor/bin/fetch-mf2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$files = array(
-  __DIR__ . '/../vendor/autoload.php',
-  __DIR__ . '/../../../autoload.php',
-  __DIR__ . '/../Mf2/Parser.php'
-);
-
-foreach ($files as $file) {
-	if (file_exists($file)) {
-		require $file;
-		define('COMPOSER_INSTALL_LOCATION', $file);
-		break;
-	}
-}
-
-if (!defined('COMPOSER_INSTALL_LOCATION')) {
-	die('A composer /vendor/autoload.php file could not be found. You need to install composer: https://getcomposer.org/download');
-}
-
-$url = $argv[1];
-
-if (empty($url)) {
-	die("Please provide a URL to fetch+parse, e.g. bin/fetch-mf2 waterpigs.co.uk/notes");
-}
-
-if (!file_exists($url)) {
-	if (!preg_match('|https?://|', $url)) {
-		$url = 'http://' . $url;
-	}
-}
-
-$result = Mf2\fetch($url);
-
-if (defined('JSON_PRETTY_PRINT')) {
-	echo json_encode($result, JSON_PRETTY_PRINT);
-} else {
-	echo json_encode($result);
-}
diff --git a/vendor/bin/parse-mf2 b/vendor/bin/parse-mf2
deleted file mode 100644
index 12df408..0000000
--- a/vendor/bin/parse-mf2
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$files = array(
-  __DIR__ . '/../vendor/autoload.php',
-  __DIR__ . '/../../../autoload.php',
-  __DIR__ . '/../Mf2/Parser.php'
-);
-
-foreach ($files as $file) {
-	if (file_exists($file)) {
-		require $file;
-		define('COMPOSER_INSTALL_LOCATION', $file);
-		break;
-	}
-}
-
-if (!defined('COMPOSER_INSTALL_LOCATION')) {
-	die('A composer /vendor/autoload.php file could not be found. You need to install composer: https://getcomposer.org/download');
-}
-
-if (!empty($argv[1])) {
-	$url = $argv[1];
-	if (!preg_match('|https?://|', $url)) {
-		$url = 'http://' . $url;
-	}
-} else {
-	$url = null;
-}
-
-$result = Mf2\parse(fgets(STDIN), $url);
-
-if (defined('JSON_PRETTY_PRINT')) {
-	echo json_encode($result, JSON_PRETTY_PRINT);
-} else {
-	echo json_encode($result);
-}
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 1a58957..7824d8f 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,21 +42,76 @@
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var string|null */
     private $apcuPrefix;
 
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -66,28 +121,42 @@ public function getPrefixes()
         return array();
     }
 
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return array<string, string> Array of classname => path
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,22 +171,25 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -126,19 +198,19 @@ public function add($prefix, $paths, $prepend = false)
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -147,25 +219,28 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -175,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -195,8 +270,10 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +288,12 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +313,8 @@ public function setPsr4($prefix, $paths)
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +337,8 @@ public function getUseIncludePath()
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +359,8 @@ public function isClassMapAuthoritative()
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -296,33 +381,55 @@ public function getApcuPrefix()
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +474,21 @@ public function findFile($class)
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -432,14 +554,26 @@ private function findFileWithExtension($class, $ext)
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 6fbf943..51e734a 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -1,246 +1,359 @@
 <?php
 
-
-
-
-
-
-
-
-
-
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Composer;
 
+use Composer\Autoload\ClassLoader;
 use Composer\Semver\VersionParser;
 
-
-
-
-
-
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
 class InstalledVersions
 {
-private static $installed = array (
-  'root' => 
-  array (
-    'pretty_version' => '1.0.0+no-version-set',
-    'version' => '1.0.0.0',
-    'aliases' => 
-    array (
-    ),
-    'reference' => NULL,
-    'name' => '__root__',
-  ),
-  'versions' => 
-  array (
-    '__root__' => 
-    array (
-      'pretty_version' => '1.0.0+no-version-set',
-      'version' => '1.0.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => NULL,
-    ),
-    'barnabywalters/mf-cleaner' => 
-    array (
-      'pretty_version' => 'v0.1.4',
-      'version' => '0.1.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4',
-    ),
-    'firebase/php-jwt' => 
-    array (
-      'pretty_version' => 'v5.4.0',
-      'version' => '5.4.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2113d9b2e0e349796e72d2a63cf9319100382d2',
-    ),
-    'mf2/mf2' => 
-    array (
-      'pretty_version' => '0.4.6',
-      'version' => '0.4.6.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23',
-    ),
-  ),
-);
-
-
-
-
-
-
-
-public static function getInstalledPackages()
-{
-return array_keys(self::$installed['versions']);
-}
-
-
-
-
-
-
-
-
-
-public static function isInstalled($packageName)
-{
-return isset(self::$installed['versions'][$packageName]);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function satisfies(VersionParser $parser, $packageName, $constraint)
-{
-$constraint = $parser->parseConstraints($constraint);
-$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-return $provided->matches($constraint);
-}
-
-
-
-
-
-
-
-
-
-
-public static function getVersionRanges($packageName)
-{
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-$ranges = array();
-if (isset(self::$installed['versions'][$packageName]['pretty_version'])) {
-$ranges[] = self::$installed['versions'][$packageName]['pretty_version'];
-}
-if (array_key_exists('aliases', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']);
-}
-if (array_key_exists('replaced', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']);
-}
-if (array_key_exists('provided', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']);
-}
-
-return implode(' || ', $ranges);
-}
-
-
-
-
-
-public static function getVersion($packageName)
-{
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-if (!isset(self::$installed['versions'][$packageName]['version'])) {
-return null;
-}
-
-return self::$installed['versions'][$packageName]['version'];
-}
-
-
-
-
-
-public static function getPrettyVersion($packageName)
-{
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) {
-return null;
-}
-
-return self::$installed['versions'][$packageName]['pretty_version'];
-}
-
-
-
-
-
-public static function getReference($packageName)
-{
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-if (!isset(self::$installed['versions'][$packageName]['reference'])) {
-return null;
-}
-
-return self::$installed['versions'][$packageName]['reference'];
-}
-
-
-
-
-
-public static function getRootPackage()
-{
-return self::$installed['root'];
-}
-
-
-
-
-
-
-
-public static function getRawData()
-{
-return self::$installed;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function reload($data)
-{
-self::$installed = $data;
-}
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints((string) $constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
 }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index b26f1b1..e5b0f39 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,9 +2,35 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => $baseDir . '/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => $baseDir . '/libs/firebase/php-jwt/src/BeforeValidException.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => $baseDir . '/libs/firebase/php-jwt/src/CachedKeySet.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => $baseDir . '/libs/firebase/php-jwt/src/ExpiredException.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => $baseDir . '/libs/firebase/php-jwt/src/JWK.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => $baseDir . '/libs/firebase/php-jwt/src/JWT.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => $baseDir . '/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\Key' => $baseDir . '/libs/firebase/php-jwt/src/Key.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => $baseDir . '/libs/firebase/php-jwt/src/SignatureInvalidException.php',
+    'IndieAuth\\Libs\\Mf2\\Parser' => $baseDir . '/libs/mf2/mf2/Mf2/Parser.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParsePTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseUTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParserTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/RelTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/URLTest.php',
 );
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index c11b5a2..6a24477 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,10 +2,10 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '75114ff88d0fe0413bbfd961d51cb0e3' => $vendorDir . '/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php',
-    '757772e28a0943a9afe83def8db95bdf' => $vendorDir . '/mf2/mf2/Mf2/Parser.php',
+    'e028e420ea1d245ced7d9e07c59e020e' => $baseDir . '/libs/mf2/mf2/Mf2/Parser.php',
+    '5cd7e71b95ba7cc6cc22611a088f8653' => $baseDir . '/libs/barnabywalters/mf-cleaner/src/functions.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc012..15a2ff3 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 16c5539..e829da9 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,10 +2,9 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
     'IndieAuth\\' => array($baseDir . '/src/IndieAuth'),
-    'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index a585d3f..2d98b70 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInita3f135fc7ff74331d581d4d9b4d9ea9c
+class ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3
 {
     private static $loader;
 
@@ -22,54 +22,27 @@ public static function getLoader()
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
+        spl_autoload_register(array('ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3', 'loadClassLoader'));
 
-        spl_autoload_register(array('ComposerAutoloaderInita3f135fc7ff74331d581d4d9b4d9ea9c', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInita3f135fc7ff74331d581d4d9b4d9ea9c', 'loadClassLoader'));
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::getInitializer($loader));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+        $loader->register(true);
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
+                require $file;
             }
-        }
-
-        $loader->register(true);
-
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirea3f135fc7ff74331d581d4d9b4d9ea9c($fileIdentifier, $file);
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-function composerRequirea3f135fc7ff74331d581d4d9b4d9ea9c($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e12b496..6771fc1 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,11 +4,11 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c
+class ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3
 {
     public static $files = array (
-        '75114ff88d0fe0413bbfd961d51cb0e3' => __DIR__ . '/..' . '/barnabywalters/mf-cleaner/src/BarnabyWalters/Mf2/Functions.php',
-        '757772e28a0943a9afe83def8db95bdf' => __DIR__ . '/..' . '/mf2/mf2/Mf2/Parser.php',
+        'e028e420ea1d245ced7d9e07c59e020e' => __DIR__ . '/../..' . '/libs/mf2/mf2/Mf2/Parser.php',
+        '5cd7e71b95ba7cc6cc22611a088f8653' => __DIR__ . '/../..' . '/libs/barnabywalters/mf-cleaner/src/functions.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -16,10 +16,6 @@ class ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c
         array (
             'IndieAuth\\' => 10,
         ),
-        'F' => 
-        array (
-            'Firebase\\JWT\\' => 13,
-        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -27,22 +23,44 @@ class ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c
         array (
             0 => __DIR__ . '/../..' . '/src/IndieAuth',
         ),
-        'Firebase\\JWT\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/firebase/php-jwt/src',
-        ),
     );
 
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => __DIR__ . '/../..' . '/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/BeforeValidException.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/CachedKeySet.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/ExpiredException.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWK.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWT.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\Key' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/Key.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/SignatureInvalidException.php',
+        'IndieAuth\\Libs\\Mf2\\Parser' => __DIR__ . '/../..' . '/libs/mf2/mf2/Mf2/Parser.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParsePTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseUTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParserTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/RelTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/URLTest.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInita3f135fc7ff74331d581d4d9b4d9ea9c::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3495145..f20a6c4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,176 +1,5 @@
 {
-    "packages": [
-        {
-            "name": "barnabywalters/mf-cleaner",
-            "version": "v0.1.4",
-            "version_normalized": "0.1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
-                "reference": "ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4",
-                "reference": "ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4",
-                "shasum": ""
-            },
-            "require-dev": {
-                "php": ">=5.3",
-                "phpunit/phpunit": "*"
-            },
-            "suggest": {
-                "mf2/mf2": "To parse microformats2 structures from (X)HTML"
-            },
-            "time": "2014-10-06T23:11:15+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "files": [
-                    "src/BarnabyWalters/Mf2/Functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barnaby Walters",
-                    "email": "barnaby@waterpigs.co.uk"
-                }
-            ],
-            "description": "Cleans up microformats2 array structures",
-            "support": {
-                "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
-                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.1.4"
-            },
-            "install-path": "../barnabywalters/mf-cleaner"
-        },
-        {
-            "name": "firebase/php-jwt",
-            "version": "v5.4.0",
-            "version_normalized": "5.4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "d2113d9b2e0e349796e72d2a63cf9319100382d2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d2113d9b2e0e349796e72d2a63cf9319100382d2",
-                "reference": "d2113d9b2e0e349796e72d2a63cf9319100382d2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=4.8 <=9"
-            },
-            "suggest": {
-                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
-            },
-            "time": "2021-06-23T19:00:23+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Firebase\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Neuman Vong",
-                    "email": "neuman+pear@twilio.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Anant Narayanan",
-                    "email": "anant@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-            "homepage": "https://github.com/firebase/php-jwt",
-            "keywords": [
-                "jwt",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v5.4.0"
-            },
-            "install-path": "../firebase/php-jwt"
-        },
-        {
-            "name": "mf2/mf2",
-            "version": "0.4.6",
-            "version_normalized": "0.4.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/microformats/php-mf2.git",
-                "reference": "00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23",
-                "reference": "00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "mf2/tests": "@dev",
-                "phpdocumentor/phpdocumentor": "v2.8.4",
-                "phpunit/phpunit": "4.8.*"
-            },
-            "suggest": {
-                "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
-                "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
-            },
-            "time": "2018-08-24T14:47:04+00:00",
-            "bin": [
-                "bin/fetch-mf2",
-                "bin/parse-mf2"
-            ],
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "files": [
-                    "Mf2/Parser.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "CC0-1.0"
-            ],
-            "authors": [
-                {
-                    "name": "Barnaby Walters",
-                    "homepage": "http://waterpigs.co.uk"
-                }
-            ],
-            "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
-            "keywords": [
-                "html",
-                "microformats",
-                "microformats 2",
-                "parser",
-                "semantic"
-            ],
-            "support": {
-                "issues": "https://github.com/microformats/php-mf2/issues",
-                "source": "https://github.com/microformats/php-mf2/tree/master"
-            },
-            "install-path": "../mf2/mf2"
-        }
-    ],
+    "packages": [],
     "dev": false,
     "dev-package-names": []
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 415114c..37502bc 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -1,51 +1,23 @@
-<?php return array (
-  'root' => 
-  array (
-    'pretty_version' => '1.0.0+no-version-set',
-    'version' => '1.0.0.0',
-    'aliases' => 
-    array (
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => '1.0.0+no-version-set',
+        'version' => '1.0.0.0',
+        'reference' => NULL,
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => false,
     ),
-    'reference' => NULL,
-    'name' => '__root__',
-  ),
-  'versions' => 
-  array (
-    '__root__' => 
-    array (
-      'pretty_version' => '1.0.0+no-version-set',
-      'version' => '1.0.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => NULL,
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => '1.0.0+no-version-set',
+            'version' => '1.0.0.0',
+            'reference' => NULL,
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
     ),
-    'barnabywalters/mf-cleaner' => 
-    array (
-      'pretty_version' => 'v0.1.4',
-      'version' => '0.1.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ef6a16628db6e8aee2b4f8bb8093d18c24b74cd4',
-    ),
-    'firebase/php-jwt' => 
-    array (
-      'pretty_version' => 'v5.4.0',
-      'version' => '5.4.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2113d9b2e0e349796e72d2a63cf9319100382d2',
-    ),
-    'mf2/mf2' => 
-    array (
-      'pretty_version' => '0.4.6',
-      'version' => '0.4.6.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '00b70ee7eb7f5b0585b1bd467f6c9cbd75055d23',
-    ),
-  ),
 );
diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
deleted file mode 100644
index 590554b..0000000
--- a/vendor/composer/platform_check.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// platform_check.php @generated by Composer
-
-$issues = array();
-
-if (!(PHP_VERSION_ID >= 50400)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 5.4.0". You are running ' . PHP_VERSION . '.';
-}
-
-if ($issues) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
-        } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
-        }
-    }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
-    );
-}
diff --git a/vendor/firebase/php-jwt/README.md b/vendor/firebase/php-jwt/README.md
deleted file mode 100644
index a8556aa..0000000
--- a/vendor/firebase/php-jwt/README.md
+++ /dev/null
@@ -1,282 +0,0 @@
-[![Build Status](https://travis-ci.org/firebase/php-jwt.png?branch=master)](https://travis-ci.org/firebase/php-jwt)
-[![Latest Stable Version](https://poser.pugx.org/firebase/php-jwt/v/stable)](https://packagist.org/packages/firebase/php-jwt)
-[![Total Downloads](https://poser.pugx.org/firebase/php-jwt/downloads)](https://packagist.org/packages/firebase/php-jwt)
-[![License](https://poser.pugx.org/firebase/php-jwt/license)](https://packagist.org/packages/firebase/php-jwt)
-
-PHP-JWT
-=======
-A simple library to encode and decode JSON Web Tokens (JWT) in PHP, conforming to [RFC 7519](https://tools.ietf.org/html/rfc7519).
-
-Installation
-------------
-
-Use composer to manage your dependencies and download PHP-JWT:
-
-```bash
-composer require firebase/php-jwt
-```
-
-Optionally, install the `paragonie/sodium_compat` package from composer if your
-php is < 7.2 or does not have libsodium installed:
-
-```bash
-composer require paragonie/sodium_compat
-```
-
-Example
--------
-```php
-use Firebase\JWT\JWT;
-
-$key = "example_key";
-$payload = array(
-    "iss" => "http://example.org",
-    "aud" => "http://example.com",
-    "iat" => 1356999524,
-    "nbf" => 1357000000
-);
-
-/**
- * IMPORTANT:
- * You must specify supported algorithms for your application. See
- * https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40
- * for a list of spec-compliant algorithms.
- */
-$jwt = JWT::encode($payload, $key);
-$decoded = JWT::decode($jwt, $key, array('HS256'));
-
-print_r($decoded);
-
-/*
- NOTE: This will now be an object instead of an associative array. To get
- an associative array, you will need to cast it as such:
-*/
-
-$decoded_array = (array) $decoded;
-
-/**
- * You can add a leeway to account for when there is a clock skew times between
- * the signing and verifying servers. It is recommended that this leeway should
- * not be bigger than a few minutes.
- *
- * Source: http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#nbfDef
- */
-JWT::$leeway = 60; // $leeway in seconds
-$decoded = JWT::decode($jwt, $key, array('HS256'));
-```
-Example with RS256 (openssl)
-----------------------------
-```php
-use Firebase\JWT\JWT;
-
-$privateKey = <<<EOD
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC8kGa1pSjbSYZVebtTRBLxBz5H4i2p/llLCrEeQhta5kaQu/Rn
-vuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t0tyazyZ8JXw+KgXTxldMPEL9
-5+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4ehde/zUxo6UvS7UrBQIDAQAB
-AoGAb/MXV46XxCFRxNuB8LyAtmLDgi/xRnTAlMHjSACddwkyKem8//8eZtw9fzxz
-bWZ/1/doQOuHBGYZU8aDzzj59FZ78dyzNFoF91hbvZKkg+6wGyd/LrGVEB+Xre0J
-Nil0GReM2AHDNZUYRv+HYJPIOrB0CRczLQsgFJ8K6aAD6F0CQQDzbpjYdx10qgK1
-cP59UHiHjPZYC0loEsk7s+hUmT3QHerAQJMZWC11Qrn2N+ybwwNblDKv+s5qgMQ5
-5tNoQ9IfAkEAxkyffU6ythpg/H0Ixe1I2rd0GbF05biIzO/i77Det3n4YsJVlDck
-ZkcvY3SK2iRIL4c9yY6hlIhs+K9wXTtGWwJBAO9Dskl48mO7woPR9uD22jDpNSwe
-k90OMepTjzSvlhjbfuPN1IdhqvSJTDychRwn1kIJ7LQZgQ8fVz9OCFZ/6qMCQGOb
-qaGwHmUK6xzpUbbacnYrIM6nLSkXgOAwv7XXCojvY614ILTK3iXiLBOxPu5Eu13k
-eUz9sHyD6vkgZzjtxXECQAkp4Xerf5TGfQXGXhxIX52yH+N2LtujCdkQZjXAsGdm
-B2zNzvrlgRmgBrklMTrMYgm1NPcW+bRLGcwgW2PTvNM=
------END RSA PRIVATE KEY-----
-EOD;
-
-$publicKey = <<<EOD
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8kGa1pSjbSYZVebtTRBLxBz5H
-4i2p/llLCrEeQhta5kaQu/RnvuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t
-0tyazyZ8JXw+KgXTxldMPEL95+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4
-ehde/zUxo6UvS7UrBQIDAQAB
------END PUBLIC KEY-----
-EOD;
-
-$payload = array(
-    "iss" => "example.org",
-    "aud" => "example.com",
-    "iat" => 1356999524,
-    "nbf" => 1357000000
-);
-
-$jwt = JWT::encode($payload, $privateKey, 'RS256');
-echo "Encode:\n" . print_r($jwt, true) . "\n";
-
-$decoded = JWT::decode($jwt, $publicKey, array('RS256'));
-
-/*
- NOTE: This will now be an object instead of an associative array. To get
- an associative array, you will need to cast it as such:
-*/
-
-$decoded_array = (array) $decoded;
-echo "Decode:\n" . print_r($decoded_array, true) . "\n";
-```
-
-Example with a passphrase
--------------------------
-
-```php
-// Your passphrase
-$passphrase = '[YOUR_PASSPHRASE]';
-
-// Your private key file with passphrase
-// Can be generated with "ssh-keygen -t rsa -m pem"
-$privateKeyFile = '/path/to/key-with-passphrase.pem';
-
-// Create a private key of type "resource"
-$privateKey = openssl_pkey_get_private(
-    file_get_contents($privateKeyFile),
-    $passphrase
-);
-
-$payload = array(
-    "iss" => "example.org",
-    "aud" => "example.com",
-    "iat" => 1356999524,
-    "nbf" => 1357000000
-);
-
-$jwt = JWT::encode($payload, $privateKey, 'RS256');
-echo "Encode:\n" . print_r($jwt, true) . "\n";
-
-// Get public key from the private key, or pull from from a file.
-$publicKey = openssl_pkey_get_details($privateKey)['key'];
-
-$decoded = JWT::decode($jwt, $publicKey, array('RS256'));
-echo "Decode:\n" . print_r((array) $decoded, true) . "\n";
-```
-
-Example with EdDSA (libsodium and Ed25519 signature)
-----------------------------
-```php
-use Firebase\JWT\JWT;
-
-// Public and private keys are expected to be Base64 encoded. The last
-// non-empty line is used so that keys can be generated with
-// sodium_crypto_sign_keypair(). The secret keys generated by other tools may
-// need to be adjusted to match the input expected by libsodium.
-
-$keyPair = sodium_crypto_sign_keypair();
-
-$privateKey = base64_encode(sodium_crypto_sign_secretkey($keyPair));
-
-$publicKey = base64_encode(sodium_crypto_sign_publickey($keyPair));
-
-$payload = array(
-    "iss" => "example.org",
-    "aud" => "example.com",
-    "iat" => 1356999524,
-    "nbf" => 1357000000
-);
-
-$jwt = JWT::encode($payload, $privateKey, 'EdDSA');
-echo "Encode:\n" . print_r($jwt, true) . "\n";
-
-$decoded = JWT::decode($jwt, $publicKey, array('EdDSA'));
-echo "Decode:\n" . print_r((array) $decoded, true) . "\n";
-````
-
-Using JWKs
-----------
-
-```php
-use Firebase\JWT\JWK;
-use Firebase\JWT\JWT;
-
-// Set of keys. The "keys" key is required. For example, the JSON response to
-// this endpoint: https://www.gstatic.com/iap/verify/public_key-jwk
-$jwks = ['keys' => []];
-
-// JWK::parseKeySet($jwks) returns an associative array of **kid** to private
-// key. Pass this as the second parameter to JWT::decode.
-JWT::decode($payload, JWK::parseKeySet($jwks), $supportedAlgorithm);
-```
-
-Changelog
----------
-
-#### 5.0.0 / 2017-06-26
-- Support RS384 and RS512.
-  See [#117](https://github.com/firebase/php-jwt/pull/117). Thanks [@joostfaassen](https://github.com/joostfaassen)!
-- Add an example for RS256 openssl.
-  See [#125](https://github.com/firebase/php-jwt/pull/125). Thanks [@akeeman](https://github.com/akeeman)!
-- Detect invalid Base64 encoding in signature.
-  See [#162](https://github.com/firebase/php-jwt/pull/162). Thanks [@psignoret](https://github.com/psignoret)!
-- Update `JWT::verify` to handle OpenSSL errors.
-  See [#159](https://github.com/firebase/php-jwt/pull/159). Thanks [@bshaffer](https://github.com/bshaffer)!
-- Add `array` type hinting to `decode` method
-  See [#101](https://github.com/firebase/php-jwt/pull/101). Thanks [@hywak](https://github.com/hywak)!
-- Add all JSON error types.
-  See [#110](https://github.com/firebase/php-jwt/pull/110). Thanks [@gbalduzzi](https://github.com/gbalduzzi)!
-- Bugfix 'kid' not in given key list.
-  See [#129](https://github.com/firebase/php-jwt/pull/129). Thanks [@stampycode](https://github.com/stampycode)!
-- Miscellaneous cleanup, documentation and test fixes.
-  See [#107](https://github.com/firebase/php-jwt/pull/107), [#115](https://github.com/firebase/php-jwt/pull/115),
-  [#160](https://github.com/firebase/php-jwt/pull/160), [#161](https://github.com/firebase/php-jwt/pull/161), and
-  [#165](https://github.com/firebase/php-jwt/pull/165). Thanks [@akeeman](https://github.com/akeeman),
-  [@chinedufn](https://github.com/chinedufn), and [@bshaffer](https://github.com/bshaffer)!
-
-#### 4.0.0 / 2016-07-17
-- Add support for late static binding. See [#88](https://github.com/firebase/php-jwt/pull/88) for details. Thanks to [@chappy84](https://github.com/chappy84)!
-- Use static `$timestamp` instead of `time()` to improve unit testing. See [#93](https://github.com/firebase/php-jwt/pull/93) for details. Thanks to [@josephmcdermott](https://github.com/josephmcdermott)!
-- Fixes to exceptions classes. See [#81](https://github.com/firebase/php-jwt/pull/81) for details. Thanks to [@Maks3w](https://github.com/Maks3w)!
-- Fixes to PHPDoc. See [#76](https://github.com/firebase/php-jwt/pull/76) for details. Thanks to [@akeeman](https://github.com/akeeman)!
-
-#### 3.0.0 / 2015-07-22
-- Minimum PHP version updated from `5.2.0` to `5.3.0`.
-- Add `\Firebase\JWT` namespace. See
-[#59](https://github.com/firebase/php-jwt/pull/59) for details. Thanks to
-[@Dashron](https://github.com/Dashron)!
-- Require a non-empty key to decode and verify a JWT. See
-[#60](https://github.com/firebase/php-jwt/pull/60) for details. Thanks to
-[@sjones608](https://github.com/sjones608)!
-- Cleaner documentation blocks in the code. See
-[#62](https://github.com/firebase/php-jwt/pull/62) for details. Thanks to
-[@johanderuijter](https://github.com/johanderuijter)!
-
-#### 2.2.0 / 2015-06-22
-- Add support for adding custom, optional JWT headers to `JWT::encode()`. See
-[#53](https://github.com/firebase/php-jwt/pull/53/files) for details. Thanks to
-[@mcocaro](https://github.com/mcocaro)!
-
-#### 2.1.0 / 2015-05-20
-- Add support for adding a leeway to `JWT:decode()` that accounts for clock skew
-between signing and verifying entities. Thanks to [@lcabral](https://github.com/lcabral)!
-- Add support for passing an object implementing the `ArrayAccess` interface for
-`$keys` argument in `JWT::decode()`. Thanks to [@aztech-dev](https://github.com/aztech-dev)!
-
-#### 2.0.0 / 2015-04-01
-- **Note**: It is strongly recommended that you update to > v2.0.0 to address
-  known security vulnerabilities in prior versions when both symmetric and
-  asymmetric keys are used together.
-- Update signature for `JWT::decode(...)` to require an array of supported
-  algorithms to use when verifying token signatures.
-
-
-Tests
------
-Run the tests using phpunit:
-
-```bash
-$ pear install PHPUnit
-$ phpunit --configuration phpunit.xml.dist
-PHPUnit 3.7.10 by Sebastian Bergmann.
-.....
-Time: 0 seconds, Memory: 2.50Mb
-OK (5 tests, 5 assertions)
-```
-
-New Lines in private keys
------
-
-If your private key contains `\n` characters, be sure to wrap it in double quotes `""`
-and not single quotes `''` in order to properly interpret the escaped characters.
-
-License
--------
-[3-Clause BSD](http://opensource.org/licenses/BSD-3-Clause).
diff --git a/vendor/firebase/php-jwt/src/BeforeValidException.php b/vendor/firebase/php-jwt/src/BeforeValidException.php
deleted file mode 100644
index c147852..0000000
--- a/vendor/firebase/php-jwt/src/BeforeValidException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Firebase\JWT;
-
-class BeforeValidException extends \UnexpectedValueException
-{
-}
diff --git a/vendor/firebase/php-jwt/src/ExpiredException.php b/vendor/firebase/php-jwt/src/ExpiredException.php
deleted file mode 100644
index 81ba52d..0000000
--- a/vendor/firebase/php-jwt/src/ExpiredException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Firebase\JWT;
-
-class ExpiredException extends \UnexpectedValueException
-{
-}
diff --git a/vendor/firebase/php-jwt/src/JWK.php b/vendor/firebase/php-jwt/src/JWK.php
deleted file mode 100644
index 981a9ba..0000000
--- a/vendor/firebase/php-jwt/src/JWK.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Firebase\JWT;
-
-use DomainException;
-use InvalidArgumentException;
-use UnexpectedValueException;
-
-/**
- * JSON Web Key implementation, based on this spec:
- * https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
- *
- * PHP version 5
- *
- * @category Authentication
- * @package  Authentication_JWT
- * @author   Bui Sy Nguyen <nguyenbs@gmail.com>
- * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
- * @link     https://github.com/firebase/php-jwt
- */
-class JWK
-{
-    /**
-     * Parse a set of JWK keys
-     *
-     * @param array $jwks The JSON Web Key Set as an associative array
-     *
-     * @return array An associative array that represents the set of keys
-     *
-     * @throws InvalidArgumentException     Provided JWK Set is empty
-     * @throws UnexpectedValueException     Provided JWK Set was invalid
-     * @throws DomainException              OpenSSL failure
-     *
-     * @uses parseKey
-     */
-    public static function parseKeySet(array $jwks)
-    {
-        $keys = array();
-
-        if (!isset($jwks['keys'])) {
-            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
-        }
-        if (empty($jwks['keys'])) {
-            throw new InvalidArgumentException('JWK Set did not contain any keys');
-        }
-
-        foreach ($jwks['keys'] as $k => $v) {
-            $kid = isset($v['kid']) ? $v['kid'] : $k;
-            if ($key = self::parseKey($v)) {
-                $keys[$kid] = $key;
-            }
-        }
-
-        if (0 === \count($keys)) {
-            throw new UnexpectedValueException('No supported algorithms found in JWK Set');
-        }
-
-        return $keys;
-    }
-
-    /**
-     * Parse a JWK key
-     *
-     * @param array $jwk An individual JWK
-     *
-     * @return resource|array An associative array that represents the key
-     *
-     * @throws InvalidArgumentException     Provided JWK is empty
-     * @throws UnexpectedValueException     Provided JWK was invalid
-     * @throws DomainException              OpenSSL failure
-     *
-     * @uses createPemFromModulusAndExponent
-     */
-    public static function parseKey(array $jwk)
-    {
-        if (empty($jwk)) {
-            throw new InvalidArgumentException('JWK must not be empty');
-        }
-        if (!isset($jwk['kty'])) {
-            throw new UnexpectedValueException('JWK must contain a "kty" parameter');
-        }
-
-        switch ($jwk['kty']) {
-            case 'RSA':
-                if (!empty($jwk['d'])) {
-                    throw new UnexpectedValueException('RSA private keys are not supported');
-                }
-                if (!isset($jwk['n']) || !isset($jwk['e'])) {
-                    throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
-                }
-
-                $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']);
-                $publicKey = \openssl_pkey_get_public($pem);
-                if (false === $publicKey) {
-                    throw new DomainException(
-                        'OpenSSL error: ' . \openssl_error_string()
-                    );
-                }
-                return $publicKey;
-            default:
-                // Currently only RSA is supported
-                break;
-        }
-    }
-
-    /**
-     * Create a public key represented in PEM format from RSA modulus and exponent information
-     *
-     * @param string $n The RSA modulus encoded in Base64
-     * @param string $e The RSA exponent encoded in Base64
-     *
-     * @return string The RSA public key represented in PEM format
-     *
-     * @uses encodeLength
-     */
-    private static function createPemFromModulusAndExponent($n, $e)
-    {
-        $modulus = JWT::urlsafeB64Decode($n);
-        $publicExponent = JWT::urlsafeB64Decode($e);
-
-        $components = array(
-            'modulus' => \pack('Ca*a*', 2, self::encodeLength(\strlen($modulus)), $modulus),
-            'publicExponent' => \pack('Ca*a*', 2, self::encodeLength(\strlen($publicExponent)), $publicExponent)
-        );
-
-        $rsaPublicKey = \pack(
-            'Ca*a*a*',
-            48,
-            self::encodeLength(\strlen($components['modulus']) + \strlen($components['publicExponent'])),
-            $components['modulus'],
-            $components['publicExponent']
-        );
-
-        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
-        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-        $rsaPublicKey = \chr(0) . $rsaPublicKey;
-        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
-
-        $rsaPublicKey = \pack(
-            'Ca*a*',
-            48,
-            self::encodeLength(\strlen($rsaOID . $rsaPublicKey)),
-            $rsaOID . $rsaPublicKey
-        );
-
-        $rsaPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-            \chunk_split(\base64_encode($rsaPublicKey), 64) .
-            '-----END PUBLIC KEY-----';
-
-        return $rsaPublicKey;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @param int $length
-     * @return string
-     */
-    private static function encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return \chr($length);
-        }
-
-        $temp = \ltrim(\pack('N', $length), \chr(0));
-
-        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
-    }
-}
diff --git a/vendor/firebase/php-jwt/src/JWT.php b/vendor/firebase/php-jwt/src/JWT.php
deleted file mode 100644
index 99d6dcd..0000000
--- a/vendor/firebase/php-jwt/src/JWT.php
+++ /dev/null
@@ -1,544 +0,0 @@
-<?php
-
-namespace Firebase\JWT;
-
-use DomainException;
-use Exception;
-use InvalidArgumentException;
-use UnexpectedValueException;
-use DateTime;
-
-/**
- * JSON Web Token implementation, based on this spec:
- * https://tools.ietf.org/html/rfc7519
- *
- * PHP version 5
- *
- * @category Authentication
- * @package  Authentication_JWT
- * @author   Neuman Vong <neuman@twilio.com>
- * @author   Anant Narayanan <anant@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
- * @link     https://github.com/firebase/php-jwt
- */
-class JWT
-{
-    const ASN1_INTEGER = 0x02;
-    const ASN1_SEQUENCE = 0x10;
-    const ASN1_BIT_STRING = 0x03;
-
-    /**
-     * When checking nbf, iat or expiration times,
-     * we want to provide some extra leeway time to
-     * account for clock skew.
-     */
-    public static $leeway = 0;
-
-    /**
-     * Allow the current timestamp to be specified.
-     * Useful for fixing a value within unit testing.
-     *
-     * Will default to PHP time() value if null.
-     */
-    public static $timestamp = null;
-
-    public static $supported_algs = array(
-        'ES384' => array('openssl', 'SHA384'),
-        'ES256' => array('openssl', 'SHA256'),
-        'HS256' => array('hash_hmac', 'SHA256'),
-        'HS384' => array('hash_hmac', 'SHA384'),
-        'HS512' => array('hash_hmac', 'SHA512'),
-        'RS256' => array('openssl', 'SHA256'),
-        'RS384' => array('openssl', 'SHA384'),
-        'RS512' => array('openssl', 'SHA512'),
-        'EdDSA' => array('sodium_crypto', 'EdDSA'),
-    );
-
-    /**
-     * Decodes a JWT string into a PHP object.
-     *
-     * @param string                    $jwt            The JWT
-     * @param string|array|resource     $key            The key, or map of keys.
-     *                                                  If the algorithm used is asymmetric, this is the public key
-     * @param array                     $allowed_algs   List of supported verification algorithms
-     *                                                  Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
-     *                                                  'HS512', 'RS256', 'RS384', and 'RS512'
-     *
-     * @return object The JWT's payload as a PHP object
-     *
-     * @throws InvalidArgumentException     Provided JWT was empty
-     * @throws UnexpectedValueException     Provided JWT was invalid
-     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
-     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
-     *
-     * @uses jsonDecode
-     * @uses urlsafeB64Decode
-     */
-    public static function decode($jwt, $key, array $allowed_algs = array())
-    {
-        $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp;
-
-        if (empty($key)) {
-            throw new InvalidArgumentException('Key may not be empty');
-        }
-        $tks = \explode('.', $jwt);
-        if (\count($tks) != 3) {
-            throw new UnexpectedValueException('Wrong number of segments');
-        }
-        list($headb64, $bodyb64, $cryptob64) = $tks;
-        if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
-            throw new UnexpectedValueException('Invalid header encoding');
-        }
-        if (null === $payload = static::jsonDecode(static::urlsafeB64Decode($bodyb64))) {
-            throw new UnexpectedValueException('Invalid claims encoding');
-        }
-        if (false === ($sig = static::urlsafeB64Decode($cryptob64))) {
-            throw new UnexpectedValueException('Invalid signature encoding');
-        }
-        if (empty($header->alg)) {
-            throw new UnexpectedValueException('Empty algorithm');
-        }
-        if (empty(static::$supported_algs[$header->alg])) {
-            throw new UnexpectedValueException('Algorithm not supported');
-        }
-        if (!\in_array($header->alg, $allowed_algs)) {
-            throw new UnexpectedValueException('Algorithm not allowed');
-        }
-        if ($header->alg === 'ES256' || $header->alg === 'ES384') {
-            // OpenSSL expects an ASN.1 DER sequence for ES256/ES384 signatures
-            $sig = self::signatureToDER($sig);
-        }
-
-        if (\is_array($key) || $key instanceof \ArrayAccess) {
-            if (isset($header->kid)) {
-                if (!isset($key[$header->kid])) {
-                    throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
-                }
-                $key = $key[$header->kid];
-            } else {
-                throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
-            }
-        }
-
-        // Check the signature
-        if (!static::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
-            throw new SignatureInvalidException('Signature verification failed');
-        }
-
-        // Check the nbf if it is defined. This is the time that the
-        // token can actually be used. If it's not yet that time, abort.
-        if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf)
-            );
-        }
-
-        // Check that this token has been created before 'now'. This prevents
-        // using tokens that have been created for later use (and haven't
-        // correctly used the nbf claim).
-        if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat)
-            );
-        }
-
-        // Check if this token has expired.
-        if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
-            throw new ExpiredException('Expired token');
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Converts and signs a PHP object or array into a JWT string.
-     *
-     * @param object|array      $payload    PHP object or array
-     * @param string|resource   $key        The secret key.
-     *                                      If the algorithm used is asymmetric, this is the private key
-     * @param string            $alg        The signing algorithm.
-     *                                      Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
-     *                                      'HS512', 'RS256', 'RS384', and 'RS512'
-     * @param mixed             $keyId
-     * @param array             $head       An array with header elements to attach
-     *
-     * @return string A signed JWT
-     *
-     * @uses jsonEncode
-     * @uses urlsafeB64Encode
-     */
-    public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
-    {
-        $header = array('typ' => 'JWT', 'alg' => $alg);
-        if ($keyId !== null) {
-            $header['kid'] = $keyId;
-        }
-        if (isset($head) && \is_array($head)) {
-            $header = \array_merge($head, $header);
-        }
-        $segments = array();
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($header));
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($payload));
-        $signing_input = \implode('.', $segments);
-
-        $signature = static::sign($signing_input, $key, $alg);
-        $segments[] = static::urlsafeB64Encode($signature);
-
-        return \implode('.', $segments);
-    }
-
-    /**
-     * Sign a string with a given key and algorithm.
-     *
-     * @param string            $msg    The message to sign
-     * @param string|resource   $key    The secret key
-     * @param string            $alg    The signing algorithm.
-     *                                  Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
-     *                                  'HS512', 'RS256', 'RS384', and 'RS512'
-     *
-     * @return string An encrypted message
-     *
-     * @throws DomainException Unsupported algorithm or bad key was specified
-     */
-    public static function sign($msg, $key, $alg = 'HS256')
-    {
-        if (empty(static::$supported_algs[$alg])) {
-            throw new DomainException('Algorithm not supported');
-        }
-        list($function, $algorithm) = static::$supported_algs[$alg];
-        switch ($function) {
-            case 'hash_hmac':
-                return \hash_hmac($algorithm, $msg, $key, true);
-            case 'openssl':
-                $signature = '';
-                $success = \openssl_sign($msg, $signature, $key, $algorithm);
-                if (!$success) {
-                    throw new DomainException("OpenSSL unable to sign data");
-                }
-                if ($alg === 'ES256') {
-                    $signature = self::signatureFromDER($signature, 256);
-                } elseif ($alg === 'ES384') {
-                    $signature = self::signatureFromDER($signature, 384);
-                }
-                return $signature;
-            case 'sodium_crypto':
-                if (!function_exists('sodium_crypto_sign_detached')) {
-                    throw new DomainException('libsodium is not available');
-                }
-                try {
-                    // The last non-empty line is used as the key.
-                    $lines = array_filter(explode("\n", $key));
-                    $key = base64_decode(end($lines));
-                    return sodium_crypto_sign_detached($msg, $key);
-                } catch (Exception $e) {
-                    throw new DomainException($e->getMessage(), 0, $e);
-                }
-        }
-    }
-
-    /**
-     * Verify a signature with the message, key and method. Not all methods
-     * are symmetric, so we must have a separate verify and sign method.
-     *
-     * @param string            $msg        The original message (header and body)
-     * @param string            $signature  The original signature
-     * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
-     * @param string            $alg        The algorithm
-     *
-     * @return bool
-     *
-     * @throws DomainException Invalid Algorithm, bad key, or OpenSSL failure
-     */
-    private static function verify($msg, $signature, $key, $alg)
-    {
-        if (empty(static::$supported_algs[$alg])) {
-            throw new DomainException('Algorithm not supported');
-        }
-
-        list($function, $algorithm) = static::$supported_algs[$alg];
-        switch ($function) {
-            case 'openssl':
-                $success = \openssl_verify($msg, $signature, $key, $algorithm);
-                if ($success === 1) {
-                    return true;
-                } elseif ($success === 0) {
-                    return false;
-                }
-                // returns 1 on success, 0 on failure, -1 on error.
-                throw new DomainException(
-                    'OpenSSL error: ' . \openssl_error_string()
-                );
-            case 'sodium_crypto':
-              if (!function_exists('sodium_crypto_sign_verify_detached')) {
-                  throw new DomainException('libsodium is not available');
-              }
-              try {
-                  // The last non-empty line is used as the key.
-                  $lines = array_filter(explode("\n", $key));
-                  $key = base64_decode(end($lines));
-                  return sodium_crypto_sign_verify_detached($signature, $msg, $key);
-              } catch (Exception $e) {
-                  throw new DomainException($e->getMessage(), 0, $e);
-              }
-            case 'hash_hmac':
-            default:
-                $hash = \hash_hmac($algorithm, $msg, $key, true);
-                if (\function_exists('hash_equals')) {
-                    return \hash_equals($signature, $hash);
-                }
-                $len = \min(static::safeStrlen($signature), static::safeStrlen($hash));
-
-                $status = 0;
-                for ($i = 0; $i < $len; $i++) {
-                    $status |= (\ord($signature[$i]) ^ \ord($hash[$i]));
-                }
-                $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash));
-
-                return ($status === 0);
-        }
-    }
-
-    /**
-     * Decode a JSON string into a PHP object.
-     *
-     * @param string $input JSON string
-     *
-     * @return object Object representation of JSON string
-     *
-     * @throws DomainException Provided string was invalid JSON
-     */
-    public static function jsonDecode($input)
-    {
-        if (\version_compare(PHP_VERSION, '5.4.0', '>=') && !(\defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
-            /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you
-             * to specify that large ints (like Steam Transaction IDs) should be treated as
-             * strings, rather than the PHP default behaviour of converting them to floats.
-             */
-            $obj = \json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
-        } else {
-            /** Not all servers will support that, however, so for older versions we must
-             * manually detect large ints in the JSON string and quote them (thus converting
-             *them to strings) before decoding, hence the preg_replace() call.
-             */
-            $max_int_length = \strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = \preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
-            $obj = \json_decode($json_without_bigints);
-        }
-
-        if ($errno = \json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($obj === null && $input !== 'null') {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $obj;
-    }
-
-    /**
-     * Encode a PHP object into a JSON string.
-     *
-     * @param object|array $input A PHP object or array
-     *
-     * @return string JSON representation of the PHP object or array
-     *
-     * @throws DomainException Provided object could not be encoded to valid JSON
-     */
-    public static function jsonEncode($input)
-    {
-        $json = \json_encode($input);
-        if ($errno = \json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($json === 'null' && $input !== null) {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $json;
-    }
-
-    /**
-     * Decode a string with URL-safe Base64.
-     *
-     * @param string $input A Base64 encoded string
-     *
-     * @return string A decoded string
-     */
-    public static function urlsafeB64Decode($input)
-    {
-        $remainder = \strlen($input) % 4;
-        if ($remainder) {
-            $padlen = 4 - $remainder;
-            $input .= \str_repeat('=', $padlen);
-        }
-        return \base64_decode(\strtr($input, '-_', '+/'));
-    }
-
-    /**
-     * Encode a string with URL-safe Base64.
-     *
-     * @param string $input The string you want encoded
-     *
-     * @return string The base64 encode of what you passed in
-     */
-    public static function urlsafeB64Encode($input)
-    {
-        return \str_replace('=', '', \strtr(\base64_encode($input), '+/', '-_'));
-    }
-
-    /**
-     * Helper method to create a JSON error.
-     *
-     * @param int $errno An error number from json_last_error()
-     *
-     * @return void
-     */
-    private static function handleJsonError($errno)
-    {
-        $messages = array(
-            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-            JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
-            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters' //PHP >= 5.3.3
-        );
-        throw new DomainException(
-            isset($messages[$errno])
-            ? $messages[$errno]
-            : 'Unknown JSON error: ' . $errno
-        );
-    }
-
-    /**
-     * Get the number of bytes in cryptographic strings.
-     *
-     * @param string $str
-     *
-     * @return int
-     */
-    private static function safeStrlen($str)
-    {
-        if (\function_exists('mb_strlen')) {
-            return \mb_strlen($str, '8bit');
-        }
-        return \strlen($str);
-    }
-
-    /**
-     * Convert an ECDSA signature to an ASN.1 DER sequence
-     *
-     * @param   string $sig The ECDSA signature to convert
-     * @return  string The encoded DER object
-     */
-    private static function signatureToDER($sig)
-    {
-        // Separate the signature into r-value and s-value
-        list($r, $s) = \str_split($sig, (int) (\strlen($sig) / 2));
-
-        // Trim leading zeros
-        $r = \ltrim($r, "\x00");
-        $s = \ltrim($s, "\x00");
-
-        // Convert r-value and s-value from unsigned big-endian integers to
-        // signed two's complement
-        if (\ord($r[0]) > 0x7f) {
-            $r = "\x00" . $r;
-        }
-        if (\ord($s[0]) > 0x7f) {
-            $s = "\x00" . $s;
-        }
-
-        return self::encodeDER(
-            self::ASN1_SEQUENCE,
-            self::encodeDER(self::ASN1_INTEGER, $r) .
-            self::encodeDER(self::ASN1_INTEGER, $s)
-        );
-    }
-
-    /**
-     * Encodes a value into a DER object.
-     *
-     * @param   int     $type DER tag
-     * @param   string  $value the value to encode
-     * @return  string  the encoded object
-     */
-    private static function encodeDER($type, $value)
-    {
-        $tag_header = 0;
-        if ($type === self::ASN1_SEQUENCE) {
-            $tag_header |= 0x20;
-        }
-
-        // Type
-        $der = \chr($tag_header | $type);
-
-        // Length
-        $der .= \chr(\strlen($value));
-
-        return $der . $value;
-    }
-
-    /**
-     * Encodes signature from a DER object.
-     *
-     * @param   string  $der binary signature in DER format
-     * @param   int     $keySize the number of bits in the key
-     * @return  string  the signature
-     */
-    private static function signatureFromDER($der, $keySize)
-    {
-        // OpenSSL returns the ECDSA signatures as a binary ASN.1 DER SEQUENCE
-        list($offset, $_) = self::readDER($der);
-        list($offset, $r) = self::readDER($der, $offset);
-        list($offset, $s) = self::readDER($der, $offset);
-
-        // Convert r-value and s-value from signed two's compliment to unsigned
-        // big-endian integers
-        $r = \ltrim($r, "\x00");
-        $s = \ltrim($s, "\x00");
-
-        // Pad out r and s so that they are $keySize bits long
-        $r = \str_pad($r, $keySize / 8, "\x00", STR_PAD_LEFT);
-        $s = \str_pad($s, $keySize / 8, "\x00", STR_PAD_LEFT);
-
-        return $r . $s;
-    }
-
-    /**
-     * Reads binary DER-encoded data and decodes into a single object
-     *
-     * @param string $der the binary data in DER format
-     * @param int $offset the offset of the data stream containing the object
-     * to decode
-     * @return array [$offset, $data] the new offset and the decoded object
-     */
-    private static function readDER($der, $offset = 0)
-    {
-        $pos = $offset;
-        $size = \strlen($der);
-        $constructed = (\ord($der[$pos]) >> 5) & 0x01;
-        $type = \ord($der[$pos++]) & 0x1f;
-
-        // Length
-        $len = \ord($der[$pos++]);
-        if ($len & 0x80) {
-            $n = $len & 0x1f;
-            $len = 0;
-            while ($n-- && $pos < $size) {
-                $len = ($len << 8) | \ord($der[$pos++]);
-            }
-        }
-
-        // Value
-        if ($type == self::ASN1_BIT_STRING) {
-            $pos++; // Skip the first contents octet (padding indicator)
-            $data = \substr($der, $pos, $len - 1);
-            $pos += $len - 1;
-        } elseif (!$constructed) {
-            $data = \substr($der, $pos, $len);
-            $pos += $len;
-        } else {
-            $data = null;
-        }
-
-        return array($pos, $data);
-    }
-}
diff --git a/vendor/mf2/mf2/.editorconfig b/vendor/mf2/mf2/.editorconfig
deleted file mode 100644
index a4e137e..0000000
--- a/vendor/mf2/mf2/.editorconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-[*]
-indent_style = tab
-indent_size = 2
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-charset = utf-8
diff --git a/vendor/mf2/mf2/.gitignore b/vendor/mf2/mf2/.gitignore
deleted file mode 100644
index cb8f3db..0000000
--- a/vendor/mf2/mf2/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.DS_Store
-/nbproject
-composer.phar
-/vendor/
-/tmp
-.idea/
-/bin/test
diff --git a/vendor/mf2/mf2/.travis.yml b/vendor/mf2/mf2/.travis.yml
deleted file mode 100644
index 799c58e..0000000
--- a/vendor/mf2/mf2/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - nightly
-env:
-  - COMPOSER_REQUIRE=""
-  - COMPOSER_REQUIRE="composer require masterminds/html5"
-install:
-  - $COMPOSER_REQUIRE
-before_script: composer install
diff --git a/vendor/mf2/mf2/LICENSE.md b/vendor/mf2/mf2/LICENSE.md
deleted file mode 100644
index 1e4777b..0000000
--- a/vendor/mf2/mf2/LICENSE.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Creative Commons Legal Code
-
-## CC0 1.0 Universal
-
-http://creativecommons.org/publicdomain/zero/1.0
-
-Official translations of this legal tool are available> CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
-
-### _Statement of Purpose_
-
-The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
-
-**1. Copyright and Related Rights.** A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
-
-1.  the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
-2.  moral rights retained by the original author(s) and/or performer(s);
-3.  publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
-4.  rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
-5.  rights protecting the extraction, dissemination, use and reuse of data in a Work;
-6.  database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
-7.  other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
-
-**2. Waiver.** To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
-
-**3. Public License Fallback.** Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
-
-**4. Limitations and Disclaimers.**
-
-1.  No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
-2.  Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
-3.  Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
-4.  Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/vendor/mf2/mf2/Mf2/Parser.php b/vendor/mf2/mf2/Mf2/Parser.php
deleted file mode 100644
index fe5590b..0000000
--- a/vendor/mf2/mf2/Mf2/Parser.php
+++ /dev/null
@@ -1,2313 +0,0 @@
-<?php
-
-namespace Mf2;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-use DOMNode;
-use DOMNodeList;
-use Exception;
-use SplObjectStorage;
-use stdClass;
-
-/**
- * Parse Microformats2
- *
- * Functional shortcut for the commonest cases of parsing microformats2 from HTML.
- *
- * Example usage:
- *
- *     use Mf2;
- *     $output = Mf2\parse('<span class="h-card">Barnaby Walters</span>');
- *     echo json_encode($output, JSON_PRETTY_PRINT);
- *
- * Produces:
- *
- *     {
- *      "items": [
- *       {
- *        "type": ["h-card"],
- *        "properties": {
- *         "name": ["Barnaby Walters"]
- *        }
- *       }
- *      ],
- *      "rels": {}
- *     }
- *
- * @param string|DOMDocument $input The HTML string or DOMDocument object to parse
- * @param string $url The URL the input document was found at, for relative URL resolution
- * @param bool $convertClassic whether or not to convert classic microformats
- * @return array Canonical MF2 array structure
- */
-function parse($input, $url = null, $convertClassic = true) {
-	$parser = new Parser($input, $url);
-	return $parser->parse($convertClassic);
-}
-
-/**
- * Fetch microformats2
- *
- * Given a URL, fetches it (following up to 5 redirects) and, if the content-type appears to be HTML, returns the parsed
- * microformats2 array structure.
- *
- * Not that even if the response code was a 4XX or 5XX error, if the content-type is HTML-like then it will be parsed
- * all the same, as there are legitimate cases where error pages might contain useful microformats (for example a deleted
- * h-entry resulting in a 410 Gone page with a stub h-entry explaining the reason for deletion). Look in $curlInfo['http_code']
- * for the actual value.
- *
- * @param string $url The URL to fetch
- * @param bool $convertClassic (optional, default true) whether or not to convert classic microformats
- * @param &array $curlInfo (optional) the results of curl_getinfo will be placed in this variable for debugging
- * @return array|null canonical microformats2 array structure on success, null on failure
- */
-function fetch($url, $convertClassic = true, &$curlInfo=null) {
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-	curl_setopt($ch, CURLOPT_HEADER, 0);
-	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-	curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
-	curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-		'Accept: text/html'
-	));
-	$html = curl_exec($ch);
-	$info = $curlInfo = curl_getinfo($ch);
-	curl_close($ch);
-
-	if (strpos(strtolower($info['content_type']), 'html') === false) {
-		// The content was not delivered as HTML, do not attempt to parse it.
-		return null;
-	}
-
-	# ensure the final URL is used to resolve relative URLs
-	$url = $info['url'];
-
-	return parse($html, $url, $convertClassic);
-}
-
-/**
- * Unicode to HTML Entities
- * @param string $input String containing characters to convert into HTML entities
- * @return string
- */
-function unicodeToHtmlEntities($input) {
-	return mb_convert_encoding($input, 'HTML-ENTITIES', mb_detect_encoding($input));
-}
-
-/**
- * Collapse Whitespace
- *
- * Collapses any sequences of whitespace within a string into a single space
- * character.
- *
- * @deprecated since v0.2.3
- * @param string $str
- * @return string
- */
-function collapseWhitespace($str) {
-	return preg_replace('/[\s|\n]+/', ' ', $str);
-}
-
-function unicodeTrim($str) {
-	// this is cheating. TODO: find a better way if this causes any problems
-	$str = str_replace(mb_convert_encoding('&nbsp;', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);
-	$str = preg_replace('/^\s+/', '', $str);
-	return preg_replace('/\s+$/', '', $str);
-}
-
-/**
- * Microformat Name From Class string
- *
- * Given the value of @class, get the relevant mf classnames (e.g. h-card,
- * p-name).
- *
- * @param string $class A space delimited list of classnames
- * @param string $prefix The prefix to look for
- * @return string|array The prefixed name of the first microfomats class found or false
- */
-function mfNamesFromClass($class, $prefix='h-') {
-	$class = str_replace(array(' ', '	', "\n"), ' ', $class);
-	$classes = explode(' ', $class);
-	$classes = preg_grep('#^(h|p|u|dt|e)-([a-z0-9]+-)?[a-z]+(-[a-z]+)*$#', $classes);
-	$matches = array();
-
-	foreach ($classes as $classname) {
-		$compare_classname = ' ' . $classname;
-		$compare_prefix = ' ' . $prefix;
-		if (strstr($compare_classname, $compare_prefix) !== false && ($compare_classname != $compare_prefix)) {
-			$matches[] = ($prefix === 'h-') ? $classname : substr($classname, strlen($prefix));
-		}
-	}
-
-	return $matches;
-}
-
-/**
- * Get Nested µf Property Name From Class
- *
- * Returns all the p-, u-, dt- or e- prefixed classnames it finds in a
- * space-separated string.
- *
- * @param string $class
- * @return array
- */
-function nestedMfPropertyNamesFromClass($class) {
-	$prefixes = array('p-', 'u-', 'dt-', 'e-');
-	$propertyNames = array();
-
-	$class = str_replace(array(' ', '	', "\n"), ' ', $class);
-	foreach (explode(' ', $class) as $classname) {
-		foreach ($prefixes as $prefix) {
-			// Check if $classname is a valid property classname for $prefix.
-			if (mb_substr($classname, 0, mb_strlen($prefix)) == $prefix && $classname != $prefix) {
-				$propertyName = mb_substr($classname, mb_strlen($prefix));
-				$propertyNames[$propertyName][] = $prefix;
-			}
-		}
-	}
-
-	foreach ($propertyNames as $property => $prefixes) {
-		$propertyNames[$property] = array_unique($prefixes);
-	}
-
-	return $propertyNames;
-}
-
-/**
- * Wraps mfNamesFromClass to handle an element as input (common)
- *
- * @param DOMElement $e The element to get the classname for
- * @param string $prefix The prefix to look for
- * @return mixed See return value of mf2\Parser::mfNameFromClass()
- */
-function mfNamesFromElement(\DOMElement $e, $prefix = 'h-') {
-	$class = $e->getAttribute('class');
-	return mfNamesFromClass($class, $prefix);
-}
-
-/**
- * Wraps nestedMfPropertyNamesFromClass to handle an element as input
- */
-function nestedMfPropertyNamesFromElement(\DOMElement $e) {
-	$class = $e->getAttribute('class');
-	return nestedMfPropertyNamesFromClass($class);
-}
-
-/**
- * Converts various time formats to HH:MM
- * @param string $time The time to convert
- * @return string
- */
-function convertTimeFormat($time) {
-	$hh = $mm = $ss = '';
-	preg_match('/(\d{1,2}):?(\d{2})?:?(\d{2})?(a\.?m\.?|p\.?m\.?)?/i', $time, $matches);
-
-	// If no am/pm is specified:
-	if (empty($matches[4])) {
-		return $time;
-	} else {
-		// Otherwise, am/pm is specified.
-		$meridiem = strtolower(str_replace('.', '', $matches[4]));
-
-		// Hours.
-		$hh = $matches[1];
-
-		// Add 12 to hours if pm applies.
-		if ($meridiem == 'pm' && ($hh < 12)) {
-			$hh += 12;
-		}
-
-		$hh = str_pad($hh, 2, '0', STR_PAD_LEFT);
-
-		// Minutes.
-		$mm = (empty($matches[2]) ) ? '00' : $matches[2];
-
-		// Seconds, only if supplied.
-		if (!empty($matches[3])) {
-			$ss = $matches[3];
-		}
-
-		if (empty($ss)) {
-			return sprintf('%s:%s', $hh, $mm);
-		}
-		else {
-			return sprintf('%s:%s:%s', $hh, $mm, $ss);
-		}
-	}
-}
-
-/**
- * Normalize an ordinal date to YYYY-MM-DD
- * This function should only be called after validating the $dtValue
- * matches regex \d{4}-\d{2}
- * @param string $dtValue
- * @return string
- */
-function normalizeOrdinalDate($dtValue) {
-	list($year, $day) = explode('-', $dtValue, 2);
-	$day = intval($day);
-	if ($day < 367 && $day > 0) {
-		$date = \DateTime::createFromFormat('Y-z', $dtValue);
-		$date->modify('-1 day'); # 'z' format is zero-based so need to adjust
-		if ($date->format('Y') === $year) {
-			return $date->format('Y-m-d');
-		}
-	}
-	return '';
-}
-
-/**
- * If a date value has a timezone offset, normalize it.
- * @param string $dtValue
- * @return string isolated, normalized TZ offset for implied TZ for other dt- properties
- */
-function normalizeTimezoneOffset(&$dtValue) {
-	preg_match('/Z|[+-]\d{1,2}:?(\d{2})?$/i', $dtValue, $matches);
-
-	if (empty($matches)) {
-		return null;
-	}
-
-	$timezoneOffset = null;
-
-	if ( $matches[0] != 'Z' ) {
-		$timezoneString = str_replace(':', '', $matches[0]);
-		$plus_minus = substr($timezoneString, 0, 1);
-		$timezoneOffset = substr($timezoneString, 1);
-		if ( strlen($timezoneOffset) <= 2 ) {
-			$timezoneOffset .= '00';
-		}
-		$timezoneOffset = str_pad($timezoneOffset, 4, 0, STR_PAD_LEFT);
-		$timezoneOffset = $plus_minus . $timezoneOffset;
-		$dtValue = preg_replace('/Z?[+-]\d{1,2}:?(\d{2})?$/i', $timezoneOffset, $dtValue);
-	}
-
-	return $timezoneOffset;
-}
-
-function applySrcsetUrlTransformation($srcset, $transformation) {
-	return implode(', ', array_filter(array_map(function ($srcsetPart) use ($transformation) {
-		$parts = explode(" \t\n\r\0\x0B", trim($srcsetPart), 2);
-		$parts[0] = rtrim($parts[0]);
-
-		if (empty($parts[0])) { return false; }
-
-		$parts[0] = call_user_func($transformation, $parts[0]);
-
-		return $parts[0] . (empty($parts[1]) ? '' : ' ' . $parts[1]);
-	}, explode(',', trim($srcset)))));
-}
-
-/**
- * Microformats2 Parser
- *
- * A class which holds state for parsing microformats2 from HTML.
- *
- * Example usage:
- *
- *     use Mf2;
- *     $parser = new Mf2\Parser('<p class="h-card">Barnaby Walters</p>');
- *     $output = $parser->parse();
- */
-class Parser {
-	/** @var string The baseurl (if any) to use for this parse */
-	public $baseurl;
-
-	/** @var DOMXPath object which can be used to query over any fragment*/
-	public $xpath;
-
-	/** @var DOMDocument */
-	public $doc;
-
-	/** @var SplObjectStorage */
-	protected $parsed;
-
-	/**
-	 * @var bool
-	 */
-	public $jsonMode;
-
-	/** @var boolean Whether to include experimental language parsing in the result */
-	public $lang = false;
-
-	/** @var bool Whether to include alternates object (dropped from spec in favor of rel-urls) */
-	public $enableAlternates = false;
-
-	/**
-	 * Elements upgraded to mf2 during backcompat
-	 * @var SplObjectStorage
-	 */
-	protected $upgraded;
-
-	/**
-	 * Whether to convert classic microformats
-	 * @var bool
-	 */
-	public $convertClassic;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DOMDocument|string $input The data to parse. A string of HTML or a DOMDocument
-	 * @param string $url The URL of the parsed document, for relative URL resolution
-	 * @param boolean $jsonMode Whether or not to use a stdClass instance for an empty `rels` dictionary. This breaks PHP looping over rels, but allows the output to be correctly serialized as JSON.
-	 */
-	public function __construct($input, $url = null, $jsonMode = false) {
-		libxml_use_internal_errors(true);
-		if (is_string($input)) {
-			if (class_exists('Masterminds\\HTML5')) {
-					$doc = new \Masterminds\HTML5(array('disable_html_ns' => true));
-					$doc = $doc->loadHTML($input);
-			} else {
-				$doc = new DOMDocument();
-				@$doc->loadHTML(unicodeToHtmlEntities($input));
-			}
-		} elseif (is_a($input, 'DOMDocument')) {
-			$doc = clone $input;
-		} else {
-			$doc = new DOMDocument();
-			@$doc->loadHTML('');
-		}
-
-		$this->xpath = new DOMXPath($doc);
-
-		$baseurl = $url;
-		foreach ($this->xpath->query('//base[@href]') as $base) {
-			$baseElementUrl = $base->getAttribute('href');
-
-			if (parse_url($baseElementUrl, PHP_URL_SCHEME) === null) {
-				/* The base element URL is relative to the document URL.
-				 *
-				 * :/
-				 *
-				 * Perhaps the author was high? */
-
-				$baseurl = resolveUrl($url, $baseElementUrl);
-			} else {
-				$baseurl = $baseElementUrl;
-			}
-			break;
-		}
-
-		// Ignore <template> elements as per the HTML5 spec
-		foreach ($this->xpath->query('//template') as $templateEl) {
-			$templateEl->parentNode->removeChild($templateEl);
-		}
-
-		$this->baseurl = $baseurl;
-		$this->doc = $doc;
-		$this->parsed = new SplObjectStorage();
-		$this->upgraded = new SplObjectStorage();
-		$this->jsonMode = $jsonMode;
-	}
-
-	private function elementPrefixParsed(\DOMElement $e, $prefix) {
-		if (!$this->parsed->contains($e))
-			$this->parsed->attach($e, array());
-
-		$prefixes = $this->parsed[$e];
-		$prefixes[] = $prefix;
-		$this->parsed[$e] = $prefixes;
-	}
-
-	/**
-	 * Determine if the element has already been parsed
-	 * @param DOMElement $e
-	 * @param string $prefix
-	 * @return bool
-	 */
-	private function isElementParsed(\DOMElement $e, $prefix) {
-		if (!$this->parsed->contains($e)) {
-			return false;
-		}
-
-		$prefixes = $this->parsed[$e];
-
-		if (!in_array($prefix, $prefixes)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Determine if the element's specified property has already been upgraded during backcompat
-	 * @param DOMElement $el
-	 * @param string $property
-	 * @return bool
-	 */
-	private function isElementUpgraded(\DOMElement $el, $property) {
-		if ( $this->upgraded->contains($el) ) {
-			if ( in_array($property, $this->upgraded[$el]) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private function resolveChildUrls(DOMElement $el) {
-		$hyperlinkChildren = $this->xpath->query('.//*[@src or @href or @data]', $el);
-
-		foreach ($hyperlinkChildren as $child) {
-			if ($child->hasAttribute('href'))
-				$child->setAttribute('href', $this->resolveUrl($child->getAttribute('href')));
-			if ($child->hasAttribute('src'))
-				$child->setAttribute('src', $this->resolveUrl($child->getAttribute('src')));
-			if ($child->hasAttribute('srcset'))
-				$child->setAttribute('srcset', applySrcsetUrlTransformation($child->getAttribute('href'), array($this, 'resolveUrl')));
-			if ($child->hasAttribute('data'))
-				$child->setAttribute('data', $this->resolveUrl($child->getAttribute('data')));
-		}
-	}
-
-	/**
-	 * The following two methods implements plain text parsing.
-	 * @param DOMElement $element
-	 * @param bool $implied
-	 * @see https://wiki.zegnat.net/media/textparsing.html
-	 **/
-	public function textContent(DOMElement $element, $implied=false)
-	{
-				return preg_replace(
-						'/(^[\t\n\f\r ]+| +(?=\n)|(?<=\n) +| +(?= )|[\t\n\f\r ]+$)/',
-						'',
-						$this->elementToString($element, $implied)
-				);
-	}
-	private function elementToString(DOMElement $input, $implied=false)
-	{
-			$output = '';
-			foreach ($input->childNodes as $child) {
-					if ($child->nodeType === XML_TEXT_NODE) {
-							$output .= str_replace(array("\t", "\n", "\r") , ' ', $child->textContent);
-					} else if ($child->nodeType === XML_ELEMENT_NODE) {
-							$tagName = strtoupper($child->tagName);
-							if (in_array($tagName, array('SCRIPT', 'STYLE'))) {
-									continue;
-							} else if ($tagName === 'IMG') {
-									if ($child->hasAttribute('alt')) {
-											$output .= ' ' . trim($child->getAttribute('alt'), "\t\n\f\r ") . ' ';
-									} else if (!$implied && $child->hasAttribute('src')) {
-											$output .= ' ' . $this->resolveUrl(trim($child->getAttribute('src'), "\t\n\f\r ")) . ' ';
-									}
-							} else if ($tagName === 'BR') {
-									$output .= "\n";
-							} else if ($tagName === 'P') {
-									$output .= "\n" . $this->elementToString($child);
-							} else {
-									$output .= $this->elementToString($child);
-							}
-					}
-			}
-			return $output;
-	}
-
-	/**
-	 * This method parses the language of an element
-	 * @param DOMElement $el
-	 * @access public
-	 * @return string
-	 */
-	public function language(DOMElement $el)
-	{
-		// element has a lang attribute; use it
-		if ($el->hasAttribute('lang')) {
-			return unicodeTrim($el->getAttribute('lang'));
-		}
-
-		if ($el->tagName == 'html') {
-			// we're at the <html> element and no lang; check <meta> http-equiv Content-Language
-			foreach ( $this->xpath->query('.//meta[@http-equiv]') as $node )
-			{
-				if ($node->hasAttribute('http-equiv') && $node->hasAttribute('content') && strtolower($node->getAttribute('http-equiv')) == 'content-language') {
-					return unicodeTrim($node->getAttribute('content'));
-				}
-			}
-		} elseif ($el->parentNode instanceof DOMElement) {
-			// check the parent node
-			return $this->language($el->parentNode);
-		}
-
-		return '';
-	} # end method language()
-
-	// TODO: figure out if this has problems with sms: and geo: URLs
-	public function resolveUrl($url) {
-		// If the URL is seriously malformed it’s probably beyond the scope of this
-		// parser to try to do anything with it.
-		if (parse_url($url) === false) {
-			return $url;
-		}
-
-		// per issue #40 valid URLs could have a space on either side
-		$url = trim($url);
-
-		$scheme = parse_url($url, PHP_URL_SCHEME);
-
-		if (empty($scheme) and !empty($this->baseurl)) {
-			return resolveUrl($this->baseurl, $url);
-		} else {
-			return $url;
-		}
-	}
-
-	// Parsing Functions
-
-	/**
-	 * Parse value-class/value-title on an element, joining with $separator if
-	 * there are multiple.
-	 *
-	 * @param \DOMElement $e
-	 * @param string $separator = '' if multiple value-title elements, join with this string
-	 * @return string|null the parsed value or null if value-class or -title aren’t in use
-	 */
-	public function parseValueClassTitle(\DOMElement $e, $separator = '') {
-		$valueClassElements = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value ")]', $e);
-
-		if ($valueClassElements->length !== 0) {
-			// Process value-class stuff
-			$val = '';
-			foreach ($valueClassElements as $el) {
-				$val .= $this->textContent($el);
-			}
-
-			return unicodeTrim($val);
-		}
-
-		$valueTitleElements = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value-title ")]', $e);
-
-		if ($valueTitleElements->length !== 0) {
-			// Process value-title stuff
-			$val = '';
-			foreach ($valueTitleElements as $el) {
-				$val .= $el->getAttribute('title');
-			}
-
-			return unicodeTrim($val);
-		}
-
-		// No value-title or -class in this element
-		return null;
-	}
-
-	/**
-	 * Given an element with class="p-*", get its value
-	 *
-	 * @param DOMElement $p The element to parse
-	 * @return string The plaintext value of $p, dependant on type
-	 * @todo Make this adhere to value-class
-	 */
-	public function parseP(\DOMElement $p) {
-		$classTitle = $this->parseValueClassTitle($p, ' ');
-
-		if ($classTitle !== null) {
-			return $classTitle;
-		}
-
-		$this->resolveChildUrls($p);
-
-		if ($p->tagName == 'img' and $p->hasAttribute('alt')) {
-			$pValue = $p->getAttribute('alt');
-		} elseif ($p->tagName == 'area' and $p->hasAttribute('alt')) {
-			$pValue = $p->getAttribute('alt');
-		} elseif (($p->tagName == 'abbr' or $p->tagName == 'link') and $p->hasAttribute('title')) {
-			$pValue = $p->getAttribute('title');
-		} elseif (in_array($p->tagName, array('data', 'input')) and $p->hasAttribute('value')) {
-			$pValue = $p->getAttribute('value');
-		} else {
-			$pValue = $this->textContent($p);
-		}
-
-		return $pValue;
-	}
-
-	/**
-	 * Given an element with class="u-*", get the value of the URL
-	 *
-	 * @param DOMElement $u The element to parse
-	 * @return string The plaintext value of $u, dependant on type
-	 * @todo make this adhere to value-class
-	 */
-	public function parseU(\DOMElement $u) {
-		if (($u->tagName == 'a' or $u->tagName == 'area' or $u->tagName == 'link') and $u->hasAttribute('href')) {
-			$uValue = $u->getAttribute('href');
-		} elseif (in_array($u->tagName, array('img', 'audio', 'video', 'source')) and $u->hasAttribute('src')) {
-			$uValue = $u->getAttribute('src');
-		} elseif ($u->tagName == 'video' and !$u->hasAttribute('src') and $u->hasAttribute('poster')) {
-			$uValue = $u->getAttribute('poster');
-		} elseif ($u->tagName == 'object' and $u->hasAttribute('data')) {
-			$uValue = $u->getAttribute('data');
-		} elseif (($classTitle = $this->parseValueClassTitle($u)) !== null) {
-				$uValue = $classTitle;
-		} elseif (($u->tagName == 'abbr' or $u->tagName == 'link') and $u->hasAttribute('title')) {
-			$uValue = $u->getAttribute('title');
-		} elseif (in_array($u->tagName, array('data', 'input')) and $u->hasAttribute('value')) {
-			$uValue = $u->getAttribute('value');
-		} else {
-			$uValue = $this->textContent($u);
-		}
-				return $this->resolveUrl($uValue);
-	}
-
-	/**
-	 * Given an element with class="dt-*", get the value of the datetime as a php date object
-	 *
-	 * @param DOMElement $dt The element to parse
-	 * @param array $dates Array of dates processed so far
-	 * @param string $impliedTimezone
-	 * @return string The datetime string found
-	 */
-	public function parseDT(\DOMElement $dt, &$dates = array(), &$impliedTimezone = null) {
-		// Check for value-class pattern
-		$valueClassChildren = $this->xpath->query('./*[contains(concat(" ", @class, " "), " value ") or contains(concat(" ", @class, " "), " value-title ")]', $dt);
-		$dtValue = false;
-
-		if ($valueClassChildren->length > 0) {
-			// They’re using value-class
-			$dateParts = array();
-
-			foreach ($valueClassChildren as $e) {
-				if (strstr(' ' . $e->getAttribute('class') . ' ', ' value-title ')) {
-					$title = $e->getAttribute('title');
-					if (!empty($title)) {
-						$dateParts[] = $title;
-					}
-				}
-				elseif ($e->tagName == 'img' or $e->tagName == 'area') {
-					// Use @alt
-					$alt = $e->getAttribute('alt');
-					if (!empty($alt)) {
-						$dateParts[] = $alt;
-					}
-				}
-				elseif ($e->tagName == 'data') {
-					// Use @value, otherwise innertext
-					$value = $e->hasAttribute('value') ? $e->getAttribute('value') : unicodeTrim($e->nodeValue);
-					if (!empty($value)) {
-						$dateParts[] = $value;
-					}
-				}
-				elseif ($e->tagName == 'abbr') {
-					// Use @title, otherwise innertext
-					$title = $e->hasAttribute('title') ? $e->getAttribute('title') : unicodeTrim($e->nodeValue);
-					if (!empty($title)) {
-						$dateParts[] = $title;
-					}
-				}
-				elseif ($e->tagName == 'del' or $e->tagName == 'ins' or $e->tagName == 'time') {
-					// Use @datetime if available, otherwise innertext
-					$dtAttr = ($e->hasAttribute('datetime')) ? $e->getAttribute('datetime') : unicodeTrim($e->nodeValue);
-					if (!empty($dtAttr)) {
-						$dateParts[] = $dtAttr;
-					}
-				}
-				else {
-					if (!empty($e->nodeValue)) {
-						$dateParts[] = unicodeTrim($e->nodeValue);
-					}
-				}
-			}
-
-			// Look through dateParts
-			$datePart = '';
-			$timePart = '';
-			$timezonePart = '';
-			foreach ($dateParts as $part) {
-				// Is this part a full ISO8601 datetime?
-				if (preg_match('/^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}(:\d{2})?(Z|[+-]\d{2}:?\d{2})?$/', $part)) {
-					// Break completely, we’ve got our value.
-					$dtValue = $part;
-					break;
-				} else {
-					// Is the current part a valid time(+TZ?) AND no other time representation has been found?
-					if ((preg_match('/^\d{1,2}:\d{2}(:\d{2})?(Z|[+-]\d{1,2}:?\d{2})?$/', $part) or preg_match('/^\d{1,2}(:\d{2})?(:\d{2})?[ap]\.?m\.?$/i', $part)) and empty($timePart)) {
-						$timePart = $part;
-
-						$timezoneOffset = normalizeTimezoneOffset($timePart);
-						if (!$impliedTimezone && $timezoneOffset) {
-							$impliedTimezone = $timezoneOffset;
-						}
-					// Is the current part a valid date AND no other date representation has been found?
-					} elseif (preg_match('/^\d{4}-\d{2}-\d{2}$/', $part) and empty($datePart)) {
-						$datePart = $part;
-					// Is the current part a valid ordinal date AND no other date representation has been found?
-					} elseif (preg_match('/^\d{4}-\d{3}$/', $part) and empty($datePart)) {
-						$datePart = normalizeOrdinalDate($part);
-					// Is the current part a valid timezone offset AND no other timezone part has been found?
-					} elseif (preg_match('/^(Z|[+-]\d{1,2}:?(\d{2})?)$/', $part) and empty($timezonePart)) {
-						$timezonePart = $part;
-
-						$timezoneOffset = normalizeTimezoneOffset($timezonePart);
-						if (!$impliedTimezone && $timezoneOffset) {
-							$impliedTimezone = $timezoneOffset;
-						}
-					// Current part already represented by other VCP parts; do nothing with it
-					} else {
-						continue;
-					}
-
-					if ( !empty($datePart) && !in_array($datePart, $dates) ) {
-						$dates[] = $datePart;
-					}
-
-					if (!empty($timezonePart) && !empty($timePart)) {
-						$timePart .= $timezonePart;
-					}
-
-					$dtValue = '';
-
-					if ( empty($datePart) && !empty($timePart) ) {
-						$timePart = convertTimeFormat($timePart);
-						$dtValue = unicodeTrim($timePart);
-					}
-					else if ( !empty($datePart) && empty($timePart) ) {
-						$dtValue = rtrim($datePart, 'T');
-					}
-					else {
-						$timePart = convertTimeFormat($timePart);
-						$dtValue = rtrim($datePart, 'T') . ' ' . unicodeTrim($timePart);
-					}
-				}
-			}
-		} else {
-			// Not using value-class (phew).
-			if ($dt->tagName == 'img' or $dt->tagName == 'area') {
-				// Use @alt
-				// Is it an entire dt?
-				$alt = $dt->getAttribute('alt');
-				if (!empty($alt)) {
-					$dtValue = $alt;
-				}
-			} elseif (in_array($dt->tagName, array('data'))) {
-				// Use @value, otherwise innertext
-				// Is it an entire dt?
-				$value = $dt->getAttribute('value');
-				if (!empty($value)) {
-					$dtValue = $value;
-				}
-				else {
-					$dtValue = $this->textContent($dt);
-				}
-			} elseif ($dt->tagName == 'abbr') {
-				// Use @title, otherwise innertext
-				// Is it an entire dt?
-				$title = $dt->getAttribute('title');
-				if (!empty($title)) {
-					$dtValue = $title;
-				}
-				else {
-					$dtValue = $this->textContent($dt);
-				}
-			} elseif ($dt->tagName == 'del' or $dt->tagName == 'ins' or $dt->tagName == 'time') {
-				// Use @datetime if available, otherwise innertext
-				// Is it an entire dt?
-				$dtAttr = $dt->getAttribute('datetime');
-				if (!empty($dtAttr)) {
-					$dtValue = $dtAttr;
-				}
-				else {
-					$dtValue = $this->textContent($dt);
-				}
-
-			} else {
-				$dtValue = $this->textContent($dt);
-			}
-
-			// if the dtValue is not just YYYY-MM-DD
-			if (!preg_match('/^(\d{4}-\d{2}-\d{2})$/', $dtValue)) {
-				// no implied timezone set and dtValue has a TZ offset, use un-normalized TZ offset
-				preg_match('/Z|[+-]\d{1,2}:?(\d{2})?$/i', $dtValue, $matches);
-				if (!$impliedTimezone && !empty($matches[0])) {
-					$impliedTimezone = $matches[0];
-				}
-			}
-
-			$dtValue = unicodeTrim($dtValue);
-
-			// Store the date part so that we can use it when assembling the final timestamp if the next one is missing a date part
-			if (preg_match('/(\d{4}-\d{2}-\d{2})/', $dtValue, $matches)) {
-				$dates[] = $matches[0];
-			}
-		}
-
-		/**
-		 * if $dtValue is only a time and there are recently parsed dates,
-		 * form the full date-time using the most recently parsed dt- value
-		 */
-		if ((preg_match('/^\d{1,2}:\d{2}(:\d{2})?(Z|[+-]\d{2}:?\d{2}?)?$/', $dtValue) or preg_match('/^\d{1,2}(:\d{2})?(:\d{2})?[ap]\.?m\.?$/i', $dtValue)) && !empty($dates)) {
-			$timezoneOffset = normalizeTimezoneOffset($dtValue);
-			if (!$impliedTimezone && $timezoneOffset) {
-				$impliedTimezone = $timezoneOffset;
-			}
-
-			$dtValue = convertTimeFormat($dtValue);
-			$dtValue = end($dates) . ' ' . unicodeTrim($dtValue);
-		}
-
-		return $dtValue;
-	}
-
-	/**
-	 * 	Given the root element of some embedded markup, return a string representing that markup
-	 *
-	 * 	@param DOMElement $e The element to parse
-	 * 	@return string $e’s innerHTML
-	 *
-	 * @todo need to mark this element as e- parsed so it doesn’t get parsed as it’s parent’s e-* too
-	 */
-	public function parseE(\DOMElement $e) {
-		$classTitle = $this->parseValueClassTitle($e);
-
-		if ($classTitle !== null)
-			return $classTitle;
-
-		// Expand relative URLs within children of this element
-		// TODO: as it is this is not relative to only children, make this .// and rerun tests
-		$this->resolveChildUrls($e);
-
-		// Temporarily move all descendants into a separate DocumentFragment.
-		// This way we can DOMDocument::saveHTML on the entire collection at once.
-		// Running DOMDocument::saveHTML per node may add whitespace that isn't in source.
-		// See https://stackoverflow.com/q/38317903
-		$innerNodes = $e->ownerDocument->createDocumentFragment();
-		while ($e->hasChildNodes()) {
-			$innerNodes->appendChild($e->firstChild);
-		}
-		$html = $e->ownerDocument->saveHtml($innerNodes);
-		// Put the nodes back in place.
-		if($innerNodes->hasChildNodes()) {
-			$e->appendChild($innerNodes);
-		}
-
-		$return = array(
-			'html' => unicodeTrim($html),
-			'value' => $this->textContent($e),
-		);
-
-		if($this->lang) {
-			// Language
-			if ( $html_lang = $this->language($e) ) {
-				$return['lang'] = $html_lang;
-			}
-		}
-
-		return $return;
-	}
-
-	private function removeTags(\DOMElement &$e, $tagName) {
-		while(($r = $e->getElementsByTagName($tagName)) && $r->length) {
-			$r->item(0)->parentNode->removeChild($r->item(0));
-		}
-	}
-
-	/**
-	 * Recursively parse microformats
-	 *
-	 * @param DOMElement $e The element to parse
-	 * @param bool $is_backcompat Whether using backcompat parsing or not
-	 * @param bool $has_nested_mf Whether this microformat has a nested microformat
-	 * @return array A representation of the values contained within microformat $e
-	 */
-	public function parseH(\DOMElement $e, $is_backcompat = false, $has_nested_mf = false) {
-		// If it’s already been parsed (e.g. is a child mf), skip
-		if ($this->parsed->contains($e)) {
-			return null;
-		}
-
-		// Get current µf name
-		$mfTypes = mfNamesFromElement($e, 'h-');
-
-		if (!$mfTypes) {
-			return null;
-		}
-
-		// Initalise var to store the representation in
-		$return = array();
-		$children = array();
-		$dates = array();
-		$prefixes = array();
-		$impliedTimezone = null;
-
-		if($e->tagName == 'area') {
-			$coords = $e->getAttribute('coords');
-			$shape = $e->getAttribute('shape');
-		}
-
-		// Handle p-*
-		foreach ($this->xpath->query('.//*[contains(concat(" ", @class) ," p-")]', $e) as $p) {
-			// element is already parsed
-			if ($this->isElementParsed($p, 'p')) {
-				continue;
-			// backcompat parsing and element was not upgraded; skip it
-			} else if ( $is_backcompat && empty($this->upgraded[$p]) ) {
-				$this->elementPrefixParsed($p, 'p');
-				continue;
-			}
-
-			$prefixes[] = 'p-';
-			$pValue = $this->parseP($p);
-
-			// Add the value to the array for it’s p- properties
-			foreach (mfNamesFromElement($p, 'p-') as $propName) {
-				if (!empty($propName)) {
-					$return[$propName][] = $pValue;
-				}
-			}
-
-			// Make sure this sub-mf won’t get parsed as a top level mf
-			$this->elementPrefixParsed($p, 'p');
-		}
-
-		// Handle u-*
-		foreach ($this->xpath->query('.//*[contains(concat(" ",  @class)," u-")]', $e) as $u) {
-			// element is already parsed
-			if ($this->isElementParsed($u, 'u')) {
-				continue;
-			// backcompat parsing and element was not upgraded; skip it
-			} else if ( $is_backcompat && empty($this->upgraded[$u]) ) {
-				$this->elementPrefixParsed($u, 'u');
-				continue;
-			}
-
-			$prefixes[] = 'u-';
-			$uValue = $this->parseU($u);
-
-			// Add the value to the array for it’s property types
-			foreach (mfNamesFromElement($u, 'u-') as $propName) {
-				$return[$propName][] = $uValue;
-			}
-
-			// Make sure this sub-mf won’t get parsed as a top level mf
-			$this->elementPrefixParsed($u, 'u');
-		}
-
-		$temp_dates = array();
-
-		// Handle dt-*
-		foreach ($this->xpath->query('.//*[contains(concat(" ", @class), " dt-")]', $e) as $dt) {
-			// element is already parsed
-			if ($this->isElementParsed($dt, 'dt')) {
-				continue;
-			// backcompat parsing and element was not upgraded; skip it
-			} else if ( $is_backcompat && empty($this->upgraded[$dt]) ) {
-				$this->elementPrefixParsed($dt, 'dt');
-				continue;
-			}
-
-			$prefixes[] = 'dt-';
-			$dtValue = $this->parseDT($dt, $dates, $impliedTimezone);
-
-			if ($dtValue) {
-				// Add the value to the array for dt- properties
-				foreach (mfNamesFromElement($dt, 'dt-') as $propName) {
-					$temp_dates[$propName][] = $dtValue;
-				}
-			}
-			// Make sure this sub-mf won’t get parsed as a top level mf
-			$this->elementPrefixParsed($dt, 'dt');
-		}
-
-		foreach ($temp_dates as $propName => $data) {
-			foreach ( $data as $dtValue ) {
-				// var_dump(preg_match('/[+-]\d{2}(\d{2})?$/i', $dtValue));
-				if ( $impliedTimezone && preg_match('/(Z|[+-]\d{2}:?(\d{2})?)$/i', $dtValue, $matches) == 0 ) {
-					$dtValue .= $impliedTimezone;
-				}
-
-				$return[$propName][] = $dtValue;
-			}
-		}
-
-		// Handle e-*
-		foreach ($this->xpath->query('.//*[contains(concat(" ", @class)," e-")]', $e) as $em) {
-			// element is already parsed
-			if ($this->isElementParsed($em, 'e')) {
-				continue;
-			// backcompat parsing and element was not upgraded; skip it
-			} else if ( $is_backcompat && empty($this->upgraded[$em]) ) {
-				$this->elementPrefixParsed($em, 'e');
-				continue;
-			}
-
-			$prefixes[] = 'e-';
-			$eValue = $this->parseE($em);
-
-			if ($eValue) {
-				// Add the value to the array for e- properties
-				foreach (mfNamesFromElement($em, 'e-') as $propName) {
-					$return[$propName][] = $eValue;
-				}
-			}
-			// Make sure this sub-mf won’t get parsed as a top level mf
-			$this->elementPrefixParsed($em, 'e');
-		}
-
-		// Do we need to imply a name property?
-		// if no explicit "name" property, and no other p-* or e-* properties, and no nested microformats,
-		if (!array_key_exists('name', $return) && !in_array('p-', $prefixes) && !in_array('e-', $prefixes) && !$has_nested_mf && !$is_backcompat) {
-			$name = false;
-			// img.h-x[alt] or area.h-x[alt]
-			if (($e->tagName === 'img' || $e->tagName === 'area') && $e->hasAttribute('alt')) {
-				$name = $e->getAttribute('alt');
-			// abbr.h-x[title]
-			} elseif ($e->tagName === 'abbr' && $e->hasAttribute('title')) {
-				$name = $e->getAttribute('title');
-			} else {
-				$xpaths = array(
-					// .h-x>img:only-child[alt]:not([alt=""]):not[.h-*]
-					'./img[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @alt and string-length(@alt) != 0]',
-					// .h-x>area:only-child[alt]:not([alt=""]):not[.h-*]
-					'./area[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @alt and string-length(@alt) != 0]',
-					// .h-x>abbr:only-child[title]:not([title=""]):not[.h-*]
-					'./abbr[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and @title and string-length(@title) != 0]',
-					// .h-x>:only-child:not[.h-*]>img:only-child[alt]:not([alt=""]):not[.h-*]
-					'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/img[not(contains(concat(" ", @class), " h-")) and @alt and string-length(@alt) != 0]',
-					// .h-x>:only-child:not[.h-*]>area:only-child[alt]:not([alt=""]):not[.h-*]
-					'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/area[not(contains(concat(" ", @class), " h-")) and @alt and string-length(@alt) != 0]',
-					// .h-x>:only-child:not[.h-*]>abbr:only-child[title]:not([title=""]):not[.h-*]
-					'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(*) = 1]/abbr[not(contains(concat(" ", @class), " h-")) and @title and string-length(@title) != 0]'
-				);
-				foreach ($xpaths as $xpath) {
-					$nameElement = $this->xpath->query($xpath, $e);
-					if ($nameElement !== false && $nameElement->length === 1) {
-						$nameElement = $nameElement->item(0);
-						if ($nameElement->tagName === 'img' || $nameElement->tagName === 'area') {
-							$name = $nameElement->getAttribute('alt');
-						} else {
-							$name = $nameElement->getAttribute('title');
-						}
-						break;
-					}
-				}
-			}
-			if ($name === false) {
-				$name = $this->textContent($e, true);
-			}
-			$return['name'][] = unicodeTrim($name);
-		}
-
-		// Check for u-photo
-		if (!array_key_exists('photo', $return) && !$is_backcompat) {
-
-			$photo = $this->parseImpliedPhoto($e);
-
-			if ($photo !== false) {
-				$return['photo'][] = $photo;
-			}
-
-		}
-
-		// Do we need to imply a url property?
-		// if no explicit "url" property, and no other explicit u-* properties, and no nested microformats
-		if (!array_key_exists('url', $return) && !in_array('u-', $prefixes) && !$has_nested_mf && !$is_backcompat) {
-			// a.h-x[href] or area.h-x[href]
-			if (($e->tagName === 'a' || $e->tagName === 'area') && $e->hasAttribute('href')) {
-				$return['url'][] = $this->resolveUrl($e->getAttribute('href'));
-			} else {
-				$xpaths = array(
-					// .h-x>a[href]:only-of-type:not[.h-*]
-					'./a[not(contains(concat(" ", @class), " h-")) and count(../a) = 1 and @href]',
-					// .h-x>area[href]:only-of-type:not[.h-*]
-					'./area[not(contains(concat(" ", @class), " h-")) and count(../area) = 1 and @href]',
-					// .h-x>:only-child:not[.h-*]>a[href]:only-of-type:not[.h-*]
-					'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(a) = 1]/a[not(contains(concat(" ", @class), " h-")) and @href]',
-					// .h-x>:only-child:not[.h-*]>area[href]:only-of-type:not[.h-*]
-					'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(area) = 1]/area[not(contains(concat(" ", @class), " h-")) and @href]'
-				);
-				foreach ($xpaths as $xpath) {
-					$url = $this->xpath->query($xpath, $e);
-					if ($url !== false && $url->length === 1) {
-						$return['url'][] = $this->resolveUrl($url->item(0)->getAttribute('href'));
-						break;
-					}
-				}
-			}
-		}
-
-		// Make sure things are unique and in alphabetical order
-		$mfTypes = array_unique($mfTypes);
-		sort($mfTypes);
-
-		// Properties should be an object when JSON serialised
-		if (empty($return) and $this->jsonMode) {
-			$return = new stdClass();
-		}
-
-		// Phew. Return the final result.
-		$parsed = array(
-			'type' => $mfTypes,
-			'properties' => $return
-		);
-
-		if($this->lang) {
-			// Language
-			if ( $html_lang = $this->language($e) ) {
-				$parsed['lang'] = $html_lang;
-			}
-		}
-
-		if (!empty($shape)) {
-			$parsed['shape'] = $shape;
-		}
-
-		if (!empty($coords)) {
-			$parsed['coords'] = $coords;
-		}
-
-		if (!empty($children)) {
-			$parsed['children'] = array_values(array_filter($children));
-		}
-		return $parsed;
-	}
-
-	/**
-	 * @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
-	 */
-	public function parseImpliedPhoto(\DOMElement $e) {
-
-		// img.h-x[src]
-		if ($e->tagName == 'img') {
-			return $this->resolveUrl($e->getAttribute('src'));
-		}
-
-		// object.h-x[data]
-		if ($e->tagName == 'object' && $e->hasAttribute('data')) {
-			return $this->resolveUrl($e->getAttribute('data'));
-		}
-
-		$xpaths = array(
-			// .h-x>img[src]:only-of-type:not[.h-*]
-			'./img[not(contains(concat(" ", @class), " h-")) and count(../img) = 1 and @src]',
-			// .h-x>object[data]:only-of-type:not[.h-*]
-			'./object[not(contains(concat(" ", @class), " h-")) and count(../object) = 1 and @data]',
-			// .h-x>:only-child:not[.h-*]>img[src]:only-of-type:not[.h-*]
-			'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(img) = 1]/img[not(contains(concat(" ", @class), " h-")) and @src]',
-			// .h-x>:only-child:not[.h-*]>object[data]:only-of-type:not[.h-*]
-			'./*[not(contains(concat(" ", @class), " h-")) and count(../*) = 1 and count(object) = 1]/object[not(contains(concat(" ", @class), " h-")) and @data]',
-		);
-
-		foreach ($xpaths as $path) {
-			$els = $this->xpath->query($path, $e);
-
-			if ($els !== false && $els->length === 1) {
-				$el = $els->item(0);
-				if ($el->tagName == 'img') {
-					return $this->resolveUrl($el->getAttribute('src'));
-				} else if ($el->tagName == 'object') {
-					return $this->resolveUrl($el->getAttribute('data'));
-				}
-			}
-		}
-
-		// no implied photo
-		return false;
-	}
-
-	/**
-	 * Parse rels and alternates
-	 *
-	 * Returns [$rels, $rel_urls, $alternates].
-	 * For $rels and $rel_urls, if they are empty and $this->jsonMode = true, they will be returned as stdClass,
-	 * optimizing for JSON serialization. Otherwise they will be returned as an empty array.
-	 * Note that $alternates is deprecated in the microformats spec in favor of $rel_urls. $alternates only appears
-	 * in parsed results if $this->enableAlternates = true.
-	 * @return array|stdClass
-	 */
-	public function parseRelsAndAlternates() {
-		$rels = array();
-		$rel_urls = array();
-		$alternates = array();
-
-		// Iterate through all a, area and link elements with rel attributes
-		foreach ($this->xpath->query('//a[@rel and @href] | //link[@rel and @href] | //area[@rel and @href]') as $hyperlink) {
-			// Parse the set of rels for the current link
-			$linkRels = array_unique(array_filter(preg_split('/[\t\n\f\r ]/', $hyperlink->getAttribute('rel'))));
-			if (count($linkRels) === 0) {
-				continue;
-			}
-
-			// Resolve the href
-			$href = $this->resolveUrl($hyperlink->getAttribute('href'));
-
-			$rel_attributes = array();
-
-			if ($hyperlink->hasAttribute('media')) {
-				$rel_attributes['media'] = $hyperlink->getAttribute('media');
-			}
-
-			if ($hyperlink->hasAttribute('hreflang')) {
-				$rel_attributes['hreflang'] = $hyperlink->getAttribute('hreflang');
-			}
-
-			if ($hyperlink->hasAttribute('title')) {
-				$rel_attributes['title'] = $hyperlink->getAttribute('title');
-			}
-
-			if ($hyperlink->hasAttribute('type')) {
-				$rel_attributes['type'] = $hyperlink->getAttribute('type');
-			}
-
-			if (strlen($hyperlink->textContent) > 0) {
-				$rel_attributes['text'] = $hyperlink->textContent;
-			}
-
-			if ($this->enableAlternates) {
-				// If 'alternate' in rels, create 'alternates' structure, append
-				if (in_array('alternate', $linkRels)) {
-					$alternates[] = array_merge(
-						$rel_attributes,
-						array(
-							'url' => $href,
-							'rel' => implode(' ', array_diff($linkRels, array('alternate')))
-						)
-					);
-				}
-			}
-
-			foreach ($linkRels as $rel) {
-				if (!array_key_exists($rel, $rels)) {
-					$rels[$rel] = array($href);
-				} elseif (!in_array($href, $rels[$rel])) {
-					$rels[$rel][] = $href;
-				}
-			}
-
-			if (!array_key_exists($href, $rel_urls)) {
-				$rel_urls[$href] = array('rels' => array());
-			}
-
-			// Add the attributes collected only if they were not already set
-			$rel_urls[$href] = array_merge(
-				$rel_attributes,
-				$rel_urls[$href]
-			);
-
-			// Merge current rels with those already set
-			$rel_urls[$href]['rels'] = array_merge(
-				$rel_urls[$href]['rels'],
-				$linkRels
-			);
-		}
-
-		// Alphabetically sort the rels arrays after removing duplicates
-		foreach ($rel_urls as $href => $object) {
-			$rel_urls[$href]['rels'] = array_unique($rel_urls[$href]['rels']);
-			sort($rel_urls[$href]['rels']);
-		}
-
-		if (empty($rels) and $this->jsonMode) {
-			$rels = new stdClass();
-		}
-
-		if (empty($rel_urls) and $this->jsonMode) {
-			$rel_urls = new stdClass();
-		}
-
-		return array($rels, $rel_urls, $alternates);
-	}
-
-	/**
-	 * Find rel=tag elements that don't have class=category and have an href.
-	 * For each element, get the last non-empty URL segment. Append a <data>
-	 * element with that value as the category. Uses the mf1 class 'category'
-	 * which will then be upgraded to p-category during backcompat.
-	 * @param DOMElement $el
-	 */
-	public function upgradeRelTagToCategory(DOMElement $el) {
-		$rel_tag = $this->xpath->query('.//a[contains(concat(" ",normalize-space(@rel)," ")," tag ") and not(contains(concat(" ", normalize-space(@class), " "), " category ")) and @href]', $el);
-
-		if ( $rel_tag->length ) {
-			foreach ( $rel_tag as $tempEl ) {
-				$path = trim(parse_url($tempEl->getAttribute('href'), PHP_URL_PATH), ' /');
-				$segments = explode('/', $path);
-				$value = array_pop($segments);
-
-				# build the <data> element
-				$dataEl = $tempEl->ownerDocument->createElement('data');
-				$dataEl->setAttribute('class', 'category');
-				$dataEl->setAttribute('value', $value);
-
-				# append as child of input element. this should ensure added element does get parsed inside e-*
-				$el->appendChild($dataEl);
-			}
-		}
-	}
-
-	/**
-	 * Kicks off the parsing routine
-	 * @param bool $convertClassic whether to do backcompat parsing on microformats1. Defaults to true.
-	 * @param DOMElement $context optionally specify an element from which to parse microformats
-	 * @return array An array containing all the microformats found in the current document
-	 */
-	public function parse($convertClassic = true, DOMElement $context = null) {
-		$this->convertClassic = $convertClassic;
-		$mfs = $this->parse_recursive($context);
-
-		// Parse rels
-		list($rels, $rel_urls, $alternates) = $this->parseRelsAndAlternates();
-
-		$top = array(
-			'items' => array_values(array_filter($mfs)),
-			'rels' => $rels,
-			'rel-urls' => $rel_urls,
-		);
-
-		if ($this->enableAlternates && count($alternates)) {
-			$top['alternates'] = $alternates;
-		}
-
-		return $top;
-	}
-
-
-	/**
-	 * Parse microformats recursively
-	 * Keeps track of whether inside a backcompat root or not
-	 * @param DOMElement $context: node to start with
-	 * @param int $depth: recursion depth
-	 * @return array
-	 */
-	public function parse_recursive(DOMElement $context = null, $depth = 0) {
-		$mfs = array();
-		$mfElements = $this->getRootMF($context);
-
-		foreach ($mfElements as $node) {
-			$is_backcompat = !$this->hasRootMf2($node);
-
-			if ($this->convertClassic && $is_backcompat) {
-				$this->backcompat($node);
-			}
-
-			$recurse = $this->parse_recursive($node, $depth + 1);
-
-			// set bool flag for nested mf
-			$has_nested_mf = ($recurse);
-
-			// parse for root mf
-			$result = $this->parseH($node, $is_backcompat, $has_nested_mf);
-
-			// TODO: Determine if clearing this is required?
-			$this->elementPrefixParsed($node, 'h');
-			$this->elementPrefixParsed($node, 'p');
-			$this->elementPrefixParsed($node, 'u');
-			$this->elementPrefixParsed($node, 'dt');
-			$this->elementPrefixParsed($node, 'e');
-
-			// parseH returned a parsed result
-			if ($result) {
-
-				// merge recursive results into current results
-				if ($recurse) {
-					$result = array_merge_recursive($result, $recurse);
-				}
-
-				// currently a nested mf; check if node is an mf property of parent
-				if ($depth > 0) {
-					$temp_properties = nestedMfPropertyNamesFromElement($node);
-
-					// properties found; set up parsed result in 'properties'
-					if (!empty($temp_properties)) {
-
-						foreach ($temp_properties as $property => $prefixes) {
-							// Note: handling microformat nesting under multiple conflicting prefixes is not currently specified by the mf2 parsing spec.
-							$prefixSpecificResult = $result;
-							if (in_array('p-', $prefixes)) {
-								$prefixSpecificResult['value'] = (!is_array($prefixSpecificResult['properties']) || empty($prefixSpecificResult['properties']['name'][0])) ? $this->parseP($node) : $prefixSpecificResult['properties']['name'][0];
-							} elseif (in_array('e-', $prefixes)) {
-								$eParsedResult = $this->parseE($node);
-								$prefixSpecificResult['html'] = $eParsedResult['html'];
-								$prefixSpecificResult['value'] = $eParsedResult['value'];
-							} elseif (in_array('u-', $prefixes)) {
-								$prefixSpecificResult['value'] = (!is_array($result['properties']) || empty($result['properties']['url'])) ? $this->parseU($node) : reset($result['properties']['url']);
-							} elseif (in_array('dt-', $prefixes)) {
-								$parsed_property = $this->parseDT($node);
-								$prefixSpecificResult['value'] = ($parsed_property) ? $parsed_property : '';
-							}
-
-							$mfs['properties'][$property][] = $prefixSpecificResult;
-						}
-
-					// otherwise, set up in 'children'
-					} else {
-						$mfs['children'][] = $result;
-					}
-				// otherwise, top-level mf
-				} else {
-					$mfs[] = $result;
-				}
-			}
-		}
-
-		return $mfs;
-	}
-
-
-	/**
-	 * Parse From ID
-	 *
-	 * Given an ID, parse all microformats which are children of the element with
-	 * that ID.
-	 *
-	 * Note that rel values are still document-wide.
-	 *
-	 * If an element with the ID is not found, an empty skeleton mf2 array structure
-	 * will be returned.
-	 *
-	 * @param string $id
-	 * @param bool $htmlSafe = false whether or not to HTML-encode angle brackets in non e-* properties
-	 * @return array
-	 */
-	public function parseFromId($id, $convertClassic=true) {
-		$matches = $this->xpath->query("//*[@id='{$id}']");
-
-		if (empty($matches))
-			return array('items' => array(), 'rels' => array(), 'alternates' => array());
-
-		return $this->parse($convertClassic, $matches->item(0));
-	}
-
-	/**
-	 * Get the root microformat elements
-	 * @param DOMElement $context
-	 * @return DOMNodeList
-	 */
-	public function getRootMF(DOMElement $context = null) {
-		// start with mf2 root class name xpath
-		$xpaths = array(
-			'contains(concat(" ",normalize-space(@class)), " h-")'
-		);
-
-		// add mf1 root class names
-		foreach ( $this->classicRootMap as $old => $new ) {
-			$xpaths[] = '( contains(concat(" ",normalize-space(@class), " "), " ' . $old . ' ") )';
-		}
-
-		// final xpath with OR
-		$xpath = '//*[' . implode(' or ', $xpaths) . ']';
-
-		$mfElements = (null === $context)
-			? $this->xpath->query($xpath)
-			: $this->xpath->query('.' . $xpath, $context);
-
-		return $mfElements;
-	}
-
-	/**
-	 * Apply the backcompat algorithm to upgrade mf1 classes to mf2.
-	 * This method is called recursively.
-	 * @param DOMElement $el
-	 * @param string $context
-	 * @param bool $isParentMf2
-	 * @see http://microformats.org/wiki/microformats2-parsing#algorithm
-	 */
-	public function backcompat(DOMElement $el, $context = '', $isParentMf2 = false) {
-
-		if ( $context ) {
-			$mf1Classes = array($context);
-		} else {
-			$class = str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
-			$classes = array_filter(explode(' ', $class));
-			$mf1Classes = array_intersect($classes, array_keys($this->classicRootMap));
-		}
-
-		$elHasMf2 = $this->hasRootMf2($el);
-
-		foreach ($mf1Classes as $classname) {
-			// special handling for specific properties
-			switch ( $classname )
-			{
-				case 'hentry':
-					$this->upgradeRelTagToCategory($el);
-
-					$rel_bookmark = $this->xpath->query('.//a[contains(concat(" ",normalize-space(@rel)," ")," bookmark ") and @href]', $el);
-
-					if ( $rel_bookmark->length ) {
-						foreach ( $rel_bookmark as $tempEl ) {
-							$this->addMfClasses($tempEl, 'u-url');
-							$this->addUpgraded($tempEl, array('bookmark'));
-						}
-					}
-				break;
-
-				case 'hreview':
-					$item_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
-
-					if ( $item_and_vcard->length ) {
-						foreach ( $item_and_vcard as $tempEl ) {
-							if ( !$this->hasRootMf2($tempEl) ) {
-								$this->backcompat($tempEl, 'vcard');
-								$this->addMfClasses($tempEl, 'p-item h-card');
-								$this->addUpgraded($tempEl, array('item', 'vcard'));
-							}
-						}
-					}
-
-					$item_and_vevent = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vevent ")]', $el);
-
-					if ( $item_and_vevent->length ) {
-						foreach ( $item_and_vevent as $tempEl ) {
-							if ( !$this->hasRootMf2($tempEl) ) {
-								$this->addMfClasses($tempEl, 'p-item h-event');
-								$this->backcompat($tempEl, 'vevent');
-								$this->addUpgraded($tempEl, array('item', 'vevent'));
-							}
-						}
-					}
-
-					$item_and_hproduct = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " hproduct ")]', $el);
-
-					if ( $item_and_hproduct->length ) {
-						foreach ( $item_and_hproduct as $tempEl ) {
-							if ( !$this->hasRootMf2($tempEl) ) {
-								$this->addMfClasses($tempEl, 'p-item h-product');
-								$this->backcompat($tempEl, 'vevent');
-								$this->addUpgraded($tempEl, array('item', 'hproduct'));
-							}
-						}
-					}
-
-					$this->upgradeRelTagToCategory($el);
-				break;
-
-				case 'vevent':
-					$location = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ")]', $el);
-
-					if ( $location->length ) {
-						foreach ( $location as $tempEl ) {
-							if ( !$this->hasRootMf2($tempEl) ) {
-								$this->addMfClasses($tempEl, 'h-card');
-								$this->backcompat($tempEl, 'vcard');
-							}
-						}
-					}
-				break;
-			}
-
-			// root class has mf1 properties to be upgraded
-			if ( isset($this->classicPropertyMap[$classname]) ) {
-				// loop through each property of the mf1 root
-				foreach ( $this->classicPropertyMap[$classname] as $property => $data ) {
-					$propertyElements = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " ' . $property . ' ")]', $el);
-
-					// loop through each element with the property
-					foreach ( $propertyElements as $propertyEl ) {
-						$hasRootMf2 = $this->hasRootMf2($propertyEl);
-
-						// if the element has not been upgraded and we're not inside an mf2 root, recurse
-						if ( !$this->isElementUpgraded($propertyEl, $property) && !$isParentMf2 )
-						{
-							$temp_context = ( isset($data['context']) ) ? $data['context'] : null;
-							$this->backcompat($propertyEl, $temp_context, $hasRootMf2);
-							$this->addMfClasses($propertyEl, $data['replace']);
-						}
-
-						$this->addUpgraded($propertyEl, $property);
-					}
-				}
-			}
-
-			if ( empty($context) && isset($this->classicRootMap[$classname]) && !$elHasMf2 ) {
-				$this->addMfClasses($el, $this->classicRootMap[$classname]);
-			}
-		}
-
-		return;
-	}
-
-	/**
-	 * Add element + property as upgraded during backcompat
-	 * @param DOMElement $el
-	 * @param string|array $property
-	 */
-	public function addUpgraded(DOMElement $el, $property) {
-		if ( !is_array($property) ) {
-			$property = array($property);
-		}
-
-		// add element to list of upgraded elements
-		if ( !$this->upgraded->contains($el) ) {
-			$this->upgraded->attach($el, $property);
-		} else {
-			$this->upgraded[$el] = array_merge($this->upgraded[$el], $property);
-		}
-	}
-
-	/**
-	 * Add the provided classes to an element.
-	 * Does not add duplicate if class name already exists.
-	 * @param DOMElement $el
-	 * @param string $classes
-	 */
-	public function addMfClasses(DOMElement $el, $classes) {
-		$existingClasses = str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
-		$existingClasses = array_filter(explode(' ', $existingClasses));
-
-		$addClasses = array_diff(explode(' ', $classes), $existingClasses);
-
-		if ( $addClasses ) {
-			$el->setAttribute('class', $el->getAttribute('class') . ' ' . implode(' ', $addClasses));
-		}
-	}
-
-	/**
-	 * Check an element for mf2 h-* class, typically to determine if backcompat should be used
-	 * @param DOMElement $el
-	 */
-	public function hasRootMf2(\DOMElement $el) {
-		$class = str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
-		$classes = array_filter(explode(' ', $class));
-
-		foreach ( $classes as $classname ) {
-			if ( strpos($classname, 'h-') === 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Convert Legacy Classnames
-	 *
-	 * Adds microformats2 classnames into a document containing only legacy
-	 * semantic classnames.
-	 *
-	 * @return Parser $this
-	 */
-	public function convertLegacy() {
-		$doc = $this->doc;
-		$xp = new DOMXPath($doc);
-
-		// replace all roots
-		foreach ($this->classicRootMap as $old => $new) {
-			foreach ($xp->query('//*[contains(concat(" ", @class, " "), " ' . $old . ' ") and not(contains(concat(" ", @class, " "), " ' . $new . ' "))]') as $el) {
-				$el->setAttribute('class', $el->getAttribute('class') . ' ' . $new);
-			}
-		}
-
-		foreach ($this->classicPropertyMap as $oldRoot => $properties) {
-			$newRoot = $this->classicRootMap[$oldRoot];
-			foreach ($properties as $old => $data) {
-				foreach ($xp->query('//*[contains(concat(" ", @class, " "), " ' . $oldRoot . ' ")]//*[contains(concat(" ", @class, " "), " ' . $old . ' ") and not(contains(concat(" ", @class, " "), " ' . $data['replace'] . ' "))]') as $el) {
-					$el->setAttribute('class', $el->getAttribute('class') . ' ' . $data['replace']);
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * XPath Query
-	 *
-	 * Runs an XPath query over the current document. Works in exactly the same
-	 * way as DOMXPath::query.
-	 *
-	 * @param string $expression
-	 * @param DOMNode $context
-	 * @return DOMNodeList
-	 */
-	public function query($expression, $context = null) {
-		return $this->xpath->query($expression, $context);
-	}
-
-	/**
-	 * Classic Root Classname map
-	 * @var array
-	 */
-	public $classicRootMap = array(
-		'vcard' => 'h-card',
-		'hfeed' => 'h-feed',
-		'hentry' => 'h-entry',
-		'hrecipe' => 'h-recipe',
-		'hresume' => 'h-resume',
-		'vevent' => 'h-event',
-		'hreview' => 'h-review',
-		'hproduct' => 'h-product',
-		'adr' => 'h-adr',
-	);
-
-	/**
-	 * Mapping of mf1 properties to mf2 and the context they're parsed with
-	 * @var array
-	 */
-	public $classicPropertyMap = array(
-		'vcard' => array(
-			'fn' => array(
-				'replace' => 'p-name'
-			),
-			'honorific-prefix' => array(
-				'replace' => 'p-honorific-prefix'
-			),
-			'given-name' => array(
-				'replace' => 'p-given-name'
-			),
-			'additional-name' => array(
-				'replace' => 'p-additional-name'
-			),
-			'family-name' => array(
-				'replace' => 'p-family-name'
-			),
-			'honorific-suffix' => array(
-				'replace' => 'p-honorific-suffix'
-			),
-			'nickname' => array(
-				'replace' => 'p-nickname'
-			),
-			'email' => array(
-				'replace' => 'u-email'
-			),
-			'logo' => array(
-				'replace' => 'u-logo'
-			),
-			'photo' => array(
-				'replace' => 'u-photo'
-			),
-			'url' => array(
-				'replace' => 'u-url'
-			),
-			'uid' => array(
-				'replace' => 'u-uid'
-			),
-			'category' => array(
-				'replace' => 'p-category'
-			),
-			'adr' => array(
-				'replace' => 'p-adr',
-			),
-			'extended-address' => array(
-				'replace' => 'p-extended-address'
-			),
-			'street-address' => array(
-				'replace' => 'p-street-address'
-			),
-			'locality' => array(
-				'replace' => 'p-locality'
-			),
-			'region' => array(
-				'replace' => 'p-region'
-			),
-			'postal-code' => array(
-				'replace' => 'p-postal-code'
-			),
-			'country-name' => array(
-				'replace' => 'p-country-name'
-			),
-			'label' => array(
-				'replace' => 'p-label'
-			),
-			'geo' => array(
-				'replace' => 'p-geo h-geo'
-			),
-			'latitude' => array(
-				'replace' => 'p-latitude'
-			),
-			'longitude' => array(
-				'replace' => 'p-longitude'
-			),
-			'tel' => array(
-				'replace' => 'p-tel'
-			),
-			'note' => array(
-				'replace' => 'p-note'
-			),
-			'bday' => array(
-				'replace' => 'dt-bday'
-			),
-			'key' => array(
-				'replace' => 'u-key'
-			),
-			'org' => array(
-				'replace' => 'p-org'
-			),
-			'organization-name' => array(
-				'replace' => 'p-organization-name'
-			),
-			'organization-unit' => array(
-				'replace' => 'p-organization-unit'
-			),
-			'title' => array(
-				'replace' => 'p-job-title'
-			),
-			'role' => array(
-				'replace' => 'p-role'
-			),
-			'tz' => array(
-				'replace' => 'p-tz'
-			),
-			'rev' => array(
-				'replace' => 'dt-rev'
-			),
-		),
-		'hfeed' => array(
-			# nothing currently
-		),
-		'hentry' => array(
-			'entry-title' => array(
-				'replace' => 'p-name'
-			),
-			'entry-summary' => array(
-				'replace' => 'p-summary'
-			),
-			'entry-content' => array(
-				'replace' => 'e-content'
-			),
-			'published' => array(
-				'replace' => 'dt-published'
-			),
-			'updated' => array(
-				'replace' => 'dt-updated'
-			),
-			'author' => array(
-				'replace' => 'p-author h-card',
-				'context' => 'vcard',
-			),
-			'category' => array(
-				'replace' => 'p-category'
-			),
-		),
-		'hrecipe' => array(
-			'fn' => array(
-				'replace' => 'p-name'
-			),
-			'ingredient' =>  array(
-				'replace' => 'p-ingredient'
-				/**
-				 * TODO: hRecipe 'value' and 'type' child mf not parsing correctly currently.
-				 * Per http://microformats.org/wiki/hRecipe#Property_details, they're experimental.
-				 */
-			),
-			'yield' =>  array(
-				'replace' => 'p-yield'
-			),
-			'instructions' =>  array(
-				'replace' => 'e-instructions'
-			),
-			'duration' =>  array(
-				'replace' => 'dt-duration'
-			),
-			'photo' =>  array(
-				'replace' => 'u-photo'
-			),
-			'summary' =>  array(
-				'replace' => 'p-summary'
-			),
-			'author' =>  array(
-				'replace' => 'p-author h-card',
-				'context' => 'vcard',
-			),
-			'nutrition' =>  array(
-				'replace' => 'p-nutrition'
-			),
-			'category' =>  array(
-				'replace' => 'p-category'
-			),
-		),
-		'hresume' => array(
-			'summary' => array(
-				'replace' => 'p-summary'
-			),
-			'contact' => array(
-				'replace' => 'p-contact h-card',
-				'context' => 'vcard',
-			),
-			'education' => array(
-				'replace' => 'p-education h-event',
-				'context' => 'vevent',
-			),
-			'experience' => array(
-				'replace' => 'p-experience h-event',
-				'context' => 'vevent',
-			),
-			'skill' => array(
-				'replace' => 'p-skill'
-			),
-			'affiliation' => array(
-				'replace' => 'p-affiliation h-card',
-				'context' => 'vcard',
-			),
-		),
-		'vevent' => array(
-			'summary' => array(
-				'replace' => 'p-name'
-			),
-			'dtstart' => array(
-				'replace' => 'dt-start'
-			),
-			'dtend' => array(
-				'replace' => 'dt-end'
-			),
-			'duration' => array(
-				'replace' => 'dt-duration'
-			),
-			'description' => array(
-				'replace' => 'p-description'
-			),
-			'url' => array(
-				'replace' => 'u-url'
-			),
-			'category' => array(
-				'replace' => 'p-category'
-			),
-			'location' => array(
-				'replace' => 'h-card',
-				'context' => 'vcard'
-			),
-			'geo' => array(
-				'replace' => 'p-location h-geo'
-			),
-		),
-		'hreview' => array(
-			'summary' => array(
-				'replace' => 'p-name'
-			),
-			# fn: see item.fn below
-			# photo: see item.photo below
-			# url: see item.url below
-			'item' => array(
-				'replace' => 'p-item h-item',
-				'context' => 'item'
-			),
-			'reviewer' => array(
-				'replace' => 'p-author h-card',
-				'context' => 'vcard',
-			),
-			'dtreviewed' => array(
-				'replace' => 'dt-published'
-			),
-			'rating' => array(
-				'replace' => 'p-rating'
-			),
-			'best' => array(
-				'replace' => 'p-best'
-			),
-			'worst' => array(
-				'replace' => 'p-worst'
-			),
-			'description' => array(
-				'replace' => 'e-content'
-			),
-			'category' => array(
-				'replace' => 'p-category'
-			),
-		),
-		'hproduct' => array(
-			'fn' => array(
-				'replace' => 'p-name',
-			),
-			'photo' => array(
-				'replace' => 'u-photo',
-			),
-			'brand' => array(
-				'replace' => 'p-brand',
-			),
-			'category' => array(
-				'replace' => 'p-category',
-			),
-			'description' => array(
-				'replace' => 'p-description',
-			),
-			'identifier' => array(
-				'replace' => 'u-identifier',
-			),
-			'url' => array(
-				'replace' => 'u-url',
-			),
-			'review' => array(
-				'replace' => 'p-review h-review',
-			),
-			'price' => array(
-				'replace' => 'p-price'
-			),
-		),
-		'item' => array(
-			'fn' => array(
-				'replace' => 'p-name'
-			),
-			'url' => array(
-				'replace' => 'u-url'
-			),
-			'photo' => array(
-				'replace' => 'u-photo'
-			),
-		),
-		'adr' => array(
-			'post-office-box' => array(
-				'replace' => 'p-post-office-box'
-			),
-			'extended-address' => array(
-				'replace' => 'p-extended-address'
-			),
-			'street-address' => array(
-				'replace' => 'p-street-address'
-			),
-			'locality' => array(
-				'replace' => 'p-locality'
-			),
-			'region' => array(
-				'replace' => 'p-region'
-			),
-			'postal-code' => array(
-				'replace' => 'p-postal-code'
-			),
-			'country-name' => array(
-				'replace' => 'p-country-name'
-			),
-		),
-		'geo' => array(
-			'latitude' => array(
-				'replace' => 'p-latitude'
-			),
-			'longitude' => array(
-				'replace' => 'p-longitude'
-			),
-		),
-	);
-}
-
-function parseUriToComponents($uri) {
-	$result = array(
-		'scheme' => null,
-		'authority' => null,
-		'path' => null,
-		'query' => null,
-		'fragment' => null
-	);
-
-	$u = @parse_url($uri);
-
-	if(array_key_exists('scheme', $u))
-		$result['scheme'] = $u['scheme'];
-
-	if(array_key_exists('host', $u)) {
-		if(array_key_exists('user', $u))
-			$result['authority'] = $u['user'];
-		if(array_key_exists('pass', $u))
-			$result['authority'] .= ':' . $u['pass'];
-		if(array_key_exists('user', $u) || array_key_exists('pass', $u))
-			$result['authority'] .= '@';
-		$result['authority'] .= $u['host'];
-		if(array_key_exists('port', $u))
-			$result['authority'] .= ':' . $u['port'];
-	}
-
-	if(array_key_exists('path', $u))
-		$result['path'] = $u['path'];
-
-	if(array_key_exists('query', $u))
-		$result['query'] = $u['query'];
-
-	if(array_key_exists('fragment', $u))
-		$result['fragment'] = $u['fragment'];
-
-	return $result;
-}
-
-function resolveUrl($baseURI, $referenceURI) {
-	$target = array(
-		'scheme' => null,
-		'authority' => null,
-		'path' => null,
-		'query' => null,
-		'fragment' => null
-	);
-
-	# 5.2.1 Pre-parse the Base URI
-	# The base URI (Base) is established according to the procedure of
-	# Section 5.1 and parsed into the five main components described in
-	# Section 3
-	$base = parseUriToComponents($baseURI);
-
-	# If base path is blank (http://example.com) then set it to /
-	# (I can't tell if this is actually in the RFC or not, but seems like it makes sense)
-	if($base['path'] == null)
-		$base['path'] = '/';
-
-	# 5.2.2. Transform References
-
-	# The URI reference is parsed into the five URI components
-	# (R.scheme, R.authority, R.path, R.query, R.fragment) = parse(R);
-	$reference = parseUriToComponents($referenceURI);
-
-	# A non-strict parser may ignore a scheme in the reference
-	# if it is identical to the base URI's scheme.
-	# TODO
-
-	if($reference['scheme']) {
-		$target['scheme'] = $reference['scheme'];
-		$target['authority'] = $reference['authority'];
-		$target['path'] = removeDotSegments($reference['path']);
-		$target['query'] = $reference['query'];
-	} else {
-		if($reference['authority']) {
-			$target['authority'] = $reference['authority'];
-			$target['path'] = removeDotSegments($reference['path']);
-			$target['query'] = $reference['query'];
-		} else {
-			if($reference['path'] == '') {
-				$target['path'] = $base['path'];
-				if($reference['query']) {
-					$target['query'] = $reference['query'];
-				} else {
-					$target['query'] = $base['query'];
-				}
-			} else {
-				if(substr($reference['path'], 0, 1) == '/') {
-					$target['path'] = removeDotSegments($reference['path']);
-				} else {
-					$target['path'] = mergePaths($base, $reference);
-					$target['path'] = removeDotSegments($target['path']);
-				}
-				$target['query'] = $reference['query'];
-			}
-			$target['authority'] = $base['authority'];
-		}
-		$target['scheme'] = $base['scheme'];
-	}
-	$target['fragment'] = $reference['fragment'];
-
-	# 5.3 Component Recomposition
-	$result = '';
-	if($target['scheme']) {
-		$result .= $target['scheme'] . ':';
-	}
-	if($target['authority']) {
-		$result .= '//' . $target['authority'];
-	}
-	$result .= $target['path'];
-	if($target['query']) {
-		$result .= '?' . $target['query'];
-	}
-	if($target['fragment']) {
-		$result .= '#' . $target['fragment'];
-	} elseif($referenceURI == '#') {
-		$result .= '#';
-	}
-	return $result;
-}
-
-# 5.2.3 Merge Paths
-function mergePaths($base, $reference) {
-	# If the base URI has a defined authority component and an empty
-	# path,
-	if($base['authority'] && $base['path'] == null) {
-		# then return a string consisting of "/" concatenated with the
-		# reference's path; otherwise,
-		$merged = '/' . $reference['path'];
-	} else {
-		if(($pos=strrpos($base['path'], '/')) !== false) {
-			# return a string consisting of the reference's path component
-			# appended to all but the last segment of the base URI's path (i.e.,
-			# excluding any characters after the right-most "/" in the base URI
-			# path,
-			$merged = substr($base['path'], 0, $pos + 1) . $reference['path'];
-		} else {
-			# or excluding the entire base URI path if it does not contain
-			# any "/" characters).
-			$merged = $base['path'];
-		}
-	}
-	return $merged;
-}
-
-# 5.2.4.A Remove leading ../ or ./
-function removeLeadingDotSlash(&$input) {
-	if(substr($input, 0, 3) == '../') {
-		$input = substr($input, 3);
-	} elseif(substr($input, 0, 2) == './') {
-		$input = substr($input, 2);
-	}
-}
-
-# 5.2.4.B Replace leading /. with /
-function removeLeadingSlashDot(&$input) {
-	if(substr($input, 0, 3) == '/./') {
-		$input = '/' . substr($input, 3);
-	} else {
-		$input = '/' . substr($input, 2);
-	}
-}
-
-# 5.2.4.C Given leading /../ remove component from output buffer
-function removeOneDirLevel(&$input, &$output) {
-	if(substr($input, 0, 4) == '/../') {
-		$input = '/' . substr($input, 4);
-	} else {
-		$input = '/' . substr($input, 3);
-	}
-	$output = substr($output, 0, strrpos($output, '/'));
-}
-
-# 5.2.4.D Remove . and .. if it's the only thing in the input
-function removeLoneDotDot(&$input) {
-	if($input == '.') {
-		$input = substr($input, 1);
-	} else {
-		$input = substr($input, 2);
-	}
-}
-
-# 5.2.4.E Move one segment from input to output
-function moveOneSegmentFromInput(&$input, &$output) {
-	if(substr($input, 0, 1) != '/') {
-		$pos = strpos($input, '/');
-	} else {
-		$pos = strpos($input, '/', 1);
-	}
-
-	if($pos === false) {
-		$output .= $input;
-		$input = '';
-	} else {
-		$output .= substr($input, 0, $pos);
-		$input = substr($input, $pos);
-	}
-}
-
-# 5.2.4 Remove Dot Segments
-function removeDotSegments($path) {
-	# 1.  The input buffer is initialized with the now-appended path
-	#     components and the output buffer is initialized to the empty
-	#     string.
-	$input = $path;
-	$output = '';
-
-	$step = 0;
-
-	# 2.  While the input buffer is not empty, loop as follows:
-	while($input) {
-		$step++;
-
-		if(substr($input, 0, 3) == '../' || substr($input, 0, 2) == './') {
-			#     A.  If the input buffer begins with a prefix of "../" or "./",
-			#         then remove that prefix from the input buffer; otherwise,
-			removeLeadingDotSlash($input);
-		} elseif(substr($input, 0, 3) == '/./' || $input == '/.') {
-			#     B.  if the input buffer begins with a prefix of "/./" or "/.",
-			#         where "." is a complete path segment, then replace that
-			#         prefix with "/" in the input buffer; otherwise,
-			removeLeadingSlashDot($input);
-		} elseif(substr($input, 0, 4) == '/../' || $input == '/..') {
-			#     C.  if the input buffer begins with a prefix of "/../" or "/..",
-			#          where ".." is a complete path segment, then replace that
-			#          prefix with "/" in the input buffer and remove the last
-			#          segment and its preceding "/" (if any) from the output
-			#          buffer; otherwise,
-			removeOneDirLevel($input, $output);
-		} elseif($input == '.' || $input == '..') {
-			#     D.  if the input buffer consists only of "." or "..", then remove
-			#         that from the input buffer; otherwise,
-			removeLoneDotDot($input);
-		} else {
-			#     E.  move the first path segment in the input buffer to the end of
-			#         the output buffer and any subsequent characters up to, but not including,
-			#         the next "/" character or the end of the input buffer
-			moveOneSegmentFromInput($input, $output);
-		}
-	}
-
-	return $output;
-}
diff --git a/vendor/mf2/mf2/README.md b/vendor/mf2/mf2/README.md
deleted file mode 100644
index 7794203..0000000
--- a/vendor/mf2/mf2/README.md
+++ /dev/null
@@ -1,645 +0,0 @@
-# php-mf2
-
-[![Build Status](https://travis-ci.org/microformats/php-mf2.png?branch=master)](http://travis-ci.org/microformats/php-mf2)
-
-php-mf2 is a pure, generic [microformats-2](http://microformats.org/wiki/microformats-2) parser. It makes HTML as easy to consume as JSON.
-
-Instead of having a hard-coded list of all the different microformats, it follows a set of procedures to handle different property types (e.g. `p-` for plaintext, `u-` for URL, etc). This allows for a very small and maintainable parser.
-
-## Installation
-
-There are two ways of installing php-mf2. I **highly recommend** installing php-mf2 using [Composer](http://getcomposer.org). The rest of the documentation assumes that you have done so.
-
-To install using Composer, run
-
-```
-composer require mf2/mf2
-```
-
-If you can’t or don’t want to use Composer, then php-mf2 can be installed the old way by downloading [`/Mf2/Parser.php`](https://raw.githubusercontent.com/microformats/php-mf2/master/Mf2/Parser.php), adding it to your project and requiring it from files you want to call its functions from, like this:
-
-```php
-<?php
-
-require_once 'Mf2/Parser.php';
-
-// Now all the functions documented below are available, for example:
-$mf = Mf2\fetch('https://waterpigs.co.uk');
-```
-
-It is recommended to install the HTML5 parser for proper handling of HTML5 elements. Using composer, run
-
-```
-composer require masterminds/html5
-```
-
-If this library is added to your project, the php-mf2 parser will use it automatically instead of the built-in HTML parser.
-
-
-### Signed Code Verification
-
-From v0.2.9, php-mf2’s version tags are signed using GPG, allowing you to cryptographically verify that you’re using code which hasn’t been tampered with. To verify the code you will need the GPG keys for one of the people in the list of code signers:
-
-* Barnaby Walters barnaby@waterpigs.co.uk 1C00 430B 19C6 B426 922F E534 BEF8 CE58 118A D524
-* Aaron Parecki aaron@parecki.com F384 12A1 55FB 8B15 B7DD 8E07 4225 2B5E 65CE 0ADD
-* Bear bear@bear.im 0A93 9BA7 8203 FCBC 58A9 E8B5 9D1E 0661 8EE5 B4D8
-
-To import the relevant keys into your GPG keychain, execute the following command:
-
-```bash
-gpg --recv-keys 1C00430B19C6B426922FE534BEF8CE58118AD524 F38412A155FB8B15B7DD8E0742252B5E65CE0ADD 0A939BA78203FCBC58A9E8B59D1E06618EE5B4D8
-```
-
-Then verify the installed files like this:
-
-```bash
-# in your project root
-cd vendor/mf2/mf2
-git tag -v v0.3.0
-```
-
-If nothing went wrong, you should see the tag commit message, ending something like this:
-
-```
-gpg: Signature made Wed  6 Aug 10:04:20 2014 GMT using RSA key ID 2B2BBB65
-gpg: Good signature from "Barnaby Walters <barnaby@waterpigs.co.uk>"
-gpg:                 aka "[jpeg image of size 12805]"
-```
-
-Possible issues:
-
-* **Git complains that there’s no such tag**: check for a .git file in the source folder; odds are you have the prefer-dist setting enabled and composer is just extracting a zip rather than checking out from git.
-* **Git complains the gpg command doesn’t exist**: If you successfully imported my key then you obviously do have gpg installed, but you might have gpg2, whereas git looks for gpg. Solution: tell git which binary to use: `git config --global gpg.program 'gpg2'`
-
-## Usage
-
-php-mf2 is PSR-0 autoloadable, so simply include Composer’s auto-generated autoload file (`/vendor/autoload.php`) and you can start using it. These two functions cover most situations:
-
-* To fetch microformats from a URL, call `Mf2\fetch($url)`
-* To parse microformats from HTML, call `Mf2\parse($html, $url)`, where `$url` is the URL from which `$html` was loaded, if any. This parameter is required for correct relative URL parsing and must not be left out unless parsing HTML which is not loaded from the web.
-
-## Examples
-
-### Fetching microformats from a URL
-
-```php
-<?php
-
-namespace YourApp;
-
-require '/vendor/autoload.php';
-
-use Mf2;
-
-// (Above code (or equivalent) assumed in future examples)
-
-$mf = Mf2\fetch('http://microformats.org');
-
-foreach ($mf['items'] as $microformat) {
-	echo "A {$microformat['type'][0]} called {$microformat['properties']['name'][0]}\n";
-}
-
-```
-
-### Parsing microformats from a HTML string
-
-Here we demonstrate parsing of microformats2 implied property parsing, where an entire h-card with name and URL properties is created using a single `h-card` class.
-
-```php
-<?php
-
-$html = '<a class="h-card" href="https://waterpigs.co.uk/">Barnaby Walters</a>';
-$output = Mf2\parse($html, 'https://waterpigs.co.uk/');
-```
-
-`$output` is a canonical microformats2 array structure like:
-
-```json
-{
-	"items": [
-		{
-			"type": ["h-card"],
-			"properties": {
-				"name": ["Barnaby Walters"],
-				"url": ["https://waterpigs.co.uk/"]
-			}
-		}
-	],
-	"rels": {}
-}
-```
-
-If no microformats are found, `items` will be an empty array.
-
-Note that, whilst the property prefixes are stripped, the prefix of the `h-*` classname(s) in the "type" array are retained.
-
-### Parsing a document with relative URLs
-
-Most of the time you’ll be getting your input HTML from a URL. You should pass that URL as the second parameter to `Mf2\parse()` so that any relative URLs in the document can be resolved. For example, say you got the following HTML from `http://example.org/post/1`:
-
-```html
-<div class="h-card">
-	<h1 class="p-name">Mr. Example</h1>
-	<img class="u-photo" alt="" src="/photo.png" />
-</div>
-```
-
-Parsing like this:
-
-```php
-$output = Mf2\parse($html, 'http://example.org/post/1');
-```
-
-will result in the following output, with relative URLs made absolute:
-
-```json
-{
-	"items": [{
-		"type": ["h-card"],
-		"properties": {
-			"name": ["Mr. Example"],
-			"photo": ["http://example.org/photo.png"]
-		}
-	}],
-	"rels": {},
-	"rel-urls": {}
-}
-```
-
-php-mf2 correctly handles relative URL resolution according to the URI and HTML specs, including correct use of the `<base>` element.
-
-### Parsing `rel` and `rel=alternate` values
-
-php-mf2 also parses any link relations in the document, placing them into two top-level arrays — one for `rel=alternate` and another for all other rel values, e.g. when parsing:
-
-```html
-<a rel="me" href="https://twitter.com/barnabywalters">Me on twitter</a>
-<link rel="alternate etc" href="http://example.com/notes.atom" />
-```
-
-parsing will result in the following keys:
-
-```json
-{
-	"items": [],
-	"rels": {
-		"me": ["https://twitter.com/barnabywalters"]
-	},
-	"rel-urls": {
-		"https://twitter.com/barnabywalters": {
-			"text": "Me on twitter",
-			"rels": ["me"]
-		},
-		"http://example.com/notes.atom": {
-			"rels": ["alternate","etc"]
-		}
-	}
-}
-```
-
-Protip: if you’re not bothered about the microformats2 data and just want rels and alternates, you can improve performance by creating a `Mf2\Parser` object (see below) and calling `->parseRelsAndAlternates()` instead of `->parse()`, e.g.
-
-```php
-<?php
-
-$parser = new Mf2\Parser('<link rel="…');
-$relsAndAlternates = $parser->parseRelsAndAlternates();
-```
-
-### Debugging Mf2\fetch
-
-`Mf2\fetch()` will attempt to parse any response served with “HTML” in the content-type, regardless of what the status code is. If it receives a non-HTML response it will return null.
-
-To learn what the HTTP status code for any request was, or learn more about the request, pass a variable name as the third parameter to `Mf2\fetch()` — this will be filled with the contents of `curl_getinfo()`, e.g:
-
-```php
-
-<?php
-
-$mf = Mf2\fetch('http://waterpigs.co.uk/this-page-doesnt-exist', true, $curlInfo);
-if ($curlInfo['http_code'] == '404') {
-	// This page doesn’t exist.
-}
-
-```
-
-If it was HTML then it is still parsed, as there are cases where error pages contain microformats — for example a deleted h-entry resulting in a 410 Gone response containing a stub h-entry with amn explanation for the deletion.
-
-### Getting more control by creating a Parser object
-
-The `Mf2\parse()` function covers the most common usage patterns by internally creating an instance of `Mf2\Parser` and returning the output all in one step. For some advanced usage you can also create an instance of `Mf2\Parser` yourself.
-
-The constructor takes two arguments, the input HTML (or a DOMDocument) and the URL to use as a base URL. Once you have a parser, there are a few other things you can do:
-
-### Selectively parsing a document
-
-There are several ways to selectively parse microformats from a document. If you wish to only parse microformats from an element with a particular ID, `Parser::parseFromId($id) ` is the easiest way.
-
-If your needs are more complex, `Parser::parse` accepts an optional context DOMNode as its second parameter. Typically you’d use `Parser::query` to run XPath queries on the document to get the element you want to parse from under, then pass it to `Parser::parse`. Example usage:
-
-```php
-$doc = 'More microformats, more microformats <div id="parse-from-here"><span class="h-card">This shows up</span></div> yet more ignored content';
-$parser = new Mf2\Parser($doc);
-
-$parser->parseFromId('parse-from-here'); // returns a document with only the h-card descended from div#parse-from-here
-
-$elementIWant = $parser->query('an xpath query')[0];
-
-$parser->parse(true, $elementIWant); // returns a document with only the Microformats under the selected element
-
-```
-
-### Experimental Language Parsing
-
-There is still [ongoing brainstorming](http://microformats.org/wiki/microformats2-parsing-brainstorming#Parse_language_information) around how HTML language attributes should be added to the parsed result. In order to use this feature, you will need to set a flag to opt in.
-
-```php
-$doc = '<div class="h-entry" lang="sv" id="postfrag123">
-	<h1 class="p-name">En svensk titel</h1>
-	<div class="e-content" lang="en">With an <em>english</em> summary</div>
-	<div class="e-content">Och <em>svensk</em> huvudtext</div>
-</div>';
-$parser = new Mf2\Parser($doc);
-$parser->lang = true;
-$result = $parser->parse();
-```
-
-```json
-{
-	"items": [
-		{
-			"type": ["h-entry"],
-			"properties": {
-				"name": ["En svensk titel"],
-				"content": [
-					{
-						"html": "With an <em>english</em> summary",
-						"value": "With an english summary",
-						"lang": "en"
-					},
-					{
-						"html": "Och <em>svensk</em> huvudtext",
-						"value": "Och svensk huvudtext",
-						"lang": "sv"
-					}
-				]
-			},
-			"lang": "sv"
-		}
-	],
-	"rels": {},
-	"rel-urls": {}
-}
-```
-
-Note that this option is still considered experimental and in development, and the parsed output may change between minor releases.
-
-
-### Generating output for JSON serialization with JSON-mode
-
-Due to a quirk with the way PHP arrays work, there is an edge case ([reported](https://github.com/microformats/php-mf2/issues/29) by Tom Morris) in which a document with no rel values, when serialised as JSON, results in an empty object as the rels value rather than an empty array. Replacing this in code with a stdClass breaks PHP iteration over the values.
-
-As of version 0.2.6, the default behaviour is back to being PHP-friendly, so if you want to produce results specifically for serialisation as JSON (for example if you run a HTML -> JSON service, or want to run tests against JSON fixtures), enable JSON mode:
-
-```php
-// …by passing true as the third constructor:
-$jsonParser = new Mf2\Parser($html, $url, true);
-```
-
-### Classic Microformats Markup
-
-php-mf2 has some support for parsing classic microformats markup. It’s enabled by default, but can be turned off by calling `Mf2\parse($html, $url, false);` or `$parser->parse(false);` if you’re instanciating a parser yourself.
-
-In previous versions of php-mf2 you could also add your own class mappings — officially this is no longer supported.
-
-* If the built in mappings don’t successfully parse some classic microformats markup then raise an issue and we’ll fix it.
-* If you want to screen-scrape websites which don’t use mf2 into mf2 data structures, consider contributing to [php-mf2-shim](https://github.com/microformats/php-mf2-shim)
-* If you *really* need to make one-off changes to the default mappings… It is possible. But you have to figure it out for yourself ;)
-
-## Security
-
-**No filtering of content takes place in mf2\Parser, so treat its output as you would any untrusted data from the source of the parsed document.**
-
-Some tips:
-
-* All content apart from the 'html' key in dictionaries produced by parsing an `e-*` property is not HTML-escaped. For example, `<span class="p-name">&lt;code&gt;</span>` will result in `"name": ["<code>"]`. At the very least, HTML-escape all properties before echoing them out in HTML
-* If you’re using the raw HTML content under the 'html' key of dictionaries produced by parsing `e-*` properties, you SHOULD purify the HTML before displaying it to prevent injection of arbitrary code. For PHP I recommend using [HTML Purifier](http://htmlpurifier.org)
-
-TODO: move this section to a security/consumption best practises page on the wiki
-
-## Contributing
-
-Issues and bug reports are very welcome. If you know how to write tests then please do so as code always expresses problems and intent much better than English, and gives me a way of measuring whether or not fixes have actually solved your problem. If you don’t know how to write tests, don’t worry :) Just include as much useful information in the issue as you can.
-
-Pull requests very welcome, please try to maintain stylistic, structural and naming consistency with the existing codebase, and don’t be too upset if I make naming changes :)
-
-### How to make a Pull Request
-
-1. Fork the repo to your github account
-2. Clone a copy to your computer (simply installing php-mf2 using composer only works for using it, not developing it)
-3. Install the dev dependencies with `./composer.phar install`
-4. Run PHPUnit with `./vendor/bin/phpunit`
-5. Make your changes
-6. Add PHPUnit tests for your changes, either in an existing test file if suitable, or a new one
-7. Make sure your tests pass (`./vendor/bin/phpunit`), using 5.4+
-8. Go to your fork of the repo on github.com and make a pull request, preferably with a short summary, detailed description and references to issues/parsing specs as appropriate
-9. Bask in the warm feeling of having contributed to a piece of free software
-
-### Testing
-
-There are currently two separate test suites: one, in `tests/Mf2`, is written in phpunit, containing many microformats parsing examples as well as internal parser tests and regression tests for specific issues over php-mf2’s history. Run it with `./vendor/bin/phpunit`. If you do not have a live internet connection, you can exclude tests that depend on it: `./vendor/bin/phpunit --exclude-group internet`.
-
-The other, in `tests/test-suite`, is a custom test harness which hooks up php-mf2 to the cross-platform [microformats test suite](https://github.com/microformats/tests). To run these tests you must first install the tests with `./composer.phar install`. Each test consists of a HTML file and a corresponding JSON file, and the suite can be run with `php ./tests/test-suite/test-suite.php`.
-
-Currently php-mf2 passes the majority of it’s own test case, and a good percentage of the cross-platform tests. Contributors should ALWAYS test against the PHPUnit suite to ensure any changes don’t negatively impact php-mf2, and SHOULD run the cross-platform suite, especially if you’re changing parsing behaviour.
-
-### Changelog
-
-#### v0.4.6
-
-Bugfixes:
-
-* Don't include img src attribute in implied p-name ([#180](https://github.com/microformats/php-mf2/issues/180))
-* Normalize ordinal dates in VCP values ([#167](https://github.com/microformats/php-mf2/issues/167))
-* Fix for accidental array access of stdClass in deeply nested structures ([#196](https://github.com/microformats/php-mf2/issues/196))
-* Reduce instances where u-url is implied according to a [spec update](http://microformats.org/wiki/index.php?title=microformats2-parsing&diff=66887&oldid=66871) ([#183](https://github.com/microformats/php-mf2/issues/183) and [parsing issue #36](https://github.com/microformats/microformats2-parsing/issues/36))
-* Fix for wrongly implied photo property ([#190](https://github.com/microformats/php-mf2/issues/190))
-
-Other Updates:
-
-* Adds a filter to avoid running tests that require a live internet connection ([#194](https://github.com/microformats/php-mf2/pull/194))
-* Refactor implied name code to match new implied name handling of photo and url ([#193](https://github.com/microformats/php-mf2/pull/193))
-* Moved this repo to the microformats GitHub organization ([#179](https://github.com/microformats/php-mf2/issues/179))
-
-
-#### v0.4.5
-
-2018-08-02
-
-Bugfixes:
-
-* Fix for parsing empty `e-` elements
-
-Other Updates:
-
-* Added `.editorconfig` to the project and cleaned up whitespace across all files
-
-
-#### v0.4.4
-
-2018-08-01
-
-Bugfixes:
-
-* Ensure empty `properties` is an object `{}` rather than array  `[]` ([#171](https://github.com/microformats/php-mf2/issues/171))
-* Ensure the parser does not mutate the DOMDOcument passed in ([#174](https://github.com/microformats/php-mf2/issues/174))
-* Fix for multiple class names in backcompat parsing ([#156](https://github.com/microformats/php-mf2/issues/156))
-
-Microformats Parsing Updates:
-
-* New algorithm for plaintext values ([#168](https://github.com/microformats/php-mf2/pull/168) and [parsing issue #15](https://github.com/microformats/microformats2-parsing/issues/15))
-* Always resolve URLs from `u-` properties even when not from a link element ([Parsing issue #10](https://github.com/microformats/microformats2-parsing/issues/10))
-
-Other Updates:
-
-* Improved test coverage
-
-
-#### v0.4.3
-
-2018-03-29
-
-If the [masterminds/html5](https://github.com/Masterminds/html5-php) HTML5 parser is available, the Mf2 parser will use that instead of the built-in HTML parser. This enables proper handling of HTML5 elements such as `<article>`.
-
-To include the HTML5 parser in your project, run:
-
-```
-composer require masterminds/html5
-```
-
-#### v0.4.2
-
-2018-03-29
-
-Fixes:
-
-* [#165](https://github.com/microformats/php-mf2/pull/165) - Prevents inadvertently adding whitespace to the html value
-* [#158](https://github.com/microformats/php-mf2/issues/158) - Allows numbers in vendor prefixed names
-* [#160](https://github.com/microformats/php-mf2/issues/160) - Ignores class names with consecutive dashes
-* [#159](https://github.com/microformats/php-mf2/issues/159) - Remove duplicate values from type and rels arrays
-* [#162](https://github.com/microformats/php-mf2/pull/162) - Improved rel attribute parsing
-
-Backcompat:
-
-* [#157](https://github.com/microformats/php-mf2/issues/157) - Parse `rel=tag` as `p-category` for hEntry and hReview
-
-#### v0.4.1
-
-2018-03-15
-
-Fixes:
-
-* [#153](https://github.com/microformats/php-mf2/issues/153) - Fixes parsed timestamps authored with a Z timezone offset
-* [#151](https://github.com/microformats/php-mf2/issues/151) - Adds back "value" of nested microformats when no matching property exists
-
-
-#### v0.4.0
-
-2018-03-13
-
-Breaking changes:
-
-* [#125](https://github.com/microformats/php-mf2/pull/125) - Add `rel-urls` to parsed result. Removes `alternates` by default but still available behind a feature flag.
-* [#142](https://github.com/microformats/php-mf2/pull/142) - Reduce instances of implied `p-name`. See Microformats issue [#6](https://github.com/microformats/microformats2-parsing/issues/6). This means it is now possible for the parsed result to *not* have a `name` property, whereas before there was always a `name` property on an object. Make sure consuming code can handle an object without a name now.
-
-Fixes:
-
-* [#124](https://github.com/microformats/php-mf2/pull/124) - Fix for experimental lang parsing
-* [#127](https://github.com/microformats/php-mf2/issues/127) - Fix for parsing `h-*` class names containing invalid characters.
-* [#131](https://github.com/microformats/php-mf2/pull/131) - Improved `dt-` parsing. Issues [#126](https://github.com/microformats/php-mf2/issues/126) and [#115](https://github.com/microformats/php-mf2/issues/115).
-* [#130](https://github.com/microformats/php-mf2/issues/130) - Fix for implied properties with empty attributes.
-* [#135](https://github.com/microformats/php-mf2/issues/135) - Trim leading and tailing whitespace from HTML value as well as text value.
-* [#137](https://github.com/microformats/php-mf2/issues/137) - Fix backcompat hfeed parsing.
-* [#134](https://github.com/microformats/php-mf2/issues/134) - Fix `rel=bookmark` backcompat parsing.
-* [#116](https://github.com/microformats/php-mf2/issues/116) - Fix backcompat parsing for `summary` property in `hreview`
-* [#149](https://github.com/microformats/php-mf2/issues/149) - Fix for datetime parsing, no longer tries to interpret the value and passes through instead
-
-#### v0.3.2
-
-2017-05-27
-
-* Fixed how the Microformats tests repo is loaded via composer
-* Moved experimental language parsing feature behind an opt-in flag
-* [#121](https://github.com/microformats/php-mf2/pull/121) Fixed language detection to support parsing of HTML fragments
-
-#### v0.3.1
-
-2017-05-24
-
-* [#89](https://github.com/microformats/php-mf2/issues/89) - Fixed parsing empty `img alt=""` attributes
-* [#91](https://github.com/microformats/php-mf2/issues/91) - Ignore rel values from HTML tags that don't allow rel values
-* [#57](https://github.com/microformats/php-mf2/issues/57) - Implement hAtom rel=bookmark backcompat
-* [#94](https://github.com/microformats/php-mf2/pull/94) - Fixed HTML output when parsing e-* properties
-* [#97](https://github.com/microformats/php-mf2/pull/97) - Experimental language parsing
-* [#88](https://github.com/microformats/php-mf2/issues/88) - Fix for implied photo parsing
-* [#102](https://github.com/microformats/php-mf2/pull/102) - Ignore classes with numbers or capital letters
-* [#111](https://github.com/microformats/php-mf2/pull/111) - Improved backcompat parsing
-* [#106](https://github.com/microformats/php-mf2/issues/106) - Send `Accept: text/html` header when using the `fetch` method
-* [#114](https://github.com/microformats/php-mf2/issues/114) - Parse `poster` attribute for `video` tags
-* [#118](https://github.com/microformats/php-mf2/issues/118) - Fixes parsing elements with missing attributes
-* Tests now use [microformats/tests](https://github.com/microformats/tests) repo
-
-Many thanks to @gRegorLove for the major overhaul of the backcompat parsing!
-
-#### v0.3.0
-
-2016-03-14
-
-* Requires PHP 5.4 at minimum (PHP 5.3 is EOL)
-* Licensed under CC0 rather than MIT
-* Merges Pull requests #70, #73, #74, #75, #77, #80, #82, #83, #85 and #86.
-* Variety of small bug fixes and features including improved whitespace support, removal of style and script contents from plaintext properties
-* All PHPUnit tests passing finally
-
-Many thanks to @aaronpk, @diplix, @dissolve, @dymcx @gRegorLove, @jeena, @veganstraightedge and @voxpelli for all your hard work opening issues and sending and merging PRs!
-
-#### v0.2.12
-
-2015-07-12
-
-* Merges pull requests [#65](https://github.com/microformats/php-mf2/pull/65), [#66](https://github.com/microformats/php-mf2/pull/66) and [#67](https://github.com/microformats/php-mf2/pull/67).
-* Fixes issue [#64](https://github.com/microformats/php-mf2/issues/64).
-
-Many thanks to @aaronpk, @gRegorLove and @kylewm for contributions, @aaronpk and @kevinmarks for PR management and @tantek for issue reporting!
-
-#### v0.2.11
-
-2015-07-10
-
-#### v0.2.10
-
-2015-04-29
-
-* Merged [#58](https://github.com/microformats/php-mf2/pull/58), fixing some parsing bugs and adding support for area element parsing. Thanks so much for your hard work and patience, <a class="h-card" href="http://ben.thatmustbe.me/">Ben</a>!
-
-#### v0.2.9
-
-2014-08-06
-
-* Added backcompat classmap for hProduct, associated tests
-* Started GPG signing version tags as barnaby@waterpigs.co.uk, fingerprint CBC7 7876 BF7C 9637 B6AE 77BA 7D49 834B 0416 CFA3
-
-#### v0.2.8
-
-2014-07-17
-
-* Fixed issue #51 causing php-mf2 to not work with PHP 5.3
-* Fixed issue #52 correctly handling the `<template>` element by ignoring it
-* Fixed issue #53 improving the plaintext parsing of `<img>` elements
-
-#### v0.2.7
-
-2014-06-18
-
-* Added `Mf2\fetch()` which fetches content from a URL and returns parsed microformats
-* Added implied `dt-end` discovery (thanks for all your hard work, @gRegorLove!)
-* Fixed issue causing classnames like `blah e- blah` to produce properties with numeric keys (thanks @aaronpk and @gRegorLove)
-* Fixed issue causing resolved URLs to not include port numbers (thanks @aaronpk)
-
-#### v0.2.6
-
-* Added JSON mode as long-term fix for #29
-* Fixed bug causing microformats nested under multiple property names to be parsed only once
-
-#### v0.2.5
-
-* Removed conditional replacing empty rel list with stdclass. Original purpose was to make JSON-encoding the output from the parser correct but it also caused Fatal Errors due to trying to treat stdclass as array.
-
-#### v0.2.4
-
-#### v0.2.3
-
-* Made p-* parsing consistent with implied name parsing
-* Stopped collapsing whitespace in p-* properties
-* Implemented unicodeTrim which removes &nbsp; characters as well as regex \s
-* Added support for implied name via abbr[title]
-* Prevented excessively nested value-class elements from being parsed incorrectly, removed incorrect separator which was getting added in some cases
-* Updated u-* parsing to be spec-compliant, matching [href] before value-class and only attempting URL resolution for URL attributes
-* Added support for input[value] parsing
-* Tests for all the above
-
-#### v0.2.2
-
-* Made resolveUrl method public, allowing advanced parsers and subclasses to make use of it
-* Fixed bug causing multiple duplicate property values to appear
-
-#### v0.2.1
-
-* Fixed bug causing classic microformats property classnames to not be parsed correctly
-
-#### v0.2.0 (BREAKING CHANGES)
-
-* Namespace change from mf2 to Mf2, for PSR-0 compatibility
-* `Mf2\parse()` function added to simplify the most common case of just parsing some HTML
-* Updated e-* property parsing rules to match mf2 parsing spec — instead of producing inconsistent HTML content, it now produces dictionaries like <pre><code>
-{
-	"html": "<b>The Content</b>",
-	"value: "The Content"
-}
-</code></pre>
-* Removed `htmlSafe` options as new e-* parsing rules make them redundant
-* Moved a whole load of static functions out of the class and into standalone functions
-* Changed autoloading to always include Parser.php instead of using classmap
-
-#### v0.1.23
-
-* Made some changes to the way back-compatibility with classic microformats are handled, ignoring classic property classnames inside mf2 roots and outside classic roots
-* Deprecated ability to add new classmaps, removed twitter classmap. Use [php-mf2-shim](http://github.com/microformats/php-mf2-shim) instead, it’s better
-
-#### v0.1.22
-
-* Converts classic microformats by default
-
-#### v0.1.21
-
-* Removed webignition dependency, also removing ext-intl dependency. php-mf2 is now a standalone, single file library again
-* Replaced webignition URL resolving with custom code passing almost all tests, courtesy of <a class="h-card" href="http://aaronparecki.com">Aaron Parecki</a>
-
-#### v0.1.20
-
-* Added in almost-perfect custom URL resolving code
-
-#### v0.1.19 (2013-06-11)
-
-* Required stable version of webigniton/absolute-url-resolver, hopefully resolving versioning problems
-
-#### v0.1.18 (2013-06-05)
-
-* Fixed problems with isElementParsed, causing elements to be incorrectly parsed
-* Cleaned up some test files
-
-#### v0.1.17
-
-* Rewrote some PHP 5.4 array syntax which crept into 0.1.16 so php-mf2 still works on PHP 5.3
-* Fixed a bug causing weird partial microformats to be added to parent microformats if they had doubly property-nested children
-* Finally actually licensed this project under a real license (MIT, in composer.json)
-* Suggested barnabywalters/mf-cleaner in composer.json
-
-#### v0.1.16
-
-* Ability to parse from only an ID
-* Context DOMElement can be passed to $parse
-* Parser::query runs XPath queries on the current document
-* When parsing e-* properties, elements with @src, @data or @href have relative URLs resolved in the output
-
-#### v0.1.15
-
-* Added html-safe options
-* Added rel+rel-alternate parsing
-
-
-## License
-
-php-mf2 is dedicated to the public domain using Creative Commons -- CC0 1.0 Universal.
-
-http://creativecommons.org/publicdomain/zero/1.0
diff --git a/vendor/mf2/mf2/bin/fetch-mf2 b/vendor/mf2/mf2/bin/fetch-mf2
deleted file mode 100644
index 2e8e578..0000000
--- a/vendor/mf2/mf2/bin/fetch-mf2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$files = array(
-  __DIR__ . '/../vendor/autoload.php',
-  __DIR__ . '/../../../autoload.php',
-  __DIR__ . '/../Mf2/Parser.php'
-);
-
-foreach ($files as $file) {
-	if (file_exists($file)) {
-		require $file;
-		define('COMPOSER_INSTALL_LOCATION', $file);
-		break;
-	}
-}
-
-if (!defined('COMPOSER_INSTALL_LOCATION')) {
-	die('A composer /vendor/autoload.php file could not be found. You need to install composer: https://getcomposer.org/download');
-}
-
-$url = $argv[1];
-
-if (empty($url)) {
-	die("Please provide a URL to fetch+parse, e.g. bin/fetch-mf2 waterpigs.co.uk/notes");
-}
-
-if (!file_exists($url)) {
-	if (!preg_match('|https?://|', $url)) {
-		$url = 'http://' . $url;
-	}
-}
-
-$result = Mf2\fetch($url);
-
-if (defined('JSON_PRETTY_PRINT')) {
-	echo json_encode($result, JSON_PRETTY_PRINT);
-} else {
-	echo json_encode($result);
-}
diff --git a/vendor/mf2/mf2/bin/parse-mf2 b/vendor/mf2/mf2/bin/parse-mf2
deleted file mode 100644
index 12df408..0000000
--- a/vendor/mf2/mf2/bin/parse-mf2
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$files = array(
-  __DIR__ . '/../vendor/autoload.php',
-  __DIR__ . '/../../../autoload.php',
-  __DIR__ . '/../Mf2/Parser.php'
-);
-
-foreach ($files as $file) {
-	if (file_exists($file)) {
-		require $file;
-		define('COMPOSER_INSTALL_LOCATION', $file);
-		break;
-	}
-}
-
-if (!defined('COMPOSER_INSTALL_LOCATION')) {
-	die('A composer /vendor/autoload.php file could not be found. You need to install composer: https://getcomposer.org/download');
-}
-
-if (!empty($argv[1])) {
-	$url = $argv[1];
-	if (!preg_match('|https?://|', $url)) {
-		$url = 'http://' . $url;
-	}
-} else {
-	$url = null;
-}
-
-$result = Mf2\parse(fgets(STDIN), $url);
-
-if (defined('JSON_PRETTY_PRINT')) {
-	echo json_encode($result, JSON_PRETTY_PRINT);
-} else {
-	echo json_encode($result);
-}
diff --git a/vendor/mf2/mf2/composer.json b/vendor/mf2/mf2/composer.json
deleted file mode 100644
index c8f92c3..0000000
--- a/vendor/mf2/mf2/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "mf2/mf2",
-    "type": "library",
-    "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
-    "keywords": ["microformats", "microformats 2", "parser", "semantic", "html"],
-    "authors" : [
-        {
-            "name": "Barnaby Walters",
-            "homepage": "http://waterpigs.co.uk"
-        }
-    ],
-    "bin": ["bin/fetch-mf2", "bin/parse-mf2"],
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.8.*",
-        "phpdocumentor/phpdocumentor": "v2.8.4",
-        "mf2/tests": "@dev"
-    },
-    "autoload": {
-        "files": ["Mf2/Parser.php"]
-    },
-    "license": "CC0-1.0",
-    "suggest": {
-        "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
-        "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
-    }
-}
diff --git a/vendor/mf2/mf2/composer.lock b/vendor/mf2/mf2/composer.lock
deleted file mode 100644
index ac77ce3..0000000
--- a/vendor/mf2/mf2/composer.lock
+++ /dev/null
@@ -1,3619 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "5d070b435f66729017b7f1f1ad0ea8a0",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "cilex/cilex",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Cilex/Cilex.git",
-                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Cilex/Cilex/zipball/7acd965a609a56d0345e8b6071c261fbdb926cb5",
-                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5",
-                "shasum": ""
-            },
-            "require": {
-                "cilex/console-service-provider": "1.*",
-                "php": ">=5.3.3",
-                "pimple/pimple": "~1.0",
-                "symfony/finder": "~2.1",
-                "symfony/process": "~2.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "symfony/validator": "~2.1"
-            },
-            "suggest": {
-                "monolog/monolog": ">=1.0.0",
-                "symfony/validator": ">=1.0.0",
-                "symfony/yaml": ">=1.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Cilex": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "description": "The PHP micro-framework for Command line tools based on the Symfony2 Components",
-            "homepage": "http://cilex.github.com",
-            "keywords": [
-                "cli",
-                "microframework"
-            ],
-            "time": "2014-03-29T14:03:13+00:00"
-        },
-        {
-            "name": "cilex/console-service-provider",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Cilex/console-service-provider.git",
-                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Cilex/console-service-provider/zipball/25ee3d1875243d38e1a3448ff94bdf944f70d24e",
-                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "pimple/pimple": "1.*@dev",
-                "symfony/console": "~2.1"
-            },
-            "require-dev": {
-                "cilex/cilex": "1.*@dev",
-                "silex/silex": "1.*@dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Cilex\\Provider\\Console": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Beau Simensen",
-                    "email": "beau@dflydev.com",
-                    "homepage": "http://beausimensen.com"
-                },
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "description": "Console Service Provider",
-            "keywords": [
-                "cilex",
-                "console",
-                "pimple",
-                "service-provider",
-                "silex"
-            ],
-            "time": "2012-12-19T10:50:58+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Annotations\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "time": "2015-08-31T12:32:49+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "lexer",
-                "parser"
-            ],
-            "time": "2014-09-09T13:34:57+00:00"
-        },
-        {
-            "name": "erusev/parsedown",
-            "version": "1.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/1bf24f7334fe16c88bf9d467863309ceaf285b01",
-                "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Parsedown": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Emanuil Rusev",
-                    "email": "hello@erusev.com",
-                    "homepage": "http://erusev.com"
-                }
-            ],
-            "description": "Parser for Markdown.",
-            "homepage": "http://parsedown.org",
-            "keywords": [
-                "markdown",
-                "parser"
-            ],
-            "time": "2017-03-29T16:04:15+00:00"
-        },
-        {
-            "name": "herrera-io/json",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kherge-php/json.git",
-                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kherge-php/json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1",
-                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "justinrainbow/json-schema": ">=1.0,<2.0-dev",
-                "php": ">=5.3.3",
-                "seld/jsonlint": ">=1.0,<2.0-dev"
-            },
-            "require-dev": {
-                "herrera-io/phpunit-test-case": "1.*",
-                "mikey179/vfsstream": "1.1.0",
-                "phpunit/phpunit": "3.7.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/lib/json_version.php"
-                ],
-                "psr-0": {
-                    "Herrera\\Json": "src/lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kevin Herrera",
-                    "email": "kevin@herrera.io",
-                    "homepage": "http://kevin.herrera.io"
-                }
-            ],
-            "description": "A library for simplifying JSON linting and validation.",
-            "homepage": "http://herrera-io.github.com/php-json",
-            "keywords": [
-                "json",
-                "lint",
-                "schema",
-                "validate"
-            ],
-            "abandoned": "kherge/json",
-            "time": "2013-10-30T16:51:34+00:00"
-        },
-        {
-            "name": "herrera-io/phar-update",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kherge-abandoned/php-phar-update.git",
-                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kherge-abandoned/php-phar-update/zipball/00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
-                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
-                "shasum": ""
-            },
-            "require": {
-                "herrera-io/json": "1.*",
-                "kherge/version": "1.*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "herrera-io/phpunit-test-case": "1.*",
-                "mikey179/vfsstream": "1.1.0",
-                "phpunit/phpunit": "3.7.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/lib/constants.php"
-                ],
-                "psr-0": {
-                    "Herrera\\Phar\\Update": "src/lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kevin Herrera",
-                    "email": "kevin@herrera.io",
-                    "homepage": "http://kevin.herrera.io"
-                }
-            ],
-            "description": "A library for self-updating Phars.",
-            "homepage": "http://herrera-io.github.com/php-phar-update",
-            "keywords": [
-                "phar",
-                "update"
-            ],
-            "abandoned": true,
-            "time": "2013-10-30T17:23:01+00:00"
-        },
-        {
-            "name": "jms/metadata",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/metadata.git",
-                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab",
-                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "doctrine/cache": "~1.0",
-                "symfony/cache": "~3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Metadata\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Class/method/property metadata management in PHP",
-            "keywords": [
-                "annotations",
-                "metadata",
-                "xml",
-                "yaml"
-            ],
-            "time": "2016-12-05T10:18:33+00:00"
-        },
-        {
-            "name": "jms/parser-lib",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/parser-lib.git",
-                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
-            },
-            "require": {
-                "phpoption/phpoption": ">=0.9,<2.0-dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "JMS\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "description": "A library for easily creating recursive-descent parsers.",
-            "time": "2012-11-18T18:08:43+00:00"
-        },
-        {
-            "name": "jms/serializer",
-            "version": "0.16.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "c8a171357ca92b6706e395c757f334902d430ea9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9",
-                "reference": "c8a171357ca92b6706e395c757f334902d430ea9",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "1.*",
-                "jms/metadata": "~1.1",
-                "jms/parser-lib": "1.*",
-                "php": ">=5.3.2",
-                "phpcollection/phpcollection": "~0.1"
-            },
-            "require-dev": {
-                "doctrine/orm": "~2.1",
-                "doctrine/phpcr-odm": "~1.0.1",
-                "jackalope/jackalope-doctrine-dbal": "1.0.*",
-                "propel/propel1": "~1.7",
-                "symfony/filesystem": "2.*",
-                "symfony/form": "~2.1",
-                "symfony/translation": "~2.0",
-                "symfony/validator": "~2.0",
-                "symfony/yaml": "2.*",
-                "twig/twig": ">=1.8,<2.0-dev"
-            },
-            "suggest": {
-                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.15-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "JMS\\Serializer": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
-            "homepage": "http://jmsyst.com/libs/serializer",
-            "keywords": [
-                "deserialization",
-                "jaxb",
-                "json",
-                "serialization",
-                "xml"
-            ],
-            "time": "2014-03-18T08:39:00+00:00"
-        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/cc84765fb7317f6b07bd8ac78364747f95b86341",
-                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.29"
-            },
-            "require-dev": {
-                "json-schema/json-schema-test-suite": "1.1.0",
-                "phpdocumentor/phpdocumentor": "~2",
-                "phpunit/phpunit": "~3.7"
-            },
-            "bin": [
-                "bin/validate-json"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "JsonSchema\\": "src/JsonSchema/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "time": "2016-01-25T15:43:01+00:00"
-        },
-        {
-            "name": "kherge/version",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kherge-abandoned/Version.git",
-                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kherge-abandoned/Version/zipball/f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
-                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "KevinGH\\Version": "src/lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kevin Herrera",
-                    "email": "me@kevingh.com"
-                }
-            ],
-            "description": "A parsing and comparison library for semantic versioning.",
-            "homepage": "http://github.com/kherge/Version",
-            "abandoned": true,
-            "time": "2012-08-16T17:13:03+00:00"
-        },
-        {
-            "name": "mf2/tests",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/microformats/tests.git",
-                "reference": "7b10592633fe83600e00f6e00b479b4f255eb2fd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/microformats/tests/zipball/7b10592633fe83600e00f6e00b479b4f255eb2fd",
-                "reference": "7b10592633fe83600e00f6e00b479b4f255eb2fd",
-                "shasum": ""
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "CC0"
-            ],
-            "authors": [
-                {
-                    "name": "Glenn Jones",
-                    "homepage": "https://glennjones.net/"
-                }
-            ],
-            "description": "Microformats test suite",
-            "homepage": "https://github.com/microformats/tests",
-            "time": "2017-05-27T08:22:21+00:00"
-        },
-        {
-            "name": "monolog/monolog",
-            "version": "1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
-                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/log": "~1.0"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0.0"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-                "doctrine/couchdb": "~1.0@dev",
-                "graylog2/gelf-php": "~1.0",
-                "jakub-onderka/php-parallel-lint": "0.9",
-                "php-amqplib/php-amqplib": "~2.4",
-                "php-console/php-console": "^3.1.3",
-                "phpunit/phpunit": "~4.5",
-                "phpunit/phpunit-mock-objects": "2.3.0",
-                "ruflin/elastica": ">=0.90 <3.0",
-                "sentry/sentry": "^0.13",
-                "swiftmailer/swiftmailer": "~5.3"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-mongo": "Allow sending log messages to a MongoDB server",
-                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
-                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-                "sentry/sentry": "Allow sending log messages to a Sentry server"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Monolog\\": "src/Monolog"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "http://github.com/Seldaek/monolog",
-            "keywords": [
-                "log",
-                "logging",
-                "psr-3"
-            ],
-            "time": "2017-03-13T07:08:03+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v0.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PHPParser": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "time": "2014-07-23T18:24:17+00:00"
-        },
-        {
-            "name": "phpcollection/phpcollection",
-            "version": "0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-collection.git",
-                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                "shasum": ""
-            },
-            "require": {
-                "phpoption/phpoption": "1.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PhpCollection": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "General-Purpose Collection Library for PHP",
-            "keywords": [
-                "collection",
-                "list",
-                "map",
-                "sequence",
-                "set"
-            ],
-            "time": "2015-05-17T12:39:23+00:00"
-        },
-        {
-            "name": "phpdocumentor/fileset",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/Fileset.git",
-                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/Fileset/zipball/bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
-                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/finder": "~2.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/",
-                        "tests/unit/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Fileset component for collecting a set of files given directories and file paths",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "files",
-                "fileset",
-                "phpdoc"
-            ],
-            "time": "2013-08-06T21:07:42+00:00"
-        },
-        {
-            "name": "phpdocumentor/graphviz",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/GraphViz.git",
-                "reference": "a906a90a9f230535f25ea31caf81b2323956283f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/GraphViz/zipball/a906a90a9f230535f25ea31caf81b2323956283f",
-                "reference": "a906a90a9f230535f25ea31caf81b2323956283f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/",
-                        "tests/unit"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2016-02-02T13:00:08+00:00"
-        },
-        {
-            "name": "phpdocumentor/phpdocumentor",
-            "version": "v2.8.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/phpDocumentor2.git",
-                "reference": "6d8f4c6381283dd2ae21efae30080adde9bfb1ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/6d8f4c6381283dd2ae21efae30080adde9bfb1ba",
-                "reference": "6d8f4c6381283dd2ae21efae30080adde9bfb1ba",
-                "shasum": ""
-            },
-            "require": {
-                "cilex/cilex": "~1.0",
-                "erusev/parsedown": "~1.0",
-                "herrera-io/phar-update": "1.0.3",
-                "jms/serializer": "~0.12",
-                "monolog/monolog": "~1.6",
-                "php": ">=5.3.3",
-                "phpdocumentor/fileset": "~1.0",
-                "phpdocumentor/graphviz": "~1.0",
-                "phpdocumentor/reflection": "~1.0",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "symfony/config": "~2.3",
-                "symfony/console": "~2.3",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/process": "~2.0",
-                "symfony/stopwatch": "~2.3",
-                "symfony/validator": "~2.2",
-                "twig/twig": "~1.3",
-                "zendframework/zend-cache": "~2.1",
-                "zendframework/zend-config": "~2.1",
-                "zendframework/zend-filter": "~2.1",
-                "zendframework/zend-i18n": "~2.1",
-                "zendframework/zend-serializer": "~2.1",
-                "zendframework/zend-servicemanager": "~2.1",
-                "zendframework/zend-stdlib": "~2.1",
-                "zetacomponents/document": ">=1.3.1"
-            },
-            "require-dev": {
-                "behat/behat": "~3.0",
-                "mikey179/vfsstream": "~1.2",
-                "mockery/mockery": "~0.9@dev",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.4",
-                "symfony/expression-language": "~2.4"
-            },
-            "suggest": {
-                "ext-twig": "Enabling the twig extension improves the generation of twig based templates.",
-                "ext-xslcache": "Enabling the XSLCache extension improves the generation of xml based templates."
-            },
-            "bin": [
-                "bin/phpdoc.php",
-                "bin/phpdoc"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "2.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/",
-                        "tests/unit/"
-                    ],
-                    "Cilex\\Provider": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Documentation Generator for PHP",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "api",
-                "application",
-                "dga",
-                "documentation",
-                "phpdoc"
-            ],
-            "time": "2015-07-03T10:23:02+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection",
-            "version": "1.0.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/Reflection.git",
-                "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/fc40c3f604ac2287eb5c314174d5109b2c699372",
-                "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "~0.9.4",
-                "php": ">=5.3.3",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "psr/log": "~1.0"
-            },
-            "require-dev": {
-                "behat/behat": "~2.4",
-                "mockery/mockery": "~0.8",
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/",
-                        "tests/unit/",
-                        "tests/mocks/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Reflection library to do Static Analysis for PHP Projects",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2014-11-14T11:43:04+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
-                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2016-01-25T08:17:30+00:00"
-        },
-        {
-            "name": "phpoption/phpoption",
-            "version": "1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.7.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PhpOption\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Option Type for PHP",
-            "keywords": [
-                "language",
-                "option",
-                "php",
-                "type"
-            ],
-            "time": "2015-07-25T16:39:46+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
-                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1|^2.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2017-03-02T20:05:34+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06T15:47:00+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2016-10-03T07:40:28+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
-                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-02-27T10:12:30+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.35",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
-                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.2.2",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-02-06T05:18:07+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02T06:51:40+00:00"
-        },
-        {
-            "name": "pimple/pimple",
-            "version": "v1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
-                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2013-11-22T08:30:29+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2016-10-10T12:19:37+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-08-18T05:49:44+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17T09:04:28+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03T07:41:43+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
-        },
-        {
-            "name": "seld/jsonlint",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/791f8c594f300d246cdf01c6b3e1e19611e301d8",
-                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5"
-            },
-            "bin": [
-                "bin/jsonlint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "JSON Linter",
-            "keywords": [
-                "json",
-                "linter",
-                "parser",
-                "validator"
-            ],
-            "time": "2017-03-06T16:42:24+00:00"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "0b8541d18507d10204a08384640ff6df3c739ebe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/0b8541d18507d10204a08384640ff6df3c739ebe",
-                "reference": "0b8541d18507d10204a08384640ff6df3c739ebe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/filesystem": "~2.3|~3.0.0"
-            },
-            "require-dev": {
-                "symfony/yaml": "~2.7|~3.0.0"
-            },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Config Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e",
-                "reference": "2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/debug": "^2.7.2|~3.0.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-26T01:38:53+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "344f50ce827413b3640bfcb1e37386a67d06ea1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/344f50ce827413b3640bfcb1e37386a67d06ea1f",
-                "reference": "344f50ce827413b3640bfcb1e37386a67d06ea1f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/class-loader": "~2.2|~3.0.0",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-19T19:56:30+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7fc8e2b4118ff316550596357325dfd92a51f531"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fc8e2b4118ff316550596357325dfd92a51f531",
-                "reference": "7fc8e2b4118ff316550596357325dfd92a51f531",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.6|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-26T16:56:54+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "dc40154e26a0116995e4f2f0c71cb9c2fe0775a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/dc40154e26a0116995e4f2f0c71cb9c2fe0775a3",
-                "reference": "dc40154e26a0116995e4f2f0c71cb9c2fe0775a3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "16d55394b31547e4a8494551b85c9b9915545347"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/16d55394b31547e4a8494551b85c9b9915545347",
-                "reference": "16d55394b31547e4a8494551b85c9b9915545347",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "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 for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "aff35fb3dee799c84a7313c576b72208b046ef8d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/aff35fb3dee799c84a7313c576b72208b046ef8d",
-                "reference": "aff35fb3dee799c84a7313c576b72208b046ef8d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "e02577b841394a78306d7b547701bb7bb705bad5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5",
-                "reference": "e02577b841394a78306d7b547701bb7bb705bad5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Stopwatch Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/translation",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/translation.git",
-                "reference": "32b7c0bffc07772cf1a902e3464ef77117fa07c7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/32b7c0bffc07772cf1a902e3464ef77117fa07c7",
-                "reference": "32b7c0bffc07772cf1a902e3464ef77117fa07c7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/config": "<2.7"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8",
-                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
-                "symfony/yaml": "~2.2|~3.0.0"
-            },
-            "suggest": {
-                "psr/log": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Translation\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Translation Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/validator",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/validator.git",
-                "reference": "e125c9ec86d615231817302115a1558cd74d9aa1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/e125c9ec86d615231817302115a1558cd74d9aa1",
-                "reference": "e125c9ec86d615231817302115a1558cd74d9aa1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation": "~2.4|~3.0.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "doctrine/cache": "~1.0",
-                "egulias/email-validator": "^1.2.1",
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.3|~3.0.0",
-                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
-                "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "^2.0.5|~3.0.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-                "egulias/email-validator": "Strict (RFC compliant) email validation",
-                "symfony/config": "",
-                "symfony/expression-language": "For using the 2.4 Expression validator",
-                "symfony/http-foundation": "",
-                "symfony/intl": "",
-                "symfony/property-access": "For using the 2.4 Validator API",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Validator\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Validator Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:07:15+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.20",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "93ccdde79f4b079c7558da4656a3cb1c50c68e02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/93ccdde79f4b079c7558da4656a3cb1c50c68e02",
-                "reference": "93ccdde79f4b079c7558da4656a3cb1c50c68e02",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-05-01T14:31:55+00:00"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v1.33.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd6ca96227917e1e85b41c7c3cc6507b411e0927",
-                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.7"
-            },
-            "require-dev": {
-                "psr/container": "^1.0",
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~3.3@dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.33-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2017-04-20T17:39:48+00:00"
-        },
-        {
-            "name": "zendframework/zend-cache",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-cache.git",
-                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/5999e5a03f7dcf82abbbe67eea74da641f959684",
-                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-serializer": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-session": "~2.5"
-            },
-            "suggest": {
-                "ext-apc": "APC >= 3.1.6 to use the APC storage adapter",
-                "ext-dba": "DBA, to use the DBA storage adapter",
-                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
-                "ext-mongo": "Mongo, to use MongoDb storage adapter",
-                "ext-wincache": "WinCache, to use the WinCache storage adapter",
-                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-session": "Zend\\Session component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides a generic way to cache any data",
-            "homepage": "https://github.com/zendframework/zend-cache",
-            "keywords": [
-                "cache",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:31:59+00:00"
-        },
-        {
-            "name": "zendframework/zend-config",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-config.git",
-                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
-                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-filter": "~2.5",
-                "zendframework/zend-i18n": "~2.5",
-                "zendframework/zend-json": "~2.5",
-                "zendframework/zend-mvc": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Config\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-            "homepage": "https://github.com/zendframework/zend-config",
-            "keywords": [
-                "config",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:00+00:00"
-        },
-        {
-            "name": "zendframework/zend-eventmanager",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-eventmanager.git",
-                "reference": "d94a16039144936f107f906896349900fd634443"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d94a16039144936f107f906896349900fd634443",
-                "reference": "d94a16039144936f107f906896349900fd634443",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\EventManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-eventmanager",
-            "keywords": [
-                "eventmanager",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:01+00:00"
-        },
-        {
-            "name": "zendframework/zend-filter",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-filter.git",
-                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/93e6990a198e6cdd811064083acac4693f4b29ae",
-                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-config": "~2.5",
-                "zendframework/zend-crypt": "~2.5",
-                "zendframework/zend-i18n": "~2.5",
-                "zendframework/zend-loader": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-uri": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-crypt": "Zend\\Crypt component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Filter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides a set of commonly needed data filters",
-            "homepage": "https://github.com/zendframework/zend-filter",
-            "keywords": [
-                "filter",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:01+00:00"
-        },
-        {
-            "name": "zendframework/zend-i18n",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "509271eb7947e4aabebfc376104179cffea42696"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/509271eb7947e4aabebfc376104179cffea42696",
-                "reference": "509271eb7947e4aabebfc376104179cffea42696",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-cache": "~2.5",
-                "zendframework/zend-config": "~2.5",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-filter": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-validator": "~2.5",
-                "zendframework/zend-view": "~2.5"
-            },
-            "suggest": {
-                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
-                "zendframework/zend-cache": "Zend\\Cache component",
-                "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
-                "zendframework/zend-filter": "You should install this package to use the provided filters",
-                "zendframework/zend-resources": "Translation resources",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-validator": "You should install this package to use the provided validators",
-                "zendframework/zend-view": "You should install this package to use the provided view helpers"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\I18n\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-i18n",
-            "keywords": [
-                "i18n",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:01+00:00"
-        },
-        {
-            "name": "zendframework/zend-json",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-json.git",
-                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
-                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-http": "~2.5",
-                "zendframework/zend-server": "~2.5",
-                "zendframework/zendxml": "~1.0"
-            },
-            "suggest": {
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-server": "Zend\\Server component",
-                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Json\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-            "homepage": "https://github.com/zendframework/zend-json",
-            "keywords": [
-                "json",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:01+00:00"
-        },
-        {
-            "name": "zendframework/zend-math",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-math.git",
-                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/9f02a1ac4d3374d3332c80f9215deec9c71558fc",
-                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "ircmaxell/random-lib": "~1.1",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-servicemanager": "~2.5"
-            },
-            "suggest": {
-                "ext-bcmath": "If using the bcmath functionality",
-                "ext-gmp": "If using the gmp functionality",
-                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
-                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Math\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-math",
-            "keywords": [
-                "math",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:02+00:00"
-        },
-        {
-            "name": "zendframework/zend-serializer",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
-                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-json": "~2.5",
-                "zendframework/zend-math": "~2.5",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-servicemanager": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-servicemanager": "To support plugin manager support"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Serializer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-            "homepage": "https://github.com/zendframework/zend-serializer",
-            "keywords": [
-                "serializer",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:02+00:00"
-        },
-        {
-            "name": "zendframework/zend-servicemanager",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/3b22c403e351d92526c642cba0bd810bc22e1c56",
-                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-di": "~2.5",
-                "zendframework/zend-mvc": "~2.5"
-            },
-            "suggest": {
-                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
-                "zendframework/zend-di": "Zend\\Di component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\ServiceManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-servicemanager",
-            "keywords": [
-                "servicemanager",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:02+00:00"
-        },
-        {
-            "name": "zendframework/zend-stdlib",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cc8e90a60dd5d44b9730b77d07b97550091da1ae",
-                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-config": "~2.5",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-filter": "~2.5",
-                "zendframework/zend-inputfilter": "~2.5",
-                "zendframework/zend-serializer": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-                "zendframework/zend-filter": "To support naming strategy hydrator usage",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Stdlib\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-stdlib",
-            "keywords": [
-                "stdlib",
-                "zf2"
-            ],
-            "time": "2015-06-03T15:32:03+00:00"
-        },
-        {
-            "name": "zetacomponents/base",
-            "version": "1.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zetacomponents/Base.git",
-                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zetacomponents/Base/zipball/f20df24e8de3e48b6b69b2503f917e457281e687",
-                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687",
-                "shasum": ""
-            },
-            "require-dev": {
-                "zetacomponents/unit-test": "*"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Sergey Alexeev"
-                },
-                {
-                    "name": "Sebastian Bergmann"
-                },
-                {
-                    "name": "Jan Borsodi"
-                },
-                {
-                    "name": "Raymond Bosman"
-                },
-                {
-                    "name": "Frederik Holljen"
-                },
-                {
-                    "name": "Kore Nordmann"
-                },
-                {
-                    "name": "Derick Rethans"
-                },
-                {
-                    "name": "Vadym Savchuk"
-                },
-                {
-                    "name": "Tobias Schlitt"
-                },
-                {
-                    "name": "Alexandru Stanoi"
-                }
-            ],
-            "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
-            "homepage": "https://github.com/zetacomponents",
-            "time": "2014-09-19T03:28:34+00:00"
-        },
-        {
-            "name": "zetacomponents/document",
-            "version": "1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zetacomponents/Document.git",
-                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zetacomponents/Document/zipball/688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
-                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
-                "shasum": ""
-            },
-            "require": {
-                "zetacomponents/base": "*"
-            },
-            "require-dev": {
-                "zetacomponents/unit-test": "dev-master"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann"
-                },
-                {
-                    "name": "Kore Nordmann"
-                },
-                {
-                    "name": "Derick Rethans"
-                },
-                {
-                    "name": "Tobias Schlitt"
-                },
-                {
-                    "name": "Alexandru Stanoi"
-                }
-            ],
-            "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
-            "homepage": "https://github.com/zetacomponents",
-            "time": "2013-12-19T11:40:00+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "mf2/tests": 20
-    },
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.4.0"
-    },
-    "platform-dev": []
-}
diff --git a/vendor/mf2/mf2/phpunit.xml b/vendor/mf2/mf2/phpunit.xml
deleted file mode 100644
index 08a3463..0000000
--- a/vendor/mf2/mf2/phpunit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<phpunit bootstrap="tests/Mf2/bootstrap.php">
-	<testsuites>
-		<testsuite name="php-mf2">
-			<directory suffix="Test.php">tests/Mf2</directory>
-		</testsuite>
-	</testsuites>
-</phpunit>

From 952e6620fa0b56bacc61064ba2bda1ed3f634484 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sun, 5 Nov 2023 14:38:38 -0800
Subject: [PATCH 08/17] Add support for h-x-app

Closes #3
---
 ProcessIndieAuth.module.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ProcessIndieAuth.module.php b/ProcessIndieAuth.module.php
index 4664e2a..9295b58 100644
--- a/ProcessIndieAuth.module.php
+++ b/ProcessIndieAuth.module.php
@@ -25,8 +25,6 @@
     Barnabywalters\Mf2 as Mf2Helper,
     Mf2
 };
-// use IndieAuth\Libs\;
-// use function IndieAuth\Libs\Mf2\parse;
 
 class ProcessIndieAuth extends Process implements Module, ConfigurableModule
 {
@@ -54,8 +52,6 @@ public static function getModuleInfo(): array
     public function init(): void
     {
         require_once 'vendor/autoload.php';
-        // require_once 'build/vendor/scoper-autoload.php';
-        // require_once 'libs/vendor/autoload.php';
         $this->addHookAfter('Session::loginSuccess', $this, 'loginSuccess');
         if ($this->auto_revoke) {
             $this->addHook('LazyCron::every12Hours', $this, 'revokeExpiredTokens');
@@ -2071,6 +2067,10 @@ private function getClientInfo(string $url): array
 
         $apps = Mf2Helper\findMicroformatsByType($mf, 'h-app');
 
+        if (!$apps) {
+            $apps = Mf2Helper\findMicroformatsByType($mf, 'h-x-app');
+        }
+
         if (!$apps) {
             return $info;
         }

From 175c1b9f81cf9264f7dd72263d192606413afc2e Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Sun, 5 Nov 2023 14:48:12 -0800
Subject: [PATCH 09/17] Update Client Credentials page

---
 CHANGELOG.md              | 1 +
 views/execute-clients.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e31a4d..76cc591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Introspection Endpoint with HTTP Basic Authentication support
 - Admin: add clients and generate client_secrets for use with Client Credentials Flow
 - Admin: manually add a token with client_id and scopes -- for developer testing
+- Support for clients with h-x-app [#3](https://github.com/gRegorLove/ProcessWire-IndieAuth/issues/3)
 
 ### Changed
 - Noted refresh token expiration in the list of approved applications
diff --git a/views/execute-clients.php b/views/execute-clients.php
index 0ef3318..c21070b 100644
--- a/views/execute-clients.php
+++ b/views/execute-clients.php
@@ -11,13 +11,14 @@
 
 namespace ProcessWire;
 
-if ($table):
 ?>
 
     <p> <b>Advanced:</b> use this page if you need to set up <a href="https://www.oauth.com/oauth2-servers/access-tokens/client-credentials/" target="_blank" rel="noopener">Client Credentials</a> allowing a client to authenticate as itself instead of a user. </p>
 
     <p> You do not need to add anything here to use IndieAuth to sign in with your domain name. </p>
 
+<?php if ($table): ?>
+
     <?=$table->render();?>
     <?=$results->renderPager();?>
 

From e9e88aac23db1027b376a17316953c3f6d1bf606 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Thu, 4 Jul 2024 12:36:24 -0700
Subject: [PATCH 10/17] Update scoped dependencies

---
 composer.json                                 |   36 +-
 composer.lock                                 | 2538 ++++-------------
 config/php-scoper/scoper.inc.php              |    2 +-
 scoped-composer.json                          |   28 +
 scoped-composer.lock                          | 1683 +++++++++++
 .../barnabywalters/mf-cleaner/composer.json   |    0
 .../mf-cleaner/src/functions.php              |    0
 .../mf-cleaner/tests/CleanerTest.php          |    0
 .../firebase/php-jwt/LICENSE                  |    0
 .../firebase/php-jwt/composer.json            |    6 +-
 .../php-jwt/src/BeforeValidException.php      |    0
 .../firebase/php-jwt/src/CachedKeySet.php     |   12 +-
 .../firebase/php-jwt/src/ExpiredException.php |    0
 .../firebase/php-jwt/src/JWK.php              |    0
 .../firebase/php-jwt/src/JWT.php              |   12 +-
 .../src/JWTExceptionWithPayloadInterface.php  |    0
 .../firebase/php-jwt/src/Key.php              |    0
 .../php-jwt/src/SignatureInvalidException.php |    0
 {libs => scoped-libs}/mf2/mf2/Mf2/Parser.php  |    0
 {libs => scoped-libs}/mf2/mf2/composer.json   |    0
 .../mf2/tests/Mf2/ClassicMicroformatsTest.php |    0
 .../tests/Mf2/CombinedMicroformatsTest.php    |    0
 .../tests/Mf2/MicroformatsTestSuiteTest.php   |    0
 .../Mf2/MicroformatsWikiExamplesTest.php      |    0
 .../mf2/mf2/tests/Mf2/ParseDTTest.php         |    0
 .../mf2/mf2/tests/Mf2/ParseHtmlIdTest.php     |    0
 .../mf2/mf2/tests/Mf2/ParseImpliedTest.php    |    0
 .../mf2/mf2/tests/Mf2/ParseLanguageTest.php   |    0
 .../mf2/mf2/tests/Mf2/ParsePTest.php          |    0
 .../mf2/mf2/tests/Mf2/ParseUTest.php          |    0
 .../tests/Mf2/ParseValueClassTitleTest.php    |    0
 .../mf2/mf2/tests/Mf2/ParserTest.php          |    0
 .../mf2/mf2/tests/Mf2/PlainTextTest.php       |    0
 .../mf2/mf2/tests/Mf2/RelTest.php             |    0
 .../mf2/mf2/tests/Mf2/URLTest.php             |    0
 .../mf2/mf2/tests/Mf2/bootstrap.php           |    0
 36 files changed, 2336 insertions(+), 1981 deletions(-)
 create mode 100644 scoped-composer.json
 create mode 100644 scoped-composer.lock
 rename {libs => scoped-libs}/barnabywalters/mf-cleaner/composer.json (100%)
 rename {libs => scoped-libs}/barnabywalters/mf-cleaner/src/functions.php (100%)
 rename {libs => scoped-libs}/barnabywalters/mf-cleaner/tests/CleanerTest.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/LICENSE (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/composer.json (91%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/BeforeValidException.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/CachedKeySet.php (93%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/ExpiredException.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/JWK.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/JWT.php (98%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/Key.php (100%)
 rename {libs => scoped-libs}/firebase/php-jwt/src/SignatureInvalidException.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/Mf2/Parser.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/composer.json (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseDTTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseImpliedTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseLanguageTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParsePTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseUTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/ParserTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/PlainTextTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/RelTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/URLTest.php (100%)
 rename {libs => scoped-libs}/mf2/mf2/tests/Mf2/bootstrap.php (100%)

diff --git a/composer.json b/composer.json
index accbc99..8129a30 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,17 @@
 {
-    "require-dev": {
-        "mf2/mf2": "^0.5",
-        "barnabywalters/mf-cleaner": "^0.2",
-        "firebase/php-jwt": "^6.0",
-        "humbug/php-scoper": "^0.18.3"
-    },
     "autoload": {
-        "classmap": [
-            "libs/"
-        ],
-        "files": [
-            "libs/mf2/mf2/Mf2/Parser.php",
-            "libs/barnabywalters/mf-cleaner/src/functions.php"
-        ],
         "psr-4": {
             "IndieAuth\\": "src/IndieAuth/"
-        }
-    },
-    "scripts": {
-        "prefix-dependencies": [
-            "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --output-dir=./libs --config=config/php-scoper/scoper.inc.php --force --quiet"
-        ],
-        "pre-install-cmd": [
-            "mkdir -p libs"
-        ],
-        "pre-update-cmd": [
-            "mkdir -p libs"
+        },
+        "classmap": [
+            "scoped-libs/"
         ],
-        "post-autoload-dump": [
-            "@prefix-dependencies",
-            "composer dump-autoload --no-scripts"
+        "files": [
+            "scoped-libs/mf2/mf2/Mf2/Parser.php",
+            "scoped-libs/barnabywalters/mf-cleaner/src/functions.php"
         ]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
     }
 }
diff --git a/composer.lock b/composer.lock
index 70789f1..c9691bb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,34 +4,35 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b21caa02d4ea82487e911aea860f2628",
-    "packages": [
+    "content-hash": "d04a6a4216eec9684d7a430e94632a78",
+    "packages": [],
+    "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.5.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -58,7 +59,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -74,20 +75,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-30T00:15:36+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -95,11 +96,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -125,7 +127,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -133,24 +135,83 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
+            },
+            "time": "2024-07-01T20:03:41+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -191,9 +252,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -248,40 +315,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.15",
+            "version": "9.2.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48"
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.3 || ^4.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.7.2"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -309,7 +380,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
             },
             "funding": [
                 {
@@ -317,32 +389,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-26T12:20:09+00:00"
+            "time": "2024-03-02T06:37:42+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -369,7 +441,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -377,26 +449,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:42:26+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -413,41 +497,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -466,14 +556,14 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
             "funding": [
                 {
@@ -481,33 +571,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "4.0.4",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -522,17 +611,18 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -540,53 +630,54 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2020-08-04T08:28:15+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.34",
+            "version": "9.6.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "622d0186707f39a4ae71df3bcf42d759bb868854"
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/622d0186707f39a4ae71df3bcf42d759bb868854",
-                "reference": "622d0186707f39a4ae71df3bcf42d759bb868854",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.0",
+                "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.4",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.5",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.5",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
-                "sebastian/version": "^2.0.1"
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.28",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.8",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.5",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.2",
+                "sebastian/version": "^3.0.2"
             },
             "suggest": {
                 "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage",
-                "phpunit/php-invoker": "To allow enforcing time limits"
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "bin": [
                 "phpunit"
@@ -594,10 +685,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -623,7 +717,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.34"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
             },
             "funding": [
                 {
@@ -639,32 +733,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-09-19T05:20:51+00:00"
+            "time": "2024-04-05T04:35:58+00:00"
         },
         {
-            "name": "sebastian/code-unit-reverse-lookup",
+            "name": "sebastian/cli-parser",
             "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -679,14 +773,15 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -694,34 +789,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
-            "name": "sebastian/comparator",
-            "version": "3.0.5",
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770"
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
-                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -736,31 +829,15 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5"
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
             },
             "funding": [
                 {
@@ -768,33 +845,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:31:48+00:00"
+            "time": "2020-10-26T13:08:54+00:00"
         },
         {
-            "name": "sebastian/diff",
-            "version": "3.0.4",
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae"
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae",
-                "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -810,23 +886,13 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
                 }
             ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4"
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -834,35 +900,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:30:20+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
-            "name": "sebastian/environment",
-            "version": "4.2.4",
+            "name": "sebastian/comparator",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
-            },
-            "suggest": {
-                "ext-posix": "*"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -878,18 +943,30 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
                 }
             ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
+                "comparator",
+                "compare",
+                "equality"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -897,34 +974,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
-            "name": "sebastian/exporter",
-            "version": "3.1.5",
+            "name": "sebastian/complexity",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -939,34 +1015,15 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -974,38 +1031,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:00:17+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
-            "name": "sebastian/global-state",
-            "version": "3.0.3",
+            "name": "sebastian/diff",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0"
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/66783ce213de415b451b904bfef9dda0cf9aeae0",
-                "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1021,16 +1073,23 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
             "keywords": [
-                "global state"
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.3"
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1038,34 +1097,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:23:32+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "name": "sebastian/environment",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1083,11 +1143,16 @@
                     "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -1095,32 +1160,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "name": "sebastian/exporter",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1136,13 +1203,33 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1150,32 +1237,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "name": "sebastian/global-state",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1191,21 +1284,16 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
                 }
             ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -1213,29 +1301,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
-            "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -1250,14 +1342,15 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -1265,32 +1358,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
-            "name": "sebastian/type",
-            "version": "1.1.4",
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1305,15 +1400,14 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Collection of value objects that represent the types of the PHP type system",
-            "homepage": "https://github.com/sebastianbergmann/type",
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1321,29 +1415,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:25:11+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
-            "name": "sebastian/version",
-            "version": "2.0.1",
+            "name": "sebastian/object-reflector",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1358,39 +1455,49 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
-            "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "name": "sebastian/recursion-context",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.2 || ^8.0"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1402,199 +1509,169 @@
             ],
             "authors": [
                 {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
                 }
             ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
-                    "url": "https://github.com/theseer",
+                    "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
-        }
-    ],
-    "packages-dev": [
+            "time": "2023-02-03T06:07:39+00:00"
+        },
         {
-            "name": "barnabywalters/mf-cleaner",
-            "version": "v0.2.0",
+            "name": "sebastian/resource-operations",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
-                "reference": "bf86945ccb24093294bd266ee9e874917e762680"
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/bf86945ccb24093294bd266ee9e874917e762680",
-                "reference": "bf86945ccb24093294bd266ee9e874917e762680",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~9",
-                "vimeo/psalm": "~4"
-            },
-            "suggest": {
-                "mf2/mf2": "To parse microformats2 structures from (X)HTML"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/functions.php"
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Barnaby Walters",
-                    "email": "barnaby@waterpigs.co.uk"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Cleans up microformats2 array structures",
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
-                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.2.0"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
-            "time": "2022-11-15T20:04:09+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
-            "name": "fidry/console",
-            "version": "0.5.5",
+            "name": "sebastian/type",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theofidry/console.git",
-                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7"
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/console/zipball/bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
-                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4.0 || ^8.0.0",
-                "symfony/console": "^4.4 || ^5.4 || ^6.1",
-                "symfony/event-dispatcher-contracts": "^1.0 || ^2.5 || ^3.0",
-                "symfony/service-contracts": "^1.0 || ^2.5 || ^3.0",
-                "thecodingmachine/safe": "^1.3 || ^2.0",
-                "webmozart/assert": "^1.11"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<5.3.0",
-                "symfony/framework-bundle": "<5.3.0",
-                "symfony/http-kernel": "<5.3.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4",
-                "composer/semver": "^3.3",
-                "ergebnis/composer-normalize": "^2.28",
-                "infection/infection": "^0.26",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.4.3",
-                "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.1",
-                "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.1",
-                "symfony/http-kernel": "^4.4 || ^5.4 || ^6.1",
-                "symfony/phpunit-bridge": "^4.4.47 || ^5.4 || ^6.0",
-                "symfony/yaml": "^4.4 || ^5.4 || ^6.1",
-                "webmozarts/strict-phpunit": "^7.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
-                "bamarni-bin": {
-                    "bin-links": false,
-                    "forward-command": false
-                },
                 "branch-alias": {
-                    "dev-main": "1.0.x-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Fidry\\Console\\": "src"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Théo Fidry",
-                    "email": "theo.fidry@gmail.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Library to create CLI applications",
-            "keywords": [
-                "cli",
-                "console",
-                "symfony"
-            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
-                "issues": "https://github.com/theofidry/console/issues",
-                "source": "https://github.com/theofidry/console/tree/0.5.5"
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
-                    "url": "https://github.com/theofidry",
+                    "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2022-12-18T10:49:34+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
-            "name": "fidry/filesystem",
-            "version": "1.1.0",
+            "name": "sebastian/version",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theofidry/filesystem.git",
-                "reference": "1dd372ab3eb8b84ffe9578bff576b00c9a44ee46"
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/filesystem/zipball/1dd372ab3eb8b84ffe9578bff576b00c9a44ee46",
-                "reference": "1dd372ab3eb8b84ffe9578bff576b00c9a44ee46",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1",
-                "symfony/filesystem": "^6.3",
-                "thecodingmachine/safe": "^2.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4",
-                "ergebnis/composer-normalize": "^2.28",
-                "infection/infection": "^0.26",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^10.3",
-                "symfony/finder": "^6.3",
-                "symfony/phpunit-bridge": "^6.2"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
-                "bamarni-bin": {
-                    "bin-links": false,
-                    "forward-command": false
-                },
                 "branch-alias": {
-                    "dev-main": "1.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Fidry\\FileSystem\\": "src"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1602,1495 +1679,74 @@
             ],
             "authors": [
                 {
-                    "name": "Théo Fidry",
-                    "email": "theo.fidry@gmail.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Symfony Filesystem with a few more utilities.",
-            "keywords": [
-                "filesystem"
-            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
-                "issues": "https://github.com/theofidry/filesystem/issues",
-                "source": "https://github.com/theofidry/filesystem/tree/1.1.0"
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
             "funding": [
                 {
-                    "url": "https://github.com/theofidry",
+                    "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2023-10-07T07:32:54+00:00"
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
-            "name": "firebase/php-jwt",
-            "version": "v6.9.0",
+            "name": "theseer/tokenizer",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "f03270e63eaccf3019ef0f32849c497385774e11"
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11",
-                "reference": "f03270e63eaccf3019ef0f32849c497385774e11",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
-            },
-            "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0"
-            },
-            "suggest": {
-                "ext-sodium": "Support EdDSA (Ed25519) signatures",
-                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Firebase\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Neuman Vong",
-                    "email": "neuman+pear@twilio.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Anant Narayanan",
-                    "email": "anant@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-            "homepage": "https://github.com/firebase/php-jwt",
-            "keywords": [
-                "jwt",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.9.0"
-            },
-            "time": "2023-10-05T00:24:42+00:00"
-        },
-        {
-            "name": "humbug/php-scoper",
-            "version": "0.18.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/humbug/php-scoper.git",
-                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/humbug/php-scoper/zipball/9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
-                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
-                "shasum": ""
-            },
-            "require": {
-                "fidry/console": "^0.5.0",
-                "fidry/filesystem": "^1.1",
-                "jetbrains/phpstorm-stubs": "^v2022.2",
-                "nikic/php-parser": "^4.12",
-                "php": "^8.1",
-                "symfony/console": "^5.2 || ^6.0",
-                "symfony/filesystem": "^5.2 || ^6.0",
-                "symfony/finder": "^5.2 || ^6.0",
-                "thecodingmachine/safe": "^2.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.1",
-                "ergebnis/composer-normalize": "^2.28",
-                "fidry/makefile": "^1.0",
-                "humbug/box": "^4.5.1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.0",
-                "symfony/yaml": "^6.1"
-            },
-            "bin": [
-                "bin/php-scoper"
-            ],
-            "type": "library",
-            "extra": {
-                "bamarni-bin": {
-                    "bin-links": false,
-                    "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "Humbug\\PhpScoper\\": "src/"
-                },
-                "classmap": [
-                    "vendor-hotfix/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                },
-                {
-                    "name": "Théo Fidry",
-                    "email": "theo.fidry@gmail.com"
-                },
-                {
-                    "name": "Pádraic Brady",
-                    "email": "padraic.brady@gmail.com"
-                }
-            ],
-            "description": "Prefixes all PHP namespaces in a file or directory.",
-            "support": {
-                "issues": "https://github.com/humbug/php-scoper/issues",
-                "source": "https://github.com/humbug/php-scoper/tree/0.18.7"
-            },
-            "time": "2023-11-04T18:01:12+00:00"
-        },
-        {
-            "name": "jetbrains/phpstorm-stubs",
-            "version": "v2022.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/JetBrains/phpstorm-stubs.git",
-                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/6b568c153cea002dc6fad96285c3063d07cab18d",
-                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d",
-                "shasum": ""
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "@stable",
-                "nikic/php-parser": "@stable",
-                "php": "^8.0",
-                "phpdocumentor/reflection-docblock": "@stable",
-                "phpunit/phpunit": "@stable"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "PhpStormStubsMap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "description": "PHP runtime & extensions header files for PhpStorm",
-            "homepage": "https://www.jetbrains.com/phpstorm",
-            "keywords": [
-                "autocomplete",
-                "code",
-                "inference",
-                "inspection",
-                "jetbrains",
-                "phpstorm",
-                "stubs",
-                "type"
-            ],
-            "support": {
-                "source": "https://github.com/JetBrains/phpstorm-stubs/tree/v2022.3"
-            },
-            "time": "2022-10-17T09:21:37+00:00"
-        },
-        {
-            "name": "mf2/mf2",
-            "version": "v0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/microformats/php-mf2.git",
-                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/ddc56de6be62ed4a21f569de9b80e17af678ca50",
-                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
-                "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpunit/phpunit": "^5.7",
-                "squizlabs/php_codesniffer": "^3.6.2"
-            },
-            "suggest": {
-                "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
-                "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
-            },
-            "bin": [
-                "bin/fetch-mf2",
-                "bin/parse-mf2"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Mf2/Parser.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "CC0-1.0"
-            ],
-            "authors": [
-                {
-                    "name": "Barnaby Walters",
-                    "homepage": "http://waterpigs.co.uk"
-                }
-            ],
-            "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
-            "keywords": [
-                "html",
-                "microformats",
-                "microformats 2",
-                "parser",
-                "semantic"
-            ],
-            "support": {
-                "issues": "https://github.com/microformats/php-mf2/issues",
-                "source": "https://github.com/microformats/php-mf2/tree/v0.5.0"
-            },
-            "time": "2022-02-10T01:05:27+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v4.17.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "bin": [
-                "bin/php-parse"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpParser\\": "lib/PhpParser"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
-            },
-            "time": "2023-08-13T19:53:39+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
-            },
-            "time": "2021-11-05T16:47:00+00:00"
-        },
-        {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Standard interfaces for event handling.",
-            "keywords": [
-                "events",
-                "psr",
-                "psr-14"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
-            },
-            "time": "2019-01-08T18:20:26+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v6.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
-                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0|2.0|3.0"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Eases the creation of beautiful and testable command line interfaces",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "cli",
-                "command-line",
-                "console",
-                "terminal"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.4"
-            },
-            "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-08-16T10:10:12+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "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": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/event-dispatcher": "^1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\EventDispatcher\\": ""
-                }
-            },
-            "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": "Generic abstractions related to dispatching event",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v6.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides basic utilities for the filesystem",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
-            },
-            "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-06-01T08:30:39+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v6.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
-                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "require-dev": {
-                "symfony/filesystem": "^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Finds files and directories via an intuitive fluent interface",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.5"
-            },
-            "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-09-26T12:56:25+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.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": "2023-01-26T09:26:14+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                }
-            },
-            "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 for intl's grapheme_* functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "grapheme",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.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": "2023-01-26T09:26:14+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "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 for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.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": "2023-01-26T09:26:14+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "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 for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.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": "2023-07-28T09:04:16+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/container": "^2.0"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "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": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.3.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": "2023-05-23T14:45:45+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v6.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
-                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/translation-contracts": "<2.5"
-            },
-            "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Resources/functions.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 }
             ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.5"
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
+                    "url": "https://github.com/theseer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-09-18T10:38:32+00:00"
-        },
-        {
-            "name": "thecodingmachine/safe",
-            "version": "v2.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
-                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.5",
-                "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "^3.2",
-                "thecodingmachine/phpstan-strict-rules": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "deprecated/apc.php",
-                    "deprecated/array.php",
-                    "deprecated/datetime.php",
-                    "deprecated/libevent.php",
-                    "deprecated/misc.php",
-                    "deprecated/password.php",
-                    "deprecated/mssql.php",
-                    "deprecated/stats.php",
-                    "deprecated/strings.php",
-                    "lib/special_cases.php",
-                    "deprecated/mysqli.php",
-                    "generated/apache.php",
-                    "generated/apcu.php",
-                    "generated/array.php",
-                    "generated/bzip2.php",
-                    "generated/calendar.php",
-                    "generated/classobj.php",
-                    "generated/com.php",
-                    "generated/cubrid.php",
-                    "generated/curl.php",
-                    "generated/datetime.php",
-                    "generated/dir.php",
-                    "generated/eio.php",
-                    "generated/errorfunc.php",
-                    "generated/exec.php",
-                    "generated/fileinfo.php",
-                    "generated/filesystem.php",
-                    "generated/filter.php",
-                    "generated/fpm.php",
-                    "generated/ftp.php",
-                    "generated/funchand.php",
-                    "generated/gettext.php",
-                    "generated/gmp.php",
-                    "generated/gnupg.php",
-                    "generated/hash.php",
-                    "generated/ibase.php",
-                    "generated/ibmDb2.php",
-                    "generated/iconv.php",
-                    "generated/image.php",
-                    "generated/imap.php",
-                    "generated/info.php",
-                    "generated/inotify.php",
-                    "generated/json.php",
-                    "generated/ldap.php",
-                    "generated/libxml.php",
-                    "generated/lzf.php",
-                    "generated/mailparse.php",
-                    "generated/mbstring.php",
-                    "generated/misc.php",
-                    "generated/mysql.php",
-                    "generated/network.php",
-                    "generated/oci8.php",
-                    "generated/opcache.php",
-                    "generated/openssl.php",
-                    "generated/outcontrol.php",
-                    "generated/pcntl.php",
-                    "generated/pcre.php",
-                    "generated/pgsql.php",
-                    "generated/posix.php",
-                    "generated/ps.php",
-                    "generated/pspell.php",
-                    "generated/readline.php",
-                    "generated/rpminfo.php",
-                    "generated/rrd.php",
-                    "generated/sem.php",
-                    "generated/session.php",
-                    "generated/shmop.php",
-                    "generated/sockets.php",
-                    "generated/sodium.php",
-                    "generated/solr.php",
-                    "generated/spl.php",
-                    "generated/sqlsrv.php",
-                    "generated/ssdeep.php",
-                    "generated/ssh2.php",
-                    "generated/stream.php",
-                    "generated/strings.php",
-                    "generated/swoole.php",
-                    "generated/uodbc.php",
-                    "generated/uopz.php",
-                    "generated/url.php",
-                    "generated/var.php",
-                    "generated/xdiff.php",
-                    "generated/xml.php",
-                    "generated/xmlrpc.php",
-                    "generated/yaml.php",
-                    "generated/yaz.php",
-                    "generated/zip.php",
-                    "generated/zlib.php"
-                ],
-                "classmap": [
-                    "lib/DateTime.php",
-                    "lib/DateTimeImmutable.php",
-                    "lib/Exceptions/",
-                    "deprecated/Exceptions/",
-                    "generated/Exceptions/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "support": {
-                "issues": "https://github.com/thecodingmachine/safe/issues",
-                "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0"
-            },
-            "time": "2023-04-05T11:54:14+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
                 }
             ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
-            },
-            "time": "2022-06-03T18:03:27+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
@@ -3100,5 +1756,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/config/php-scoper/scoper.inc.php b/config/php-scoper/scoper.inc.php
index 702f3ff..de0e7d3 100644
--- a/config/php-scoper/scoper.inc.php
+++ b/config/php-scoper/scoper.inc.php
@@ -8,7 +8,7 @@
 
 return [
     'prefix'  => 'IndieAuth\\Libs',
-
+    'output-dir' => 'scoped-libs',
     'finders' => [
         Finder::create()->files()->in( 'vendor/mf2/mf2' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
         Finder::create()->files()->in( 'vendor/barnabywalters/mf-cleaner' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
diff --git a/scoped-composer.json b/scoped-composer.json
new file mode 100644
index 0000000..7f28bf3
--- /dev/null
+++ b/scoped-composer.json
@@ -0,0 +1,28 @@
+{
+    "require-dev": {
+        "mf2/mf2": "^0.5",
+        "barnabywalters/mf-cleaner": "^0.2",
+        "firebase/php-jwt": "^6.0",
+        "humbug/php-scoper": "^0.18.3"
+    },
+    "autoload": {
+        "classmap": [
+            "scoped-libs/"
+        ]
+    },
+    "scripts": {
+        "prefix-dependencies": [
+            "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --config=config/php-scoper/scoper.inc.php --force --quiet"
+        ],
+        "pre-install-cmd": [
+            "mkdir -p scoped-libs"
+        ],
+        "pre-update-cmd": [
+            "mkdir -p scoped-libs"
+        ],
+        "post-autoload-dump": [
+            "@prefix-dependencies",
+            "composer dump-autoload --no-scripts"
+        ]
+    }
+}
diff --git a/scoped-composer.lock b/scoped-composer.lock
new file mode 100644
index 0000000..9f8811a
--- /dev/null
+++ b/scoped-composer.lock
@@ -0,0 +1,1683 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "febeb09cb9045d91c5981c163cb3421e",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "barnabywalters/mf-cleaner",
+            "version": "v0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barnabywalters/php-mf-cleaner.git",
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barnabywalters/php-mf-cleaner/zipball/bf86945ccb24093294bd266ee9e874917e762680",
+                "reference": "bf86945ccb24093294bd266ee9e874917e762680",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~9",
+                "vimeo/psalm": "~4"
+            },
+            "suggest": {
+                "mf2/mf2": "To parse microformats2 structures from (X)HTML"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barnaby Walters",
+                    "email": "barnaby@waterpigs.co.uk"
+                }
+            ],
+            "description": "Cleans up microformats2 array structures",
+            "support": {
+                "issues": "https://github.com/barnabywalters/php-mf-cleaner/issues",
+                "source": "https://github.com/barnabywalters/php-mf-cleaner/tree/v0.2.0"
+            },
+            "time": "2022-11-15T20:04:09+00:00"
+        },
+        {
+            "name": "fidry/console",
+            "version": "0.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/console.git",
+                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/console/zipball/bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
+                "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4.0 || ^8.0.0",
+                "symfony/console": "^4.4 || ^5.4 || ^6.1",
+                "symfony/event-dispatcher-contracts": "^1.0 || ^2.5 || ^3.0",
+                "symfony/service-contracts": "^1.0 || ^2.5 || ^3.0",
+                "thecodingmachine/safe": "^1.3 || ^2.0",
+                "webmozart/assert": "^1.11"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.3.0",
+                "symfony/framework-bundle": "<5.3.0",
+                "symfony/http-kernel": "<5.3.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4",
+                "composer/semver": "^3.3",
+                "ergebnis/composer-normalize": "^2.28",
+                "infection/infection": "^0.26",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.4.3",
+                "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.1",
+                "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.1",
+                "symfony/http-kernel": "^4.4 || ^5.4 || ^6.1",
+                "symfony/phpunit-bridge": "^4.4.47 || ^5.4 || ^6.0",
+                "symfony/yaml": "^4.4 || ^5.4 || ^6.1",
+                "webmozarts/strict-phpunit": "^7.3"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\Console\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Library to create CLI applications",
+            "keywords": [
+                "cli",
+                "console",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/console/issues",
+                "source": "https://github.com/theofidry/console/tree/0.5.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-18T10:49:34+00:00"
+        },
+        {
+            "name": "fidry/filesystem",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/filesystem.git",
+                "reference": "8303225d289da1c434f6009743fbe9aad852de0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/filesystem/zipball/8303225d289da1c434f6009743fbe9aad852de0c",
+                "reference": "8303225d289da1c434f6009743fbe9aad852de0c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1",
+                "symfony/filesystem": "^6.4 || ^7.0",
+                "thecodingmachine/safe": "^2.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4",
+                "ergebnis/composer-normalize": "^2.28",
+                "infection/infection": ">=0.26",
+                "phpunit/phpunit": "^10.3",
+                "symfony/finder": "^6.4 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\FileSystem\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Symfony Filesystem with a few more utilities.",
+            "keywords": [
+                "filesystem"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/filesystem/issues",
+                "source": "https://github.com/theofidry/filesystem/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-10T13:29:09+00:00"
+        },
+        {
+            "name": "firebase/php-jwt",
+            "version": "v6.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "500501c2ce893c824c801da135d02661199f60c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
+                "reference": "500501c2ce893c824c801da135d02661199f60c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^7.4",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psr/cache": "^2.0||^3.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
+            },
+            "time": "2024-05-18T18:05:11+00:00"
+        },
+        {
+            "name": "humbug/php-scoper",
+            "version": "0.18.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/humbug/php-scoper.git",
+                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/humbug/php-scoper/zipball/9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
+                "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858",
+                "shasum": ""
+            },
+            "require": {
+                "fidry/console": "^0.5.0",
+                "fidry/filesystem": "^1.1",
+                "jetbrains/phpstorm-stubs": "^v2022.2",
+                "nikic/php-parser": "^4.12",
+                "php": "^8.1",
+                "symfony/console": "^5.2 || ^6.0",
+                "symfony/filesystem": "^5.2 || ^6.0",
+                "symfony/finder": "^5.2 || ^6.0",
+                "thecodingmachine/safe": "^2.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.1",
+                "ergebnis/composer-normalize": "^2.28",
+                "fidry/makefile": "^1.0",
+                "humbug/box": "^4.5.1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0",
+                "symfony/yaml": "^6.1"
+            },
+            "bin": [
+                "bin/php-scoper"
+            ],
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Humbug\\PhpScoper\\": "src/"
+                },
+                "classmap": [
+                    "vendor-hotfix/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                },
+                {
+                    "name": "Théo Fidry",
+                    "email": "theo.fidry@gmail.com"
+                },
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com"
+                }
+            ],
+            "description": "Prefixes all PHP namespaces in a file or directory.",
+            "support": {
+                "issues": "https://github.com/humbug/php-scoper/issues",
+                "source": "https://github.com/humbug/php-scoper/tree/0.18.7"
+            },
+            "time": "2023-11-04T18:01:12+00:00"
+        },
+        {
+            "name": "jetbrains/phpstorm-stubs",
+            "version": "v2022.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JetBrains/phpstorm-stubs.git",
+                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/6b568c153cea002dc6fad96285c3063d07cab18d",
+                "reference": "6b568c153cea002dc6fad96285c3063d07cab18d",
+                "shasum": ""
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "@stable",
+                "nikic/php-parser": "@stable",
+                "php": "^8.0",
+                "phpdocumentor/reflection-docblock": "@stable",
+                "phpunit/phpunit": "@stable"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "PhpStormStubsMap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "PHP runtime & extensions header files for PhpStorm",
+            "homepage": "https://www.jetbrains.com/phpstorm",
+            "keywords": [
+                "autocomplete",
+                "code",
+                "inference",
+                "inspection",
+                "jetbrains",
+                "phpstorm",
+                "stubs",
+                "type"
+            ],
+            "support": {
+                "source": "https://github.com/JetBrains/phpstorm-stubs/tree/v2022.3"
+            },
+            "time": "2022-10-17T09:21:37+00:00"
+        },
+        {
+            "name": "mf2/mf2",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/microformats/php-mf2.git",
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/microformats/php-mf2/zipball/ddc56de6be62ed4a21f569de9b80e17af678ca50",
+                "reference": "ddc56de6be62ed4a21f569de9b80e17af678ca50",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.6.2"
+            },
+            "suggest": {
+                "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you",
+                "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support."
+            },
+            "bin": [
+                "bin/fetch-mf2",
+                "bin/parse-mf2"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Mf2/Parser.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "CC0-1.0"
+            ],
+            "authors": [
+                {
+                    "name": "Barnaby Walters",
+                    "homepage": "http://waterpigs.co.uk"
+                }
+            ],
+            "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API",
+            "keywords": [
+                "html",
+                "microformats",
+                "microformats 2",
+                "parser",
+                "semantic"
+            ],
+            "support": {
+                "issues": "https://github.com/microformats/php-mf2/issues",
+                "source": "https://github.com/microformats/php-mf2/tree/v0.5.0"
+            },
+            "time": "2022-02-10T01:05:27+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.19.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+            },
+            "time": "2024-03-17T08:10:35+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v6.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v6.4.9"
+            },
+            "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": "2024-06-28T09:49:33+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "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": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.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": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "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": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.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": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v6.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "b51ef8059159330b74a4d52f68e671033c0fe463"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463",
+                "reference": "b51ef8059159330b74a4d52f68e671033c0fe463",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.9"
+            },
+            "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": "2024-06-28T09:49:33+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v6.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v6.4.8"
+            },
+            "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": "2024-05-31T14:49:08+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.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": "2024-05-31T15:07:36+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "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 for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.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": "2024-05-31T15:07:36+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "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 for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.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": "2024-05-31T15:07:36+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "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 for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.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": "2024-06-19T12:30:46+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "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": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.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": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v6.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7",
+                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v6.4.9"
+            },
+            "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": "2024-06-28T09:25:38+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "thecodingmachine/phpstan-strict-rules": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "deprecated/apc.php",
+                    "deprecated/array.php",
+                    "deprecated/datetime.php",
+                    "deprecated/libevent.php",
+                    "deprecated/misc.php",
+                    "deprecated/password.php",
+                    "deprecated/mssql.php",
+                    "deprecated/stats.php",
+                    "deprecated/strings.php",
+                    "lib/special_cases.php",
+                    "deprecated/mysqli.php",
+                    "generated/apache.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/calendar.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gettext.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/inotify.php",
+                    "generated/json.php",
+                    "generated/ldap.php",
+                    "generated/libxml.php",
+                    "generated/lzf.php",
+                    "generated/mailparse.php",
+                    "generated/mbstring.php",
+                    "generated/misc.php",
+                    "generated/mysql.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php"
+                ],
+                "classmap": [
+                    "lib/DateTime.php",
+                    "lib/DateTimeImmutable.php",
+                    "lib/Exceptions/",
+                    "deprecated/Exceptions/",
+                    "generated/Exceptions/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "support": {
+                "issues": "https://github.com/thecodingmachine/safe/issues",
+                "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0"
+            },
+            "time": "2023-04-05T11:54:14+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.13"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
+            },
+            "time": "2022-06-03T18:03:27+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}
diff --git a/libs/barnabywalters/mf-cleaner/composer.json b/scoped-libs/barnabywalters/mf-cleaner/composer.json
similarity index 100%
rename from libs/barnabywalters/mf-cleaner/composer.json
rename to scoped-libs/barnabywalters/mf-cleaner/composer.json
diff --git a/libs/barnabywalters/mf-cleaner/src/functions.php b/scoped-libs/barnabywalters/mf-cleaner/src/functions.php
similarity index 100%
rename from libs/barnabywalters/mf-cleaner/src/functions.php
rename to scoped-libs/barnabywalters/mf-cleaner/src/functions.php
diff --git a/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php b/scoped-libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
similarity index 100%
rename from libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
rename to scoped-libs/barnabywalters/mf-cleaner/tests/CleanerTest.php
diff --git a/libs/firebase/php-jwt/LICENSE b/scoped-libs/firebase/php-jwt/LICENSE
similarity index 100%
rename from libs/firebase/php-jwt/LICENSE
rename to scoped-libs/firebase/php-jwt/LICENSE
diff --git a/libs/firebase/php-jwt/composer.json b/scoped-libs/firebase/php-jwt/composer.json
similarity index 91%
rename from libs/firebase/php-jwt/composer.json
rename to scoped-libs/firebase/php-jwt/composer.json
index 062f239..4bccac2 100644
--- a/libs/firebase/php-jwt/composer.json
+++ b/scoped-libs/firebase/php-jwt/composer.json
@@ -20,7 +20,7 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4||^8.0"
+        "php": "^8.0"
     },
     "suggest": {
         "paragonie\/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present",
@@ -32,10 +32,10 @@
         }
     },
     "require-dev": {
-        "guzzlehttp\/guzzle": "^6.5||^7.4",
+        "guzzlehttp\/guzzle": "^7.4",
         "phpspec\/prophecy-phpunit": "^2.0",
         "phpunit\/phpunit": "^9.5",
-        "psr\/cache": "^1.0||^2.0",
+        "psr\/cache": "^2.0||^3.0",
         "psr\/http-client": "^1.0",
         "psr\/http-factory": "^1.0"
     }
diff --git a/libs/firebase/php-jwt/src/BeforeValidException.php b/scoped-libs/firebase/php-jwt/src/BeforeValidException.php
similarity index 100%
rename from libs/firebase/php-jwt/src/BeforeValidException.php
rename to scoped-libs/firebase/php-jwt/src/BeforeValidException.php
diff --git a/libs/firebase/php-jwt/src/CachedKeySet.php b/scoped-libs/firebase/php-jwt/src/CachedKeySet.php
similarity index 93%
rename from libs/firebase/php-jwt/src/CachedKeySet.php
rename to scoped-libs/firebase/php-jwt/src/CachedKeySet.php
index b3e271d..2b9ca88 100644
--- a/libs/firebase/php-jwt/src/CachedKeySet.php
+++ b/scoped-libs/firebase/php-jwt/src/CachedKeySet.php
@@ -181,15 +181,17 @@ private function rateLimitExceeded() : bool
             return \false;
         }
         $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
-        if (!$cacheItem->isHit()) {
-            $cacheItem->expiresAfter(1);
-            // # of calls are cached each minute
+        $cacheItemData = [];
+        if ($cacheItem->isHit() && \is_array($data = $cacheItem->get())) {
+            $cacheItemData = $data;
         }
-        $callsPerMinute = (int) $cacheItem->get();
+        $callsPerMinute = $cacheItemData['callsPerMinute'] ?? 0;
+        $expiry = $cacheItemData['expiry'] ?? new \DateTime('+60 seconds', new \DateTimeZone('UTC'));
         if (++$callsPerMinute > $this->maxCallsPerMinute) {
             return \true;
         }
-        $cacheItem->set($callsPerMinute);
+        $cacheItem->set(['expiry' => $expiry, 'callsPerMinute' => $callsPerMinute]);
+        $cacheItem->expiresAt($expiry);
         $this->cache->save($cacheItem);
         return \false;
     }
diff --git a/libs/firebase/php-jwt/src/ExpiredException.php b/scoped-libs/firebase/php-jwt/src/ExpiredException.php
similarity index 100%
rename from libs/firebase/php-jwt/src/ExpiredException.php
rename to scoped-libs/firebase/php-jwt/src/ExpiredException.php
diff --git a/libs/firebase/php-jwt/src/JWK.php b/scoped-libs/firebase/php-jwt/src/JWK.php
similarity index 100%
rename from libs/firebase/php-jwt/src/JWK.php
rename to scoped-libs/firebase/php-jwt/src/JWK.php
diff --git a/libs/firebase/php-jwt/src/JWT.php b/scoped-libs/firebase/php-jwt/src/JWT.php
similarity index 98%
rename from libs/firebase/php-jwt/src/JWT.php
rename to scoped-libs/firebase/php-jwt/src/JWT.php
index d2f27ed..c59a027 100644
--- a/libs/firebase/php-jwt/src/JWT.php
+++ b/scoped-libs/firebase/php-jwt/src/JWT.php
@@ -168,13 +168,14 @@ public static function decode(string $jwt, $keyOrKeyArray, stdClass &$headers =
      */
     public static function encode(array $payload, $key, string $alg, string $keyId = null, array $head = null) : string
     {
-        $header = ['typ' => 'JWT', 'alg' => $alg];
+        $header = ['typ' => 'JWT'];
+        if (isset($head) && \is_array($head)) {
+            $header = \array_merge($header, $head);
+        }
+        $header['alg'] = $alg;
         if ($keyId !== null) {
             $header['kid'] = $keyId;
         }
-        if (isset($head) && \is_array($head)) {
-            $header = \array_merge($head, $header);
-        }
         $segments = [];
         $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($header));
         $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($payload));
@@ -209,6 +210,9 @@ public static function sign(string $msg, $key, string $alg) : string
                 return \hash_hmac($algorithm, $msg, $key, \true);
             case 'openssl':
                 $signature = '';
+                if (!\is_resource($key) && !\openssl_pkey_get_private($key)) {
+                    throw new DomainException('OpenSSL unable to validate key');
+                }
                 $success = \openssl_sign($msg, $signature, $key, $algorithm);
                 // @phpstan-ignore-line
                 if (!$success) {
diff --git a/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php b/scoped-libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
similarity index 100%
rename from libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
rename to scoped-libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php
diff --git a/libs/firebase/php-jwt/src/Key.php b/scoped-libs/firebase/php-jwt/src/Key.php
similarity index 100%
rename from libs/firebase/php-jwt/src/Key.php
rename to scoped-libs/firebase/php-jwt/src/Key.php
diff --git a/libs/firebase/php-jwt/src/SignatureInvalidException.php b/scoped-libs/firebase/php-jwt/src/SignatureInvalidException.php
similarity index 100%
rename from libs/firebase/php-jwt/src/SignatureInvalidException.php
rename to scoped-libs/firebase/php-jwt/src/SignatureInvalidException.php
diff --git a/libs/mf2/mf2/Mf2/Parser.php b/scoped-libs/mf2/mf2/Mf2/Parser.php
similarity index 100%
rename from libs/mf2/mf2/Mf2/Parser.php
rename to scoped-libs/mf2/mf2/Mf2/Parser.php
diff --git a/libs/mf2/mf2/composer.json b/scoped-libs/mf2/mf2/composer.json
similarity index 100%
rename from libs/mf2/mf2/composer.json
rename to scoped-libs/mf2/mf2/composer.json
diff --git a/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php b/scoped-libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php b/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php b/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseDTTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseDTTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseDTTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseDTTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParsePTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParsePTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParsePTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParsePTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseUTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseUTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseUTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseUTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/ParserTest.php b/scoped-libs/mf2/mf2/tests/Mf2/ParserTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/ParserTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/ParserTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/PlainTextTest.php b/scoped-libs/mf2/mf2/tests/Mf2/PlainTextTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/PlainTextTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/PlainTextTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/RelTest.php b/scoped-libs/mf2/mf2/tests/Mf2/RelTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/RelTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/RelTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/URLTest.php b/scoped-libs/mf2/mf2/tests/Mf2/URLTest.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/URLTest.php
rename to scoped-libs/mf2/mf2/tests/Mf2/URLTest.php
diff --git a/libs/mf2/mf2/tests/Mf2/bootstrap.php b/scoped-libs/mf2/mf2/tests/Mf2/bootstrap.php
similarity index 100%
rename from libs/mf2/mf2/tests/Mf2/bootstrap.php
rename to scoped-libs/mf2/mf2/tests/Mf2/bootstrap.php

From 2cfb79fc84f0da5e765cc628c0c58eff3f1dac49 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Fri, 5 Jul 2024 14:00:18 -0700
Subject: [PATCH 11/17] Update Server lib

---
 src/IndieAuth/Server.php | 32 +++++++++++++++
 tests/ServerTest.php     | 86 ++++++++++++++++++++++++++++++----------
 2 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/src/IndieAuth/Server.php b/src/IndieAuth/Server.php
index 00f8c95..0cbafd1 100644
--- a/src/IndieAuth/Server.php
+++ b/src/IndieAuth/Server.php
@@ -59,6 +59,38 @@ public static function isClientIdValid(string $url): bool
         return true;
     }
 
+    /**
+     * Reserved for future use with Ticketing
+     *
+     * @see https://indieauth.spec.indieweb.org/#indieauth-server-metadata
+     */
+    public static function isIssuerValid(
+        string $issuer,
+        string $metadata_endpoint
+    ): bool {
+        if (!static::isClientIdValid($issuer)) {
+            return false;
+        }
+
+        $issuer = static::canonizeUrl($issuer);
+        $metadata_endpoint = static::canonizeUrl($metadata_endpoint);
+        $parts = parse_url($issuer);
+
+        if (!array_key_exists('scheme', $parts) || $parts['scheme'] != 'https') {
+            return false;
+        }
+
+        if (array_key_exists('query', $parts) || array_key_exists('fragment', $parts)) {
+            return false;
+        }
+
+        if (strpos($metadata_endpoint, $issuer) !== 0) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @see https://indieauth.spec.indieweb.org/#url-canonicalization
      */
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 8eabfa2..2a64b6e 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -9,98 +9,98 @@
 
 class ServerTest extends TestCase
 {
-    public function testHasScheme()
+    public function testHasScheme(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('example.com')
         );
     }
 
-    public function testSchemeHttp()
+    public function testSchemeHttp(): void
     {
         $this->assertTrue(
             Server::isClientIdValid('http://example.com')
         );
     }
 
-    public function testSchemeHttps()
+    public function testSchemeHttps(): void
     {
         $this->assertTrue(
             Server::isClientIdValid('https://example.com')
         );
     }
 
-    public function testSchemeOther()
+    public function testSchemeOther(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('ftp://example.com')
         );
     }
 
-    public function testUser()
+    public function testUser(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('http://user@example.com')
         );
     }
 
-    public function testUserPass()
+    public function testUserPass(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://user:pass@example.com')
         );
     }
 
-    public function testDotPath()
+    public function testDotPath(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://example.com/./')
         );
     }
 
-    public function testDoubleDotPath()
+    public function testDoubleDotPath(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://example.com/../')
         );
     }
 
-    public function testFragment()
+    public function testFragment(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://example.com/#id')
         );
     }
 
-    public function testIpv4()
+    public function testIpv4(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://1.1.1.1')
         );
     }
 
-    public function testIpv6()
+    public function testIpv6(): void
     {
         $this->assertFalse(
             Server::isClientIdValid('https://[2606:4700:4700::1111]')
         );
     }
 
-    public function testIpv4Loopback()
+    public function testIpv4Loopback(): void
     {
         $this->assertTrue(
             Server::isClientIdValid('https://127.0.0.1')
         );
     }
 
-    public function testIpv6Loopback()
+    public function testIpv6Loopback(): void
     {
         $this->assertTrue(
             Server::isClientIdValid('https://[0000:0000:0000:0000:0000:0000:0000:0001]')
         );
     }
 
-    public function testCanonizedPath()
+    public function testCanonizedPath(): void
     {
         $this->assertEquals(
             Server::canonizeUrl('https://example.com'),
@@ -108,7 +108,7 @@ public function testCanonizedPath()
         );
     }
 
-    public function testCanonizedSchemeHost()
+    public function testCanonizedSchemeHost(): void
     {
         $this->assertEquals(
             Server::canonizeUrl('Https://Example.Com/Path'),
@@ -116,7 +116,7 @@ public function testCanonizedSchemeHost()
         );
     }
 
-    public function testRedirectUriSchemeMismatch()
+    public function testRedirectUriSchemeMismatch(): void
     {
         $this->assertFalse(
             Server::isRedirectUriAllowed(
@@ -126,7 +126,7 @@ public function testRedirectUriSchemeMismatch()
         );
     }
 
-    public function testRedirectUriHostMismatch()
+    public function testRedirectUriHostMismatch(): void
     {
         $this->assertFalse(
             Server::isRedirectUriAllowed(
@@ -136,7 +136,7 @@ public function testRedirectUriHostMismatch()
         );
     }
 
-    public function testRedirectUriPortMismatch()
+    public function testRedirectUriPortMismatch(): void
     {
         $this->assertFalse(
             Server::isRedirectUriAllowed(
@@ -146,7 +146,7 @@ public function testRedirectUriPortMismatch()
         );
     }
 
-    public function testBase64UrlEncode()
+    public function testBase64UrlEncode(): void
     {
         $this->assertEquals( Server::base64UrlEncode(''), '' );
         $this->assertEquals( Server::base64UrlEncode('f'), 'Zg' );
@@ -163,11 +163,57 @@ public function testBase64UrlEncode()
         $this->assertEquals( Server::base64UrlEncode($data), 'uBR_fRaGMbusv1fMdGpYDQ' );
     }
 
-    public function testCodeVerifierValid()
+    public function testCodeVerifierValid(): void
     {
         $code_verifier = 'foobar';
         $code_challenge = Server::base64UrlEncode(hash('sha256', $code_verifier, true));
         $this->assertTrue( Server::isCodeVerifierValid($code_verifier, $code_challenge) );
     }
+
+    public function testIssuerHttps(): void
+    {
+        $this->assertFalse(
+            Server::isIssuerValid(
+                'http://example.com',
+                'http://example.com/metadata-endpoint'
+            )
+        );
+        $this->assertTrue(
+            Server::isIssuerValid(
+                'https://example.com',
+                'https://example.com/metadata-endpoint'
+            )
+        );
+    }
+
+    public function testIssuerNoQuery(): void
+    {
+        $this->assertFalse(
+            Server::isIssuerValid(
+                'https://example.com/?issuer=1',
+                'https://example.com/metadata-endpoint'
+            )
+        );
+    }
+
+    public function testIssuerNoFragment(): void
+    {
+        $this->assertFalse(
+            Server::isIssuerValid(
+                'https://example.com/#issuer',
+                'https://example.com/metadata-endpoint'
+            )
+        );
+    }
+
+    public function testIssuerPrefix(): void
+    {
+        $this->assertTrue(
+            Server::isIssuerValid(
+                'https://example.com/',
+                'https://example.com/metadata/endpoint'
+            )
+        );
+    }
 }
 

From ebd19be172e9c2042350e28433edb316f9f7314f Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Fri, 5 Jul 2024 20:49:51 -0700
Subject: [PATCH 12/17] Update client information discovery

See https://github.com/indieweb/indieauth/issues/133
---
 ProcessIndieAuth.module.php |   9 ++-
 src/IndieAuth/Server.php    | 136 +++++++++++++++++++++++++++++++++++-
 2 files changed, 142 insertions(+), 3 deletions(-)

diff --git a/ProcessIndieAuth.module.php b/ProcessIndieAuth.module.php
index 9295b58..e498eeb 100644
--- a/ProcessIndieAuth.module.php
+++ b/ProcessIndieAuth.module.php
@@ -926,9 +926,9 @@ public function authorizationEndpoint(): void
 
             $request['client_id'] = Server::canonizeUrl($request['client_id']);
             $request['redirect_uri'] = Server::canonizeUrl($request['redirect_uri']);
-            $client = $this->getClientInfo($request['client_id']);
+            $client = Server::getClientInfo($request['client_id']);
 
-            if (!Server::isRedirectUriAllowed($request['redirect_uri'], $request['client_id'], $client['redirect_uri'])) {
+            if (!Server::isRedirectUriAllowed($request['redirect_uri'], $request['client_id'], $client['redirect_uris'])) {
                 $this->httpResponse('mismatched redirect_uri');
             }
 
@@ -2038,6 +2038,11 @@ private function httpResponse($response, int $http_status = 400, array $headers
         exit;
     }
 
+    /**
+     * DEPRECATED
+     *
+     * @see Client::getInfo()
+     */
     private function getClientInfo(string $url): array
     {
         $info = array_fill_keys([
diff --git a/src/IndieAuth/Server.php b/src/IndieAuth/Server.php
index 0cbafd1..d733c47 100644
--- a/src/IndieAuth/Server.php
+++ b/src/IndieAuth/Server.php
@@ -11,8 +11,81 @@
 
 namespace IndieAuth;
 
-final class Server 
+use IndieAuth\Libs\{
+    Barnabywalters\Mf2 as Mf2Helper,
+    Mf2
+};
+use ProcessWire\WireHttp;
+
+final class Server
 {
+    /**
+     * Get client information
+     * First check if the client_id itself is the info (JSON)
+     * Fallback to checking for h-app or h-x-app
+     *
+     * @see https://github.com/indieweb/indieauth/issues/133
+     */
+    public static function getClientInfo(string $client_id): array
+    {
+        $headers = static::fetchHead($client_id, ['content-type']);
+
+        $is_json = false;
+        if ($headers) {
+            if (static::hasContentType('application/json', $headers['content-type'])) {
+                $is_json = true;
+            }
+        }
+
+        $content = static::fetchBody($client_id);
+
+        if ($is_json) {
+            $json = json_decode($content, true);
+            if ($json) {
+                return [
+                    'name' => $json['client_name'] ?? '',
+                    'url' => $json['client_uri'] ?? '',
+                    'logo' => $json['logo_uri'] ?? '',
+                    'redirect_uris' => $json['redirect_uris'] ?? [],
+                ];
+            }
+        }
+
+        $info = array_fill_keys([
+            'name',
+            'url',
+            'logo',
+        ], '');
+
+        $info['name'] = parse_url($client_id, PHP_URL_HOST);
+        $info['url'] = $client_id;
+        $info['redirect_uris'] = [];
+
+        $mf2 = Mf2\parse($content, $client_id);
+        $info['redirect_uris'] = $mf2['rels']['redirect_uri'] ?? [];
+
+        $apps = Mf2Helper\findMicroformatsByType($mf2, 'h-app');
+        if (!$apps) {
+            $apps = Mf2Helper\findMicroformatsByType($mf2, 'h-x-app');
+        }
+
+        if (!$apps) {
+            return $info;
+        }
+
+        $app = reset($apps);
+
+        if (Mf2Helper\hasProp($app, 'name')) {
+            $info['name'] = Mf2Helper\getPlaintext($app, 'name');
+        }
+
+        if (Mf2Helper\hasProp($app, 'logo')) {
+            $info['logo'] = Mf2Helper\getPlaintext($app, 'logo');
+        }
+
+        return $info;
+    }
+
     /**
      * @see https://indieauth.spec.indieweb.org/#client-identifier
      */
@@ -169,5 +242,66 @@ public static function base64UrlEncode(string $input): string
     {
         return rtrim(strtr(base64_encode($input), '+/', '-_'), '=');
     }
+
+    /**
+     * Perform a HEAD request and return an array of headers
+     * If $requested_headers is provided, only return those headers.
+     * For example, `$requested_headers = ['link']` will return
+     * only the Link: headers
+     */
+    private static function fetchHead(
+        string $url,
+        array $requested_headers = []
+    ): ?array {
+        $http = new WireHttp();
+
+        $response = $http->status($url);
+        if (!$response) {
+            return null;
+        }
+
+        $http_headers = $http->getResponseHeaderValues('', true);
+
+        if ($requested_headers) {
+            $http_headers = array_intersect_key(
+                $http_headers,
+                array_fill_keys($requested_headers, [])
+            );
+
+            if (!$http_headers) {
+                return null;
+            }
+        }
+
+        return $http_headers;
+    }
+
+    /**
+     * Fetch the content of a URL
+     */
+    private static function fetchBody(string $url): string
+    {
+        $http = new WireHttp();
+        $content = $http->get($url);
+
+        if (!$content) {
+            return '';
+        }
+
+        return $content;
+    }
+
+    private static function hasContentType(
+        string $expected,
+        array $content_types
+    ) {
+        foreach ($content_types as $content_type) {
+            if (stripos($content_type, $expected) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
 

From 00c06fe0d450e53a604fa2696bb5878ecc330eed Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Fri, 5 Jul 2024 21:02:17 -0700
Subject: [PATCH 13/17] Update /vendor directory

---
 vendor/autoload.php                   |  2 +-
 vendor/composer/autoload_classmap.php | 52 +++++++++++-----------
 vendor/composer/autoload_files.php    |  4 +-
 vendor/composer/autoload_real.php     | 10 ++---
 vendor/composer/autoload_static.php   | 64 +++++++++++++--------------
 vendor/composer/installed.php         |  4 +-
 6 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/vendor/autoload.php b/vendor/autoload.php
index cf719d4..6663926 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3::getLoader();
+return ComposerAutoloaderInitfebeb09cb9045d91c5981c163cb3421e::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index e5b0f39..d32bf55 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,30 +7,30 @@
 
 return array(
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => $baseDir . '/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => $baseDir . '/libs/firebase/php-jwt/src/BeforeValidException.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => $baseDir . '/libs/firebase/php-jwt/src/CachedKeySet.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => $baseDir . '/libs/firebase/php-jwt/src/ExpiredException.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => $baseDir . '/libs/firebase/php-jwt/src/JWK.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => $baseDir . '/libs/firebase/php-jwt/src/JWT.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => $baseDir . '/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\Key' => $baseDir . '/libs/firebase/php-jwt/src/Key.php',
-    'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => $baseDir . '/libs/firebase/php-jwt/src/SignatureInvalidException.php',
-    'IndieAuth\\Libs\\Mf2\\Parser' => $baseDir . '/libs/mf2/mf2/Mf2/Parser.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParsePTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseUTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/ParserTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/RelTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => $baseDir . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
-    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => $baseDir . '/libs/mf2/mf2/tests/Mf2/URLTest.php',
+    'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => $baseDir . '/scoped-libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => $baseDir . '/scoped-libs/firebase/php-jwt/src/BeforeValidException.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => $baseDir . '/scoped-libs/firebase/php-jwt/src/CachedKeySet.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => $baseDir . '/scoped-libs/firebase/php-jwt/src/ExpiredException.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => $baseDir . '/scoped-libs/firebase/php-jwt/src/JWK.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => $baseDir . '/scoped-libs/firebase/php-jwt/src/JWT.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => $baseDir . '/scoped-libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\Key' => $baseDir . '/scoped-libs/firebase/php-jwt/src/Key.php',
+    'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => $baseDir . '/scoped-libs/firebase/php-jwt/src/SignatureInvalidException.php',
+    'IndieAuth\\Libs\\Mf2\\Parser' => $baseDir . '/scoped-libs/mf2/mf2/Mf2/Parser.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParsePTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseUTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/ParserTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/RelTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+    'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => $baseDir . '/scoped-libs/mf2/mf2/tests/Mf2/URLTest.php',
 );
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 6a24477..f59b77f 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -6,6 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'e028e420ea1d245ced7d9e07c59e020e' => $baseDir . '/libs/mf2/mf2/Mf2/Parser.php',
-    '5cd7e71b95ba7cc6cc22611a088f8653' => $baseDir . '/libs/barnabywalters/mf-cleaner/src/functions.php',
+    'eb9c22d6e1a07d2b2bf99fa9c6b4e857' => $baseDir . '/scoped-libs/mf2/mf2/Mf2/Parser.php',
+    'e543e19c14ae0c8c139d55822040dede' => $baseDir . '/scoped-libs/barnabywalters/mf-cleaner/src/functions.php',
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 2d98b70..d8b883b 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3
+class ComposerAutoloaderInitfebeb09cb9045d91c5981c163cb3421e
 {
     private static $loader;
 
@@ -22,16 +22,16 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitfebeb09cb9045d91c5981c163cb3421e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitfd0c30e4a16ae5d27443f8c89d3fe2e3', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfebeb09cb9045d91c5981c163cb3421e', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 6771fc1..bab987f 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,11 +4,11 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3
+class ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e
 {
     public static $files = array (
-        'e028e420ea1d245ced7d9e07c59e020e' => __DIR__ . '/../..' . '/libs/mf2/mf2/Mf2/Parser.php',
-        '5cd7e71b95ba7cc6cc22611a088f8653' => __DIR__ . '/../..' . '/libs/barnabywalters/mf-cleaner/src/functions.php',
+        'eb9c22d6e1a07d2b2bf99fa9c6b4e857' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/Mf2/Parser.php',
+        'e543e19c14ae0c8c139d55822040dede' => __DIR__ . '/../..' . '/scoped-libs/barnabywalters/mf-cleaner/src/functions.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -27,40 +27,40 @@ class ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3
 
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => __DIR__ . '/../..' . '/libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/BeforeValidException.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/CachedKeySet.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/ExpiredException.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWK.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWT.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\Key' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/Key.php',
-        'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => __DIR__ . '/../..' . '/libs/firebase/php-jwt/src/SignatureInvalidException.php',
-        'IndieAuth\\Libs\\Mf2\\Parser' => __DIR__ . '/../..' . '/libs/mf2/mf2/Mf2/Parser.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParsePTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseUTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/ParserTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/RelTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
-        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => __DIR__ . '/../..' . '/libs/mf2/mf2/tests/Mf2/URLTest.php',
+        'IndieAuth\\Libs\\BarnabyWalters\\Mf2\\CleanerTest' => __DIR__ . '/../..' . '/scoped-libs/barnabywalters/mf-cleaner/tests/CleanerTest.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\BeforeValidException' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/BeforeValidException.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\CachedKeySet' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/CachedKeySet.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\ExpiredException' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/ExpiredException.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWK' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/JWK.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWT' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/JWT.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\JWTExceptionWithPayloadInterface' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\Key' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/Key.php',
+        'IndieAuth\\Libs\\Firebase\\JWT\\SignatureInvalidException' => __DIR__ . '/../..' . '/scoped-libs/firebase/php-jwt/src/SignatureInvalidException.php',
+        'IndieAuth\\Libs\\Mf2\\Parser' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/Mf2/Parser.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ClassicMicroformatsTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ClassicMicroformatsTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\CombinedMicroformatsTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/CombinedMicroformatsTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsTestSuiteTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\MicroformatsWikiExamplesTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsWikiExamplesTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseDTTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseDTTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseHtmlIdTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseHtmlIdTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseImpliedTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseImpliedTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseLanguageTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseLanguageTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParsePTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParsePTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseUTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseUTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParseValueClassTitleTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParseValueClassTitleTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\ParserTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/ParserTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\PlainTextTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/PlainTextTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\RelTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/RelTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\TestSuiteParser' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/MicroformatsTestSuiteTest.php',
+        'IndieAuth\\Libs\\Mf2\\Parser\\Test\\UrlTest' => __DIR__ . '/../..' . '/scoped-libs/mf2/mf2/tests/Mf2/URLTest.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitfd0c30e4a16ae5d27443f8c89d3fe2e3::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitfebeb09cb9045d91c5981c163cb3421e::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 37502bc..a4aeb2e 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => '1.0.0+no-version-set',
         'version' => '1.0.0.0',
-        'reference' => NULL,
+        'reference' => null,
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => '1.0.0+no-version-set',
             'version' => '1.0.0.0',
-            'reference' => NULL,
+            'reference' => null,
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

From df29af9e43be61ab9745c18ec454a33be6782718 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Fri, 5 Jul 2024 21:02:31 -0700
Subject: [PATCH 14/17] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76cc591..489e24f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for clients with h-x-app [#3](https://github.com/gRegorLove/ProcessWire-IndieAuth/issues/3)
 
 ### Changed
+- Updated client information discovery [#5](https://github.com/gRegorLove/ProcessWire-IndieAuth/issues/5)
 - Noted refresh token expiration in the list of approved applications
+- Scoped dependencies to avoid namespace collisions when other plugins have same dependencies
 
 ## [0.2.1] - 2022-08-06
 ### Added

From b1cdb5d73e034a11293eb8b09ba485fec10e5942 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Fri, 5 Jul 2024 21:04:07 -0700
Subject: [PATCH 15/17] Bump version

---
 ProcessIndieAuth.module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ProcessIndieAuth.module.php b/ProcessIndieAuth.module.php
index e498eeb..e9811c3 100644
--- a/ProcessIndieAuth.module.php
+++ b/ProcessIndieAuth.module.php
@@ -35,7 +35,7 @@ public static function getModuleInfo(): array
     {
         return [
             'title' => 'IndieAuth',
-            'version' => '021',
+            'version' => '022',
             'author' => 'gRegor Morrill, https://gregorlove.com/',
             'summary' => 'Use your domain name as an IndieAuth provider',
             'href' => 'https://indieauth.com/',

From 59bc8224eed8a0e6e0fd1f9cd04a2cb9fdcf5d53 Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Thu, 11 Jul 2024 22:41:50 -0700
Subject: [PATCH 16/17] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 489e24f..c70a40e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.2.2] - 2024-07-12
 ### Added
 - Introspection Endpoint with HTTP Basic Authentication support
 - Admin: add clients and generate client_secrets for use with Client Credentials Flow

From b729f8383e702993fb57cab14d703823b4a2709f Mon Sep 17 00:00:00 2001
From: Gregor Morrill <git@gregorlove.com>
Date: Thu, 11 Jul 2024 23:01:23 -0700
Subject: [PATCH 17/17] Update readme

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c1472eb..d772a21 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,11 @@ Continue with the [Setup](#setup) steps.
 This section is intended for developers. Follow these steps when preparing a new release of the module. If you run into an issue with the dependencies on your server, you can also follow these steps. Please consider filing an issue as well, in case the conflict is something I can improve in the module.
 
 1. Delete the `vendor` folder
-2. Run `composer install`
-3. Check that `libs` folder is created and not empty
-4. Run `composer install --no-dev` to remove dev dependencies
-5. Check that the `vendor` folder only has composer autoload files, no dev dependencies
+2. Run `env COMPOSER=scoped-composer.json composer install`
+3. Check that `scoped-libs` folder is created and not empty
+4. Run `env COMPOSER=scoped-composer.json composer install --no-dev` to remove dev dependencies
+5. Run `env COMPOSER=composer.json composer dump-autoload`
+6. Check that the `vendor` folder only has composer autoload files, no dev dependencies
 
 Thanks to [this PR](https://github.com/Automattic/sensei/pull/6614) for help setting up this process.
 
@@ -69,9 +70,9 @@ To run unit tests, you can use a globally installed version of phpunit, or run `
 After running tests, be sure to remove phpunit and dev dependencies again:
 
 1. Run `composer remove phpunit/phpunit`
-2. Run `composer install --no-dev`
+2. Run `composer dump-autoload`
 
-This gets you back to step step 4 above.
+This gets you back to step step 5 above.
 
 ## Changelog
 * [Changelog](CHANGELOG.md)