Merge pull request #41 from thornag/scrutinizer-patch-2

Scrutinizer Auto-Fixes
michael-donat · Dec 30, 2014 · 7d802b7 · 7d802b7
2 parents 620ac3f + 9c0cb7d
commit 7d802b7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/src/VirtualFileSystem/FileSystem.php b/src/VirtualFileSystem/FileSystem.php
@@ -119,8 +119,8 @@ public function path($path)
     /**
      * Creates and returns a directory
      *
-     * @param string  $path
-     * @param bool    $recursive
+     * @param string       $path
+     * @param bool         $recursive
      * @param integer|null $mode
      *
      * @return Directory
@@ -133,7 +133,7 @@ public function createDirectory($path, $recursive = false, $mode = null)
     /**
      * Creates and returns a file
      *
-     * @param string $path
+     * @param string      $path
      * @param string|null $data
      *
      * @return File

diff --git a/src/VirtualFileSystem/Wrapper.php b/src/VirtualFileSystem/Wrapper.php
@@ -369,9 +369,9 @@ public function mkdir($path, $mode, $options)
     }
 
     /**
-     * @param $path
-     * @param $container
-     * @param $strippedPath
+     * @param string $path
+     * @param Container $container
+     * @param string $strippedPath
      * @return bool
      */
     protected function metaTouch($path, $container, $strippedPath)
@@ -410,6 +410,13 @@ protected function metaTouch($path, $container, $strippedPath)
         return true;
     }
 
+    /**
+     * @param Structure\Node $node
+     * @param integer $value
+     * @param Container $container
+     * @param string $strippedPath
+     * @param Wrapper\PermissionHelper $permissionHelper
+     */
     protected function metaAccess($node, $value, $container, $strippedPath, $permissionHelper)
     {
         if ($node instanceof Link) {
@@ -429,7 +436,15 @@ protected function metaAccess($node, $value, $container, $strippedPath, $permiss
         $node->setChangeTime(time());
     }
 
-    protected function metaOwner($node, $ownerId, $ownerName, $container, $strippedPath, $permissionHelper)
+    /**
+ * @param Structure\Node $node
+ * @param null|integer $ownerId
+ * @param integer|null $ownerName
+ * @param Container $container
+ * @param string $strippedPath
+ * @param Wrapper\PermissionHelper $permissionHelper
+ */
+protected function metaOwner($node, $ownerId, $ownerName, $container, $strippedPath, $permissionHelper)
     {
         if (!$permissionHelper->userIsRoot() && !$permissionHelper->userIsOwner()) {
             trigger_error(
@@ -448,7 +463,15 @@ protected function metaOwner($node, $ownerId, $ownerName, $container, $strippedP
         $node->setChangeTime(time());
     }
 
-    protected function metaGroup($node, $groupId, $groupName, $container, $strippedPath, $permissionHelper)
+    /**
+ * @param Structure\Node $node
+ * @param null|integer $groupId
+ * @param integer|null $groupName
+ * @param Container $container
+ * @param string $strippedPath
+ * @param Wrapper\PermissionHelper $permissionHelper
+ */
+protected function metaGroup($node, $groupId, $groupName, $container, $strippedPath, $permissionHelper)
     {
         if (!$permissionHelper->userIsRoot() && !$permissionHelper->userIsOwner()) {
             trigger_error(

diff --git a/src/VirtualFileSystem/Wrapper/FileHandler.php b/src/VirtualFileSystem/Wrapper/FileHandler.php
@@ -191,7 +191,7 @@ public function isOpenedForReading()
     }
 
     /**
-     * @param  $resource
+     * @param   $resource
      */
     public function lock($resource, $operation)
     {

diff --git a/src/VirtualFileSystem/Wrapper/PermissionHelper.php b/src/VirtualFileSystem/Wrapper/PermissionHelper.php
@@ -91,7 +91,7 @@ public function groupIsOwner()
     /**
      * Checks whether file is readable for group
      *
-     * @return integer|null
+     * @return boolean
      */
     public function groupCanRead()
     {