diff --git a/composer.json b/composer.json
index 3cf5aea69..9179c79d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
 	"require-dev": {
-		"php-parallel-lint/php-parallel-lint": "1.2.0",
-		"mediawiki/mediawiki-codesniffer": "35.0.0",
+		"php-parallel-lint/php-parallel-lint": "1.3.0",
+		"mediawiki/mediawiki-codesniffer": "36.0.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"mediawiki/minus-x": "1.1.0",
+		"mediawiki/minus-x": "1.1.1",
 		"mediawiki/mediawiki-phan-config": "0.10.6"
 	},
 	"scripts": {
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 5df05d859..fa5d5e5ab 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -11,31 +11,31 @@ use Popups\UserPreferencesChangeHandler;
  * @codeCoverageIgnore
  */
 return [
-	'Popups.Config' => function ( MediaWikiServices $services ) {
+	'Popups.Config' => static function ( MediaWikiServices $services ) {
 		return $services->getService( 'ConfigFactory' )
 			->makeConfig( PopupsContext::EXTENSION_NAME );
 	},
-	'Popups.GadgetsIntegration' => function ( MediaWikiServices $services ) {
+	'Popups.GadgetsIntegration' => static function ( MediaWikiServices $services ) {
 		return new PopupsGadgetsIntegration(
 			$services->getService( 'Popups.Config' ),
 			ExtensionRegistry::getInstance()
 		);
 	},
-	'Popups.EventLogger' => function ( MediaWikiServices $services ) {
+	'Popups.EventLogger' => static function ( MediaWikiServices $services ) {
 		$factory = new EventLoggerFactory(
 			ExtensionRegistry::getInstance()
 		);
 		return $factory->get();
 	},
-	'Popups.UserPreferencesChangeHandler' => function ( MediaWikiServices $services ) {
+	'Popups.UserPreferencesChangeHandler' => static function ( MediaWikiServices $services ) {
 		return new UserPreferencesChangeHandler(
 			$services->getService( 'Popups.Context' )
 		);
 	},
-	'Popups.Logger' => function ( MediaWikiServices $services ) {
+	'Popups.Logger' => static function ( MediaWikiServices $services ) {
 		return LoggerFactory::getInstance( PopupsContext::LOGGER_CHANNEL );
 	},
-	'Popups.Context' => function ( MediaWikiServices $services ) {
+	'Popups.Context' => static function ( MediaWikiServices $services ) {
 		return new PopupsContext(
 			$services->getService( 'Popups.Config' ),
 			ExtensionRegistry::getInstance(),