mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-10-31 01:08:26 +00:00 
			
		
		
		
	Compare commits
	
		
			6 Commits
		
	
	
		
			425-rename
			...
			20-update-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | b4c8d4c240 | ||
|  | c9eaf3afac | ||
|  | 348f649fef | ||
|  | e449efc695 | ||
|  | c388f91e88 | ||
|  | 5f75b87621 | 
| @@ -82,6 +82,7 @@ | ||||
|             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle", | ||||
|             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle", | ||||
|             "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle", | ||||
|             "Chill\\FormTypesBundle\\": "src/Bundle/ChillFormTypesBundle/src", | ||||
|             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle", | ||||
|             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle", | ||||
|             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", | ||||
|   | ||||
							
								
								
									
										19
									
								
								src/Bundle/ChillFormTypesBundle/.editorconfig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								src/Bundle/ChillFormTypesBundle/.editorconfig
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | ||||
| ; top-most EditorConfig file | ||||
| root = true | ||||
|  | ||||
| ; Unix-style newlines | ||||
| [*] | ||||
| charset = utf-8 | ||||
| end_of_line = LF | ||||
| insert_final_newline = true | ||||
| trim_trailing_whitespace = true | ||||
|  | ||||
| [*.{php,html,twig}] | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
|  | ||||
| [*.md] | ||||
| max_line_length = 80 | ||||
|  | ||||
| [COMMIT_EDITMSG] | ||||
| max_line_length = 0 | ||||
							
								
								
									
										11
									
								
								src/Bundle/ChillFormTypesBundle/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								src/Bundle/ChillFormTypesBundle/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | ||||
| composer.lock | ||||
| vendor/* | ||||
| parameters.yml | ||||
| *~ | ||||
| *.DS_Store | ||||
| *.sass-cache | ||||
| Resources/node_modules/ | ||||
| Tests/Fixtures/App/app/config/parameters.yml | ||||
| /nbproject/private/ | ||||
| Resources/test/Fixtures/App/bootstrap.php.cache | ||||
|  | ||||
							
								
								
									
										661
									
								
								src/Bundle/ChillFormTypesBundle/LICENSE
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										661
									
								
								src/Bundle/ChillFormTypesBundle/LICENSE
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,661 @@ | ||||
|                     GNU AFFERO GENERAL PUBLIC LICENSE | ||||
|                        Version 3, 19 November 2007 | ||||
|  | ||||
|  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> | ||||
|  Everyone is permitted to copy and distribute verbatim copies | ||||
|  of this license document, but changing it is not allowed. | ||||
|  | ||||
|                             Preamble | ||||
|  | ||||
|   The GNU Affero General Public License is a free, copyleft license for | ||||
| software and other kinds of works, specifically designed to ensure | ||||
| cooperation with the community in the case of network server software. | ||||
|  | ||||
|   The licenses for most software and other practical works are designed | ||||
| to take away your freedom to share and change the works.  By contrast, | ||||
| our General Public Licenses are intended to guarantee your freedom to | ||||
| share and change all versions of a program--to make sure it remains free | ||||
| software for all its users. | ||||
|  | ||||
|   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 | ||||
| them 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. | ||||
|  | ||||
|   Developers that use our General Public Licenses protect your rights | ||||
| with two steps: (1) assert copyright on the software, and (2) offer | ||||
| you this License which gives you legal permission to copy, distribute | ||||
| and/or modify the software. | ||||
|  | ||||
|   A secondary benefit of defending all users' freedom is that | ||||
| improvements made in alternate versions of the program, if they | ||||
| receive widespread use, become available for other developers to | ||||
| incorporate.  Many developers of free software are heartened and | ||||
| encouraged by the resulting cooperation.  However, in the case of | ||||
| software used on network servers, this result may fail to come about. | ||||
| The GNU General Public License permits making a modified version and | ||||
| letting the public access it on a server without ever releasing its | ||||
| source code to the public. | ||||
|  | ||||
|   The GNU Affero General Public License is designed specifically to | ||||
| ensure that, in such cases, the modified source code becomes available | ||||
| to the community.  It requires the operator of a network server to | ||||
| provide the source code of the modified version running there to the | ||||
| users of that server.  Therefore, public use of a modified version, on | ||||
| a publicly accessible server, gives the public access to the source | ||||
| code of the modified version. | ||||
|  | ||||
|   An older license, called the Affero General Public License and | ||||
| published by Affero, was designed to accomplish similar goals.  This is | ||||
| a different license, not a version of the Affero GPL, but Affero has | ||||
| released a new version of the Affero GPL which permits relicensing under | ||||
| this license. | ||||
|  | ||||
|   The precise terms and conditions for copying, distribution and | ||||
| modification follow. | ||||
|  | ||||
|                        TERMS AND CONDITIONS | ||||
|  | ||||
|   0. Definitions. | ||||
|  | ||||
|   "This License" refers to version 3 of the GNU Affero General Public License. | ||||
|  | ||||
|   "Copyright" also means copyright-like laws that apply to other kinds of | ||||
| works, such as semiconductor masks. | ||||
|  | ||||
|   "The Program" refers to any copyrightable work licensed under this | ||||
| License.  Each licensee is addressed as "you".  "Licensees" and | ||||
| "recipients" may be individuals or organizations. | ||||
|  | ||||
|   To "modify" a work means to copy from or adapt all or part of the work | ||||
| in a fashion requiring copyright permission, other than the making of an | ||||
| exact copy.  The resulting work is called a "modified version" of the | ||||
| earlier work or a work "based on" the earlier work. | ||||
|  | ||||
|   A "covered work" means either the unmodified Program or a work based | ||||
| on the Program. | ||||
|  | ||||
|   To "propagate" a work means to do anything with it that, without | ||||
| permission, would make you directly or secondarily liable for | ||||
| infringement under applicable copyright law, except executing it on a | ||||
| computer or modifying a private copy.  Propagation includes copying, | ||||
| distribution (with or without modification), making available to the | ||||
| public, and in some countries other activities as well. | ||||
|  | ||||
|   To "convey" a work means any kind of propagation that enables other | ||||
| parties to make or receive copies.  Mere interaction with a user through | ||||
| a computer network, with no transfer of a copy, is not conveying. | ||||
|  | ||||
|   An interactive user interface displays "Appropriate Legal Notices" | ||||
| to the extent that it includes a convenient and prominently visible | ||||
| feature that (1) displays an appropriate copyright notice, and (2) | ||||
| tells the user that there is no warranty for the work (except to the | ||||
| extent that warranties are provided), that licensees may convey the | ||||
| work under this License, and how to view a copy of this License.  If | ||||
| the interface presents a list of user commands or options, such as a | ||||
| menu, a prominent item in the list meets this criterion. | ||||
|  | ||||
|   1. Source Code. | ||||
|  | ||||
|   The "source code" for a work means the preferred form of the work | ||||
| for making modifications to it.  "Object code" means any non-source | ||||
| form of a work. | ||||
|  | ||||
|   A "Standard Interface" means an interface that either is an official | ||||
| standard defined by a recognized standards body, or, in the case of | ||||
| interfaces specified for a particular programming language, one that | ||||
| is widely used among developers working in that language. | ||||
|  | ||||
|   The "System Libraries" of an executable work include anything, other | ||||
| than the work as a whole, that (a) is included in the normal form of | ||||
| packaging a Major Component, but which is not part of that Major | ||||
| Component, and (b) serves only to enable use of the work with that | ||||
| Major Component, or to implement a Standard Interface for which an | ||||
| implementation is available to the public in source code form.  A | ||||
| "Major Component", in this context, means a major essential component | ||||
| (kernel, window system, and so on) of the specific operating system | ||||
| (if any) on which the executable work runs, or a compiler used to | ||||
| produce the work, or an object code interpreter used to run it. | ||||
|  | ||||
|   The "Corresponding Source" for a work in object code form means all | ||||
| the source code needed to generate, install, and (for an executable | ||||
| work) run the object code and to modify the work, including scripts to | ||||
| control those activities.  However, it does not include the work's | ||||
| System Libraries, or general-purpose tools or generally available free | ||||
| programs which are used unmodified in performing those activities but | ||||
| which are not part of the work.  For example, Corresponding Source | ||||
| includes interface definition files associated with source files for | ||||
| the work, and the source code for shared libraries and dynamically | ||||
| linked subprograms that the work is specifically designed to require, | ||||
| such as by intimate data communication or control flow between those | ||||
| subprograms and other parts of the work. | ||||
|  | ||||
|   The Corresponding Source need not include anything that users | ||||
| can regenerate automatically from other parts of the Corresponding | ||||
| Source. | ||||
|  | ||||
|   The Corresponding Source for a work in source code form is that | ||||
| same work. | ||||
|  | ||||
|   2. Basic Permissions. | ||||
|  | ||||
|   All rights granted under this License are granted for the term of | ||||
| copyright on the Program, and are irrevocable provided the stated | ||||
| conditions are met.  This License explicitly affirms your unlimited | ||||
| permission to run the unmodified Program.  The output from running a | ||||
| covered work is covered by this License only if the output, given its | ||||
| content, constitutes a covered work.  This License acknowledges your | ||||
| rights of fair use or other equivalent, as provided by copyright law. | ||||
|  | ||||
|   You may make, run and propagate covered works that you do not | ||||
| convey, without conditions so long as your license otherwise remains | ||||
| in force.  You may convey covered works to others for the sole purpose | ||||
| of having them make modifications exclusively for you, or provide you | ||||
| with facilities for running those works, provided that you comply with | ||||
| the terms of this License in conveying all material for which you do | ||||
| not control copyright.  Those thus making or running the covered works | ||||
| for you must do so exclusively on your behalf, under your direction | ||||
| and control, on terms that prohibit them from making any copies of | ||||
| your copyrighted material outside their relationship with you. | ||||
|  | ||||
|   Conveying under any other circumstances is permitted solely under | ||||
| the conditions stated below.  Sublicensing is not allowed; section 10 | ||||
| makes it unnecessary. | ||||
|  | ||||
|   3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||||
|  | ||||
|   No covered work shall be deemed part of an effective technological | ||||
| measure under any applicable law fulfilling obligations under article | ||||
| 11 of the WIPO copyright treaty adopted on 20 December 1996, or | ||||
| similar laws prohibiting or restricting circumvention of such | ||||
| measures. | ||||
|  | ||||
|   When you convey a covered work, you waive any legal power to forbid | ||||
| circumvention of technological measures to the extent such circumvention | ||||
| is effected by exercising rights under this License with respect to | ||||
| the covered work, and you disclaim any intention to limit operation or | ||||
| modification of the work as a means of enforcing, against the work's | ||||
| users, your or third parties' legal rights to forbid circumvention of | ||||
| technological measures. | ||||
|  | ||||
|   4. Conveying Verbatim Copies. | ||||
|  | ||||
|   You may convey 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; | ||||
| keep intact all notices stating that this License and any | ||||
| non-permissive terms added in accord with section 7 apply to the code; | ||||
| keep intact all notices of the absence of any warranty; and give all | ||||
| recipients a copy of this License along with the Program. | ||||
|  | ||||
|   You may charge any price or no price for each copy that you convey, | ||||
| and you may offer support or warranty protection for a fee. | ||||
|  | ||||
|   5. Conveying Modified Source Versions. | ||||
|  | ||||
|   You may convey a work based on the Program, or the modifications to | ||||
| produce it from the Program, in the form of source code under the | ||||
| terms of section 4, provided that you also meet all of these conditions: | ||||
|  | ||||
|     a) The work must carry prominent notices stating that you modified | ||||
|     it, and giving a relevant date. | ||||
|  | ||||
|     b) The work must carry prominent notices stating that it is | ||||
|     released under this License and any conditions added under section | ||||
|     7.  This requirement modifies the requirement in section 4 to | ||||
|     "keep intact all notices". | ||||
|  | ||||
|     c) You must license the entire work, as a whole, under this | ||||
|     License to anyone who comes into possession of a copy.  This | ||||
|     License will therefore apply, along with any applicable section 7 | ||||
|     additional terms, to the whole of the work, and all its parts, | ||||
|     regardless of how they are packaged.  This License gives no | ||||
|     permission to license the work in any other way, but it does not | ||||
|     invalidate such permission if you have separately received it. | ||||
|  | ||||
|     d) If the work has interactive user interfaces, each must display | ||||
|     Appropriate Legal Notices; however, if the Program has interactive | ||||
|     interfaces that do not display Appropriate Legal Notices, your | ||||
|     work need not make them do so. | ||||
|  | ||||
|   A compilation of a covered work with other separate and independent | ||||
| works, which are not by their nature extensions of the covered work, | ||||
| and which are not combined with it such as to form a larger program, | ||||
| in or on a volume of a storage or distribution medium, is called an | ||||
| "aggregate" if the compilation and its resulting copyright are not | ||||
| used to limit the access or legal rights of the compilation's users | ||||
| beyond what the individual works permit.  Inclusion of a covered work | ||||
| in an aggregate does not cause this License to apply to the other | ||||
| parts of the aggregate. | ||||
|  | ||||
|   6. Conveying Non-Source Forms. | ||||
|  | ||||
|   You may convey a covered work in object code form under the terms | ||||
| of sections 4 and 5, provided that you also convey the | ||||
| machine-readable Corresponding Source under the terms of this License, | ||||
| in one of these ways: | ||||
|  | ||||
|     a) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by the | ||||
|     Corresponding Source fixed on a durable physical medium | ||||
|     customarily used for software interchange. | ||||
|  | ||||
|     b) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by a | ||||
|     written offer, valid for at least three years and valid for as | ||||
|     long as you offer spare parts or customer support for that product | ||||
|     model, to give anyone who possesses the object code either (1) a | ||||
|     copy of the Corresponding Source for all the software in the | ||||
|     product that is covered by this License, on a durable physical | ||||
|     medium customarily used for software interchange, for a price no | ||||
|     more than your reasonable cost of physically performing this | ||||
|     conveying of source, or (2) access to copy the | ||||
|     Corresponding Source from a network server at no charge. | ||||
|  | ||||
|     c) Convey individual copies of the object code with a copy of the | ||||
|     written offer to provide the Corresponding Source.  This | ||||
|     alternative is allowed only occasionally and noncommercially, and | ||||
|     only if you received the object code with such an offer, in accord | ||||
|     with subsection 6b. | ||||
|  | ||||
|     d) Convey the object code by offering access from a designated | ||||
|     place (gratis or for a charge), and offer equivalent access to the | ||||
|     Corresponding Source in the same way through the same place at no | ||||
|     further charge.  You need not require recipients to copy the | ||||
|     Corresponding Source along with the object code.  If the place to | ||||
|     copy the object code is a network server, the Corresponding Source | ||||
|     may be on a different server (operated by you or a third party) | ||||
|     that supports equivalent copying facilities, provided you maintain | ||||
|     clear directions next to the object code saying where to find the | ||||
|     Corresponding Source.  Regardless of what server hosts the | ||||
|     Corresponding Source, you remain obligated to ensure that it is | ||||
|     available for as long as needed to satisfy these requirements. | ||||
|  | ||||
|     e) Convey the object code using peer-to-peer transmission, provided | ||||
|     you inform other peers where the object code and Corresponding | ||||
|     Source of the work are being offered to the general public at no | ||||
|     charge under subsection 6d. | ||||
|  | ||||
|   A separable portion of the object code, whose source code is excluded | ||||
| from the Corresponding Source as a System Library, need not be | ||||
| included in conveying the object code work. | ||||
|  | ||||
|   A "User Product" is either (1) a "consumer product", which means any | ||||
| tangible personal property which is normally used for personal, family, | ||||
| or household purposes, or (2) anything designed or sold for incorporation | ||||
| into a dwelling.  In determining whether a product is a consumer product, | ||||
| doubtful cases shall be resolved in favor of coverage.  For a particular | ||||
| product received by a particular user, "normally used" refers to a | ||||
| typical or common use of that class of product, regardless of the status | ||||
| of the particular user or of the way in which the particular user | ||||
| actually uses, or expects or is expected to use, the product.  A product | ||||
| is a consumer product regardless of whether the product has substantial | ||||
| commercial, industrial or non-consumer uses, unless such uses represent | ||||
| the only significant mode of use of the product. | ||||
|  | ||||
|   "Installation Information" for a User Product means any methods, | ||||
| procedures, authorization keys, or other information required to install | ||||
| and execute modified versions of a covered work in that User Product from | ||||
| a modified version of its Corresponding Source.  The information must | ||||
| suffice to ensure that the continued functioning of the modified object | ||||
| code is in no case prevented or interfered with solely because | ||||
| modification has been made. | ||||
|  | ||||
|   If you convey an object code work under this section in, or with, or | ||||
| specifically for use in, a User Product, and the conveying occurs as | ||||
| part of a transaction in which the right of possession and use of the | ||||
| User Product is transferred to the recipient in perpetuity or for a | ||||
| fixed term (regardless of how the transaction is characterized), the | ||||
| Corresponding Source conveyed under this section must be accompanied | ||||
| by the Installation Information.  But this requirement does not apply | ||||
| if neither you nor any third party retains the ability to install | ||||
| modified object code on the User Product (for example, the work has | ||||
| been installed in ROM). | ||||
|  | ||||
|   The requirement to provide Installation Information does not include a | ||||
| requirement to continue to provide support service, warranty, or updates | ||||
| for a work that has been modified or installed by the recipient, or for | ||||
| the User Product in which it has been modified or installed.  Access to a | ||||
| network may be denied when the modification itself materially and | ||||
| adversely affects the operation of the network or violates the rules and | ||||
| protocols for communication across the network. | ||||
|  | ||||
|   Corresponding Source conveyed, and Installation Information provided, | ||||
| in accord with this section must be in a format that is publicly | ||||
| documented (and with an implementation available to the public in | ||||
| source code form), and must require no special password or key for | ||||
| unpacking, reading or copying. | ||||
|  | ||||
|   7. Additional Terms. | ||||
|  | ||||
|   "Additional permissions" are terms that supplement the terms of this | ||||
| License by making exceptions from one or more of its conditions. | ||||
| Additional permissions that are applicable to the entire Program shall | ||||
| be treated as though they were included in this License, to the extent | ||||
| that they are valid under applicable law.  If additional permissions | ||||
| apply only to part of the Program, that part may be used separately | ||||
| under those permissions, but the entire Program remains governed by | ||||
| this License without regard to the additional permissions. | ||||
|  | ||||
|   When you convey a copy of a covered work, you may at your option | ||||
| remove any additional permissions from that copy, or from any part of | ||||
| it.  (Additional permissions may be written to require their own | ||||
| removal in certain cases when you modify the work.)  You may place | ||||
| additional permissions on material, added by you to a covered work, | ||||
| for which you have or can give appropriate copyright permission. | ||||
|  | ||||
|   Notwithstanding any other provision of this License, for material you | ||||
| add to a covered work, you may (if authorized by the copyright holders of | ||||
| that material) supplement the terms of this License with terms: | ||||
|  | ||||
|     a) Disclaiming warranty or limiting liability differently from the | ||||
|     terms of sections 15 and 16 of this License; or | ||||
|  | ||||
|     b) Requiring preservation of specified reasonable legal notices or | ||||
|     author attributions in that material or in the Appropriate Legal | ||||
|     Notices displayed by works containing it; or | ||||
|  | ||||
|     c) Prohibiting misrepresentation of the origin of that material, or | ||||
|     requiring that modified versions of such material be marked in | ||||
|     reasonable ways as different from the original version; or | ||||
|  | ||||
|     d) Limiting the use for publicity purposes of names of licensors or | ||||
|     authors of the material; or | ||||
|  | ||||
|     e) Declining to grant rights under trademark law for use of some | ||||
|     trade names, trademarks, or service marks; or | ||||
|  | ||||
|     f) Requiring indemnification of licensors and authors of that | ||||
|     material by anyone who conveys the material (or modified versions of | ||||
|     it) with contractual assumptions of liability to the recipient, for | ||||
|     any liability that these contractual assumptions directly impose on | ||||
|     those licensors and authors. | ||||
|  | ||||
|   All other non-permissive additional terms are considered "further | ||||
| restrictions" within the meaning of section 10.  If the Program as you | ||||
| received it, or any part of it, contains a notice stating that it is | ||||
| governed by this License along with a term that is a further | ||||
| restriction, you may remove that term.  If a license document contains | ||||
| a further restriction but permits relicensing or conveying under this | ||||
| License, you may add to a covered work material governed by the terms | ||||
| of that license document, provided that the further restriction does | ||||
| not survive such relicensing or conveying. | ||||
|  | ||||
|   If you add terms to a covered work in accord with this section, you | ||||
| must place, in the relevant source files, a statement of the | ||||
| additional terms that apply to those files, or a notice indicating | ||||
| where to find the applicable terms. | ||||
|  | ||||
|   Additional terms, permissive or non-permissive, may be stated in the | ||||
| form of a separately written license, or stated as exceptions; | ||||
| the above requirements apply either way. | ||||
|  | ||||
|   8. Termination. | ||||
|  | ||||
|   You may not propagate or modify a covered work except as expressly | ||||
| provided under this License.  Any attempt otherwise to propagate or | ||||
| modify it is void, and will automatically terminate your rights under | ||||
| this License (including any patent licenses granted under the third | ||||
| paragraph of section 11). | ||||
|  | ||||
|   However, if you cease all violation of this License, then your | ||||
| license from a particular copyright holder is reinstated (a) | ||||
| provisionally, unless and until the copyright holder explicitly and | ||||
| finally terminates your license, and (b) permanently, if the copyright | ||||
| holder fails to notify you of the violation by some reasonable means | ||||
| prior to 60 days after the cessation. | ||||
|  | ||||
|   Moreover, your license from a particular copyright holder is | ||||
| reinstated permanently if the copyright holder notifies you of the | ||||
| violation by some reasonable means, this is the first time you have | ||||
| received notice of violation of this License (for any work) from that | ||||
| copyright holder, and you cure the violation prior to 30 days after | ||||
| your receipt of the notice. | ||||
|  | ||||
|   Termination of your rights under this section does not terminate the | ||||
| licenses of parties who have received copies or rights from you under | ||||
| this License.  If your rights have been terminated and not permanently | ||||
| reinstated, you do not qualify to receive new licenses for the same | ||||
| material under section 10. | ||||
|  | ||||
|   9. Acceptance Not Required for Having Copies. | ||||
|  | ||||
|   You are not required to accept this License in order to receive or | ||||
| run a copy of the Program.  Ancillary propagation of a covered work | ||||
| occurring solely as a consequence of using peer-to-peer transmission | ||||
| to receive a copy likewise does not require acceptance.  However, | ||||
| nothing other than this License grants you permission to propagate or | ||||
| modify any covered work.  These actions infringe copyright if you do | ||||
| not accept this License.  Therefore, by modifying or propagating a | ||||
| covered work, you indicate your acceptance of this License to do so. | ||||
|  | ||||
|   10. Automatic Licensing of Downstream Recipients. | ||||
|  | ||||
|   Each time you convey a covered work, the recipient automatically | ||||
| receives a license from the original licensors, to run, modify and | ||||
| propagate that work, subject to this License.  You are not responsible | ||||
| for enforcing compliance by third parties with this License. | ||||
|  | ||||
|   An "entity transaction" is a transaction transferring control of an | ||||
| organization, or substantially all assets of one, or subdividing an | ||||
| organization, or merging organizations.  If propagation of a covered | ||||
| work results from an entity transaction, each party to that | ||||
| transaction who receives a copy of the work also receives whatever | ||||
| licenses to the work the party's predecessor in interest had or could | ||||
| give under the previous paragraph, plus a right to possession of the | ||||
| Corresponding Source of the work from the predecessor in interest, if | ||||
| the predecessor has it or can get it with reasonable efforts. | ||||
|  | ||||
|   You may not impose any further restrictions on the exercise of the | ||||
| rights granted or affirmed under this License.  For example, you may | ||||
| not impose a license fee, royalty, or other charge for exercise of | ||||
| rights granted under this License, and you may not initiate litigation | ||||
| (including a cross-claim or counterclaim in a lawsuit) alleging that | ||||
| any patent claim is infringed by making, using, selling, offering for | ||||
| sale, or importing the Program or any portion of it. | ||||
|  | ||||
|   11. Patents. | ||||
|  | ||||
|   A "contributor" is a copyright holder who authorizes use under this | ||||
| License of the Program or a work on which the Program is based.  The | ||||
| work thus licensed is called the contributor's "contributor version". | ||||
|  | ||||
|   A contributor's "essential patent claims" are all patent claims | ||||
| owned or controlled by the contributor, whether already acquired or | ||||
| hereafter acquired, that would be infringed by some manner, permitted | ||||
| by this License, of making, using, or selling its contributor version, | ||||
| but do not include claims that would be infringed only as a | ||||
| consequence of further modification of the contributor version.  For | ||||
| purposes of this definition, "control" includes the right to grant | ||||
| patent sublicenses in a manner consistent with the requirements of | ||||
| this License. | ||||
|  | ||||
|   Each contributor grants you a non-exclusive, worldwide, royalty-free | ||||
| patent license under the contributor's essential patent claims, to | ||||
| make, use, sell, offer for sale, import and otherwise run, modify and | ||||
| propagate the contents of its contributor version. | ||||
|  | ||||
|   In the following three paragraphs, a "patent license" is any express | ||||
| agreement or commitment, however denominated, not to enforce a patent | ||||
| (such as an express permission to practice a patent or covenant not to | ||||
| sue for patent infringement).  To "grant" such a patent license to a | ||||
| party means to make such an agreement or commitment not to enforce a | ||||
| patent against the party. | ||||
|  | ||||
|   If you convey a covered work, knowingly relying on a patent license, | ||||
| and the Corresponding Source of the work is not available for anyone | ||||
| to copy, free of charge and under the terms of this License, through a | ||||
| publicly available network server or other readily accessible means, | ||||
| then you must either (1) cause the Corresponding Source to be so | ||||
| available, or (2) arrange to deprive yourself of the benefit of the | ||||
| patent license for this particular work, or (3) arrange, in a manner | ||||
| consistent with the requirements of this License, to extend the patent | ||||
| license to downstream recipients.  "Knowingly relying" means you have | ||||
| actual knowledge that, but for the patent license, your conveying the | ||||
| covered work in a country, or your recipient's use of the covered work | ||||
| in a country, would infringe one or more identifiable patents in that | ||||
| country that you have reason to believe are valid. | ||||
|  | ||||
|   If, pursuant to or in connection with a single transaction or | ||||
| arrangement, you convey, or propagate by procuring conveyance of, a | ||||
| covered work, and grant a patent license to some of the parties | ||||
| receiving the covered work authorizing them to use, propagate, modify | ||||
| or convey a specific copy of the covered work, then the patent license | ||||
| you grant is automatically extended to all recipients of the covered | ||||
| work and works based on it. | ||||
|  | ||||
|   A patent license is "discriminatory" if it does not include within | ||||
| the scope of its coverage, prohibits the exercise of, or is | ||||
| conditioned on the non-exercise of one or more of the rights that are | ||||
| specifically granted under this License.  You may not convey a covered | ||||
| work if you are a party to an arrangement with a third party that is | ||||
| in the business of distributing software, under which you make payment | ||||
| to the third party based on the extent of your activity of conveying | ||||
| the work, and under which the third party grants, to any of the | ||||
| parties who would receive the covered work from you, a discriminatory | ||||
| patent license (a) in connection with copies of the covered work | ||||
| conveyed by you (or copies made from those copies), or (b) primarily | ||||
| for and in connection with specific products or compilations that | ||||
| contain the covered work, unless you entered into that arrangement, | ||||
| or that patent license was granted, prior to 28 March 2007. | ||||
|  | ||||
|   Nothing in this License shall be construed as excluding or limiting | ||||
| any implied license or other defenses to infringement that may | ||||
| otherwise be available to you under applicable patent law. | ||||
|  | ||||
|   12. No Surrender of Others' Freedom. | ||||
|  | ||||
|   If 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 convey a | ||||
| covered work so as to satisfy simultaneously your obligations under this | ||||
| License and any other pertinent obligations, then as a consequence you may | ||||
| not convey it at all.  For example, if you agree to terms that obligate you | ||||
| to collect a royalty for further conveying from those to whom you convey | ||||
| the Program, the only way you could satisfy both those terms and this | ||||
| License would be to refrain entirely from conveying the Program. | ||||
|  | ||||
|   13. Remote Network Interaction; Use with the GNU General Public License. | ||||
|  | ||||
|   Notwithstanding any other provision of this License, if you modify the | ||||
| Program, your modified version must prominently offer all users | ||||
| interacting with it remotely through a computer network (if your version | ||||
| supports such interaction) an opportunity to receive the Corresponding | ||||
| Source of your version by providing access to the Corresponding Source | ||||
| from a network server at no charge, through some standard or customary | ||||
| means of facilitating copying of software.  This Corresponding Source | ||||
| shall include the Corresponding Source for any work covered by version 3 | ||||
| of the GNU General Public License that is incorporated pursuant to the | ||||
| following paragraph. | ||||
|  | ||||
|   Notwithstanding any other provision of this License, you have | ||||
| permission to link or combine any covered work with a work licensed | ||||
| under version 3 of the GNU General Public License into a single | ||||
| combined work, and to convey the resulting work.  The terms of this | ||||
| License will continue to apply to the part which is the covered work, | ||||
| but the work with which it is combined will remain governed by version | ||||
| 3 of the GNU General Public License. | ||||
|  | ||||
|   14. Revised Versions of this License. | ||||
|  | ||||
|   The Free Software Foundation may publish revised and/or new versions of | ||||
| the GNU Affero 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 that a certain numbered version of the GNU Affero General | ||||
| Public License "or any later version" applies to it, you have the | ||||
| option of following the terms and conditions either of that numbered | ||||
| version or of any later version published by the Free Software | ||||
| Foundation.  If the Program does not specify a version number of the | ||||
| GNU Affero General Public License, you may choose any version ever published | ||||
| by the Free Software Foundation. | ||||
|  | ||||
|   If the Program specifies that a proxy can decide which future | ||||
| versions of the GNU Affero General Public License can be used, that proxy's | ||||
| public statement of acceptance of a version permanently authorizes you | ||||
| to choose that version for the Program. | ||||
|  | ||||
|   Later license versions may give you additional or different | ||||
| permissions.  However, no additional obligations are imposed on any | ||||
| author or copyright holder as a result of your choosing to follow a | ||||
| later version. | ||||
|  | ||||
|   15. Disclaimer of Warranty. | ||||
|  | ||||
|   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. | ||||
|  | ||||
|   16. Limitation of Liability. | ||||
|  | ||||
|   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||||
| WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | ||||
| 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. | ||||
|  | ||||
|   17. Interpretation of Sections 15 and 16. | ||||
|  | ||||
|   If the disclaimer of warranty and limitation of liability provided | ||||
| above cannot be given local legal effect according to their terms, | ||||
| reviewing courts shall apply local law that most closely approximates | ||||
| an absolute waiver of all civil liability in connection with the | ||||
| Program, unless a warranty or assumption of liability accompanies a | ||||
| copy of the Program in return for a fee. | ||||
|  | ||||
|                      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 | ||||
| state 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 Affero General Public License as published by | ||||
|     the Free Software Foundation, either version 3 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 Affero General Public License for more details. | ||||
|  | ||||
|     You should have received a copy of the GNU Affero General Public License | ||||
|     along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| Also add information on how to contact you by electronic and paper mail. | ||||
|  | ||||
|   If your software can interact with users remotely through a computer | ||||
| network, you should also make sure that it provides a way for users to | ||||
| get its source.  For example, if your program is a web application, its | ||||
| interface could display a "Source" link that leads users to an archive | ||||
| of the code.  There are many ways you could offer source, and different | ||||
| solutions will be better for different programs; see section 13 for the | ||||
| specific requirements. | ||||
|  | ||||
|   You should also get your employer (if you work as a programmer) or school, | ||||
| if any, to sign a "copyright disclaimer" for the program, if necessary. | ||||
| For more information on this, and how to apply and follow the GNU AGPL, see | ||||
| <https://www.gnu.org/licenses/>. | ||||
							
								
								
									
										9
									
								
								src/Bundle/ChillFormTypesBundle/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								src/Bundle/ChillFormTypesBundle/README.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| ChillPersonBundle | ||||
| ================= | ||||
|  | ||||
| The chill bundle for dealing with persons | ||||
|  | ||||
| Documentation & installation | ||||
| ---------------------------- | ||||
|  | ||||
| Read documentation here : http://chill.readthedocs.org | ||||
							
								
								
									
										39
									
								
								src/Bundle/ChillFormTypesBundle/composer.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								src/Bundle/ChillFormTypesBundle/composer.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | ||||
| { | ||||
|     "name": "chill-project/form-types-bundle", | ||||
|     "type": "symfony-bundle", | ||||
|     "description": "TODO", | ||||
|     "keywords": [ | ||||
|         "chill", | ||||
|         "social work", | ||||
|         "form" | ||||
|     ], | ||||
|     "homepage": "http://www.champs-libres.coop", | ||||
|     "license": "AGPL-3.0", | ||||
|     "authors": [ | ||||
|         { | ||||
|             "name": "Champs-Libres", | ||||
|             "email": "info@champs-libres.coop", | ||||
|             "homepage": "http://www.champs-libres.coop" | ||||
|         } | ||||
|     ], | ||||
|     "require": { | ||||
|         "php": ">= 7.4", | ||||
|         "ext-intl": "*", | ||||
|         "odolbeau/phone-number-bundle": "^3.4", | ||||
|         "symfony/http-client": "^4.4 || ^5" | ||||
|     }, | ||||
|     "require-dev": { | ||||
|         "doctrine/orm": "^2.9", | ||||
|         "drupol/php-conventions": "^5.0", | ||||
|         "phpspec/phpspec": "^7.0", | ||||
|         "phpunit/phpunit": "^9.5", | ||||
|         "psr/log": "^1.1", | ||||
|         "symfony/form": "^5.2", | ||||
|         "symfony/validator": "^5.2" | ||||
|     }, | ||||
|     "autoload": { | ||||
|         "psr-4": { | ||||
|             "Chill\\FormTypesBundle\\": "src/" | ||||
|         } | ||||
|     } | ||||
| } | ||||
							
								
								
									
										9
									
								
								src/Bundle/ChillFormTypesBundle/grumphp.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								src/Bundle/ChillFormTypesBundle/grumphp.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| imports: | ||||
|   - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml } | ||||
|  | ||||
| parameters: | ||||
|   tasks.license.holder: Champs-Libres | ||||
|   tasks.license.date_from: 2021 | ||||
|   tasks.license.name: AGPL-3.0 | ||||
|   extra_tasks: | ||||
|     phpunit: ~ | ||||
							
								
								
									
										13
									
								
								src/Bundle/ChillFormTypesBundle/phpunit.xml.dist
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								src/Bundle/ChillFormTypesBundle/phpunit.xml.dist
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"> | ||||
|   <coverage> | ||||
|     <include> | ||||
|       <directory>src</directory> | ||||
|     </include> | ||||
|   </coverage> | ||||
|   <testsuites> | ||||
|     <testsuite name="Chill Form Types Test"> | ||||
|       <directory>src/Tests</directory> | ||||
|     </testsuite> | ||||
|   </testsuites> | ||||
| </phpunit> | ||||
							
								
								
									
										15
									
								
								src/Bundle/ChillFormTypesBundle/psalm.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								src/Bundle/ChillFormTypesBundle/psalm.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| <?xml version="1.0"?> | ||||
| <psalm | ||||
|     errorLevel="3" | ||||
|     resolveFromConfigFile="true" | ||||
|     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||||
|     xmlns="https://getpsalm.org/schema/config" | ||||
|     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" | ||||
| > | ||||
|     <projectFiles> | ||||
|         <directory name="src" /> | ||||
|         <ignoreFiles> | ||||
|             <directory name="vendor" /> | ||||
|         </ignoreFiles> | ||||
|     </projectFiles> | ||||
| </psalm> | ||||
| @@ -0,0 +1,21 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace spec\Chill\FormTypesBundle; | ||||
|  | ||||
| use Chill\FormTypesBundle\PhoneNumberHelper; | ||||
| use PhpSpec\ObjectBehavior; | ||||
|  | ||||
| class PhoneNumberHelperSpec extends ObjectBehavior | ||||
| { | ||||
|     public function it_is_initializable() | ||||
|     { | ||||
|         $this->shouldHaveType(PhoneNumberHelper::class); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,21 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace spec\Chill\FormTypesBundle; | ||||
|  | ||||
| use Chill\FormTypesBundle\TwilioHttpClient; | ||||
| use PhpSpec\ObjectBehavior; | ||||
|  | ||||
| class TwilioHttpClientSpec extends ObjectBehavior | ||||
| { | ||||
|     public function it_is_initializable() | ||||
|     { | ||||
|         $this->shouldHaveType(TwilioHttpClient::class); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,21 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace spec\Chill\FormTypesBundle\Validation\Validator; | ||||
|  | ||||
| use Chill\FormTypesBundle\Validation\Validator\PhoneNumberValidator; | ||||
| use PhpSpec\ObjectBehavior; | ||||
|  | ||||
| class PhoneNumberValidatorSpec extends ObjectBehavior | ||||
| { | ||||
|     public function it_is_initializable() | ||||
|     { | ||||
|         $this->shouldHaveType(PhoneNumberValidator::class); | ||||
|     } | ||||
| } | ||||
							
								
								
									
										16
									
								
								src/Bundle/ChillFormTypesBundle/src/ChillFormTypesBundle.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								src/Bundle/ChillFormTypesBundle/src/ChillFormTypesBundle.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle; | ||||
|  | ||||
| use Symfony\Component\HttpKernel\Bundle\Bundle; | ||||
|  | ||||
| final class ChillFormTypesBundle extends Bundle | ||||
| { | ||||
| } | ||||
| @@ -0,0 +1,64 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\DependencyInjection; | ||||
|  | ||||
| use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType; | ||||
| use Symfony\Component\Config\FileLocator; | ||||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||||
| use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; | ||||
| use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; | ||||
| use Symfony\Component\HttpKernel\DependencyInjection\Extension; | ||||
|  | ||||
| final class ChillFormTypesExtension extends Extension implements PrependExtensionInterface | ||||
| { | ||||
|     public function load(array $configs, ContainerBuilder $container) | ||||
|     { | ||||
|         $configuration = new Configuration(); | ||||
|         $config = $this->processConfiguration($configuration, $configs); | ||||
|  | ||||
|         $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources')); | ||||
|         $loader->load('services.php'); | ||||
|     } | ||||
|  | ||||
|     public function prepend(ContainerBuilder $container) | ||||
|     { | ||||
|         $configs = $container->getExtensionConfig($this->getAlias()); | ||||
|         $resolvingBag = $container->getParameterBag(); | ||||
|         $configs = $resolvingBag->resolveValue($configs); | ||||
|         $config = $this->processConfiguration(new Configuration(), $configs); | ||||
|  | ||||
|         $container | ||||
|             ->prependExtensionConfig( | ||||
|                 'framework', | ||||
|                 [ | ||||
|                     'http_client' => [ | ||||
|                         'scoped_clients' => [ | ||||
|                             'twilio_api' => [ | ||||
|                                 'scope' => 'https://(lookups|api)\.twilio\.com', | ||||
|                                 'auth_basic' => $config['twilio']['sid'] . ':' . $config['twilio']['secret'], | ||||
|                             ], | ||||
|                         ], | ||||
|                     ], | ||||
|                 ] | ||||
|             ); | ||||
|  | ||||
|         $container | ||||
|             ->prependExtensionConfig( | ||||
|                 'doctrine', | ||||
|                 [ | ||||
|                     'dbal' => [ | ||||
|                         'types' => [ | ||||
|                             'phone_number' => PhoneNumberType::class, | ||||
|                         ], | ||||
|                     ], | ||||
|                 ] | ||||
|             ); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,44 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\DependencyInjection; | ||||
|  | ||||
| use Symfony\Component\Config\Definition\Builder\TreeBuilder; | ||||
| use Symfony\Component\Config\Definition\ConfigurationInterface; | ||||
|  | ||||
| final class Configuration implements ConfigurationInterface | ||||
| { | ||||
|     public function getConfigTreeBuilder() | ||||
|     { | ||||
|         $treeBuilder = new TreeBuilder('chill_form_types'); | ||||
|  | ||||
|         if (method_exists($treeBuilder, 'getRootNode')) { | ||||
|             $rootNode = $treeBuilder->getRootNode(); | ||||
|         } else { | ||||
|             // BC layer for symfony/config 4.1 and older | ||||
|             $rootNode = $treeBuilder->root('chill_form_types'); | ||||
|         } | ||||
|  | ||||
|         $rootNode | ||||
|             ->children() | ||||
|             ->arrayNode('twilio') | ||||
|             ->addDefaultsIfNotSet() | ||||
|             ->children() | ||||
|             ->scalarNode('sid') | ||||
|             ->defaultValue('%env(resolve:TWILIO_SID)%') | ||||
|             ->end() | ||||
|             ->scalarNode('secret') | ||||
|             ->defaultValue('%env(resolve:TWILIO_SECRET)%') | ||||
|             ->end() | ||||
|             ->end() | ||||
|             ->end(); | ||||
|  | ||||
|         return $treeBuilder; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,25 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Form\DataTransformer; | ||||
|  | ||||
| use Symfony\Component\Form\DataTransformerInterface; | ||||
|  | ||||
| final class PhoneNumberTypeTransformer implements DataTransformerInterface | ||||
| { | ||||
|     public function reverseTransform($phoneNumber): string | ||||
|     { | ||||
|         return preg_replace('/[^0-9+]/', '', $phoneNumber); | ||||
|     } | ||||
|  | ||||
|     public function transform($phoneNumber) | ||||
|     { | ||||
|         return $phoneNumber; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,37 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Form\Types; | ||||
|  | ||||
| use Chill\FormTypesBundle\Form\DataTransformer\PhoneNumberTypeTransformer; | ||||
| use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType as MisdPhoneNumberType; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
|  | ||||
| final class PhoneNumberType extends AbstractType | ||||
| { | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $phoneNumberTypeTransformer = new PhoneNumberTypeTransformer(); | ||||
|  | ||||
|         $builder->addViewTransformer( | ||||
|             $phoneNumberTypeTransformer | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     public function getBlockPrefix(): string | ||||
|     { | ||||
|         return 'chill_formtypes_bundle'; | ||||
|     } | ||||
|  | ||||
|     public function getParent(): string | ||||
|     { | ||||
|         return MisdPhoneNumberType::class; | ||||
|     } | ||||
| } | ||||
							
								
								
									
										41
									
								
								src/Bundle/ChillFormTypesBundle/src/Resources/services.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								src/Bundle/ChillFormTypesBundle/src/Resources/services.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Symfony\Component\DependencyInjection\Loader\Configurator; | ||||
|  | ||||
| use Chill\FormTypesBundle\Service\PhoneNumberHelper; | ||||
| use Chill\FormTypesBundle\Service\TwilioHttpClient; | ||||
| use Symfony\Component\HttpKernel\HttpCache\Store; | ||||
|  | ||||
| return static function (ContainerConfigurator $container) { | ||||
|     $services = $container | ||||
|         ->services() | ||||
|         ->defaults() | ||||
|         ->autowire() | ||||
|         ->autoconfigure(); | ||||
|  | ||||
|     $services | ||||
|         ->load('Chill\\FormTypesBundle\\', '../*') | ||||
|         ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); | ||||
|  | ||||
|     // This can be replaced by http_cache.store in Symfony 5. | ||||
|     $services | ||||
|         ->set('twilio.http_cache.store', Store::class) | ||||
|         ->args([ | ||||
|             param('kernel.cache_dir') . '/http_cache', | ||||
|         ]); | ||||
|  | ||||
|     $services | ||||
|         ->set(TwilioHttpClient::class) | ||||
|         ->arg('$store', service('twilio.http_cache.store')); | ||||
|  | ||||
|     $services | ||||
|         ->set(PhoneNumberHelper::class) | ||||
|         ->arg('$client', service(TwilioHttpClient::class)); | ||||
| }; | ||||
| @@ -0,0 +1,193 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Service; | ||||
|  | ||||
| use libphonenumber\PhoneNumber; | ||||
| use libphonenumber\PhoneNumberFormat; | ||||
| use libphonenumber\PhoneNumberUtil; | ||||
| use Psr\Log\LoggerInterface; | ||||
| use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface; | ||||
| use Symfony\Contracts\HttpClient\HttpClientInterface; | ||||
|  | ||||
| use function in_array; | ||||
|  | ||||
| final class PhoneNumberHelper implements PhoneNumberHelperInterface | ||||
| { | ||||
|     private const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; | ||||
|  | ||||
|     private const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; | ||||
|  | ||||
|     private HttpClientInterface $client; | ||||
|  | ||||
|     private LoggerInterface $logger; | ||||
|  | ||||
|     private PhoneNumberUtil $phoneNumberUtil; | ||||
|  | ||||
|     public function __construct( | ||||
|         HttpClientInterface $client, | ||||
|         LoggerInterface $logger, | ||||
|         PhoneNumberUtil $phoneNumberUtil | ||||
|     ) { | ||||
|         $this->logger = $logger; | ||||
|         $this->client = $client; | ||||
|         $this->phoneNumberUtil = $phoneNumberUtil; | ||||
|     } | ||||
|  | ||||
|     public function format(string $phonenumber): string | ||||
|     { | ||||
|         return $this->performTwilioFormat($phonenumber); | ||||
|     } | ||||
|  | ||||
|     public function getType(string $phonenumber): string | ||||
|     { | ||||
|         return $this->performTwilioLookup($phonenumber) ?? 'unknown'; | ||||
|     } | ||||
|  | ||||
|     public function isTwilioEnabled(): bool | ||||
|     { | ||||
|         try { | ||||
|             $response = $this | ||||
|                 ->client | ||||
|                 ->request( | ||||
|                     'GET', | ||||
|                     'https://api.twilio.com/2010-04-01/Accounts.json' | ||||
|                 ); | ||||
|         } catch (TransportExceptionInterface $e) { | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         if (200 !== $response->getStatusCode()) { | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     public function isValidPhonenumberAny(PhoneNumber $phonenumber): bool | ||||
|     { | ||||
|         $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL); | ||||
|  | ||||
|         $validation = $this->performTwilioLookup($phone); | ||||
|  | ||||
|         return in_array($validation, ['landline', 'voip', 'mobile'], true); | ||||
|     } | ||||
|  | ||||
|     public function isValidPhonenumberLandOrVoip(PhoneNumber $phonenumber): bool | ||||
|     { | ||||
|         $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL); | ||||
|  | ||||
|         $validation = $this->performTwilioLookup($phone); | ||||
|  | ||||
|         return in_array($validation, ['landline', 'voip'], true); | ||||
|     } | ||||
|  | ||||
|     public function isValidPhonenumberMobile(PhoneNumber $phonenumber): bool | ||||
|     { | ||||
|         $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL); | ||||
|  | ||||
|         $validation = $this->performTwilioLookup($phone); | ||||
|  | ||||
|         return 'mobile' === $validation; | ||||
|     } | ||||
|  | ||||
|     private function performTwilioFormat(string $phonenumber): string | ||||
|     { | ||||
|         // filter only number | ||||
|         $filtered = preg_replace('/[^0-9]/', '', $phonenumber); | ||||
|  | ||||
|         try { | ||||
|             $response = $this | ||||
|                 ->client | ||||
|                 ->request( | ||||
|                     'GET', | ||||
|                     sprintf(self::FORMAT_URI, '+' . $filtered), | ||||
|                 ); | ||||
|         } catch (TransportExceptionInterface $e) { | ||||
|             $this | ||||
|                 ->logger | ||||
|                 ->error( | ||||
|                     'Could not format number due to server error', | ||||
|                     [ | ||||
|                         'message' => $e->getMessage(), | ||||
|                         'status_code' => $e->getCode(), | ||||
|                         'phonenumber' => $phonenumber, | ||||
|                     ] | ||||
|                 ); | ||||
|  | ||||
|             return $phonenumber; | ||||
|         } | ||||
|  | ||||
|         if (200 !== $response->getStatusCode()) { | ||||
|             $this | ||||
|                 ->logger | ||||
|                 ->error( | ||||
|                     'Could not format number due to client error', | ||||
|                     [ | ||||
|                         'message' => $response->getContent(false), | ||||
|                         'status_code' => $response->getStatusCode(), | ||||
|                         'phonenumber' => $phonenumber, | ||||
|                     ] | ||||
|                 ); | ||||
|  | ||||
|             return $phonenumber; | ||||
|         } | ||||
|  | ||||
|         return $response->toArray()['national_format']; | ||||
|     } | ||||
|  | ||||
|     private function performTwilioLookup(string $phonenumber): ?string | ||||
|     { | ||||
|         $filtered = preg_replace('/[^0-9]/', '', $phonenumber); | ||||
|  | ||||
|         try { | ||||
|             $response = $this | ||||
|                 ->client | ||||
|                 ->request( | ||||
|                     'GET', | ||||
|                     sprintf(self::LOOKUP_URI, '+' . $filtered), | ||||
|                     [ | ||||
|                         'query' => [ | ||||
|                             'Type' => 'carrier', | ||||
|                         ], | ||||
|                     ] | ||||
|                 ); | ||||
|         } catch (TransportExceptionInterface $e) { | ||||
|             $this | ||||
|                 ->logger | ||||
|                 ->error( | ||||
|                     'Could not lookup number due to server error', | ||||
|                     [ | ||||
|                         'message' => $e->getMessage(), | ||||
|                         'status_code' => $e->getCode(), | ||||
|                         'phonenumber' => $phonenumber, | ||||
|                     ] | ||||
|                 ); | ||||
|  | ||||
|             return $phonenumber; | ||||
|         } | ||||
|  | ||||
|         if (200 !== $response->getStatusCode()) { | ||||
|             $this | ||||
|                 ->logger | ||||
|                 ->error( | ||||
|                     'Could not lookup number due to client error', | ||||
|                     [ | ||||
|                         'message' => $response->getContent(false), | ||||
|                         'status_code' => $response->getStatusCode(), | ||||
|                         'phonenumber' => $phonenumber, | ||||
|                     ] | ||||
|                 ); | ||||
|  | ||||
|             return $phonenumber; | ||||
|         } | ||||
|  | ||||
|         return $response->toArray()['carrier']['type']; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,42 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Service; | ||||
|  | ||||
| use libphonenumber\PhoneNumber; | ||||
|  | ||||
| interface PhoneNumberHelperInterface | ||||
| { | ||||
|     public function format(string $phonenumber): string; | ||||
|  | ||||
|     /** | ||||
|      * Get type (mobile, landline, ...) for phone number. | ||||
|      */ | ||||
|     public function getType(string $phonenumber): string; | ||||
|  | ||||
|     public function isTwilioEnabled(): bool; | ||||
|  | ||||
|     /** | ||||
|      * Return true if the phonenumber is a landline or voip phone.  Return always true | ||||
|      * if the validation is not configured. | ||||
|      */ | ||||
|     public function isValidPhonenumberAny(PhoneNumber $phonenumber): bool; | ||||
|  | ||||
|     /** | ||||
|      * Return true if the phonenumber is a landline or voip phone.  Return always true | ||||
|      * if the validation is not configured. | ||||
|      */ | ||||
|     public function isValidPhonenumberLandOrVoip(PhoneNumber $phonenumber): bool; | ||||
|  | ||||
|     /** | ||||
|      * Return true if the phoennumber is a mobile phone. Return always true | ||||
|      * if the validation is not configured. | ||||
|      */ | ||||
|     public function isValidPhonenumberMobile(PhoneNumber $phonenumber): bool; | ||||
| } | ||||
| @@ -0,0 +1,48 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Service; | ||||
|  | ||||
| use Symfony\Component\HttpKernel\HttpCache\StoreInterface; | ||||
| use Symfony\Contracts\HttpClient\HttpClientInterface; | ||||
| use Symfony\Contracts\HttpClient\ResponseInterface; | ||||
| use Symfony\Contracts\HttpClient\ResponseStreamInterface; | ||||
|  | ||||
| final class TwilioHttpClient implements HttpClientInterface | ||||
| { | ||||
|     private HttpClientInterface $client; | ||||
|  | ||||
|     public function __construct(HttpClientInterface $twilioApi, StoreInterface $store) | ||||
|     { | ||||
|         // TODO: Use CachingHttpClient when the following bug is fixed. | ||||
|         // TODO: https://github.com/symfony/symfony/issues/40644 | ||||
|         /* | ||||
|         $this->client = new CachingHttpClient( | ||||
|             $twilioApi, | ||||
|             $store | ||||
|         ); | ||||
|          */ | ||||
|         $this->client = $twilioApi; | ||||
|     } | ||||
|  | ||||
|     public function request(string $method, string $url, array $options = []): ResponseInterface | ||||
|     { | ||||
|         return $this->client->request($method, $url, $options); | ||||
|     } | ||||
|  | ||||
|     public function stream($responses, ?float $timeout = null): ResponseStreamInterface | ||||
|     { | ||||
|         return $this->client->stream($responses, $timeout); | ||||
|     } | ||||
|  | ||||
|     public function withOptions($options) | ||||
|     { | ||||
|         return $this->client->withOptions($options); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,102 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Tests\Form\Types; | ||||
|  | ||||
| use Chill\FormTypesBundle\Form\Types\PhoneNumberType; | ||||
| use libphonenumber\PhoneNumberFormat; | ||||
| use Locale; | ||||
| use PHPUnit\Framework\TestCase; | ||||
| use Symfony\Component\Form\FormFactoryInterface; | ||||
| use Symfony\Component\Form\Forms; | ||||
|  | ||||
| /** | ||||
|  * @internal | ||||
|  * | ||||
|  * @covers \Chill\FormTypesBundle\Form\DataTransformer\PhoneNumberTypeTransformer | ||||
|  * @covers \Chill\FormTypesBundle\Form\Types\PhoneNumberType | ||||
|  */ | ||||
| final class PhoneNumberTypeTest extends TestCase | ||||
| { | ||||
|     /** | ||||
|      * @var FormFactoryInterface | ||||
|      */ | ||||
|     protected $factory; | ||||
|  | ||||
|     protected function setUp(): void | ||||
|     { | ||||
|         Locale::setDefault('en'); | ||||
|  | ||||
|         $this->factory = Forms::createFormFactoryBuilder()->getFormFactory(); | ||||
|     } | ||||
|  | ||||
|     public function singleFieldProvider() | ||||
|     { | ||||
|         yield ['0,-03f212@%3g4 g5k 6789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789']; | ||||
|  | ||||
|         yield ['0032 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789']; | ||||
|  | ||||
|         yield ['0032 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789']; | ||||
|  | ||||
|         yield ['+32 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789']; | ||||
|  | ||||
|         yield ['+32 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789']; | ||||
|  | ||||
|         yield ['0123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789']; | ||||
|  | ||||
|         yield ['0123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789']; | ||||
|  | ||||
|         yield ['0486/540660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 486 54 06 60']; | ||||
|  | ||||
|         yield ['0486/540660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '0486 54 06 60']; | ||||
|  | ||||
|         yield ['0486/540.660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 486 54 06 60']; | ||||
|  | ||||
|         yield ['0486/540.660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '0486 54 06 60']; | ||||
|  | ||||
|         yield ['+441234567890', [], '+44 1234 567890']; | ||||
|  | ||||
|         yield ['+44 1234 567890', ['format' => PhoneNumberFormat::NATIONAL], '+44 1234 567890']; | ||||
|  | ||||
|         yield ['+44 1234 567890', ['default_region' => 'GB', 'format' => PhoneNumberFormat::NATIONAL], '01234 567890']; | ||||
|  | ||||
|         yield ['+1 650-253-0000', ['default_region' => 'GB', 'format' => PhoneNumberFormat::NATIONAL], '00 1 650-253-0000']; | ||||
|  | ||||
|         yield ['01234 567890', ['default_region' => 'GB'], '+44 1234 567890']; | ||||
|  | ||||
|         yield ['', [], '']; | ||||
|     } | ||||
|  | ||||
|     public function testGetNameAndBlockPrefixAreTel() | ||||
|     { | ||||
|         $type = new PhoneNumberType(); | ||||
|  | ||||
|         self::assertSame('chill_formtypes_bundle', $type->getBlockPrefix()); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @dataProvider singleFieldProvider | ||||
|      */ | ||||
|     public function testSingleField(string $input, array $options, string $output) | ||||
|     { | ||||
|         $form = $this->factory->create(PhoneNumberType::class, null, $options); | ||||
|  | ||||
|         $form->submit($input); | ||||
|  | ||||
|         if (method_exists($form, 'getTransformationFailure') && $failure = $form->getTransformationFailure()) { | ||||
|             throw $failure; | ||||
|         } | ||||
|         self::assertTrue($form->isSynchronized()); | ||||
|  | ||||
|         $view = $form->createView(); | ||||
|  | ||||
|         self::assertSame('tel', $view->vars['type']); | ||||
|         self::assertSame($output, $view->vars['value']); | ||||
|     } | ||||
| } | ||||
| @@ -1,38 +1,31 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * Chill is a software for social workers | ||||
|  * | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
| 
 | ||||
| declare(strict_types=1); | ||||
| 
 | ||||
| namespace Chill\MainBundle\Validation\Constraint; | ||||
| namespace Chill\FormTypesBundle\Validation\Constraint; | ||||
| 
 | ||||
| use Chill\FormTypesBundle\Validation\Validator\PhoneNumberValidator; | ||||
| use Symfony\Component\Validator\Constraint; | ||||
| 
 | ||||
| /** | ||||
|  * @Annotation | ||||
|  */ | ||||
| class PhonenumberConstraint extends Constraint | ||||
| final class PhonenumberConstraint extends Constraint | ||||
| { | ||||
|     public $notLandlineMessage = 'This is not a landline phonenumber'; | ||||
| 
 | ||||
|     public $notMobileMessage = 'This is not a mobile phonenumber'; | ||||
| 
 | ||||
|     public $notValidMessage = 'This is not a valid phonenumber'; | ||||
| 
 | ||||
|     /** | ||||
|      * The type of phone: landline (not able to receive sms) or mobile (can receive sms). | ||||
|      * | ||||
|      * @var string 'landline', 'mobile' or 'any' | ||||
|      */ | ||||
|     public $type; | ||||
|     public string $type; | ||||
| 
 | ||||
|     public function validatedBy() | ||||
|     { | ||||
|         return \Chill\MainBundle\Validation\Validator\ValidPhonenumber::class; | ||||
|         return PhoneNumberValidator::class; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,75 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\FormTypesBundle\Validation\Validator; | ||||
|  | ||||
| use Chill\FormTypesBundle\Service\PhoneNumberHelperInterface; | ||||
| use Chill\FormTypesBundle\Validation\Constraint\PhonenumberConstraint; | ||||
| use LogicException; | ||||
| use Symfony\Component\Validator\Constraint; | ||||
| use Symfony\Component\Validator\ConstraintValidator; | ||||
|  | ||||
| final class PhoneNumberValidator extends ConstraintValidator | ||||
| { | ||||
|     protected PhoneNumberHelperInterface $phoneNumberHelper; | ||||
|  | ||||
|     public function __construct( | ||||
|         PhoneNumberHelperInterface $phoneNumberHelper | ||||
|     ) { | ||||
|         $this->phoneNumberHelper = $phoneNumberHelper; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param Constraint|PhonenumberConstraint $constraint | ||||
|      * @param mixed $value | ||||
|      */ | ||||
|     public function validate($value, Constraint $constraint) | ||||
|     { | ||||
|         if (null === $value) { | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         if (false === $this->phoneNumberHelper->isTwilioEnabled()) { | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         $message = 'The phone number (%phonenumber%) must be of type: %type%'; | ||||
|         $isValid = true; | ||||
|  | ||||
|         switch ($constraint->type) { | ||||
|             case 'landline': | ||||
|                 $isValid = $this->phoneNumberHelper->isValidPhonenumberLandOrVoip($value); | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             case 'mobile': | ||||
|                 $isValid = $this->phoneNumberHelper->isValidPhonenumberMobile($value); | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             case 'any': | ||||
|                 $isValid = $this->phoneNumberHelper->isValidPhonenumberAny($value); | ||||
|                 $message = 'The phone number (%phonenumber%) is invalid'; | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             default: | ||||
|                 throw new LogicException( | ||||
|                     sprintf( | ||||
|                         'The phone number type %s is not implemented.', | ||||
|                         $constraint->type | ||||
|                     ) | ||||
|                 ); | ||||
|         } | ||||
|  | ||||
|         if (false === $isValid) { | ||||
|             $this->context->addViolation($message, ['%type%' => $constraint->type, '%phonenumber%' => $value]); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -162,7 +162,6 @@ class ChillMainExtension extends Extension implements | ||||
|         $loader->load('services/notification.yaml'); | ||||
|         $loader->load('services/redis.yaml'); | ||||
|         $loader->load('services/command.yaml'); | ||||
|         $loader->load('services/phonenumber.yaml'); | ||||
|         $loader->load('services/cache.yaml'); | ||||
|         $loader->load('services/templating.yaml'); | ||||
|         $loader->load('services/timeline.yaml'); | ||||
|   | ||||
| @@ -15,7 +15,7 @@ use Doctrine\ORM\EntityManagerInterface; | ||||
| use Symfony\Component\Form\DataTransformerInterface; | ||||
| use Symfony\Component\Form\Exception\TransformationFailedException; | ||||
|  | ||||
| class ObjectToIdTransformer implements DataTransformerInterface | ||||
| final class ObjectToIdTransformer implements DataTransformerInterface | ||||
| { | ||||
|     private ?string $class; | ||||
|  | ||||
| @@ -38,7 +38,7 @@ class ObjectToIdTransformer implements DataTransformerInterface | ||||
|      */ | ||||
|     public function reverseTransform($id) | ||||
|     { | ||||
|         if (!$id) { | ||||
|         if (null === $id) { | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|   | ||||
| @@ -1,276 +0,0 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * Chill is a software for social workers | ||||
|  * | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\MainBundle\Phonenumber; | ||||
|  | ||||
| use GuzzleHttp\Client; | ||||
| use GuzzleHttp\Exception\ClientException; | ||||
| use GuzzleHttp\Exception\ConnectException; | ||||
| use GuzzleHttp\Exception\ServerException; | ||||
| use Psr\Cache\CacheItemPoolInterface; | ||||
| use Psr\Log\LoggerInterface; | ||||
|  | ||||
| use function array_key_exists; | ||||
| use function in_array; | ||||
| use function json_decode; | ||||
| use function preg_replace; | ||||
| use function strlen; | ||||
|  | ||||
| /** | ||||
|  * Helper to some task linked to phonenumber. | ||||
|  * | ||||
|  * Currently, only Twilio is supported (https://www.twilio.com/lookup). A method | ||||
|  * allow to check if the helper is configured for validation. This should be used | ||||
|  * before doing some validation. | ||||
|  */ | ||||
| class PhonenumberHelper | ||||
| { | ||||
|     public const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; | ||||
|  | ||||
|     public const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; | ||||
|  | ||||
|     protected CacheItemPoolInterface $cachePool; | ||||
|  | ||||
|     /** | ||||
|      * TRUE if the client is properly configured. | ||||
|      */ | ||||
|     protected bool $isConfigured = false; | ||||
|  | ||||
|     protected LoggerInterface $logger; | ||||
|  | ||||
|     /** | ||||
|      * Twilio client. | ||||
|      */ | ||||
|     protected Client $twilioClient; | ||||
|  | ||||
|     public function __construct( | ||||
|         CacheItemPoolInterface $cachePool, | ||||
|         $config, | ||||
|         LoggerInterface $logger | ||||
|     ) { | ||||
|         $this->logger = $logger; | ||||
|         $this->cachePool = $cachePool; | ||||
|  | ||||
|         if ( | ||||
|             array_key_exists('twilio_sid', $config) | ||||
|             && !empty($config['twilio_sid']) | ||||
|             && strlen($config['twilio_sid']) > 2 | ||||
|             && array_key_exists('twilio_secret', $config) | ||||
|             && !empty($config['twilio_secret']) | ||||
|             && strlen($config['twilio_secret']) > 2 | ||||
|         ) { | ||||
|             $this->twilioClient = new Client([ | ||||
|                 'auth' => [$config['twilio_sid'], $config['twilio_secret']], | ||||
|             ]); | ||||
|             $this->isConfigured = true; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     public function format($phonenumber) | ||||
|     { | ||||
|         return $this->performTwilioFormat($phonenumber); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get type (mobile, landline, ...) for phone number. | ||||
|      */ | ||||
|     public function getType(string $phonenumber): string | ||||
|     { | ||||
|         return $this->performTwilioLookup($phonenumber) ?? 'unknown'; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Return true if the validation is configured and available. | ||||
|      */ | ||||
|     public function isPhonenumberValidationConfigured(): bool | ||||
|     { | ||||
|         return $this->isConfigured; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Return true if the phonenumber is a landline or voip phone.  Return always true | ||||
|      * if the validation is not configured. | ||||
|      * | ||||
|      * @param string $phonenumber | ||||
|      */ | ||||
|     public function isValidPhonenumberAny($phonenumber): bool | ||||
|     { | ||||
|         if (false === $this->isPhonenumberValidationConfigured()) { | ||||
|             return true; | ||||
|         } | ||||
|         $validation = $this->performTwilioLookup($phonenumber); | ||||
|  | ||||
|         if (null === $validation) { | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         return in_array($validation, ['landline', 'voip', 'mobile'], true); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Return true if the phonenumber is a landline or voip phone.  Return always true | ||||
|      * if the validation is not configured. | ||||
|      * | ||||
|      * @param string $phonenumber | ||||
|      */ | ||||
|     public function isValidPhonenumberLandOrVoip($phonenumber): bool | ||||
|     { | ||||
|         if (false === $this->isPhonenumberValidationConfigured()) { | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         $validation = $this->performTwilioLookup($phonenumber); | ||||
|  | ||||
|         if (null === $validation) { | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         return in_array($validation, ['landline', 'voip'], true); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * REturn true if the phoennumber is a mobile phone. Return always true | ||||
|      * if the validation is not configured. | ||||
|      * | ||||
|      * @param string $phonenumber | ||||
|      */ | ||||
|     public function isValidPhonenumberMobile($phonenumber): bool | ||||
|     { | ||||
|         if (false === $this->isPhonenumberValidationConfigured()) { | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         $validation = $this->performTwilioLookup($phonenumber); | ||||
|  | ||||
|         if (null === $validation) { | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         return 'mobile' === $validation; | ||||
|     } | ||||
|  | ||||
|     protected function performTwilioFormat($phonenumber) | ||||
|     { | ||||
|         if (false === $this->isPhonenumberValidationConfigured()) { | ||||
|             return $phonenumber; | ||||
|         } | ||||
|  | ||||
|         // filter only number | ||||
|         $filtered = preg_replace('/[^0-9]/', '', $phonenumber); | ||||
|  | ||||
|         $item = $this->cachePool->getItem('pnum_format_nat_' . $filtered); | ||||
|  | ||||
|         if ($item->isHit()) { | ||||
|             return $item->get(); | ||||
|         } | ||||
|  | ||||
|         try { | ||||
|             $response = $this->twilioClient->get(sprintf(self::FORMAT_URI, '+' . $filtered), [ | ||||
|                 'http_errors' => true, | ||||
|             ]); | ||||
|         } catch (ClientException $e) { | ||||
|             $response = $e->getResponse(); | ||||
|             $this->logger->error('[phonenumber helper] Could not format number ' | ||||
|                 . 'due to client error', [ | ||||
|                     'message' => $response->getBody()->getContents(), | ||||
|                     'status_code' => $response->getStatusCode(), | ||||
|                     'phonenumber' => $phonenumber, | ||||
|                 ]); | ||||
|  | ||||
|             return $phonenumber; | ||||
|         } catch (ServerException $e) { | ||||
|             $response = $e->getResponse(); | ||||
|             $this->logger->error('[phonenumber helper] Could not format number ' | ||||
|                 . 'due to server error', [ | ||||
|                     'message' => $response->getBody()->getContents(), | ||||
|                     'status_code' => $response->getStatusCode(), | ||||
|                     'phonenumber' => $phonenumber, | ||||
|                 ]); | ||||
|  | ||||
|             return null; | ||||
|         } catch (ConnectException $e) { | ||||
|             $this->logger->error('[phonenumber helper] Could not format number ' | ||||
|                 . 'due to connect error', [ | ||||
|                     'message' => $e->getMessage(), | ||||
|                     'phonenumber' => $phonenumber, | ||||
|                 ]); | ||||
|  | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         $format = json_decode($response->getBody()->getContents())->national_format; | ||||
|  | ||||
|         $item | ||||
|             ->set($format) | ||||
|             // expires after 3d | ||||
|             ->expiresAfter(3600 * 24 * 3); | ||||
|  | ||||
|         $this->cachePool->save($item); | ||||
|  | ||||
|         return $format; | ||||
|     } | ||||
|  | ||||
|     protected function performTwilioLookup($phonenumber) | ||||
|     { | ||||
|         if (false === $this->isPhonenumberValidationConfigured()) { | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         // filter only number | ||||
|         $filtered = preg_replace('/[^0-9]/', '', $phonenumber); | ||||
|  | ||||
|         $item = $this->cachePool->getItem('pnum_' . $filtered); | ||||
|  | ||||
|         if ($item->isHit()) { | ||||
|             //return $item->get(); | ||||
|         } | ||||
|  | ||||
|         try { | ||||
|             $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+' . $filtered), [ | ||||
|                 'http_errors' => true, | ||||
|                 'query' => [ | ||||
|                     'Type' => 'carrier', | ||||
|                 ], | ||||
|             ]); | ||||
|         } catch (ClientException $e) { | ||||
|             return 'invalid'; | ||||
|         } catch (ServerException $e) { | ||||
|             $response = $e->getResponse(); | ||||
|             $this->logger->error('[phonenumber helper] Could not perform validation ' | ||||
|                 . 'due to server error', [ | ||||
|                     'message' => $response->getBody()->getContents(), | ||||
|                     'status_code' => $response->getStatusCode(), | ||||
|                     'phonenumber' => $phonenumber, | ||||
|                 ]); | ||||
|  | ||||
|             return null; | ||||
|         } catch (ConnectException $e) { | ||||
|             $this->logger->error('[phonenumber helper] Could not format number ' | ||||
|                 . 'due to connect error', [ | ||||
|                     'message' => $e->getMessage(), | ||||
|                     'phonenumber' => $phonenumber, | ||||
|                 ]); | ||||
|  | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         $validation = json_decode($response->getBody()->getContents())->carrier->type; | ||||
|  | ||||
|         $item | ||||
|             ->set($validation) | ||||
|             // expires after 12h | ||||
|             ->expiresAfter(3600 * 12); | ||||
|  | ||||
|         $this->cachePool->save($item); | ||||
|  | ||||
|         return $validation; | ||||
|     } | ||||
| } | ||||
| @@ -1,40 +0,0 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * Chill is a software for social workers | ||||
|  * | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\MainBundle\Phonenumber; | ||||
|  | ||||
| use Twig\Extension\AbstractExtension; | ||||
| use Twig\TwigFilter; | ||||
|  | ||||
| class Templating extends AbstractExtension | ||||
| { | ||||
|     /** | ||||
|      * @var PhonenumberHelper | ||||
|      */ | ||||
|     protected $phonenumberHelper; | ||||
|  | ||||
|     public function __construct(PhonenumberHelper $phonenumberHelper) | ||||
|     { | ||||
|         $this->phonenumberHelper = $phonenumberHelper; | ||||
|     } | ||||
|  | ||||
|     public function formatPhonenumber($phonenumber) | ||||
|     { | ||||
|         return $this->phonenumberHelper->format($phonenumber) ?? $phonenumber; | ||||
|     } | ||||
|  | ||||
|     public function getFilters() | ||||
|     { | ||||
|         return [ | ||||
|             new TwigFilter('chill_format_phonenumber', [$this, 'formatPhonenumber']), | ||||
|         ]; | ||||
|     } | ||||
| } | ||||
| @@ -1,81 +0,0 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * Chill is a software for social workers | ||||
|  * | ||||
|  * For the full copyright and license information, please view | ||||
|  * the LICENSE file that was distributed with this source code. | ||||
|  */ | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\MainBundle\Validation\Validator; | ||||
|  | ||||
| use Chill\MainBundle\Phonenumber\PhonenumberHelper; | ||||
| use LogicException; | ||||
| use Psr\Log\LoggerInterface; | ||||
| use Symfony\Component\Validator\Constraint; | ||||
| use Symfony\Component\Validator\ConstraintValidator; | ||||
|  | ||||
| class ValidPhonenumber extends ConstraintValidator | ||||
| { | ||||
|     protected $logger; | ||||
|  | ||||
|     /** | ||||
|      * @var PhonenumberHelper | ||||
|      */ | ||||
|     protected $phonenumberHelper; | ||||
|  | ||||
|     public function __construct( | ||||
|         LoggerInterface $logger, | ||||
|         PhonenumberHelper $phonenumberHelper | ||||
|     ) { | ||||
|         $this->phonenumberHelper = $phonenumberHelper; | ||||
|         $this->logger = $logger; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param string $value | ||||
|      * @param \Chill\MainBundle\Validation\Constraint\PhonenumberConstraint $constraint | ||||
|      */ | ||||
|     public function validate($value, Constraint $constraint) | ||||
|     { | ||||
|         if (false === $this->phonenumberHelper->isPhonenumberValidationConfigured()) { | ||||
|             $this->logger->debug('[phonenumber] skipping validation due to not configured helper'); | ||||
|  | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         if (empty($value)) { | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         switch ($constraint->type) { | ||||
|             case 'landline': | ||||
|                 $isValid = $this->phonenumberHelper->isValidPhonenumberLandOrVoip($value); | ||||
|                 $message = $constraint->notLandlineMessage; | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             case 'mobile': | ||||
|                 $isValid = $this->phonenumberHelper->isValidPhonenumberMobile($value); | ||||
|                 $message = $constraint->notMobileMessage; | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             case 'any': | ||||
|                 $isValid = $this->phonenumberHelper->isValidPhonenumberAny($value); | ||||
|                 $message = $constraint->notValidMessage; | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             default: | ||||
|                 throw new LogicException(sprintf("This type '%s' is not implemented. " | ||||
|                     . "Possible values are 'mobile', 'landline' or 'any'", $constraint->type)); | ||||
|         } | ||||
|  | ||||
|         if (false === $isValid) { | ||||
|             $this->context->addViolation($message, ['%phonenumber%' => $value]); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -1,21 +0,0 @@ | ||||
| services: | ||||
|     _defaults: | ||||
|         autowire: true | ||||
|         autoconfigure: true | ||||
|  | ||||
|     Chill\MainBundle\Phonenumber\PhonenumberHelper: | ||||
|         arguments: | ||||
|             $config: '%chill_main.phone_helper%' | ||||
|             $cachePool: '@cache.user_data' | ||||
|  | ||||
|     Chill\MainBundle\Phonenumber\Templating: | ||||
|         arguments: | ||||
|             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper' | ||||
|         tags: | ||||
|             - { name: twig.extension } | ||||
|  | ||||
|     Chill\MainBundle\Validation\Validator\ValidPhonenumber: | ||||
|         arguments: | ||||
|             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper' | ||||
|         tags: | ||||
|             - { name: validator.constraint_validator } | ||||
| @@ -368,19 +368,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|      */ | ||||
|     private $memo = ''; // TO-CHANGE in remark | ||||
|  | ||||
|     /** | ||||
|      * The person's mobile phone number. | ||||
|      * | ||||
|      * @ORM\Column(type="text") | ||||
|      * @Assert\Regex( | ||||
|      *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/", | ||||
|      * ) | ||||
|      * @PhonenumberConstraint( | ||||
|      *     type="mobile", | ||||
|      * ) | ||||
|      */ | ||||
|     private string $mobilenumber = ''; | ||||
|  | ||||
|     /** | ||||
|      * The person's nationality. | ||||
|      * | ||||
| @@ -403,6 +390,24 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|      */ | ||||
|     private ?int $numberOfChildren = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="phone_number", nullable=true) | ||||
|      * @PhonenumberConstraint( | ||||
|      *   type="landline", | ||||
|      *   groups={"general", "creation"} | ||||
|      * ) | ||||
|      */ | ||||
|     private ?PhoneNumber $phonenumber; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="phone_number", nullable=true) | ||||
|      * @PhonenumberConstraint( | ||||
|      *   type="mobile", | ||||
|      *   groups={"general", "creation"} | ||||
|      * ) | ||||
|      */ | ||||
|     private ?PhoneNumber $mobilenumber; | ||||
|  | ||||
|     /** | ||||
|      * @var Collection | ||||
|      * | ||||
| @@ -426,19 +431,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|      */ | ||||
|     private Collection $periodLocatedOn; | ||||
|  | ||||
|     /** | ||||
|      * The person's phonenumber. | ||||
|      * | ||||
|      * @ORM\Column(type="text") | ||||
|      * @Assert\Regex( | ||||
|      *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/", | ||||
|      * ) | ||||
|      * @PhonenumberConstraint( | ||||
|      *     type="landline", | ||||
|      * ) | ||||
|      */ | ||||
|     private string $phonenumber = ''; | ||||
|  | ||||
|     /** | ||||
|      * The person's place of birth. | ||||
|      * | ||||
| @@ -510,7 +502,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Add AccompanyingPeriodParticipation. | ||||
|      * Add AccompanyingPeriodParticipation | ||||
|      * | ||||
|      * @uses AccompanyingPeriod::addPerson | ||||
|      */ | ||||
| @@ -522,6 +514,22 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * set the Person file as open at the given date. | ||||
|      * | ||||
|      * For updating a opening's date, you should update AccompanyingPeriod instance | ||||
|      * directly. | ||||
|      * | ||||
|      * For closing a file, @see this::close | ||||
|      * | ||||
|      * To check if the Person and its accompanying period is consistent, use validation. | ||||
|      */ | ||||
|     public function open(AccompanyingPeriod $accompanyingPeriod) : void | ||||
|     { | ||||
|         $this->proxyAccompanyingPeriodOpenState = true; | ||||
|         $this->addAccompanyingPeriod($accompanyingPeriod); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return $this | ||||
|      */ | ||||
| @@ -552,7 +560,32 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setPhonenumber(?PhoneNumber $phonenumber = null): self | ||||
|     { | ||||
|         $this->phonenumber = $phonenumber; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function getPhonenumber(): ?PhoneNumber | ||||
|     { | ||||
|         return $this->phonenumber; | ||||
|     } | ||||
|  | ||||
|     public function setMobilenumber(?PhoneNumber $mobilenumber = null): self | ||||
|     { | ||||
|         $this->mobilenumber = $mobilenumber; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function getMobilenumber(): ?PhoneNumber | ||||
|     { | ||||
|         return $this->mobilenumber; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param PersonPhone $otherPhoneNumber | ||||
|      * @return $this | ||||
|      */ | ||||
|     public function addOtherPhoneNumber(PersonPhone $otherPhoneNumber) | ||||
| @@ -1225,14 +1258,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this->memo; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get mobilenumber. | ||||
|      */ | ||||
|     public function getMobilenumber(): string | ||||
|     { | ||||
|         return $this->mobilenumber; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get nationality. | ||||
|      * | ||||
| @@ -1293,14 +1318,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this->otherPhoneNumbers; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get phonenumber. | ||||
|      */ | ||||
|     public function getPhonenumber(): string | ||||
|     { | ||||
|         return $this->phonenumber; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get placeOfBirth. | ||||
|      * | ||||
| @@ -1423,22 +1440,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return null !== $this->getCurrentHousehold($at); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * set the Person file as open at the given date. | ||||
|      * | ||||
|      * For updating a opening's date, you should update AccompanyingPeriod instance | ||||
|      * directly. | ||||
|      * | ||||
|      * For closing a file, @see this::close | ||||
|      * | ||||
|      * To check if the Person and its accompanying period is consistent, use validation. | ||||
|      */ | ||||
|     public function open(AccompanyingPeriod $accompanyingPeriod): void | ||||
|     { | ||||
|         $this->proxyAccompanyingPeriodOpenState = true; | ||||
|         $this->addAccompanyingPeriod($accompanyingPeriod); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Remove AccompanyingPeriod. | ||||
|      */ | ||||
| @@ -1735,20 +1736,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set mobilenumber. | ||||
|      * | ||||
|      * @param string $mobilenumber | ||||
|      * | ||||
|      * @return Person | ||||
|      */ | ||||
|     public function setMobilenumber(?string $mobilenumber = '') | ||||
|     { | ||||
|         $this->mobilenumber = (string) $mobilenumber; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set nationality. | ||||
|      * | ||||
| @@ -1780,20 +1767,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set phonenumber. | ||||
|      * | ||||
|      * @param string $phonenumber | ||||
|      * | ||||
|      * @return Person | ||||
|      */ | ||||
|     public function setPhonenumber(?string $phonenumber = '') | ||||
|     { | ||||
|         $this->phonenumber = (string) $phonenumber; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set placeOfBirth. | ||||
|      * | ||||
|   | ||||
| @@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity; | ||||
|  | ||||
| use DateTime; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as AssertPhoneNumber; | ||||
|  | ||||
| /** | ||||
|  * Person Phones. | ||||
| @@ -51,7 +52,13 @@ class PersonPhone | ||||
|     private Person $person; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text", length=40, nullable=false) | ||||
|      * @ORM\Column(type="text", length=40, nullable=true) | ||||
|      */ | ||||
|     private ?string $type; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="phone_number", length=40, nullable=false) | ||||
|      * @AssertPhoneNumber | ||||
|      */ | ||||
|     private string $phonenumber = ''; | ||||
|  | ||||
|   | ||||
| @@ -15,17 +15,17 @@ use Chill\PersonBundle\Entity\Person; | ||||
| use Doctrine\Persistence\ObjectManager; | ||||
| use Symfony\Component\Form\DataTransformerInterface; | ||||
| use Symfony\Component\Form\Exception\TransformationFailedException; | ||||
| use Chill\PersonBundle\Entity\Person; | ||||
| use Chill\PersonBundle\Repository\PersonRepository; | ||||
| use Doctrine\ORM\EntityRepository; | ||||
|  | ||||
| class PersonToIdTransformer implements DataTransformerInterface | ||||
| final class PersonToIdTransformer implements DataTransformerInterface | ||||
| { | ||||
|     /** | ||||
|      * @var ObjectManager | ||||
|      */ | ||||
|     private $om; | ||||
|     private EntityRepository $personRepository; | ||||
|  | ||||
|     public function __construct(ObjectManager $om) | ||||
|     public function __construct(PersonRepository $personRepository) | ||||
|     { | ||||
|         $this->om = $om; | ||||
|         $this->personRepository = $personRepository; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
| @@ -43,9 +43,8 @@ class PersonToIdTransformer implements DataTransformerInterface | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         $issue = $this->om | ||||
|             ->getRepository('ChillPersonBundle:Person') | ||||
|             ->findOneBy(['id' => $id]); | ||||
|         $issue = $this->personRepository | ||||
|             ->findOneBy(array('id' => $id)); | ||||
|  | ||||
|         if (null === $issue) { | ||||
|             throw new TransformationFailedException(sprintf( | ||||
|   | ||||
| @@ -12,6 +12,7 @@ declare(strict_types=1); | ||||
| namespace Chill\PersonBundle\Form; | ||||
|  | ||||
| use Chill\CustomFieldsBundle\Form\Type\CustomFieldType; | ||||
| use Chill\FormTypesBundle\Form\Types\PhoneNumberType; | ||||
| use Chill\MainBundle\Entity\Civility; | ||||
| use Chill\MainBundle\Form\Type\ChillCollectionType; | ||||
| use Chill\MainBundle\Form\Type\ChillDateType; | ||||
| @@ -25,18 +26,16 @@ use Chill\PersonBundle\Entity\Person; | ||||
| use Chill\PersonBundle\Entity\PersonPhone; | ||||
| use Chill\PersonBundle\Form\Type\GenderType; | ||||
| use Chill\PersonBundle\Form\Type\PersonAltNameType; | ||||
| use Chill\PersonBundle\Form\Type\PersonPhoneType; | ||||
| use Chill\PersonBundle\Form\Type\Select2MaritalStatusType; | ||||
| use Doctrine\ORM\EntityRepository; | ||||
| use Doctrine\ORM\QueryBuilder; | ||||
| use Symfony\Bridge\Doctrine\Form\Type\EntityType; | ||||
| use libphonenumber\PhoneNumberFormat; | ||||
| use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType as MisdPhoneNumberType; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\CallbackTransformer; | ||||
| use Symfony\Component\Form\Extension\Core\Type\CheckboxType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\DateType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\EmailType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\IntegerType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\TelType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\TextType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\OptionsResolver\OptionsResolver; | ||||
| @@ -51,7 +50,7 @@ class PersonType extends AbstractType | ||||
|      * | ||||
|      * @var string[] | ||||
|      */ | ||||
|     protected $config = []; | ||||
|     protected array $config; | ||||
|  | ||||
|     /** | ||||
|      * @var ConfigPersonAltNamesHelper | ||||
| @@ -128,36 +127,54 @@ class PersonType extends AbstractType | ||||
|             $builder->add('contactInfo', ChillTextareaType::class, ['required' => false]); | ||||
|         } | ||||
|  | ||||
|         if ('visible' === $this->config['phonenumber']) { | ||||
|             $builder->add('phonenumber', TelType::class, [ | ||||
|                 'required' => false, | ||||
|                 // 'placeholder' => '+33623124554' //TODO placeholder for phone numbers | ||||
|             ]); | ||||
|         } | ||||
|  | ||||
|         if ('visible' === $this->config['mobilenumber']) { | ||||
|         if ($this->config['phonenumber'] === 'visible') { | ||||
|             $builder | ||||
|                 ->add('mobilenumber', TelType::class, ['required' => false]) | ||||
|                 ->add('acceptSMS', CheckboxType::class, [ | ||||
|                     'required' => false, | ||||
|                 ]); | ||||
|                 ->add( | ||||
|                     'phonenumber', | ||||
|                     PhoneNumberType::class, | ||||
|                     [ | ||||
|                         'required' => false, | ||||
|                         'format' => PhoneNumberFormat::INTERNATIONAL, | ||||
|                         'widget' => MisdPhoneNumberType::WIDGET_COUNTRY_CHOICE, | ||||
|                         'country_choices' => ['BE', 'GB', 'JE', 'FR', 'US'], | ||||
|                         'preferred_country_choices' => ['BE', 'FR'], | ||||
|                     ] | ||||
|                 ); | ||||
|         } | ||||
|  | ||||
|         $builder->add('otherPhoneNumbers', ChillCollectionType::class, [ | ||||
|             'entry_type' => PersonPhoneType::class, | ||||
|             'button_add_label' => 'Add new phone', | ||||
|             'button_remove_label' => 'Remove phone', | ||||
|             'required' => false, | ||||
|             'allow_add' => true, | ||||
|             'allow_delete' => true, | ||||
|             'by_reference' => false, | ||||
|             'label' => false, | ||||
|             'delete_empty' => static function (?PersonPhone $pp = null) { | ||||
|                 return null === $pp || $pp->isEmpty(); | ||||
|             }, | ||||
|             'error_bubbling' => false, | ||||
|             'empty_collection_explain' => 'No additional phone numbers', | ||||
|         ]); | ||||
|         if ($this->config['mobilenumber'] === 'visible') { | ||||
|             $builder | ||||
|                 ->add( | ||||
|                     'mobilenumber', | ||||
|                     PhoneNumberType::class, | ||||
|                     [ | ||||
|                         'required' => false, | ||||
|                         'format' => PhoneNumberFormat::INTERNATIONAL, | ||||
|                         'widget' => MisdPhoneNumberType::WIDGET_COUNTRY_CHOICE, | ||||
|                         'country_choices' => ['BE', 'GB', 'JE', 'FR', 'US'], | ||||
|                         'preferred_country_choices' => ['BE', 'FR'], | ||||
|                     ] | ||||
|                 ); | ||||
|         } | ||||
|  | ||||
|         $builder->add( | ||||
|             'otherPhoneNumbers', | ||||
|             ChillCollectionType::class, | ||||
|             [ | ||||
|                 'entry_type' => PhoneNumberType::class, | ||||
|                 'button_add_label' => 'Add new phone', | ||||
|                 'button_remove_label' => 'Remove phone', | ||||
|                 'required' => false, | ||||
|                 'allow_add' => true, | ||||
|                 'allow_delete' => true, | ||||
|                 'by_reference' => false, | ||||
|                 'label' => false, | ||||
|                 'delete_empty' => static function(?PersonPhone $pp = null): bool { | ||||
|                     return NULL === $pp || $pp->isEmpty(); | ||||
|                 }, | ||||
|                 'error_bubbling' => false | ||||
|             ] | ||||
|         ); | ||||
|  | ||||
|         if ('visible' === $this->config['email']) { | ||||
|             $builder | ||||
|   | ||||
| @@ -11,24 +11,24 @@ declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\PersonBundle\Form\Type; | ||||
|  | ||||
| use Chill\MainBundle\Phonenumber\PhonenumberHelper; | ||||
| use Chill\FormTypesBundle\Service\PhoneNumberHelperInterface; | ||||
| use Chill\PersonBundle\Entity\PersonPhone; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use libphonenumber\PhoneNumberFormat; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\TelType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\TextType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\Form\FormEvent; | ||||
| use Symfony\Component\Form\FormEvents; | ||||
| use Symfony\Component\OptionsResolver\OptionsResolver; | ||||
|  | ||||
| class PersonPhoneType extends AbstractType | ||||
| final class PersonPhoneType extends AbstractType | ||||
| { | ||||
|     private PhoneNumberHelperInterface $phonenumberHelper; | ||||
|  | ||||
|     private EntityManagerInterface $em; | ||||
|  | ||||
|     private PhonenumberHelper $phonenumberHelper; | ||||
|  | ||||
|     public function __construct(PhonenumberHelper $phonenumberHelper, EntityManagerInterface $em) | ||||
|     public function __construct(PhoneNumberHelperInterface $phonenumberHelper, EntityManagerInterface $em) | ||||
|     { | ||||
|         $this->phonenumberHelper = $phonenumberHelper; | ||||
|         $this->em = $em; | ||||
| @@ -36,10 +36,16 @@ class PersonPhoneType extends AbstractType | ||||
|  | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $builder->add('phonenumber', TelType::class, [ | ||||
|             'label' => 'Other phonenumber', | ||||
|             'required' => true, | ||||
|         ]); | ||||
|         $builder | ||||
|             ->add( | ||||
|                 'phonenumber', | ||||
|                 PhoneNumberType::class, | ||||
|                 [ | ||||
|                     'label' => 'Other phonenumber', | ||||
|                     'required' => true, | ||||
|                     'format' => PhoneNumberFormat::NATIONAL, | ||||
|                 ] | ||||
|             ); | ||||
|  | ||||
|         $builder->add('description', TextType::class, [ | ||||
|             'required' => false, | ||||
|   | ||||
| @@ -40,13 +40,14 @@ class Select2MaritalStatusType extends AbstractType | ||||
|  | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $transformer = new ObjectToIdTransformer($this->em, 'Chill\PersonBundle\Entity\MaritalStatus'); | ||||
|         $transformer = new ObjectToIdTransformer($this->em, MaritalStatus::class); | ||||
|         $builder->addModelTransformer($transformer); | ||||
|     } | ||||
|  | ||||
|     public function configureOptions(OptionsResolver $resolver) | ||||
|     { | ||||
|         $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll(); | ||||
|         $locale = $this->requestStack->getCurrentRequest()->getLocale(); | ||||
|         $maritalStatuses = $this->em->getRepository(MaritalStatus::class)->findAll(); | ||||
|         $choices = []; | ||||
|  | ||||
|         foreach ($maritalStatuses as $ms) { | ||||
|   | ||||
| @@ -91,17 +91,58 @@ | ||||
|                         <a href="{{ path('chill_person_new') }}" class="btn btn-create"> | ||||
|                             {{ 'Add a person'|trans }} | ||||
|                         </a> | ||||
|                     </li> | ||||
|                     {% endif %} | ||||
|                     {% if preview == true and persons|length < total %} | ||||
|                     <li> | ||||
|                         <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc"> | ||||
|                             {{ 'See all results'|trans }} | ||||
|                         </a> | ||||
|                     </li> | ||||
|                     {% endif %} | ||||
|                 </ul> | ||||
|     {% endif %} | ||||
|                     </td> | ||||
|                     <td> | ||||
|                         {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{  'Unknown date of birth'|trans }}{% endif %} | ||||
|                     </td> | ||||
|                     <td class="person-list__--by-phonenumber__phones"> | ||||
|                         <ul> | ||||
|                             {% if person.phonenumber is not empty %} | ||||
|                                 <li> | ||||
|                                     <a href="tel:{{ person.phonenumber }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}"> <pre>{{ person.phonenumber|phone_number_format('INTERNATIONAL') }}</pre></a> | ||||
|                                 </li> | ||||
|                             {% endif %} | ||||
|                             {% if person.mobilenumber is not empty%} | ||||
|                                 <li> | ||||
|                                     <a href="tel:{{ person.mobilenumber }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}"> <pre>{{ person.mobilenumber|phone_number_format('INTERNATIONAL') }}</pre></a> | ||||
|                                 </li> | ||||
|                             {% endif %} | ||||
|                         </ul> | ||||
|                     </td> | ||||
|                     <td> | ||||
|                         <ul class="record_actions"> | ||||
|                             <li><a class="sc-button bt-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li> | ||||
|                             {% if is_granted('CHILL_PERSON_UPDATE', person) %} | ||||
|                             <li><a class="sc-button bt-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li> | ||||
|                             {% endif %} | ||||
|                         </ul> | ||||
|                     </td> | ||||
|                 </tr> | ||||
|             {% endfor %} | ||||
|         </tbody> | ||||
|     </table> | ||||
|  | ||||
|             <ul class="record_actions"> | ||||
|                 {% if is_granted('CHILL_PERSON_CREATE') %} | ||||
|                 <li> | ||||
|                     <a href="{{ path('chill_person_new') }}" class="sc-button bt-create"> | ||||
|                         {{ 'Add a person'|trans }} | ||||
|                     </a> | ||||
|                 </li> | ||||
|                 {% endif %} | ||||
|                 {% if preview == true and persons|length < total %} | ||||
|                 <li> | ||||
|                     <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="sc-button"> | ||||
|                         {{ 'See all results'|trans }} | ||||
|                     </a> | ||||
|                 </li> | ||||
|                 {% endif %} | ||||
|             </ul> | ||||
| {% endif %} | ||||
|  | ||||
| {% if preview == false %} | ||||
| {{ chill_pagination(paginator) }} | ||||
| {% endif %} | ||||
|  | ||||
|     {% if preview == false %} | ||||
|     {{ chill_pagination(paginator) }} | ||||
|   | ||||
| @@ -119,14 +119,40 @@ This view should receive those arguments: | ||||
|                             {% endapply %}</dd> | ||||
|                     {%- endif -%} | ||||
|  | ||||
|                 </dl> | ||||
|             </figure> | ||||
|         </div> | ||||
|  | ||||
|         {% if person.genderComment.comment is not empty %} | ||||
|             <div class="col-12"> | ||||
|                 <figure class="person-details"> | ||||
|                     <h2 class="chill-beige">{{ 'Gender comment'|trans }} :</h2> | ||||
|             {%- if chill_person.fields.email == 'visible' -%} | ||||
|             <dl> | ||||
|                 <dt>{{ 'Email'|trans }} :</dt> | ||||
|                 <dd>{% if person.email is not empty %}<a href="mailto:{{ person.email|escape('html_attr') }}">{{ person.email }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd> | ||||
|             </dl> | ||||
|             {%- endif -%} | ||||
|             {%- if chill_person.fields.phonenumber == 'visible' -%} | ||||
|             <dl> | ||||
|                 <dt>{{ 'Phonenumber'|trans }} :</dt> | ||||
|                 <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber|phone_number_format('INTERNATIONAL') }}"><pre>{{ person.phonenumber|phone_number_format('INTERNATIONAL') }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd> | ||||
|             </dl> | ||||
|             {% endif %} | ||||
|             {%- if chill_person.fields.mobilenumber == 'visible' -%} | ||||
|             <dl> | ||||
|                 <dt>{{ 'Mobilenumber'|trans }} :</dt> | ||||
|                 <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber|phone_number_format('INTERNATIONAL') }}"><pre>{{ person.mobilenumber|phone_number_format('INTERNATIONAL') }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd> | ||||
|             </dl> | ||||
|             {% endif %} | ||||
|             {% for pp in person.otherPhoneNumbers %} | ||||
|                 <dt>{{ 'Other phonenumber'|trans }} :</dt> | ||||
|                 <dd> | ||||
|                     <a href="tel:{{ pp.phoneNumber|phone_number_format('INTERNATIONAL') }}"><pre>{{ pp.phoneNumber|phone_number_format('INTERNATIONAL') }}</pre></a> | ||||
|                     {% if pp.description is not empty %} | ||||
|                     <blockquote class="chill-user-quote"> | ||||
|                     {{ pp.description|nl2br }} | ||||
|                     {% endif %} | ||||
|                     </blockquote> | ||||
|                 </dd> | ||||
|             {% endfor %} | ||||
|             {%- if chill_person.fields.contact_info == 'visible' -%} | ||||
|             <dl> | ||||
|                 <dt>{{ 'Notes on contact information'|trans }} :</dt> | ||||
|                 <dd> | ||||
|                     {% if person.contactInfo is not empty %} | ||||
|                     <div class="chill-user-quote"> | ||||
|                         {{ person.genderComment.comment|chill_markdown_to_html }} | ||||
|                     </div> | ||||
| @@ -317,4 +343,4 @@ This view should receive those arguments: | ||||
|     {% endif %} | ||||
|  | ||||
| </div> | ||||
| {% endblock %} | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -0,0 +1,57 @@ | ||||
| <?php | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\Migrations\Person; | ||||
|  | ||||
| use Doctrine\DBAL\Schema\Schema; | ||||
| use Doctrine\Migrations\AbstractMigration; | ||||
|  | ||||
| /** | ||||
|  * Auto-generated Migration: Please modify to your needs! | ||||
|  */ | ||||
| final class Version20210518135515 extends AbstractMigration | ||||
| { | ||||
|     public function getDescription(): string | ||||
|     { | ||||
|         return ''; | ||||
|     } | ||||
|  | ||||
|     public function up(Schema $schema): void | ||||
|     { | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE VARCHAR(35)'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP NOT NULL'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS \'(DC2Type:phone_number)\''); | ||||
|  | ||||
|         $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE VARCHAR(35)'); | ||||
|         $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS \'(DC2Type:phone_number)\''); | ||||
|  | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE VARCHAR(35)'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS \'(DC2Type:phone_number)\''); | ||||
|  | ||||
|         $this->addSql('UPDATE chill_person_person SET phonenumber = NULL WHERE phonenumber=:pn', array('pn' => '')); | ||||
|         $this->addSql('UPDATE chill_person_person SET mobilenumber = NULL WHERE mobilenumber=:pn', array('pn' => '')); | ||||
|     } | ||||
|  | ||||
|     public function down(Schema $schema): void | ||||
|     { | ||||
|         $this->addSql('UPDATE chill_person_person SET phonenumber = :pn WHERE phonenumber IS NULL', array('pn' => '')); | ||||
|         $this->addSql('UPDATE chill_person_person SET mobilenumber = :pn WHERE mobilenumber IS NULL', array('pn' => '')); | ||||
|  | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE TEXT'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET NOT NULL'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS NULL'); | ||||
|  | ||||
|         $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT'); | ||||
|         $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS NULL'); | ||||
|  | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE TEXT'); | ||||
|         $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT'); | ||||
|         $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL'); | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user