@@ -29,8 +29,7 @@ |
||
| 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 | } |
@@ -38,8 +38,7 @@ |
||
| 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 | } |
@@ -173,17 +173,14 @@ |
||
| 173 | 173 | { |
| 174 | 174 | $object->type = static::TYPE_FILE; |
| 175 | 175 | $object->size = (int)$stat['size']; |
| 176 | - } |
|
| 177 | - elseif (is_dir($absolutePath)) |
|
| 176 | + } elseif (is_dir($absolutePath)) |
|
| 178 | 177 | { |
| 179 | 178 | $object->type = static::TYPE_DIR; |
| 180 | - } |
|
| 181 | - elseif (is_link($absolutePath)) |
|
| 179 | + } elseif (is_link($absolutePath)) |
|
| 182 | 180 | { |
| 183 | 181 | $object->type = static::TYPE_LINK; |
| 184 | 182 | $object->linkTarget = str_replace($basePath, '', readlink($absolutePath)); |
| 185 | - } |
|
| 186 | - else |
|
| 183 | + } else |
|
| 187 | 184 | { |
| 188 | 185 | throw new \LogicException(); |
| 189 | 186 | } |
@@ -89,9 +89,7 @@ |
||
| 89 | 89 | // compare remote object to object state at last sync |
| 90 | 90 | // we explicitly want to use equality instead of identity |
| 91 | 91 | $remoteObjectModified = !($remoteObject == $lastLocalObject); |
| 92 | - } |
|
| 93 | - |
|
| 94 | - else |
|
| 92 | + } else |
|
| 95 | 93 | { |
| 96 | 94 | // object already didn't exist locally at the last sync |
| 97 | 95 | $localObjectModified = false; |
@@ -68,9 +68,7 @@ discard block |
||
| 68 | 68 | $directoryMtimes[$mergedIndexObject->getRelativePath()] = $mergedIndexObject->getMtime(); |
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | - } |
|
| 72 | - |
|
| 73 | - elseif ($mergedIndexObject->isFile()) |
|
| 71 | + } elseif ($mergedIndexObject->isFile()) |
|
| 74 | 72 | { |
| 75 | 73 | // local file did not exist, hasn't been a file before or is outdated |
| 76 | 74 | $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime(); |
@@ -98,9 +96,7 @@ discard block |
||
| 98 | 96 | |
| 99 | 97 | $operationList->addOperation(new UploadOperation($mergedIndexObject->getRelativePath(), $mergedIndexObject->getBlobId(), $uploadStreamFilters)); |
| 100 | 98 | } |
| 101 | - } |
|
| 102 | - |
|
| 103 | - elseif ($mergedIndexObject->isLink()) |
|
| 99 | + } elseif ($mergedIndexObject->isLink()) |
|
| 104 | 100 | { |
| 105 | 101 | if ($localObject !== null && $localObject->getLinkTarget() !== $mergedIndexObject->getLinkTarget()) |
| 106 | 102 | { |
@@ -109,9 +105,7 @@ discard block |
||
| 109 | 105 | |
| 110 | 106 | $modifiedPaths[] = $mergedIndexObject->getRelativePath(); |
| 111 | 107 | } |
| 112 | - } |
|
| 113 | - |
|
| 114 | - else |
|
| 108 | + } else |
|
| 115 | 109 | { |
| 116 | 110 | // unknown/invalid object type |
| 117 | 111 | throw new Exception(); |
@@ -106,12 +106,10 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -292,8 +292,7 @@ |
||
| 292 | 292 | { |
| 293 | 293 | $newRevision = $newRevision ?: ($lastSynchronization->getRevision() + 1); |
| 294 | 294 | $remoteIndex = $this->doLoadRemoteIndex($lastSynchronization->getRevision(), $synchronizationList); |
| 295 | - } |
|
| 296 | - else |
|
| 295 | + } else |
|
| 297 | 296 | { |
| 298 | 297 | $newRevision = $newRevision ?: 1; |
| 299 | 298 | $remoteIndex = null; |
@@ -59,8 +59,7 @@ |
||
| 59 | 59 | if ($input->getOption('config')) |
| 60 | 60 | { |
| 61 | 61 | $config = $reader->getConfiguration($input->getOption('config')); |
| 62 | - } |
|
| 63 | - elseif (is_file('archivr.json')) |
|
| 62 | + } elseif (is_file('archivr.json')) |
|
| 64 | 63 | { |
| 65 | 64 | $config = $reader->getConfiguration('archivr.json'); |
| 66 | 65 | } |
@@ -53,16 +53,13 @@ discard block |
||
| 53 | 53 | if (is_string($factory)) |
| 54 | 54 | { |
| 55 | 55 | $instance = new $factory(...$params); |
| 56 | - } |
|
| 57 | - elseif ($factory instanceof \Closure) |
|
| 56 | + } elseif ($factory instanceof \Closure) |
|
| 58 | 57 | { |
| 59 | 58 | $instance = $factory(...$params); |
| 60 | - } |
|
| 61 | - elseif (is_object($factory)) |
|
| 59 | + } elseif (is_object($factory)) |
|
| 62 | 60 | { |
| 63 | 61 | $instance = $factory; |
| 64 | - } |
|
| 65 | - else |
|
| 62 | + } else |
|
| 66 | 63 | { |
| 67 | 64 | throw new \LogicException(); |
| 68 | 65 | } |
@@ -101,12 +98,10 @@ discard block |
||
| 101 | 98 | { |
| 102 | 99 | throw new \RuntimeException(sprintf('Trying to register factory named "%s" to "%s" as class name "%s" which does not exist.', $name, static::class, $factory)); |
| 103 | 100 | } |
| 104 | - } |
|
| 105 | - elseif ($factory instanceof \Closure) |
|
| 101 | + } elseif ($factory instanceof \Closure) |
|
| 106 | 102 | { |
| 107 | 103 | // cannot really validate |
| 108 | - } |
|
| 109 | - elseif (is_object($factory)) |
|
| 104 | + } elseif (is_object($factory)) |
|
| 110 | 105 | { |
| 111 | 106 | if ($type = static::requiresInstanceOf()) |
| 112 | 107 | { |
@@ -115,8 +110,7 @@ discard block |
||
| 115 | 110 | throw new \RuntimeException(sprintf('Trying to register service instance named "%s" to "%s" as which is not an instance of "%s".', $name, static::class, $type)); |
| 116 | 111 | } |
| 117 | 112 | } |
| 118 | - } |
|
| 119 | - else |
|
| 113 | + } else |
|
| 120 | 114 | { |
| 121 | 115 | throw new \InvalidArgumentException(sprintf('Invalid factory of type "%s" named "%s" given to "%s".', gettype($factory), $name, static::class)); |
| 122 | 116 | } |