rkrx / data-diff

src/DiffStorageStoreRowData.php

Spacing +14 added lines, -14 removed lines

@@ -77,12 +77,12 @@ 
 		$keys = array_keys(array_merge($this->row, $this->foreignRow));
 		$formattedLocalRow = $this->formatRow($localRow);
 		$formattedForeignRow = $this->formatRow($foreignRow);
-		foreach($keys as $key) {
-			$conv = function (array $row) use ($key) {
+		foreach ($keys as $key) {
+			$conv = function(array $row) use ($key) {
 				$value = null;
-				if(array_key_exists($key, $row)) {
+				if (array_key_exists($key, $row)) {
 					$value = $row[$key];
-					if(array_key_exists($key, $this->converter)) {
+					if (array_key_exists($key, $this->converter)) {
 						$value = call_user_func($this->converter[$key], $value);
 					}
 				}
@@ -90,7 +90,7 @@ 
 			};
 			$localValue = call_user_func($conv, $formattedLocalRow);
 			$foreignValue = call_user_func($conv, $formattedForeignRow);
-			if(json_encode($localValue) !== json_encode($foreignValue)) {
+			if (json_encode($localValue) !== json_encode($foreignValue)) {
 				$diff[$key] = ['local' => $localValue, 'foreign' => $foreignValue];
 			}
 		}
@@ -105,16 +105,16 @@ 
 	 */
 	public function getDiffFormatted(array $fields = null, $format = null) {
 		$diff = $this->getDiff($fields);
-		if($format === null) {
+		if ($format === null) {
 			$result = [];
-			$formatVal = function ($value) {
+			$formatVal = function($value) {
 				$value = preg_replace('/\\s+/', ' ', $value);
-				if(strlen($value) > 20) {
-					$value = substr($value, 0, 16) . ' ...';
+				if (strlen($value) > 20) {
+					$value = substr($value, 0, 16).' ...';
 				}
 				return $value;
 			};
-			foreach($diff as $fieldName => $values) {
+			foreach ($diff as $fieldName => $values) {
 				$foreignValue = $formatVal($values['foreign']);
 				$localValue = $formatVal($values['local']);
 				$result[] = sprintf("%s: %s -> %s", $fieldName, $foreignValue, $localValue);
@@ -130,13 +130,13 @@ 
 	 * @return array
 	 */
 	private function applyOptions(array $row, array $options) {
-		if(count($options) < 1) {
+		if (count($options) < 1) {
 			return $row;
 		}
-		if(array_key_exists('keys', $options) && is_array($options['keys'])) {
+		if (array_key_exists('keys', $options) && is_array($options['keys'])) {
 			$row = array_intersect_key($row, array_combine($options['keys'], $options['keys']));
 		}
-		if(array_key_exists('ignore', $options) && is_array($options['ignore'])) {
+		if (array_key_exists('ignore', $options) && is_array($options['ignore'])) {
 			$row = array_diff_key($row, array_combine($options['ignore'], $options['ignore']));
 		}
 		return $row;
@@ -148,7 +148,7 @@ 
 	 */
 	private function formatRow($row) {
 		$schema = $this->converter;
-		$schema = array_map(function () { return null; }, $schema);
+		$schema = array_map(function() { return null; }, $schema);
 		$row = array_merge($schema, $row);
 		return $row;
 	}

src/DiffStorageStore.php

Spacing +22 added lines, -22 removed lines

@@ -64,10 +64,10 @@ 
 	 */
 	public function addRow(array $data, array $translation = null, $duplicateKeyHandler = null) {
 		$data = $this->translate($data, $translation);
-		if($duplicateKeyHandler === null) {
+		if ($duplicateKeyHandler === null) {
 			$duplicateKeyHandler = $this->duplicateKeyHandler;
 		}
-		$buildMetaData = function (array $data, array $keys) {
+		$buildMetaData = function(array $data, array $keys) {
 			$metaData = $data;
 			$metaData = array_diff_key($metaData, array_diff_key($metaData, $keys));
 			$metaData['___data'] = json_encode($data);
@@ -75,19 +75,19 @@ 
 			return $metaData;
 		};
 		$metaData = $buildMetaData($data, $this->converter);
-		if($duplicateKeyHandler === null) {
+		if ($duplicateKeyHandler === null) {
 			$this->replaceStmt->execute($metaData);
 		} else {
 			try {
 				$this->insertStmt->execute($metaData);
 			} catch (\PDOException $e) {
-				if(strpos($e->getMessage(), 'UNIQUE constraint failed') !== false) {
+				if (strpos($e->getMessage(), 'UNIQUE constraint failed') !== false) {
 					$metaData = $buildMetaData($data, $this->converter);
 					unset($metaData['___data']);
 					unset($metaData['___sort']);
 					$this->selectStmt->execute($metaData);
 					$oldData = $this->selectStmt->fetch(PDO::FETCH_COLUMN, 0);
-					if($oldData === null) {
+					if ($oldData === null) {
 						$oldData = [];
 					} else {
 						$oldData = json_decode($oldData, true);
@@ -110,7 +110,7 @@ 
 	 * @return $this
 	 */
 	public function addRows($rows, array $translation = null, $duplicateKeyHandler = null) {
-		foreach($rows as $row) {
+		foreach ($rows as $row) {
 			$this->addRow($row, $translation, $duplicateKeyHandler);
 		}
 		return $this;
@@ -121,11 +121,11 @@ 
 	 */
 	public function hasAnyChanges() {
 		/** @noinspection PhpUnusedLocalVariableInspection */
-		foreach($this->getNewOrChanged() as $_) {
+		foreach ($this->getNewOrChanged() as $_) {
 			return true;
 		}
 		/** @noinspection PhpUnusedLocalVariableInspection */
-		foreach($this->getMissing() as $_) {
+		foreach ($this->getMissing() as $_) {
 			return true;
 		}
 		return false;
@@ -152,7 +152,7 @@ 
 				s2.s_ab IS NULL
 			ORDER BY
 				s1.s_sort
-		', function (DiffStorageStoreRowInterface $row) {
+		', function(DiffStorageStoreRowInterface $row) {
 			return $this->formatNewRow($row);
 		});
 	}
@@ -178,7 +178,7 @@ 
 				s1.s_value != s2.s_value
 			ORDER BY
 				s1.s_sort
-		', function (DiffStorageStoreRowInterface $row) {
+		', function(DiffStorageStoreRowInterface $row) {
 			return $this->formatChangedRow($row);
 		});
 	}
@@ -202,8 +202,8 @@ 
 				((s2.s_ab IS NULL) OR (s1.s_value != s2.s_value))
 			ORDER BY
 				s1.s_sort
-		', function (DiffStorageStoreRowInterface $row) {
-			if(count($row->getForeign()->getValueData())) {
+		', function(DiffStorageStoreRowInterface $row) {
+			if (count($row->getForeign()->getValueData())) {
 				return $this->formatChangedRow($row);
 			} else {
 				return $this->formatNewRow($row);
@@ -232,7 +232,7 @@ 
 				s2.s_ab IS NULL
 			ORDER BY
 				s1.s_sort
-		', function (DiffStorageStoreRowInterface $row) {
+		', function(DiffStorageStoreRowInterface $row) {
 			return $this->formatMissingRow($row);
 		});
 	}
@@ -254,7 +254,7 @@ 
 	private function query($query, $stringFormatter) {
 		$stmt = $this->pdo->query($query);
 		$stmt->execute(['sA' => $this->storeA, 'sB' => $this->storeB]);
-		while($row = $stmt->fetch(PDO::FETCH_NUM)) {
+		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
 			$d = json_decode($row[1], true);
 			$f = json_decode($row[2], true);
 			yield $this->instantiateRow($d, $f, $stringFormatter);
@@ -278,9 +278,9 @@ 
 		';
 		$stmt = $this->pdo->query($query);
 		$stmt->execute(['s' => $this->storeA]);
-		while($row = $stmt->fetch(PDO::FETCH_NUM)) {
+		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
 			$row = json_decode($row[0], true);
-			$row = $this->instantiateRow($row, [], function (DiffStorageStoreRowInterface $row) {
+			$row = $this->instantiateRow($row, [], function(DiffStorageStoreRowInterface $row) {
 				return $this->formatKeyValuePairs($row->getData());
 			});
 			yield $row->getData();
@@ -294,10 +294,10 @@ 
 	 * @return array
 	 */
 	private function translate(array $data, array $translation = null) {
-		if($translation !== null) {
+		if ($translation !== null) {
 			$result = [];
-			foreach($data as $key => $value) {
-				if(array_key_exists($key, $translation)) {
+			foreach ($data as $key => $value) {
+				if (array_key_exists($key, $translation)) {
 					$key = $translation[$key];
 				}
 				$result[$key] = $value;
@@ -372,10 +372,10 @@ 
 	 */
 	private function formatKeyValuePairs($keyValues) {
 		$keyParts = [];
-		foreach($keyValues as $key => $value) {
+		foreach ($keyValues as $key => $value) {
 			$value = preg_replace('/\\s+/', ' ', $value);
-			if(strlen($value) > 20) {
-				$value = substr($value, 0, 16) . ' ...';
+			if (strlen($value) > 20) {
+				$value = substr($value, 0, 16).' ...';
 			}
 			$keyParts[] = sprintf("%s: %s", $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 		}