[ResourceWatcher] Ran CS Fixer against code + fixed some CS issues by…

… myself.
everzet · May 27, 2012 · 0bec395 · 0bec395
1 parent 0132949
commit 0bec395
Show file tree

Hide file tree

Showing 18 changed files with 104 additions and 83 deletions.
diff --git a/src/Symfony/Component/ResourceWatcher/Event/FilesystemEvent.php b/src/Symfony/Component/ResourceWatcher/Event/FilesystemEvent.php
@@ -43,9 +43,9 @@ class FilesystemEvent extends Event
     /**
      * Initializes resource event.
      *
-     * @param   TrackedResource   $tracked      resource, that being tracked
-     * @param   ResourceInterface $resource     resource instance
-     * @param   integer           $type         event type bit
+     * @param TrackedResource   $tracked  resource, that being tracked
+     * @param ResourceInterface $resource resource instance
+     * @param integer           $type     event type bit
      */
     public function __construct(TrackedResource $tracked, ResourceInterface $resource, $type)
     {
@@ -61,7 +61,7 @@ public function __construct(TrackedResource $tracked, ResourceInterface $resourc
     /**
      * Returns resource, that being tracked while event occured.
      *
-     * @return  integer
+     * @return integer
      */
     public function getTrackedResource()
     {
@@ -71,7 +71,7 @@ public function getTrackedResource()
     /**
      * Returns changed resource.
      *
-     * @return  ResourceInterface
+     * @return ResourceInterface
      */
     public function getResource()
     {
@@ -81,7 +81,7 @@ public function getResource()
     /**
      * Returns true is resource, that fired event is file.
      *
-     * @return  Boolean
+     * @return Boolean
      */
     public function isFileChange()
     {
@@ -91,7 +91,7 @@ public function isFileChange()
     /**
      * Returns true is resource, that fired event is directory.
      *
-     * @return  Boolean
+     * @return Boolean
      */
     public function isDirectoryChange()
     {
@@ -101,7 +101,7 @@ public function isDirectoryChange()
     /**
      * Returns event type.
      *
-     * @return  integer
+     * @return integer
      */
     public function getType()
     {
@@ -111,7 +111,7 @@ public function getType()
     /**
      * Returns event type string representation.
      *
-     * @return  string
+     * @return string
      */
     public function getTypeString()
     {

diff --git a/src/Symfony/Component/ResourceWatcher/ResourceWatcher.php b/src/Symfony/Component/ResourceWatcher/ResourceWatcher.php
@@ -37,8 +37,8 @@ class ResourceWatcher
     /**
      * Initializes path watcher.
      *
-     * @param   TrackerInterface         $tracker
-     * @param   EventDispatcherInterface $eventDispatcher
+     * @param TrackerInterface         $tracker
+     * @param EventDispatcherInterface $eventDispatcher
      */
     public function __construct(TrackerInterface $tracker = null, EventDispatcherInterface $eventDispatcher = null)
     {
@@ -61,7 +61,7 @@ public function __construct(TrackerInterface $tracker = null, EventDispatcherInt
     /**
      * Returns current tracker instance.
      *
-     * @return  TrackerInterface
+     * @return TrackerInterface
      */
     public function getTracker()
     {
@@ -71,7 +71,7 @@ public function getTracker()
     /**
      * Returns event dispatcher mapped to this tracker.
      *
-     * @return  EventDispatcherInterface
+     * @return EventDispatcherInterface
      */
     public function getEventDispatcher()
     {
@@ -81,11 +81,11 @@ public function getEventDispatcher()
     /**
      * Track resource with watcher.
      *
-     * @param   string                      $trackingId id to this track (used for events naming)
-     * @param   ResourceInterface|string    $resource   resource to track
-     * @param   integer                     $eventsMask event types bitmask
+     * @param string                   $trackingId id to this track (used for events naming)
+     * @param ResourceInterface|string $resource   resource to track
+     * @param integer                  $eventsMask event types bitmask
      *
-     * @throws  InvalidArgumentException If 'all' is used as a tracking id
+     * @throws InvalidArgumentException If 'all' is used as a tracking id
      */
     public function track($trackingId, $resource, $eventsMask = FilesystemEvent::IN_ALL)
     {
@@ -116,10 +116,10 @@ public function track($trackingId, $resource, $eventsMask = FilesystemEvent::IN_
     /**
      * Adds callback as specific tracking listener.
      *
-     * @param   string   $trackingId id to this track (used for events naming)
-     * @param   Callable $callback   callback to call on change
+     * @param string   $trackingId id to this track (used for events naming)
+     * @param callable $callback   callback to call on change
      *
-     * @throws  InvalidArgumentException If $callback argument isn't callable
+     * @throws InvalidArgumentException If $callback argument isn't callable
      */
     public function addListener($trackingId, $callback)
     {
@@ -135,20 +135,20 @@ public function addListener($trackingId, $callback)
     /**
      * Tracks specific resource change by provided callback.
      *
-     * @param   ResourceInterface|string  $resource   resource to track
-     * @param   callable                  $callback   callback to call on change
-     * @param   integer                   $eventsMask event types bitmask
+     * @param ResourceInterface|string $resource   resource to track
+     * @param callable                 $callback   callback to call on change
+     * @param integer                  $eventsMask event types bitmask
      */
     public function trackByListener($resource, $callback, $eventsMask = FilesystemEvent::IN_ALL)
     {
-        $this->track($trackingId = md5((string)$resource.$eventsMask), $resource, $eventsMask);
+        $this->track($trackingId = md5((string) $resource.$eventsMask), $resource, $eventsMask);
         $this->addListener($trackingId, $callback);
     }
 
     /**
      * Returns true if watcher is currently watching on tracked resources (started).
      *
-     * @return  Boolean
+     * @return Boolean
      */
     public function isWatching()
     {
@@ -158,8 +158,8 @@ public function isWatching()
     /**
      * Starts watching on tracked resources.
      *
-     * @param   integer $checkInterval  check interval in microseconds
-     * @param   integer $timeLimit      maximum watching time limit in microseconds
+     * @param integer $checkInterval check interval in microseconds
+     * @param integer $timeLimit     maximum watching time limit in microseconds
      */
     public function start($checkInterval = 1000000, $timeLimit = null)
     {

diff --git a/src/Symfony/Component/ResourceWatcher/StateChecker/FileStateChecker.php b/src/Symfony/Component/ResourceWatcher/StateChecker/FileStateChecker.php
@@ -24,8 +24,8 @@ class FileStateChecker extends ResourceStateChecker
     /**
      * Initializes checker.
      *
-     * @param   FileResource   $resource
-     * @param   integer        $eventsMask event types bitmask
+     * @param FileResource $resource
+     * @param integer      $eventsMask event types bitmask
      */
     public function __construct(FileResource $resource, $eventsMask = FilesystemEvent::IN_ALL)
     {

diff --git a/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/CheckerBag.php b/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/CheckerBag.php
@@ -56,7 +56,8 @@ public function add(ResourceStateChecker $watched)
     /**
      * Returns state checker from the bag
      *
-     * @param int $id Watch descriptor
+     * @param  int                     $id Watch descriptor
+     *
      * @return \SplObjectStorage|array
      */
     public function get($id)
@@ -67,7 +68,8 @@ public function get($id)
     /**
      * Checks whether at least one state checker with id $id exists.
      *
-     * @param int $id Watch descriptor
+     * @param  int  $id Watch descriptor
+     *
      * @return bool
      */
     public function has($id)

diff --git a/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/DirectoryStateChecker.php b/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/DirectoryStateChecker.php
@@ -62,9 +62,9 @@ class DirectoryStateChecker extends ResourceStateChecker
     /**
      * Initializes checker.
      *
-     * @param CheckerBag $bag
+     * @param CheckerBag        $bag
      * @param DirectoryResource $resource
-     * @param int $eventsMask
+     * @param int               $eventsMask
      */
     public function __construct(CheckerBag $bag, DirectoryResource $resource, $eventsMask = FilesystemEvent::IN_ALL)
     {
@@ -162,6 +162,7 @@ public function getChangeset()
 
         $this->dirEvents = $this->fileEvents = $this->movedResources = array();
         $this->event     = null;
+
         return $changeset;
     }
 
@@ -170,7 +171,7 @@ public function getChangeset()
      * rename('dir', 'dir_new'); rename('dir_new', 'dir'). As a result no events should be returned.
      * This function just keeps track of the move events, and they're analyzed in the getChangeset method.
      *
-     * @param int $mask
+     * @param int    $mask
      * @param string $name
      */
     protected function trackMoveEvent($mask, $name)
@@ -242,8 +243,9 @@ protected function reindexChildCheckers()
     /**
      * Normalizes file event
      *
-     * @param int $event
-     * @param string $name
+     * @param  int      $event
+     * @param  string   $name
+     *
      * @return null|int
      */
     protected function normalizeFileEvent($event, $name)
@@ -258,6 +260,7 @@ protected function normalizeFileEvent($event, $name)
         }
         if (!$this->isDeleted($event)) {
             $this->createFileResource($name);
+
             return IN_CREATE;
         }
 
@@ -267,7 +270,8 @@ protected function normalizeFileEvent($event, $name)
     /**
      * Normalizes event
      *
-     * @param int $event
+     * @param  int $event
+     *
      * @return int
      */
     protected function normalizeEvent($event)
@@ -285,7 +289,7 @@ protected function normalizeEvent($event)
     /**
      * Creates new DirectoryStateChecker
      *
-     * @param string $name
+     * @param string                 $name
      * @param null|DirectoryResource $resource
      */
     protected function createNewDirectoryChecker($name, DirectoryResource $resource = null)

diff --git a/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/FileStateChecker.php b/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/FileStateChecker.php
@@ -24,9 +24,9 @@ class FileStateChecker extends ResourceStateChecker
     /**
      * Initializes checker.
      *
-     * @param CheckerBag $bag
+     * @param CheckerBag   $bag
      * @param FileResource $resource
-     * @param int $eventsMask
+     * @param int          $eventsMask
      */
     public function __construct(CheckerBag $bag, FileResource $resource, $eventsMask = FilesystemEvent::IN_ALL)
     {

diff --git a/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/NewDirectoryStateChecker.php b/src/Symfony/Component/ResourceWatcher/StateChecker/Inotify/NewDirectoryStateChecker.php
@@ -29,9 +29,9 @@ class NewDirectoryStateChecker extends DirectoryStateChecker
     /**
      * Initializes checker.
      *
-     * @param CheckerBag $bag
+     * @param CheckerBag        $bag
      * @param DirectoryResource $resource
-     * @param int $eventsMask
+     * @param int               $eventsMask
      */
     public function __construct(CheckerBag $bag, DirectoryResource $resource, $eventsMask = FilesystemEvent::IN_ALL)
     {