From 7901b2aa49504d918024ff13c27c096091ccdf9b Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 6 Oct 2026 11:33:38 +0200 Subject: [PATCH] add private properties for things that are dynamic now --- solid/lib/Controller/CalendarController.php | 13 ++++++---- solid/lib/Controller/ContactsController.php | 13 ++++++---- solid/lib/Controller/ProfileController.php | 9 +++++-- .../lib/Controller/SolidWebhookController.php | 17 ++++++++----- solid/lib/Controller/StorageController.php | 24 ++++++++++++------- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/solid/lib/Controller/CalendarController.php b/solid/lib/Controller/CalendarController.php index f193a798..4ed011c5 100644 --- a/solid/lib/Controller/CalendarController.php +++ b/solid/lib/Controller/CalendarController.php @@ -21,11 +21,14 @@ class CalendarController extends Controller { use DpopFactoryTrait; - /* @var IURLGenerator */ - private $urlGenerator; - - /* @var ISession */ - private $session; + private IURLGenerator $urlGenerator; + private ISession $session; + private \League\Flysystem\Filesystem $filesystem; + private \Pdsinterop\Rdf\Flysystem\Adapter\Rdf $adapter; + private \Laminas\Diactoros\Response $response; + private \Laminas\Diactoros\ServerRequest $rawRequest; + private ResourceServer $resourceServer; + private WAC $WAC; public function __construct( $AppName, diff --git a/solid/lib/Controller/ContactsController.php b/solid/lib/Controller/ContactsController.php index 52c964f1..efc41445 100644 --- a/solid/lib/Controller/ContactsController.php +++ b/solid/lib/Controller/ContactsController.php @@ -22,11 +22,14 @@ class ContactsController extends Controller { use DpopFactoryTrait; - /* @var IURLGenerator */ - private $urlGenerator; - - /* @var ISession */ - private $session; + private IURLGenerator $urlGenerator; + private ISession $session; + private \League\Flysystem\Filesystem $filesystem; + private \Pdsinterop\Rdf\Flysystem\Adapter\Rdf $adapter; + private \Laminas\Diactoros\Response $response; + private \Laminas\Diactoros\ServerRequest $rawRequest; + private ResourceServer $resourceServer; + private WAC $WAC; public function __construct( $AppName, diff --git a/solid/lib/Controller/ProfileController.php b/solid/lib/Controller/ProfileController.php index 35a3273a..4cd15a06 100644 --- a/solid/lib/Controller/ProfileController.php +++ b/solid/lib/Controller/ProfileController.php @@ -27,8 +27,13 @@ class ProfileController extends Controller { protected ServerConfig $config; protected IURLGenerator $urlGenerator; - /* @var ISession */ - private $session; + private ISession $session; + private \League\Flysystem\Filesystem $filesystem; + private \Pdsinterop\Rdf\Flysystem\Adapter\Rdf $adapter; + private \Laminas\Diactoros\Response $response; + private \Laminas\Diactoros\ServerRequest $rawRequest; + private ResourceServer $resourceServer; + private WAC $WAC; public function __construct( $AppName, diff --git a/solid/lib/Controller/SolidWebhookController.php b/solid/lib/Controller/SolidWebhookController.php index 1b19dd4b..721d74fb 100644 --- a/solid/lib/Controller/SolidWebhookController.php +++ b/solid/lib/Controller/SolidWebhookController.php @@ -29,11 +29,16 @@ class SolidWebhookController extends Controller { protected ServerConfig $config; protected IURLGenerator $urlGenerator; - /* @var ISession */ - private $session; - - /** @var SolidWebhookService */ - private $webhookService; + private ISession $session; + private SolidWebhookService $webhookService; + private string $webId; + private \Pdsinterop\Solid\Auth\Utils\DPop $DPop; + private \League\Flysystem\Filesystem $filesystem; + private \Pdsinterop\Rdf\Flysystem\Adapter\Rdf $adapter; + private \Laminas\Diactoros\Response $response; + private \Laminas\Diactoros\ServerRequest $rawRequest; + private ResourceServer $resourceServer; + private WAC $WAC; public function __construct( $AppName, @@ -57,7 +62,7 @@ public function __construct( $this->webhookService = $webhookService; $this->setJtiStorage($connection); - $this->DPop = $this->getDpop(); + $this->DPop = $this->getDPop(); try { $this->rawRequest = \Laminas\Diactoros\ServerRequestFactory::fromGlobals($_SERVER, $_GET, $_POST, $_COOKIE, $_FILES); $this->webId = $this->DPop->getWebId($this->rawRequest); diff --git a/solid/lib/Controller/StorageController.php b/solid/lib/Controller/StorageController.php index fdd6f21e..0764ef12 100644 --- a/solid/lib/Controller/StorageController.php +++ b/solid/lib/Controller/StorageController.php @@ -30,8 +30,16 @@ class StorageController extends Controller protected ServerConfig $config; protected IURLGenerator $urlGenerator; - /* @var ISession */ - private $session; + private ISession $session; + private IRootFolder $rootFolder; + private \League\Flysystem\Filesystem $filesystem; + private \Pdsinterop\Rdf\Flysystem\Adapter\Rdf $adapter; + private $solidFolder; + private $userFolder; + private \Laminas\Diactoros\Response $response; + private \Laminas\Diactoros\ServerRequest $rawRequest; + private ResourceServer $resourceServer; + private WAC $WAC; public function __construct( $AppName, @@ -128,12 +136,12 @@ private function generatePublicAppendAcl($userId) { @prefix foaf: . <#public> - a acl:Authorization; - acl:agentClass foaf:Agent; - acl:accessTo <./>; - acl:default <./>; - acl:mode - acl:Append. + a acl:Authorization; + acl:agentClass foaf:Agent; + acl:accessTo <./>; + acl:default <./>; + acl:mode + acl:Append. <#owner> a acl:Authorization;