Completed
Push — master ( 63b887...b350e3 )
by Arne
01:47
created
src/ConnectionAdapter/FlysystemConnectionAdapter.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@  discard block
 block discarded – undo
29 29
             {
30 30
                 throw new Exception(sprintf('read() failed for %s.', $relativePath));
31 31
             }
32
-        }
33
-        catch (FlysystemException $exception)
32
+        } catch (FlysystemException $exception)
34 33
         {
35 34
             throw new Exception($exception->getMessage(), 0, $exception);
36 35
         }
@@ -48,8 +47,7 @@  discard block
 block discarded – undo
48 47
             {
49 48
                 throw new Exception(sprintf('write() failed for %s.', $relativePath));
50 49
             }
51
-        }
52
-        catch (FlysystemException $exception)
50
+        } catch (FlysystemException $exception)
53 51
         {
54 52
             throw new Exception($exception->getMessage(), 0, $exception);
55 53
         }
@@ -65,8 +63,7 @@  discard block
 block discarded – undo
65 63
             {
66 64
                 throw new Exception(sprintf('writeStream() failed for %s.', $relativePath));
67 65
             }
68
-        }
69
-        catch (FlysystemException $exception)
66
+        } catch (FlysystemException $exception)
70 67
         {
71 68
             throw new Exception($exception->getMessage(), 0, $exception);
72 69
         }
@@ -77,8 +74,7 @@  discard block
 block discarded – undo
77 74
         try
78 75
         {
79 76
             return $this->filesystem->has($relativePath);
80
-        }
81
-        catch (FlysystemException $exception)
77
+        } catch (FlysystemException $exception)
82 78
         {
83 79
             throw new Exception($exception->getMessage(), 0, $exception);
84 80
         }
@@ -94,8 +90,7 @@  discard block
 block discarded – undo
94 90
             {
95 91
                 throw new Exception(sprintf('unlink() failed for %s', $relativePath));
96 92
             }
97
-        }
98
-        catch (FlysystemException $exception)
93
+        } catch (FlysystemException $exception)
99 94
         {
100 95
             throw new Exception($exception->getMessage(), 0, $exception);
101 96
         }
@@ -113,8 +108,7 @@  discard block
 block discarded – undo
113 108
             }
114 109
 
115 110
             return $stream;
116
-        }
117
-        catch (FlysystemException $exception)
111
+        } catch (FlysystemException $exception)
118 112
         {
119 113
             throw new Exception($exception->getMessage(), 0, $exception);
120 114
         }
Please login to merge, or discard this patch.
src/Operation/UploadOperation.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@
 block discarded – undo
29 29
             fclose($localStream);
30 30
 
31 31
             return true;
32
-        }
33
-        catch (Exception $exception)
32
+        } catch (Exception $exception)
34 33
         {
35 34
             return false;
36 35
         }
Please login to merge, or discard this patch.
src/Index.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@
 block discarded – undo
38 38
             if ($parent === null)
39 39
             {
40 40
                 throw new Exception();
41
-            }
42
-            elseif (!$parent->isDirectory())
41
+            } elseif (!$parent->isDirectory())
43 42
             {
44 43
                 throw new Exception();
45 44
             }
Please login to merge, or discard this patch.
src/Cli/Command/AbstractCommand.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@
 block discarded – undo
46 46
             if ($input->getOption('config'))
47 47
             {
48 48
                 $this->config = $reader->getConfiguration($input->getOption('config'));
49
-            }
50
-            elseif (is_file('archivr.json'))
49
+            } elseif (is_file('archivr.json'))
51 50
             {
52 51
                 $this->config = $reader->getConfiguration('archivr.json');
53 52
             }
Please login to merge, or discard this patch.
src/Cli/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 
5 5
 class Application extends \Symfony\Component\Console\Application
6 6
 {
7
-    const LOGO =  <<<TXT
7
+    const LOGO = <<<TXT
8 8
    ___           __   _      ___ 
9 9
   / _ | ________/ /  (_)  __/ _ \
10 10
  / __ |/ __/ __/ _ \/ / |/ / , _/
Please login to merge, or discard this patch.
src/Vault.php 3 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -681,6 +681,9 @@  discard block
 block discarded – undo
681 681
         return $operationCollection;
682 682
     }
683 683
 
684
+    /**
685
+     * @param resource $stream
686
+     */
684 687
     protected function readIndexFromStream($stream, \DateTime $created = null): Index
685 688
     {
686 689
         if (!is_resource($stream))
@@ -715,6 +718,9 @@  discard block
 block discarded – undo
715 718
         fclose($stream);
716 719
     }
717 720
 
721
+    /**
722
+     * @param resource $stream
723
+     */
718 724
     protected function readSynchronizationListFromStream($stream): SynchronizationList
719 725
     {
720 726
         if (!is_resource($stream))
Please login to merge, or discard this patch.
Braces   +6 added lines, -15 removed lines patch added patch discarded remove patch
@@ -299,8 +299,7 @@  discard block
 block discarded – undo
299 299
         {
300 300
             $newRevision = $newRevision ?: ($lastSynchronization->getRevision() + 1);
301 301
             $remoteIndex = $this->doLoadRemoteIndex($lastSynchronization->getRevision(), $synchronizationList);
302
-        }
303
-        else
302
+        } else
304 303
         {
305 304
             $newRevision = $newRevision ?: 1;
306 305
             $remoteIndex = null;
@@ -432,12 +431,10 @@  discard block
 block discarded – undo
432 431
         try
433 432
         {
434 433
             return $this->doRestore($revision, $progressListener, true);
435
-        }
436
-        catch (\Exception $exception)
434
+        } catch (\Exception $exception)
437 435
         {
438 436
             throw $exception;
439
-        }
440
-        finally
437
+        } finally
441 438
         {
442 439
             $this->localPath = $originalLocalPath;
443 440
         }
@@ -602,9 +599,7 @@  discard block
 block discarded – undo
602 599
                         $directoryMtimes[$absoluteLocalPath] = $mergedIndexObject->getMtime();
603 600
                     }
604 601
                 }
605
-            }
606
-
607
-            elseif ($mergedIndexObject->isFile())
602
+            } elseif ($mergedIndexObject->isFile())
608 603
             {
609 604
                 // local file did not exist, hasn't been a file before or is outdated
610 605
                 $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime();
@@ -635,9 +630,7 @@  discard block
 block discarded – undo
635 630
 
636 631
                     $operationCollection->addOperation(new UploadOperation($absoluteLocalPath, $mergedIndexObject->getBlobId(), $this->vaultConnection, $uploadStreamFilters));
637 632
                 }
638
-            }
639
-
640
-            elseif ($mergedIndexObject->isLink())
633
+            } elseif ($mergedIndexObject->isLink())
641 634
             {
642 635
                 $absoluteLinkTarget = dirname($absoluteLocalPath) . DIRECTORY_SEPARATOR . $mergedIndexObject->getLinkTarget();
643 636
 
@@ -646,9 +639,7 @@  discard block
 block discarded – undo
646 639
                     $operationCollection->addOperation(new UnlinkOperation($absoluteLocalPath));
647 640
                     $operationCollection->addOperation(new SymlinkOperation($absoluteLocalPath, $absoluteLinkTarget, $mergedIndexObject->getMode()));
648 641
                 }
649
-            }
650
-
651
-            else
642
+            } else
652 643
             {
653 644
                 // unknown/invalid object type
654 645
                 throw new Exception();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -427,7 +427,7 @@
 block discarded – undo
427 427
     public function dump(string $targetPath, int $revision = null, SynchronizationProgressListenerInterface $progressListener = null): OperationResultCollection
428 428
     {
429 429
         $originalLocalPath = $this->localPath;
430
-        $this->localPath =  rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
430
+        $this->localPath = rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
431 431
 
432 432
         try
433 433
         {
Please login to merge, or discard this patch.
src/Cli/Command/DumpCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
         $archivr = new ArchivR($configuration);
28 28
         $archivr->dump(
29 29
             $input->getArgument('path'),
30
-            $input->getOption(  'revision') ? (int)$input->getOption('revision') : null,
30
+            $input->getOption('revision') ? (int)$input->getOption('revision') : null,
31 31
             $input->getOption('vault'),
32 32
             new SynchronizationProgressListener($output)
33 33
         );
Please login to merge, or discard this patch.
src/Cli/Command/InfoCommand.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -107,8 +107,7 @@  discard block
 block discarded – undo
107 107
             }
108 108
 
109 109
             $table->render();
110
-        }
111
-        else
110
+        } else
112 111
         {
113 112
             $output->writeln('No synchronizations so far.');
114 113
         }
@@ -124,8 +123,7 @@  discard block
 block discarded – undo
124 123
         if (count($operationCollection))
125 124
         {
126 125
             $output->writeln(sprintf('<bold>There are %d outstanding operations.</bold>', count($operationCollection)));
127
-        }
128
-        else
126
+        } else
129 127
         {
130 128
             $output->writeln('<info>Everything is up to date!</info>');
131 129
         }
Please login to merge, or discard this patch.
src/Compiler.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,12 +106,10 @@  discard block
 block discarded – undo
106 106
             if (is_string($token))
107 107
             {
108 108
                 $output .= $token;
109
-            }
110
-            elseif (in_array($token[0], [T_COMMENT, T_DOC_COMMENT]))
109
+            } elseif (in_array($token[0], [T_COMMENT, T_DOC_COMMENT]))
111 110
             {
112 111
                 $output .= str_repeat("\n", substr_count($token[1], "\n"));
113
-            }
114
-            elseif (T_WHITESPACE === $token[0])
112
+            } elseif (T_WHITESPACE === $token[0])
115 113
             {
116 114
                 // reduce wide spaces
117 115
                 $whitespace = preg_replace('{[ \t]+}', ' ', $token[1]);
@@ -123,8 +121,7 @@  discard block
 block discarded – undo
123 121
                 $whitespace = preg_replace('{\n +}', "\n", $whitespace);
124 122
 
125 123
                 $output .= $whitespace;
126
-            }
127
-            else
124
+            } else
128 125
             {
129 126
                 $output .= $token[1];
130 127
             }
Please login to merge, or discard this patch.