@@ -10,5 +10,5 @@ |
||
| 10 | 10 | |
| 11 | 11 | /** English (English) */ |
| 12 | 12 | $specialPageAliases['en'] = [ |
| 13 | - 'ConstraintReport' => [ 'ConstraintReport', 'Constraint Report' ], |
|
| 13 | + 'ConstraintReport' => ['ConstraintReport', 'Constraint Report'], |
|
| 14 | 14 | ]; |
@@ -119,8 +119,8 @@ |
||
| 119 | 119 | * for quantity values, the difference is the numerical difference between the quantities, |
| 120 | 120 | * after attempting normalization of each side. |
| 121 | 121 | * |
| 122 | - * @param TimeValue|QuantityValue|UnboundedQuantityValue $minuend |
|
| 123 | - * @param TimeValue|QuantityValue|UnboundedQuantityValue $subtrahend |
|
| 122 | + * @param DataValue $minuend |
|
| 123 | + * @param DataValue $subtrahend |
|
| 124 | 124 | * |
| 125 | 125 | * @throws InvalidArgumentException if the values do not both have the same, supported data value type |
| 126 | 126 | * @return UnboundedQuantityValue |
@@ -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 | } |
@@ -14,6 +14,6 @@ |
||
| 14 | 14 | * |
| 15 | 15 | * @return Constraint[] |
| 16 | 16 | */ |
| 17 | - public function queryConstraintsForProperty( PropertyId $propertyId ); |
|
| 17 | + public function queryConstraintsForProperty(PropertyId $propertyId); |
|
| 18 | 18 | |
| 19 | 19 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | /** |
| 27 | 27 | * @var ConstraintLookup $lookup The lookup to which all queries are delegated. |
| 28 | 28 | */ |
| 29 | - public function __construct( ConstraintLookup $lookup ) { |
|
| 29 | + public function __construct(ConstraintLookup $lookup) { |
|
| 30 | 30 | $this->lookup = $lookup; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -35,10 +35,10 @@ discard block |
||
| 35 | 35 | * |
| 36 | 36 | * @return Constraint[] |
| 37 | 37 | */ |
| 38 | - public function queryConstraintsForProperty( PropertyId $propertyId ) { |
|
| 38 | + public function queryConstraintsForProperty(PropertyId $propertyId) { |
|
| 39 | 39 | $id = $propertyId->getSerialization(); |
| 40 | - if ( !array_key_exists( $id, $this->cache ) ) { |
|
| 41 | - $this->cache[$id] = $this->lookup->queryConstraintsForProperty( $propertyId ); |
|
| 40 | + if (!array_key_exists($id, $this->cache)) { |
|
| 41 | + $this->cache[$id] = $this->lookup->queryConstraintsForProperty($propertyId); |
|
| 42 | 42 | } |
| 43 | 43 | return $this->cache[$id]; |
| 44 | 44 | } |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | * @codeCoverageIgnore |
| 73 | 73 | */ |
| 74 | 74 | private function __construct() { |
| 75 | - throw new LogicException( 'This class should never be instantiated.' ); |
|
| 75 | + throw new LogicException('This class should never be instantiated.'); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @throws ConstraintParameterException if the constraint parameters are invalid |
| 23 | 23 | * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs |
| 24 | 24 | */ |
| 25 | - public function checkConstraint( Context $context, Constraint $constraint ); |
|
| 25 | + public function checkConstraint(Context $context, Constraint $constraint); |
|
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * Check if the constraint parameters of $constraint are valid. |
@@ -33,6 +33,6 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * @return ConstraintParameterException[] |
| 35 | 35 | */ |
| 36 | - public function checkConstraintParameters( Constraint $constraint ); |
|
| 36 | + public function checkConstraintParameters(Constraint $constraint); |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | class SparqlHelperException extends RuntimeException { |
| 11 | 11 | |
| 12 | 12 | public function __construct() { |
| 13 | - parent::__construct( 'The SPARQL query endpoint returned an error.' ); |
|
| 13 | + parent::__construct('The SPARQL query endpoint returned an error.'); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | private $metadata; |
| 22 | 22 | |
| 23 | - public function __construct( array $array, Metadata $metadata ) { |
|
| 23 | + public function __construct(array $array, Metadata $metadata) { |
|
| 24 | 24 | $this->array = $array; |
| 25 | 25 | $this->metadata = $metadata; |
| 26 | 26 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * @param bool $bool |
| 25 | 25 | * @param Metadata $metadata |
| 26 | 26 | */ |
| 27 | - public function __construct( $bool, Metadata $metadata ) { |
|
| 27 | + public function __construct($bool, Metadata $metadata) { |
|
| 28 | 28 | $this->bool = $bool; |
| 29 | 29 | $this->metadata = $metadata; |
| 30 | 30 | } |