Refactor after removing Framework folder

junlarsen · Jun 22, 2019 · d674b92 · d674b92
1 parent 531cc45
commit d674b92
Show file tree

Hide file tree

Showing 160 changed files with 234 additions and 230 deletions.
diff --git a/src/RiotQuest/Client.php b/src/RiotQuest/Client.php
@@ -2,7 +2,7 @@
 
 namespace RiotQuest;
 
-use RiotQuest\Components\Framework\Client\Client as Module;
+use RiotQuest\Components\Client\Client as Module;
 
 /**
  * Class Client

diff --git a/src/RiotQuest/Codegen/Codegen.php b/src/RiotQuest/Codegen/Codegen.php
@@ -7,7 +7,7 @@
 use League\Flysystem\Adapter\Local;
 use Illuminate\Support\Collection;
 use ReflectionException;
-use RiotQuest\Components\Framework\Collections\Collection as LeagueCollection;
+use RiotQuest\Components\Collections\Collection as LeagueCollection;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -40,11 +40,11 @@ public static function getInstance(): Codegen {
     public static function createAll(Closure $closure): void {
         $codegen = static::getInstance();
 
-        $in = new Filesystem(new Local(__DIR__ . '/../Components/Framework/Collections/'));
+        $in = new Filesystem(new Local(__DIR__ . '/../Components/Collections/'));
 
         foreach ($in->listContents() as $file) {
             if ($file['type'] === 'file') {
-                $res = $codegen->createFromClass("\\RiotQuest\\Components\\Framework\\Collections\\" . $file['filename']);
+                $res = $codegen->createFromClass("\\RiotQuest\\Components\\Collections\\" . $file['filename']);
 
                 $closure->call($res, $res);
             }

diff --git a/...uest/Components/Framework/Cache/Cache.php → src/RiotQuest/Components/Cache/Cache.php b/...uest/Components/Framework/Cache/Cache.php → src/RiotQuest/Components/Cache/Cache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Cache;
+namespace RiotQuest\Components\Cache;
 
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\FileExistsException;
@@ -30,7 +30,7 @@ class Cache
      */
     public function __construct()
     {
-        $this->fs = new Filesystem(new Local(__DIR__ . "/../../../../storage/cache/$this->namespace"));
+        $this->fs = new Filesystem(new Local(__DIR__ . "/../../../storage/cache/$this->namespace"));
     }
 
     /**

diff --git a/...onents/Framework/Cache/RateLimitCache.php → ...Quest/Components/Cache/RateLimitCache.php b/...onents/Framework/Cache/RateLimitCache.php → ...Quest/Components/Cache/RateLimitCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Cache;
+namespace RiotQuest\Components\Cache;
 
 /**
  * Class RateLimitCache

diff --git a/...mponents/Framework/Cache/RequestCache.php → ...otQuest/Components/Cache/RequestCache.php b/...mponents/Framework/Cache/RequestCache.php → ...otQuest/Components/Cache/RequestCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Cache;
+namespace RiotQuest\Components\Cache;
 
 /**
  * Class RequestCache

diff --git a/...mponents/Framework/Client/Application.php → ...otQuest/Components/Client/Application.php b/...mponents/Framework/Client/Application.php → ...otQuest/Components/Client/Application.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Client;
+namespace RiotQuest\Components\Client;
 
 use League\Flysystem\FileExistsException;
 use League\Flysystem\FileNotFoundException;
 use Psr\SimpleCache\InvalidArgumentException;
 use RiotQuest\Components\DataProviders\BaseProvider;
 use RiotQuest\Components\DataProviders\DataDragon;
 use RiotQuest\Components\DataProviders\Provider;
-use RiotQuest\Components\Framework\Cache\Cache;
-use RiotQuest\Components\Framework\Cache\RateLimitCache;
-use RiotQuest\Components\Framework\Cache\RequestCache;
-use RiotQuest\Components\Framework\RateLimit\Manager;
+use RiotQuest\Components\Cache\Cache;
+use RiotQuest\Components\Cache\RateLimitCache;
+use RiotQuest\Components\Cache\RequestCache;
+use RiotQuest\Components\RateLimit\Manager;
 use RiotQuest\Contracts\LeagueException;
 use Symfony\Component\Dotenv\Dotenv;
 
@@ -114,8 +114,8 @@ public function load(): void
         call_user_func([Provider::class, 'boot']);
         $this->manager = new Manager();
 
-        if (file_exists(__DIR__ . '/../../../../../.env')) {
-            (new Dotenv())->load(__DIR__ . '/../../../../../.env');
+        if (file_exists(__DIR__ . '/../../../../.env')) {
+            (new Dotenv())->load(__DIR__ . '/../../../../.env');
         }
 
         $keys = [];

diff --git a/...st/Components/Framework/Client/Client.php → src/RiotQuest/Components/Client/Client.php b/...st/Components/Framework/Client/Client.php → src/RiotQuest/Components/Client/Client.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Client;
-
-use RiotQuest\Components\Framework\Endpoints\Champion;
-use RiotQuest\Components\Framework\Endpoints\Code;
-use RiotQuest\Components\Framework\Endpoints\League;
-use RiotQuest\Components\Framework\Endpoints\Mastery;
-use RiotQuest\Components\Framework\Endpoints\Match;
-use RiotQuest\Components\Framework\Endpoints\Spectator;
-use RiotQuest\Components\Framework\Endpoints\Status;
-use RiotQuest\Components\Framework\Endpoints\Summoner;
+namespace RiotQuest\Components\Client;
+
+use RiotQuest\Components\Endpoints\Champion;
+use RiotQuest\Components\Endpoints\Code;
+use RiotQuest\Components\Endpoints\League;
+use RiotQuest\Components\Endpoints\Mastery;
+use RiotQuest\Components\Endpoints\Match;
+use RiotQuest\Components\Endpoints\Spectator;
+use RiotQuest\Components\Endpoints\Status;
+use RiotQuest\Components\Endpoints\Summoner;
 use RiotQuest\Contracts\LeagueException;
 
 /**

diff --git a/...est/Components/Framework/Client/Token.php → src/RiotQuest/Components/Client/Token.php b/...est/Components/Framework/Client/Token.php → src/RiotQuest/Components/Client/Token.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Client;
+namespace RiotQuest\Components\Client;
 
 /**
  * Class Token

diff --git a/.../Framework/Collections/BannedChampion.php → ...Components/Collections/BannedChampion.php b/.../Framework/Collections/BannedChampion.php → ...Components/Collections/BannedChampion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use RiotQuest\Components\DataProviders\Provider;
 
@@ -15,7 +15,7 @@
  *
  * @package RiotQuest\Components\Framework\Collections
  */
-class                            BannedChampion extends Collection
+class BannedChampion extends Collection
 {
 
     /**

diff --git a/...mework/Collections/BannedChampionList.php → ...onents/Collections/BannedChampionList.php b/...mework/Collections/BannedChampionList.php → ...onents/Collections/BannedChampionList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class BannedChampionList

diff --git a/...ts/Framework/Collections/ChampionInfo.php → ...t/Components/Collections/ChampionInfo.php b/...ts/Framework/Collections/ChampionInfo.php → ...t/Components/Collections/ChampionInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class ChampionInfo

diff --git a/...Framework/Collections/ChampionMastery.php → ...omponents/Collections/ChampionMastery.php b/...Framework/Collections/ChampionMastery.php → ...omponents/Collections/ChampionMastery.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use RiotQuest\Components\DataProviders\Provider;
-use RiotQuest\Components\Framework\Client\Client;
+use RiotQuest\Components\Client\Client;
 use RiotQuest\Contracts\LeagueException;
 
 /**

diff --git a/...ework/Collections/ChampionMasteryList.php → ...nents/Collections/ChampionMasteryList.php b/...ework/Collections/ChampionMasteryList.php → ...nents/Collections/ChampionMasteryList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class ChampionMasteryList

diff --git a/...ents/Framework/Collections/Collection.php → ...est/Components/Collections/Collection.php b/...ents/Framework/Collections/Collection.php → ...est/Components/Collections/Collection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use Closure;
 use Illuminate\Support\Collection as Module;

diff --git a/...Framework/Collections/CurrentGameInfo.php → ...omponents/Collections/CurrentGameInfo.php b/...Framework/Collections/CurrentGameInfo.php → ...omponents/Collections/CurrentGameInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use Carbon\Carbon;
 

diff --git a/...rk/Collections/CurrentGameParticipant.php → ...ts/Collections/CurrentGameParticipant.php b/...rk/Collections/CurrentGameParticipant.php → ...ts/Collections/CurrentGameParticipant.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use RiotQuest\Components\DataProviders\Provider;
-use RiotQuest\Components\Framework\Client\Client;
+use RiotQuest\Components\Client\Client;
 use RiotQuest\Contracts\LeagueException;
 
 /**

diff --git a/...ollections/CurrentGameParticipantList.php → ...ollections/CurrentGameParticipantList.php b/...ollections/CurrentGameParticipantList.php → ...ollections/CurrentGameParticipantList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class CurrentGameParticipantList

diff --git a/...ramework/Collections/FeaturedGameInfo.php → ...mponents/Collections/FeaturedGameInfo.php b/...ramework/Collections/FeaturedGameInfo.php → ...mponents/Collections/FeaturedGameInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use Carbon\Carbon;
 use Carbon\CarbonInterface;

diff --git a/...work/Collections/FeaturedGameInfoList.php → ...ents/Collections/FeaturedGameInfoList.php b/...work/Collections/FeaturedGameInfoList.php → ...ents/Collections/FeaturedGameInfoList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class FeaturedGameInfoList

diff --git a/...s/Framework/Collections/FeaturedGames.php → .../Components/Collections/FeaturedGames.php b/...s/Framework/Collections/FeaturedGames.php → .../Components/Collections/FeaturedGames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class FeaturedGames

diff --git a/...k/Collections/GameCustomizationObject.php → ...s/Collections/GameCustomizationObject.php b/...k/Collections/GameCustomizationObject.php → ...s/Collections/GameCustomizationObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class GameCustomizationObject

diff --git a/...llections/GameCustomizationObjectList.php → ...llections/GameCustomizationObjectList.php b/...llections/GameCustomizationObjectList.php → ...llections/GameCustomizationObjectList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class GameCustomizationObjectList

diff --git a/...onents/Framework/Collections/Incident.php → ...Quest/Components/Collections/Incident.php b/...onents/Framework/Collections/Incident.php → ...Quest/Components/Collections/Incident.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class Incident

diff --git a/...ts/Framework/Collections/IncidentList.php → ...t/Components/Collections/IncidentList.php b/...ts/Framework/Collections/IncidentList.php → ...t/Components/Collections/IncidentList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class IncidentList

diff --git a/...ponents/Framework/Collections/IntList.php → ...tQuest/Components/Collections/IntList.php b/...ponents/Framework/Collections/IntList.php → ...tQuest/Components/Collections/IntList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class IntList

diff --git a/...mponents/Framework/Collections/League.php → ...otQuest/Components/Collections/League.php b/...mponents/Framework/Collections/League.php → ...otQuest/Components/Collections/League.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class League

diff --git a/...nts/Framework/Collections/LeagueEntry.php → ...st/Components/Collections/LeagueEntry.php b/...nts/Framework/Collections/LeagueEntry.php → ...st/Components/Collections/LeagueEntry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use RiotQuest\Client;
 use RiotQuest\Contracts\LeagueException;

diff --git a/...Framework/Collections/LeagueEntryList.php → ...omponents/Collections/LeagueEntryList.php b/...Framework/Collections/LeagueEntryList.php → ...omponents/Collections/LeagueEntryList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class LeagueEntryList

diff --git a/...ents/Framework/Collections/LeagueItem.php → ...est/Components/Collections/LeagueItem.php b/...ents/Framework/Collections/LeagueItem.php → ...est/Components/Collections/LeagueItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
-use RiotQuest\Components\Framework\Client\Client;
+use RiotQuest\Components\Client\Client;
 use RiotQuest\Contracts\LeagueException;
 
 /**

diff --git a/.../Framework/Collections/LeagueItemList.php → ...Components/Collections/LeagueItemList.php b/.../Framework/Collections/LeagueItemList.php → ...Components/Collections/LeagueItemList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class LeagueItemList

diff --git a/...ponents/Framework/Collections/Mastery.php → ...tQuest/Components/Collections/Mastery.php b/...ponents/Framework/Collections/Mastery.php → ...tQuest/Components/Collections/Mastery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class Mastery

diff --git a/...nts/Framework/Collections/MasteryList.php → ...st/Components/Collections/MasteryList.php b/...nts/Framework/Collections/MasteryList.php → ...st/Components/Collections/MasteryList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MasteryList

diff --git a/...omponents/Framework/Collections/Match.php → ...iotQuest/Components/Collections/Match.php b/...omponents/Framework/Collections/Match.php → ...iotQuest/Components/Collections/Match.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 use Carbon\Carbon;
-use RiotQuest\Components\Framework\Client\Client;
+use RiotQuest\Components\Client\Client;
 use RiotQuest\Contracts\LeagueException;
 
 /**

diff --git a/...ents/Framework/Collections/MatchEvent.php → ...est/Components/Collections/MatchEvent.php b/...ents/Framework/Collections/MatchEvent.php → ...est/Components/Collections/MatchEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MatchEvent

diff --git a/.../Framework/Collections/MatchEventList.php → ...Components/Collections/MatchEventList.php b/.../Framework/Collections/MatchEventList.php → ...Components/Collections/MatchEventList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MatchEventList

diff --git a/...ents/Framework/Collections/MatchFrame.php → ...est/Components/Collections/MatchFrame.php b/...ents/Framework/Collections/MatchFrame.php → ...est/Components/Collections/MatchFrame.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MatchFrame

diff --git a/.../Framework/Collections/MatchFrameList.php → ...Components/Collections/MatchFrameList.php b/.../Framework/Collections/MatchFrameList.php → ...Components/Collections/MatchFrameList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MatchFrameList

diff --git a/...ts/Framework/Collections/MatchHistory.php → ...t/Components/Collections/MatchHistory.php b/...ts/Framework/Collections/MatchHistory.php → ...t/Components/Collections/MatchHistory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RiotQuest\Components\Framework\Collections;
+namespace RiotQuest\Components\Collections;
 
 /**
  * Class MatchHistory