iqb / ecryptfs

src/StreamWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
         $startBlock = \floor(($this->position - $this->header->metadataSize) / $this->header->extentSize);
 
         $return = '';
-        for ($i=0; $i<$readBlocks && !$this->stream_eof(); $i++) {
+        for ($i = 0; $i < $readBlocks && !$this->stream_eof(); $i++) {
             $block = $startBlock + $i;
             $iv = \hash("md5", $this->header->rootIv . \str_pad("$block", 16, "\0", \STR_PAD_RIGHT), true);
 

Braces +1 added lines, -3 removed lines

@@ -121,9 +121,7 @@
         // Use stream from context or open file
         if (\array_key_exists(self::CONTEXT_STREAM, $myContext)) {
             $this->encrypted = $myContext[self::CONTEXT_STREAM];
-        }
-
-        else {
+        } else {
             $prefix = self::STREAM_NAME . '://';
 
             if (\substr($path, 0, \strlen($prefix)) !== $prefix) {

src/Util.php

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
     {
         $key = \hash(self::KEY_DERIVATION_ALGO, \substr($salt, 0, ECRYPTFS_SALT_SIZE) . $passPhrase, true);
 
-        for ($i=1; $i<self::DEFAULT_NUM_HASH_ITERATIONS; $i++) {
+        for ($i = 1; $i < self::DEFAULT_NUM_HASH_ITERATIONS; $i++) {
             $key = \hash(self::KEY_DERIVATION_ALGO, $key, true);
         }
 
@@ -120,7 +120,7 @@ 
      * @return int
      * @throws ParseException
      */
-    final public static function parseTagPacketLength(string $data, int &$pos = 0) : int
+    final public static function parseTagPacketLength(string $data, int & $pos = 0) : int
     {
         $packetSize = \ord($data[$pos]);
         if ($packetSize > 224) {
@@ -150,7 +150,7 @@ 
             throw new \InvalidArgumentException("Length must be an unsigned integer.");
         }
 
-        if ($length > (32*256 + 255)) {
+        if ($length > (32 * 256 + 255)) {
             throw new \InvalidArgumentException("Length too large.");
         }
 
@@ -173,7 +173,7 @@ 
      */
     public static function isEncryptedFilename(string $filename) : bool
     {
-        return (\substr(\basename($filename), 0, \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX )) === self::FNEK_ENCRYPTED_FILENAME_PREFIX);
+        return (\substr(\basename($filename), 0, \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX)) === self::FNEK_ENCRYPTED_FILENAME_PREFIX);
     }
 
 
@@ -192,7 +192,7 @@ 
     public static function encryptFilename(CryptoEngineInterface $cryptoEngine, string $filename, string $fnek, int $cipherCode = Tag70Packet::DEFAULT_CIPHER, int $cipherKeySize = null) : string
     {
         $tag = Tag70Packet::generate($cryptoEngine, $filename, $fnek, $cipherCode, $cipherKeySize);
-        return self::FNEK_ENCRYPTED_FILENAME_PREFIX  . BaseConverter::encode($tag->dump());
+        return self::FNEK_ENCRYPTED_FILENAME_PREFIX . BaseConverter::encode($tag->dump());
     }
 
 
@@ -206,7 +206,7 @@ 
         }
 
         $dirname = \dirname($filename);
-        $decoded = BaseConverter::decode(\substr(\basename($filename), \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX )));
+        $decoded = BaseConverter::decode(\substr(\basename($filename), \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX)));
         $tag = Tag70Packet::parse($decoded);
         $tag->decrypt($cryptoEngine, $key);