Use Dice instantiation to access App\Arguments
- Remove App->args accessors
This commit is contained in:
parent
1e737ae888
commit
c8316bfe57
10
src/App.php
10
src/App.php
|
@ -132,16 +132,6 @@ class App
|
|||
*/
|
||||
private $process;
|
||||
|
||||
/**
|
||||
* Returns the arguments of the query
|
||||
*
|
||||
* @return Arguments
|
||||
*/
|
||||
public function getArgs()
|
||||
{
|
||||
return $this->args;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current config cache of this node
|
||||
*
|
||||
|
|
|
@ -155,12 +155,4 @@ abstract class BaseModule extends BaseObject
|
|||
throw new \Friendica\Network\HTTPException\ForbiddenException();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return App\Arguments
|
||||
*/
|
||||
protected static function getArgs()
|
||||
{
|
||||
return self::getApp()->getArgs();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Module;
|
||||
|
||||
use Friendica\App\Arguments;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Content\ContactSelector;
|
||||
use Friendica\Content\Pager;
|
||||
|
@ -63,7 +64,9 @@ class BaseSearchModule extends BaseModule
|
|||
$header = L10n::t('Forum Search - %s', $search);
|
||||
}
|
||||
|
||||
$pager = new Pager(self::getArgs()->getQueryString());
|
||||
/** @var Arguments $args */
|
||||
$args = self::getClass(Arguments::class);
|
||||
$pager = new Pager($args->getQueryString());
|
||||
|
||||
if ($localSearch && empty($results)) {
|
||||
$pager->setItemsPerPage(80);
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Module\Search;
|
||||
|
||||
use Friendica\App\Arguments;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Content\Pager;
|
||||
use Friendica\Content\Text\HTML;
|
||||
|
@ -125,7 +126,9 @@ class Index extends BaseSearchModule
|
|||
// OR your own posts if you are a logged in member
|
||||
// No items will be shown if the member has a blocked profile wall.
|
||||
|
||||
$pager = new Pager(self::getArgs()->getQueryString());
|
||||
/** @var Arguments $args */
|
||||
$args = self::getClass(Arguments::class);
|
||||
$pager = new Pager($args->getQueryString());
|
||||
|
||||
if ($tag) {
|
||||
Logger::info('Start tag search for "' . $search . '"');
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Module\Search;
|
||||
|
||||
use Friendica\App\Arguments;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Database\DBA;
|
||||
|
@ -11,8 +12,11 @@ class Saved extends BaseModule
|
|||
{
|
||||
public static function rawContent()
|
||||
{
|
||||
$action = self::getArgs()->get(2, 'none');
|
||||
$search = Strings::escapeTags(trim(rawurldecode(self::getArgs()->get(3, ''))));
|
||||
/** @var Arguments $args */
|
||||
$args = self::getClass(Arguments::class);
|
||||
|
||||
$action = $args->get(2, 'none');
|
||||
$search = Strings::escapeTags(trim(rawurldecode($args->get(3, ''))));
|
||||
|
||||
$return_url = $_GET['return_url'] ?? 'search?q=' . urlencode($search);
|
||||
|
||||
|
|
Loading…
Reference in a new issue