Merge pull request #71 from Quix0r/fixes/timeout-class-reference
Fixes:
This commit is contained in:
commit
7112c65166
|
@ -15,9 +15,9 @@ require __DIR__ . '/../src/dependencies.php';
|
||||||
|
|
||||||
(new \Friendica\Directory\Controllers\Cron(
|
(new \Friendica\Directory\Controllers\Cron(
|
||||||
$container->get('atlas'),
|
$container->get('atlas'),
|
||||||
$container->get('\Friendica\Directory\Pollers\Profile'),
|
$container->get(\Friendica\Directory\Pollers\Profile::class),
|
||||||
$container->get('\Friendica\Directory\Pollers\Server'),
|
$container->get(\Friendica\Directory\Pollers\Server::class),
|
||||||
$container->get('\Friendica\Directory\Pollers\Directory'),
|
$container->get(\Friendica\Directory\Pollers\Directory::class),
|
||||||
$container->get('logger')
|
$container->get('logger')
|
||||||
))->execute();
|
))->execute();
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ class DirectoryPoll extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Console\DirectoryPoll(
|
return (new \Friendica\Directory\Controllers\Console\DirectoryPoll(
|
||||||
$this->container->get('atlas'),
|
$this->container->get('atlas'),
|
||||||
$this->container->get('\Friendica\Directory\Pollers\Directory'),
|
$this->container->get(\Friendica\Directory\Pollers\Directory::class),
|
||||||
$args
|
$args
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ class ProfileAdd extends BaseRoute
|
||||||
public function __invoke(array $args)
|
public function __invoke(array $args)
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Console\ProfileAdd(
|
return (new \Friendica\Directory\Controllers\Console\ProfileAdd(
|
||||||
$this->container->get('\Friendica\Directory\Models\ProfilePollQueue'),
|
$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
|
||||||
$args
|
$args
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ class ProfilePoll extends BaseRoute
|
||||||
public function __invoke(array $args)
|
public function __invoke(array $args)
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Console\ProfilePoll(
|
return (new \Friendica\Directory\Controllers\Console\ProfilePoll(
|
||||||
$this->container->get('\Friendica\Directory\Pollers\Profile'),
|
$this->container->get(\Friendica\Directory\Pollers\Profile::class),
|
||||||
$args
|
$args
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class ServerHide extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Console\ServerHide(
|
return (new \Friendica\Directory\Controllers\Console\ServerHide(
|
||||||
$this->container->get('atlas'),
|
$this->container->get('atlas'),
|
||||||
$this->container->get('\Friendica\Directory\Models\Server'),
|
$this->container->get(\Friendica\Directory\Models\Server::class),
|
||||||
$args
|
$args
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class ServerPoll extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Console\ServerPoll(
|
return (new \Friendica\Directory\Controllers\Console\ServerPoll(
|
||||||
$this->container->get('atlas'),
|
$this->container->get('atlas'),
|
||||||
$this->container->get('\Friendica\Directory\Pollers\Server'),
|
$this->container->get(\Friendica\Directory\Pollers\Server::class),
|
||||||
$args
|
$args
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class MatchSearch extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Api\MatchSearch(
|
return (new \Friendica\Directory\Controllers\Api\MatchSearch(
|
||||||
$this->container->atlas,
|
$this->container->atlas,
|
||||||
$this->container->get('\Friendica\Directory\Models\Profile'),
|
$this->container->get(\Friendica\Directory\Models\Profile::class),
|
||||||
$this->container->l10n
|
$this->container->l10n
|
||||||
))->render($request, $response, $args);
|
))->render($request, $response, $args);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class Search extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Api\Search(
|
return (new \Friendica\Directory\Controllers\Api\Search(
|
||||||
$this->container->atlas,
|
$this->container->atlas,
|
||||||
$this->container->get('\Friendica\Directory\Models\Profile'),
|
$this->container->get(\Friendica\Directory\Models\Profile::class),
|
||||||
$this->container->l10n
|
$this->container->l10n
|
||||||
))->render($request, $response, $args);
|
))->render($request, $response, $args);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class Submit extends BaseRoute
|
||||||
{
|
{
|
||||||
return (new \Friendica\Directory\Controllers\Api\Submit(
|
return (new \Friendica\Directory\Controllers\Api\Submit(
|
||||||
$this->container->atlas,
|
$this->container->atlas,
|
||||||
$this->container->get('\Friendica\Directory\Models\ProfilePollQueue'),
|
$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
|
||||||
$this->container->logger
|
$this->container->logger
|
||||||
))->execute($request, $response);
|
))->execute($request, $response);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,8 +13,8 @@ class Directory extends BaseRoute
|
||||||
|
|
||||||
$this->controller = new \Friendica\Directory\Controllers\Web\Directory(
|
$this->controller = new \Friendica\Directory\Controllers\Web\Directory(
|
||||||
$this->container->atlas,
|
$this->container->atlas,
|
||||||
$this->container->get('\Friendica\Directory\Models\Profile'),
|
$this->container->get(\Friendica\Directory\Models\Profile::class),
|
||||||
$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
|
$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
|
||||||
$this->container->renderer,
|
$this->container->renderer,
|
||||||
$this->container->l10n
|
$this->container->l10n
|
||||||
);
|
);
|
||||||
|
|
|
@ -13,8 +13,8 @@ class Search extends BaseRoute
|
||||||
|
|
||||||
$this->controller = new \Friendica\Directory\Controllers\Web\Search(
|
$this->controller = new \Friendica\Directory\Controllers\Web\Search(
|
||||||
$this->container->atlas,
|
$this->container->atlas,
|
||||||
$this->container->get('\Friendica\Directory\Models\Profile'),
|
$this->container->get(\Friendica\Directory\Models\Profile::class),
|
||||||
$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
|
$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
|
||||||
$this->container->renderer,
|
$this->container->renderer,
|
||||||
$this->container->l10n
|
$this->container->l10n
|
||||||
);
|
);
|
||||||
|
|
|
@ -91,52 +91,52 @@ $container['migration'] = function (ContainerInterface $c): ByJG\DbMigration\Mig
|
||||||
|
|
||||||
// Internal Dependency Injection
|
// Internal Dependency Injection
|
||||||
|
|
||||||
$container['\Friendica\Directory\Models\Profile'] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {
|
$container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {
|
||||||
return new Friendica\Directory\Models\Profile($c->get('atlas'));
|
return new Friendica\Directory\Models\Profile($c->get('atlas'));
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Models\ProfilePollQueue'] = function (ContainerInterface $c): Friendica\Directory\Models\ProfilePollQueue {
|
$container[\Friendica\Directory\Models\ProfilePollQueue::class] = function (ContainerInterface $c): Friendica\Directory\Models\ProfilePollQueue {
|
||||||
return new Friendica\Directory\Models\ProfilePollQueue($c->get('atlas'));
|
return new Friendica\Directory\Models\ProfilePollQueue($c->get('atlas'));
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Models\Server'] = function (ContainerInterface $c): Friendica\Directory\Models\Server {
|
$container[\Friendica\Directory\Models\Server::class] = function (ContainerInterface $c): Friendica\Directory\Models\Server {
|
||||||
return new Friendica\Directory\Models\Server($c->get('atlas'));
|
return new Friendica\Directory\Models\Server($c->get('atlas'));
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Pollers\Directory'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory {
|
$container[\Friendica\Directory\Pollers\Directory::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory {
|
||||||
$settings = $c->get('settings')['poller'];
|
$settings = $c->get('settings')['poller'];
|
||||||
return new Friendica\Directory\Pollers\Directory(
|
return new Friendica\Directory\Pollers\Directory(
|
||||||
$c->get('atlas'),
|
$c->get('atlas'),
|
||||||
$c->get('\Friendica\Directory\Models\ProfilePollQueue'),
|
$c->get(\Friendica\Directory\Models\ProfilePollQueue::class),
|
||||||
$c->get('logger'),
|
$c->get('logger'),
|
||||||
$settings ?: []
|
$settings ?: []
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Pollers\Profile'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Profile {
|
$container[\Friendica\Directory\Pollers\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Profile {
|
||||||
$settings = $c->get('settings')['poller'];
|
$settings = $c->get('settings')['poller'];
|
||||||
return new Friendica\Directory\Pollers\Profile(
|
return new Friendica\Directory\Pollers\Profile(
|
||||||
$c->get('atlas'),
|
$c->get('atlas'),
|
||||||
$c->get('\Friendica\Directory\Models\Server'),
|
$c->get(\Friendica\Directory\Models\Server::class),
|
||||||
$c->get('\Friendica\Directory\Models\Profile'),
|
$c->get(\Friendica\Directory\Models\Profile::class),
|
||||||
$c->get('logger'),
|
$c->get('logger'),
|
||||||
$settings ?: []
|
$settings ?: []
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Pollers\Server'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Server {
|
$container[\Friendica\Directory\Pollers\Server::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Server {
|
||||||
$settings = $c->get('settings')['poller'];
|
$settings = $c->get('settings')['poller'];
|
||||||
return new Friendica\Directory\Pollers\Server(
|
return new Friendica\Directory\Pollers\Server(
|
||||||
$c->get('atlas'),
|
$c->get('atlas'),
|
||||||
$c->get('\Friendica\Directory\Models\ProfilePollQueue'),
|
$c->get(\Friendica\Directory\Models\ProfilePollQueue::class),
|
||||||
$c->get('\Friendica\Directory\Models\Server'),
|
$c->get(\Friendica\Directory\Models\Server::class),
|
||||||
$c->get('simplecache'),
|
$c->get('simplecache'),
|
||||||
$c->get('logger'),
|
$c->get('logger'),
|
||||||
$settings ?: []
|
$settings ?: []
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
$container['\Friendica\Directory\Views\Widget\AccountTypeTabs'] = function (ContainerInterface $c): Friendica\Directory\Views\Widget\AccountTypeTabs {
|
$container[\Friendica\Directory\Views\Widget\AccountTypeTabs::class] = function (ContainerInterface $c): Friendica\Directory\Views\Widget\AccountTypeTabs {
|
||||||
return new Friendica\Directory\Views\Widget\AccountTypeTabs(
|
return new Friendica\Directory\Views\Widget\AccountTypeTabs(
|
||||||
$c->get('atlas'),
|
$c->get('atlas'),
|
||||||
$c->get('renderer'),
|
$c->get('renderer'),
|
||||||
|
|
Loading…
Reference in a new issue