rkrx / data-diff

src/DiffStorage.php

Doc Comments +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 
 	/**
 	 * @param string $name
-	 * @param mixed $callback
+	 * @param string $callback
 	 * @throws Exception
 	 */
 	private function registerUDFunction($name, $callback) {

Spacing +15 added lines, -15 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	private function buildSchema($schema) {
 		$def = [];
-		foreach($schema as $name => $type) {
+		foreach ($schema as $name => $type) {
 			switch ($type) {
 				case 'BOOL':
 					$def[] = sprintf('CASE WHEN CAST(:'.$name.' AS INT) = 0 THEN \'false\' ELSE \'true\' END'); break;
@@ -97,7 +97,7 @@ 
 					$def[] = '\'"\'||md5(:'.$name.')||\'"\''; break;
 			}
 		}
-		if(!count($def)) {
+		if (!count($def)) {
 			throw new EmptySchemaException('Can\'t operate with empty schema');
 		}
 		return join('||"|"||', $def);
@@ -110,22 +110,22 @@ 
 	 */
 	private function buildConverter($schema) {
 		$def = [];
-		foreach($schema as $name => $type) {
+		foreach ($schema as $name => $type) {
 			switch ($type) {
 				case 'BOOL':
 					$def[$name] = 'boolval'; break;
 				case 'INT':
 					$def[$name] = 'intval'; break;
 				case 'FLOAT':
-					$def[$name] = function ($value) { return number_format($value, 6, '.', ''); }; break;
+					$def[$name] = function($value) { return number_format($value, 6, '.', ''); }; break;
 				case 'DOUBLE':
-					$def[$name] = function ($value) { return number_format($value, 12, '.', ''); }; break;
+					$def[$name] = function($value) { return number_format($value, 12, '.', ''); }; break;
 				case 'MONEY':
-					$def[$name] = function ($value) { return number_format($value, 2, '.', ''); }; break;
+					$def[$name] = function($value) { return number_format($value, 2, '.', ''); }; break;
 				case 'STRING':
-					$def[$name] = function ($value) { return (string) $value; }; break;
+					$def[$name] = function($value) { return (string) $value; }; break;
 				case 'MD5':
-					$def[$name] = function ($value) { return md5((string) $value); }; break;
+					$def[$name] = function($value) { return md5((string) $value); }; break;
 			}
 		}
 		return $def;
@@ -134,11 +134,11 @@ 
 	/**
 	 */
 	private function compatibility() {
-		if(!$this->testStatement('SELECT printf("%0.2f", 19.99999) AS res')) {
+		if (!$this->testStatement('SELECT printf("%0.2f", 19.99999) AS res')) {
 			$this->registerUDFunction('printf', 'sprintf');
 		}
 
-		if(!$this->testStatement('SELECT md5("aaa") AS md5res')) {
+		if (!$this->testStatement('SELECT md5("aaa") AS md5res')) {
 			$this->registerUDFunction('md5', 'md5');
 		}
 	}
@@ -161,7 +161,7 @@ 
 	 * @throws Exception
 	 */
 	private function registerUDFunction($name, $callback) {
-		if(!method_exists($this->pdo, 'sqliteCreateFunction')) {
+		if (!method_exists($this->pdo, 'sqliteCreateFunction')) {
 			throw new Exception('It is not possible to create user defined functions for rkr/data-diff\'s sqlite instance');
 		}
 		call_user_func([$this->pdo, 'sqliteCreateFunction'], $name, $callback);
@@ -170,7 +170,7 @@ 
 	/**
 	 */
 	private function initSqlite() {
-		$tryThis = function ($query) {
+		$tryThis = function($query) {
 			try {
 				$this->pdo->exec($query);
 			} catch (Exception $e) {
@@ -195,11 +195,11 @@ 
 	 * @return array
 	 */
 	private function defineOptionDefaults($options) {
-		if(!array_key_exists('dsn', $options)) {
+		if (!array_key_exists('dsn', $options)) {
 			$options['dsn'] = 'sqlite::memory:';
 		}
-		if(!array_key_exists('duplicate_key_handler', $options)) {
-			$options['duplicate_key_handler'] = function (array $newData = null, array $oldData = null) {
+		if (!array_key_exists('duplicate_key_handler', $options)) {
+			$options['duplicate_key_handler'] = function(array $newData = null, array $oldData = null) {
 				return array_merge($oldData, $newData);
 			};
 		}

src/DiffStorageStore.php

Doc Comments +6 added lines, -6 removed lines

@@ -125,7 +125,7 @@ 
 	/**
 	 * Get all rows, that are present in this store, but not in the other
 	 *
-	 * @return Generator|DiffStorageStoreRow[]
+	 * @return Generator
 	 */
 	public function getNew() {
 		return $this->query('
@@ -149,7 +149,7 @@ 
 	/**
 	 * Get all rows, that have a different value hash in the other store
 	 *
-	 * @return Generator|DiffStorageStoreRow[]
+	 * @return Generator
 	 */
 	public function getChanged() {
 		return $this->query('
@@ -171,7 +171,7 @@ 
 	}
 
 	/**
-	 * @return Generator|DiffStorageStoreRow[]
+	 * @return Generator
 	 */
 	public function getNewOrChanged() {
 		return $this->query('
@@ -195,7 +195,7 @@ 
 	/**
 	 * Get all rows, that are present in the other store, but not in this
 	 *
-	 * @return Generator|DiffStorageStoreRow[]
+	 * @return Generator
 	 */
 	public function getMissing() {
 		return $this->query('
@@ -227,7 +227,7 @@ 
 
 	/**
 	 * @param string $query
-	 * @return Generator|DiffStorageStoreRow[]
+	 * @return Generator
 	 */
 	private function query($query) {
 		$stmt = $this->pdo->query($query);
@@ -241,7 +241,7 @@ 
 	}
 
 	/**
-	 * @return Traversable|array[]
+	 * @return Generator
 	 */
 	public function getIterator() {
 		$query = '

Spacing +12 added lines, -12 removed lines

@@ -59,10 +59,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);
@@ -73,13 +73,13 @@ 
 			$metaData = $buildMetaData($data, $this->converter);
 			$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);
@@ -101,7 +101,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;
@@ -112,11 +112,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;
@@ -232,7 +232,7 @@ 
 	private function query($query) {
 		$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 new DiffStorageStoreRow($d, $f, $this->converter);
@@ -256,7 +256,7 @@ 
 		';
 		$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 = new DiffStorageStoreRow($row, [], $this->converter);
 			yield $row->getData();
@@ -270,10 +270,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;

src/MemoryDiffStorage.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	 * @param array $options
 	 */
 	public function __construct(array $keySchema, array $valueSchema, array $options = []) {
-		if(!array_key_exists('dsn', $options)) {
+		if (!array_key_exists('dsn', $options)) {
 			$options['dsn'] = 'sqlite::memory:';
 		}
 		parent::__construct($keySchema, $valueSchema, $options);

src/FileDiffStorage.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 	 * @param array $options
 	 */
 	public function __construct($filename = null, array $keySchema, array $valueSchema, array $options = []) {
-		if($filename === null) {
+		if ($filename === null) {
 			$filename = tempnam(sys_get_temp_dir(), 'data-diff-');
 		}
 		$this->createFile($filename);
@@ -25,7 +25,7 @@ 
 		try {
 			$fp = fopen($filename, 'w+');
 		} finally {
-			if(is_resource($fp)) {
+			if (is_resource($fp)) {
 				fclose($fp);
 			}
 		}

src/DiffStorageStoreRow.php

Spacing +17 added lines, -17 removed lines

@@ -22,9 +22,9 @@ 
 		$this->row = is_array($row) ? $row : [];
 		$this->converter = $converter;
 		$this->foreignRow = is_array($foreignRow) ? $foreignRow : [];
-		if($row !== null) {
+		if ($row !== null) {
 			$this->data = $row;
-		} elseif($foreignRow !== null) {
+		} elseif ($foreignRow !== null) {
 			$this->data = $foreignRow;
 		}
 	}
@@ -59,23 +59,23 @@ 
 	 */
 	public function getDiff(array $fields = null) {
 		$diff = [];
-		$diffFn = function ($keysA) use (&$diff, $fields) {
-			foreach($keysA as $key) {
-				if($fields !== null && !in_array($key, $fields)) {
+		$diffFn = function($keysA) use (&$diff, $fields) {
+			foreach ($keysA as $key) {
+				if ($fields !== null && !in_array($key, $fields)) {
 					continue;
 				}
-				if(!array_key_exists($key, $this->foreignRow)) {
+				if (!array_key_exists($key, $this->foreignRow)) {
 					$diff[$key] = ['local' => $this->row[$key], 'foreign' => null];
-				} elseif(!array_key_exists($key, $this->row)) {
+				} elseif (!array_key_exists($key, $this->row)) {
 					$diff[$key] = ['local' => null, 'foreign' => $this->foreignRow[$key]];
 				} else {
 					$v1 = $this->row[$key];
 					$v2 = $this->foreignRow[$key];
-					if(array_key_exists($key, $this->converter)) {
+					if (array_key_exists($key, $this->converter)) {
 						$v1 = call_user_func($this->converter[$key], $v1);
 						$v2 = call_user_func($this->converter[$key], $v2);
 					}
-					if(json_encode($v1) !== json_encode($v2)) {
+					if (json_encode($v1) !== json_encode($v2)) {
 						$diff[$key] = ['local' => $this->row[$key], 'foreign' => $this->foreignRow[$key]];
 					}
 				}
@@ -96,9 +96,9 @@ 
 	 */
 	public function getDiffFormatted(array $fields = null, $format = null) {
 		$diff = $this->getDiff($fields);
-		if($format === null) {
+		if ($format === null) {
 			$result = [];
-			foreach($diff as $fieldName => $values) {
+			foreach ($diff as $fieldName => $values) {
 				$result[] = sprintf("%s: %s -> %s", $fieldName, $values['foreign'], $values['local']);
 			}
 			return join(', ', $result);
@@ -126,7 +126,7 @@ 
 	 * @return mixed
 	 */
 	public function offsetGet($offset) {
-		if($this->offsetExists($offset)) {
+		if ($this->offsetExists($offset)) {
 			return $this->data[$offset];
 		}
 		return null;
@@ -146,7 +146,7 @@ 
 	 * @return void
 	 */
 	public function offsetUnset($offset) {
-		if($this->offsetExists($offset)) {
+		if ($this->offsetExists($offset)) {
 			unset($this->data[$offset]);
 		}
 	}
@@ -157,7 +157,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;
 	}
@@ -168,13 +168,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)) {
+		if (array_key_exists('keys', $options)) {
 			$row = array_intersect_key($row, array_combine($options['keys'], $options['keys']));
 		}
-		if(array_key_exists('ignore', $options)) {
+		if (array_key_exists('ignore', $options)) {
 			$row = array_diff_key($row, array_combine($options['ignore'], $options['ignore']));
 		}
 		return $row;