Skip to content

Commit

Permalink
Merge pull request #4 from wells/v1.1-dev
Browse files Browse the repository at this point in the history
v1.1 dev
  • Loading branch information
wells authored Dec 26, 2016
2 parents 84ec653 + 105ad54 commit f9cf60d
Show file tree
Hide file tree
Showing 122 changed files with 3,026 additions and 2,340 deletions.
8 changes: 4 additions & 4 deletions Airflix/EpisodeViews.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class EpisodeViews implements Contracts\EpisodeViews
*/
public function episodes()
{
return app()->make(
return app(
Contracts\Episodes::class
);
}
Expand All @@ -25,7 +25,7 @@ public function episodes()
*/
public function seasons()
{
return app()->make(
return app(
Contracts\Seasons::class
);
}
Expand All @@ -37,7 +37,7 @@ public function seasons()
*/
public function shows()
{
return app()->make(
return app(
Contracts\Shows::class
);
}
Expand All @@ -49,7 +49,7 @@ public function shows()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\EpisodeViewMonthlyTransformer::class
);
}
Expand Down
4 changes: 2 additions & 2 deletions Airflix/Episodes.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Episodes implements Contracts\Episodes
*/
public function imageClient()
{
return app()->make(
return app(
Contracts\TmdbImageClient::class
);
}
Expand All @@ -26,7 +26,7 @@ public function imageClient()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\EpisodeTransformer::class
);
}
Expand Down
4 changes: 2 additions & 2 deletions Airflix/Genres.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Genres implements Contracts\Genres
*/
public function filters()
{
return app()->make(GenreFilters::class);
return app(GenreFilters::class);
}

/**
Expand All @@ -25,7 +25,7 @@ public function filters()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\GenreTransformer::class
);
}
Expand Down
2 changes: 1 addition & 1 deletion Airflix/MovieImages.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MovieImages implements Contracts\MovieImages
*/
public function transformer()
{
return app()->make(
return app(
Contracts\TmdbImageTransformer::class
);
}
Expand Down
2 changes: 1 addition & 1 deletion Airflix/MovieResults.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MovieResults implements Contracts\MovieResults
*/
public function transformer()
{
return app()->make(
return app(
Contracts\TmdbMovieResultTransformer::class
);
}
Expand Down
4 changes: 2 additions & 2 deletions Airflix/MovieViews.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MovieViews implements Contracts\MovieViews
*/
public function movies()
{
return app()->make(
return app(
Contracts\Movies::class
);
}
Expand All @@ -25,7 +25,7 @@ public function movies()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\MovieViewsTransformer::class
);
}
Expand Down
10 changes: 5 additions & 5 deletions Airflix/Movies.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Movies implements Contracts\Movies
*/
public function filters()
{
return app()->make(
return app(
MovieFilters::class
);
}
Expand All @@ -30,7 +30,7 @@ public function filters()
*/
public function genres()
{
return app()->make(
return app(
Contracts\Genres::class
);
}
Expand All @@ -42,7 +42,7 @@ public function genres()
*/
public function imageClient()
{
return app()->make(
return app(
Contracts\TmdbImageClient::class
);
}
Expand All @@ -54,7 +54,7 @@ public function imageClient()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\MovieTransformer::class
);
}
Expand All @@ -66,7 +66,7 @@ public function transformer()
*/
public function views()
{
return app()->make(
return app(
Contracts\MovieViews::class
);
}
Expand Down
6 changes: 3 additions & 3 deletions Airflix/Seasons.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Seasons implements Contracts\Seasons
*/
public function episodes()
{
return app()->make(
return app(
Contracts\Episodes::class
);
}
Expand All @@ -28,7 +28,7 @@ public function episodes()
*/
public function imageClient()
{
return app()->make(
return app(
Contracts\TmdbImageClient::class
);
}
Expand All @@ -40,7 +40,7 @@ public function imageClient()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\SeasonTransformer::class
);
}
Expand Down
12 changes: 6 additions & 6 deletions Airflix/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct()
*/
public function episodes()
{
return app()->make(
return app(
Contracts\Episodes::class
);
}
Expand All @@ -37,7 +37,7 @@ public function episodes()
*/
public function episodeViews()
{
return app()->make(
return app(
Contracts\EpisodeViews::class
);
}
Expand All @@ -49,7 +49,7 @@ public function episodeViews()
*/
public function movies()
{
return app()->make(
return app(
Contracts\Movies::class
);
}
Expand All @@ -61,7 +61,7 @@ public function movies()
*/
public function movieViews()
{
return app()->make(
return app(
Contracts\MovieViews::class
);
}
Expand All @@ -73,7 +73,7 @@ public function movieViews()
*/
public function seasons()
{
return app()->make(
return app(
Contracts\Seasons::class
);
}
Expand All @@ -85,7 +85,7 @@ public function seasons()
*/
public function shows()
{
return app()->make(
return app(
Contracts\Shows::class
);
}
Expand Down
2 changes: 1 addition & 1 deletion Airflix/ShowImages.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ShowImages implements Contracts\ShowImages
*/
public function transformer()
{
return app()->make(
return app(
Contracts\TmdbImageTransformer::class
);
}
Expand Down
2 changes: 1 addition & 1 deletion Airflix/ShowResults.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ShowResults implements Contracts\ShowResults
*/
public function transformer()
{
return app()->make(
return app(
Contracts\TmdbShowResultTransformer::class
);
}
Expand Down
12 changes: 6 additions & 6 deletions Airflix/Shows.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Shows implements Contracts\Shows
*/
public function filters()
{
return app()->make(
return app(
ShowFilters::class
);
}
Expand All @@ -30,7 +30,7 @@ public function filters()
*/
public function genres()
{
return app()->make(
return app(
Contracts\Genres::class
);
}
Expand All @@ -42,7 +42,7 @@ public function genres()
*/
public function imageClient()
{
return app()->make(
return app(
Contracts\TmdbImageClient::class
);
}
Expand All @@ -54,7 +54,7 @@ public function imageClient()
*/
public function seasons()
{
return app()->make(
return app(
Contracts\Seasons::class
);
}
Expand All @@ -66,7 +66,7 @@ public function seasons()
*/
public function transformer()
{
return app()->make(
return app(
Contracts\ShowTransformer::class
);
}
Expand All @@ -78,7 +78,7 @@ public function transformer()
*/
public function views()
{
return app()->make(
return app(
Contracts\EpisodeViews::class
);
}
Expand Down
6 changes: 3 additions & 3 deletions Airflix/V1/EpisodeTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function includeShow($episode)
{
$show = $episode->show;

$transformer = app()->make(
$transformer = app(
Contracts\ShowTransformer::class
);

Expand All @@ -82,7 +82,7 @@ public function includeSeason($episode)
{
$season = $episode->season;

$transformer = app()->make(
$transformer = app(
Contracts\SeasonTransformer::class
);

Expand All @@ -104,7 +104,7 @@ public function includeViews($episode)
{
$views = $episode->monthlyViews();

$transformer = app()->make(
$transformer = app(
Contracts\EpisodeViewMonthlyTransformer::class
);

Expand Down
4 changes: 2 additions & 2 deletions Airflix/V1/GenreTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function includeMovies($genre)
{
$movies = $genre->movies;

$transformer = app()->make(
$transformer = app(
Contracts\MovieTransformer::class
);

Expand All @@ -73,7 +73,7 @@ public function includeShows($genre)
{
$shows = $genre->shows;

$transformer = app()->make(
$transformer = app(
Contracts\ShowTransformer::class
);

Expand Down
Loading

0 comments on commit f9cf60d

Please sign in to comment.