storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Braces +4 added lines, -10 removed lines

@@ -26,27 +26,21 @@
                 if ($localObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-                elseif ($remoteIndex === null)
+                } elseif ($remoteIndex === null)
                 {
                     $mergedIndex->addObject($localObject);
                 }
-            }
-            else
+            } else
             {
                 $remoteObjectModified = $lastLocalIndex ? ($remoteObject->getMtime() > $lastLocalIndex->getCreated()->getTimestamp()) : false;
 
                 if (!$localObjectModified)
                 {
                     $mergedIndex->addObject($remoteObject);
-                }
-
-                elseif (!$remoteObjectModified)
+                } elseif (!$remoteObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-
-                else
+                } else
                 {
                     throw new Exception("Collision at path {$localObject->getRelativePath()}");
                 }

src/ConnectionAdapter/FlysystemConnectionAdapter.php

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
             {
                 throw new Exception(sprintf('read() failed for %s.', $relativePath));
             }
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }
@@ -48,8 +47,7 @@ 
             {
                 throw new Exception(sprintf('write() failed for %s.', $relativePath));
             }
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }
@@ -65,8 +63,7 @@ 
             {
                 throw new Exception(sprintf('writeStream() failed for %s.', $relativePath));
             }
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }
@@ -77,8 +74,7 @@ 
         try
         {
             return $this->filesystem->has($relativePath);
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }
@@ -94,8 +90,7 @@ 
             {
                 throw new Exception(sprintf('unlink() failed for %s', $relativePath));
             }
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }
@@ -113,8 +108,7 @@ 
             }
 
             return $stream;
-        }
-        catch (FlysystemException $exception)
+        } catch (FlysystemException $exception)
         {
             throw new Exception($exception->getMessage(), 0, $exception);
         }

src/Operation/UploadOperation.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
             fclose($localStream);
 
             return true;
-        }
-        catch (Exception $exception)
+        } catch (Exception $exception)
         {
             return false;
         }

src/IndexObject.php

Braces +3 added lines, -6 removed lines

@@ -157,17 +157,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 Exception(sprintf('File %s does not exist!', $absolutePath));
         }

src/Index.php

Braces +1 added lines, -2 removed lines

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

src/Cli/Command/InfoCommand.php

Braces +1 added lines, -2 removed lines

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

src/Cli/Command/AbstractCommand.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
             if ($input->getOption('config'))
             {
                 $this->config = $reader->getConfiguration($input->getOption('config'));
-            }
-            elseif (is_file('archivr.json'))
+            } elseif (is_file('archivr.json'))
             {
                 $this->config = $reader->getConfiguration('archivr.json');
             }

src/Cli/Application.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 class Application extends \Symfony\Component\Console\Application
 {
-    const LOGO =  <<<TXT
+    const LOGO = <<<TXT
    ___           __   _      ___ 
   / _ | ________/ /  (_)  __/ _ \
  / __ |/ __/ __/ _ \/ / |/ / , _/

src/Vault.php

Doc Comments +6 added lines

@@ -681,6 +681,9 @@ 
         return $operationCollection;
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function readIndexFromStream($stream, \DateTime $created = null): Index
     {
         if (!is_resource($stream))
@@ -715,6 +718,9 @@ 
         fclose($stream);
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function readSynchronizationListFromStream($stream): SynchronizationList
     {
         if (!is_resource($stream))

Braces +6 added lines, -15 removed lines

@@ -299,8 +299,7 @@ 
         {
             $newRevision = $newRevision ?: ($lastSynchronization->getRevision() + 1);
             $remoteIndex = $this->doLoadRemoteIndex($lastSynchronization->getRevision(), $synchronizationList);
-        }
-        else
+        } else
         {
             $newRevision = $newRevision ?: 1;
             $remoteIndex = null;
@@ -432,12 +431,10 @@ 
         try
         {
             return $this->doRestore($revision, $progressListener, true);
-        }
-        catch (\Exception $exception)
+        } catch (\Exception $exception)
         {
             throw $exception;
-        }
-        finally
+        } finally
         {
             $this->localPath = $originalLocalPath;
         }
@@ -602,9 +599,7 @@ 
                         $directoryMtimes[$absoluteLocalPath] = $mergedIndexObject->getMtime();
                     }
                 }
-            }
-
-            elseif ($mergedIndexObject->isFile())
+            } elseif ($mergedIndexObject->isFile())
             {
                 // local file did not exist, hasn't been a file before or is outdated
                 $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime();
@@ -635,9 +630,7 @@ 
 
                     $operationCollection->addOperation(new UploadOperation($absoluteLocalPath, $mergedIndexObject->getBlobId(), $this->vaultConnection, $uploadStreamFilters));
                 }
-            }
-
-            elseif ($mergedIndexObject->isLink())
+            } elseif ($mergedIndexObject->isLink())
             {
                 $absoluteLinkTarget = dirname($absoluteLocalPath) . DIRECTORY_SEPARATOR . $mergedIndexObject->getLinkTarget();
 
@@ -646,9 +639,7 @@ 
                     $operationCollection->addOperation(new UnlinkOperation($absoluteLocalPath));
                     $operationCollection->addOperation(new SymlinkOperation($absoluteLocalPath, $absoluteLinkTarget, $mergedIndexObject->getMode()));
                 }
-            }
-
-            else
+            } else
             {
                 // unknown/invalid object type
                 throw new Exception();

Spacing +1 added lines, -1 removed lines

@@ -427,7 +427,7 @@
     public function dump(string $targetPath, int $revision = null, SynchronizationProgressListenerInterface $progressListener = null): OperationResultCollection
     {
         $originalLocalPath = $this->localPath;
-        $this->localPath =  rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->localPath = rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         try
         {