@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | UnitConverter $unitConverter = null |
52 | 52 | ) { |
53 | 53 | $this->config = $config; |
54 | - $this->timeParser = ( new TimeParserFactory() )->getTimeParser(); |
|
54 | + $this->timeParser = (new TimeParserFactory())->getTimeParser(); |
|
55 | 55 | $this->timeCalculator = new TimeValueCalculator(); |
56 | 56 | $this->timeValueComparer = new TimeValueComparer(); |
57 | 57 | $this->unitConverter = $unitConverter; |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | * @param UnboundedQuantityValue $value |
62 | 62 | * @return UnboundedQuantityValue $value converted to standard units if possible, otherwise unchanged $value. |
63 | 63 | */ |
64 | - private function standardize( UnboundedQuantityValue $value ) { |
|
65 | - if ( $this->unitConverter !== null ) { |
|
66 | - $standard = $this->unitConverter->toStandardUnits( $value ); |
|
67 | - if ( $standard !== null ) { |
|
64 | + private function standardize(UnboundedQuantityValue $value) { |
|
65 | + if ($this->unitConverter !== null) { |
|
66 | + $standard = $this->unitConverter->toStandardUnits($value); |
|
67 | + if ($standard !== null) { |
|
68 | 68 | return $standard; |
69 | 69 | } else { |
70 | 70 | return $value; |
@@ -86,29 +86,29 @@ discard block |
||
86 | 86 | * when $lhs is respectively less than, equal to, or greater than $rhs. |
87 | 87 | * (In other words, just like the “spaceship” operator <=>.) |
88 | 88 | */ |
89 | - public function getComparison( DataValue $lhs = null, DataValue $rhs = null ) { |
|
90 | - if ( $lhs === null || $rhs === null ) { |
|
89 | + public function getComparison(DataValue $lhs = null, DataValue $rhs = null) { |
|
90 | + if ($lhs === null || $rhs === null) { |
|
91 | 91 | return 0; |
92 | 92 | } |
93 | 93 | |
94 | - if ( $lhs->getType() !== $rhs->getType() ) { |
|
95 | - throw new InvalidArgumentException( 'Different data value types' ); |
|
94 | + if ($lhs->getType() !== $rhs->getType()) { |
|
95 | + throw new InvalidArgumentException('Different data value types'); |
|
96 | 96 | } |
97 | 97 | |
98 | - switch ( $lhs->getType() ) { |
|
98 | + switch ($lhs->getType()) { |
|
99 | 99 | case 'time': |
100 | 100 | /** @var TimeValue $lhs */ |
101 | 101 | /** @var TimeValue $rhs */ |
102 | - return $this->timeValueComparer->getComparison( $lhs, $rhs ); |
|
102 | + return $this->timeValueComparer->getComparison($lhs, $rhs); |
|
103 | 103 | case 'quantity': |
104 | 104 | /** @var QuantityValue|UnboundedQuantityValue $lhs */ |
105 | 105 | /** @var QuantityValue|UnboundedQuantityValue $rhs */ |
106 | - $lhsStandard = $this->standardize( $lhs ); |
|
107 | - $rhsStandard = $this->standardize( $rhs ); |
|
108 | - return $lhsStandard->getAmount()->compare( $rhsStandard->getAmount() ); |
|
106 | + $lhsStandard = $this->standardize($lhs); |
|
107 | + $rhsStandard = $this->standardize($rhs); |
|
108 | + return $lhsStandard->getAmount()->compare($rhsStandard->getAmount()); |
|
109 | 109 | } |
110 | 110 | |
111 | - throw new InvalidArgumentException( 'Unsupported data value type' ); |
|
111 | + throw new InvalidArgumentException('Unsupported data value type'); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -123,71 +123,71 @@ discard block |
||
123 | 123 | * @throws InvalidArgumentException if the values do not both have the same, supported data value type |
124 | 124 | * @return UnboundedQuantityValue |
125 | 125 | */ |
126 | - public function getDifference( DataValue $minuend, DataValue $subtrahend ) { |
|
127 | - if ( $minuend->getType() === 'time' && $subtrahend->getType() === 'time' ) { |
|
128 | - $minuendSeconds = $this->timeCalculator->getTimestamp( $minuend ); |
|
129 | - $subtrahendSeconds = $this->timeCalculator->getTimestamp( $subtrahend ); |
|
126 | + public function getDifference(DataValue $minuend, DataValue $subtrahend) { |
|
127 | + if ($minuend->getType() === 'time' && $subtrahend->getType() === 'time') { |
|
128 | + $minuendSeconds = $this->timeCalculator->getTimestamp($minuend); |
|
129 | + $subtrahendSeconds = $this->timeCalculator->getTimestamp($subtrahend); |
|
130 | 130 | return UnboundedQuantityValue::newFromNumber( |
131 | 131 | $minuendSeconds - $subtrahendSeconds, |
132 | - $this->config->get( 'WBQualityConstraintsSecondUnit' ) |
|
132 | + $this->config->get('WBQualityConstraintsSecondUnit') |
|
133 | 133 | ); |
134 | 134 | } |
135 | - if ( $minuend->getType() === 'quantity' && $subtrahend->getType() === 'quantity' ) { |
|
136 | - $minuendStandard = $this->standardize( $minuend ); |
|
137 | - $subtrahendStandard = $this->standardize( $subtrahend ); |
|
135 | + if ($minuend->getType() === 'quantity' && $subtrahend->getType() === 'quantity') { |
|
136 | + $minuendStandard = $this->standardize($minuend); |
|
137 | + $subtrahendStandard = $this->standardize($subtrahend); |
|
138 | 138 | $minuendValue = $minuendStandard->getAmount()->getValueFloat(); |
139 | 139 | $subtrahendValue = $subtrahendStandard->getAmount()->getValueFloat(); |
140 | 140 | $diff = $minuendValue - $subtrahendValue; |
141 | 141 | // we don’t check whether both quantities have the same standard unit – |
142 | 142 | // that’s the job of a different constraint type, Units (T164372) |
143 | - return UnboundedQuantityValue::newFromNumber( $diff, $minuendStandard->getUnit() ); |
|
143 | + return UnboundedQuantityValue::newFromNumber($diff, $minuendStandard->getUnit()); |
|
144 | 144 | } |
145 | 145 | |
146 | - throw new InvalidArgumentException( 'Unsupported or different data value types' ); |
|
146 | + throw new InvalidArgumentException('Unsupported or different data value types'); |
|
147 | 147 | } |
148 | 148 | |
149 | - public function getDifferenceInYears( TimeValue $minuend, TimeValue $subtrahend ) { |
|
150 | - if ( !preg_match( '/^([-+]\d{1,16})-(.*)$/', $minuend->getTime(), $minuendMatches ) || |
|
151 | - !preg_match( '/^([-+]\d{1,16})-(.*)$/', $subtrahend->getTime(), $subtrahendMatches ) |
|
149 | + public function getDifferenceInYears(TimeValue $minuend, TimeValue $subtrahend) { |
|
150 | + if (!preg_match('/^([-+]\d{1,16})-(.*)$/', $minuend->getTime(), $minuendMatches) || |
|
151 | + !preg_match('/^([-+]\d{1,16})-(.*)$/', $subtrahend->getTime(), $subtrahendMatches) |
|
152 | 152 | ) { |
153 | - throw new InvalidArgumentException( 'TimeValue::getTime() did not match expected format' ); |
|
153 | + throw new InvalidArgumentException('TimeValue::getTime() did not match expected format'); |
|
154 | 154 | } |
155 | - $minuendYear = (float)$minuendMatches[1]; |
|
156 | - $subtrahendYear = (float)$subtrahendMatches[1]; |
|
155 | + $minuendYear = (float) $minuendMatches[1]; |
|
156 | + $subtrahendYear = (float) $subtrahendMatches[1]; |
|
157 | 157 | $minuendRest = $minuendMatches[2]; |
158 | 158 | $subtrahendRest = $subtrahendMatches[2]; |
159 | 159 | |
160 | 160 | // calculate difference of years |
161 | 161 | $diff = $minuendYear - $subtrahendYear; |
162 | - if ( $minuendYear > 0.0 && $subtrahendYear < 0.0 ) { |
|
162 | + if ($minuendYear > 0.0 && $subtrahendYear < 0.0) { |
|
163 | 163 | $diff -= 1.0; // there is no year 0, remove it from difference |
164 | - } elseif ( $minuendYear < 0.0 && $subtrahendYear > 0.0 ) { |
|
164 | + } elseif ($minuendYear < 0.0 && $subtrahendYear > 0.0) { |
|
165 | 165 | $diff -= -1.0; // there is no year 0, remove it from negative difference |
166 | 166 | } |
167 | 167 | |
168 | 168 | // adjust for date within year by parsing the month-day part within the same year |
169 | - $minuendDateValue = $this->timeParser->parse( '+0000000000001970-' . $minuendRest ); |
|
170 | - $subtrahendDateValue = $this->timeParser->parse( '+0000000000001970-' . $subtrahendRest ); |
|
171 | - $minuendDateSeconds = $this->timeCalculator->getTimestamp( $minuendDateValue ); |
|
172 | - $subtrahendDateSeconds = $this->timeCalculator->getTimestamp( $subtrahendDateValue ); |
|
173 | - if ( $minuendDateSeconds < $subtrahendDateSeconds ) { |
|
169 | + $minuendDateValue = $this->timeParser->parse('+0000000000001970-'.$minuendRest); |
|
170 | + $subtrahendDateValue = $this->timeParser->parse('+0000000000001970-'.$subtrahendRest); |
|
171 | + $minuendDateSeconds = $this->timeCalculator->getTimestamp($minuendDateValue); |
|
172 | + $subtrahendDateSeconds = $this->timeCalculator->getTimestamp($subtrahendDateValue); |
|
173 | + if ($minuendDateSeconds < $subtrahendDateSeconds) { |
|
174 | 174 | // difference in the last year is actually less than one full year |
175 | 175 | // e. g. 1975-03-01 - 1974-09-01 is just six months |
176 | 176 | // (we don’t need sub-year precision in the difference, adjusting by 0.5 is enough) |
177 | 177 | $diff -= 0.5; |
178 | - } elseif ( $minuendDateSeconds > $subtrahendDateSeconds ) { |
|
178 | + } elseif ($minuendDateSeconds > $subtrahendDateSeconds) { |
|
179 | 179 | // difference in the last year is actually more than one full year |
180 | 180 | // e. g. 1975-09-01 - 1974-03-01 is 18 months |
181 | 181 | // (we don’t need sub-year precision in the difference, adjusting by 0.5 is enough) |
182 | 182 | $diff += 0.5; |
183 | 183 | } |
184 | 184 | |
185 | - $unit = $this->config->get( 'WBQualityConstraintsYearUnit' ); |
|
186 | - return UnboundedQuantityValue::newFromNumber( $diff, $unit ); |
|
185 | + $unit = $this->config->get('WBQualityConstraintsYearUnit'); |
|
186 | + return UnboundedQuantityValue::newFromNumber($diff, $unit); |
|
187 | 187 | } |
188 | 188 | |
189 | - public function isFutureTime( TimeValue $timeValue ) { |
|
190 | - return $this->timeValueComparer->isFutureTime( $timeValue ); |
|
189 | + public function isFutureTime(TimeValue $timeValue) { |
|
190 | + return $this->timeValueComparer->isFutureTime($timeValue); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | /** |
17 | 17 | * @param bool $serializeConstraintParameters Whether to serialize constraint parameters or not. |
18 | 18 | */ |
19 | - public function __construct( $serializeConstraintParameters = true ) { |
|
19 | + public function __construct($serializeConstraintParameters = true) { |
|
20 | 20 | $this->serializeConstraintParameters = $serializeConstraintParameters; |
21 | 21 | } |
22 | 22 | |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | * @param Constraint $constraint |
25 | 25 | * @return array |
26 | 26 | */ |
27 | - public function serialize( Constraint $constraint ) { |
|
27 | + public function serialize(Constraint $constraint) { |
|
28 | 28 | $serialization = [ |
29 | 29 | 'id' => $constraint->getConstraintId(), |
30 | 30 | 'pid' => $constraint->getPropertyId()->getSerialization(), |
31 | 31 | 'qid' => $constraint->getConstraintTypeItemId(), |
32 | 32 | ]; |
33 | - if ( $this->serializeConstraintParameters ) { |
|
33 | + if ($this->serializeConstraintParameters) { |
|
34 | 34 | $serialization['params'] = $constraint->getConstraintParameters(); |
35 | 35 | } |
36 | 36 | return $serialization; |
@@ -10,14 +10,13 @@ |
||
10 | 10 | */ |
11 | 11 | class ConstraintDeserializer { |
12 | 12 | |
13 | - public function deserialize( array $serialization ) { |
|
13 | + public function deserialize(array $serialization) { |
|
14 | 14 | return new Constraint( |
15 | 15 | $serialization['id'], |
16 | - new PropertyId( $serialization['pid'] ), |
|
16 | + new PropertyId($serialization['pid']), |
|
17 | 17 | $serialization['qid'], |
18 | - array_key_exists( 'params', $serialization ) ? |
|
19 | - $serialization['params'] : |
|
20 | - [] |
|
18 | + array_key_exists('params', $serialization) ? |
|
19 | + $serialization['params'] : [] |
|
21 | 20 | ); |
22 | 21 | } |
23 | 22 |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @param EntityId $entityId An entity ID from which the value was derived. |
38 | 38 | * @return self Indication that a value was derived from the entity with the given ID. |
39 | 39 | */ |
40 | - public static function ofEntityId( EntityId $entityId ) { |
|
40 | + public static function ofEntityId(EntityId $entityId) { |
|
41 | 41 | $ret = new self; |
42 | 42 | $ret->entityIds[] = $entityId; |
43 | 43 | return $ret; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @return self Indication that a value will only remain valid |
50 | 50 | * as long as the given time value is in the future, not in the past. |
51 | 51 | */ |
52 | - public static function ofFutureTime( TimeValue $timeValue ) { |
|
52 | + public static function ofFutureTime(TimeValue $timeValue) { |
|
53 | 53 | $ret = new self; |
54 | 54 | $ret->timeValue = $timeValue; |
55 | 55 | return $ret; |
@@ -59,17 +59,17 @@ discard block |
||
59 | 59 | * @param self[] $metadatas |
60 | 60 | * @return self |
61 | 61 | */ |
62 | - public static function merge( array $metadatas ) { |
|
63 | - Assert::parameterElementType( self::class, $metadatas, '$metadatas' ); |
|
62 | + public static function merge(array $metadatas) { |
|
63 | + Assert::parameterElementType(self::class, $metadatas, '$metadatas'); |
|
64 | 64 | $ret = new self; |
65 | 65 | $entityIds = []; |
66 | - foreach ( $metadatas as $metadata ) { |
|
67 | - foreach ( $metadata->entityIds as $entityId ) { |
|
66 | + foreach ($metadatas as $metadata) { |
|
67 | + foreach ($metadata->entityIds as $entityId) { |
|
68 | 68 | $entityIds[$entityId->getSerialization()] = $entityId; |
69 | 69 | } |
70 | - $ret->timeValue = self::minTimeValue( $ret->timeValue, $metadata->timeValue ); |
|
70 | + $ret->timeValue = self::minTimeValue($ret->timeValue, $metadata->timeValue); |
|
71 | 71 | } |
72 | - $ret->entityIds = array_values( $entityIds ); |
|
72 | + $ret->entityIds = array_values($entityIds); |
|
73 | 73 | return $ret; |
74 | 74 | } |
75 | 75 | |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | * @param TimeValue|null $t2 |
79 | 79 | * @return TimeValue|null |
80 | 80 | */ |
81 | - private static function minTimeValue( TimeValue $t1 = null, TimeValue $t2 = null ) { |
|
82 | - if ( $t1 === null ) { |
|
81 | + private static function minTimeValue(TimeValue $t1 = null, TimeValue $t2 = null) { |
|
82 | + if ($t1 === null) { |
|
83 | 83 | return $t2; |
84 | 84 | } |
85 | - if ( $t2 === null ) { |
|
85 | + if ($t2 === null) { |
|
86 | 86 | return $t1; |
87 | 87 | } |
88 | - return ( new TimeValueComparer() )->getMinimum( $t1, $t2 ); |
|
88 | + return (new TimeValueComparer())->getMinimum($t1, $t2); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -86,6 +86,6 @@ |
||
86 | 86 | * @param array|null $result |
87 | 87 | * @param array[] &$container |
88 | 88 | */ |
89 | - public function storeCheckResultInArray( array $result = null, array &$container ); |
|
89 | + public function storeCheckResultInArray(array $result = null, array &$container); |
|
90 | 90 | |
91 | 91 | } |
@@ -92,43 +92,43 @@ |
||
92 | 92 | return $this->referenceHash; |
93 | 93 | } |
94 | 94 | |
95 | - protected function &getMainArray( array &$container ) { |
|
96 | - $statementArray = &$this->getStatementArray( $container ); |
|
95 | + protected function &getMainArray(array &$container) { |
|
96 | + $statementArray = &$this->getStatementArray($container); |
|
97 | 97 | |
98 | - if ( !array_key_exists( 'references', $statementArray ) ) { |
|
98 | + if (!array_key_exists('references', $statementArray)) { |
|
99 | 99 | $statementArray['references'] = []; |
100 | 100 | } |
101 | 101 | $referencesArray = &$statementArray['references']; |
102 | 102 | |
103 | 103 | $referenceHash = $this->getReferenceHash(); |
104 | - foreach ( $referencesArray as &$potentialReferenceArray ) { |
|
105 | - if ( $potentialReferenceArray['hash'] === $referenceHash ) { |
|
104 | + foreach ($referencesArray as &$potentialReferenceArray) { |
|
105 | + if ($potentialReferenceArray['hash'] === $referenceHash) { |
|
106 | 106 | $referenceArray = &$potentialReferenceArray; |
107 | 107 | break; |
108 | 108 | } |
109 | 109 | } |
110 | - if ( !isset( $referenceArray ) ) { |
|
111 | - $referenceArray = [ 'hash' => $referenceHash, 'snaks' => [] ]; |
|
110 | + if (!isset($referenceArray)) { |
|
111 | + $referenceArray = ['hash' => $referenceHash, 'snaks' => []]; |
|
112 | 112 | $referencesArray[] = &$referenceArray; |
113 | 113 | } |
114 | 114 | |
115 | 115 | $snaksArray = &$referenceArray['snaks']; |
116 | 116 | |
117 | 117 | $snakPropertyId = $this->getSnakPropertyId(); |
118 | - if ( !array_key_exists( $snakPropertyId, $snaksArray ) ) { |
|
118 | + if (!array_key_exists($snakPropertyId, $snaksArray)) { |
|
119 | 119 | $snaksArray[$snakPropertyId] = []; |
120 | 120 | } |
121 | 121 | $propertyArray = &$snaksArray[$snakPropertyId]; |
122 | 122 | |
123 | 123 | $snakHash = $this->getSnakHash(); |
124 | - foreach ( $propertyArray as &$potentialSnakArray ) { |
|
125 | - if ( $potentialSnakArray['hash'] === $snakHash ) { |
|
124 | + foreach ($propertyArray as &$potentialSnakArray) { |
|
125 | + if ($potentialSnakArray['hash'] === $snakHash) { |
|
126 | 126 | $snakArray = &$potentialSnakArray; |
127 | 127 | break; |
128 | 128 | } |
129 | 129 | } |
130 | - if ( !isset( $snakArray ) ) { |
|
131 | - $snakArray = [ 'hash' => $snakHash ]; |
|
130 | + if (!isset($snakArray)) { |
|
131 | + $snakArray = ['hash' => $snakHash]; |
|
132 | 132 | $propertyArray[] = &$snakArray; |
133 | 133 | } |
134 | 134 |
@@ -80,29 +80,29 @@ |
||
80 | 80 | return $this->snakHash; |
81 | 81 | } |
82 | 82 | |
83 | - protected function &getMainArray( array &$container ) { |
|
84 | - $statementArray = &$this->getStatementArray( $container ); |
|
83 | + protected function &getMainArray(array &$container) { |
|
84 | + $statementArray = &$this->getStatementArray($container); |
|
85 | 85 | |
86 | - if ( !array_key_exists( 'qualifiers', $statementArray ) ) { |
|
86 | + if (!array_key_exists('qualifiers', $statementArray)) { |
|
87 | 87 | $statementArray['qualifiers'] = []; |
88 | 88 | } |
89 | 89 | $qualifiersArray = &$statementArray['qualifiers']; |
90 | 90 | |
91 | 91 | $snakPropertyId = $this->getSnakPropertyId(); |
92 | - if ( !array_key_exists( $snakPropertyId, $qualifiersArray ) ) { |
|
92 | + if (!array_key_exists($snakPropertyId, $qualifiersArray)) { |
|
93 | 93 | $qualifiersArray[$snakPropertyId] = []; |
94 | 94 | } |
95 | 95 | $propertyArray = &$qualifiersArray[$snakPropertyId]; |
96 | 96 | |
97 | 97 | $snakHash = $this->getSnakHash(); |
98 | - foreach ( $propertyArray as &$potentialQualifierArray ) { |
|
99 | - if ( $potentialQualifierArray['hash'] === $snakHash ) { |
|
98 | + foreach ($propertyArray as &$potentialQualifierArray) { |
|
99 | + if ($potentialQualifierArray['hash'] === $snakHash) { |
|
100 | 100 | $qualifierArray = &$potentialQualifierArray; |
101 | 101 | break; |
102 | 102 | } |
103 | 103 | } |
104 | - if ( !isset( $qualifierArray ) ) { |
|
105 | - $qualifierArray = [ 'hash' => $snakHash ]; |
|
104 | + if (!isset($qualifierArray)) { |
|
105 | + $qualifierArray = ['hash' => $snakHash]; |
|
106 | 106 | $propertyArray[] = &$qualifierArray; |
107 | 107 | } |
108 | 108 |
@@ -72,12 +72,12 @@ |
||
72 | 72 | return $this->snakHash; |
73 | 73 | } |
74 | 74 | |
75 | - protected function &getMainArray( array &$container ) { |
|
76 | - $statementArray = &$this->getStatementArray( $container ); |
|
75 | + protected function &getMainArray(array &$container) { |
|
76 | + $statementArray = &$this->getStatementArray($container); |
|
77 | 77 | |
78 | - if ( !array_key_exists( 'mainsnak', $statementArray ) ) { |
|
78 | + if (!array_key_exists('mainsnak', $statementArray)) { |
|
79 | 79 | $snakHash = $this->getSnakHash(); |
80 | - $statementArray['mainsnak'] = [ 'hash' => $snakHash ]; |
|
80 | + $statementArray['mainsnak'] = ['hash' => $snakHash]; |
|
81 | 81 | } |
82 | 82 | $mainsnakArray = &$statementArray['mainsnak']; |
83 | 83 |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | */ |
12 | 12 | class ContextCursorDeserializer { |
13 | 13 | |
14 | - public function deserialize( array $serialization ) { |
|
15 | - switch ( $serialization['t'] ) { |
|
14 | + public function deserialize(array $serialization) { |
|
15 | + switch ($serialization['t']) { |
|
16 | 16 | case Context::TYPE_STATEMENT: |
17 | 17 | return new MainSnakContextCursor( |
18 | 18 | $serialization['i'], |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | ); |
40 | 40 | default: |
41 | 41 | throw new InvalidArgumentException( |
42 | - 'Unknown serialization type ' . $serialization['t'] |
|
42 | + 'Unknown serialization type '.$serialization['t'] |
|
43 | 43 | ); |
44 | 44 | } |
45 | 45 | } |