This reverts commit 158d73eb.

Revert "Sort internal changes in changelog"
Revert "Update CHANGES.md"
Revert "1.49.0rc1"
Revert "Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (#11527)"
Revert "Refactors in `_generate_sync_entry_for_rooms` (#11515)"
Revert "Correctly register shutdown handler for presence workers (#11518)"
Revert "Fix `ModuleApi.looping_background_call` for non-async functions (#11524)"
Revert "Fix 'delete room' admin api to work on incomplete rooms (#11523)"
Revert "Correctly ignore invites from ignored users (#11511)"
Revert "Fix the test breakage introduced by #11435 as a result of concurrent PRs (#11522)"
Revert "Stabilise support for MSC2918 refresh tokens as they have now been merged into the Matrix specification. (#11435)"
Revert "Save the OIDC session ID (sid) with the device on login (#11482)"
Revert "Add admin API to get some information about federation status (#11407)"
Revert "Include bundled aggregations in /sync and related fixes (#11478)"
Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)"
Revert "Update backward extremity docs to make it clear that it does not indicate whether we have fetched an events' `prev_events` (#11469)"
Revert "Support configuring the lifetime of non-refreshable access tokens separately to refreshable access tokens. (#11445)"
Revert "Add type hints to `synapse/tests/rest/admin` (#11501)"
Revert "Revert accidental commits to develop."
Revert "Newsfile"
Revert "Give `tests.server.setup_test_homeserver` (nominally!) the same behaviour"
Revert "Move `tests.utils.setup_test_homeserver` to `tests.server`"
Revert "Convert one of the `setup_test_homeserver`s to `make_test_homeserver_synchronous`"
Revert "Disambiguate queries on `state_key` (#11497)"
Revert "Comments on the /sync tentacles (#11494)"
Revert "Clean up tests.storage.test_appservice (#11492)"
Revert "Clean up `tests.storage.test_main` to remove use of legacy code. (#11493)"
Revert "Clean up `tests.test_visibility` to remove legacy code. (#11495)"
Revert "Minor cleanup on recently ported doc pages  (#11466)"
Revert "Add most of the missing type hints to `synapse.federation`. (#11483)"
Revert "Avoid waiting for zombie processes in `synctl stop` (#11490)"
Revert "Fix media repository failing when media store path contains symlinks (#11446)"
Revert "Add type annotations to `tests.storage.test_appservice`. (#11488)"
Revert "`scripts-dev/sign_json`: support for signing events (#11486)"
Revert "Add MSC3030 experimental client and federation API endpoints to get the closest event to a given timestamp (#9445)"
Revert "Port wiki pages to documentation website (#11402)"
Revert "Add a license header and comment. (#11479)"
Revert "Clean-up get_version_string (#11468)"
Revert "Link background update controller docs to summary (#11475)"
Revert "Additional type hints for config module. (#11465)"
Revert "Register the login redirect endpoint for v3. (#11451)"
Revert "Update openid.md"
Revert "Remove mention of OIDC certification from Dex (#11470)"
Revert "Add a note about huge pages to our Postgres doc (#11467)"
Revert "Don't start Synapse master process if `worker_app` is set (#11416)"
Revert "Expose worker & homeserver as entrypoints in `setup.py` (#11449)"
Revert "Bundle relations of relations into the `/relations` result. (#11284)"
Revert "Fix `LruCache` corruption bug with a `size_callback` that can return 0 (#11454)"
Revert "Eliminate a few `Any`s in `LruCache` type hints (#11453)"
Revert "Remove unnecessary `json.dumps` from `tests.rest.admin` (#11461)"
Revert "Merge branch 'master' into develop"

This reverts commit 26b5d232.
This reverts commit bce4220f.
This reverts commit 966b5d0f.
This reverts commit 088d748f.
This reverts commit 14d593f7.
This reverts commit 2a3ec6fa.
This reverts commit eccc49d7.
This reverts commit b1ecd19c.
This reverts commit 9c55dedc.
This reverts commit 2d42e586.
This reverts commit 2f053f3f.
This reverts commit a15a893d.
This reverts commit 8b4b153c.
This reverts commit 494ebd73.
This reverts commit a77c3698.
This reverts commit 4eb77965.
This reverts commit 637df95d.
This reverts commit e5f426cd.
This reverts commit 8cd68b81.
This reverts commit 6cae125e.
This reverts commit 7be88fbf.
This reverts commit b3fd99b7.
This reverts commit f7ec6e7d.
This reverts commit 5640992d.
This reverts commit d26808dd.
This reverts commit f91624a5.
This reverts commit 16d39a54.
This reverts commit 8a4c2969.
This reverts commit 49e1356e.
This reverts commit d2279f47.
This reverts commit b50e39df.
This reverts commit 858d80bf.
This reverts commit 435f0448.
This reverts commit f61462e1.
This reverts commit a6f1a3ab.
This reverts commit 84dc50e1.
This reverts commit ed635d32.
This reverts commit 7b62791e.
This reverts commit 153194c7.
This reverts commit f44d729d.
This reverts commit a265fbd3.
This reverts commit b9fef1a7.
This reverts commit b0eb64ff.
This reverts commit f1795463.
This reverts commit 70cbb1a5.
This reverts commit 42bf0204.
This reverts commit 379f2650.
This reverts commit 7ff22d6d.
This reverts commit 5a0b652d.
This reverts commit 432a174b.
This reverts commit b14f8a1b, reversing
changes made to e713855d.

This skips a few methods which are difficult to type.

This would have caught the bug #11438 introduced in #11217 and fixed in #11439.

Also refactor the stream ID trackers/generators a bit and try to
document them better.

It already seems to pass mypy. I wonder what changed, given that it was
on the exclusion list. So this commit consists of me ensuring
`--disallow-untyped-defs` passes and a minor fixup to a function that
returned either `True` or `None`.

I was sad that I couldn't do better for
`_curr_state_delta_stream_cache`. At least it's explicitly called out in
a comment with #TODO.

This was only checking the __init__ files in modules instead of
all files in a module, which don't pass yet.

* Prefer `HTTPStatus` over plain `int`

This is an Opinion that no-one has seemed to object to yet.

* `--disallow-untyped-defs` for `tests.rest.client.test_directory`
* Improve synapse's annotations for deleting aliases
* Test case for deleting a room alias
* Changelog

* Make DataStore inherit from EventForwardExtremitiesStore before CacheInvalidationWorkerStore

the former implicitly inherits from the latter, so they should be
ordered like this when used.

I'm not sure why this was excluded---it seemed to be passing for me. But
it's easy enough to fixup.

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>

This was due to a conflict between #11282, which changed
mypy configuration, and #11228, a normal change.

Signed-off-by: Dan Callahan <danc@element.io>

* Teach MyPy that the sentinel context is False

This means that if `ctx: LoggingContextOrSentinel`
then `bool(ctx)` narrows us to `ctx:LoggingContext`, which is a really
neat find!

* Annotate RequestMetrics

- Raise errors for sentry if we use the sentinel context
- Ensure we don't raise an error and carry on, but not recording stats
- Include stack trace in the error case to lower Sean's blood pressure

* Make mypy pass for synapse.http.request_metrics

* Make synapse.http.connectproxyclient pass mypy

Co-authored-by: reivilibre <oliverw@matrix.org>