Merge pull request #74 from wtfzdotnet/scrutinizer-issues

Scrutinizer issues

Author: wtfzdotnet

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": ">=5.4.0",
         "ext-curl": "*",
-        "symfony/event-dispatcher": "~2.1",
+        "symfony/event-dispatcher": "~2.4",
         "symfony/options-resolver": "~2.1",
         "guzzlehttp/guzzle": "~5.0",
         "guzzlehttp/cache-subscriber": "~0.1@dev",

examples/find/api/get.php

@@ -16,7 +16,7 @@
 $token  = new \Tmdb\ApiToken(TMDB_API_KEY);
 $client = new \Tmdb\Client($token);
 
-$find = $client->getFindApi()->find('tt0120737', [
+$find = $client->getFindApi()->findBy('tt0120737', [
     'external_source' => 'imdb_id'
 ]);
 

examples/find/model/get.php

@@ -17,6 +17,6 @@
 $client = new \Tmdb\Client($token);
 
 $repository = new \Tmdb\Repository\FindRepository($client);
-$find       = $repository->find('tt0120737', ['external_source' => 'imdb_id']);
+$find       = $repository->findBy('tt0120737', ['external_source' => 'imdb_id']);
 
 var_dump($find);

lib/Tmdb/Api/Find.php

@@ -37,7 +37,7 @@ class Find extends AbstractApi
      * @param  array  $headers
      * @return mixed
      */
-    public function find($id, array $parameters = [], array $headers = [])
+    public function findBy($id, array $parameters = [], array $headers = [])
     {
         return $this->get(
             sprintf('find/%s', $id),

lib/Tmdb/ConfigurationInterface.php

@@ -4,7 +4,7 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * @package Shop2Market
  * @author Michael Roterman <michael@b-found.nl>
  * @copyright (c) 2014, B-Found Internet Marketing & Services
@@ -13,6 +13,7 @@
 
 namespace Tmdb;
 
-interface ConfigurationInterface {
-    function all();
-}
+interface ConfigurationInterface
+{
+    public function all();
+}

lib/Tmdb/Event/HydrationSubscriber.php

@@ -12,6 +12,7 @@
  */
 namespace Tmdb\Event;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Tmdb\Common\ObjectHydrator;
 use Tmdb\HttpClient\HttpClientEventSubscriber;
 
@@ -36,13 +37,16 @@ public static function getSubscribedEvents()
     /**
      * Hydrate the subject with data
      *
-     * @param  HydrationEvent            $event
+     * @param HydrationEvent           $event
+     * @param string                   $eventName
+     * @param EventDispatcherInterface $eventDispatcher
+     *
      * @return \Tmdb\Model\AbstractModel
      */
-    public function hydrate(HydrationEvent $event)
+    public function hydrate(HydrationEvent $event, $eventName, $eventDispatcher)
     {
         // Possibility to load serialized cache
-        $event->getDispatcher()->dispatch(TmdbEvents::BEFORE_HYDRATION, $event);
+        $eventDispatcher->dispatch(TmdbEvents::BEFORE_HYDRATION, $event);
 
         if ($event->isPropagationStopped()) {
             return $event->getSubject();
@@ -52,7 +56,7 @@ public function hydrate(HydrationEvent $event)
         $event->setSubject($subject);
 
         // Possibility to cache the data
-        $event->getDispatcher()->dispatch(TmdbEvents::AFTER_HYDRATION, $event);
+        $eventDispatcher->dispatch(TmdbEvents::AFTER_HYDRATION, $event);
 
         return $event->getSubject();
     }

lib/Tmdb/Event/RequestSubscriber.php

@@ -12,6 +12,7 @@
  */
 namespace Tmdb\Event;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Tmdb\Exception\RuntimeException;
 use Tmdb\HttpClient\HttpClientEventSubscriber;
 use Tmdb\HttpClient\Response;
@@ -29,10 +30,17 @@ public static function getSubscribedEvents()
         ];
     }
 
-    public function send(RequestEvent $event)
+    /**
+     * @param RequestEvent             $event
+     * @param string                   $eventName
+     * @param EventDispatcherInterface $eventDispatcher
+     *
+     * @return string|Response
+     */
+    public function send(RequestEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
         // Preparation of request parameters / Possibility to use for logging and caching etc.
-        $event->getDispatcher()->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
+        $eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
 
         if ($event->isPropagationStopped() && $event->hasResponse()) {
             return $event->getResponse();
@@ -42,7 +50,7 @@ public function send(RequestEvent $event)
         $event->setResponse($response);
 
         // Possibility to cache the request
-        $event->getDispatcher()->dispatch(TmdbEvents::AFTER_REQUEST, $event);
+        $eventDispatcher->dispatch(TmdbEvents::AFTER_REQUEST, $event);
 
         return $response;
     }
@@ -56,8 +64,6 @@ public function send(RequestEvent $event)
      */
     public function sendRequest(RequestEvent $event)
     {
-        $response = null;
-
         switch ($event->getMethod()) {
             case 'GET':
                 $response = $this->getHttpClient()->getAdapter()->get($event->getRequest());

lib/Tmdb/Exception/TmdbApiException.php

@@ -43,10 +43,10 @@ class TmdbApiException extends \Exception
     /**
      * Create the exception
      *
-     * @param string $message
-     * @param int    $code
-     * @param null   $request
-     * @param null   $response
+     * @param string        $message
+     * @param int           $code
+     * @param Request|null  $request
+     * @param Response|null $response
      */
     public function __construct($code, $message, $request = null, $response = null)
     {

lib/Tmdb/Factory/Common/VideoFactory.php

@@ -62,10 +62,8 @@ private function resolveVideoType($data)
             switch ($site) {
                 case 'youtube':
                     return new Video\Youtube();
-                    break;
                 default:
                     return new Video();
-                    break;
             }
         }
     }

lib/Tmdb/Factory/FindFactory.php

@@ -36,6 +36,16 @@ class FindFactory extends AbstractFactory
      */
     private $tvFactory;
 
+    /**
+     * @var TvSeasonFactory
+     */
+    private $tvSeasonFactory;
+
+    /**
+     * @var TvEpisodeFactory
+     */
+    private $tvEpisodeFactory;
+
     /**
      * Constructor
      *
@@ -46,7 +56,7 @@ public function __construct(HttpClient $httpClient)
         $this->movieFactory     = new MovieFactory($httpClient);
         $this->peopleFactory    = new PeopleFactory($httpClient);
         $this->tvFactory        = new TvFactory($httpClient);
-        $this->tvSeasonFactory  = new TvFactory($httpClient);
+        $this->tvSeasonFactory  = new TvSeasonFactory($httpClient);
         $this->tvEpisodeFactory = new TvEpisodeFactory($httpClient);
 
         parent::__construct($httpClient);
@@ -171,15 +181,15 @@ public function setTvEpisodeFactory($tvEpisodeFactory)
     }
 
     /**
-     * @return TvFactory
+     * @return TvSeasonFactory
      */
     public function getTvSeasonFactory()
     {
         return $this->tvSeasonFactory;
     }
 
     /**
-     * @param  TvFactory $tvSeasonFactory
+     * @param  TvSeasonFactory $tvSeasonFactory
      * @return $this
      */
     public function setTvSeasonFactory($tvSeasonFactory)