keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Dice instantiation to access App\Arguments

Browse source 
- Remove App->args accessors
This commit is contained in:
Hypolite Petovan 2019-10-07 16:16:42 -04:00
parent 1e737ae888
commit c8316bfe57
5 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App.php
View file

@ -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
*

8
src/BaseModule.php
View file

@ -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();
}
}

5
src/Module/BaseSearchModule.php
View file

@ -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);

5
src/Module/Search/Index.php
View file

@ -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 . '"');

8
src/Module/Search/Saved.php
View file

@ -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);