jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395518 )
Change subject: Remove data-values/data-types
......................................................................
Remove data-values/data-types
To be merged together with
I6292331d945ef7737fdc2130001533212605c1ff.
Bug: T180454
Change-Id: I6791b11c0af6c81fbb6086dab85c59230dd2d2e4
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
D data-values/data-types/.gitreview
D data-values/data-types/COPYING
D data-values/data-types/DataTypes.php
D data-values/data-types/README.md
D data-values/data-types/package.json
D data-values/data-types/src/DataType.php
D data-values/data-types/src/DataTypeFactory.php
13 files changed, 1 insertion(+), 848 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 087e52f..d50d4f7 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,6 @@
"composer/semver": "1.4.2",
"cssjanus/cssjanus": "1.2.0",
"data-values/common": "0.4.1",
- "data-values/data-types": "2.0.0",
"data-values/data-values": "1.1.1",
"data-values/geo": "2.1.1",
"data-values/interfaces": "0.2.5",
diff --git a/composer.lock b/composer.lock
index dbad8e6..b52e20e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "content-hash": "75dfcdd9f65a99995bfd9302c0096caf",
+ "content-hash": "6f68bf26abea37e7212cc0afe9cb9341",
"packages": [
{
"name": "composer/semver",
@@ -163,59 +163,6 @@
"wikidata"
],
"time": "2017-08-09T18:20:52+00:00"
- },
- {
- "name": "data-values/data-types",
- "version": "2.0.0",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-DataTypes.git";,
- "reference": "55c4aae1f3704aa3764babcbe165a314e864a301"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-DataTypes/zipball/55c4aae1f3704aa3764babcbe165a314e864a301";,
- "reference": "55c4aae1f3704aa3764babcbe165a314e864a301",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "phpunit/phpunit": "~4.8",
- "wikibase/wikibase-codesniffer": "^0.1.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "DataTypes\\": "src/",
- "DataTypes\\Tests\\": "tests/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- },
- {
- "name": "Daniel Kinzler"
- }
- ],
- "description": "PHP library defining the DataTypes\\DataType class
of which instances represent a type of value, such as \"positive integer\" or
\"percentage\".",
- "homepage": "https://github.com/wmde/DataTypes";,
- "keywords": [
- "datatypes",
- "datavalues"
- ],
- "time": "2017-11-14T12:29:53+00:00"
},
{
"name": "data-values/data-values",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index a906060..1259416 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -73,8 +73,6 @@
'Composer\\Semver\\VersionParser' => $vendorDir .
'/composer/semver/src/VersionParser.php',
'Console_Getopt' => $vendorDir . '/pear/console_getopt/Console/Getopt.php',
'Copyable' => $vendorDir .
'/data-values/data-values/src/interfaces/Copyable.php',
- 'DataTypes\\DataType' => $vendorDir .
'/data-values/data-types/src/DataType.php',
- 'DataTypes\\DataTypeFactory' => $vendorDir .
'/data-values/data-types/src/DataTypeFactory.php',
'DataValues\\BooleanValue' => $vendorDir .
'/data-values/data-values/src/DataValues/BooleanValue.php',
'DataValues\\DataValue' => $vendorDir .
'/data-values/data-values/src/DataValues/DataValue.php',
'DataValues\\DataValueObject' => $vendorDir .
'/data-values/data-values/src/DataValues/DataValueObject.php',
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
index 855c63b..388308a 100644
--- a/composer/autoload_psr4.php
+++ b/composer/autoload_psr4.php
@@ -42,8 +42,6 @@
'DataValues\\Geo\\' => array($vendorDir . '/data-values/geo/src'),
'DataValues\\Deserializers\\' => array($vendorDir .
'/data-values/serialization/src/Deserializers'),
'DataValues\\' => array($vendorDir . '/data-values/common/src/DataValues'),
- 'DataTypes\\Tests\\' => array($vendorDir .
'/data-values/data-types/tests'),
- 'DataTypes\\' => array($vendorDir . '/data-values/data-types/src'),
'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
'CLDRPluralRuleParser\\' => array($vendorDir .
'/wikimedia/cldr-plural-rule-parser/src'),
);
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index a3f5444..0a805fc 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -98,8 +98,6 @@
'DataValues\\Geo\\' => 15,
'DataValues\\Deserializers\\' => 25,
'DataValues\\' => 11,
- 'DataTypes\\Tests\\' => 16,
- 'DataTypes\\' => 10,
),
'C' =>
array (
@@ -255,14 +253,6 @@
'DataValues\\' =>
array (
0 => __DIR__ . '/..' . '/data-values/common/src/DataValues',
- ),
- 'DataTypes\\Tests\\' =>
- array (
- 0 => __DIR__ . '/..' . '/data-values/data-types/tests',
- ),
- 'DataTypes\\' =>
- array (
- 0 => __DIR__ . '/..' . '/data-values/data-types/src',
),
'Composer\\Semver\\' =>
array (
@@ -446,8 +436,6 @@
'Composer\\Semver\\VersionParser' => __DIR__ . '/..' .
'/composer/semver/src/VersionParser.php',
'Console_Getopt' => __DIR__ . '/..' .
'/pear/console_getopt/Console/Getopt.php',
'Copyable' => __DIR__ . '/..' .
'/data-values/data-values/src/interfaces/Copyable.php',
- 'DataTypes\\DataType' => __DIR__ . '/..' .
'/data-values/data-types/src/DataType.php',
- 'DataTypes\\DataTypeFactory' => __DIR__ . '/..' .
'/data-values/data-types/src/DataTypeFactory.php',
'DataValues\\BooleanValue' => __DIR__ . '/..' .
'/data-values/data-values/src/DataValues/BooleanValue.php',
'DataValues\\DataValue' => __DIR__ . '/..' .
'/data-values/data-values/src/DataValues/DataValue.php',
'DataValues\\DataValueObject' => __DIR__ . '/..' .
'/data-values/data-values/src/DataValues/DataValueObject.php',
diff --git a/composer/installed.json b/composer/installed.json
index beea8ad..e1d6e49 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -3221,61 +3221,6 @@
]
},
{
- "name": "data-values/data-types",
- "version": "2.0.0",
- "version_normalized": "2.0.0.0",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-DataTypes.git";,
- "reference": "55c4aae1f3704aa3764babcbe165a314e864a301"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-DataTypes/zipball/55c4aae1f3704aa3764babcbe165a314e864a301";,
- "reference": "55c4aae1f3704aa3764babcbe165a314e864a301",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "phpunit/phpunit": "~4.8",
- "wikibase/wikibase-codesniffer": "^0.1.0"
- },
- "time": "2017-11-14T12:29:53+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "DataTypes\\": "src/",
- "DataTypes\\Tests\\": "tests/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- },
- {
- "name": "Daniel Kinzler"
- }
- ],
- "description": "PHP library defining the DataTypes\\DataType class of
which instances represent a type of value, such as \"positive integer\" or
\"percentage\".",
- "homepage": "https://github.com/wmde/DataTypes";,
- "keywords": [
- "datatypes",
- "datavalues"
- ]
- },
- {
"name": "wikimedia/equivset",
"version": "1.2.0",
"version_normalized": "1.2.0.0",
diff --git a/data-values/data-types/.gitreview
b/data-values/data-types/.gitreview
deleted file mode 100644
index de4cd7d..0000000
--- a/data-values/data-types/.gitreview
+++ /dev/null
@@ -1,6 +0,0 @@
-[gerrit]
-host=gerrit.wikimedia.org
-port=29418
-project=mediawiki/extensions/DataTypes.git
-track=1
-defaultrebase=0
diff --git a/data-values/data-types/COPYING b/data-values/data-types/COPYING
deleted file mode 100644
index ebba08a..0000000
--- a/data-values/data-types/COPYING
+++ /dev/null
@@ -1,347 +0,0 @@
-The license text below "----" applies to all files within this distribution,
other
-than those that are in a directory which contains files named "LICENSE" or
-"COPYING", or a subdirectory thereof. For those files, the license text
contained in
-said file overrides any license information contained in directories of
smaller depth.
-Alternative licenses are typically used for software that is provided by
external
-parties, and merely packaged with this software for convenience.
-----
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/data-values/data-types/DataTypes.php
b/data-values/data-types/DataTypes.php
deleted file mode 100644
index e69de29..0000000
--- a/data-values/data-types/DataTypes.php
+++ /dev/null
diff --git a/data-values/data-types/README.md b/data-values/data-types/README.md
deleted file mode 100644
index f1b2cb8..0000000
--- a/data-values/data-types/README.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# DataTypes
-
-PHP library defining the `DataTypes\DataType` class of which instances
represent a type of value,
-such as "positive integer" or "percentage".
-
-[](http://travis-ci.org/wmde/DataTypes)
-[](https://scrutinizer-ci.com/g/wmde/DataTypes/)
-[](https://scrutinizer-ci.com/g/wmde/DataTypes/)
-[](https://www.versioneye.com/php/data-values:data-types/dev-master)
-
-On [Packagist](https://packagist.org/packages/data-values/data-types):
-[](https://packagist.org/packages/data-values/data-types)
-[](https://packagist.org/packages/data-values/data-types)
-
-## Installation
-
-You can use [Composer](http://getcomposer.org/) to download and install
-this package as well as its dependencies. Alternatively you can simply clone
-the git repository and take care of loading yourself.
-
-### Composer
-
-To add this package as a local, per-project dependency to your project, simply
add a
-dependency on `data-values/data-types` to your project's `composer.json` file.
-Here is a minimal example of a `composer.json` file that just defines a
dependency on
-DataTypes 1.0:
-
- {
- "require": {
- "data-values/data-types": "~1.0"
- }
- }
-
-### Manual
-
-Get the DataTypes code, either via git, or some other means. Also get all
dependencies.
-You can find a list of the dependencies in the "require" section of the
composer.json file.
-Load all dependencies and the load the DataTypes library by including its
entry point:
-DataTypes.php.
-
-## Tests
-
-This library comes with a set up PHPUnit tests that cover all non-trivial
code. You can run these
-tests using the PHPUnit configuration file found in the root directory. The
tests can also be run
-via TravisCI, as a TravisCI configuration file is also provided in the root
directory.
-
-## Authors
-
-DataTypes has been written by the Wikidata team at [Wikimedia
Germany](https://wikimedia.de)
-for the [Wikidata project](https://wikidata.org/).
-
-## Release notes
-
-### 2.0.0 (2017-11-14)
-* Removed `DataTypesModules`
-* Removed MediaWiki integration. The library is no longer a MediaWiki
extension.
-* Removed JavaScript files and internationalizations (moved to a separate
package).
-
-### 1.0.0 (2016-12-29)
-* `DataType` and `DataTypeFactory` do not accept empty strings any more.
-* Removed `DataType::getLabel` along with the `DataTypes\Message` class.
-* Added `DataType::getMessageKey`.
-* Added a basic PHPCS rule set, can be run with `composer phpcs`.
-
-### 0.5.2 (2016-02-17)
-* Fixed cache invalidation in `DataTypesModule`.
-* Fixed `DataTypeFactory` to report invalid arguments on construction.
-
-### 0.5.1 (2015-10-20)
-* `DataTypeFactory::getTypes()` now returns array with typeId keys as
documented
-
-### 0.5.0 (2015-08-10)
-
-#### Breaking changes
-* `DataType` no longer takes an array of `ValueValidator` in its constructor
-* `DataType::getValidators` has been removed
-* `DataTypeFactory` now takes a map from data type id to data value type.
-* `DataTypeFactory::registerBuilder` has been removed
-
-### 0.4.3 (2015-06-18)
-
-* Fixed version number constant.
-
-### 0.4.2 (2015-06-18)
-
-* Updated code documentation for being able to automatically generate a proper
documentation using JSDuck.
-* Removed the ResourceLoader module "dependencies" which had been defined by
accident.
-
-### 0.4.1 (2014-11-18)
-
-* Improved path detection so it does not break when the library is included in
`vendor` rather than `extensions`
-
-### 0.4.0 (2014-05-21)
-
-* Removed the global variable `wgDataTypes`
-
-### 0.3.0 (2014-05-21)
-
-* Rename `monolingual-text` to `monolingualtext`
-* Rename `multilingual-text` to `multilingualtext`
-
-### 0.2.1 (2014-05-06)
-
-* Migrated the i18n support to the new MediaWiki JSON format
-* The tests are now run on PHP 5.6 and HHVM on travis
-
-### 0.2.0 (2014-03-14)
-
-#### Breaking changes
-
-* `dataTypes.DataType` JavaScript object may no longer be initialized from a
`dataValues.DataValue` object.
-* Removed `dataTypes.DataType.getLabel`.
-* Removed global DataType registration in the `dataTypes` object;
`DataTypeStore` is to be used instead.
-* Split up generic "dataTypes" ResourceLoader module into "dataTypes.DataType"
and "dataTypes.DataTypeStore".
-
-#### Enhancements
-
-* Removed MediaWiki and DataValues dependencies from JavaScript code.
-* Made code PSR-4 compliant
-* Removed ResourceLoader dependency of QUnit tests.
-* Implemented DataTypeStore.
-
-### 0.1.1 (2013-12-23)
-
-* Remove assumption about where the extension is installed in the resource
loading paths.
-
-### 0.1.0 (2013-12-15)
-
-Initial release.
-
-## Links
-
-* [DataTypes on
Packagist](https://packagist.org/packages/data-values/data-types)
-* [DataTypes on Ohloh](https://www.ohloh.net/p/DataTypesPHP)
-* [TravisCI build status](https://travis-ci.org/wmde/DataTypes)
-* [DataTypes on ScrutinizerCI](https://scrutinizer-ci.com/g/wmde/DataTypes/)
-* [Issue tracker](https://phabricator.wikimedia.org/project/view/123/)
diff --git a/data-values/data-types/package.json
b/data-values/data-types/package.json
deleted file mode 100644
index e0926dc..0000000
--- a/data-values/data-types/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "scripts": {
- "test": "true"
- }
-}
diff --git a/data-values/data-types/src/DataType.php
b/data-values/data-types/src/DataType.php
deleted file mode 100644
index ac9ca1d..0000000
--- a/data-values/data-types/src/DataType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace DataTypes;
-
-use InvalidArgumentException;
-
-/**
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Thiemo Mättig
- */
-class DataType {
-
- /**
- * Identifier of this data type (also referred to as "property type").
- *
- * @since 0.1
- *
- * @var string
- */
- protected $typeId;
-
- /**
- * Identifier for the type of the DataValue.
- *
- * @since 0.1
- *
- * @var string
- */
- protected $dataValueType;
-
- /**
- * @since 0.5
- *
- * @param string $typeId Identifier of this data type (also referred to
as "property type").
- * @param string $dataValueType Identifier for the type of the
DataValue.
- *
- * @throws InvalidArgumentException
- */
- public function __construct( $typeId, $dataValueType ) {
- if ( !is_string( $typeId ) || $typeId === '' ) {
- throw new InvalidArgumentException( '$typeId must be a
non-empty string' );
- }
-
- if ( !is_string( $dataValueType ) || $dataValueType === '' ) {
- throw new InvalidArgumentException( '$dataValueType
must be a non-empty string' );
- }
-
- $this->typeId = $typeId;
- $this->dataValueType = $dataValueType;
- }
-
- /**
- * Returns the identifier of this data type (also referred to as
"property type").
- *
- * @since 0.1
- *
- * @return string
- */
- public function getId() {
- return $this->typeId;
- }
-
- /**
- * Returns the type of the DataValue used by this data type.
- *
- * @since 0.1
- *
- * @return string
- */
- public function getDataValueType() {
- return $this->dataValueType;
- }
-
- /**
- * @since 1.0
- *
- * @return string
- */
- public function getMessageKey() {
- return 'datatypes-type-' . $this->typeId;
- }
-
- /**
- * @since 0.1
- *
- * @return string[]
- */
- public function toArray() {
- return [
- 'dataValueType' => $this->dataValueType
- ];
- }
-
-}
diff --git a/data-values/data-types/src/DataTypeFactory.php
b/data-values/data-types/src/DataTypeFactory.php
deleted file mode 100644
index a4b5004..0000000
--- a/data-values/data-types/src/DataTypeFactory.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-namespace DataTypes;
-
-use InvalidArgumentException;
-use OutOfBoundsException;
-
-/**
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Daniel Kinzler
- */
-class DataTypeFactory {
-
- /**
- * Associative array mapping data type identifiers to DataType objects.
- *
- * @var DataType[]
- */
- private $types = [];
-
- /**
- * @var string[] Associative array mapping data type identifiers to
data value type identifiers.
- */
- private $valueTypes = [];
-
- /**
- * @since 0.5
- *
- * @param string[] $valueTypes Associative array mapping data type
identifiers (also
- * referred to as "property types") to data value type identifiers.
- *
- * @throws InvalidArgumentException
- */
- public function __construct( array $valueTypes ) {
- foreach ( $valueTypes as $typeId => $valueType ) {
- if ( !is_string( $typeId ) || $typeId === ''
- || !is_string( $valueType ) || $valueType === ''
- ) {
- throw new InvalidArgumentException(
- '$valueTypes must be an associative
array of non-empty strings'
- );
- }
- }
-
- $this->valueTypes = $valueTypes;
- }
-
- /**
- * @since 0.1
- *
- * @param DataType[] $dataTypes
- *
- * @return self
- */
- public static function newFromTypes( array $dataTypes ) {
- $factory = new self( [] );
-
- foreach ( $dataTypes as $dataType ) {
- $factory->registerDataType( $dataType );
- }
-
- return $factory;
- }
-
- /**
- * @since 0.1
- *
- * @param DataType $dataType
- */
- public function registerDataType( DataType $dataType ) {
- $this->types[$dataType->getId()] = $dataType;
- }
-
- /**
- * Returns the list of registered data type identifiers (also referred
to as "property types").
- *
- * @since 0.1
- *
- * @return string[]
- */
- public function getTypeIds() {
- return array_keys( $this->valueTypes );
- }
-
- /**
- * Returns the data type that has the specified type identifier.
- * Types may be instantiated on the fly using a type builder spec.
- *
- * @since 0.1
- *
- * @param string $typeId Data type identifier (also referred to as
"property type").
- *
- * @throws OutOfBoundsException if the requested type is not known.
- * @return DataType
- */
- public function getType( $typeId ) {
- if ( !array_key_exists( $typeId, $this->types ) ) {
- if ( !array_key_exists( $typeId, $this->valueTypes ) ) {
- throw new OutOfBoundsException( "Unknown data
type '$typeId'" );
- }
-
- $valueType = $this->valueTypes[$typeId];
- $this->types[$typeId] = new DataType( $typeId,
$valueType );
- }
-
- return $this->types[$typeId];
- }
-
- /**
- * Returns all data types in an associative array with
- * the keys being data type identifiers (also referred to as "property
types") pointing to their
- * corresponding data type.
- *
- * @since 0.1
- *
- * @return DataType[]
- */
- public function getTypes() {
- $types = [];
-
- foreach ( $this->getTypeIds() as $typeId ) {
- $types[$typeId] = $this->getType( $typeId );
- }
-
- return $types;
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/395518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6791b11c0af6c81fbb6086dab85c59230dd2d2e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
