Skip to content

Fix/add properties #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ylebre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix/add properties #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions solid/lib/Controller/CalendarController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 8 additions & 5 deletions solid/lib/Controller/ContactsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 7 additions & 2 deletions solid/lib/Controller/ProfileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 11 additions & 6 deletions solid/lib/Controller/SolidWebhookController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down
24 changes: 16 additions & 8 deletions solid/lib/Controller/StorageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -128,12 +136,12 @@ private function generatePublicAppendAcl($userId) {
@prefix foaf: <http://xmlns.com/foaf/0.1/>.

<#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;
Expand Down
Loading