From 23ca7ac47f2f11ff5a54ad28160a952f915d2159 Mon Sep 17 00:00:00 2001 From: bcweaver <brianweaver@gmail.com> Date: Tue, 23 Oct 2018 17:31:24 -0400 Subject: [PATCH] Removing unused 'simple_block' package --- composer.json | 1 - composer.lock | 50 +-- vendor/composer/installed.json | 49 --- web/modules/simple_block/LICENSE.txt | 339 ------------------ web/modules/simple_block/README.txt | 40 --- .../config/schema/simple_block.schema.yml | 22 -- .../simple_block/simple_block.info.yml | 14 - .../simple_block.links.action.yml | 6 - .../simple_block.links.contextual.yml | 10 - .../simple_block/simple_block.links.task.yml | 4 - .../simple_block/simple_block.routing.yml | 31 -- .../simple_block/src/Entity/SimpleBlock.php | 97 ----- .../src/Plugin/Block/SimpleBlockBlock.php | 82 ----- .../src/Plugin/Derivative/SimpleBlock.php | 57 --- .../src/SimpleBlockAccessControlHandler.php | 24 -- .../simple_block/src/SimpleBlockEditForm.php | 70 ---- .../simple_block/src/SimpleBlockInterface.php | 18 - .../src/SimpleBlockListBuilder.php | 48 --- .../src/Tests/SimpleBlockTest.php | 29 -- .../install/simple_block.simple_block.foo.yml | 7 - .../simple_block_test.info.yml | 14 - 21 files changed, 1 insertion(+), 1011 deletions(-) delete mode 100644 web/modules/simple_block/LICENSE.txt delete mode 100644 web/modules/simple_block/README.txt delete mode 100644 web/modules/simple_block/config/schema/simple_block.schema.yml delete mode 100644 web/modules/simple_block/simple_block.info.yml delete mode 100644 web/modules/simple_block/simple_block.links.action.yml delete mode 100644 web/modules/simple_block/simple_block.links.contextual.yml delete mode 100644 web/modules/simple_block/simple_block.links.task.yml delete mode 100644 web/modules/simple_block/simple_block.routing.yml delete mode 100644 web/modules/simple_block/src/Entity/SimpleBlock.php delete mode 100644 web/modules/simple_block/src/Plugin/Block/SimpleBlockBlock.php delete mode 100644 web/modules/simple_block/src/Plugin/Derivative/SimpleBlock.php delete mode 100644 web/modules/simple_block/src/SimpleBlockAccessControlHandler.php delete mode 100644 web/modules/simple_block/src/SimpleBlockEditForm.php delete mode 100644 web/modules/simple_block/src/SimpleBlockInterface.php delete mode 100644 web/modules/simple_block/src/SimpleBlockListBuilder.php delete mode 100644 web/modules/simple_block/src/Tests/SimpleBlockTest.php delete mode 100644 web/modules/simple_block/tests/modules/simple_block_test/config/install/simple_block.simple_block.foo.yml delete mode 100644 web/modules/simple_block/tests/modules/simple_block_test/simple_block_test.info.yml diff --git a/composer.json b/composer.json index cf1b2ab23f..030aa6d042 100644 --- a/composer.json +++ b/composer.json @@ -131,7 +131,6 @@ "drupal/search_api": "1.1", "drupal/search_api_db": "1.1", "drupal/search_api_glossary": "3.4", - "drupal/simple_block": "^1.0@beta", "drupal/simple_gmap": "1.3", "drupal/simple_megamenu": "1.0-beta3", "drupal/simplesamlphp_auth": "3.0", diff --git a/composer.lock b/composer.lock index bfa4386cfe..264a791190 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": "9ec01e498db1065a5b2a2dbcf4ec56af", + "content-hash": "4ffcf7c711c2fbff172498426a100802", "packages": [ { "name": "alchemy/zippy", @@ -5524,53 +5524,6 @@ "source": "http://cgit.drupalcode.org/search_api_glossary" } }, - { - "name": "drupal/simple_block", - "version": "1.0.0-beta1", - "source": { - "type": "git", - "url": "https://git.drupal.org/project/simple_block", - "reference": "8.x-1.0-beta1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_block-8.x-1.0-beta1.zip", - "reference": "8.x-1.0-beta1", - "shasum": "3a3555e580993ee1600b6e2eb01ab481ff8d9caa" - }, - "require": { - "drupal/core": "*" - }, - "type": "drupal-module", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, - "drupal": { - "version": "8.x-1.0-beta1", - "datestamp": "1485418683", - "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "claudiu.cristea", - "homepage": "https://www.drupal.org/user/56348" - } - ], - "description": "Provides simple title/content custom blocks stored as config entities and not as content entities.", - "homepage": "https://www.drupal.org/project/simple_block", - "support": { - "source": "http://cgit.drupalcode.org/simple_block" - } - }, { "name": "drupal/simple_gmap", "version": "1.3.0", @@ -10595,7 +10548,6 @@ "minimum-stability": "dev", "stability-flags": { "drupal/roleassign": 15, - "drupal/simple_block": 10, "drupal/views_bootstrap": 20 }, "prefer-stable": true, diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4ab5756026..2fa4dc7a0f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -5696,55 +5696,6 @@ "source": "http://cgit.drupalcode.org/search_api_glossary" } }, - { - "name": "drupal/simple_block", - "version": "1.0.0-beta1", - "version_normalized": "1.0.0.0-beta1", - "source": { - "type": "git", - "url": "https://git.drupal.org/project/simple_block", - "reference": "8.x-1.0-beta1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_block-8.x-1.0-beta1.zip", - "reference": "8.x-1.0-beta1", - "shasum": "3a3555e580993ee1600b6e2eb01ab481ff8d9caa" - }, - "require": { - "drupal/core": "*" - }, - "type": "drupal-module", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, - "drupal": { - "version": "8.x-1.0-beta1", - "datestamp": "1485418683", - "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" - } - } - }, - "installation-source": "dist", - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "claudiu.cristea", - "homepage": "https://www.drupal.org/user/56348" - } - ], - "description": "Provides simple title/content custom blocks stored as config entities and not as content entities.", - "homepage": "https://www.drupal.org/project/simple_block", - "support": { - "source": "http://cgit.drupalcode.org/simple_block" - } - }, { "name": "drupal/simple_gmap", "version": "1.3.0", diff --git a/web/modules/simple_block/LICENSE.txt b/web/modules/simple_block/LICENSE.txt deleted file mode 100644 index d159169d10..0000000000 --- a/web/modules/simple_block/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - 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/simple_block/README.txt b/web/modules/simple_block/README.txt deleted file mode 100644 index e02c118032..0000000000 --- a/web/modules/simple_block/README.txt +++ /dev/null @@ -1,40 +0,0 @@ -Description -=========== - -Missing the Drupal 7 simple blocks that were so easy to export with FE Block -(fe_block) module? Here's Simple Block, a module that lets you define simple -exportable blocks that have only a title and a formatted text. Each block is -identified by an unique user configurable machine name string. - -Unlike the core Block Content (block_content), this module stores the blocks as -config entities making the import/export trivial. - -Usage -===== - -1. Provide Default Blocks. - - Just add the blocks as YAMLs in your module config/install. - Example (simple_block.simple_block.foo.yml): - - langcode: en - status: true - id: foo - title: 'The foo block' - content: - value: 'Just a simple block...' - format: plain_text - -2. Export Blocks - - Use the 'config' module to export blocks as config entities from the - interface, at /admin/config/development/configuration/single/export. - -3. Add/Edit/Delete Blocks - - Go to /admin/structure/block/simple-block and use the provided UI. - -Author -====== - -Claudiu Cristea | https://www.drupal.org/u/claudiu.cristea diff --git a/web/modules/simple_block/config/schema/simple_block.schema.yml b/web/modules/simple_block/config/schema/simple_block.schema.yml deleted file mode 100644 index 187caf9fb3..0000000000 --- a/web/modules/simple_block/config/schema/simple_block.schema.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Schema for the configuration files of the Simple Block module. - -simple_block.*: - type: config_entity - label: 'Simple block' - mapping: - id: - type: string - label: 'ID' - title: - type: string - label: 'Title' - content: - type: mapping - label: 'Content' - mapping: - value: - type: string - label: 'Text' - format: - type: string - label: 'Format' diff --git a/web/modules/simple_block/simple_block.info.yml b/web/modules/simple_block/simple_block.info.yml deleted file mode 100644 index d48b84f832..0000000000 --- a/web/modules/simple_block/simple_block.info.yml +++ /dev/null @@ -1,14 +0,0 @@ -type: module -name: 'Simple Block' -description: 'Provides simple title/content custom blocks stored as config entities and not as content entities.' -# core: 8.x -# version: VERSION -dependencies: - - block - - -# Information added by Drupal.org packaging script on 2017-01-26 -version: '8.x-1.0-beta1' -core: '8.x' -project: 'simple_block' -datestamp: 1485418688 diff --git a/web/modules/simple_block/simple_block.links.action.yml b/web/modules/simple_block/simple_block.links.action.yml deleted file mode 100644 index 40f86e28f7..0000000000 --- a/web/modules/simple_block/simple_block.links.action.yml +++ /dev/null @@ -1,6 +0,0 @@ -simple_block.form_add: - route_name: simple_block.form_add - title: 'Add simple block' - weight: 1 - appears_on: - - entity.simple_block.collection diff --git a/web/modules/simple_block/simple_block.links.contextual.yml b/web/modules/simple_block/simple_block.links.contextual.yml deleted file mode 100644 index 1d8caca977..0000000000 --- a/web/modules/simple_block/simple_block.links.contextual.yml +++ /dev/null @@ -1,10 +0,0 @@ -simple_block.block_edit: - title: 'Edit' - group: 'simple_block' - route_name: 'entity.simple_block.edit_form' - -simple_block.block_delete: - title: 'Delete' - group: 'simple_block' - route_name: 'entity.simple_block.delete_form' - weight: 1 diff --git a/web/modules/simple_block/simple_block.links.task.yml b/web/modules/simple_block/simple_block.links.task.yml deleted file mode 100644 index a58ebaa216..0000000000 --- a/web/modules/simple_block/simple_block.links.task.yml +++ /dev/null @@ -1,4 +0,0 @@ -entity.simple_block.collection: - title: 'Simple blocks' - base_route: block.admin_display - route_name: entity.simple_block.collection diff --git a/web/modules/simple_block/simple_block.routing.yml b/web/modules/simple_block/simple_block.routing.yml deleted file mode 100644 index dda8142cfd..0000000000 --- a/web/modules/simple_block/simple_block.routing.yml +++ /dev/null @@ -1,31 +0,0 @@ -entity.simple_block.collection: - path: '/admin/structure/block/simple-block' - defaults: - _entity_list: 'simple_block' - _title: 'Simple blocks' - requirements: - _permission: 'administer blocks' - -entity.simple_block.edit_form: - path: '/admin/structure/block/simple-block/manage/{simple_block}/edit' - defaults: - _entity_form: 'simple_block.edit' - _title: 'Edit simple block' - requirements: - _entity_access: 'simple_block.update' - -simple_block.form_add: - path: '/admin/structure/block/simple-block/add' - defaults: - _entity_form: 'simple_block.add' - _title: 'Add simple block' - requirements: - _permission: 'administer blocks' - -entity.simple_block.delete_form: - path: '/admin/structure/block/simple-block/manage/{simple_block}/delete' - defaults: - _entity_form: 'simple_block.delete' - _title: 'Delete' - requirements: - _entity_access: 'simple_block.delete' diff --git a/web/modules/simple_block/src/Entity/SimpleBlock.php b/web/modules/simple_block/src/Entity/SimpleBlock.php deleted file mode 100644 index e1efe7cb1c..0000000000 --- a/web/modules/simple_block/src/Entity/SimpleBlock.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php - -namespace Drupal\simple_block\Entity; - -use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\filter\Entity\FilterFormat; -use Drupal\simple_block\SimpleBlockInterface; - -/** - * Defines the block config configuration entity. - * - * @ConfigEntityType( - * id = "simple_block", - * label = @Translation("Simple block"), - * config_prefix = "simple_block", - * entity_keys = { - * "id" = "id", - * "label" = "title" - * }, - * handlers = { - * "access" = "Drupal\simple_block\SimpleBlockAccessControlHandler", - * "list_builder" = "Drupal\simple_block\SimpleBlockListBuilder", - * "form" = { - * "add" = "Drupal\simple_block\SimpleBlockEditForm", - * "edit" = "Drupal\simple_block\SimpleBlockEditForm", - * "delete" = "Drupal\Core\Entity\EntityDeleteForm" - * } - * }, - * links = { - * "collection" = "/admin/structure/block/simple-block", - * "canonical" = "/admin/structure/block/simple-block/manage/{simple_block}", - * "edit-form" = "/admin/structure/block/simple-block/manage/{simple_block}/edit", - * "delete-form" = "/admin/structure/block/simple-block/manage/{simple_block}/delete", - * }, - * config_export = { - * "id", - * "title", - * "content" - * } - * ) - */ -class SimpleBlock extends ConfigEntityBase implements SimpleBlockInterface { - - /** - * The block ID. - * - * @var string - */ - protected $id; - - /** - * The block title. - * - * @var string - */ - protected $title; - - /** - * The block content. - * - * Have 'value' and 'format' as keys. - * - * @var string[] - */ - protected $content; - - /** - * {@inheritdoc} - */ - public function getContent() { - return $this->content; - } - - /** - * {@inheritdoc} - */ - public function calculateDependencies() { - parent::calculateDependencies(); - if (!empty($format_id = $this->getContent()['format'])) { - if ($format = FilterFormat::load($format_id)) { - $this->addDependency($format->getConfigDependencyKey(), $format->getConfigDependencyName()); - } - } - return $this; - } - - /** - * {@inheritdoc} - */ - public function postSave(EntityStorageInterface $storage, $update = TRUE) { - parent::postSave($storage, $update); - // Invalidate the block cache to update custom block-based derivatives. - \Drupal::service('plugin.manager.block')->clearCachedDefinitions(); - } - -} diff --git a/web/modules/simple_block/src/Plugin/Block/SimpleBlockBlock.php b/web/modules/simple_block/src/Plugin/Block/SimpleBlockBlock.php deleted file mode 100644 index c7c76c0d58..0000000000 --- a/web/modules/simple_block/src/Plugin/Block/SimpleBlockBlock.php +++ /dev/null @@ -1,82 +0,0 @@ -<?php - -namespace Drupal\simple_block\Plugin\Block; - -use Drupal\Core\Cache\Cache; -use Drupal\filter\Entity\FilterFormat; -use Drupal\simple_block\Entity\SimpleBlock; -use Drupal\Core\Block\BlockBase; -use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; - -/** - * Defines a generic custom block config type. - * - * @Block( - * id = "simple_block", - * admin_label = @Translation("Simple custom block"), - * category = @Translation("Simple"), - * deriver = "Drupal\simple_block\Plugin\Derivative\SimpleBlock" - * ) - */ -class SimpleBlockBlock extends BlockBase implements ContainerFactoryPluginInterface { - - /** - * {@inheritdoc} - */ - public function label() { - return SimpleBlock::load($this->getDerivativeId())->label(); - } - - /** - * {@inheritdoc} - */ - public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { - return new static( - $configuration, - $plugin_id, - $plugin_definition - ); - } - - /** - * {@inheritdoc} - */ - public function build() { - $build = []; - /** @var \Drupal\simple_block\Entity\SimpleBlock $simple_block */ - if ($simple_block = SimpleBlock::load($this->getDerivativeId())) { - $content = $simple_block->getContent(); - $build = [ - '#type' => 'processed_text', - '#text' => $content['value'], - '#format' => $content['format'], - '#contextual_links' => [ - 'simple_block' => [ - 'route_parameters' => ['simple_block' => $simple_block->id()], - ], - ], - - ]; - } - return $build; - } - - /** - * {@inheritdoc} - */ - public function getCacheTags() { - $cache_tags = parent::getCacheTags(); - /** @var \Drupal\simple_block\Entity\SimpleBlock $simple_block */ - if ($simple_block = SimpleBlock::load($this->getDerivativeId())) { - $cache_tags = Cache::mergeTags($cache_tags, $simple_block->getCacheTags()); - if (!empty($format_id = $simple_block->getContent()['format'])) { - if ($format = FilterFormat::load($format_id)) { - $cache_tags = Cache::mergeTags($cache_tags, $format->getCacheTags()); - } - } - } - return $cache_tags; - } - -} diff --git a/web/modules/simple_block/src/Plugin/Derivative/SimpleBlock.php b/web/modules/simple_block/src/Plugin/Derivative/SimpleBlock.php deleted file mode 100644 index 71d76bc07e..0000000000 --- a/web/modules/simple_block/src/Plugin/Derivative/SimpleBlock.php +++ /dev/null @@ -1,57 +0,0 @@ -<?php - -namespace Drupal\simple_block\Plugin\Derivative; - -use Drupal\Component\Plugin\Derivative\DeriverBase; -use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; - -/** - * Retrieves block plugin definitions for all custom config blocks. - */ -class SimpleBlock extends DeriverBase implements ContainerDeriverInterface { - - /** - * The custom config block storage. - * - * @var \Drupal\Core\Entity\EntityStorageInterface - */ - protected $blockConfigStorage; - - /** - * Constructs a BlockContent object. - * - * @param \Drupal\Core\Entity\EntityStorageInterface $block_content_storage - * The custom block storage. - */ - public function __construct(EntityStorageInterface $block_content_storage) { - $this->blockConfigStorage = $block_content_storage; - } - - /** - * {@inheritdoc} - */ - public static function create(ContainerInterface $container, $base_plugin_id) { - $entity_type_manager = $container->get('entity_type.manager'); - return new static( - $entity_type_manager->getStorage('simple_block') - ); - } - - /** - * {@inheritdoc} - */ - public function getDerivativeDefinitions($base_plugin_definition) { - /** @var $simple_block \Drupal\simple_block\Entity\SimpleBlock */ - foreach ($this->blockConfigStorage->loadMultiple() as $simple_block) { - $this->derivatives[$simple_block->id()] = $base_plugin_definition; - $this->derivatives[$simple_block->id()]['admin_label'] = $simple_block->label(); - $this->derivatives[$simple_block->id()]['config_dependencies'][$simple_block->getConfigDependencyKey()] = [ - $simple_block->getConfigDependencyName() - ]; - } - return parent::getDerivativeDefinitions($base_plugin_definition); - } - -} diff --git a/web/modules/simple_block/src/SimpleBlockAccessControlHandler.php b/web/modules/simple_block/src/SimpleBlockAccessControlHandler.php deleted file mode 100644 index 7446d834b8..0000000000 --- a/web/modules/simple_block/src/SimpleBlockAccessControlHandler.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php - -namespace Drupal\simple_block; - -use Drupal\Core\Access\AccessResult; -use Drupal\Core\Entity\EntityAccessControlHandler; -use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Session\AccountInterface; - -/** - * Defines the access control handler for the simple block entity type. - * - * @see \Drupal\simple_block\Entity\SimpleBlock - */ -class SimpleBlockAccessControlHandler extends EntityAccessControlHandler { - - /** - * {@inheritdoc} - */ - protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) { - return AccessResult::allowedIf($account->hasPermission('administer blocks')); - } - -} diff --git a/web/modules/simple_block/src/SimpleBlockEditForm.php b/web/modules/simple_block/src/SimpleBlockEditForm.php deleted file mode 100644 index 0a88e1ab92..0000000000 --- a/web/modules/simple_block/src/SimpleBlockEditForm.php +++ /dev/null @@ -1,70 +0,0 @@ -<?php - -namespace Drupal\simple_block; - -use Drupal\Core\DependencyInjection\ContainerInjectionInterface; -use Drupal\simple_block\Entity\SimpleBlock; -use Drupal\Core\Entity\EntityForm; -use Drupal\Core\Entity\EntityTypeInterface; -use Drupal\Core\Form\ConfigFormBaseTrait; -use Drupal\Core\Form\FormStateInterface; - -/** - * Base form for simple block edit forms. - */ -class SimpleBlockEditForm extends EntityForm implements ContainerInjectionInterface { - - use ConfigFormBaseTrait; - - /** - * {@inheritdoc} - */ - protected function getEditableConfigNames() { - return ['simple_block.simple_block.' . $this->entity->id()]; - } - - /** - * {@inheritdoc} - */ - public function form(array $form, FormStateInterface $form_state) { - $form = parent::form($form, $form_state); - - /** @var \Drupal\simple_block\Entity\SimpleBlock $simple_block */ - $simple_block = $this->entity; - - $form['id'] = [ - '#type' => 'machine_name', - '#default_value' => $simple_block->id(), - '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH, - '#machine_name' => [ - 'exists' => SimpleBlock::class . '::load', - ], - '#disabled' => !$simple_block->isNew(), - ]; - $form['title'] = [ - '#type' => 'textfield', - '#title' => $this->t('Title'), - '#maxlength' => 255, - '#default_value' => $simple_block->label(), - '#description' => $this->t("The block title."), - '#required' => TRUE, - ]; - $form['content'] = array( - '#type' => 'text_format', - '#format' => $simple_block->getContent()['format'], - '#title' => $this->t('Block content'), - '#default_value' => $simple_block->getContent()['value'], - '#description' => $this->t("The block content."), - '#required' => TRUE, - ); - return $form; - } - - /** - * {@inheritdoc} - */ - public function save(array $form, FormStateInterface $form_state) { - $this->entity->save(); - } - -} diff --git a/web/modules/simple_block/src/SimpleBlockInterface.php b/web/modules/simple_block/src/SimpleBlockInterface.php deleted file mode 100644 index 23af9ca7f3..0000000000 --- a/web/modules/simple_block/src/SimpleBlockInterface.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php - -namespace Drupal\simple_block; - -/** - * Provides an interface defining a block config entity. - */ -interface SimpleBlockInterface { - - /** - * Returns the content of the block. - * - * @return string[] - * The content of the block. - */ - public function getContent(); - -} diff --git a/web/modules/simple_block/src/SimpleBlockListBuilder.php b/web/modules/simple_block/src/SimpleBlockListBuilder.php deleted file mode 100644 index 2ee4981cd4..0000000000 --- a/web/modules/simple_block/src/SimpleBlockListBuilder.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php - -namespace Drupal\simple_block; - -use Drupal\Core\Config\Entity\ConfigEntityListBuilder; -use Drupal\Core\Entity\EntityInterface; - -/** - * Defines a class to build a listing of simple blocks. - * - * @see \Drupal\simple_block\Entity\SimpleBlock - */ -class SimpleBlockListBuilder extends ConfigEntityListBuilder { - - /** - * {@inheritdoc} - */ - public function buildHeader() { - return [ - 'id' => $this->t('ID'), - 'block' => $this->t('Block description'), - - ] + parent::buildHeader(); - } - - /** - * {@inheritdoc} - */ - public function buildRow(EntityInterface $entity) { - return [ - 'id' => $entity->id(), - 'block' => $entity->label(), - ] + parent::buildRow($entity); - } - - /** - * {@inheritdoc} - */ - public function getDefaultOperations(EntityInterface $entity) { - $operations = parent::getDefaultOperations($entity); - if (isset($operations['edit'])) { - $operations['edit']['query']['destination'] = $entity->toUrl('collection') - ->toString(); - } - return $operations; - } - -} diff --git a/web/modules/simple_block/src/Tests/SimpleBlockTest.php b/web/modules/simple_block/src/Tests/SimpleBlockTest.php deleted file mode 100644 index f155e493b5..0000000000 --- a/web/modules/simple_block/src/Tests/SimpleBlockTest.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php - -namespace Drupal\simple_block\Tests; - -use Drupal\simpletest\WebTestBase; - -/** - * Tests Simple Block module. - * - * @group simple_block - */ -class SimpleBlockTest extends WebTestBase { - - /** - * {@inheritdoc} - */ - public static $modules = ['simple_block_test', 'simple_block', 'filter']; - - /** - * Tests if a block provided through a config entity is showed on the site. - */ - public function testBlockDisplay() { - $block = $this->drupalPlaceBlock('simple_block:foo'); - $this->drupalGet('<front>'); - $this->assertBlockAppears($block); - $this->assertText('Just a simple block...'); - } - -} diff --git a/web/modules/simple_block/tests/modules/simple_block_test/config/install/simple_block.simple_block.foo.yml b/web/modules/simple_block/tests/modules/simple_block_test/config/install/simple_block.simple_block.foo.yml deleted file mode 100644 index 4c86aaf708..0000000000 --- a/web/modules/simple_block/tests/modules/simple_block_test/config/install/simple_block.simple_block.foo.yml +++ /dev/null @@ -1,7 +0,0 @@ -langcode: en -status: true -id: foo -title: 'The foo block' -content: - value: 'Just a simple block...' - format: plain_text diff --git a/web/modules/simple_block/tests/modules/simple_block_test/simple_block_test.info.yml b/web/modules/simple_block/tests/modules/simple_block_test/simple_block_test.info.yml deleted file mode 100644 index 178db4a090..0000000000 --- a/web/modules/simple_block/tests/modules/simple_block_test/simple_block_test.info.yml +++ /dev/null @@ -1,14 +0,0 @@ -type: module -name: 'Simple Block Test' -description: 'Simple Block testing module.' -# core: 8.x -# version: VERSION -package: Testing -dependencies: - - simple_block - -# Information added by Drupal.org packaging script on 2017-01-26 -version: '8.x-1.0-beta1' -core: '8.x' -project: 'simple_block' -datestamp: 1485418688 -- GitLab