Completed
Push — master ( 25cbeb...603ba8 )
by
unknown
02:02
created
includes/Serializer/ComparisonResultSerializer.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	/**
23 23
 	 * @param Serializer $dataValueSerializer
24 24
 	 */
25
-	public function __construct( Serializer $dataValueSerializer ) {
25
+	public function __construct(Serializer $dataValueSerializer) {
26 26
 		$this->dataValueSerializer = $dataValueSerializer;
27 27
 	}
28 28
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 *
34 34
 	 * @return bool
35 35
 	 */
36
-	public function isSerializerFor( $object ) {
36
+	public function isSerializerFor($object) {
37 37
 		return $object instanceof ComparisonResult;
38 38
 	}
39 39
 
@@ -45,29 +45,29 @@  discard block
 block discarded – undo
45 45
 	 * @return array
46 46
 	 * @throws UnsupportedObjectException
47 47
 	 */
48
-	public function serialize( $object ) {
49
-		if ( !$this->isSerializerFor( $object ) ) {
48
+	public function serialize($object) {
49
+		if (!$this->isSerializerFor($object)) {
50 50
 			throw new UnsupportedObjectException(
51 51
 				$object,
52 52
 				'ComparisonResultSerializer can only serialize ComparisonResult objects.'
53 53
 			);
54 54
 		}
55 55
 
56
-		return $this->getSerialized( $object );
56
+		return $this->getSerialized($object);
57 57
 	}
58 58
 
59
-	private function getSerialized( ComparisonResult $comparisonResult ) {
59
+	private function getSerialized(ComparisonResult $comparisonResult) {
60 60
 		$dataValueSerializer = $this->dataValueSerializer;
61 61
 		$externalValues = array_map(
62
-			function ( $dataValue ) use ( $dataValueSerializer ) {
63
-				return $dataValueSerializer->serialize( $dataValue );
62
+			function($dataValue) use ($dataValueSerializer) {
63
+				return $dataValueSerializer->serialize($dataValue);
64 64
 			},
65 65
 			$comparisonResult->getExternalValues()
66 66
 		);
67
-		$this->setIndexedTagName( $externalValues, 'dataValue' );
67
+		$this->setIndexedTagName($externalValues, 'dataValue');
68 68
 
69 69
 		return array(
70
-			'localValue' => $this->dataValueSerializer->serialize( $comparisonResult->getLocalValue() ),
70
+			'localValue' => $this->dataValueSerializer->serialize($comparisonResult->getLocalValue()),
71 71
 			'externalValues' => $externalValues,
72 72
 			'result' => $comparisonResult->getStatus()
73 73
 		);
Please login to merge, or discard this patch.
includes/Serializer/CrossCheckResultListSerializer.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	/**
23 23
 	 * @param Serializer $crossCheckResultSerializer
24 24
 	 */
25
-	public function __construct( Serializer $crossCheckResultSerializer ) {
25
+	public function __construct(Serializer $crossCheckResultSerializer) {
26 26
 		$this->crossCheckResultSerializer = $crossCheckResultSerializer;
27 27
 	}
28 28
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 *
34 34
 	 * @return bool
35 35
 	 */
36
-	public function isSerializerFor( $object ) {
36
+	public function isSerializerFor($object) {
37 37
 		return $object instanceof CrossCheckResultList;
38 38
 	}
39 39
 
@@ -45,29 +45,29 @@  discard block
 block discarded – undo
45 45
 	 * @return array
46 46
 	 * @throws UnsupportedObjectException
47 47
 	 */
48
-	public function serialize( $object ) {
49
-		if ( !$this->isSerializerFor( $object ) ) {
48
+	public function serialize($object) {
49
+		if (!$this->isSerializerFor($object)) {
50 50
 			throw new UnsupportedObjectException(
51 51
 				$object,
52 52
 				'CrossCheckResultListSerializer can only serialize CrossCheckResultList objects.'
53 53
 			);
54 54
 		}
55 55
 
56
-		return $this->getSerialized( $object );
56
+		return $this->getSerialized($object);
57 57
 	}
58 58
 
59
-	private function getSerialized( CrossCheckResultList $resultList ) {
59
+	private function getSerialized(CrossCheckResultList $resultList) {
60 60
 		$serialization = array();
61
-		$this->setKeyAttributeName( $serialization, 'property', 'id' );
61
+		$this->setKeyAttributeName($serialization, 'property', 'id');
62 62
 
63
-		foreach ( $resultList->getPropertyIds() as $propertyId ) {
63
+		foreach ($resultList->getPropertyIds() as $propertyId) {
64 64
 			$id = $propertyId->getSerialization();
65 65
 			$resultSerialization = array();
66 66
 
67
-			$this->setIndexedTagName( $resultSerialization, 'result' );
67
+			$this->setIndexedTagName($resultSerialization, 'result');
68 68
 
69
-			foreach ( $resultList->getByPropertyId( $propertyId ) as $result ) {
70
-				$resultSerialization[] = $this->crossCheckResultSerializer->serialize( $result );
69
+			foreach ($resultList->getByPropertyId($propertyId) as $result) {
70
+				$resultSerialization[] = $this->crossCheckResultSerializer->serialize($result);
71 71
 			}
72 72
 
73 73
 			$serialization[$id] = $resultSerialization;
Please login to merge, or discard this patch.
includes/Serializer/CrossCheckResultSerializer.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @param Serializer $comparisonResultSerializer
35 35
 	 * @param Serializer $referenceResultSerializer
36 36
 	 */
37
-	public function __construct( Serializer $dumpMetaInformationSerializer, Serializer $comparisonResultSerializer, Serializer $referenceResultSerializer ) {
37
+	public function __construct(Serializer $dumpMetaInformationSerializer, Serializer $comparisonResultSerializer, Serializer $referenceResultSerializer) {
38 38
 		$this->dumpMetaInformationSerializer = $dumpMetaInformationSerializer;
39 39
 		$this->comparisonResultSerializer = $comparisonResultSerializer;
40 40
 		$this->referenceResultSerializer = $referenceResultSerializer;
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 *
48 48
 	 * @return bool
49 49
 	 */
50
-	public function isSerializerFor( $object ) {
50
+	public function isSerializerFor($object) {
51 51
 		return $object instanceof CrossCheckResult;
52 52
 	}
53 53
 
@@ -59,25 +59,25 @@  discard block
 block discarded – undo
59 59
 	 * @return array
60 60
 	 * @throws UnsupportedObjectException
61 61
 	 */
62
-	public function serialize( $object ) {
63
-		if ( !$this->isSerializerFor( $object ) ) {
62
+	public function serialize($object) {
63
+		if (!$this->isSerializerFor($object)) {
64 64
 			throw new UnsupportedObjectException(
65 65
 				$object,
66 66
 				'CrossCheckResultSerializer can only serialize CrossCheckResult objects.'
67 67
 			);
68 68
 		}
69 69
 
70
-		return $this->getSerialized( $object );
70
+		return $this->getSerialized($object);
71 71
 	}
72 72
 
73
-	private function getSerialized( CrossCheckResult $crossCheckResult ) {
73
+	private function getSerialized(CrossCheckResult $crossCheckResult) {
74 74
 		return array(
75 75
 			'propertyId' => $crossCheckResult->getPropertyId()->getSerialization(),
76 76
 			'claimGuid' => $crossCheckResult->getClaimGuid(),
77 77
 			'externalId' => $crossCheckResult->getExternalId(),
78
-			'dataSource' => $this->dumpMetaInformationSerializer->serialize( $crossCheckResult->getDumpMetaInformation() ),
79
-			'comparisonResult' => $this->comparisonResultSerializer->serialize( $crossCheckResult->getComparisonResult() ),
80
-			'referenceResult' => $this->referenceResultSerializer->serialize( $crossCheckResult->getReferenceResult() )
78
+			'dataSource' => $this->dumpMetaInformationSerializer->serialize($crossCheckResult->getDumpMetaInformation()),
79
+			'comparisonResult' => $this->comparisonResultSerializer->serialize($crossCheckResult->getComparisonResult()),
80
+			'referenceResult' => $this->referenceResultSerializer->serialize($crossCheckResult->getReferenceResult())
81 81
 		);
82 82
 	}
83 83
 
Please login to merge, or discard this patch.
includes/Serializer/IndexedTagsSerializer.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 	 * @param array &$arr
21 21
 	 * @param string $tag
22 22
 	 */
23
-	protected function setIndexedTagName( array &$arr, $tag ) {
24
-		ApiResult::setIndexedTagName( $arr, $tag );
23
+	protected function setIndexedTagName(array &$arr, $tag) {
24
+		ApiResult::setIndexedTagName($arr, $tag);
25 25
 	}
26 26
 
27 27
 	/**
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	 * @param string $tagName
34 34
 	 * @param string $idAttribute
35 35
 	 */
36
-	protected function setKeyAttributeName( array &$arr, $tagName, $idAttribute ) {
37
-		ApiResult::setArrayType( $arr, 'kvp', $idAttribute );
38
-		ApiResult::setIndexedTagName( $arr, $tagName );
36
+	protected function setKeyAttributeName(array &$arr, $tagName, $idAttribute) {
37
+		ApiResult::setArrayType($arr, 'kvp', $idAttribute);
38
+		ApiResult::setIndexedTagName($arr, $tagName);
39 39
 	}
40 40
 
41 41
 }
Please login to merge, or discard this patch.
includes/Serializer/ReferenceResultSerializer.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	/**
23 23
 	 * @param Serializer $referenceSerializer
24 24
 	 */
25
-	public function __construct( Serializer $referenceSerializer ) {
25
+	public function __construct(Serializer $referenceSerializer) {
26 26
 		$this->referenceSerializer = $referenceSerializer;
27 27
 	}
28 28
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 *
34 34
 	 * @return bool
35 35
 	 */
36
-	public function isSerializerFor( $object ) {
36
+	public function isSerializerFor($object) {
37 37
 		return $object instanceof ReferenceResult;
38 38
 	}
39 39
 
@@ -45,20 +45,20 @@  discard block
 block discarded – undo
45 45
 	 * @return array
46 46
 	 * @throws UnsupportedObjectException
47 47
 	 */
48
-	public function serialize( $object ) {
49
-		if ( !$this->isSerializerFor( $object ) ) {
48
+	public function serialize($object) {
49
+		if (!$this->isSerializerFor($object)) {
50 50
 			throw new UnsupportedObjectException(
51 51
 				$object,
52 52
 				'ReferenceResultSerializer can only serialize ReferenceResult objects.'
53 53
 			);
54 54
 		}
55 55
 
56
-		return $this->getSerialized( $object );
56
+		return $this->getSerialized($object);
57 57
 	}
58 58
 
59
-	private function getSerialized( ReferenceResult $referenceResult ) {
59
+	private function getSerialized(ReferenceResult $referenceResult) {
60 60
 		return array(
61
-			'reference' => $this->referenceSerializer->serialize( $referenceResult->getReference() ),
61
+			'reference' => $this->referenceSerializer->serialize($referenceResult->getReference()),
62 62
 			'status' => $referenceResult->getStatus()
63 63
 		);
64 64
 	}
Please login to merge, or discard this patch.
includes/Serializer/SerializerFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param Serializer $dataValueSerializer
26 26
 	 * @param Serializer $referenceSerializer
27 27
 	 */
28
-	public function __construct( Serializer $dataValueSerializer, Serializer $referenceSerializer ) {
28
+	public function __construct(Serializer $dataValueSerializer, Serializer $referenceSerializer) {
29 29
 		$this->dataValueSerializer = $dataValueSerializer;
30 30
 		$this->referenceSerializer = $referenceSerializer;
31 31
 	}
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 * @return Serializer
48 48
 	 */
49 49
 	public function newComparisonResultSerializer() {
50
-		return new ComparisonResultSerializer( $this->dataValueSerializer );
50
+		return new ComparisonResultSerializer($this->dataValueSerializer);
51 51
 	}
52 52
 
53 53
 	/**
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 * @return Serializer
79 79
 	 */
80 80
 	public function newReferenceResultSerializer() {
81
-		return new ReferenceResultSerializer( $this->referenceSerializer );
81
+		return new ReferenceResultSerializer($this->referenceSerializer);
82 82
 	}
83 83
 
84 84
 }
Please login to merge, or discard this patch.
includes/UpdateExternalData/CsvImportSettings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@
 block discarded – undo
43 43
 	 * @param int $batchSize
44 44
 	 * @param bool $quiet
45 45
 	 */
46
-	public function __construct( $externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false ) {
47
-		Assert::parameterType( 'string', $externalValuesFilePath, '$externalValuesFilePath' );
48
-		Assert::parameterType( 'string', $dumpInformationFilePath, '$dumpInformationFilePath' );
49
-		Assert::parameterType( 'integer', $batchSize, '$batchSize' );
50
-		Assert::parameterType( 'boolean', $quiet, '$quiet' );
46
+	public function __construct($externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false) {
47
+		Assert::parameterType('string', $externalValuesFilePath, '$externalValuesFilePath');
48
+		Assert::parameterType('string', $dumpInformationFilePath, '$dumpInformationFilePath');
49
+		Assert::parameterType('integer', $batchSize, '$batchSize');
50
+		Assert::parameterType('boolean', $quiet, '$quiet');
51 51
 
52 52
 		$this->externalValuesFilePath = $externalValuesFilePath;
53 53
 		$this->dumpInformationFilePath = $dumpInformationFilePath;
Please login to merge, or discard this patch.
includes/UpdateExternalData/ExternalDataImporter.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	public function import() {
52 52
 		$dumpIds = $this->insertMetaInformation();
53 53
 
54
-		$this->log( "\nDelete old database entries...\n" );
54
+		$this->log("\nDelete old database entries...\n");
55 55
 
56
-		foreach ( $dumpIds as $dumpId ) {
57
-			$this->externalDataRepo->deleteOfDump( $dumpId, $this->importSettings->getBatchSize() );
56
+		foreach ($dumpIds as $dumpId) {
57
+			$this->externalDataRepo->deleteOfDump($dumpId, $this->importSettings->getBatchSize());
58 58
 		}
59 59
 
60
-		$this->log( "\n" );
60
+		$this->log("\n");
61 61
 
62 62
 		$this->insertExternalValues();
63 63
 	}
@@ -68,54 +68,54 @@  discard block
 block discarded – undo
68 68
 	 * @return array
69 69
 	 */
70 70
 	protected function insertMetaInformation() {
71
-		$this->log( "Insert new dump meta information\n" );
71
+		$this->log("Insert new dump meta information\n");
72 72
 
73
-		$csvFile = fopen( $this->importSettings->getDumpInformationFilePath(), 'rb' );
74
-		if( !$csvFile ) {
75
-			exit( 'Error while reading CSV file.' );
73
+		$csvFile = fopen($this->importSettings->getDumpInformationFilePath(), 'rb');
74
+		if (!$csvFile) {
75
+			exit('Error while reading CSV file.');
76 76
 		}
77 77
 
78 78
 		$i = 0;
79 79
 		$dumpIds = array();
80
-		while ( $data = fgetcsv( $csvFile ) ) {
80
+		while ($data = fgetcsv($csvFile)) {
81 81
 			$identifierPropertyIds = array_map(
82
-				function ( $propertyId ) {
83
-					return new PropertyId( $propertyId );
82
+				function($propertyId) {
83
+					return new PropertyId($propertyId);
84 84
 				},
85
-				json_decode( $data[2] )
85
+				json_decode($data[2])
86 86
 			);
87 87
 			try {
88 88
 				$dumpMetaInformation = new DumpMetaInformation(
89 89
 					$data[0],
90
-					new ItemId( $data[1] ),
90
+					new ItemId($data[1]),
91 91
 					$identifierPropertyIds,
92 92
 					$data[3],
93 93
 					$data[4],
94 94
 					$data[5],
95
-					intval( $data[6] ),
96
-					new ItemId( $data[7] )
95
+					intval($data[6]),
96
+					new ItemId($data[7])
97 97
 				);
98 98
 			}
99
-			catch( \InvalidArgumentException $e ) {
100
-				exit( 'Input file has bad formatted values.' );
99
+			catch (\InvalidArgumentException $e) {
100
+				exit('Input file has bad formatted values.');
101 101
 			}
102 102
 			$dumpIds[] = $dumpMetaInformation->getDumpId();
103 103
 
104 104
 			try {
105
-				$this->dumpMetaInformationStore->save( $dumpMetaInformation );
105
+				$this->dumpMetaInformationStore->save($dumpMetaInformation);
106 106
 			}
107
-			catch( \DBError $e ) {
108
-				exit( 'Unknown database error occurred.' );
107
+			catch (\DBError $e) {
108
+				exit('Unknown database error occurred.');
109 109
 			}
110 110
 
111 111
 			$i++;
112
-			$this->log( "\r\033[K" );
113
-			$this->log( "$i rows inserted or updated" );
112
+			$this->log("\r\033[K");
113
+			$this->log("$i rows inserted or updated");
114 114
 		}
115 115
 
116
-		fclose( $csvFile );
116
+		fclose($csvFile);
117 117
 
118
-		$this->log( "\n" );
118
+		$this->log("\n");
119 119
 
120 120
 		return $dumpIds;
121 121
 	}
@@ -124,32 +124,32 @@  discard block
 block discarded – undo
124 124
 	 * Inserts external values stored in csv file into database
125 125
 	 */
126 126
 	private function insertExternalValues() {
127
-		$this->log( "Insert new data values\n" );
127
+		$this->log("Insert new data values\n");
128 128
 
129
-		$csvFile = fopen( $this->importSettings->getExternalValuesFilePath(), 'rb' );
130
-		if( !$csvFile ) {
131
-			exit( 'Error while reading CSV file.' );
129
+		$csvFile = fopen($this->importSettings->getExternalValuesFilePath(), 'rb');
130
+		if (!$csvFile) {
131
+			exit('Error while reading CSV file.');
132 132
 		}
133 133
 
134 134
 		$i = 0;
135 135
 		$accumulator = array();
136
-		while ( true ) {
137
-			$data = fgetcsv( $csvFile );
138
-			if ( $data === false || ++$i % $this->importSettings->getBatchSize() === 0 ) {
136
+		while (true) {
137
+			$data = fgetcsv($csvFile);
138
+			if ($data === false || ++$i % $this->importSettings->getBatchSize() === 0) {
139 139
 				try {
140
-					$this->externalDataRepo->insertBatch( $accumulator );
140
+					$this->externalDataRepo->insertBatch($accumulator);
141 141
 				}
142
-				catch( \DBError $e ) {
143
-					exit( 'Unknown database error occurred.' );
142
+				catch (\DBError $e) {
143
+					exit('Unknown database error occurred.');
144 144
 				}
145 145
 				wfWaitForSlaves();
146 146
 
147
-				$this->log( "\r\033[K" );
148
-				$this->log( "$i rows inserted" );
147
+				$this->log("\r\033[K");
148
+				$this->log("$i rows inserted");
149 149
 
150 150
 				$accumulator = array();
151 151
 
152
-				if ( $data === false ) {
152
+				if ($data === false) {
153 153
 					break;
154 154
 				}
155 155
 			}
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
157 157
 			$accumulator[] = $data;
158 158
 		}
159 159
 
160
-		fclose( $csvFile );
160
+		fclose($csvFile);
161 161
 
162
-		$this->log( "\n" );
162
+		$this->log("\n");
163 163
 	}
164 164
 
165 165
 	/**
166 166
 	 * @param string $text
167 167
 	 */
168
-	private function log( $text ) {
169
-		if ( !$this->importSettings->isQuiet() ) {
168
+	private function log($text) {
169
+		if (!$this->importSettings->isQuiet()) {
170 170
 			print $text;
171 171
 		}
172 172
 	}
Please login to merge, or discard this patch.
includes/Serializer/DumpMetaInformationSerializer.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 *
22 22
 	 * @return bool
23 23
 	 */
24
-	public function isSerializerFor( $object ) {
24
+	public function isSerializerFor($object) {
25 25
 		return $object instanceof DumpMetaInformation;
26 26
 	}
27 27
 
@@ -33,32 +33,32 @@  discard block
 block discarded – undo
33 33
 	 * @return array
34 34
 	 * @throws UnsupportedObjectException
35 35
 	 */
36
-	public function serialize( $object ) {
37
-		if ( !$this->isSerializerFor( $object ) ) {
36
+	public function serialize($object) {
37
+		if (!$this->isSerializerFor($object)) {
38 38
 			throw new UnsupportedObjectException(
39 39
 				$object,
40 40
 				'DumpMetaInformationSerializer can only serialize DumpMetaInformation objects.'
41 41
 			);
42 42
 		}
43 43
 
44
-		return $this->getSerialized( $object );
44
+		return $this->getSerialized($object);
45 45
 	}
46 46
 
47
-	private function getSerialized( DumpMetaInformation $dumpMetaInformation ) {
47
+	private function getSerialized(DumpMetaInformation $dumpMetaInformation) {
48 48
 		$identifierPropertyIds = array_map(
49
-			function( PropertyId $id ) {
49
+			function(PropertyId $id) {
50 50
 				return $id->getSerialization();
51 51
 			},
52 52
 			$dumpMetaInformation->getIdentifierPropertyIds()
53 53
 		);
54 54
 
55
-		$this->setIndexedTagName( $identifierPropertyIds, 'propertyId' );
55
+		$this->setIndexedTagName($identifierPropertyIds, 'propertyId');
56 56
 
57 57
 		return array(
58 58
 			'dumpId' => $dumpMetaInformation->getDumpId(),
59 59
 			'sourceItemId' => $dumpMetaInformation->getSourceItemId()->getSerialization(),
60 60
 			'identifierPropertyIds' => $identifierPropertyIds,
61
-			'importDate' => wfTimestamp( TS_ISO_8601, $dumpMetaInformation->getImportDate() ),
61
+			'importDate' => wfTimestamp(TS_ISO_8601, $dumpMetaInformation->getImportDate()),
62 62
 			'language' => $dumpMetaInformation->getLanguageCode(),
63 63
 			'sourceUrl' => $dumpMetaInformation->getSourceUrl(),
64 64
 			'size' => $dumpMetaInformation->getSize(),
Please login to merge, or discard this patch.