diff --git a/lib/Tmdb/Factory/CollectionFactory.php b/lib/Tmdb/Factory/CollectionFactory.php index 14fbbcd6..935c5b0e 100644 --- a/lib/Tmdb/Factory/CollectionFactory.php +++ b/lib/Tmdb/Factory/CollectionFactory.php @@ -51,7 +51,7 @@ public function create(array $data = array()) } if (array_key_exists('backdrop_path', $data)) { - $collection->setBackdrop($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); + $collection->setBackdropImage($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); } if (array_key_exists('images', $data)) { @@ -59,7 +59,7 @@ public function create(array $data = array()) } if (array_key_exists('poster_path', $data)) { - $collection->setPoster($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); + $collection->setPosterImage($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); } return $this->hydrate($collection, $data); diff --git a/lib/Tmdb/Factory/CompanyFactory.php b/lib/Tmdb/Factory/CompanyFactory.php index 8cf215a4..b9ebaf0d 100644 --- a/lib/Tmdb/Factory/CompanyFactory.php +++ b/lib/Tmdb/Factory/CompanyFactory.php @@ -37,7 +37,7 @@ public function create(array $data = array()) $company = new Company(); if (array_key_exists('logo_path', $data)) { - $company->setLogo($this->getImageFactory()->createFromPath($data['logo_path'], 'logo_path')); + $company->setLogoImage($this->getImageFactory()->createFromPath($data['logo_path'], 'logo_path')); } return $this->hydrate(new Company(), $data); diff --git a/lib/Tmdb/Factory/MovieFactory.php b/lib/Tmdb/Factory/MovieFactory.php index ef38f181..ba23404f 100644 --- a/lib/Tmdb/Factory/MovieFactory.php +++ b/lib/Tmdb/Factory/MovieFactory.php @@ -85,7 +85,7 @@ public function create(array $data = array()) /** Images */ if (array_key_exists('backdrop_path', $data)) { - $movie->setBackdrop($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); + $movie->setBackdropImage($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); } if (array_key_exists('images', $data)) { @@ -93,7 +93,7 @@ public function create(array $data = array()) } if (array_key_exists('poster_path', $data)) { - $movie->setPoster($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); + $movie->setPosterImage($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); } /** Keywords */ diff --git a/lib/Tmdb/Factory/PeopleFactory.php b/lib/Tmdb/Factory/PeopleFactory.php index 3343fbab..9d326b2f 100644 --- a/lib/Tmdb/Factory/PeopleFactory.php +++ b/lib/Tmdb/Factory/PeopleFactory.php @@ -54,7 +54,7 @@ public function create(array $data = array(), Person\AbstractMember $person = nu } if (array_key_exists('profile_path', $data)) { - $person->setProfile($this->getImageFactory()->createFromPath($data['profile_path'], 'profile_path')); + $person->setProfileImage($this->getImageFactory()->createFromPath($data['profile_path'], 'profile_path')); } if ($person instanceof Person) { diff --git a/lib/Tmdb/Factory/TvEpisodeFactory.php b/lib/Tmdb/Factory/TvEpisodeFactory.php index 948fb82a..56b0eb8d 100644 --- a/lib/Tmdb/Factory/TvEpisodeFactory.php +++ b/lib/Tmdb/Factory/TvEpisodeFactory.php @@ -86,7 +86,7 @@ public function create(array $data = array()) } if (array_key_exists('still_path', $data)) { - $tvEpisode->setStill($this->getImageFactory()->createFromPath($data['still_path'], 'still_path')); + $tvEpisode->setStillImage($this->getImageFactory()->createFromPath($data['still_path'], 'still_path')); } return $this->hydrate($tvEpisode, $data); diff --git a/lib/Tmdb/Factory/TvFactory.php b/lib/Tmdb/Factory/TvFactory.php index 1e16c0fe..91b8ca5b 100644 --- a/lib/Tmdb/Factory/TvFactory.php +++ b/lib/Tmdb/Factory/TvFactory.php @@ -98,11 +98,11 @@ public function create(array $data = array()) } if (array_key_exists('backdrop_path', $data)) { - $tvShow->setBackdrop($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); + $tvShow->setBackdropImage($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path')); } if (array_key_exists('poster_path', $data)) { - $tvShow->setPoster($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); + $tvShow->setPosterImage($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); } /** Translations */ diff --git a/lib/Tmdb/Factory/TvSeasonFactory.php b/lib/Tmdb/Factory/TvSeasonFactory.php index 0483c25d..f13ea363 100644 --- a/lib/Tmdb/Factory/TvSeasonFactory.php +++ b/lib/Tmdb/Factory/TvSeasonFactory.php @@ -86,7 +86,7 @@ public function create(array $data = array()) } if (array_key_exists('poster_path', $data)) { - $tvSeason->setPoster($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); + $tvSeason->setPosterImage($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path')); } /** Episodes */ diff --git a/lib/Tmdb/Model/Collection.php b/lib/Tmdb/Model/Collection.php index d0ac3277..f8c6ecad 100644 --- a/lib/Tmdb/Model/Collection.php +++ b/lib/Tmdb/Model/Collection.php @@ -82,7 +82,7 @@ public function __construct() * @param \Tmdb\Model\Image\BackdropImage $backdrop * @return $this */ - public function setBackdrop(BackdropImage $backdrop) + public function setBackdropImage(BackdropImage $backdrop) { $this->backdrop = $backdrop; return $this; @@ -91,7 +91,7 @@ public function setBackdrop(BackdropImage $backdrop) /** * @return \Tmdb\Model\Image\BackdropImage */ - public function getBackdrop() + public function getBackdropImage() { return $this->backdrop; } @@ -208,7 +208,7 @@ public function getParts() * @param \Tmdb\Model\Image\PosterImage $poster * @return $this */ - public function setPoster(PosterImage $poster) + public function setPosterImage(PosterImage $poster) { $this->poster = $poster; return $this; @@ -217,7 +217,7 @@ public function setPoster(PosterImage $poster) /** * @return \Tmdb\Model\Image\PosterImage */ - public function getPoster() + public function getPosterImage() { return $this->poster; } diff --git a/lib/Tmdb/Model/Company.php b/lib/Tmdb/Model/Company.php index 385b3f15..f8161caf 100644 --- a/lib/Tmdb/Model/Company.php +++ b/lib/Tmdb/Model/Company.php @@ -116,7 +116,7 @@ public function getId() * @param LogoImage $logo * @return $this */ - public function setLogo(LogoImage $logo) + public function setLogoImage(LogoImage $logo) { $this->logo = $logo; return $this; @@ -125,7 +125,7 @@ public function setLogo(LogoImage $logo) /** * @return LogoImage */ - public function getLogo() + public function getLogoImage() { return $this->logo; } diff --git a/lib/Tmdb/Model/Movie.php b/lib/Tmdb/Model/Movie.php index 9bdf3413..dc8d1d00 100644 --- a/lib/Tmdb/Model/Movie.php +++ b/lib/Tmdb/Model/Movie.php @@ -860,7 +860,7 @@ public function getTranslations() * @param \Tmdb\Model\Image $backdrop * @return $this */ - public function setBackdrop($backdrop) + public function setBackdropImage($backdrop) { $this->backdrop = $backdrop; return $this; @@ -869,7 +869,7 @@ public function setBackdrop($backdrop) /** * @return \Tmdb\Model\Image */ - public function getBackdrop() + public function getBackdropImage() { return $this->backdrop; } @@ -878,7 +878,7 @@ public function getBackdrop() * @param \Tmdb\Model\Image $poster * @return $this */ - public function setPoster($poster) + public function setPosterImage($poster) { $this->poster = $poster; return $this; @@ -887,7 +887,7 @@ public function setPoster($poster) /** * @return \Tmdb\Model\Image */ - public function getPoster() + public function getPosterImage() { return $this->poster; } diff --git a/lib/Tmdb/Model/Person.php b/lib/Tmdb/Model/Person.php index 6b893615..ed643a32 100644 --- a/lib/Tmdb/Model/Person.php +++ b/lib/Tmdb/Model/Person.php @@ -383,7 +383,7 @@ public function getProfilePath() * @param ProfileImage $profile * @return $this */ - public function setProfile(ProfileImage $profile) + public function setProfileImage(ProfileImage $profile) { $this->profile = $profile; return $this; @@ -392,7 +392,7 @@ public function setProfile(ProfileImage $profile) /** * @return ProfileImage */ - public function getProfile() + public function getProfileImage() { return $this->profile; } diff --git a/lib/Tmdb/Model/Person/AbstractMember.php b/lib/Tmdb/Model/Person/AbstractMember.php index 7eb43b81..1f17d81d 100644 --- a/lib/Tmdb/Model/Person/AbstractMember.php +++ b/lib/Tmdb/Model/Person/AbstractMember.php @@ -101,7 +101,7 @@ public function getProfilePath() * @param Image\ProfileImage $profile * @return $this */ - public function setProfile($profile = null) + public function setProfileImage($profile = null) { $this->profile = $profile; return $this; @@ -110,7 +110,7 @@ public function setProfile($profile = null) /** * @return Image\ProfileImage|null */ - public function getProfile() + public function getProfileImage() { return $this->profile; } diff --git a/lib/Tmdb/Model/Tv.php b/lib/Tmdb/Model/Tv.php index 6e2145d4..f47623d6 100644 --- a/lib/Tmdb/Model/Tv.php +++ b/lib/Tmdb/Model/Tv.php @@ -727,7 +727,7 @@ public function getCredits() * @param \Tmdb\Model\Image\BackdropImage $backdrop * @return $this */ - public function setBackdrop(BackdropImage $backdrop) + public function setBackdropImage(BackdropImage $backdrop) { $this->backdrop = $backdrop; return $this; @@ -736,7 +736,7 @@ public function setBackdrop(BackdropImage $backdrop) /** * @return \Tmdb\Model\Image\BackdropImage */ - public function getBackdrop() + public function getBackdropImage() { return $this->backdrop; } @@ -745,7 +745,7 @@ public function getBackdrop() * @param \Tmdb\Model\Image\PosterImage $poster * @return $this */ - public function setPoster(PosterImage $poster) + public function setPosterImage(PosterImage $poster) { $this->poster = $poster; return $this; @@ -754,7 +754,7 @@ public function setPoster(PosterImage $poster) /** * @return \Tmdb\Model\Image\PosterImage */ - public function getPoster() + public function getPosterImage() { return $this->poster; } diff --git a/lib/Tmdb/Model/Tv/Episode.php b/lib/Tmdb/Model/Tv/Episode.php index f38c83be..c4e0fb24 100644 --- a/lib/Tmdb/Model/Tv/Episode.php +++ b/lib/Tmdb/Model/Tv/Episode.php @@ -368,7 +368,7 @@ public function getImages() * @param StillImage $still * @return $this */ - public function setStill($still) + public function setStillImage($still) { $this->still = $still; return $this; @@ -377,7 +377,7 @@ public function setStill($still) /** * @return StillImage */ - public function getStill() + public function getStillImage() { return $this->still; } diff --git a/lib/Tmdb/Model/Tv/Season.php b/lib/Tmdb/Model/Tv/Season.php index aca7f459..4d3adc25 100644 --- a/lib/Tmdb/Model/Tv/Season.php +++ b/lib/Tmdb/Model/Tv/Season.php @@ -292,7 +292,7 @@ public function getImages() * @param \Tmdb\Model\Image\PosterImage $poster * @return $this */ - public function setPoster($poster) + public function setPosterImage($poster) { $this->poster = $poster; return $this; @@ -301,7 +301,7 @@ public function setPoster($poster) /** * @return \Tmdb\Model\Image\PosterImage */ - public function getPoster() + public function getPosterImage() { return $this->poster; } diff --git a/test/Tmdb/Tests/Factory/CollectionFactoryTest.php b/test/Tmdb/Tests/Factory/CollectionFactoryTest.php index 8f68c5d7..41cac432 100644 --- a/test/Tmdb/Tests/Factory/CollectionFactoryTest.php +++ b/test/Tmdb/Tests/Factory/CollectionFactoryTest.php @@ -88,14 +88,14 @@ public function shouldBeAbleToCreateCollection() */ public function shouldBeFunctional() { - $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->collection->getBackdrop()); + $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->collection->getBackdropImage()); $this->assertEquals('/qCECROwx3TRUEgoZv2Mz2D723QC.jpg', $this->collection->getBackdropPath()); $this->assertEquals(10, $this->collection->getId()); $this->assertEquals('external', $this->collection->getOverview()); $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->collection->getImages()); $this->assertEquals('Star Wars Collection', $this->collection->getName()); $this->assertInstanceOf('Tmdb\Model\Common\GenericCollection', $this->collection->getParts()); - $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->collection->getPoster()); + $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->collection->getPosterImage()); $this->assertEquals('/ghd5zOQnDaDW1mxO7R5fXXpZMu.jpg', $this->collection->getPosterPath()); } diff --git a/test/Tmdb/Tests/Factory/CompanyFactoryTest.php b/test/Tmdb/Tests/Factory/CompanyFactoryTest.php index 7ce35e0f..dec99ac2 100644 --- a/test/Tmdb/Tests/Factory/CompanyFactoryTest.php +++ b/test/Tmdb/Tests/Factory/CompanyFactoryTest.php @@ -42,7 +42,7 @@ public function shouldConstructCompany() $company = $factory->create($this->data); $this->assertInstanceOf('Tmdb\Model\Company', $company); - $this->assertInstanceOf('Tmdb\Model\Image\LogoImage', $company->getLogo()); + $this->assertInstanceOf('Tmdb\Model\Image\LogoImage', $company->getLogoImage()); $this->assertEquals(null, $company->getDescription()); $this->assertEquals('San Francisco, California', $company->getHeadquarters()); diff --git a/test/Tmdb/Tests/Factory/MovieFactoryTest.php b/test/Tmdb/Tests/Factory/MovieFactoryTest.php index d25ac5c7..67aa297f 100644 --- a/test/Tmdb/Tests/Factory/MovieFactoryTest.php +++ b/test/Tmdb/Tests/Factory/MovieFactoryTest.php @@ -72,7 +72,7 @@ public function shouldBeFunctional() { $this->assertEquals(false, $this->movie->getAdult()); $this->assertEquals('/7DlIoyQ3ecGMklVWyKsneZmVnsi.jpg', $this->movie->getBackdropPath()); - $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->movie->getBackdrop()); + $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->movie->getBackdropImage()); $this->assertEquals(true, is_array($this->movie->getBelongsToCollection())); $this->assertEquals(true, is_int($this->movie->getBudget())); $this->assertInstanceOf('Tmdb\Model\Collection\Genres', $this->movie->getGenres()); @@ -83,7 +83,7 @@ public function shouldBeFunctional() $this->assertEquals('Riddick', $this->movie->getOriginalTitle()); $this->assertEquals('Betrayed by his own kind and left for dead on a desolate planet, Riddick fights for survival against alien predators and becomes more powerful and dangerous than ever before. Soon bounty hunters from throughout the galaxy descend on Riddick only to find themselves pawns in his greater scheme for revenge. With his enemies right where he wants them, Riddick unleashes a vicious attack of vengeance before returning to his home planet of Furya to save it from destruction.', $this->movie->getOverview()); $this->assertEquals(93.491722439366, $this->movie->getPopularity()); - $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->movie->getPoster()); + $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->movie->getPosterImage()); $this->assertEquals('/1NfhdnQAEqcBRCulEhOFSkRrrLv.jpg', $this->movie->getPosterPath()); $this->assertInstanceOf('Tmdb\Model\Common\GenericCollection', $this->movie->getProductionCompanies()); $this->assertInstanceOf('Tmdb\Model\Common\GenericCollection', $this->movie->getProductionCountries()); @@ -135,10 +135,10 @@ public function shouldGetProfileImages() */ foreach($cast as $c) { if ($c->hasProfileImage()) { - $filePath = $c->getProfile()->getFilePath(); + $filePath = $c->getProfileImage()->getFilePath(); $this->assertEquals(false, empty($filePath)); }else{ - $this->assertEquals(null, $c->getProfile()); + $this->assertEquals(null, $c->getProfileImage()); } } } diff --git a/test/Tmdb/Tests/Factory/PeopleFactoryTest.php b/test/Tmdb/Tests/Factory/PeopleFactoryTest.php index 3098ccfb..4150c73b 100644 --- a/test/Tmdb/Tests/Factory/PeopleFactoryTest.php +++ b/test/Tmdb/Tests/Factory/PeopleFactoryTest.php @@ -48,7 +48,7 @@ public function shouldConstructPerson() $this->assertInstanceOf('Tmdb\Model\Person', $this->person); $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->person->getImages()); - $this->assertInstanceOf('Tmdb\Model\Image\ProfileImage', $this->person->getProfile()); + $this->assertInstanceOf('Tmdb\Model\Image\ProfileImage', $this->person->getProfileImage()); } /** @@ -127,7 +127,7 @@ public function shouldBeFunctional() $this->assertEquals('Blue Island, Illinois, USA', $this->person->getPlaceOfBirth()); //@todo //$this->assertEquals(1.99498054250796, $this->person->getPopularity()); - $this->assertInstanceOf('Tmdb\Model\Image\ProfileImage', $this->person->getProfile()); + $this->assertInstanceOf('Tmdb\Model\Image\ProfileImage', $this->person->getProfileImage()); $this->assertEquals('/h9YwlLHANaQzaTVkVwxnxLbvCY4.jpg', $this->person->getProfilePath()); $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->person->getImages()); $this->assertInstanceOf('Tmdb\Model\Common\GenericCollection', $this->person->getChanges()); diff --git a/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php b/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php index 09dd73bf..3e6c4cf3 100644 --- a/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php +++ b/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php @@ -48,7 +48,7 @@ public function shouldConstructTvEpisode() $this->assertInstanceOf('Tmdb\Model\Collection\Credits', $this->episode->getCredits()); $this->assertInstanceOf('Tmdb\Model\Tv\ExternalIds', $this->episode->getExternalIds()); $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->episode->getImages()); - $this->assertInstanceOf('Tmdb\Model\Image\StillImage', $this->episode->getStill()); + $this->assertInstanceOf('Tmdb\Model\Image\StillImage', $this->episode->getStillImage()); } /** diff --git a/test/Tmdb/Tests/Factory/TvFactoryTest.php b/test/Tmdb/Tests/Factory/TvFactoryTest.php index d8281dfc..48424bfc 100644 --- a/test/Tmdb/Tests/Factory/TvFactoryTest.php +++ b/test/Tmdb/Tests/Factory/TvFactoryTest.php @@ -48,9 +48,9 @@ public function shouldConstructTv() $this->assertInstanceOf('Tmdb\Model\Tv', $this->tv); $this->assertInstanceOf('\DateTime', $this->tv->getLastAirDate()); - $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->tv->getBackdrop()); + $this->assertInstanceOf('Tmdb\Model\Image\BackdropImage', $this->tv->getBackdropImage()); $this->assertInstanceOf('Tmdb\Model\Collection\Genres', $this->tv->getGenres()); - $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->tv->getPoster()); + $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->tv->getPosterImage()); } /** diff --git a/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php b/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php index 80140296..9f54a2f9 100644 --- a/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php +++ b/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php @@ -49,7 +49,7 @@ public function shouldConstructTvSeason() $this->assertInstanceOf('Tmdb\Model\Tv\ExternalIds', $this->season->getExternalIds()); $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->season->getImages()); $this->assertInstanceOf('Tmdb\Model\Common\GenericCollection', $this->season->getEpisodes()); - $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->season->getPoster()); + $this->assertInstanceOf('Tmdb\Model\Image\PosterImage', $this->season->getPosterImage()); } /**