WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314665
Change subject: New Wikidata Build - 2016-10-07T10:00:01+0000
......................................................................
New Wikidata Build - 2016-10-07T10:00:01+0000
Change-Id: I2facec9cf4588b027cbf4a2d164f1a24fc876f99
---
M composer.lock
M extensions/MediaInfo/src/Content/MediaInfoContent.php
M extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
A
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
M extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php
M extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php
M extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php
M extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
M extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php
M extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
M extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php
M extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php
M extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php
M extensions/Wikibase/lib/tests/phpunit/SummaryTest.php
M extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
M extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php
M extensions/Wikibase/repo/includes/Rdf/DateTimeValueCleaner.php
M extensions/Wikibase/repo/includes/Rdf/JulianDateTimeValueCleaner.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Rdf/DateTimeValueCleanerTest.php
M extensions/Wikibase/view/resources/wikibase/wikibase.css
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
28 files changed, 374 insertions(+), 84 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/65/314665/1
diff --git a/composer.lock b/composer.lock
index 2ed3a6b..712468b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1425,7 +1425,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo",
- "reference": "fcfbe05f43c7d2a18b945a2c919f2701849236df"
+ "reference": "a9a53ac3ffb8d1470cec5813ed641cca76484eac"
},
"require": {
"php": ">=5.5.0",
@@ -1471,7 +1471,7 @@
"issues": "https://phabricator.wikimedia.org/",
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2016-10-04 20:43:25"
+ "time": "2016-10-06 14:12:57"
},
{
"name": "wikibase/quality",
@@ -1574,12 +1574,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git",
- "reference": "2158b16f7f0f002b53c82e46d4e12d22c00489aa"
+ "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2158b16f7f0f002b53c82e46d4e12d22c00489aa",
- "reference": "2158b16f7f0f002b53c82e46d4e12d22c00489aa",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/826b84b61b770fac3e247ac85668bebe19adb4ac",
+ "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac",
"shasum": ""
},
"require": {
@@ -1653,7 +1653,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-10-06 08:27:33"
+ "time": "2016-10-06 22:47:40"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/MediaInfo/src/Content/MediaInfoContent.php
b/extensions/MediaInfo/src/Content/MediaInfoContent.php
index 2bd52ba..deb0c93 100644
--- a/extensions/MediaInfo/src/Content/MediaInfoContent.php
+++ b/extensions/MediaInfo/src/Content/MediaInfoContent.php
@@ -71,6 +71,15 @@
}
/**
+ * @see EntityContent::isEmpty
+ *
+ * @return bool
+ */
+ public function isEmpty() {
+ return !$this->isRedirect() && $this->getMediaInfo()->isEmpty();
+ }
+
+ /**
* @see EntityContent::isStub
*
* @return bool
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
index f2b10de..c6d9b36 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
@@ -40,6 +40,21 @@
$this->assertSame( $mediaInfo, $mediaInfoContent->getEntity() );
}
+ public function testIsEmpty() {
+ $mediaInfo = new MediaInfo();
+ $content = new MediaInfoContent( new EntityInstanceHolder(
$mediaInfo ) );
+
+ $this->assertTrue( $content->isEmpty() );
+ }
+
+ public function testIsNotEmpty() {
+ $mediaInfo = new MediaInfo();
+ $mediaInfo->getLabels()->setTextForLanguage( 'en', 'Foo' );
+ $content = new MediaInfoContent( new EntityInstanceHolder(
$mediaInfo ) );
+
+ $this->assertFalse( $content->isEmpty() );
+ }
+
public function provideStubs() {
$stubs = [];
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
new file mode 100644
index 0000000..8220fd4
--- /dev/null
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Wikibase\Client\Tests\DataAccess;
+
+use Language;
+use PHPUnit_Framework_TestCase;
+use DataValues\DecimalValue;
+use DataValues\Geo\Values\GlobeCoordinateValue;
+use DataValues\Geo\Values\LatLongValue;
+use DataValues\MonolingualTextValue;
+use DataValues\QuantityValue;
+use DataValues\StringValue;
+use DataValues\TimeValue;
+use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Snak\PropertySomeValueSnak;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Services\Lookup\EntityRetrievingTermLookup;
+use Wikibase\Client\WikibaseClient;
+use Wikibase\Client\Usage\UsageAccumulator;
+use Wikibase\Test\MockClientStore;
+
+/**
+ * Regression tests for the output produced by data access functionality.
+ * Technically this tests the SnakFormatters outputted by
DataAccessSnakFormatterFactory.
+ *
+ * @group Wikibase
+ * @group WikibaseClient
+ * @group WikibaseDataAccess
+ *
+ * @license GPL-2.0+
+ * @author Marius Hoch
+ */
+class DataAccessSnakFormatterOutputFormatTest extends
PHPUnit_Framework_TestCase {
+
+ /**
+ * Makes sure WikibaseClient uses our ClientStore mock
+ */
+ public function setUp() {
+ $wikibaseClient = WikibaseClient::getDefaultInstance( 'reset' );
+
+ $store = new MockClientStore( 'de' );
+ $wikibaseClient->overrideStore( $store );
+
+ // Create a term lookup from the ovewritten EntityLookup or the
MockClientStore one
+ $wikibaseClient->overrideTermLookup(
+ new EntityRetrievingTermLookup(
$store->getEntityLookup() )
+ );
+
+ $this->setUpDummyData( $store );
+ }
+
+ private function setUpDummyData( MockClientStore $store ) {
+ $mockRepository = $store->getEntityRevisionLookup();
+ $dataTypeIds = [
+ 'commonsMedia' => 'P1',
+ 'globe-coordinate' => 'P2',
+ 'monolingualtext' => 'P3',
+ 'quantity' => 'P4',
+ 'string' => 'P5',
+ 'time' => 'P6',
+ 'url' => 'P7',
+ 'external-id' => 'P8',
+ 'wikibase-item' => 'P9',
+ ];
+
+ foreach ( $dataTypeIds as $dataTypeId => $id ) {
+ $property = Property::newFromType( $dataTypeId );
+ $property->setId( new PropertyId( $id ) );
+
+ $mockRepository->putEntity( $property );
+ }
+
+ $item = new Item( new ItemId( 'Q12' ) );
+ $item->setLabel( 'en', 'label [[with]] wikitext' );
+
+ $mockRepository->putEntity( $item );
+ }
+
+ public function tearDown() {
+ WikibaseClient::getDefaultInstance( 'reset' );
+ }
+
+ /**
+ * @dataProvider snakProvider
+ */
+ public function testOutput( $expected, $snak ) {
+ // This is an integration test, use the global factory
+ $factory =
WikibaseClient::getDefaultInstance()->getDataAccessSnakFormatterFactory();
+ $formatter = $factory->newSnakFormatterForLanguage(
+ Language::factory( 'en' ),
+ $this->getMock( UsageAccumulator::class )
+ );
+
+ $this->assertSame( $expected, $formatter->formatSnak( $snak ) );
+ }
+
+ public function snakProvider() {
+ $settings = WikibaseClient::getDefaultInstance()->getSettings();
+ $repoConceptBaseUri = $settings->getSetting(
'repoConceptBaseUri' );
+
+ $p4 = new PropertyId( 'P4' );
+ $sampleUrl =
'https://www.wikidata.org/w/index.php?title=Q2013&action=history';
+
+ return [
+ 'commonsMedia' => [
+ 'A_file name.jpg',
+ new PropertyValueSnak(
+ new PropertyId( 'P1' ),
+ new StringValue( 'A_file name.jpg' )
+ )
+ ],
+ 'globecoordinate' => [
+ wfEscapeWikiText( '12°0\'0"N, 34°0\'0"E' ),
+ new PropertyValueSnak(
+ new PropertyId( 'P2' ),
+ new GlobeCoordinateValue( new
LatLongValue( 12, 34 ), null )
+ )
+ ],
+ 'monolingualtext' => [
+ wfEscapeWikiText( 'a [[b]] c' ),
+ new PropertyValueSnak(
+ new PropertyId( 'P3' ),
+ new MonolingualTextValue( 'es', 'a
[[b]] c' )
+ )
+ ],
+ 'quantity' => [
+ wfEscapeWikiText( '42 a [[b]] c' ),
+ new PropertyValueSnak(
+ $p4,
+ new QuantityValue(
+ new DecimalValue( 42 ),
+ 'a [[b]] c',
+ new DecimalValue( 42 ),
+ new DecimalValue( 42 )
+ )
+ )
+ ],
+ 'quantity with unit' => [
+ wfEscapeWikiText( '42 label [[with]] wikitext'
),
+ new PropertyValueSnak(
+ $p4,
+ new QuantityValue(
+ new DecimalValue( 42 ),
+ $repoConceptBaseUri . 'Q12',
+ new DecimalValue( 42 ),
+ new DecimalValue( 42 )
+ )
+ )
+ ],
+ 'string including wikitext' => [
+ wfEscapeWikiText( 'a [[b]] c' ),
+ new PropertyValueSnak(
+ new PropertyId( 'P5' ),
+ new StringValue( 'a [[b]] c' )
+ )
+ ],
+ 'time' => [
+ '+2013-01-01T00:00:00Z',
+ new PropertyValueSnak(
+ new PropertyId( 'P6' ),
+ new TimeValue(
+ '+2013-01-01T00:00:00Z',
+ 0, 0, 0,
+ TimeValue::PRECISION_SECOND,
+ TimeValue::CALENDAR_GREGORIAN
+ )
+ )
+ ],
+ 'url' => [
+ $sampleUrl,
+ new PropertyValueSnak(
+ new PropertyId( 'P7' ),
+ new StringValue( $sampleUrl )
+ )
+ ],
+ 'external-id' => [
+ 'abc',
+ new PropertyValueSnak(
+ new PropertyId( 'P8' ),
+ new StringValue( 'abc' )
+ )
+ ],
+ 'wikibase-item (wikibase-entityid)' => [
+ wfEscapeWikiText( 'label [[with]] wikitext' ),
+ new PropertyValueSnak(
+ new PropertyId( 'P9' ),
+ new EntityIdValue( new ItemId( 'Q12' ) )
+ )
+ ],
+ 'novalue' => [
+ 'no value',
+ new PropertyNoValueSnak( $p4 )
+ ],
+ 'somevalue' => [
+ 'unknown value',
+ new PropertySomeValueSnak( $p4 )
+ ],
+ ];
+ }
+
+}
diff --git a/extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php
b/extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php
index 3b66adc..3ecae44 100644
--- a/extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use DataValues\DataValueFactory;
use DataValues\IllegalValueException;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php
b/extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php
index 7f5c573..27b7210 100644
--- a/extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\Lib\ContentLanguages;
diff --git a/extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php
b/extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php
index c9f7b58..2207a9f 100644
--- a/extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
index 84dd2a1..1202b57 100644
--- a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use Language;
use MediaWikiTestCase;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php
b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php
index 8c1a7bf..3c3d264 100644
--- a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use Language;
use Wikibase\LanguageFallbackChain;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php
b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php
index 3f79880..63467c8 100644
--- a/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\DataModel\Term\TermFallback;
diff --git a/extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
b/extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
index d04d4ea..fdd6e87 100644
--- a/extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\Lib\LanguageNameLookup;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php
b/extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php
index e51c19c..e7f9420 100644
--- a/extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use Language;
use MWException;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php
b/extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php
index 7736d49..5380e03 100644
--- a/extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\Lib\MediaWikiContentLanguages;
diff --git a/extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
b/extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
index 6d48a7b..63ccaab 100644
--- a/extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use RecursiveDirectoryIterator;
@@ -28,26 +28,24 @@
$this->assertStringNotInLib( 'Wikibase\\Client\\', 2 );
}
+ /**
+ * @param string $string
+ * @param int $maxAllowance
+ */
private function assertStringNotInLib( $string, $maxAllowance ) {
- $this->assertStringNotInDir(
- $string,
- __DIR__ . '/../../',
- $maxAllowance
+ $this->assertLessThanOrEqual(
+ $maxAllowance,
+ $this->countStringInDir( $string, __DIR__ . '/../../' ),
+ 'You are not allowed to use ' . $string . ' in this
component'
);
}
- private function assertStringNotInDir( $string, $dirs, $maxAllowance ) {
- $dirs = (array)$dirs;
-
- foreach ( $dirs as $dir ) {
- $this->assertLessThanOrEqual(
- $maxAllowance,
- $this->countStringInDir( $string, $dir ),
- 'You are not allowed to use ' . $string . ' in
this component'
- );
- }
- }
-
+ /**
+ * @param string $string
+ * @param string $dir
+ *
+ * @return int
+ */
private function countStringInDir( $string, $dir ) {
$count = 0;
$directoryIterator = new RecursiveDirectoryIterator( $dir );
@@ -60,7 +58,7 @@
$text = file_get_contents(
$fileInfo->getPathname() );
$text = preg_replace( '@/\*.*?\*/@s', '', $text
);
- if ( stripos( $text, $string ) !== false ) {
+ if ( strpos( $text, $string ) !== false ) {
$count++;
}
}
diff --git
a/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php
b/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php
index 37ffc83..c1486b7 100644
---
a/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use RecursiveDirectoryIterator;
@@ -44,8 +44,14 @@
];
}
+ /**
+ * @param string $string
+ * @param string $dir
+ *
+ * @return string[]
+ */
private function getTestFilesWithoutGroup( $string, $dir ) {
- $string = '@group ' . $string;
+ $pattern = '/@group ' . preg_quote( $string, '/' ) . '\b/';
$files = [];
$directoryIterator = new RecursiveDirectoryIterator( $dir );
@@ -55,12 +61,13 @@
foreach ( new RecursiveIteratorIterator( $directoryIterator )
as $fileInfo ) {
if ( $fileInfo->isFile() && substr(
$fileInfo->getFilename(), -8 ) === 'Test.php' ) {
$text = file_get_contents(
$fileInfo->getPathname() );
- if ( stripos( $text, 'abstract class' ) !==
false ) {
+
+ if ( strpos( $text, 'abstract class' ) !==
false ) {
// Ignore abstract base classes.
continue;
}
- if ( preg_match( '@' . preg_quote( $string, '@'
) . '[^\w]@i', $text ) === 0 ) {
+ if ( preg_match( $pattern, $text ) === 0 ) {
$files[] = $fileInfo->getPathname();
}
}
diff --git
a/extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
b/extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
index aca0df1..b30cc18 100644
--- a/extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use DataValues\StringValue;
use Wikibase\DataModel\Entity\EntityIdValue;
diff --git a/extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php
b/extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php
index 49456ac..819a67e 100644
--- a/extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use OutOfBoundsException;
use Wikibase\SettingsArray;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php
b/extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php
index f0e66ed..a080665 100644
--- a/extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\Lib\StaticContentLanguages;
diff --git a/extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php
b/extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php
index 6724a6a..e7efaa3 100644
--- a/extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\StringNormalizer;
diff --git a/extensions/Wikibase/lib/tests/phpunit/SummaryTest.php
b/extensions/Wikibase/lib/tests/phpunit/SummaryTest.php
index 9e1a452..51e09d6 100644
--- a/extensions/Wikibase/lib/tests/phpunit/SummaryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/SummaryTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Summary;
diff --git a/extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
b/extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
index fd3e350..5b80391 100644
--- a/extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Lib\Tests;
use MWException;
use PHPUnit_Framework_TestCase;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php
b/extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php
index b98ca56..260dcfa 100644
--- a/extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Test;
+namespace Wikibase\Lib\Tests;
use PHPUnit_Framework_TestCase;
use Wikibase\Lib\ContentLanguages;
diff --git a/extensions/Wikibase/repo/includes/Rdf/DateTimeValueCleaner.php
b/extensions/Wikibase/repo/includes/Rdf/DateTimeValueCleaner.php
index 459cecc..4128bdb 100644
--- a/extensions/Wikibase/repo/includes/Rdf/DateTimeValueCleaner.php
+++ b/extensions/Wikibase/repo/includes/Rdf/DateTimeValueCleaner.php
@@ -11,6 +11,7 @@
*
* @license GPL-2.0+
* @author Stas Malyshev
+ * @author Thiemo Mättig
*/
class DateTimeValueCleaner {
@@ -37,7 +38,15 @@
* @return string|null
*/
public function getStandardValue( TimeValue $value ) {
- return $this->cleanupGregorianValue( $value->getTime(),
$value->getPrecision() );
+ // If we are less precise than a day, the calendar model does
not matter
+ // since we don't have enough information to do conversion
anyway
+ if ( $value->getCalendarModel() ===
TimeValue::CALENDAR_GREGORIAN
+ || $value->getPrecision() < TimeValue::PRECISION_DAY
+ ) {
+ return $this->cleanupGregorianValue( $value->getTime(),
$value->getPrecision() );
+ }
+
+ return null;
}
/**
@@ -105,7 +114,7 @@
*
* @param string $dateValue
*
- * @throws IllegalValueException
+ * @throws IllegalValueException if the input is an illegal XSD 1.0
timestamp
* @return array Parsed value in parts: $minus, $y, $m, $d, $time
*/
protected function parseDateValue( $dateValue ) {
@@ -136,7 +145,8 @@
// Year 0 is invalid for now, see T94064 for discussion
throw new IllegalValueException();
}
- return array( $minus, $y, $m, $d, $time );
+
+ return [ $minus, $y, $m, $d, $time ];
}
}
diff --git
a/extensions/Wikibase/repo/includes/Rdf/JulianDateTimeValueCleaner.php
b/extensions/Wikibase/repo/includes/Rdf/JulianDateTimeValueCleaner.php
index 810c86d..33c3a34 100644
--- a/extensions/Wikibase/repo/includes/Rdf/JulianDateTimeValueCleaner.php
+++ b/extensions/Wikibase/repo/includes/Rdf/JulianDateTimeValueCleaner.php
@@ -13,6 +13,7 @@
*
* @license GPL-2.0+
* @author Stas Malyshev
+ * @author Thiemo Mättig
*/
class JulianDateTimeValueCleaner extends DateTimeValueCleaner {
@@ -22,57 +23,54 @@
*
* @param TimeValue $value
*
- * @return string|null
+ * @return string|null Value compatible with xsd:dateTime type, null if
the input is an illegal
+ * XSD 1.0 timestamp
*/
public function getStandardValue( TimeValue $value ) {
- $calendar = $value->getCalendarModel();
- if ( $calendar == TimeValue::CALENDAR_GREGORIAN ) {
- return $this->cleanupGregorianValue( $value->getTime(),
$value->getPrecision() );
- } elseif ( $calendar == TimeValue::CALENDAR_JULIAN ) {
- $precision = $value->getPrecision();
+ try {
// If we are less precise than a day, no point to
convert
// Julian to Gregorian since we don't have enough
information to do it anyway
- if ( $precision >= TimeValue::PRECISION_DAY ) {
- return $this->julianDateValue(
$value->getTime(), $precision );
- } else {
- return $this->cleanupGregorianValue(
$value->getTime(), $precision );
+ if ( $value->getCalendarModel() ===
TimeValue::CALENDAR_JULIAN
+ && $value->getPrecision() >=
TimeValue::PRECISION_DAY
+ ) {
+ // There is a certain range of years PHP can
convert; assume everything else was a
+ // mistake and meant to be a Gregorian date
+ return $this->julianDateValue(
$value->getTime() )
+ ?: $this->cleanupGregorianValue(
$value->getTime(), $value->getPrecision() );
}
+ } catch ( IllegalValueException $e ) {
+ return null;
}
- return null;
+
+ return parent::getStandardValue( $value );
}
/**
* Get Julian date value and return it as Gregorian date
*
* @param string $dateValue
- * @param int $precision
*
- * @return string|null Value compatible with xsd:dateTime type, null if
we failed to parse
+ * @throws IllegalValueException if the input is an illegal XSD 1.0
timestamp
+ * @return string|null Value compatible with xsd:dateTime type, null if
conversion is not
+ * possible
*/
- private function julianDateValue( $dateValue, $precision ) {
- try {
- list( $minus, $y, $m, $d, $time ) =
$this->parseDateValue( $dateValue );
- } catch ( IllegalValueException $e ) {
- return null;
- }
+ private function julianDateValue( $dateValue ) {
+ list( $minus, $y, $m, $d, $time ) = $this->parseDateValue(
$dateValue );
$y = $minus ? -$y : $y + 0;
- if ( !is_int( $y ) || $y < -4713 ) {
- // Fall back to Gregorian when Julian to Gregorian
conversion is not possible.
- return $this->cleanupGregorianValue( $dateValue,
$precision );
+ // There are some weird overflows happening in the PHP
functions before and after this year.
+ if ( !is_int( $y ) || $y < -4713 || $y > 1465072 ) {
+ return null;
}
$jd = juliantojd( $m, $d, $y );
if ( $jd == 0 ) {
- // Fall back to Gregorian when Julian to Gregorian
conversion is not possible.
- return $this->cleanupGregorianValue( $dateValue,
$precision );
+ return null;
}
- // PHP API for Julian/Gregorian conversions is kind of awful
$gregorian = jdtogregorian( $jd );
if ( $gregorian === '0/0/0' ) {
- // Fall back to Gregorian when Julian to Gregorian
conversion is not possible.
- return $this->cleanupGregorianValue( $dateValue,
$precision );
+ return null;
}
list( $m, $d, $y ) = explode( '/', $gregorian );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/DateTimeValueCleanerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/DateTimeValueCleanerTest.php
index 4ce6c23..afef485 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/DateTimeValueCleanerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/DateTimeValueCleanerTest.php
@@ -16,8 +16,31 @@
*
* @license GPL-2.0+
* @author Stas Malyshev
+ * @author Thiemo Mättig
*/
class DateTimeValueCleanerTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @dataProvider illegalTimeValueProvider
+ */
+ public function testIllegalTimeValue( TimeValue $value, $xsd11 ) {
+ $cleaner = new JulianDateTimeValueCleaner( $xsd11 );
+ $this->assertNull( $cleaner->getStandardValue( $value ) );
+ }
+
+ public function illegalTimeValueProvider() {
+ $day = TimeValue::PRECISION_DAY;
+ $year0 = '+0000-01-01T00:00:00Z';
+ $year0Greg = new TimeValue( $year0, 0, 0, 0, $day,
TimeValue::CALENDAR_GREGORIAN );
+ $year0Jul = new TimeValue( $year0, 0, 0, 0, $day,
TimeValue::CALENDAR_JULIAN );
+
+ return [
+ [ $year0Greg, false ],
+ [ $year0Greg, true ],
+ [ $year0Jul, false ],
+ [ $year0Jul, true ],
+ ];
+ }
public function getDates() {
$greg = TimeValue::CALENDAR_GREGORIAN;
@@ -55,8 +78,12 @@
[ '+00000000200-02-31T00:00:00Z', $jul,
'0200-03-02T00:00:00Z' ],
[ '+00000000204-02-31T00:00:00Z', $jul,
'0204-03-02T00:00:00Z' ],
[ '-02000000204-02-31T00:00:00Z', $jul,
'-2000000204-02-29T00:00:00Z' ],
- [ '-4713-12-31T00:00:00Z', $jul,
'-4713-11-23T00:00:00Z' ],
- [ '-4714-01-02T00:00:00Z', $jul,
'-4714-01-02T00:00:00Z' ],
+ [ '-4713-01-02T00:00:00Z', $jul,
'-4714-11-25T00:00:00Z' ],
+ [ '-4713-01-01T00:00:00Z', $jul,
'-4713-01-01T00:00:00Z' ],
+ [ '+0000-01-01T00:00:00Z', $jul, null ],
+ [ '+0001-01-01T00:00:00Z', $jul,
'-0001-12-30T00:00:00Z' ],
+ [ '+1465072-01-01T00:00:00Z', $jul,
'1465102-01-30T00:00:00Z' ],
+ [ '+1465073-01-01T00:00:00Z', $jul,
'1465073-01-01T00:00:00Z' ],
[ '+98765432198765-00-00T00:00:00Z', $jul,
'98765432198765-01-01T00:00:00Z', $year ],
[ '-98765432198765-00-00T00:00:00Z', $jul,
'-98765432198765-01-01T00:00:00Z', $year ],
[ '+8888888888888888-01-01T00:00:00Z', $jul,
'8888888888888888-01-01T00:00:00Z' ],
@@ -88,8 +115,8 @@
[ '-00000002014-01-05T12:34:56Z', $jul,
'-2014-12-19T12:34:56Z' ],
[ '-00000002014-01-05T12:34:56Z', $jul,
'-2013-01-01T12:34:56Z', $year ],
[ '-0100-07-12T00:00:00Z', $jul,
'-0099-07-10T00:00:00Z', $day ],
- [ '-4713-12-31T00:00:00Z', $jul,
'-4712-11-23T00:00:00Z' ],
- [ '-4714-01-02T00:00:00Z', $jul,
'-4713-01-02T00:00:00Z' ],
+ [ '-4713-01-02T00:00:00Z', $jul,
'-4713-11-25T00:00:00Z' ],
+ [ '-4713-01-01T00:00:00Z', $jul,
'-4712-01-01T00:00:00Z' ],
[ '+98765432198765-00-00T00:00:00Z', $jul,
'98765432198765-01-01T00:00:00Z', $year ],
[ '-98765432198765-00-00T00:00:00Z', $jul,
'-98765432198764-01-01T00:00:00Z', $year ],
[ '+8888888888888888-01-01T00:00:00Z', $jul,
'8888888888888888-01-01T00:00:00Z' ],
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.css
b/extensions/Wikibase/view/resources/wikibase/wikibase.css
index 62d008d..f1498a6 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.css
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.css
@@ -478,6 +478,7 @@
.wikibase-statementview .wikibase-toolbar-container {
top: 10px; /* even out padding */
+ white-space: nowrap;
}
/***** REFERENCES *****/
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index e73837e..bbfa53b 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -476,6 +476,7 @@
'Wikibase\\Client\\Tests\\Changes\\WikiPageUpdaterTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/Changes/WikiPageUpdaterTest.php',
'Wikibase\\Client\\Tests\\ClientParserOutputDataUpdaterTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/ClientParserOutputDataUpdaterTest.php',
'Wikibase\\Client\\Tests\\DataAccess\\DataAccessSnakFormatterFactoryTest'
=> $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php',
+
'Wikibase\\Client\\Tests\\DataAccess\\DataAccessSnakFormatterOutputFormatTest'
=> $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php',
'Wikibase\\Client\\Tests\\DataAccess\\PropertyIdResolverTest' => $baseDir
.
'/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php',
'Wikibase\\Client\\Tests\\DataAccess\\PropertyParserFunction\\LanguageAwareRendererTest'
=> $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php',
'Wikibase\\Client\\Tests\\DataAccess\\PropertyParserFunction\\PropertyParserFunctionIntegrationTest'
=> $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php',
@@ -887,19 +888,33 @@
'Wikibase\\Lib\\Tests\\Changes\\ItemChangeTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Changes/ItemChangeTest.php',
'Wikibase\\Lib\\Tests\\Changes\\TestChanges' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Changes/TestChanges.php',
'Wikibase\\Lib\\Tests\\DataTypeDefinitionsTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/DataTypeDefinitionsTest.php',
+ 'Wikibase\\Lib\\Tests\\DataValueFactoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/DataValueFactoryTest.php',
+ 'Wikibase\\Lib\\Tests\\DifferenceContentLanguagesTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/DifferenceContentLanguagesTest.php',
+ 'Wikibase\\Lib\\Tests\\EntityFactoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/EntityFactoryTest.php',
'Wikibase\\Lib\\Tests\\EntityIdComposerTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/EntityIdComposerTest.php',
'Wikibase\\Lib\\Tests\\EntityRevisionLookupTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php',
'Wikibase\\Lib\\Tests\\EntityTypeDefinitionsTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/EntityTypeDefinitionsTest.php',
'Wikibase\\Lib\\Tests\\EntityTypesTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/EntityTypesTest.php',
'Wikibase\\Lib\\Tests\\FieldPropertyInfoProviderTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php',
+ 'Wikibase\\Lib\\Tests\\LanguageFallbackChainFactoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php',
+ 'Wikibase\\Lib\\Tests\\LanguageFallbackChainTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php',
+ 'Wikibase\\Lib\\Tests\\LanguageFallbackIndicatorTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/LanguageFallbackIndicatorTest.php',
+ 'Wikibase\\Lib\\Tests\\LanguageNameLookupTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php',
+ 'Wikibase\\Lib\\Tests\\LanguageWithConversionTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/LanguageWithConversionTest.php',
+ 'Wikibase\\Lib\\Tests\\MediaWikiContentLanguagesTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MediaWikiContentLanguagesTest.php',
'Wikibase\\Lib\\Tests\\MockPropertyLabelResolver' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockPropertyLabelResolver.php',
'Wikibase\\Lib\\Tests\\MockRepository' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockRepository.php',
'Wikibase\\Lib\\Tests\\MockRepositoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php',
'Wikibase\\Lib\\Tests\\Modules\\RepoAccessModuleTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Modules/RepoAccessModuleTest.php',
'Wikibase\\Lib\\Tests\\Modules\\SitesModuleTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Modules/SitesModuleTest.php',
'Wikibase\\Lib\\Tests\\MwTimeIsoFormatterTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php',
+ 'Wikibase\\Lib\\Tests\\NoBadDependencyUsageTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php',
+ 'Wikibase\\Lib\\Tests\\PHPUnitTestsHaveGroupWikibaseTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php',
'Wikibase\\Lib\\Tests\\PropertyInfoDataTypeLookupTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php',
+ 'Wikibase\\Lib\\Tests\\PropertyInfoSnakUrlExpanderTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php',
'Wikibase\\Lib\\Tests\\Serialization\\CallbackFactoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Serialization/CallbackFactoryTest.php',
+ 'Wikibase\\Lib\\Tests\\SettingsArrayTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/SettingsArrayTest.php',
+ 'Wikibase\\Lib\\Tests\\StaticContentLanguagesTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/StaticContentLanguagesTest.php',
'Wikibase\\Lib\\Tests\\Store\\BufferingTermLookupTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/BufferingTermLookupTest.php',
'Wikibase\\Lib\\Tests\\Store\\CachingPropertyInfoStoreTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/CachingPropertyInfoStoreTest.php',
'Wikibase\\Lib\\Tests\\Store\\ChunkCacheTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/ChunkCacheTest.php',
@@ -917,6 +932,10 @@
'Wikibase\\Lib\\Tests\\Store\\TermPropertyLabelResolverTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php',
'Wikibase\\Lib\\Tests\\Store\\TermSqlIndexTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php',
'Wikibase\\Lib\\Tests\\Store\\WikiPageEntityRevisionLookupTest' =>
$baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php',
+ 'Wikibase\\Lib\\Tests\\StringNormalizerTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php',
+ 'Wikibase\\Lib\\Tests\\SummaryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/SummaryTest.php',
+ 'Wikibase\\Lib\\Tests\\TermIndexEntryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php',
+ 'Wikibase\\Lib\\Tests\\UnionContentLanguagesTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/UnionContentLanguagesTest.php',
'Wikibase\\Lib\\TimeDetailsFormatter' => $baseDir .
'/extensions/Wikibase/lib/includes/Formatters/TimeDetailsFormatter.php',
'Wikibase\\Lib\\TypedValueFormatter' => $baseDir .
'/extensions/Wikibase/lib/includes/TypedValueFormatter.php',
'Wikibase\\Lib\\UnDeserializableValueFormatter' => $baseDir .
'/extensions/Wikibase/lib/includes/Formatters/UnDeserializableValueFormatter.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ef2e2c5..58cdec2 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1348,12 +1348,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git",
- "reference": "2158b16f7f0f002b53c82e46d4e12d22c00489aa"
+ "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2158b16f7f0f002b53c82e46d4e12d22c00489aa",
- "reference": "2158b16f7f0f002b53c82e46d4e12d22c00489aa",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/826b84b61b770fac3e247ac85668bebe19adb4ac",
+ "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac",
"shasum": ""
},
"require": {
@@ -1386,7 +1386,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-10-06 08:27:33",
+ "time": "2016-10-06 22:47:40",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1597,7 +1597,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo",
- "reference": "fcfbe05f43c7d2a18b945a2c919f2701849236df"
+ "reference": "a9a53ac3ffb8d1470cec5813ed641cca76484eac"
},
"require": {
"php": ">=5.5.0",
@@ -1611,7 +1611,7 @@
"mediawiki/mediawiki-codesniffer": "0.6.0",
"phpunit/phpunit": "~4.8"
},
- "time": "2016-10-04 20:43:25",
+ "time": "2016-10-06 14:12:57",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/314665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2facec9cf4588b027cbf4a2d164f1a24fc876f99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits