Merge pull request #34 from iMattPro/fixes

iMattPro · web-flow · commit 097e23592689 · 2025-01-23T07:06:02.000-08:00
Minor fixes
diff --git a/config/services.yml b/config/services.yml
@@ -19,6 +19,7 @@ services:
 
     phpbb.pwakit.upload:
         class: phpbb\pwakit\helper\upload
+        shared: false
         arguments:
             - '@files.upload'
             - '@phpbb.pwakit.storage'
diff --git a/controller/admin_controller.php b/controller/admin_controller.php
@@ -328,12 +328,12 @@ protected function delete(): void
 		}
 		else
 		{
-			confirm_box(false, 'ACP_PWA_IMG_DELETE', build_hidden_fields(array(
+			confirm_box(false, 'ACP_PWA_IMG_DELETE', build_hidden_fields([
 				'i'			=> $this->id,
 				'mode'		=> 'settings',
 				'delete'	=> $path,
 				'action'	=> $this->u_action,
-			)));
+			]));
 		}
 	}
 
diff --git a/tests/unit/acp_module_test.php b/tests/unit/acp_module_test.php
@@ -27,10 +27,7 @@
 
 class acp_module_test extends phpbb_test_case
 {
-	/** @var phpbb_mock_extension_manager */
 	protected phpbb_mock_extension_manager $extension_manager;
-
-	/** @var module_manager */
 	protected module_manager $module_manager;
 
 	protected function setUp(): void
diff --git a/tests/unit/admin_controller_test.php b/tests/unit/admin_controller_test.php
@@ -32,28 +32,20 @@
 class admin_controller_test extends phpbb_database_test_case
 {
 	public static bool $confirm;
-
 	public static bool $valid_form;
 
 	protected dbal $db;
-
 	protected config $config;
-
 	protected language $language;
-
 	protected request $request;
-
 	protected template|MockObject $template;
-
 	protected helper $helper;
-
 	protected upload $upload;
-
 	protected string $phpbb_root_path;
 
 	protected static function setup_extensions(): array
 	{
-		return array('phpbb/pwakit');
+		return ['phpbb/pwakit'];
 	}
 
 	protected function getDataSet(): IDataSet|XmlDataSet|DefaultDataSet
diff --git a/tests/unit/event_listener_test.php b/tests/unit/event_listener_test.php
@@ -21,13 +21,8 @@
 
 class event_listener_test extends phpbb_test_case
 {
-	/** @var user|MockObject */
 	protected user|MockObject $user;
-
-	/** @var template|MockObject  */
 	protected template|MockObject $template;
-
-	/** @var helper */
 	protected helper $helper;
 
 	/**
diff --git a/tests/unit/ext_test.php b/tests/unit/ext_test.php
@@ -25,9 +25,7 @@
 class ext_test extends phpbb_test_case
 {
 	protected ContainerInterface|MockObject $container;
-
 	protected finder|MockObject $extension_finder;
-
 	protected migrator|MockObject $migrator;
 
 	protected function setUp(): void
diff --git a/tests/unit/helper_test.php b/tests/unit/helper_test.php
@@ -35,26 +35,16 @@ class helper_test extends phpbb_database_test_case
 {
 	protected const FIXTURES = __DIR__ . '/../fixtures/';
 
-	/** @var config */
 	protected config $config;
-
-	/** @var template|MockObject  */
 	protected template|MockObject $template;
-
-	/** @var helper */
 	protected helper $helper;
-
-	/** @var storage */
 	protected storage $storage;
-
-	/** @var string */
 	protected string $storage_path;
-
 	protected string $phpbb_root_path;
 
 	protected static function setup_extensions(): array
 	{
-		return array('phpbb/pwakit');
+		return ['phpbb/pwakit'];
 	}
 
 	protected function getDataSet(): IDataSet|XmlDataSet|DefaultDataSet
diff --git a/tests/unit/upload_test.php b/tests/unit/upload_test.php
@@ -20,9 +20,9 @@
 
 class upload_test extends phpbb_test_case
 {
-	protected MockObject|\phpbb\files\upload $files_upload;
+	protected MockObject|files_upload $files_upload;
 	protected MockObject|filespec_storage $file;
-	protected storage|MockObject $storage;
+	protected MockObject|storage $storage;
 
 	protected static function setup_extensions(): array
 	{

Original file line number	Diff line number	Diff line change
`@@ -328,12 +328,12 @@ protected function delete(): void`
`328`	`328`	`}`
`329`	`329`	`else`
`330`	`330`	`{`
`331`		`- confirm_box(false, 'ACP_PWA_IMG_DELETE', build_hidden_fields(array(`
	`331`	`+ confirm_box(false, 'ACP_PWA_IMG_DELETE', build_hidden_fields([`
`332`	`332`	`'i' => $this->id,`
`333`	`333`	`'mode' => 'settings',`
`334`	`334`	`'delete' => $path,`
`335`	`335`	`'action' => $this->u_action,`
`336`		`- )));`
	`336`	`+ ]));`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,7 @@`
`27`	`27`
`28`	`28`	`class acp_module_test extends phpbb_test_case`
`29`	`29`	`{`
`30`		`- /** @var phpbb_mock_extension_manager */`
`31`	`30`	`protected phpbb_mock_extension_manager $extension_manager;`
`32`		`-`
`33`		`- /** @var module_manager */`
`34`	`31`	`protected module_manager $module_manager;`
`35`	`32`
`36`	`33`	`protected function setUp(): void`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@`
`25`	`25`	`class ext_test extends phpbb_test_case`
`26`	`26`	`{`
`27`	`27`	`protected ContainerInterface\|MockObject $container;`
`28`		`-`
`29`	`28`	`protected finder\|MockObject $extension_finder;`
`30`		`-`
`31`	`29`	`protected migrator\|MockObject $migrator;`
`32`	`30`
`33`	`31`	`protected function setUp(): void`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`
`21`	`21`	`class upload_test extends phpbb_test_case`
`22`	`22`	`{`
`23`		`- protected MockObject\|\phpbb\files\upload $files_upload;`
	`23`	`+ protected MockObject\|files_upload $files_upload;`
`24`	`24`	`protected MockObject\|filespec_storage $file;`
`25`		`- protected storage\|MockObject $storage;`
	`25`	`+ protected MockObject\|storage $storage;`
`26`	`26`
`27`	`27`	`protected static function setup_extensions(): array`
`28`	`28`	`{`