From 27f66cfea3b748abb938b362ad02e202892482b1 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 20 Oct 2016 22:32:17 -0400 Subject: [PATCH] Update headers and namespaces --- ...eclient_header_comment.txt => header_comment.txt} | 0 sonar-project.properties | 6 ------ src/Auth/HummingbirdAuth.php | 2 +- src/Command/BaseCommand.php | 12 +++++------- src/Command/CacheImages.php | 1 + src/Controller.php | 10 ++++++++-- src/Controller/Anime.php | 2 +- src/Controller/Collection.php | 4 ++-- src/Controller/Manga.php | 6 +++--- src/MenuGenerator.php | 5 ++++- src/Model/API.php | 7 +++---- src/Model/Anime.php | 2 +- src/Model/AnimeCollection.php | 2 +- src/Model/Manga.php | 2 +- tests/AnimeClientTest.php | 2 -- tests/AnimeClient_TestCase.php | 7 +++---- tests/Auth/HummingbirdAuthTest.php | 5 ++--- tests/Command/BaseCommandTest.php | 4 ++-- tests/ControllerTest.php | 8 ++++---- tests/DispatcherTest.php | 11 +++-------- tests/MenuGeneratorTest.php | 3 +-- tests/Model/AnimeCollectionModelTest.php | 3 +-- tests/Model/AnimeModelTest.php | 2 -- tests/Model/BaseApiModelTest.php | 5 +---- tests/Transformer/AnimeListTransformerTest.php | 2 +- tests/Transformer/MangaListTransformerTest.php | 2 +- tests/Transformer/MangaListsZipperTest.php | 2 +- tests/UrlGeneratorTest.php | 2 +- tests/mocks.php | 7 +++---- 29 files changed, 55 insertions(+), 71 deletions(-) rename build/{animeclient_header_comment.txt => header_comment.txt} (100%) delete mode 100644 sonar-project.properties diff --git a/build/animeclient_header_comment.txt b/build/header_comment.txt similarity index 100% rename from build/animeclient_header_comment.txt rename to build/header_comment.txt diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index b21122c4..00000000 --- a/sonar-project.properties +++ /dev/null @@ -1,6 +0,0 @@ -sonar.projectKey=animeclient -sonar.projectName=Anime Client -sonar.projectVersion=3.0.0 -sonar.sources=src -sonar.php.coverage.reportPath=build/logs/clover.xml -sonar.php.tests.reportPath=build/logs/junit.xml \ No newline at end of file diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php index 07629fa9..ef2fefe9 100644 --- a/src/Auth/HummingbirdAuth.php +++ b/src/Auth/HummingbirdAuth.php @@ -16,8 +16,8 @@ namespace Aviat\AnimeClient\Auth; -use Aviat\Ion\Di\ContainerInterface; use Aviat\AnimeClient\AnimeClient; +use Aviat\Ion\Di\ContainerInterface; /** * Hummingbird API Authentication diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php index 5840d31e..2b4c05b3 100644 --- a/src/Command/BaseCommand.php +++ b/src/Command/BaseCommand.php @@ -17,17 +17,15 @@ namespace Aviat\AnimeClient\Command; use Aura\Session\SessionFactory; -use ConsoleKit\Command; -use ConsoleKit\Widgets\Box; - -use Aviat\Ion\Config; -use Aviat\Ion\Di\Container; -use Aviat\Ion\Cache\CacheManager; - use Aviat\AnimeClient\AnimeClient; use Aviat\AnimeClient\Auth\HummingbirdAuth; use Aviat\AnimeClient\Model; use Aviat\AnimeClient\Util; +use Aviat\Ion\Cache\CacheManager; +use Aviat\Ion\Config; +use Aviat\Ion\Di\Container; +use ConsoleKit\Command; +use ConsoleKit\Widgets\Box; /** * Base class for console command setup diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php index de30f261..bdb03683 100644 --- a/src/Command/CacheImages.php +++ b/src/Command/CacheImages.php @@ -17,6 +17,7 @@ namespace Aviat\AnimeClient\Command; use Aviat\AnimeClient\Util; + /** * Generates thumbnail image cache so that cover images load faster */ diff --git a/src/Controller.php b/src/Controller.php index 62e52565..f5e27f1f 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -16,8 +16,14 @@ namespace Aviat\AnimeClient; -use Aviat\Ion\Di\{ContainerAware, ContainerInterface}; -use Aviat\Ion\View\{HtmlView, HttpView, JsonView}; +use Aviat\Ion\Di\ +{ + ContainerAware, ContainerInterface +}; +use Aviat\Ion\View\ +{ + HtmlView, HttpView, JsonView +}; use InvalidArgumentException; /** diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php index 185c631e..7ebf31a4 100644 --- a/src/Controller/Anime.php +++ b/src/Controller/Anime.php @@ -16,10 +16,10 @@ namespace Aviat\AnimeClient\Controller; -use Aviat\Ion\Di\ContainerInterface; use Aviat\AnimeClient\Controller as BaseController; use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus; use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer; +use Aviat\Ion\Di\ContainerInterface; /** * Controller for Anime-related pages diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php index 67fcb967..893e5a80 100644 --- a/src/Controller/Collection.php +++ b/src/Controller/Collection.php @@ -16,11 +16,11 @@ namespace Aviat\AnimeClient\Controller; -use Aviat\Ion\Di\ContainerInterface; use Aviat\AnimeClient\Controller as BaseController; -use Aviat\AnimeClient\UrlGenerator; use Aviat\AnimeClient\Model\Anime as AnimeModel; use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel; +use Aviat\AnimeClient\UrlGenerator; +use Aviat\Ion\Di\ContainerInterface; /** * Controller for Anime collection pages diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php index 6ef71243..c3027af8 100644 --- a/src/Controller/Manga.php +++ b/src/Controller/Manga.php @@ -16,12 +16,12 @@ namespace Aviat\AnimeClient\Controller; -use Aviat\Ion\Json; -use Aviat\Ion\Di\ContainerInterface; use Aviat\AnimeClient\Controller; -use Aviat\AnimeClient\Model\Manga as MangaModel; use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus; use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer; +use Aviat\AnimeClient\Model\Manga as MangaModel; +use Aviat\Ion\Di\ContainerInterface; +use Aviat\Ion\Json; /** * Controller for manga list diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php index 001a8bf0..ccfb2616 100644 --- a/src/MenuGenerator.php +++ b/src/MenuGenerator.php @@ -16,7 +16,10 @@ namespace Aviat\AnimeClient; -use Aviat\Ion\{ArrayWrapper, StringWrapper}; +use Aviat\Ion\ +{ + ArrayWrapper, StringWrapper +}; use Aviat\Ion\Di\ContainerInterface; /** diff --git a/src/Model/API.php b/src/Model/API.php index 67bd6ef6..bb501e41 100644 --- a/src/Model/API.php +++ b/src/Model/API.php @@ -16,14 +16,13 @@ namespace Aviat\AnimeClient\Model; +use Aviat\AnimeClient\AnimeClient; +use Aviat\Ion\Di\ContainerInterface; +use Aviat\Ion\Model; use GuzzleHttp\Client; use GuzzleHttp\Cookie\CookieJar; use Psr\Http\Message\ResponseInterface; -use Aviat\Ion\Di\ContainerInterface; -use Aviat\Ion\Model; -use Aviat\AnimeClient\AnimeClient; - /** * Base model for api interaction * diff --git a/src/Model/Anime.php b/src/Model/Anime.php index 0593ebdf..67a21acd 100644 --- a/src/Model/Anime.php +++ b/src/Model/Anime.php @@ -16,9 +16,9 @@ namespace Aviat\AnimeClient\Model; -use Aviat\Ion\Json; use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus; use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer; +use Aviat\Ion\Json; /** * Model for handling requests dealing with the anime list diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php index cd084449..fc7fe4c1 100644 --- a/src/Model/AnimeCollection.php +++ b/src/Model/AnimeCollection.php @@ -16,8 +16,8 @@ namespace Aviat\AnimeClient\Model; -use Aviat\Ion\Json; use Aviat\Ion\Di\ContainerInterface; +use Aviat\Ion\Json; /** * Model for getting anime collection data diff --git a/src/Model/Manga.php b/src/Model/Manga.php index 3fbe8268..88aa4f3c 100644 --- a/src/Model/Manga.php +++ b/src/Model/Manga.php @@ -16,8 +16,8 @@ namespace Aviat\AnimeClient\Model; -use Aviat\AnimeClient\Hummingbird\Transformer; use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus; +use Aviat\AnimeClient\Hummingbird\Transformer; use Aviat\Ion\Json; use GuzzleHttp\Cookie\SetCookie; use RuntimeException; diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php index 75a89554..0d75a480 100644 --- a/tests/AnimeClientTest.php +++ b/tests/AnimeClientTest.php @@ -1,7 +1,5 @@