Use Dice instantiation to access App\Arguments

- Remove App->args accessors

diff --git a/src/App.php b/src/App.php
index 8a36c3bfeb386464c03ec35a030bbab223d09693..c6ed818dd1a8ec23f932a1ef4eb826e8c45f7117 100644 (file)
--- a/src/App.php
+++ b/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
         *

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 76ed901110651fce562985717a5d6b6ad8d387fa..5185771d1c51294f0f921c1e13a4cc36bf29a991 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -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();
-       }
 }

diff --git a/src/Module/BaseSearchModule.php b/src/Module/BaseSearchModule.php
index 902f2e8a08dfa9b5bc2c0b92272560c012d91f52..9766c000cca8b4926d87de07b038b3a3df5f04fd 100644 (file)
--- a/src/Module/BaseSearchModule.php
+++ b/src/Module/BaseSearchModule.php
@@ -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);

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 93eeca90febeabf245c6daed938334836eb3bc53..8cd6448a27fee2b4c7b975c5c64036f65773a7e0 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -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 . '"');

diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index abd9cfa798ad2d45c09d89b68a1d12c8f6b9302e..772f4782c2cb5850c43c365a6206ed687753d876 100644 (file)
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -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);