fix test, code and style

Signed-off-by: Benjamin Brahmer <[email protected]>

lib/Controller/PageController.php

@@ -18,6 +18,7 @@
 use OCP\IRequest;
 use OCP\IAppConfig;
 use OCP\Util;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -34,53 +35,18 @@ class PageController extends Controller
 {
     use JSONHttpErrorTrait;
 
-    /**
-     * @var IAppConfig
-     */
-    private $settings;
-
-    /**
-     * @var IL10N
-     */
-    private $l10n;
-
-    /**
-     * @var IURLGenerator
-     */
-    private $urlGenerator;
-
-    /**
-     * @var RecommendedSites
-     */
-    private $recommendedSites;
-
-    /**
-     * @var StatusService
-     */
-    private $statusService;
-
-    /*
-     * @var IInitialState
-     */
-    private $initialState;
-
     public function __construct(
         IRequest $request,
-        IAppConfig $settings,
-        IURLGenerator $urlGenerator,
-        IL10N $l10n,
-        RecommendedSites $recommendedSites,
-        StatusService $statusService,
-        IInitialState $initialState,
-        ?IUserSession $userSession
+        ?IUserSession $userSession,
+        private IAppConfig $settings,
+        private IConfig $config,
+        private IURLGenerator $urlGenerator,
+        private IL10N $l10n,
+        private RecommendedSites $recommendedSites,
+        private StatusService $statusService,
+        private IInitialState $initialState
     ) {
         parent::__construct($request, $userSession);
-        $this->settings = $settings;
-        $this->urlGenerator = $urlGenerator;
-        $this->l10n = $l10n;
-        $this->recommendedSites = $recommendedSites;
-        $this->statusService = $statusService;
-        $this->initialState = $initialState;
     }
 
 
@@ -116,13 +82,14 @@ public function index(): TemplateResponse
             'oldestFirst',
             'showAll'
         ];
+
         foreach ($usersettings as $setting) {
-            $this->initialState->provideInitialState($setting, $this->settings->getUserValue(
+            $this->initialState->provideInitialState($setting, $this->config->getUserValue(
                 $this->getUserId(),
                 $this->appName,
-		$setting,
-	        '0')
-            );
+                $setting,
+                '0'
+            ));
         }
 
         $csp = new ContentSecurityPolicy();

lib/Listeners/UserSettingsListener.php

@@ -13,17 +13,19 @@
 use OCP\EventDispatcher\IEventListener;
 
 /** @template-implements IEventListener<BeforePreferenceSetEvent|BeforePreferenceDeletedEvent> */
-class UserSettingsListener implements IEventListener {
+class UserSettingsListener implements IEventListener
+{
 
-	public function handle(Event $event): void {
-		if (!($event instanceof BeforePreferenceSetEvent || $event instanceof BeforePreferenceDeletedEvent)) {
-		  return;
-		}
+    public function handle(Event $event): void
+    {
+        if (!($event instanceof BeforePreferenceSetEvent || $event instanceof BeforePreferenceDeletedEvent)) {
+            return;
+        }
 
-		if ($event->getAppId() !== 'news') {
+        if ($event->getAppId() !== 'news') {
             return;
-		}
+        }
 
-		$event->setValid(true);
-	}
+        $event->setValid(true);
+    }
 }

tests/Unit/Controller/PageControllerTest.php

@@ -26,6 +26,7 @@
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\AppFramework\Services\IInitialState;
 use PHPUnit\Framework\TestCase;
 
 class PageControllerTest extends TestCase
@@ -86,6 +87,11 @@ class PageControllerTest extends TestCase
      */
     private $userSession;
 
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|IInitialState
+     */
+    private $initalState;
+
     /**
      * Gets run before each test
      */
@@ -131,6 +137,9 @@ public function setUp(): void
         $this->userSession->expects($this->any())
             ->method('getUser')
             ->will($this->returnValue($this->user));
+        $this->initalState = $this->getMockBuilder(IInitialState::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->controller = new PageController(
             $this->request,
             $this->userSession,
@@ -139,7 +148,8 @@ public function setUp(): void
             $this->urlGenerator,
             $this->l10n,
             $this->recommended,
-            $this->status
+            $this->status,
+            $this->initalState
         );
     }