From d3e71d641568df922af80585ebfa05c17f4b6cfd Mon Sep 17 00:00:00 2001 From: bcweaver <brianweaver@gmail.com> Date: Wed, 8 Jul 2020 14:11:16 -0400 Subject: [PATCH] update migrate_devel to 2.0-alpha2 --- composer.json | 2 +- composer.lock | 50 ++- vendor/composer/installed.json | 44 ++- web/modules/migrate_devel/LICENSE.txt | 339 ++++++++++++++++++ web/modules/migrate_devel/README.md | 75 +++- web/modules/migrate_devel/composer.json | 19 + web/modules/migrate_devel/drush.services.yml | 5 + .../migrate_devel/migrate_devel.drush.inc | 5 - .../migrate_devel/migrate_devel.info.yml | 8 +- .../src/Commands/MigrateDevelCommands.php | 26 ++ .../MigrationEventSubscriber.php | 51 ++- 11 files changed, 562 insertions(+), 62 deletions(-) create mode 100644 web/modules/migrate_devel/LICENSE.txt create mode 100644 web/modules/migrate_devel/composer.json create mode 100644 web/modules/migrate_devel/drush.services.yml create mode 100644 web/modules/migrate_devel/src/Commands/MigrateDevelCommands.php diff --git a/composer.json b/composer.json index 24f5d011bb..b17f66d9d4 100644 --- a/composer.json +++ b/composer.json @@ -141,7 +141,7 @@ "drupal/menu_block_title": "1.1", "drupal/menu_breadcrumb": "1.13", "drupal/metatag": "1.13", - "drupal/migrate_devel": "1.x-dev", + "drupal/migrate_devel": "2.0-alpha2", "drupal/migrate_plus": "4.0", "drupal/migrate_tools": "4.0", "drupal/mobile_detect_twig_extensions": "1.4", diff --git a/composer.lock b/composer.lock index f140526299..313a39a027 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5be8cd01800f5e62b789f8cba434653e", + "content-hash": "1c62a5829fdd2dcd1c604e5105490765", "packages": [ { "name": "alchemy/zippy", @@ -6057,26 +6057,37 @@ }, { "name": "drupal/migrate_devel", - "version": "dev-1.x", + "version": "2.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_devel.git", - "reference": "d56b84fe79621199305f36c707bbb5d209ee1b6b" + "reference": "8.x-2.0-alpha2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/migrate_devel-8.x-2.0-alpha2.zip", + "reference": "8.x-2.0-alpha2", + "shasum": "8ea8a10d8238c0a52abc7b12d688414e024999c8" }, "require": { - "drupal/core": "*" + "drupal/core": "^8 || ^9" + }, + "conflict": { + "drush/drush": "<9" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.x-dev", - "datestamp": "1498434542", + "version": "8.x-2.0-alpha2", + "datestamp": "1593367363", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Alpha releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" } } }, @@ -6088,14 +6099,22 @@ { "name": "Derimagia", "homepage": "https://www.drupal.org/user/819640" + }, + { + "name": "aczietlow", + "homepage": "https://www.drupal.org/user/1616656" + }, + { + "name": "andrewmacpherson", + "homepage": "https://www.drupal.org/user/265648" } ], "description": "Migrate Development Tools", "homepage": "https://www.drupal.org/project/migrate_devel", "support": { - "source": "http://cgit.drupalcode.org/migrate_devel" - }, - "time": "2017-06-25T23:46:13+00:00" + "source": "https://git.drupalcode.org/project/migrate_devel", + "issues": "https://www.drupal.org/project/issues/migrate_devel" + } }, { "name": "drupal/migrate_plus", @@ -13323,16 +13342,15 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/migrate_devel": 20, "drupal/smtp": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.0.8" + "php": ">=7.3" }, "platform-dev": [], "platform-overrides": { - "php": "7.0.8" + "php": "7.3" } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index cb7b118b13..1940910d4a 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -6241,31 +6241,42 @@ }, { "name": "drupal/migrate_devel", - "version": "dev-1.x", - "version_normalized": "dev-1.x", + "version": "2.0.0-alpha2", + "version_normalized": "2.0.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_devel.git", - "reference": "d56b84fe79621199305f36c707bbb5d209ee1b6b" + "reference": "8.x-2.0-alpha2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/migrate_devel-8.x-2.0-alpha2.zip", + "reference": "8.x-2.0-alpha2", + "shasum": "8ea8a10d8238c0a52abc7b12d688414e024999c8" }, "require": { - "drupal/core": "*" + "drupal/core": "^8 || ^9" + }, + "conflict": { + "drush/drush": "<9" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.x-dev", - "datestamp": "1498434542", + "version": "8.x-2.0-alpha2", + "datestamp": "1593367363", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Alpha releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" } } }, - "installation-source": "source", + "installation-source": "dist", "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0-or-later" @@ -6274,12 +6285,21 @@ { "name": "Derimagia", "homepage": "https://www.drupal.org/user/819640" + }, + { + "name": "aczietlow", + "homepage": "https://www.drupal.org/user/1616656" + }, + { + "name": "andrewmacpherson", + "homepage": "https://www.drupal.org/user/265648" } ], "description": "Migrate Development Tools", "homepage": "https://www.drupal.org/project/migrate_devel", "support": { - "source": "http://cgit.drupalcode.org/migrate_devel" + "source": "https://git.drupalcode.org/project/migrate_devel", + "issues": "https://www.drupal.org/project/issues/migrate_devel" } }, { diff --git a/web/modules/migrate_devel/LICENSE.txt b/web/modules/migrate_devel/LICENSE.txt new file mode 100644 index 0000000000..d159169d10 --- /dev/null +++ b/web/modules/migrate_devel/LICENSE.txt @@ -0,0 +1,339 @@ + 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/web/modules/migrate_devel/README.md b/web/modules/migrate_devel/README.md index 8a870567a1..6a572514af 100644 --- a/web/modules/migrate_devel/README.md +++ b/web/modules/migrate_devel/README.md @@ -1,23 +1,66 @@ -# Migrate Devel +CONTENTS OF THIS FILE +--------------------- -Adds new options to `drush migrate-import` which -allows developers to debug their migrations. + * Introduction + * Requirements + * Recommended modules + * Installation + * Configuration + * Maintainers -`drush migrate-import` comes from either the -[migrate_tools](https://www.drupal.org/project/migrate_tools) or the -[migrate_run](https://www.drupal.org/project/migrate_run) modules. -Currently uses Kint (from devel) directly to print out debug information -instead of devel in order to take advantage of -cli coloring and named variable debugging. +INTRODUCTION +------------ + +The Migrate Devel module adds utilities to help out developers when creating +migrations. + + * For a full description of the module, visit the project page: + https://drupal.org/project/migrate_devel + + * To submit bug reports and feature suggestions, or to track changes: + https://drupal.org/project/issues/migrate_devel + + +RECOMMENDED MODULES +------------------- + + * [migrate_tools](https://www.drupal.org/project/migrate_tools) + * [migrate_run](https://www.drupal.org/project/migrate_run) + * [config_update](https://www.drupal.org/project/config_update) + * [migrate_plus](https://www.drupal.org/project/migrate_plus) + + +INSTALLATION +------------ + + * Install as you would normally install a contributed Drupal module. Visit: + https://www.drupal.org/node/1897420 for further information. + + +CONFIGURATION +------------- Options are: -* `--migrate-debug` - Prints out rows as they run. -Can be used in `migrate-import` or `migrate-status` and will revert -existing migrations to the default and clear the cache for them. -This requires [config_update](https://www.drupal.org/project/config_update) -if you use [migrate_plus](https://www.drupal.org/project/migrate_plus) -because migrations go into config. +* `--migrate-debug` - Prints out rows as they run. + Can be used in `migrate-import` or `migrate-status` and will revert + existing migrations to the default and clear the cache for them. + This requires [config_update](https://www.drupal.org/project/config_update) + if you use [migrate_plus](https://www.drupal.org/project/migrate_plus) + because migrations go into config. * `--migrate-debug-pre` - Same as above before the process is run on the row. -Can be used in `migrate-import`. + Can be used in `migrate-import`. + + +MAINTAINERS +----------- + +Current maintainers: + * [Andrew Macpherson)](https://www.drupal.org/u/andrewmacpherson) + +Former maintainers: + * [Dave Wikoff (Derimagia)](https://www.drupal.org/u/derimagia) + +This project is sponsored by: + * [Mindgrub Technologies](https://www.drupal.org/mindgrub-technologies) - Derimagia's work on the 8.x-1.x branch. diff --git a/web/modules/migrate_devel/composer.json b/web/modules/migrate_devel/composer.json new file mode 100644 index 0000000000..09c1f6f128 --- /dev/null +++ b/web/modules/migrate_devel/composer.json @@ -0,0 +1,19 @@ +{ + "name": "drupal/migrate_devel", + "type": "drupal-module", + "description": "Migrate Development Tools", + "homepage": "https://www.drupal.org/project/migrate_devel", + "support": { + "issues": "https://www.drupal.org/project/issues/migrate_devel" + }, + "conflict": { + "drush/drush": "<9" + }, + "extra": { + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + } +} diff --git a/web/modules/migrate_devel/drush.services.yml b/web/modules/migrate_devel/drush.services.yml new file mode 100644 index 0000000000..43a02a1e98 --- /dev/null +++ b/web/modules/migrate_devel/drush.services.yml @@ -0,0 +1,5 @@ +services: + migrate_devel.commands: + class: \Drupal\migrate_devel\Commands\MigrateDevelCommands + tags: + - { name: drush.command } diff --git a/web/modules/migrate_devel/migrate_devel.drush.inc b/web/modules/migrate_devel/migrate_devel.drush.inc index 2d686c3a3a..8f446ed639 100644 --- a/web/modules/migrate_devel/migrate_devel.drush.inc +++ b/web/modules/migrate_devel/migrate_devel.drush.inc @@ -14,11 +14,6 @@ * Implements hook_drush_help_alter(). */ function migrate_devel_drush_help_alter(&$command) { - if ($command['command'] === 'migrate-import') { - $command['options']['migrate-debug'] = 'Enable Debug Mode'; - $command['options']['migrate-debug-pre'] = 'Enable Debug Mode (Before Row Save)'; - } - if ($command['command'] === 'migrate-status') { $command['options']['migrate-debug'] = 'Enable Debug Mode'; } diff --git a/web/modules/migrate_devel/migrate_devel.info.yml b/web/modules/migrate_devel/migrate_devel.info.yml index b9a03e3b13..6e8cbc08c2 100644 --- a/web/modules/migrate_devel/migrate_devel.info.yml +++ b/web/modules/migrate_devel/migrate_devel.info.yml @@ -3,7 +3,11 @@ description: Migrate Development Tools package: Migrate type: module core: 8.x +core_version_requirement: ^8 || ^9 dependencies: - - drupal:devel - drupal:migrate - - drupal:kint + +# Information added by Drupal.org packaging script on 2020-06-28 +version: '8.x-2.0-alpha2' +project: 'migrate_devel' +datestamp: 1593367365 diff --git a/web/modules/migrate_devel/src/Commands/MigrateDevelCommands.php b/web/modules/migrate_devel/src/Commands/MigrateDevelCommands.php new file mode 100644 index 0000000000..ad5b6e1722 --- /dev/null +++ b/web/modules/migrate_devel/src/Commands/MigrateDevelCommands.php @@ -0,0 +1,26 @@ +<?php + +namespace Drupal\migrate_devel\Commands; + +use Consolidation\AnnotatedCommand\CommandData; +use Drush\Commands\DrushCommands; + +/** + * Extends migrate commands with debugging options. + */ +class MigrateDevelCommands extends DrushCommands { + + /** + * Register two new options for the migrate:import command. + * + * @hook command migrate:import + * @option migrate-debug Enable Debug Mode + * @option migrate-debug-pre Enable Debug Mode (Before Row Save) + */ + public function additionalOptionsMigrateImport(CommandData $commandData) + { + // No action required here. The new options will be examined in the + // migrate event subscriber methods. + } + +} diff --git a/web/modules/migrate_devel/src/EventSubscriber/MigrationEventSubscriber.php b/web/modules/migrate_devel/src/EventSubscriber/MigrationEventSubscriber.php index 588ef44ff2..e6e4271ef2 100644 --- a/web/modules/migrate_devel/src/EventSubscriber/MigrationEventSubscriber.php +++ b/web/modules/migrate_devel/src/EventSubscriber/MigrationEventSubscriber.php @@ -21,17 +21,30 @@ class MigrationEventSubscriber implements EventSubscriberInterface { * Pre-Row-Save Migrate Event. */ public function debugRowPreSave(MigratePreRowSaveEvent $event) { + if (PHP_SAPI !== 'cli') { + return; + } + $row = $event->getRow(); - $using_drush = function_exists('drush_get_option'); - if ($using_drush && drush_get_option('migrate-debug-pre')) { + if (in_array('migrate-debug-pre', \Drush\Drush::config()->get('runtime.options'))) { // Start with capital letter for variables since this is actually a label. $Source = $row->getSource(); $Destination = $row->getDestination(); - // We use kint directly here since we want to support variable naming. - kint_require(); - \Kint::dump($Source, $Destination); + // Uses Symfony VarDumper. + // @todo Explore advanced usage of CLI dumper class for nicer output. + // https://www.drupal.org/project/migrate_devel/issues/3151276 + dump( + '---------------------------------------------------------------------', + '| $Source |', + '---------------------------------------------------------------------', + $Source, + '---------------------------------------------------------------------', + '| $Destination |', + '---------------------------------------------------------------------', + $Destination + ); } } @@ -42,18 +55,36 @@ public function debugRowPreSave(MigratePreRowSaveEvent $event) { * Post-Row-Save Migrate Event. */ public function debugRowPostSave(MigratePostRowSaveEvent $event) { + if (PHP_SAPI !== 'cli') { + return; + } + $row = $event->getRow(); - $using_drush = function_exists('drush_get_option'); - if ($using_drush && drush_get_option('migrate-debug')) { + if (in_array('migrate-debug', \Drush\Drush::config()->get('runtime.options'))) { + // Start with capital letter for variables since this is actually a label. $Source = $row->getSource(); $Destination = $row->getDestination(); $DestinationIDValues = $event->getDestinationIdValues(); - // We use kint directly here since we want to support variable naming. - kint_require(); - \Kint::dump($Source, $Destination, $DestinationIDValues); + // Uses Symfony VarDumper. + // @todo Explore advanced usage of CLI dumper class for nicer output. + // https://www.drupal.org/project/migrate_devel/issues/3151276 + dump( + '---------------------------------------------------------------------', + '| $Source |', + '---------------------------------------------------------------------', + $Source, + '---------------------------------------------------------------------', + '| $Destination |', + '---------------------------------------------------------------------', + $Destination, + '---------------------------------------------------------------------', + '| $DestinationIdValues |', + '---------------------------------------------------------------------', + $DestinationIDValues + ); } } -- GitLab