[ticket/16649] Minor code adjustments

PHPBB3-16649

phpBB/composer.json

@@ -63,7 +63,7 @@
 		"laravel/homestead": "~10.17",
 		"misantron/dbunit": "~5.0",
 		"phing/phing": "~2.4",
-		"phpunit/phpunit": "^8.5 || ^9.3",
+		"phpunit/phpunit": "^9.0",
 		"squizlabs/php_codesniffer": "~3.4",
 		"symfony/browser-kit": "~5.2",
 		"symfony/css-selector": "~5.2",

phpBB/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": "a5aa7f42a32cfdfb78e3650c3a985022",
+    "content-hash": "f33ff5b8d67189b9b8c2bf749f8fd4e0",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -161,16 +161,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.0.9",
+            "version": "2.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "591c2c155cac0d2d7f34af41d3b1e29bcbfc685e"
+                "reference": "a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/591c2c155cac0d2d7f34af41d3b1e29bcbfc685e",
-                "reference": "591c2c155cac0d2d7f34af41d3b1e29bcbfc685e",
+                "url": "https://api.github.com/repos/composer/composer/zipball/a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9",
+                "reference": "a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9",
                 "shasum": ""
             },
             "require": {
@@ -238,7 +238,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.0.9"
+                "source": "https://github.com/composer/composer/tree/2.0.11"
             },
             "funding": [
                 {
@@ -254,7 +254,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T15:09:27+00:00"
+            "time": "2021-02-24T13:57:23+00:00"
         },
         {
             "name": "composer/installers",
@@ -5371,16 +5371,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.0.4",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
-                "reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
                 "shasum": ""
             },
             "require": {
@@ -5416,9 +5416,9 @@
             "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.0.4"
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
             },
-            "time": "2020-12-13T23:18:30+00:00"
+            "time": "2021-02-23T14:00:09+00:00"
         },
         {
             "name": "phing/phing",

phpBB/phpbb/di/pass/markpublic_pass.php

@@ -26,7 +26,7 @@ class markpublic_pass implements CompilerPassInterface
 	* Mark services as public by default unless they were explicitly marked as private
 	*
 	* @param ContainerBuilder $container ContainerBuilder object
-	* @return null
+	* @return void
 	*/
 	public function process(ContainerBuilder $container)
 	{

travis/setup-phpbb.sh

@@ -46,6 +46,7 @@ cd phpBB
 php ../composer.phar install --dev --no-interaction
 if [[ "$TRAVIS_PHP_VERSION" =~ ^nightly$ || "$TRAVIS_PHP_VERSION" =~ ^8 ]]
 then
-	php ../composer.phar require phpunit/phpunit:^9.3 --update-with-all-dependencies --ignore-platform-reqs --no-interaction
+	php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
+	&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs
 fi
 cd ..