From 93cb2067fcb8f0b5f7d26593fa7eecf9885d5672 Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Tue, 23 Apr 2024 14:13:49 -0400
Subject: [PATCH] remove Allowed Formats module
---
composer.json | 1 -
composer.lock | 66 +---
vendor/composer/installed.json | 67 ----
vendor/composer/installed.php | 13 +-
web/modules/allowed_formats/LICENSE.txt | 339 ------------------
web/modules/allowed_formats/README.txt | 13 -
.../allowed_formats/allowed_formats.info.yml | 12 -
.../allowed_formats/allowed_formats.module | 139 -------
.../allowed_formats.post_update.php | 45 ---
web/modules/allowed_formats/composer.json | 37 --
.../config/schema/allowed_formats.schema.yml | 10 -
...lowed_formats_post_update_formats2core.php | 48 ---
.../src/Functional/Formats2CoreUpdateTest.php | 42 ---
13 files changed, 3 insertions(+), 829 deletions(-)
delete mode 100644 web/modules/allowed_formats/LICENSE.txt
delete mode 100644 web/modules/allowed_formats/README.txt
delete mode 100644 web/modules/allowed_formats/allowed_formats.info.yml
delete mode 100644 web/modules/allowed_formats/allowed_formats.module
delete mode 100644 web/modules/allowed_formats/allowed_formats.post_update.php
delete mode 100644 web/modules/allowed_formats/composer.json
delete mode 100644 web/modules/allowed_formats/config/schema/allowed_formats.schema.yml
delete mode 100644 web/modules/allowed_formats/tests/fixtures/update/allowed_formats_post_update_formats2core.php
delete mode 100644 web/modules/allowed_formats/tests/src/Functional/Formats2CoreUpdateTest.php
diff --git a/composer.json b/composer.json
index e6d351d701..9bd3b613f3 100644
--- a/composer.json
+++ b/composer.json
@@ -95,7 +95,6 @@
"drupal/admin_toolbar": "3.4.2",
"drupal/adminimal_theme": "^1.7",
"drupal/administerusersbyrole": "3.4",
- "drupal/allowed_formats": "3.0",
"drupal/anchor_link": "^3.0@alpha",
"drupal/better_exposed_filters": "6.0.5",
"drupal/block_field": "1.0.0-rc4",
diff --git a/composer.lock b/composer.lock
index 9d71aa2377..dcdf31b487 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": "b9ceb162827c3271a903ef5eb6c1e303",
+ "content-hash": "e6b5ddd8784d5c7f09756211c8671c07",
"packages": [
{
"name": "asm89/stack-cors",
@@ -1521,70 +1521,6 @@
"source": "https://git.drupalcode.org/project/administerusersbyrole"
}
},
- {
- "name": "drupal/allowed_formats",
- "version": "3.0.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/allowed_formats.git",
- "reference": "3.0.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/allowed_formats-3.0.0.zip",
- "reference": "3.0.0",
- "shasum": "1dad855db0e12fa3cdef8ca4e3bfc98f89090490"
- },
- "require": {
- "drupal/core": "^10.1"
- },
- "conflict": {
- "drupal/core": "<10.1.0"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "3.0.0",
- "datestamp": "1693983469",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Northern Commerce (formerly Digital Echidna)",
- "homepage": "https://www.drupal.org/northern-commerce-formerly-digital-echidna",
- "role": "Supporting organization"
- },
- {
- "name": "Jordan Thompson (nord102)",
- "homepage": "https://www.drupal.org/u/nord102",
- "role": "Maintainer"
- },
- {
- "name": "Wunder",
- "homepage": "https://www.drupal.org/wunder",
- "role": "Supporting organization"
- },
- {
- "name": "Florian Loretan (floretan)",
- "homepage": "https://www.drupal.org/u/floretan",
- "role": "Maintainer"
- }
- ],
- "description": "Hides info about the selected text format. The 'allowed formats' functionality has been moved to core since Drupal 10.1.0.",
- "homepage": "https://www.drupal.org/project/allowed_formats",
- "support": {
- "source": "http://cgit.drupalcode.org/allowed_formats",
- "issues": "https://www.drupal.org/project/issues/allowed_formats"
- }
- },
{
"name": "drupal/anchor_link",
"version": "3.0.0-alpha2",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a33235a000..5abbe55c58 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1595,73 +1595,6 @@
},
"install-path": "../../web/modules/administerusersbyrole"
},
- {
- "name": "drupal/allowed_formats",
- "version": "3.0.0",
- "version_normalized": "3.0.0.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/allowed_formats.git",
- "reference": "3.0.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/allowed_formats-3.0.0.zip",
- "reference": "3.0.0",
- "shasum": "1dad855db0e12fa3cdef8ca4e3bfc98f89090490"
- },
- "require": {
- "drupal/core": "^10.1"
- },
- "conflict": {
- "drupal/core": "<10.1.0"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "3.0.0",
- "datestamp": "1693983469",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "installation-source": "dist",
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Northern Commerce (formerly Digital Echidna)",
- "homepage": "https://www.drupal.org/northern-commerce-formerly-digital-echidna",
- "role": "Supporting organization"
- },
- {
- "name": "Jordan Thompson (nord102)",
- "homepage": "https://www.drupal.org/u/nord102",
- "role": "Maintainer"
- },
- {
- "name": "Wunder",
- "homepage": "https://www.drupal.org/wunder",
- "role": "Supporting organization"
- },
- {
- "name": "Florian Loretan (floretan)",
- "homepage": "https://www.drupal.org/u/floretan",
- "role": "Maintainer"
- }
- ],
- "description": "Hides info about the selected text format. The 'allowed formats' functionality has been moved to core since Drupal 10.1.0.",
- "homepage": "https://www.drupal.org/project/allowed_formats",
- "support": {
- "source": "http://cgit.drupalcode.org/allowed_formats",
- "issues": "https://www.drupal.org/project/issues/allowed_formats"
- },
- "install-path": "../../web/modules/allowed_formats"
- },
{
"name": "drupal/anchor_link",
"version": "3.0.0-alpha2",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 15f671505a..8cbeaa6a04 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '9425655bedfe42a3671e0e52bb49f53135b5e2db',
+ 'reference' => '63d81711dabf421c2141b740a99bfef60d66bf48',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -253,15 +253,6 @@
'aliases' => array(),
'dev_requirement' => false,
),
- 'drupal/allowed_formats' => array(
- 'pretty_version' => '3.0.0',
- 'version' => '3.0.0.0',
- 'reference' => '3.0.0',
- 'type' => 'drupal-module',
- 'install_path' => __DIR__ . '/../../web/modules/allowed_formats',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
'drupal/anchor_link' => array(
'pretty_version' => '3.0.0-alpha2',
'version' => '3.0.0.0-alpha2',
@@ -1402,7 +1393,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '9425655bedfe42a3671e0e52bb49f53135b5e2db',
+ 'reference' => '63d81711dabf421c2141b740a99bfef60d66bf48',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/web/modules/allowed_formats/LICENSE.txt b/web/modules/allowed_formats/LICENSE.txt
deleted file mode 100644
index d159169d10..0000000000
--- a/web/modules/allowed_formats/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/allowed_formats/README.txt b/web/modules/allowed_formats/README.txt
deleted file mode 100644
index 9c7ab661ce..0000000000
--- a/web/modules/allowed_formats/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-IMPORTANT CHANGES IN 3.x BRANCH
--------------------------------
-
-* Since Drupal 10.1.0, limiting the text formats per field instance is a feature
- provided by Drupal core. Read https://www.drupal.org/node/3318572 for details.
-* In the 3.x branch of this module this feature has been removed as obsolete,
- but the module provide an update path from existing sites to move the allowed
- formats, as they were stored by the previous versions of the module, to Drupal
- >=10.1.0 way, in field settings.
-* The module provides also a feature that allows site builders to hide the
- formatted text format help and guidelines. Even this feature is still
- preserved in the 3.x module branch, there is an issue that aims to move it in
- Drupal core in the future. See https://www.drupal.org/i/3323007.
diff --git a/web/modules/allowed_formats/allowed_formats.info.yml b/web/modules/allowed_formats/allowed_formats.info.yml
deleted file mode 100644
index 6c7ed6f225..0000000000
--- a/web/modules/allowed_formats/allowed_formats.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Hide format info (former Allowed Formats)
-description: Hides info about the selected text format. The 'allowed formats' functionality has been moved in core since Drupal 10.1.0.
-type: module
-core_version_requirement: ^10.1
-dependencies:
- - drupal:field
- - drupal:filter
-
-# Information added by Drupal.org packaging script on 2023-09-06
-version: '3.0.0'
-project: 'allowed_formats'
-datestamp: 1693982789
diff --git a/web/modules/allowed_formats/allowed_formats.module b/web/modules/allowed_formats/allowed_formats.module
deleted file mode 100644
index e3e2c52a90..0000000000
--- a/web/modules/allowed_formats/allowed_formats.module
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * @file
- * This is the allowed_formats module.
- *
- * It enables limiting which text formats are available for each fields.
- */
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\WidgetInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\field\FieldConfigInterface;
-
-/**
- * Implements hook_field_widget_third_party_settings_form().
- */
-function allowed_formats_field_widget_third_party_settings_form(WidgetInterface $plugin, FieldDefinitionInterface $field_definition, $form_mode, $form, FormStateInterface $form_state) {
- if (in_array($field_definition->getType(), _allowed_formats_field_types())) {
- $element = [];
- $element['hide_help'] = [
- '#type' => 'checkbox',
- '#title' => t('Hide the help link <em>About text formats</em>.'),
- '#default_value' => $plugin->getThirdPartySetting('allowed_formats', 'hide_help'),
- ];
- $element['hide_guidelines'] = [
- '#type' => 'checkbox',
- '#title' => t('Hide text format guidelines.'),
- '#default_value' => $plugin->getThirdPartySetting('allowed_formats', 'hide_guidelines'),
- ];
-
- return $element;
- }
-}
-
-/**
- * Implements hook_field_widget_single_element_form_alter().
- */
-function allowed_formats_field_widget_single_element_form_alter(&$element, FormStateInterface $form_state, $context) {
- /** @var \Drupal\Core\Field\FieldDefinitionInterface $field_definition */
- $field_definition = $context['items']->getFieldDefinition();
-
- // We can't use the protected isDefaultValueWidget() method.
- $is_default_value_widget = (bool) $form_state->get('default_value_widget');
-
- if (in_array($field_definition->getType(), _allowed_formats_field_types()) && !$is_default_value_widget) {
- /** @var \Drupal\Core\Field\WidgetInterface $widget */
- $widget = $context['widget'];
- $element['#allowed_format_hide_settings'] = $widget->getThirdPartySettings('allowed_formats');
-
- if (count(array_filter($element['#allowed_format_hide_settings']))) {
- $element['#after_build'][] = '_allowed_formats_remove_textarea_help';
- }
- }
-}
-
-/**
- * The #after_build callback for text widgets.
- */
-function _allowed_formats_remove_textarea_help($form_element, FormStateInterface $form_state) {
- if (isset($form_element['format'])) {
- if ($form_element['#allowed_format_hide_settings']['hide_help']) {
- unset($form_element['format']['help']);
- }
- if ($form_element['#allowed_format_hide_settings']['hide_guidelines']) {
- unset($form_element['format']['guidelines']);
- }
-
- // If nothing is left in the wrapper, hide it as well.
- if (isset($form_element['#allowed_formats'])
- && count($form_element['#allowed_formats']) == 1
- && $form_element['#allowed_format_hide_settings']['hide_help']
- && $form_element['#allowed_format_hide_settings']['hide_guidelines']) {
- unset($form_element['format']['#type']);
- unset($form_element['format']['#theme_wrappers']);
- }
- }
-
- return $form_element;
-}
-
-/**
- * Define what field types we want to modify.
- *
- * @return array
- * Array of modifiable field types.
- */
-function _allowed_formats_field_types() {
- return ['text', 'text_long', 'text_with_summary'];
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave().
- */
-function allowed_formats_field_config_presave(FieldConfigInterface $field_config): void {
- // Ensure backwards compatibility for default configuration not converted yet
- // to Drupal 10.1.x.
- // @see https://www.drupal.org/node/3318572
- // @see https://www.drupal.org/project/allowed_formats/issues/3324446
- _allowed_formats_convert_formats2core($field_config);
-}
-
-/**
- * Converts allowed formats to Drupal 10.1.x.
- *
- * @param \Drupal\field\FieldConfigInterface $field_config
- * The field configuration entity.
- *
- * @return bool
- * Whether the field configuration has been changed.
- *
- * @see https://www.drupal.org/node/3318572
- */
-function _allowed_formats_convert_formats2core(FieldConfigInterface $field_config): bool {
- // Can't use $field_config->getThirdPartySettings() because that doesn't
- // reveal if allowed_formats module key exists. If the module key exists, even
- // if it's empty, we want to remove it.
- if (!array_key_exists('allowed_formats', $field_config->get('third_party_settings') ?? [])) {
- return FALSE;
- }
-
- $allowed_formats = $field_config->getThirdPartySetting('allowed_formats', 'allowed_formats', []);
- // On some installations it might be possible that earlier module versions
- // stored the formats as they are submitted from a checkbox list:
- // @code
- // ['format1' => '0', 'format2' => 'format2', 'format3' => '0']
- // @encode
- $allowed_formats = array_values(array_filter($allowed_formats));
- // At the time when the site builder updates this module, the allowed
- // format field setting, provided by core, might already contain data, but
- // that is irrelevant because the allowed formats provided by this module
- // takes precedence in the form. So, it's safe to override potential field
- // settings added via new Drupal >10.0.0 feature.
- $field_config
- ->setSetting('allowed_formats', $allowed_formats)
- ->unsetThirdPartySetting('allowed_formats', 'allowed_formats');
-
- return TRUE;
-}
diff --git a/web/modules/allowed_formats/allowed_formats.post_update.php b/web/modules/allowed_formats/allowed_formats.post_update.php
deleted file mode 100644
index e2e5ca5243..0000000000
--- a/web/modules/allowed_formats/allowed_formats.post_update.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Post update functions for Allowed Formats module.
- */
-
-use Drupal\Core\Config\Entity\ConfigEntityUpdater;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\FieldConfigInterface;
-
-/**
- * Updates existing configuration to store allowed_formats as sequence.
- */
-function allowed_formats_post_update_store_allowed_formats_as_sequence() {
- foreach (FieldConfig::loadMultiple() as $field_config) {
- /** @var \Drupal\field\Entity\FieldConfig $field_config */
- if (in_array($field_config->getType(), _allowed_formats_field_types(), TRUE)) {
- $allowed_formats = $field_config->getThirdPartySettings('allowed_formats');
- if (!empty($allowed_formats)) {
- // Don't do anything if the configuration is already a sequence.
- if (isset($allowed_formats['allowed_formats']) && is_array($allowed_formats['allowed_formats'])) {
- continue;
- }
- // Unset existing configuration.
- foreach ($allowed_formats as $key => $value) {
- $field_config->unsetThirdPartySetting('allowed_formats', $key);
- }
- $field_config->setThirdPartySetting('allowed_formats', 'allowed_formats', array_values(array_filter($allowed_formats)));
- $field_config->save();
- }
- }
- }
-
- return t('Allowed formats in field configuration has been updated.');
-}
-
-/**
- * Convert allowed formats to Drupal 10.1.x.
- */
-function allowed_formats_post_update_formats2core(?array &$sandbox = NULL): void {
- \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'field_config', function (FieldConfigInterface $field_config): bool {
- return _allowed_formats_convert_formats2core($field_config);
- });
-}
diff --git a/web/modules/allowed_formats/composer.json b/web/modules/allowed_formats/composer.json
deleted file mode 100644
index e65c61c02e..0000000000
--- a/web/modules/allowed_formats/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "drupal/allowed_formats",
- "description": "Hides info about the selected text format. The 'allowed formats' functionality has been moved to core since Drupal 10.1.0.",
- "type": "drupal-module",
- "homepage": "https://www.drupal.org/project/allowed_formats",
- "license": "GPL-2.0-or-later",
- "minimum-stability": "dev",
- "authors": [
- {
- "name": "Northern Commerce (formerly Digital Echidna)",
- "homepage": "https://www.drupal.org/northern-commerce-formerly-digital-echidna",
- "role": "Supporting organization"
- },
- {
- "name": "Jordan Thompson (nord102)",
- "homepage": "https://www.drupal.org/u/nord102",
- "role": "Maintainer"
- },
- {
- "name": "Wunder",
- "homepage": "https://www.drupal.org/wunder",
- "role": "Supporting organization"
- },
- {
- "name": "Florian Loretan (floretan)",
- "homepage": "https://www.drupal.org/u/floretan",
- "role": "Maintainer"
- }
- ],
- "support": {
- "issues": "https://www.drupal.org/project/issues/allowed_formats",
- "source": "http://cgit.drupalcode.org/allowed_formats"
- },
- "conflict": {
- "drupal/core": "<10.1.0"
- }
-}
diff --git a/web/modules/allowed_formats/config/schema/allowed_formats.schema.yml b/web/modules/allowed_formats/config/schema/allowed_formats.schema.yml
deleted file mode 100644
index 89901d5bb6..0000000000
--- a/web/modules/allowed_formats/config/schema/allowed_formats.schema.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-field.widget.third_party.allowed_formats:
- type: mapping
- label: Allowed formats
- mapping:
- hide_help:
- type: string
- label: 'Hide help'
- hide_guidelines:
- type: string
- label: 'Hide guidelines'
diff --git a/web/modules/allowed_formats/tests/fixtures/update/allowed_formats_post_update_formats2core.php b/web/modules/allowed_formats/tests/fixtures/update/allowed_formats_post_update_formats2core.php
deleted file mode 100644
index 9e67639c00..0000000000
--- a/web/modules/allowed_formats/tests/fixtures/update/allowed_formats_post_update_formats2core.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Fixtures to test config conversion to Drupal 10.1.
- *
- * @see \Drupal\Tests\allowed_formats\Functional\Formats2CoreUpdateTest::testFormats2Core()
- */
-
-use Drupal\Core\Database\Database;
-
-$db = Database::getConnection();
-
-// Enable allowed_formats module.
-$extensions = unserialize($db->select('config')
- ->fields('config', ['data'])
- ->condition('collection', '')
- ->condition('name', 'core.extension')
- ->execute()
- ->fetchField());
-$extensions['module']['allowed_formats'] = 0;
-$db->update('config')
- ->fields(['data' => serialize($extensions)])
- ->condition('collection', '')
- ->condition('name', 'core.extension')
- ->execute();
-
-// Limit formats for node.article.body.
-$field_config = unserialize($db->select('config')
- ->fields('config', ['data'])
- ->condition('collection', '')
- ->condition('name', 'field.field.node.article.body')
- ->execute()
- ->fetchField());
-$field_config['third_party_settings']['allowed_formats']['allowed_formats'] = [
- 'full_html',
- 'restricted_html',
-];
-// Also add allowed formats in the standard Drupal 10.1.x way, to test whether
-// they are properly overridden.
-$field_config['settings']['allowed_formats'] = [
- 'basic_html',
-];
-$db->update('config')
- ->fields(['data' => serialize($field_config)])
- ->condition('collection', '')
- ->condition('name', 'field.field.node.article.body')
- ->execute();
diff --git a/web/modules/allowed_formats/tests/src/Functional/Formats2CoreUpdateTest.php b/web/modules/allowed_formats/tests/src/Functional/Formats2CoreUpdateTest.php
deleted file mode 100644
index 546461179d..0000000000
--- a/web/modules/allowed_formats/tests/src/Functional/Formats2CoreUpdateTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\Tests\allowed_formats\Functional;
-
-use Drupal\FunctionalTests\Update\UpdatePathTestBase;
-
-/**
- * @group allowed_formats
- * @group legacy
- */
-class Formats2CoreUpdateTest extends UpdatePathTestBase {
-
- /**
- * {@inheritdoc}
- */
- protected function setDatabaseDumpFiles(): void {
- $this->databaseDumpFiles = [
- DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-9.4.0.filled.standard.php.gz',
- __DIR__ . '/../../fixtures/update/allowed_formats_post_update_formats2core.php',
- ];
- }
-
- /**
- * @covers \allowed_formats_post_update_formats2core
- */
- public function testFormats2Core(): void {
- $config = $this->config('field.field.node.article.body');
- // Check that, before update, allowed formats exist as 3rd-party settings.
- $this->assertSame(['full_html', 'restricted_html'], $config->get('third_party_settings.allowed_formats.allowed_formats'));
- // Check that, before update, allowed formats exist as field settings.
- $this->assertSame(['basic_html'], $config->get('settings.allowed_formats'));
-
- $this->runUpdates();
-
- $config = $this->config('field.field.node.article.body');
- // Check that, after update, allowed_formats 3rd-party settings are removed.
- $this->assertArrayNotHasKey('allowed_formats', $config->get('third_party_settings') ?? []);
- // Check that, after update, allowed formats were set from module settings.
- $this->assertSame(['full_html', 'restricted_html'], $config->get('settings.allowed_formats'));
- }
-
-}
--
GitLab