storeman-io / storeman

src/Connection/StreamConnection.php

Doc Comments +3 added lines

@@ -157,6 +157,9 @@
         }
     }
 
+    /**
+     * @param string $relativePath
+     */
     protected function getAbsolutePath($relativePath): string
     {
         return $this->remotePath . ltrim($relativePath, DIRECTORY_SEPARATOR);

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
                         sleep(5);
                     }
                 }
-                while($wait);
+                while ($wait);
             }
 
             // only write lock if no other exists (or $force is true)
@@ -115,7 +115,7 @@ 
         {
             @fclose($this->getStream($relativePath, 'r'));
         }
-        catch(\RuntimeException $exception)
+        catch (\RuntimeException $exception)
         {
             return false;
         }

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
         try
         {
             @fclose($this->getStream($relativePath, 'r'));
-        }
-        catch(\RuntimeException $exception)
+        } catch(\RuntimeException $exception)
         {
             return false;
         }

src/Vault.php

Doc Comments +6 added lines

@@ -319,6 +319,9 @@ 
         return $operationCollection;
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function readIndexFromStream($stream, \DateTime $created = null): Index
     {
         $index = new Index($created);
@@ -331,6 +334,9 @@ 
         return $index;
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function writeIndexToStream(Index $index, $stream)
     {
         foreach ($index as $object)

Spacing +2 added lines, -2 removed lines

@@ -267,7 +267,7 @@ 
                     {
                         $blobId = $mergedIndex->generateNewBlobId();
                     }
-                    while($this->vaultConnection->exists($blobId));
+                    while ($this->vaultConnection->exists($blobId));
 
                     $indexObject->setBlobId($blobId);
 
@@ -323,7 +323,7 @@ 
     {
         $index = new Index($created);
 
-        while(($row = fgetcsv($stream)) !== false)
+        while (($row = fgetcsv($stream)) !== false)
         {
             $index->addObject(IndexObject::fromIndexRecord($row));
         }

Braces +4 added lines, -11 removed lines

@@ -232,8 +232,7 @@ 
                 if ($localObject === null)
                 {
                     $operationCollection->addOperation(new MkdirOperation($absoluteLocalPath, $indexObject->getMode()));
-                }
-                elseif (!$localObject->isDirectory())
+                } elseif (!$localObject->isDirectory())
                 {
                     $operationCollection->addOperation(new MkdirOperation($absoluteLocalPath, $indexObject->getMode()));
                 }
@@ -245,9 +244,7 @@ 
                         $directoryMtimes[$absoluteLocalPath] = $indexObject->getMtime();
                     }
                 }
-            }
-
-            elseif ($indexObject->isFile())
+            } elseif ($indexObject->isFile())
             {
                 // local file did not exist, hasn't been a file before or is outdated
                 if ($localObject === null || !$localObject->isFile() || $localObject->getMtime() < $indexObject->getMtime())
@@ -273,9 +270,7 @@ 
 
                     $operationCollection->addOperation(new UploadOperation($absoluteLocalPath, $indexObject->getBlobId(), $this->vaultConnection));
                 }
-            }
-
-            elseif ($indexObject->isLink())
+            } elseif ($indexObject->isLink())
             {
                 $absoluteLinkTarget = dirname($absoluteLocalPath) . DIRECTORY_SEPARATOR . $indexObject->getLinkTarget();
 
@@ -284,9 +279,7 @@ 
                     $operationCollection->addOperation(new UnlinkOperation($absoluteLocalPath));
                     $operationCollection->addOperation(new SymlinkOperation($absoluteLocalPath, $absoluteLinkTarget, $indexObject->getMode()));
                 }
-            }
-
-            else
+            } else
             {
                 // unknown object type
                 throw new \RuntimeException();

src/IndexObject.php

Braces +3 added lines, -6 removed lines

@@ -161,17 +161,14 @@
         if (is_file($absolutePath))
         {
             $object->type = static::TYPE_FILE;
-        }
-        elseif (is_dir($absolutePath))
+        } elseif (is_dir($absolutePath))
         {
             $object->type = static::TYPE_DIR;
-        }
-        elseif (is_link($absolutePath))
+        } elseif (is_link($absolutePath))
         {
             $object->type = static::TYPE_LINK;
             $object->linkTarget = str_replace($basePath, '', readlink($absolutePath));
-        }
-        else
+        } else
         {
             throw new \InvalidArgumentException(sprintf('File %s does not exist!', $absolutePath));
         }

src/Cli/Command/InfoCommand.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
         if (count($operationCollection))
         {
             $output->writeln(sprintf('<info>There are %d outstanding operations!</info>', count($operationCollection)));
-        }
-        else
+        } else
         {
             $output->writeln('<info>Everything is up to date!</info>');
         }

src/Cli/Command/AbstractCommand.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
         {
             $factory = new JsonFileConfigurationFactory($path);
             return $factory();
-        }
-        else
+        } else
         {
             throw new \InvalidArgumentException(sprintf('Don\'t know how to handle configuration given file %s.', $path));
         }

src/Index.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
         {
             $blobId = Uuid::uuid4();
         }
-        while($this->getObjectByBlobId($blobId) !== null);
+        while ($this->getObjectByBlobId($blobId) !== null);
 
         return $blobId;
     }

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
             if ($parent === null)
             {
                 throw new \InvalidArgumentException();
-            }
-            elseif (!$parent->isDirectory())
+            } elseif (!$parent->isDirectory())
             {
                 throw new \InvalidArgumentException();
             }

src/IndexMerger/StandardIndexMerger.php

Braces +4 added lines, -10 removed lines

@@ -25,13 +25,11 @@ 
                 if ($localObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-                elseif ($remoteIndex === null)
+                } elseif ($remoteIndex === null)
                 {
                     $mergedIndex->addObject($localObject);
                 }
-            }
-            else
+            } else
             {
                 // todo: merge mode by ctime
 
@@ -40,14 +38,10 @@ 
                 if (!$localObjectModified)
                 {
                     $mergedIndex->addObject($remoteObject);
-                }
-
-                elseif (!$remoteObjectModified)
+                } elseif (!$remoteObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-
-                else
+                } else
                 {
                     // todo: properly handle collision
                     throw new \RuntimeException("Collision at path {$localObject->getRelativePath()}");