From fa8506e6ac262074da8c26560738f08e1541829d Mon Sep 17 00:00:00 2001 From: Svante Richter Date: Sun, 30 Oct 2016 10:47:35 +0100 Subject: [PATCH 1/2] Dual-license under GPL & LGPL To avoid a FOSS legal quagmire. --- LICENSE-lgpl | 165 ++++++++++++++++++ src/BoltForms.php | 9 +- src/Config/EmailConfig.php | 9 +- src/Config/FormConfig.php | 9 +- src/Config/FormConfigSection.php | 9 +- src/Controller/UploadManagement.php | 9 +- src/Database.php | 9 +- src/Email.php | 9 +- src/Event/BoltFormsCustomDataEvent.php | 9 +- src/Event/BoltFormsEvent.php | 9 +- src/Event/BoltFormsEvents.php | 9 +- src/Event/BoltFormsProcessorEvent.php | 9 +- src/FileUpload.php | 9 +- src/FormData.php | 9 +- src/Submission/Processor.php | 9 +- src/Submission/RedirectHandler.php | 9 +- .../BoltFormsCustomDataSubscriber.php | 9 +- src/Subscriber/BoltFormsSubscriber.php | 9 +- src/Twig/BoltFormsExtension.php | 9 +- 19 files changed, 255 insertions(+), 72 deletions(-) create mode 100644 LICENSE-lgpl diff --git a/LICENSE-lgpl b/LICENSE-lgpl new file mode 100644 index 0000000..65c5ca8 --- /dev/null +++ b/LICENSE-lgpl @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser 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 +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/src/BoltForms.php b/src/BoltForms.php index 790db46..63a35e1 100644 --- a/src/BoltForms.php +++ b/src/BoltForms.php @@ -14,9 +14,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -27,8 +27,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltForms { diff --git a/src/Config/EmailConfig.php b/src/Config/EmailConfig.php index 06a2567..0d3b2e9 100644 --- a/src/Config/EmailConfig.php +++ b/src/Config/EmailConfig.php @@ -10,9 +10,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -23,8 +23,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class EmailConfig implements \ArrayAccess { diff --git a/src/Config/FormConfig.php b/src/Config/FormConfig.php index 68d8a98..33dbee1 100644 --- a/src/Config/FormConfig.php +++ b/src/Config/FormConfig.php @@ -7,9 +7,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -20,8 +20,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class FormConfig { diff --git a/src/Config/FormConfigSection.php b/src/Config/FormConfigSection.php index 4cc3257..12dd76c 100644 --- a/src/Config/FormConfigSection.php +++ b/src/Config/FormConfigSection.php @@ -7,9 +7,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -20,8 +20,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 * * @method boolean getEnabled() * @method boolean getDebug() diff --git a/src/Controller/UploadManagement.php b/src/Controller/UploadManagement.php index 4bf27b4..8519336 100644 --- a/src/Controller/UploadManagement.php +++ b/src/Controller/UploadManagement.php @@ -15,9 +15,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -28,8 +28,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class UploadManagement implements ControllerProviderInterface { diff --git a/src/Database.php b/src/Database.php index 568d87c..a58a23d 100644 --- a/src/Database.php +++ b/src/Database.php @@ -10,9 +10,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -23,8 +23,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class Database { diff --git a/src/Email.php b/src/Email.php index 8c2d4e8..5b1a531 100644 --- a/src/Email.php +++ b/src/Email.php @@ -14,9 +14,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -27,8 +27,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class Email { diff --git a/src/Event/BoltFormsCustomDataEvent.php b/src/Event/BoltFormsCustomDataEvent.php index 377a7a8..1f4cebf 100644 --- a/src/Event/BoltFormsCustomDataEvent.php +++ b/src/Event/BoltFormsCustomDataEvent.php @@ -10,9 +10,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -23,8 +23,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsCustomDataEvent extends Event { diff --git a/src/Event/BoltFormsEvent.php b/src/Event/BoltFormsEvent.php index 54bed0a..2d0093e 100644 --- a/src/Event/BoltFormsEvent.php +++ b/src/Event/BoltFormsEvent.php @@ -11,9 +11,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -24,8 +24,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsEvent extends FormEvent { diff --git a/src/Event/BoltFormsEvents.php b/src/Event/BoltFormsEvents.php index 456e0b6..83ab517 100644 --- a/src/Event/BoltFormsEvents.php +++ b/src/Event/BoltFormsEvents.php @@ -8,9 +8,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -21,8 +21,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ final class BoltFormsEvents { diff --git a/src/Event/BoltFormsProcessorEvent.php b/src/Event/BoltFormsProcessorEvent.php index 7dc4968..24ea003 100644 --- a/src/Event/BoltFormsProcessorEvent.php +++ b/src/Event/BoltFormsProcessorEvent.php @@ -10,9 +10,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -23,8 +23,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsProcessorEvent extends Event { diff --git a/src/FileUpload.php b/src/FileUpload.php index 8232c2f..0f4b4a0 100644 --- a/src/FileUpload.php +++ b/src/FileUpload.php @@ -15,9 +15,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -28,8 +28,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class FileUpload { diff --git a/src/FormData.php b/src/FormData.php index f58c091..ef7ceab 100644 --- a/src/FormData.php +++ b/src/FormData.php @@ -8,9 +8,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -21,8 +21,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class FormData implements \ArrayAccess { diff --git a/src/Submission/Processor.php b/src/Submission/Processor.php index aec499a..9ee1ee5 100644 --- a/src/Submission/Processor.php +++ b/src/Submission/Processor.php @@ -20,9 +20,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -33,8 +33,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class Processor { diff --git a/src/Submission/RedirectHandler.php b/src/Submission/RedirectHandler.php index 7f2642b..232f7c0 100644 --- a/src/Submission/RedirectHandler.php +++ b/src/Submission/RedirectHandler.php @@ -14,9 +14,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -27,8 +27,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class RedirectHandler { diff --git a/src/Subscriber/BoltFormsCustomDataSubscriber.php b/src/Subscriber/BoltFormsCustomDataSubscriber.php index 9c07647..12a593b 100644 --- a/src/Subscriber/BoltFormsCustomDataSubscriber.php +++ b/src/Subscriber/BoltFormsCustomDataSubscriber.php @@ -13,9 +13,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -26,8 +26,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsCustomDataSubscriber implements EventSubscriberInterface { diff --git a/src/Subscriber/BoltFormsSubscriber.php b/src/Subscriber/BoltFormsSubscriber.php index bb997e4..8796214 100644 --- a/src/Subscriber/BoltFormsSubscriber.php +++ b/src/Subscriber/BoltFormsSubscriber.php @@ -15,9 +15,9 @@ * Copyright (C) 2014-2015 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -28,8 +28,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsSubscriber implements EventSubscriberInterface { diff --git a/src/Twig/BoltFormsExtension.php b/src/Twig/BoltFormsExtension.php index e95e617..49f4a05 100644 --- a/src/Twig/BoltFormsExtension.php +++ b/src/Twig/BoltFormsExtension.php @@ -16,9 +16,9 @@ * Copyright (C) 2014-2016 Gawain Lynch * * 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 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License or GNU Lesser + * General Public License as published by the Free Software Foundation, + * either version 3 of the Licenses, 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 @@ -29,8 +29,9 @@ * along with this program. If not, see . * * @author Gawain Lynch - * @copyright Copyright (c) 2014, Gawain Lynch + * @copyright Copyright (c) 2014-2016, Gawain Lynch * @license http://opensource.org/licenses/GPL-3.0 GNU Public License 3.0 + * @license http://opensource.org/licenses/LGPL-3.0 GNU Lesser General Public License 3.0 */ class BoltFormsExtension { From 0dd3de6887cd1d1a8b7f9edb74440fdbbf365885 Mon Sep 17 00:00:00 2001 From: Svante Richter Date: Sun, 30 Oct 2016 10:53:20 +0100 Subject: [PATCH 2/2] Update composer.json for new licensing --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5afd5a..85d0608 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,10 @@ "suggest": { "rossriley/formeditor": "A UI editor for form configuration." }, - "license": "GPL-3.0+", + "license": [ + "GPL-3.0+", + "LGPL-3.0+" + ], "authors": [ { "name": "Gawain Lynch",