diff --git a/core/composer.json b/core/composer.json index 9e68eaa..1266df3 100644 --- a/core/composer.json +++ b/core/composer.json @@ -70,6 +70,7 @@ "drupal/core-discovery": "self.version", "drupal/core-event-dispatcher": "self.version", "drupal/core-file-cache": "self.version", + "drupal/core-filesystem": "self.version", "drupal/core-gettext": "self.version", "drupal/core-graph": "self.version", "drupal/core-php-storage": "self.version", diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php index 1d8bbb7..42fa409 100644 --- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php +++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php @@ -295,6 +295,30 @@ public function __call($method, $args) { } /** + * Returns the difference between two DateTimePlus objects. + * + * @param \Drupal\Component\Datetime\DateTimePlus|\DateTime $datetime2 + * The date to compare to. + * @param bool $absolute + * Should the interval be forced to be positive? + * + * @return \DateInterval + * A DateInterval object representing the difference between the two dates. + * + * @throws \BadMethodCallException + * If the input isn't a DateTime or DateTimePlus object. + */ + public function diff($datetime2, $absolute = FALSE) { + if ($datetime2 instanceof DateTimePlus) { + $datetime2 = $datetime2->dateTimeObject; + } + if (!($datetime2 instanceof \DateTime)) { + throw new \BadMethodCallException(sprintf('Method %s expects parameter 1 to be a \DateTime or \Drupal\Component\Datetime\DateTimePlus object', __METHOD__)); + } + return $this->dateTimeObject->diff($datetime2, $absolute); + } + + /** * Implements the magic __callStatic method. * * Passes through all unknown static calls onto the DateTime object. @@ -592,4 +616,5 @@ public function format($format, $settings = array()) { return $value; } + } diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php index 4afcbd3..2e35611 100644 --- a/core/lib/Drupal/Component/Diff/Diff.php +++ b/core/lib/Drupal/Component/Diff/Diff.php @@ -168,4 +168,5 @@ public function check($from_lines, $to_lines) { public function getEdits() { return $this->edits; } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php index ca47094..b27886d 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php @@ -453,4 +453,5 @@ protected function _shift_boundaries($lines, &$changed, $other_changed) { } } } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOp.php b/core/lib/Drupal/Component/Diff/Engine/DiffOp.php index fa7b996..29d749d 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffOp.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffOp.php @@ -23,4 +23,5 @@ public function norig() { public function nclosing() { return $this->closing ? sizeof($this->closing) : 0; } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php index ee4a875..14429c2 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php @@ -18,4 +18,5 @@ public function __construct($lines) { public function reverse() { return new DiffOpDelete($this->closing); } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php index 1e8b4c3..4abd6ac 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php @@ -18,4 +18,5 @@ public function __construct($orig, $closing) { public function reverse() { return new DiffOpChange($this->closing, $this->orig); } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php index c48a2d9..4128d57 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php @@ -21,4 +21,5 @@ public function __construct($orig, $closing = FALSE) { public function reverse() { return new DiffOpCopy($this->closing, $this->orig); } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php index 5d777d1..e402d66 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php @@ -18,4 +18,5 @@ public function __construct($lines) { public function reverse() { return new DiffOpAdd($this->orig); } + } diff --git a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php index 92ed706..532c701 100644 --- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php +++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php @@ -75,4 +75,5 @@ public function getLines() { $this->_flushLine('~done'); return $this->lines; } + } diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php index 9a6e8bb..d49cc0d 100644 --- a/core/lib/Drupal/Component/Diff/MappedDiff.php +++ b/core/lib/Drupal/Component/Diff/MappedDiff.php @@ -52,4 +52,5 @@ public function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_ } } } + } diff --git a/core/lib/Drupal/Component/Diff/WordLevelDiff.php b/core/lib/Drupal/Component/Diff/WordLevelDiff.php index c9114bc..a19c687 100644 --- a/core/lib/Drupal/Component/Diff/WordLevelDiff.php +++ b/core/lib/Drupal/Component/Diff/WordLevelDiff.php @@ -78,4 +78,5 @@ public function closing() { $lines = $closing->getLines(); return $lines; } + } diff --git a/core/lib/Drupal/Component/FileSystem/LICENSE.txt b/core/lib/Drupal/Component/FileSystem/LICENSE.txt new file mode 100644 index 0000000..94fb846 --- /dev/null +++ b/core/lib/Drupal/Component/FileSystem/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/core/lib/Drupal/Component/FileSystem/README.txt b/core/lib/Drupal/Component/FileSystem/README.txt new file mode 100644 index 0000000..0d4732f --- /dev/null +++ b/core/lib/Drupal/Component/FileSystem/README.txt @@ -0,0 +1,12 @@ +The Drupal FileSystem Component + +Thanks for using this Drupal component. + +You can participate in its development on Drupal.org, through our issue system: +https://www.drupal.org/project/issues/drupal + +You can get the full Drupal repo here: +https://www.drupal.org/project/drupal/git-instructions + +You can browse the full Drupal repo here: +http://cgit.drupalcode.org/drupal diff --git a/core/lib/Drupal/Component/FileSystem/TESTING.txt b/core/lib/Drupal/Component/FileSystem/TESTING.txt new file mode 100644 index 0000000..94175c9 --- /dev/null +++ b/core/lib/Drupal/Component/FileSystem/TESTING.txt @@ -0,0 +1,18 @@ +HOW-TO: Test this Drupal component + +In order to test this component, you'll need to get the entire Drupal repo and +run the tests there. + +You'll find the tests under core/tests/Drupal/Tests/Component. + +You can get the full Drupal repo here: +https://www.drupal.org/project/drupal/git-instructions + +You can find more information about running PHPUnit tests with Drupal here: +https://www.drupal.org/node/2116263 + +Each component in the Drupal\Component namespace has its own annotated test +group. You can use this group to run only the tests for this component. Like +this: + +$ ./vendor/bin/phpunit -c core --group FileSystem diff --git a/core/lib/Drupal/Component/FileSystem/composer.json b/core/lib/Drupal/Component/FileSystem/composer.json new file mode 100644 index 0000000..ed84f18 --- /dev/null +++ b/core/lib/Drupal/Component/FileSystem/composer.json @@ -0,0 +1,15 @@ +{ + "name": "drupal/core-filesystem", + "description": "FileSystem.", + "keywords": ["drupal"], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0+", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\FileSystem\\": "" + } + } +} diff --git a/core/lib/Drupal/Component/Gettext/PoHeader.php b/core/lib/Drupal/Component/Gettext/PoHeader.php index f92cfd9..5922301 100644 --- a/core/lib/Drupal/Component/Gettext/PoHeader.php +++ b/core/lib/Drupal/Component/Gettext/PoHeader.php @@ -559,4 +559,5 @@ protected function evaluatePlural($element_stack, $n) { } return (int) $element_stack[0]; } + } diff --git a/core/lib/Drupal/Component/Graph/Graph.php b/core/lib/Drupal/Component/Graph/Graph.php index 2dd430d..5d8d5ca 100644 --- a/core/lib/Drupal/Component/Graph/Graph.php +++ b/core/lib/Drupal/Component/Graph/Graph.php @@ -154,4 +154,5 @@ protected function depthFirstSearch(&$state, $start, &$component = NULL) { // topological order if the graph is acyclic. $state['last_visit_order'][] = $start; } + } diff --git a/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php b/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php index 1bd7b65..0c97c6d 100644 --- a/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php +++ b/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php @@ -31,4 +31,5 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition) public function getDerivativeDefinitions($base_plugin_definition) { return $this->derivatives; } + } diff --git a/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php b/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php index fd4e5e5..2028f40 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php @@ -240,4 +240,5 @@ protected function mergeDerivativeDefinition($base_plugin_definition, $derivativ public function __call($method, $args) { return call_user_func_array(array($this->decorated, $method), $args); } + } diff --git a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php index d967a0b..f7ee671 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php @@ -33,4 +33,5 @@ public function setDefinition($plugin, $definition) { public function deleteDefinition($plugin) { unset($this->definitions[$plugin]); } + } diff --git a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php index 157d87b..889d146 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php @@ -63,4 +63,5 @@ public function getDefinitions() { public function __call($method, $args) { return call_user_func_array(array($this->decorated, $method), $args); } + } diff --git a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php index b634d51..2cca811 100644 --- a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php +++ b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php @@ -103,4 +103,5 @@ public static function getPluginClass($plugin_id, $plugin_definition = NULL, $re return $class; } + } diff --git a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php index 3bd3237..9954422 100644 --- a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php +++ b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php @@ -76,4 +76,5 @@ protected function getInstanceArguments(\ReflectionClass $reflector, $plugin_id, } return $arguments; } + } diff --git a/core/lib/Drupal/Component/Plugin/PluginBase.php b/core/lib/Drupal/Component/Plugin/PluginBase.php index cd339a1..b608e90 100644 --- a/core/lib/Drupal/Component/Plugin/PluginBase.php +++ b/core/lib/Drupal/Component/Plugin/PluginBase.php @@ -92,4 +92,5 @@ public function getDerivativeId() { public function getPluginDefinition() { return $this->pluginDefinition; } + } diff --git a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php index 0953bfe..c20168d 100644 --- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php +++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php @@ -280,4 +280,5 @@ protected function readGenericData($bank) { // Save this data. $this->genericMap[$bank] = $base; } + } diff --git a/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php b/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php index 3a6771f..2291fcc 100644 --- a/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php +++ b/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php @@ -46,4 +46,5 @@ public function removeDiacritics($string); * characters, and unknown characters replaced with $unknown_character. */ public function transliterate($string, $langcode = 'en', $unknown_character = '?', $max_length = NULL); + } diff --git a/core/lib/Drupal/Component/Utility/Xss.php b/core/lib/Drupal/Component/Utility/Xss.php index 8f2bffd..ab8be78 100644 --- a/core/lib/Drupal/Component/Utility/Xss.php +++ b/core/lib/Drupal/Component/Utility/Xss.php @@ -343,4 +343,5 @@ public static function getAdminTagList() { public static function getHtmlTagList() { return static::$htmlTags; } + } diff --git a/core/lib/Drupal/Component/Uuid/Com.php b/core/lib/Drupal/Component/Uuid/Com.php index 13b943f..0701132 100644 --- a/core/lib/Drupal/Component/Uuid/Com.php +++ b/core/lib/Drupal/Component/Uuid/Com.php @@ -15,4 +15,5 @@ public function generate() { // Remove {} wrapper and make lower case to keep result consistent. return strtolower(trim(com_create_guid(), '{}')); } + } diff --git a/core/lib/Drupal/Component/Uuid/Pecl.php b/core/lib/Drupal/Component/Uuid/Pecl.php index 7960ff0..88e0c63 100644 --- a/core/lib/Drupal/Component/Uuid/Pecl.php +++ b/core/lib/Drupal/Component/Uuid/Pecl.php @@ -13,4 +13,5 @@ class Pecl implements UuidInterface { public function generate() { return uuid_create(UUID_TYPE_DEFAULT); } + } diff --git a/core/lib/Drupal/Component/Uuid/UuidInterface.php b/core/lib/Drupal/Component/Uuid/UuidInterface.php index 16ee8bb..f9f8a7b 100644 --- a/core/lib/Drupal/Component/Uuid/UuidInterface.php +++ b/core/lib/Drupal/Component/Uuid/UuidInterface.php @@ -14,4 +14,5 @@ * A 16 byte integer represented as a hex string formatted with 4 hyphens. */ public function generate(); + } diff --git a/core/lib/Drupal/Core/Access/AccessManager.php b/core/lib/Drupal/Core/Access/AccessManager.php index 81c911b..b0a71ae 100644 --- a/core/lib/Drupal/Core/Access/AccessManager.php +++ b/core/lib/Drupal/Core/Access/AccessManager.php @@ -169,5 +169,4 @@ protected function performCheck($service_id, ArgumentsResolverInterface $argumen return $service_access; } - } diff --git a/core/lib/Drupal/Core/Access/CheckProviderInterface.php b/core/lib/Drupal/Core/Access/CheckProviderInterface.php index 5f54cdf..bb0dd4a 100644 --- a/core/lib/Drupal/Core/Access/CheckProviderInterface.php +++ b/core/lib/Drupal/Core/Access/CheckProviderInterface.php @@ -61,4 +61,5 @@ public function loadCheck($service_id); * @return array */ public function getChecksNeedRequest(); + } diff --git a/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php b/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php index f1d6044..fa58208 100644 --- a/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php +++ b/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php @@ -46,4 +46,5 @@ public function render() { 'persist' => $this->persist, ); } + } diff --git a/core/lib/Drupal/Core/Ajax/CommandInterface.php b/core/lib/Drupal/Core/Ajax/CommandInterface.php index b6c3b2f..4865289 100644 --- a/core/lib/Drupal/Core/Ajax/CommandInterface.php +++ b/core/lib/Drupal/Core/Ajax/CommandInterface.php @@ -16,4 +16,5 @@ * Return an array to be run through json_encode and sent to the client. */ public function render(); + } diff --git a/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php index 45b14ee..edb4fe3 100644 --- a/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php +++ b/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php @@ -33,4 +33,5 @@ public function __construct($title, $content, array $dialog_options = array(), $ $dialog_options['modal'] = TRUE; parent::__construct('#drupal-modal', $title, $content, $dialog_options, $settings); } + } diff --git a/core/lib/Drupal/Core/Ajax/SetDialogTitleCommand.php b/core/lib/Drupal/Core/Ajax/SetDialogTitleCommand.php index 6f59cb4..4294aeb 100644 --- a/core/lib/Drupal/Core/Ajax/SetDialogTitleCommand.php +++ b/core/lib/Drupal/Core/Ajax/SetDialogTitleCommand.php @@ -23,4 +23,5 @@ public function __construct($selector, $title) { $this->optionName = 'title'; $this->optionValue = $title; } + } diff --git a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php index 433a541..38c62cb 100644 --- a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php +++ b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php @@ -56,4 +56,5 @@ public function extract($path, array $files = array()); * An array of file names relative to the root of the archive. */ public function listContents(); + } diff --git a/core/lib/Drupal/Core/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php index 3bf66c0..33f4de6 100644 --- a/core/lib/Drupal/Core/Archiver/Tar.php +++ b/core/lib/Drupal/Core/Archiver/Tar.php @@ -87,4 +87,5 @@ public function listContents() { public function getArchive() { return $this->tar; } + } diff --git a/core/lib/Drupal/Core/Archiver/Zip.php b/core/lib/Drupal/Core/Archiver/Zip.php index 045e6c0..640bcde 100644 --- a/core/lib/Drupal/Core/Archiver/Zip.php +++ b/core/lib/Drupal/Core/Archiver/Zip.php @@ -89,4 +89,5 @@ public function listContents() { public function getArchive() { return $this->zip; } + } diff --git a/core/lib/Drupal/Core/Cache/BackendChain.php b/core/lib/Drupal/Core/Cache/BackendChain.php index af8af0d..851978b 100644 --- a/core/lib/Drupal/Core/Cache/BackendChain.php +++ b/core/lib/Drupal/Core/Cache/BackendChain.php @@ -19,7 +19,6 @@ * * @ingroup cache */ - class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterface { /** diff --git a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php index f486506..68c5b5a 100644 --- a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php +++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php @@ -215,4 +215,5 @@ public function garbageCollection(); * Remove a cache bin. */ public function removeBin(); + } diff --git a/core/lib/Drupal/Core/Cache/CacheTagsChecksumInterface.php b/core/lib/Drupal/Core/Cache/CacheTagsChecksumInterface.php index accbd8b..3ec62be 100644 --- a/core/lib/Drupal/Core/Cache/CacheTagsChecksumInterface.php +++ b/core/lib/Drupal/Core/Cache/CacheTagsChecksumInterface.php @@ -54,4 +54,5 @@ public function isValid($checksum, array $tags); * This is only used by tests. */ public function reset(); + } diff --git a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php index eb7ce68..a13b763 100644 --- a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php @@ -8,7 +8,7 @@ /** * Defines the LanguagesCacheContext service, for "per language" caching. */ -class LanguagesCacheContext implements CalculatedCacheContextInterface { +class LanguagesCacheContext implements CalculatedCacheContextInterface { /** * The language manager. diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index f5fb598..a96d183 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -477,4 +477,5 @@ public function schemaDefinition() { ); return $schema; } + } diff --git a/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php b/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php index 826f0dd..27886ac 100644 --- a/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php +++ b/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php @@ -28,4 +28,5 @@ public function process(ContainerBuilder $container) { $container->setParameter('cache_bins', $cache_bins); $container->setParameter('cache_default_bin_backends', $cache_default_bin_backends); } + } diff --git a/core/lib/Drupal/Core/Cache/NullBackend.php b/core/lib/Drupal/Core/Cache/NullBackend.php index 4939bb5..fec549f 100644 --- a/core/lib/Drupal/Core/Cache/NullBackend.php +++ b/core/lib/Drupal/Core/Cache/NullBackend.php @@ -88,4 +88,5 @@ public function garbageCollection() {} * {@inheritdoc} */ public function removeBin() {} + } diff --git a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php index 082b0ca..3b9f654 100644 --- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php +++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php @@ -56,4 +56,5 @@ public static function getDatabaseStorage() { public static function getFileStorage() { return new FileStorage(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY)); } + } diff --git a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php index aa5045b..a8a42c5 100644 --- a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php +++ b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php @@ -99,4 +99,5 @@ public function setOverride($name, array $values) { } return $this; } + } diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php index 30d3fa9..930eea1 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -325,5 +325,4 @@ public function getAllCollectionNames() { } } - } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php index 5e9e4d7..44c02e3 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php @@ -121,4 +121,5 @@ protected function addDependencyListsToForm(array &$form, $type, array $names, C } } + } diff --git a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php index 9fc7d4c..bdeb023 100644 --- a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php +++ b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php @@ -131,4 +131,5 @@ protected function getAllFolders() { } return $this->folders; } + } diff --git a/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php b/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php index 9b6b068..f74cc91 100644 --- a/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php +++ b/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php @@ -42,4 +42,5 @@ public function getDefinitions() { } return $definitions; } + } diff --git a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php index fcbda71..972eda4 100644 --- a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php +++ b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php @@ -133,4 +133,5 @@ protected function checkValue($key, $value) { // No errors found. return array(); } + } diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index 51b1c51..9117891 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -40,7 +40,7 @@ * * @ingroup container */ -class CoreServiceProvider implements ServiceProviderInterface, ServiceModifierInterface { +class CoreServiceProvider implements ServiceProviderInterface, ServiceModifierInterface { /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Cron.php b/core/lib/Drupal/Core/Cron.php index 2750d9a..533ae48 100644 --- a/core/lib/Drupal/Core/Cron.php +++ b/core/lib/Drupal/Core/Cron.php @@ -2,6 +2,7 @@ namespace Drupal\Core; +use Drupal\Component\Utility\Timer; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Queue\QueueWorkerManagerInterface; use Drupal\Core\Queue\RequeueException; @@ -192,8 +193,25 @@ protected function processQueues() { * Invokes any cron handlers implementing hook_cron. */ protected function invokeCronHandlers() { + $module_previous = ''; + // Iterate through the modules calling their cron handlers (if any): foreach ($this->moduleHandler->getImplementations('cron') as $module) { + + if (!$module_previous) { + $this->logger->notice('Starting execution of @module_cron().', [ + '@module' => $module, + ]); + } + else { + $this->logger->notice('Starting execution of @module_cron(), execution of @module_previous_cron() took @time.', [ + '@module' => $module, + '@module_previous' => $module_previous, + '@time' => Timer::read('cron_' . $module_previous) . 'ms', + ]); + } + Timer::start('cron_' . $module); + // Do not let an exception thrown by one module disturb another. try { $this->moduleHandler->invoke($module, 'cron'); @@ -201,6 +219,9 @@ protected function invokeCronHandlers() { catch (\Exception $e) { watchdog_exception('cron', $e); } + + Timer::stop('cron_' . $module); + $module_previous = $module; } } diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php index 130d46a..213eb83 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php @@ -58,4 +58,5 @@ public function __toString() { return $query; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php index 0c1d036..a91b240 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php @@ -282,4 +282,5 @@ public function getFormOptions(array $database) { } return $form; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php index 937678e..4cd660b 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php @@ -844,6 +844,7 @@ protected function hashBase64($data) { // Modify the hash so it's safe to use in PostgreSQL identifiers. return strtr($hash, array('+' => '_', '/' => '_', '=' => '')); } + } /** diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php index 2537963..3214b33 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php @@ -152,6 +152,7 @@ public function execute() { return $result; } + } /** diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php index 13e11f3..0d9947b 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php @@ -25,4 +25,5 @@ public function execute() { return $result; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php index 23c3aa5..3a5b970 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php @@ -103,4 +103,5 @@ protected function connect() { } return TRUE; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php index be400ad..6d7caab 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php @@ -12,4 +12,5 @@ public function forUpdate($set = TRUE) { // SQLite does not support FOR UPDATE so nothing to do. return $this; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php index 33a37eb..adc537c 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php @@ -141,4 +141,5 @@ public function execute($args = array(), $options = array()) { return $return; } + } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php index 6cd3b9e..c58ff7d 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php @@ -17,4 +17,5 @@ public function __toString() { return $comments . 'DELETE FROM {' . $this->connection->escapeTable($this->table) . '} '; } + } diff --git a/core/lib/Drupal/Core/Database/Log.php b/core/lib/Drupal/Core/Database/Log.php index 84f55cb..76c39db 100644 --- a/core/lib/Drupal/Core/Database/Log.php +++ b/core/lib/Drupal/Core/Database/Log.php @@ -163,4 +163,5 @@ public function findCaller() { } } } + } diff --git a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php index 8e0c778..002e39e 100644 --- a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php +++ b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php @@ -87,4 +87,5 @@ public function addMetaData($key, $object); * The previously attached metadata object, or NULL if one doesn't exist. */ public function getMetaData($key); + } diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php index 01fbfff..cb39dfd 100644 --- a/core/lib/Drupal/Core/Database/Query/Condition.php +++ b/core/lib/Drupal/Core/Database/Query/Condition.php @@ -351,4 +351,5 @@ public function andConditionGroup() { public function orConditionGroup() { return $this->conditionGroupFactory('OR'); } + } diff --git a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php index ae5abd2..bd0b52b 100644 --- a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php +++ b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php @@ -191,4 +191,5 @@ public function andConditionGroup(); * @return \Drupal\Core\Database\Query\ConditionInterface */ public function orConditionGroup(); + } diff --git a/core/lib/Drupal/Core/Database/Query/Delete.php b/core/lib/Drupal/Core/Database/Query/Delete.php index eb84388..65f96c9 100644 --- a/core/lib/Drupal/Core/Database/Query/Delete.php +++ b/core/lib/Drupal/Core/Database/Query/Delete.php @@ -75,4 +75,5 @@ public function __toString() { return $query; } + } diff --git a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php index 79c0633..b0d6f76 100644 --- a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php +++ b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php @@ -25,4 +25,5 @@ * The extender object, which now contains a reference to this object. */ public function extend($extender_name); + } diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php index f51b6ed..a0fa599 100644 --- a/core/lib/Drupal/Core/Database/Query/Insert.php +++ b/core/lib/Drupal/Core/Database/Query/Insert.php @@ -170,4 +170,5 @@ protected function preExecute() { } return TRUE; } + } diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php index 7d60278..8bd02fa 100644 --- a/core/lib/Drupal/Core/Database/Query/Merge.php +++ b/core/lib/Drupal/Core/Database/Query/Merge.php @@ -403,4 +403,5 @@ public function execute() { } } } + } diff --git a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php index a925e31..5207f58 100644 --- a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php +++ b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php @@ -166,4 +166,5 @@ public function element($element) { } return $this; } + } diff --git a/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php b/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php index ddfb5ff..f2a00de 100644 --- a/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php +++ b/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php @@ -19,4 +19,5 @@ public function uniqueIdentifier(); * The next available placeholder ID as an integer. */ public function nextPlaceholder(); + } diff --git a/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/core/lib/Drupal/Core/Database/Query/SelectExtender.php index 8cd5755..808593c 100644 --- a/core/lib/Drupal/Core/Database/Query/SelectExtender.php +++ b/core/lib/Drupal/Core/Database/Query/SelectExtender.php @@ -532,4 +532,5 @@ public function andConditionGroup() { public function orConditionGroup() { return $this->conditionGroupFactory('OR'); } + } diff --git a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php index febb66c..285f1d6 100644 --- a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php +++ b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php @@ -96,4 +96,5 @@ protected function getQueryParameters() { protected function order() { return tablesort_get_order($this->header); } + } diff --git a/core/lib/Drupal/Core/Database/Query/Truncate.php b/core/lib/Drupal/Core/Database/Query/Truncate.php index 0ca286d..64520ee 100644 --- a/core/lib/Drupal/Core/Database/Query/Truncate.php +++ b/core/lib/Drupal/Core/Database/Query/Truncate.php @@ -80,4 +80,5 @@ public function __toString() { return $comments . 'TRUNCATE {' . $this->connection->escapeTable($this->table) . '} '; } } + } diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php index fcd824d..1a21415 100644 --- a/core/lib/Drupal/Core/Database/Schema.php +++ b/core/lib/Drupal/Core/Database/Schema.php @@ -655,4 +655,5 @@ protected function escapeDefaultValue($value) { } return is_string($value) ? $this->connection->quote($value) : $value; } + } diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php index e0147f4..5bc9e48 100644 --- a/core/lib/Drupal/Core/Database/StatementInterface.php +++ b/core/lib/Drupal/Core/Database/StatementInterface.php @@ -208,4 +208,5 @@ public function fetchAllKeyed($key_index = 0, $value_index = 1); * An associative array, or an empty array if there is no result set. */ public function fetchAllAssoc($key, $fetch = NULL); + } diff --git a/core/lib/Drupal/Core/Database/Transaction.php b/core/lib/Drupal/Core/Database/Transaction.php index 5798343..8db30ab 100644 --- a/core/lib/Drupal/Core/Database/Transaction.php +++ b/core/lib/Drupal/Core/Database/Transaction.php @@ -93,4 +93,5 @@ public function rollback() { $this->rolledBack = TRUE; $this->connection->rollback($this->name); } + } diff --git a/core/lib/Drupal/Core/DependencyInjection/Container.php b/core/lib/Drupal/Core/DependencyInjection/Container.php index 47b4297..157f576 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Container.php +++ b/core/lib/Drupal/Core/DependencyInjection/Container.php @@ -29,4 +29,5 @@ public function __sleep() { assert(FALSE, 'The container was serialized.'); return array_keys(get_object_vars($this)); } + } diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php b/core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php index 03bf726..cccf691 100644 --- a/core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php +++ b/core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php @@ -24,4 +24,5 @@ * The service container this instance should use. */ public static function create(ContainerInterface $container); + } diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php index 0f02dd7..1fb810b 100644 --- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php +++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php @@ -52,7 +52,8 @@ public function __construct(ContainerBuilder $container) /** * Loads a Yaml file. * - * @param mixed $file The resource + * @param mixed $file + * The resource */ public function load($file) { @@ -99,7 +100,7 @@ public function load($file) /** * Parses definitions * - * @param array $content + * @param array $content * @param string $file */ private function parseDefinitions($content, $file) @@ -121,7 +122,7 @@ private function parseDefinitions($content, $file) * Parses a definition. * * @param string $id - * @param array $service + * @param array $service * @param string $file * * @throws InvalidArgumentException When tags are invalid @@ -336,7 +337,7 @@ protected function loadFile($file) /** * Validates a YAML file. * - * @param mixed $content + * @param mixed $content * @param string $file * * @return array diff --git a/core/lib/Drupal/Core/DestructableInterface.php b/core/lib/Drupal/Core/DestructableInterface.php index dd68903..fe39f8f 100644 --- a/core/lib/Drupal/Core/DestructableInterface.php +++ b/core/lib/Drupal/Core/DestructableInterface.php @@ -18,4 +18,5 @@ * Performs destruct operations. */ public function destruct(); + } diff --git a/core/lib/Drupal/Core/Diff/DiffFormatter.php b/core/lib/Drupal/Core/Diff/DiffFormatter.php index 53ae74f..52f2894 100644 --- a/core/lib/Drupal/Core/Diff/DiffFormatter.php +++ b/core/lib/Drupal/Core/Diff/DiffFormatter.php @@ -211,4 +211,5 @@ protected function _changed($orig, $closing) { $this->rows[] = array_merge($this->emptyLine(), $this->addedLine($line)); } } + } diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 24a8e4f..90541f4 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -1506,4 +1506,5 @@ protected static function setupTrustedHosts(Request $request, $host_patterns) { protected function addServiceFiles(array $service_yamls) { $this->serviceYamls['site'] = array_filter($service_yamls, 'file_exists'); } + } diff --git a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php index 3e17e80..23fd0b5 100644 --- a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php +++ b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php @@ -57,19 +57,33 @@ public static function valueCallback(&$element, $input, FormStateInterface $form if (is_array($element['#default_value']) && $element['#tags'] !== TRUE) { throw new \InvalidArgumentException('The #default_value property is an array but the form element does not allow multiple values.'); } - elseif (!is_array($element['#default_value'])) { + elseif (!empty($element['#default_value']) && !is_array($element['#default_value'])) { // Convert the default value into an array for easier processing in // static::getEntityLabels(). $element['#default_value'] = array($element['#default_value']); } - if ($element['#default_value'] && !(reset($element['#default_value']) instanceof EntityInterface)) { - throw new \InvalidArgumentException('The #default_value property has to be an entity object or an array of entity objects.'); + if ($element['#default_value']) { + if (!(reset($element['#default_value']) instanceof EntityInterface)) { + throw new \InvalidArgumentException('The #default_value property has to be an entity object or an array of entity objects.'); + } + + // Extract the labels from the passed-in entity objects, taking access + // checks into account. + return static::getEntityLabels($element['#default_value']); } + } - // Extract the labels from the passed-in entity objects, taking access - // checks into account. - return static::getEntityLabels($element['#default_value']); + // Potentially the #value is set directly, so it contains the 'target_id' + // array structure instead of a string. + if ($input !== FALSE && is_array($input)) { + $entity_ids = array_map(function(array $item) { + return $item['target_id']; + }, $input); + + $entities = \Drupal::entityTypeManager()->getStorage($element['#target_type'])->loadMultiple($entity_ids); + + return static::getEntityLabels($entities); } } @@ -136,6 +150,7 @@ public static function processEntityAutocomplete(array &$element, FormStateInter */ public static function validateEntityAutocomplete(array &$element, FormStateInterface $form_state, array &$complete_form) { $value = NULL; + if (!empty($element['#value'])) { $options = array( 'target_type' => $element['#target_type'], @@ -146,27 +161,35 @@ public static function validateEntityAutocomplete(array &$element, FormStateInte $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getInstance($options); $autocreate = (bool) $element['#autocreate'] && $handler instanceof SelectionWithAutocreateInterface; - $input_values = $element['#tags'] ? Tags::explode($element['#value']) : array($element['#value']); - foreach ($input_values as $input) { - $match = static::extractEntityIdFromAutocompleteInput($input); - if ($match === NULL) { - // Try to get a match from the input string when the user didn't use - // the autocomplete but filled in a value manually. - $match = static::matchEntityByTitle($handler, $input, $element, $form_state, !$autocreate); - } + // GET forms might pass the validated data around on the next request, in + // which case it will already be in the expected format. + if (is_array($element['#value'])) { + $value = $element['#value']; + } + else { + $input_values = $element['#tags'] ? Tags::explode($element['#value']) : array($element['#value']); + + foreach ($input_values as $input) { + $match = static::extractEntityIdFromAutocompleteInput($input); + if ($match === NULL) { + // Try to get a match from the input string when the user didn't use + // the autocomplete but filled in a value manually. + $match = static::matchEntityByTitle($handler, $input, $element, $form_state, !$autocreate); + } - if ($match !== NULL) { - $value[] = array( - 'target_id' => $match, - ); - } - elseif ($autocreate) { - /** @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionWithAutocreateInterface $handler */ - // Auto-create item. See an example of how this is handled in - // \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::presave(). - $value[] = array( - 'entity' => $handler->createNewEntity($element['#target_type'], $element['#autocreate']['bundle'], $input, $element['#autocreate']['uid']), - ); + if ($match !== NULL) { + $value[] = array( + 'target_id' => $match, + ); + } + elseif ($autocreate) { + /** @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionWithAutocreateInterface $handler */ + // Auto-create item. See an example of how this is handled in + // \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::presave(). + $value[] = array( + 'entity' => $handler->createNewEntity($element['#target_type'], $element['#autocreate']['bundle'], $input, $element['#autocreate']['uid']), + ); + } } } diff --git a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php index b5fab53..b4a616a 100644 --- a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php +++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php @@ -301,4 +301,5 @@ public function getPluginCollections() { 'formatters' => new EntityDisplayPluginCollection($this->pluginManager, $configurations) ); } + } diff --git a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php index ca7d1b9..7475717 100644 --- a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php @@ -42,4 +42,5 @@ public function setChangedTime($timestamp); * translations. */ public function getChangedTimeAcrossTranslations(); + } diff --git a/core/lib/Drupal/Core/Entity/EntityChangedTrait.php b/core/lib/Drupal/Core/Entity/EntityChangedTrait.php index 8b2f8cf..f94441b 100644 --- a/core/lib/Drupal/Core/Entity/EntityChangedTrait.php +++ b/core/lib/Drupal/Core/Entity/EntityChangedTrait.php @@ -45,4 +45,5 @@ public function setChangedTime($timestamp) { $this->set('changed', $timestamp); return $this; } + } diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php index e3d8d56..e7a2a52 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php @@ -26,4 +26,5 @@ public function getTargetType(); * @return $this */ public function setTargetType($target_entity_type); + } diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php index 70e4f7c..f583121 100644 --- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php @@ -159,7 +159,7 @@ protected function setStaticCache(array $entities) { * @param string $hook * One of 'presave', 'insert', 'update', 'predelete', 'delete', or * 'revision_delete'. - * @param \Drupal\Core\Entity\EntityInterface $entity + * @param \Drupal\Core\Entity\EntityInterface $entity * The entity object. */ protected function invokeHook($hook, EntityInterface $entity) { diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php index 3a5db03..4ee738f 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php +++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php @@ -93,4 +93,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { } return $this->derivatives; } + } diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php index e9ad11c..ff8be9d 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php +++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php @@ -121,4 +121,5 @@ public function getString() { } return ''; } + } diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php index 83a0d6b..513213f 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php +++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php @@ -55,4 +55,5 @@ public function getDefaultOption() { public function getRequiredOptions() { return array('bundle'); } + } diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php index 65652c4..903e598 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php +++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php @@ -16,4 +16,5 @@ class EntityChangedConstraint extends Constraint { public $message = 'The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.'; + } diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php index 4cd502a..c9f2d81 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php +++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php @@ -42,4 +42,5 @@ public function getDefaultOption() { public function getRequiredOptions() { return array('type'); } + } diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php index a003204..ab8d64c 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php +++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php @@ -47,4 +47,5 @@ public function validate($value, Constraint $constraint) { } } } + } diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionBase.php b/core/lib/Drupal/Core/Entity/Query/ConditionBase.php index 81e2522..4393935 100644 --- a/core/lib/Drupal/Core/Entity/Query/ConditionBase.php +++ b/core/lib/Drupal/Core/Entity/Query/ConditionBase.php @@ -20,4 +20,5 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N return $this; } + } diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php index 7a0664c..81463fb 100644 --- a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php @@ -72,4 +72,5 @@ public function &conditions(); * The query object this conditional clause belongs to. */ public function compile($query); + } diff --git a/core/lib/Drupal/Core/Entity/Query/Null/Query.php b/core/lib/Drupal/Core/Entity/Query/Null/Query.php index cae2cec..33e14a7 100644 --- a/core/lib/Drupal/Core/Entity/Query/Null/Query.php +++ b/core/lib/Drupal/Core/Entity/Query/Null/Query.php @@ -42,4 +42,5 @@ public function notExistsAggregate($field, $function, $langcode = NULL) { public function conditionAggregateGroupFactory($conjunction = 'AND') { return new ConditionAggregate($conjunction, $this); } + } diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php index e673db1..8852f0b 100644 --- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php @@ -35,17 +35,40 @@ public function getEntityTypeId(); * @endcode * * @param $field - * Name of the field being queried. It must contain a field name, - * optionally followed by a column name. The column can be "entity" for - * reference fields and that can be followed similarly by a field name - * and so on. Some examples: + * Name of the field being queried. It must contain a field name, optionally + * followed by a column name. The column can be "entity" for reference + * fields and that can be followed similarly by a field name and so on. Some + * examples: * - nid * - tags.value * - tags * - uid.entity.name * "tags" "is the same as "tags.value" as value is the default column. * If two or more conditions have the same field names they apply to the - * same delta within that field. + * same delta within that field. In order to limit the condition to a + * specific item a numeric delta should be added between the field name and + * the column name. + * @code + * ->condition('tags.5.value', 'news') + * @endcode + * This will require condition to be satisfied on a specific delta of the + * field. The condition above will require the 6th value of the field to + * match the provided value. Further, it's possible to create a condition on + * the delta itself by using '%delta'. For example, + * @code + * ->condition('tags.%delta', 5) + * @endcode + * will find only entities which have at least six tags. Finally, the + * condition on the delta itself accompanied with a condition on the value + * will require the value to appear in the specific delta range. For + * example, + * @code + * ->condition('tags.%delta', 0, '>')) + * ->condition('tags.%delta.value', 'news')) + * @endcode + * will only find the "news" tag if it is not the first value. It should be + * noted that conditions on specific deltas and delta ranges are only + * supported when querying content entities. * @param $value * The value for $field. In most cases, this is a scalar and it's treated as * case-insensitive. For more complex operators, it is an array. The meaning diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php index ca25fb9..c8bf59d 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php @@ -5,6 +5,7 @@ use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Entity\Query\QueryException; use Drupal\Core\Entity\Sql\SqlEntityStorageInterface; +use Drupal\Core\Entity\Sql\TableMappingInterface; /** * Adds tables and fields to the SQL entity query. @@ -112,11 +113,37 @@ public function addField($field, $type, $langcode) { // Check whether this field is stored in a dedicated table. if ($field_storage && $table_mapping->requiresDedicatedTableStorage($field_storage)) { + $delta = NULL; // Find the field column. $column = $field_storage->getMainPropertyName(); if ($key < $count) { $next = $specifiers[$key + 1]; + // If this is a numeric specifier we're adding a condition on the + // specific delta. + if (is_numeric($next)) { + $delta = $next; + $index_prefix .= ".$delta"; + // Do not process it again. + $key++; + $next = $specifiers[$key + 1]; + } + // If this specifier is the reserved keyword "%delta" we're adding a + // condition on a delta range. + elseif ($next == TableMappingInterface::DELTA) { + $index_prefix .= TableMappingInterface::DELTA; + // Do not process it again. + $key++; + // If there are more specifiers to work with then continue + // processing. If this is the last specifier then use the reserved + // keyword as a column name. + if ($key < $count) { + $next = $specifiers[$key + 1]; + } + else { + $column = TableMappingInterface::DELTA; + } + } // Is this a field column? $columns = $field_storage->getColumns(); if (isset($columns[$next]) || in_array($next, $table_mapping->getReservedColumns())) { @@ -140,7 +167,7 @@ public function addField($field, $type, $langcode) { $next_index_prefix = "$relationship_specifier.$column"; } } - $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field); + $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta); $sql_column = $table_mapping->getFieldColumnName($field_storage, $column); $property_definitions = $field_storage->getPropertyDefinitions(); if (isset($property_definitions[$column])) { @@ -173,6 +200,27 @@ public function addField($field, $type, $langcode) { // next one is a column of this field. if ($key < $count) { $next = $specifiers[$key + 1]; + // If this specifier is the reserved keyword "%delta" we're adding a + // condition on a delta range. + if ($next == TableMappingInterface::DELTA) { + $key++; + if ($key < $count) { + $next = $specifiers[$key + 1]; + } + else { + return 0; + } + } + // If this is a numeric specifier we're adding a condition on the + // specific delta. Since we know that this is a single value base + // field no other value than 0 makes sense. + if (is_numeric($next)) { + if ($next > 0) { + $this->sqlQuery->condition('1 <> 1'); + } + $key++; + $next = $specifiers[$key + 1]; + } // Is this a field column? $columns = $field_storage->getColumns(); if (isset($columns[$next]) || in_array($next, $table_mapping->getReservedColumns())) { @@ -264,7 +312,7 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode, * @return string * @throws \Drupal\Core\Entity\Query\QueryException */ - protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field) { + protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta) { $field_name = $field->getName(); if (!isset($this->fieldTables[$index_prefix . $field_name])) { $entity_type_id = $this->sqlQuery->getMetaData('entity_type'); @@ -274,12 +322,12 @@ protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $b if ($field->getCardinality() != 1) { $this->sqlQuery->addMetaData('simple_query', FALSE); } - $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field", $langcode); + $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field", $langcode, $delta); } return $this->fieldTables[$index_prefix . $field_name]; } - protected function addJoin($type, $table, $join_condition, $langcode) { + protected function addJoin($type, $table, $join_condition, $langcode, $delta = NULL) { $arguments = array(); if ($langcode) { $entity_type_id = $this->sqlQuery->getMetaData('entity_type'); @@ -291,6 +339,11 @@ protected function addJoin($type, $table, $join_condition, $langcode) { $join_condition .= ' AND %alias.' . $langcode_key . ' = ' . $placeholder; $arguments[$placeholder] = $langcode; } + if (isset($delta)) { + $placeholder = ':delta' . $this->sqlQuery->nextPlaceholder(); + $join_condition .= ' AND %alias.delta = ' . $placeholder; + $arguments[$placeholder] = $delta; + } return $this->sqlQuery->addJoin($type, $table, NULL, $join_condition, $arguments); } diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php index 214e130..bd8e0de 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php @@ -11,8 +11,10 @@ * Adds a field to a database query. * * @param string $field - * If it contains a dot, then field name dot field column. If it doesn't - * then entity property name. + * If it doesn't contain a dot, then an entity base field name. If it + * contains a dot, then either field name dot field column or field name dot + * delta dot field column. Delta can be a numeric value or a "%delta" for + * any value. * @param string $type * Join type, can either be INNER or LEFT. * @param string $langcode diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php index b49e575..1b561ed 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php @@ -33,4 +33,5 @@ public static function translateCondition(&$condition, SelectInterface $sql_quer } parent::translateCondition($condition, $sql_query, $case_sensitive); } + } diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php index d71949e..aa6fa88 100644 --- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php +++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php @@ -204,7 +204,12 @@ public function getFieldColumnName(FieldStorageDefinitionInterface $storage_defi $column_name = count($storage_definition->getColumns()) == 1 ? $field_name : $field_name . '__' . $property_name; } elseif ($this->requiresDedicatedTableStorage($storage_definition)) { - $column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name; + if ($property_name == TableMappingInterface::DELTA) { + $column_name = 'delta'; + } + else { + $column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name; + } } else { throw new SqlContentEntityStorageException("Column information not available for the '$field_name' field."); diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php index 72c7458..d584454 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php @@ -36,7 +36,7 @@ * * @ingroup entity_api */ -class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEntityStorageInterface, DynamicallyFieldableEntityStorageSchemaInterface, EntityBundleListenerInterface { +class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEntityStorageInterface, DynamicallyFieldableEntityStorageSchemaInterface, EntityBundleListenerInterface { /** * The mapping of field columns to SQL tables. diff --git a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php index f21c270..3c553bf 100644 --- a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php +++ b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php @@ -20,6 +20,11 @@ interface TableMappingInterface { /** + * A property that represents delta used in entity query conditions. + */ + const DELTA = '%delta'; + + /** * Gets a list of table names for this mapping. * * @return string[] diff --git a/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php b/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php index f60c9f9..1fff95d 100644 --- a/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php +++ b/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinitionInterface.php @@ -44,4 +44,5 @@ public function getBundles(); * @return $this */ public function setBundles(array $bundles = NULL); + } diff --git a/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php index 3d2ada2..8337d43 100644 --- a/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php @@ -56,4 +56,5 @@ static function getSubscribedEvents() { $events[RoutingEvents::ALTER][] = array('onRoutingRouteAlterSetType', -150); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php index 07f00a6..3db181a 100644 --- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php @@ -286,4 +286,5 @@ public static function getSubscribedEvents() { $events[KernelEvents::RESPONSE][] = array('onRespond'); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php index 8016cef..4b04be6 100644 --- a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php @@ -62,4 +62,5 @@ static function getSubscribedEvents() { $events[KernelEvents::TERMINATE][] = array('onKernelTerminate', 100); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php index d0c8bf3..271ddbe 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php @@ -48,4 +48,5 @@ static function getSubscribedEvents() { $events[RoutingEvents::ALTER][] = array('onRoutingRouteAlterSetParameterConverters', -220); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php index 85d5fae..77dbdbc 100644 --- a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php @@ -75,4 +75,5 @@ static function getSubscribedEvents() { $events[KernelEvents::TERMINATE][] = array('onKernelTerminate', 200); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php index 9cea5e0..b9a64d5 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php @@ -170,4 +170,5 @@ static function getSubscribedEvents() { $events[KernelEvents::REQUEST][] = array('sanitizeDestination', 100); return $events; } + } diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php index 7676ae8..7431e96 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php @@ -53,4 +53,5 @@ static function getSubscribedEvents() { return $events; } + } diff --git a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php index b6f559b..1480cbf 100644 --- a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php +++ b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php @@ -83,4 +83,5 @@ public function setConfig($key, $value) { $this->configuration[$key] = $value; return $this; } + } diff --git a/core/lib/Drupal/Core/Extension/InfoParserInterface.php b/core/lib/Drupal/Core/Extension/InfoParserInterface.php index e5c99fe..468a94a 100644 --- a/core/lib/Drupal/Core/Extension/InfoParserInterface.php +++ b/core/lib/Drupal/Core/Extension/InfoParserInterface.php @@ -5,7 +5,7 @@ /** * Interface for classes that parses Drupal's info.yml files. */ -interface InfoParserInterface { +interface InfoParserInterface { /** * Parses Drupal module, theme and profile .info.yml files. diff --git a/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php b/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php index 3c8dff5..022212e 100644 --- a/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php +++ b/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php @@ -39,4 +39,5 @@ * @see template_preprocess_system_modules_uninstall() */ public function validate($module); + } diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php index 28ebcce..8c573bb 100644 --- a/core/lib/Drupal/Core/Extension/ThemeHandler.php +++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php @@ -495,4 +495,5 @@ public function hasUi($name) { } return FALSE; } + } diff --git a/core/lib/Drupal/Core/Field/ChangedFieldItemList.php b/core/lib/Drupal/Core/Field/ChangedFieldItemList.php index 969f7b4..f781dc9 100644 --- a/core/lib/Drupal/Core/Field/ChangedFieldItemList.php +++ b/core/lib/Drupal/Core/Field/ChangedFieldItemList.php @@ -17,4 +17,5 @@ public function defaultAccess($operation = 'view', AccountInterface $account = N // It is not possible to edit the changed field. return AccessResult::allowedIf($operation !== 'edit'); } + } diff --git a/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/core/lib/Drupal/Core/Field/FieldItemListInterface.php index abeb9f2..e8bba02 100644 --- a/core/lib/Drupal/Core/Field/FieldItemListInterface.php +++ b/core/lib/Drupal/Core/Field/FieldItemListInterface.php @@ -181,7 +181,7 @@ public function deleteRevision(); */ public function view($display_options = array()); - /* + /** * Populates a specified number of field items with valid sample data. * * @param int $count diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php index 4b46ce4..62e54a7 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php @@ -40,4 +40,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $elements; } + } diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php index 527d3ee..0193191 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php @@ -119,4 +119,5 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin $values['value'] = mt_rand(0, 1); return $values; } + } diff --git a/core/lib/Drupal/Core/FileTransfer/FTP.php b/core/lib/Drupal/Core/FileTransfer/FTP.php index 5f38fb0..2238f33 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTP.php +++ b/core/lib/Drupal/Core/FileTransfer/FTP.php @@ -45,4 +45,5 @@ public function getSettingsForm() { $form['advanced']['port']['#default_value'] = 21; return $form; } + } diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php index 8ac5891..3617a63 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php +++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php @@ -116,4 +116,5 @@ function chmodJailed($path, $mode, $recursive) { } } } + } diff --git a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php index c106fe2..dbe2559 100644 --- a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php +++ b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php @@ -414,4 +414,5 @@ public function getSettingsForm() { ); return $form; } + } diff --git a/core/lib/Drupal/Core/FileTransfer/FileTransferException.php b/core/lib/Drupal/Core/FileTransfer/FileTransferException.php index fd371f5..15e6570 100644 --- a/core/lib/Drupal/Core/FileTransfer/FileTransferException.php +++ b/core/lib/Drupal/Core/FileTransfer/FileTransferException.php @@ -28,4 +28,5 @@ function __construct($message, $code = 0, $arguments = array()) { parent::__construct($message, $code); $this->arguments = $arguments; } + } diff --git a/core/lib/Drupal/Core/FileTransfer/Local.php b/core/lib/Drupal/Core/FileTransfer/Local.php index e30be49..e687931 100644 --- a/core/lib/Drupal/Core/FileTransfer/Local.php +++ b/core/lib/Drupal/Core/FileTransfer/Local.php @@ -102,4 +102,5 @@ public function chmodJailed($path, $mode, $recursive) { throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $path)); } } + } diff --git a/core/lib/Drupal/Core/FileTransfer/SSH.php b/core/lib/Drupal/Core/FileTransfer/SSH.php index 8198730..8250c16 100644 --- a/core/lib/Drupal/Core/FileTransfer/SSH.php +++ b/core/lib/Drupal/Core/FileTransfer/SSH.php @@ -142,4 +142,5 @@ public function getSettingsForm() { $form['advanced']['port']['#default_value'] = 22; return $form; } + } diff --git a/core/lib/Drupal/Core/Flood/MemoryBackend.php b/core/lib/Drupal/Core/Flood/MemoryBackend.php index 71dddd2..5b3377e 100644 --- a/core/lib/Drupal/Core/Flood/MemoryBackend.php +++ b/core/lib/Drupal/Core/Flood/MemoryBackend.php @@ -83,4 +83,5 @@ public function garbageCollection() { } } } + } diff --git a/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php b/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php index e05e6f6..b4283ba 100644 --- a/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php +++ b/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php @@ -45,5 +45,4 @@ public function getSize() { return $this->size; } - } diff --git a/core/lib/Drupal/Core/Image/ImageInterface.php b/core/lib/Drupal/Core/Image/ImageInterface.php index cf5c3c7..9e112c6 100644 --- a/core/lib/Drupal/Core/Image/ImageInterface.php +++ b/core/lib/Drupal/Core/Image/ImageInterface.php @@ -238,4 +238,5 @@ public function desaturate(); * TRUE on success, FALSE on failure. */ public function rotate($degrees, $background = NULL); + } diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php index c87b986..aca4f31 100644 --- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php @@ -164,4 +164,5 @@ public function deleteAll() { ->condition('collection', $this->collection) ->execute(); } + } diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php index 8b87d3a..9f3b428 100644 --- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php @@ -117,5 +117,4 @@ public function deleteMultiple(array $keys) { parent::deleteMultiple($keys); } - } diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php index 6d4e7b6..5670fe5 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php @@ -62,4 +62,5 @@ public function garbageCollection() { ->condition('expire', REQUEST_TIME, '<') ->execute(); } + } diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php index 3c17b03..d70cb11 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php @@ -43,4 +43,5 @@ function __construct(SerializationInterface $serializer, Connection $connection) public function get($collection) { return new DatabaseStorage($collection, $this->serializer, $this->connection); } + } diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php index dc4cf9d..f172026 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php @@ -23,4 +23,5 @@ public function get($collection) { } return $this->collections[$collection]; } + } diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueNullExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueNullExpirableFactory.php index a5ea2ec..0761c2b 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueNullExpirableFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueNullExpirableFactory.php @@ -13,4 +13,5 @@ class KeyValueNullExpirableFactory implements KeyValueExpirableFactoryInterface public function get($collection) { return new NullStorageExpirable($collection); } + } diff --git a/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php b/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php index 140c98a..ea9e056 100644 --- a/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php +++ b/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php @@ -97,4 +97,5 @@ public function deleteMultiple(array $keys) { public function deleteAll() { $this->data = array(); } + } diff --git a/core/lib/Drupal/Core/Locale/CountryManager.php b/core/lib/Drupal/Core/Locale/CountryManager.php index ac7f1bf..451758e 100644 --- a/core/lib/Drupal/Core/Locale/CountryManager.php +++ b/core/lib/Drupal/Core/Locale/CountryManager.php @@ -21,7 +21,7 @@ class CountryManager implements CountryManagerInterface { */ protected $countries; - /* + /** * Constructor. * * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler diff --git a/core/lib/Drupal/Core/Lock/LockBackendAbstract.php b/core/lib/Drupal/Core/Lock/LockBackendAbstract.php index 1ce9ff1..32322d4 100644 --- a/core/lib/Drupal/Core/Lock/LockBackendAbstract.php +++ b/core/lib/Drupal/Core/Lock/LockBackendAbstract.php @@ -71,4 +71,5 @@ public function getLockId() { } return $this->lockId; } + } diff --git a/core/lib/Drupal/Core/Lock/LockBackendInterface.php b/core/lib/Drupal/Core/Lock/LockBackendInterface.php index 4b99ccc..e291295 100644 --- a/core/lib/Drupal/Core/Lock/LockBackendInterface.php +++ b/core/lib/Drupal/Core/Lock/LockBackendInterface.php @@ -68,8 +68,8 @@ * * @param string $name * Lock name. Limit of name's length is 255 characters. - * @param float $timeout = 30.0 - * (optional) Lock lifetime in seconds. + * @param float $timeout + * (optional) Lock lifetime in seconds. Defaults to 30.0. * * @return bool */ @@ -95,8 +95,8 @@ public function lockMayBeAvailable($name); * * @param string $name * Lock name currently being locked. - * @param int $delay = 30 - * Milliseconds to wait for. + * @param int $delay + * Milliseconds to wait for. Defaults to 30. * * @return bool * TRUE if the lock holds, FALSE if it may be available. You still need to @@ -128,4 +128,5 @@ public function releaseAll($lockId = NULL); * @return string */ public function getLockId(); + } diff --git a/core/lib/Drupal/Core/Lock/NullLockBackend.php b/core/lib/Drupal/Core/Lock/NullLockBackend.php index 00bbc25..65bf65a 100644 --- a/core/lib/Drupal/Core/Lock/NullLockBackend.php +++ b/core/lib/Drupal/Core/Lock/NullLockBackend.php @@ -57,4 +57,5 @@ public function getLockId() { } return $this->lockId; } + } diff --git a/core/lib/Drupal/Core/Lock/PersistentDatabaseLockBackend.php b/core/lib/Drupal/Core/Lock/PersistentDatabaseLockBackend.php index 1735392..eba5c47 100644 --- a/core/lib/Drupal/Core/Lock/PersistentDatabaseLockBackend.php +++ b/core/lib/Drupal/Core/Lock/PersistentDatabaseLockBackend.php @@ -28,4 +28,5 @@ public function __construct(Connection $database) { // @see \Drupal\Core\Lock\LockBackendInterface::getLockId() $this->lockId = 'persistent'; } + } diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php index 84919f9..080b326 100644 --- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php +++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php @@ -388,4 +388,5 @@ protected static function htmlToTextPad($text, $pad, $prefix = '') { // Add prefix and padding, and restore linebreak. return $text . $prefix . str_repeat($pad, $n) . "\n"; } + } diff --git a/core/lib/Drupal/Core/Mail/MailInterface.php b/core/lib/Drupal/Core/Mail/MailInterface.php index 8fd0a5b..1435ff9 100644 --- a/core/lib/Drupal/Core/Mail/MailInterface.php +++ b/core/lib/Drupal/Core/Mail/MailInterface.php @@ -61,4 +61,5 @@ public function format(array $message); * TRUE if the mail was successfully accepted for delivery, otherwise FALSE. */ public function mail(array $message); + } diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php index f750f0b..652c6b3 100644 --- a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php +++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php @@ -111,4 +111,5 @@ public function mail(array $message) { return $mail_result; } + } diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php index 89c8cb8..ede465e 100644 --- a/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php +++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php @@ -27,4 +27,5 @@ public function mail(array $message) { return TRUE; } + } diff --git a/core/lib/Drupal/Core/Menu/LocalActionInterface.php b/core/lib/Drupal/Core/Menu/LocalActionInterface.php index 9c92fb2..81ff308 100644 --- a/core/lib/Drupal/Core/Menu/LocalActionInterface.php +++ b/core/lib/Drupal/Core/Menu/LocalActionInterface.php @@ -59,6 +59,4 @@ public function getOptions(RouteMatchInterface $route_match); */ public function getTitle(); - - } diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php index f6dcde2..0368d43 100644 --- a/core/lib/Drupal/Core/Path/AliasManager.php +++ b/core/lib/Drupal/Core/Path/AliasManager.php @@ -296,4 +296,5 @@ protected function pathAliasWhitelistRebuild($path = NULL) { protected function getRequestTime() { return defined('REQUEST_TIME') ? REQUEST_TIME : (int) $_SERVER['REQUEST_TIME']; } + } diff --git a/core/lib/Drupal/Core/Path/AliasManagerInterface.php b/core/lib/Drupal/Core/Path/AliasManagerInterface.php index dcd00b9..a3096fc 100644 --- a/core/lib/Drupal/Core/Path/AliasManagerInterface.php +++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php @@ -49,4 +49,5 @@ public function getAliasByPath($path, $langcode = NULL); * if entire cache needs to be flushed. */ public function cacheClear($source = NULL); + } diff --git a/core/lib/Drupal/Core/Path/AliasStorageInterface.php b/core/lib/Drupal/Core/Path/AliasStorageInterface.php index 10d4d92..398ce07 100644 --- a/core/lib/Drupal/Core/Path/AliasStorageInterface.php +++ b/core/lib/Drupal/Core/Path/AliasStorageInterface.php @@ -164,4 +164,5 @@ public function getAliasesForAdminListing($header, $keys = NULL); * TRUE if any alias exists, FALSE otherwise. */ public function pathHasMatchingAlias($initial_substring); + } diff --git a/core/lib/Drupal/Core/Path/PathMatcher.php b/core/lib/Drupal/Core/Path/PathMatcher.php index 970dd15..2b616c2 100644 --- a/core/lib/Drupal/Core/Path/PathMatcher.php +++ b/core/lib/Drupal/Core/Path/PathMatcher.php @@ -116,4 +116,5 @@ protected function getFrontPagePath() { } return $this->frontPage; } + } diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php index 36776e2..f1987f8 100644 --- a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php +++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php @@ -140,4 +140,5 @@ protected function sortProcessors($type) { } return $sorted; } + } diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php index 5848bc3..2a219e9 100644 --- a/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php +++ b/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php @@ -17,7 +17,7 @@ * * @param \Drupal\Component\Plugin\Context\ContextInterface[] $contexts * An array of contexts. - * @param array $definitions . + * @param array $definitions * An array of plugin definitions. * * @return array diff --git a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php index 2206cea..24f5cae 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php +++ b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php @@ -55,4 +55,5 @@ public function getDefinitions() { } return $definitions; } + } diff --git a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php index 0b276f6..0845eb4 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php +++ b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php @@ -101,4 +101,5 @@ public function getDefinitions() { return $definitions; } + } diff --git a/core/lib/Drupal/Core/Queue/Batch.php b/core/lib/Drupal/Core/Queue/Batch.php index e6a0666..a7827a9 100644 --- a/core/lib/Drupal/Core/Queue/Batch.php +++ b/core/lib/Drupal/Core/Queue/Batch.php @@ -60,4 +60,5 @@ public function getAllItems() { } return $result; } + } diff --git a/core/lib/Drupal/Core/Queue/BatchMemory.php b/core/lib/Drupal/Core/Queue/BatchMemory.php index 5756d49..8245308 100644 --- a/core/lib/Drupal/Core/Queue/BatchMemory.php +++ b/core/lib/Drupal/Core/Queue/BatchMemory.php @@ -46,4 +46,5 @@ public function getAllItems() { } return $result; } + } diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php index b2ba761..b921d2c 100644 --- a/core/lib/Drupal/Core/Queue/Memory.php +++ b/core/lib/Drupal/Core/Queue/Memory.php @@ -103,4 +103,5 @@ public function deleteQueue() { $this->queue = array(); $this->idSequence = 0; } + } diff --git a/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php b/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php index 5f1a291..e2bec48 100644 --- a/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php +++ b/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php @@ -38,4 +38,5 @@ function __construct(Connection $connection) { public function get($name) { return new DatabaseQueue($name, $this->connection); } + } diff --git a/core/lib/Drupal/Core/Queue/QueueFactory.php b/core/lib/Drupal/Core/Queue/QueueFactory.php index 7c155a4..db493d9 100644 --- a/core/lib/Drupal/Core/Queue/QueueFactory.php +++ b/core/lib/Drupal/Core/Queue/QueueFactory.php @@ -63,4 +63,5 @@ public function get($name, $reliable = FALSE) { } return $this->queues[$name]; } + } diff --git a/core/lib/Drupal/Core/Queue/QueueInterface.php b/core/lib/Drupal/Core/Queue/QueueInterface.php index b384121..6d86224 100644 --- a/core/lib/Drupal/Core/Queue/QueueInterface.php +++ b/core/lib/Drupal/Core/Queue/QueueInterface.php @@ -106,4 +106,5 @@ public function createQueue(); * Deletes a queue and every item in the queue. */ public function deleteQueue(); + } diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php index 7032b52..6ba3dff 100644 --- a/core/lib/Drupal/Core/Render/Element/Pager.php +++ b/core/lib/Drupal/Core/Render/Element/Pager.php @@ -30,7 +30,7 @@ * * @RenderElement("pager") */ -class Pager extends RenderElement{ +class Pager extends RenderElement { /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Render/Element/Textarea.php b/core/lib/Drupal/Core/Render/Element/Textarea.php index 6adb18c..f9286ea 100644 --- a/core/lib/Drupal/Core/Render/Element/Textarea.php +++ b/core/lib/Drupal/Core/Render/Element/Textarea.php @@ -61,4 +61,5 @@ public static function valueCallback(&$element, $input, FormStateInterface $form } return NULL; } + } diff --git a/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php b/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php index d78c56a..aa8b60c 100644 --- a/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php +++ b/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php @@ -13,7 +13,7 @@ * (HTML, JSON …) and/or in a certain decorated manner (e.g. in the case of the * default HTML main content renderer: with a page display variant applied). */ -interface MainContentRendererInterface { +interface MainContentRendererInterface { /** * Renders the main content render array into a response. diff --git a/core/lib/Drupal/Core/Render/Markup.php b/core/lib/Drupal/Core/Render/Markup.php index 3b48951..6a2f291 100644 --- a/core/lib/Drupal/Core/Render/Markup.php +++ b/core/lib/Drupal/Core/Render/Markup.php @@ -22,4 +22,5 @@ */ final class Markup implements MarkupInterface, \Countable { use MarkupTrait; + } diff --git a/core/lib/Drupal/Core/Render/Placeholder/SingleFlushStrategy.php b/core/lib/Drupal/Core/Render/Placeholder/SingleFlushStrategy.php index 3d7228c..6cb8d1f 100644 --- a/core/lib/Drupal/Core/Render/Placeholder/SingleFlushStrategy.php +++ b/core/lib/Drupal/Core/Render/Placeholder/SingleFlushStrategy.php @@ -18,4 +18,5 @@ public function processPlaceholders(array $placeholders) { // Return all placeholders as is; they should be rendered directly. return $placeholders; } + } diff --git a/core/lib/Drupal/Core/Routing/CompiledRoute.php b/core/lib/Drupal/Core/Routing/CompiledRoute.php index a5dbbef..775d4ae 100644 --- a/core/lib/Drupal/Core/Routing/CompiledRoute.php +++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php @@ -163,5 +163,4 @@ public function unserialize($serialized) { $this->numParts = $data['numParts']; } - } diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php index 75950fa..f294bee 100644 --- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php +++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php @@ -69,4 +69,5 @@ public function setLinkGenerator(LinkGeneratorInterface $generator) { return $this; } + } diff --git a/core/lib/Drupal/Core/Routing/NullGenerator.php b/core/lib/Drupal/Core/Routing/NullGenerator.php index 1254db4..d9bc9b0 100644 --- a/core/lib/Drupal/Core/Routing/NullGenerator.php +++ b/core/lib/Drupal/Core/Routing/NullGenerator.php @@ -74,4 +74,5 @@ public function getContext() { protected function processPath($path, &$options = array(), BubbleableMetadata $bubbleable_metadata = NULL) { return $path; } + } diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php index 8c631d7..53ed626 100644 --- a/core/lib/Drupal/Core/Routing/RouteProvider.php +++ b/core/lib/Drupal/Core/Routing/RouteProvider.php @@ -134,7 +134,8 @@ public function __construct(Connection $connection, StateInterface $state, Curre * very large route sets to be filtered down to likely candidates, which * may then be filtered in memory more completely. * - * @param Request $request A request against which to match. + * @param Request $request + * A request against which to match. * * @return \Symfony\Component\Routing\RouteCollection with all urls that * could potentially match $request. Empty collection if nothing can diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php index 6d8db00..71bf332 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -452,4 +452,5 @@ public function getRouteDebugMessage($name, array $parameters = array()) { return serialize($name); } + } diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php index 9a314ed..f5174f1 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php @@ -34,7 +34,7 @@ public function getPathFromRoute($name, $parameters = array()); * * @param string|\Symfony\Component\Routing\Route $name * The route name or a route object. - * @param array $parameters + * @param array $parameters * An associative array of parameter names and values. * @param array $options * (optional) An associative array of additional options, with the following diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php index 9ea564f..f092421 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php @@ -88,4 +88,5 @@ public function setUrlGenerator(UrlGeneratorInterface $generator) { return $this; } + } diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php index 7199551..343b461 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php @@ -567,4 +567,5 @@ public function dir_closedir() { // have a return value. return TRUE; } + } diff --git a/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php b/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php index cbce29b..830fb93 100644 --- a/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php @@ -47,4 +47,5 @@ public function getExternalUrl() { $path = str_replace('\\', '/', $this->getTarget()); return Url::fromRoute('system.temporary', [], ['absolute' => TRUE, 'query' => ['file' => $path]])->toString(); } + } diff --git a/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php b/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php index cf69308..d4c46e3 100644 --- a/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php +++ b/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php @@ -116,4 +116,5 @@ public static function filesToArray($langcode, array $files) { } return $writer->getData(); } + } diff --git a/core/lib/Drupal/Core/Theme/Registry.php b/core/lib/Drupal/Core/Theme/Registry.php index 8122e89..bfb4e38 100644 --- a/core/lib/Drupal/Core/Theme/Registry.php +++ b/core/lib/Drupal/Core/Theme/Registry.php @@ -764,4 +764,5 @@ public function getPrefixGroupedUserFunctions() { protected function getPath($module) { return drupal_get_path('module', $module); } + } diff --git a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionInterface.php b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionInterface.php index e7a3c1a..2fe1a10 100644 --- a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionInterface.php +++ b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionInterface.php @@ -9,7 +9,7 @@ * * @ingroup typed_data */ -interface ComplexDataDefinitionInterface extends DataDefinitionInterface { +interface ComplexDataDefinitionInterface extends DataDefinitionInterface { /** * Gets the definition of a contained property. diff --git a/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php b/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php index 39280ff..6396cb8 100644 --- a/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php +++ b/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php @@ -18,7 +18,7 @@ * * @ingroup typed_data */ -interface ComplexDataInterface extends TraversableTypedDataInterface { +interface ComplexDataInterface extends TraversableTypedDataInterface { /** * Gets the data definition. diff --git a/core/lib/Drupal/Core/TypedData/DataReferenceBase.php b/core/lib/Drupal/Core/TypedData/DataReferenceBase.php index dbdddb1..a41b01c 100644 --- a/core/lib/Drupal/Core/TypedData/DataReferenceBase.php +++ b/core/lib/Drupal/Core/TypedData/DataReferenceBase.php @@ -14,7 +14,7 @@ * * @see \Drupal\Core\TypedData\DataReferenceDefinition */ -abstract class DataReferenceBase extends TypedData implements DataReferenceInterface { +abstract class DataReferenceBase extends TypedData implements DataReferenceInterface { /** * The referenced data. diff --git a/core/lib/Drupal/Core/TypedData/DataReferenceDefinitionInterface.php b/core/lib/Drupal/Core/TypedData/DataReferenceDefinitionInterface.php index 4275c62..f209a8f 100644 --- a/core/lib/Drupal/Core/TypedData/DataReferenceDefinitionInterface.php +++ b/core/lib/Drupal/Core/TypedData/DataReferenceDefinitionInterface.php @@ -10,7 +10,7 @@ * * @ingroup typed_data */ -interface DataReferenceDefinitionInterface extends DataDefinitionInterface { +interface DataReferenceDefinitionInterface extends DataDefinitionInterface { /** * Gets the data definition of the referenced data. diff --git a/core/lib/Drupal/Core/TypedData/DataReferenceInterface.php b/core/lib/Drupal/Core/TypedData/DataReferenceInterface.php index 53ffe0e..878c44d 100644 --- a/core/lib/Drupal/Core/TypedData/DataReferenceInterface.php +++ b/core/lib/Drupal/Core/TypedData/DataReferenceInterface.php @@ -7,7 +7,7 @@ * * @see \Drupal\Core\TypedData\DataReferenceDefinitionInterface */ -interface DataReferenceInterface { +interface DataReferenceInterface { /** * Gets the referenced data. diff --git a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php index e8ffec6..302f501 100644 --- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php +++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php @@ -107,4 +107,5 @@ public function setItemDefinition(DataDefinitionInterface $definition) { $this->itemDefinition = $definition; return $this; } + } diff --git a/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php b/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php index 565c3ed..937e542 100644 --- a/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php +++ b/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php @@ -95,4 +95,5 @@ public function getSettableValues(AccountInterface $account = NULL); * label). Note that labels should NOT be sanitized. */ public function getSettableOptions(AccountInterface $account = NULL); + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php index f20776f..8fe1a9a 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php @@ -24,4 +24,5 @@ class Any extends TypedData { * @var mixed */ protected $value; + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php index 8762dda..e51e505 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php @@ -88,4 +88,5 @@ public function getString() { public function getCastedValue() { return $this->getValue(); } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BooleanData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BooleanData.php index bd24a90..1583c79 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BooleanData.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BooleanData.php @@ -24,4 +24,5 @@ class BooleanData extends PrimitiveBase implements BooleanInterface { public function getCastedValue() { return (bool) $this->value; } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php index bf6d314..3fe189f 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php @@ -42,4 +42,5 @@ public function setDateTime(DrupalDateTime $dateTime, $notify = TRUE) { $this->parent->onChange($this->name); } } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/FloatData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/FloatData.php index 94f86b1..4de7e18 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/FloatData.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/FloatData.php @@ -24,4 +24,5 @@ class FloatData extends PrimitiveBase implements FloatInterface { public function getCastedValue() { return (float) $this->value; } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/IntegerData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/IntegerData.php index 7b00c5e..8421dca 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/IntegerData.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/IntegerData.php @@ -24,4 +24,5 @@ class IntegerData extends PrimitiveBase implements IntegerInterface { public function getCastedValue() { return (int) $this->value; } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php index e6c94ed..3af3a6b 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php @@ -236,4 +236,5 @@ public function applyDefaultValue($notify = TRUE) { } return $this; } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/StringData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/StringData.php index 513be99..270f116 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/StringData.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/StringData.php @@ -24,4 +24,5 @@ class StringData extends PrimitiveBase implements StringInterface { public function getCastedValue() { return $this->getString(); } + } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php index be11e04..8c72c85 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php @@ -41,4 +41,5 @@ public function setDateTime(DrupalDateTime $dateTime, $notify = TRUE) { $this->parent->onChange($this->name); } } + } diff --git a/core/lib/Drupal/Core/TypedData/PrimitiveBase.php b/core/lib/Drupal/Core/TypedData/PrimitiveBase.php index 2338e4a..ac2d1c1 100644 --- a/core/lib/Drupal/Core/TypedData/PrimitiveBase.php +++ b/core/lib/Drupal/Core/TypedData/PrimitiveBase.php @@ -31,4 +31,5 @@ public function setValue($value, $notify = TRUE) { $this->parent->onChange($this->name); } } + } diff --git a/core/lib/Drupal/Core/TypedData/PrimitiveInterface.php b/core/lib/Drupal/Core/TypedData/PrimitiveInterface.php index 821f8c0..1df50f7 100644 --- a/core/lib/Drupal/Core/TypedData/PrimitiveInterface.php +++ b/core/lib/Drupal/Core/TypedData/PrimitiveInterface.php @@ -31,4 +31,5 @@ public function setValue($value); * @return mixed */ public function getCastedValue(); + } diff --git a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php index eaeeac0..a6892d2 100644 --- a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php +++ b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php @@ -157,4 +157,5 @@ public function getPropertyPath(); * root of a typed data tree. Defaults to NULL. */ public function setContext($name = NULL, TraversableTypedDataInterface $parent = NULL); + } diff --git a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php index eeb7612..a20fa52 100644 --- a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php +++ b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php @@ -312,4 +312,5 @@ public function isObjectInitialized($cache_key) { public function getMetadataFactory() { throw new \LogicException('Legacy validator API is unsupported.'); } + } diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php index c7cbb7f..be0d34b 100644 --- a/core/lib/Drupal/Core/Updater/Module.php +++ b/core/lib/Drupal/Core/Updater/Module.php @@ -138,4 +138,5 @@ public function postUpdateTasks() { // We don't want to check for DB updates here, we do that once for all // updated modules on the landing page. } + } diff --git a/core/lib/Drupal/Core/Updater/Theme.php b/core/lib/Drupal/Core/Updater/Theme.php index 5dfbd97..48f68c7 100644 --- a/core/lib/Drupal/Core/Updater/Theme.php +++ b/core/lib/Drupal/Core/Updater/Theme.php @@ -109,4 +109,5 @@ public function postInstallTasks() { ], ]; } + } diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php index b9a5999..0381728 100644 --- a/core/lib/Drupal/Core/Updater/Updater.php +++ b/core/lib/Drupal/Core/Updater/Updater.php @@ -407,4 +407,5 @@ public function postInstallTasks() { public function postUpdateTasks() { return array(); } + } diff --git a/core/lib/Drupal/Core/Updater/UpdaterInterface.php b/core/lib/Drupal/Core/Updater/UpdaterInterface.php index c093c4b..09e3bec 100644 --- a/core/lib/Drupal/Core/Updater/UpdaterInterface.php +++ b/core/lib/Drupal/Core/Updater/UpdaterInterface.php @@ -64,4 +64,5 @@ public function postInstall(); * Actions to run after an update has occurred. */ public function postUpdate(); + } diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php index 8f45bd6..53432e8 100644 --- a/core/lib/Drupal/Core/Utility/Token.php +++ b/core/lib/Drupal/Core/Utility/Token.php @@ -405,4 +405,5 @@ public function resetInfo() { $this->tokenInfo = NULL; $this->cacheTagsInvalidator->invalidateTags([static::TOKEN_INFO_CACHE_TAG]); } + } diff --git a/core/lib/Drupal/Core/Validation/ConstraintManager.php b/core/lib/Drupal/Core/Validation/ConstraintManager.php index 8b1a18a..23bd7eb 100644 --- a/core/lib/Drupal/Core/Validation/ConstraintManager.php +++ b/core/lib/Drupal/Core/Validation/ConstraintManager.php @@ -136,4 +136,5 @@ public function getDefinitionsByType($type) { } return $definitions; } + } diff --git a/core/lib/Drupal/Core/Validation/DrupalTranslator.php b/core/lib/Drupal/Core/Validation/DrupalTranslator.php index 08096e2..f00df20 100644 --- a/core/lib/Drupal/Core/Validation/DrupalTranslator.php +++ b/core/lib/Drupal/Core/Validation/DrupalTranslator.php @@ -103,4 +103,5 @@ protected function getOptions($domain = NULL, $locale = NULL) { $locale = isset($locale) ? $locale : $this->locale; return array('langcode' => $locale); } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php index cf43d2f..d20f54a 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php @@ -18,4 +18,5 @@ class AllowedValuesConstraint extends Choice { public $minMessage = 'You must select at least %limit choice.|You must select at least %limit choices.'; public $maxMessage = 'You must select at most %limit choice.|You must select at most %limit choices.'; + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php index 24e6ccd..5e7d0c7 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php @@ -57,4 +57,5 @@ public function getDefaultOption() { public function getRequiredOptions() { return array('properties'); } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php index 2133709..a7f5dd5 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php @@ -27,4 +27,5 @@ class CountConstraint extends Count { public function validatedBy() { return '\Symfony\Component\Validator\Constraints\CountValidator'; } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php index c19c0dc..179ee9a 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php @@ -24,4 +24,5 @@ class EmailConstraint extends Email { public function validatedBy() { return '\Symfony\Component\Validator\Constraints\EmailValidator'; } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php index 99bad5c..2aaca39 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php @@ -29,4 +29,5 @@ class LengthConstraint extends Length { public function validatedBy() { return '\Symfony\Component\Validator\Constraints\LengthValidator'; } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php index e53b40d..a18700a 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php @@ -15,4 +15,5 @@ class PrimitiveTypeConstraint extends Constraint { public $message = 'This value should be of the correct primitive type.'; + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php index 0b84563..5829e39 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php @@ -77,4 +77,5 @@ public function validate($value, Constraint $constraint) { )); } } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php index e165087..afa7154 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php @@ -28,4 +28,5 @@ class RangeConstraint extends Range { public function validatedBy() { return '\Symfony\Component\Validator\Constraints\RangeValidator'; } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php index 5340b24..63c6682 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php @@ -24,4 +24,5 @@ class RegexConstraint extends Regex { public function validatedBy() { return '\Symfony\Component\Validator\Constraints\RegexValidator'; } + } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php index 811f5c1..1e63e6d 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php @@ -40,4 +40,5 @@ public function validate($items, Constraint $constraint) { ]); } } + } diff --git a/core/modules/action/src/Tests/ConfigurationTest.php b/core/modules/action/src/Tests/ConfigurationTest.php index 92e12d0..a6b2050 100644 --- a/core/modules/action/src/Tests/ConfigurationTest.php +++ b/core/modules/action/src/Tests/ConfigurationTest.php @@ -84,4 +84,5 @@ function testActionConfiguration() { $action = entity_load('action', $aid); $this->assertFalse($action, 'Make sure the action is gone after being deleted.'); } + } diff --git a/core/modules/aggregator/src/ItemInterface.php b/core/modules/aggregator/src/ItemInterface.php index 72ab237..8639ff8 100644 --- a/core/modules/aggregator/src/ItemInterface.php +++ b/core/modules/aggregator/src/ItemInterface.php @@ -141,4 +141,5 @@ public function getGuid(); * The called feed item entity. */ public function setGuid($guid); + } diff --git a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorXSSFormatter.php b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorXSSFormatter.php index 77be2ef..8854faf 100644 --- a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorXSSFormatter.php +++ b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorXSSFormatter.php @@ -35,4 +35,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { } return $elements; } + } diff --git a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php index e1b095b..99ec48d 100644 --- a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php +++ b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php @@ -117,4 +117,5 @@ public function fetch(FeedInterface $feed) { return FALSE; } } + } diff --git a/core/modules/aggregator/src/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php index 37ed483..b7ffe5f 100644 --- a/core/modules/aggregator/src/Tests/AddFeedTest.php +++ b/core/modules/aggregator/src/Tests/AddFeedTest.php @@ -91,4 +91,5 @@ public function testAddLongFeed() { $this->deleteFeed($feed); $this->deleteFeed($feed_2); } + } diff --git a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php index e2d2cb3..249817f 100644 --- a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php +++ b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php @@ -80,4 +80,5 @@ function testOverviewPage() { $count = $this->container->get('entity.manager')->getStorage('aggregator_item')->getItemCount($feed); $this->assertEqual(\Drupal::translation()->formatPlural($count, '1 item', '@count items'), (string) $result[0]->td[1]); } + } diff --git a/core/modules/aggregator/src/Tests/AggregatorCronTest.php b/core/modules/aggregator/src/Tests/AggregatorCronTest.php index 6d65b94..34a4cb9 100644 --- a/core/modules/aggregator/src/Tests/AggregatorCronTest.php +++ b/core/modules/aggregator/src/Tests/AggregatorCronTest.php @@ -41,4 +41,5 @@ public function testCron() { $this->cronRun(); $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); } + } diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php index ac0cae6..1777fe5 100644 --- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php +++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php @@ -370,4 +370,5 @@ public function enableTestPlugins() { )) ->save(); } + } diff --git a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php index 61e3e96..0261ed5 100644 --- a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php +++ b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php @@ -36,4 +36,5 @@ public function testDeleteFeedItem() { $this->deleteFeed($feed); } } + } diff --git a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php index 1e9c8cc..b6e36e9 100644 --- a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php +++ b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php @@ -59,4 +59,5 @@ public function testFeedUpdateFields() { $this->assertText('ago', 'The non scheduled feed has been updated. It shows "x x ago" as last update.'); $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.'); } + } diff --git a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php index 404cecf..4aac851 100644 --- a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php +++ b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php @@ -40,4 +40,5 @@ public function testfetch() { // Fetch should fail due to feed name. $this->assertTrue(empty($feed->items)); } + } diff --git a/core/modules/aggregator/src/Tests/FeedLanguageTest.php b/core/modules/aggregator/src/Tests/FeedLanguageTest.php index adaf3dd..af8335e 100644 --- a/core/modules/aggregator/src/Tests/FeedLanguageTest.php +++ b/core/modules/aggregator/src/Tests/FeedLanguageTest.php @@ -81,4 +81,5 @@ public function testFeedLanguage() { } } } + } diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php index db63caf..6c4a04d 100644 --- a/core/modules/aggregator/src/Tests/FeedParserTest.php +++ b/core/modules/aggregator/src/Tests/FeedParserTest.php @@ -107,4 +107,5 @@ public function testInvalidFeed() { $this->clickLink(t('Update items')); $this->assertRaw(t('The feed from %title seems to be broken because of error', array('%title' => $feed->label()))); } + } diff --git a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php index cc812ee..8a7ade0 100644 --- a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php +++ b/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php @@ -63,4 +63,5 @@ public function testPostProcess() { // Make sure its refresh rate doubled. $this->assertEqual($feed->getRefreshRate(), 3600); } + } diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php index 8ad04cc..1f1e90d 100644 --- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php +++ b/core/modules/aggregator/src/Tests/ImportOpmlTest.php @@ -120,4 +120,5 @@ public function testOpmlImport() { $this->validateImportFormFields(); $this->submitImportForm(); } + } diff --git a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php index 8e12345..c1c3df9 100644 --- a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php +++ b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php @@ -66,4 +66,5 @@ public function testUpdateFeedItem() { $this->updateFeedItems($feed); $this->assertResponse(200); } + } diff --git a/core/modules/aggregator/src/Tests/UpdateFeedTest.php b/core/modules/aggregator/src/Tests/UpdateFeedTest.php index 05a6f16..6bfb0f1 100644 --- a/core/modules/aggregator/src/Tests/UpdateFeedTest.php +++ b/core/modules/aggregator/src/Tests/UpdateFeedTest.php @@ -42,4 +42,5 @@ public function testUpdateFeed() { $this->deleteFeed($feed); } } + } diff --git a/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php index bb53e00..02fd209 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php +++ b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php @@ -28,4 +28,5 @@ public function fetch(FeedInterface $feed) { } return parent::fetch($feed); } + } diff --git a/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php index 50737d1..a36070f 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php +++ b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php @@ -27,4 +27,5 @@ class TestParser extends DefaultParser implements ParserInterface { public function parse(FeedInterface $feed) { return parent::parse($feed); } + } diff --git a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php index eacd139..782ac6f 100644 --- a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php +++ b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php @@ -43,7 +43,7 @@ protected function setUp() { $this->fieldName = 'title'; } - /* + /** * Tests the formatter output. */ public function testStringFormatter() { diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php index 4adfab5..9dac60f 100644 --- a/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php +++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php @@ -44,4 +44,5 @@ public function testAggregatorFeedImport() { $this->assertIdentical('"213cc1365b96c310e92053c5551f0504"', $feed->etag->value); $this->assertIdentical('0', $feed->modified->value); } + } diff --git a/core/modules/ban/src/BanIpManager.php b/core/modules/ban/src/BanIpManager.php index ec90ea1..1a70f55 100644 --- a/core/modules/ban/src/BanIpManager.php +++ b/core/modules/ban/src/BanIpManager.php @@ -64,4 +64,5 @@ public function unbanIp($id) { public function findById($ban_id) { return $this->connection->query("SELECT ip FROM {ban_ip} WHERE iid = :iid", array(':iid' => $ban_id))->fetchField(); } + } diff --git a/core/modules/ban/src/Tests/IpAddressBlockingTest.php b/core/modules/ban/src/Tests/IpAddressBlockingTest.php index a537d74..9fb9ff8 100644 --- a/core/modules/ban/src/Tests/IpAddressBlockingTest.php +++ b/core/modules/ban/src/Tests/IpAddressBlockingTest.php @@ -74,4 +74,5 @@ function testIPAddressValidation() { // $this->drupalPostForm('admin/config/people/ban', $edit, t('Save')); // $this->assertText(t('You may not ban your own IP address.')); } + } diff --git a/core/modules/big_pipe/src/Render/BigPipeMarkup.php b/core/modules/big_pipe/src/Render/BigPipeMarkup.php index 0c2115a..a954c9a 100644 --- a/core/modules/big_pipe/src/Render/BigPipeMarkup.php +++ b/core/modules/big_pipe/src/Render/BigPipeMarkup.php @@ -20,4 +20,5 @@ */ final class BigPipeMarkup implements MarkupInterface, \Countable { use MarkupTrait; + } diff --git a/core/modules/block/src/Tests/BlockHookOperationTest.php b/core/modules/block/src/Tests/BlockHookOperationTest.php index 1f3b55d..91ea843 100644 --- a/core/modules/block/src/Tests/BlockHookOperationTest.php +++ b/core/modules/block/src/Tests/BlockHookOperationTest.php @@ -31,7 +31,7 @@ protected function setUp() { $this->drupalLogin($admin_user); } - /* + /** * Tests the block list to see if the test_operation link is added. */ public function testBlockOperationAlter() { diff --git a/core/modules/block/src/Tests/BlockInvalidRegionTest.php b/core/modules/block/src/Tests/BlockInvalidRegionTest.php index 6ab5daf..438a0c1 100644 --- a/core/modules/block/src/Tests/BlockInvalidRegionTest.php +++ b/core/modules/block/src/Tests/BlockInvalidRegionTest.php @@ -59,4 +59,5 @@ function testBlockInInvalidRegion() { $this->drupalPostForm('admin/config/development/performance', array(), 'Clear all caches'); $this->assertNoRaw($warning_message, 'Disabled block in the invalid region will not trigger the warning.'); } + } diff --git a/core/modules/block/src/Tests/BlockLanguageCacheTest.php b/core/modules/block/src/Tests/BlockLanguageCacheTest.php index 20de4f6..fd5871e 100644 --- a/core/modules/block/src/Tests/BlockLanguageCacheTest.php +++ b/core/modules/block/src/Tests/BlockLanguageCacheTest.php @@ -73,4 +73,5 @@ public function testBlockLinks() { $this->assertText($edit['label']); } } + } diff --git a/core/modules/block/src/Tests/BlockRenderOrderTest.php b/core/modules/block/src/Tests/BlockRenderOrderTest.php index 6757c0b..faf667e 100644 --- a/core/modules/block/src/Tests/BlockRenderOrderTest.php +++ b/core/modules/block/src/Tests/BlockRenderOrderTest.php @@ -76,4 +76,5 @@ function testBlockRenderOrder() { $this->assertTrue($position['stark_powered'] < $position['stark_by'], 'Blocks with different weight are rendered in the correct order.'); $this->assertTrue($position['stark_drupal'] < $position['stark_by'], 'Blocks with identical weight are rendered in alphabetical order.'); } + } diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php index 49a7f75..970de52 100644 --- a/core/modules/block/src/Tests/BlockTestBase.php +++ b/core/modules/block/src/Tests/BlockTestBase.php @@ -67,4 +67,5 @@ protected function setUp() { $block->delete(); } } + } diff --git a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php index 4f0055a..218832d 100644 --- a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php +++ b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php @@ -38,4 +38,5 @@ function testNonDefaultBlockAdmin() { $this->drupalGet('admin/structure/block/list/' . $new_theme); $this->assertText('Bartik(' . t('active tab') . ')', 'Tab for non-default theme found.'); } + } diff --git a/core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php b/core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php index 27f7a17..e7aac65 100644 --- a/core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php +++ b/core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php @@ -8,7 +8,7 @@ /** * Controller for block_test module */ -class TestMultipleFormController extends ControllerBase { +class TestMultipleFormController extends ControllerBase { public function testMultipleForms() { $form_state = new FormState(); diff --git a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php index be51a09..9216d49 100644 --- a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php +++ b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php @@ -99,4 +99,5 @@ public function testBlockInterface() { // testing BlockBase's implementation, not the interface itself. $this->assertIdentical($display_block->getMachineNameSuggestion(), 'displaymessage', 'The plugin returned the expected machine name suggestion.'); } + } diff --git a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php index cb2b35c..63b68c0 100644 --- a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php +++ b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php @@ -54,4 +54,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { } return parent::getDerivativeDefinitions($base_plugin_definition); } + } diff --git a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php index 140e670..7eefdc7 100644 --- a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php +++ b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php @@ -101,4 +101,5 @@ public function testBlock() { $redirected_cid = $this->createCacheId($expected_block_cache_keys, Cache::mergeContexts($expected_block_cache_contexts, $expected_entity_cache_contexts)); $this->verifyRenderCache($cid, Cache::mergeTags($expected_block_cache_tags, $expected_entity_cache_tags), ($cid !== $redirected_cid) ? $redirected_cid : NULL); } + } diff --git a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php b/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php index 1d6df90..5a46ddd 100644 --- a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php +++ b/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php @@ -105,4 +105,5 @@ protected function assertPageCounts($path, $counts, $message) { $this->assertEqual(substr_count($text, $this->blockContentInfos[$langcode]), $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message); } } + } diff --git a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php index 0809e57..ffe124c 100644 --- a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php +++ b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php @@ -10,7 +10,7 @@ /** * Determines whether the requested node can be removed from its book. */ -class BookNodeIsRemovableAccessCheck implements AccessInterface{ +class BookNodeIsRemovableAccessCheck implements AccessInterface { /** * Book Manager Service. diff --git a/core/modules/book/src/BookOutlineStorage.php b/core/modules/book/src/BookOutlineStorage.php index 50df798..92076cb 100644 --- a/core/modules/book/src/BookOutlineStorage.php +++ b/core/modules/book/src/BookOutlineStorage.php @@ -198,4 +198,5 @@ public function getBookSubtree($link, $max_depth) { } return $query->execute(); } + } diff --git a/core/modules/book/src/BookOutlineStorageInterface.php b/core/modules/book/src/BookOutlineStorageInterface.php index b441e28..daaf92d 100644 --- a/core/modules/book/src/BookOutlineStorageInterface.php +++ b/core/modules/book/src/BookOutlineStorageInterface.php @@ -165,4 +165,5 @@ public function countOriginalLinkChildren($original); * Array of unordered subtree book items. */ public function getBookSubtree($link, $max_depth); + } diff --git a/core/modules/image/js/plugins/drupalimagestyle/plugin.js b/core/modules/ckeditor/js/plugins/drupalimagestyle/plugin.js similarity index 100% rename from core/modules/image/js/plugins/drupalimagestyle/plugin.js rename to core/modules/ckeditor/js/plugins/drupalimagestyle/plugin.js diff --git a/core/modules/ckeditor/src/CKEditorPluginBase.php b/core/modules/ckeditor/src/CKEditorPluginBase.php index 656431d..2fb4798 100644 --- a/core/modules/ckeditor/src/CKEditorPluginBase.php +++ b/core/modules/ckeditor/src/CKEditorPluginBase.php @@ -50,4 +50,5 @@ function getDependencies(Editor $editor) { function getLibraries(Editor $editor) { return array(); } + } diff --git a/core/modules/ckeditor/src/CKEditorPluginInterface.php b/core/modules/ckeditor/src/CKEditorPluginInterface.php index 6e3ed24..65475a0 100644 --- a/core/modules/ckeditor/src/CKEditorPluginInterface.php +++ b/core/modules/ckeditor/src/CKEditorPluginInterface.php @@ -95,4 +95,5 @@ public function getFile(); * A keyed array, whose keys will end up as keys under CKEDITOR.config. */ public function getConfig(Editor $editor); + } diff --git a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php similarity index 93% rename from core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php index 9a8c390..9ce2fd4 100644 --- a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php @@ -1,11 +1,6 @@ xpath('//select[contains(@class, "filter-list")]'), ); } + } diff --git a/core/modules/color/src/Tests/ColorSafePreviewTest.php b/core/modules/color/src/Tests/ColorSafePreviewTest.php index d068380..813a92e 100644 --- a/core/modules/color/src/Tests/ColorSafePreviewTest.php +++ b/core/modules/color/src/Tests/ColorSafePreviewTest.php @@ -54,5 +54,4 @@ function testColorPreview() { $this->assertRaw('

TEST COLOR PREVIEW

'); } - } diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php index 2fb10f1..75191a3 100644 --- a/core/modules/comment/src/CommentForm.php +++ b/core/modules/comment/src/CommentForm.php @@ -389,4 +389,5 @@ public function save(array $form, FormStateInterface $form_state) { } $form_state->setRedirectUrl($uri); } + } diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/src/Tests/CommentAdminTest.php index f6dc5c6..5ae57cb 100644 --- a/core/modules/comment/src/Tests/CommentAdminTest.php +++ b/core/modules/comment/src/Tests/CommentAdminTest.php @@ -214,4 +214,5 @@ public function testEditComment() { $this->drupalGet('comment/' . $anonymous_comment->id() . '/edit'); $this->assertFieldById('edit-mail', $anonymous_comment->getAuthorEmail()); } + } diff --git a/core/modules/comment/src/Tests/CommentNodeAccessTest.php b/core/modules/comment/src/Tests/CommentNodeAccessTest.php index 4b28b33..e69bfde 100644 --- a/core/modules/comment/src/Tests/CommentNodeAccessTest.php +++ b/core/modules/comment/src/Tests/CommentNodeAccessTest.php @@ -78,4 +78,5 @@ function testThreadedCommentView() { $this->assertText($reply_text); $this->assertText($reply_subject); } + } diff --git a/core/modules/comment/src/Tests/CommentNodeChangesTest.php b/core/modules/comment/src/Tests/CommentNodeChangesTest.php index 2b262b3..9fed4df 100644 --- a/core/modules/comment/src/Tests/CommentNodeChangesTest.php +++ b/core/modules/comment/src/Tests/CommentNodeChangesTest.php @@ -31,4 +31,5 @@ function testNodeDeletion() { $this->assertNull(FieldStorageConfig::load('node.comment'), 'Comment field storage deleted'); $this->assertNull(FieldConfig::load('node.article.comment'), 'Comment field deleted'); } + } diff --git a/core/modules/comment/src/Tests/CommentRssTest.php b/core/modules/comment/src/Tests/CommentRssTest.php index 8542f53..ec673df 100644 --- a/core/modules/comment/src/Tests/CommentRssTest.php +++ b/core/modules/comment/src/Tests/CommentRssTest.php @@ -75,4 +75,5 @@ function testCommentRss() { $this->drupalGet('rss.xml'); $this->assertNoRaw($raw, 'Hidden comments is not a part of RSS feed.'); } + } diff --git a/core/modules/comment/src/Tests/CommentTitleTest.php b/core/modules/comment/src/Tests/CommentTitleTest.php index a5e523d..0546cb6 100644 --- a/core/modules/comment/src/Tests/CommentTitleTest.php +++ b/core/modules/comment/src/Tests/CommentTitleTest.php @@ -60,4 +60,5 @@ public function testCommentPopulatedTitles() { // Tests that markup is created for comment with heading. $this->assertPattern('|]*>]*>' . $subject_text . '|', 'Comment title is rendered in h3 when title populated.'); } + } diff --git a/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php b/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php index f26d3e9..c0cf374 100644 --- a/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php +++ b/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php @@ -116,4 +116,5 @@ protected function assertPageCounts($path, $counts, $message) { $this->assertEqual(substr_count($text, $this->commentTitles[$langcode]), 2 * $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message); } } + } diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php index d772acf..b961201 100644 --- a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php +++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php @@ -70,4 +70,5 @@ public function testComments() { $this->assertIdentical('The second comment.', $comment->subject->value); $this->assertIdentical('0', $comment->pid->target_id); } + } diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php index 4b2bff6..a6f25f6 100644 --- a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php +++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php @@ -30,4 +30,5 @@ public function testCommentEntityDisplay() { $this->assertIdentical(20, $component['weight']); } } + } diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php index 78afe51..ffb91b0 100644 --- a/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php +++ b/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php @@ -172,4 +172,5 @@ public function testLinkReply() { $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment'); $this->assertFalse((string) $replyto_comment, "Didn't find the comment reply link as an anonymous user."); } + } diff --git a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php index 4365152..e904754 100644 --- a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php +++ b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php @@ -120,4 +120,5 @@ public function fetchObjectCallback() { break; } } + } diff --git a/core/modules/config/src/ConfigSubscriber.php b/core/modules/config/src/ConfigSubscriber.php index 6112a49..9b6c842 100644 --- a/core/modules/config/src/ConfigSubscriber.php +++ b/core/modules/config/src/ConfigSubscriber.php @@ -33,4 +33,5 @@ static function getSubscribedEvents() { $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidate', 20); return $events; } + } diff --git a/core/modules/config/src/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php index ecc7882..f758f30 100644 --- a/core/modules/config/src/Controller/ConfigController.php +++ b/core/modules/config/src/Controller/ConfigController.php @@ -160,4 +160,5 @@ public function diff($source_name, $target_name = NULL, $collection = NULL) { return $build; } + } diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index 8d11ad3..8dd9ca0 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -411,5 +411,4 @@ public static function finishBatch($success, $results, $operations) { } } - } diff --git a/core/modules/config/src/StorageReplaceDataWrapper.php b/core/modules/config/src/StorageReplaceDataWrapper.php index feb0f46..58b3b49 100644 --- a/core/modules/config/src/StorageReplaceDataWrapper.php +++ b/core/modules/config/src/StorageReplaceDataWrapper.php @@ -196,4 +196,5 @@ public function replaceData($name, array $data) { $this->replacementData[$this->collection][$name] = $data; return $this; } + } diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php index 643f763..baeacb9 100644 --- a/core/modules/config/src/Tests/ConfigImportAllTest.php +++ b/core/modules/config/src/Tests/ConfigImportAllTest.php @@ -157,4 +157,5 @@ public function testInstallUninstall() { $this->assertConfigSchema($typed_config, $name, $config->get()); } } + } diff --git a/core/modules/config/src/Tests/ConfigInstallWebTest.php b/core/modules/config/src/Tests/ConfigInstallWebTest.php index 0867f4b..4b18a4c 100644 --- a/core/modules/config/src/Tests/ConfigInstallWebTest.php +++ b/core/modules/config/src/Tests/ConfigInstallWebTest.php @@ -187,4 +187,5 @@ public function testUnmetDependenciesInstall() { $this->rebuildContainer(); $this->assertTrue(entity_load('config_test', 'other_module_test_with_dependency'), 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.'); } + } diff --git a/core/modules/config/tests/config_events_test/src/EventSubscriber.php b/core/modules/config/tests/config_events_test/src/EventSubscriber.php index ae31512..bfa70db 100644 --- a/core/modules/config/tests/config_events_test/src/EventSubscriber.php +++ b/core/modules/config/tests/config_events_test/src/EventSubscriber.php @@ -54,4 +54,5 @@ static function getSubscribedEvents() { $events[ConfigEvents::RENAME][] = array('configEventRecorder'); return $events; } + } diff --git a/core/modules/contact/src/ContactMessageAccessControlHandler.php b/core/modules/contact/src/ContactMessageAccessControlHandler.php index 4a312f8..5e45e3f 100644 --- a/core/modules/contact/src/ContactMessageAccessControlHandler.php +++ b/core/modules/contact/src/ContactMessageAccessControlHandler.php @@ -19,4 +19,5 @@ class ContactMessageAccessControlHandler extends EntityAccessControlHandler { protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) { return AccessResult::allowedIfHasPermission($account, 'access site-wide contact form'); } + } diff --git a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php index 1fa33b9..eb7c527 100644 --- a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php +++ b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php @@ -31,4 +31,5 @@ function testContactSiteWideTextfieldsLoggedInTestCase() { // Ensure that there is no textfield for email. $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'mail'))); } + } diff --git a/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php b/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php index 3edf549..dce604d 100644 --- a/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php +++ b/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php @@ -75,4 +75,5 @@ public function access(RouteMatchInterface $route_match, AccountInterface $accou // No opinion. return AccessResult::neutral(); } + } diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php index e600acd..38d643b 100644 --- a/core/modules/content_translation/src/ContentTranslationHandler.php +++ b/core/modules/content_translation/src/ContentTranslationHandler.php @@ -710,4 +710,5 @@ protected function entityFormTitle(EntityInterface $entity) { public static function getDefaultOwnerId() { return \Drupal::currentUser()->id(); } + } diff --git a/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php b/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php index e35755b..ca798e6 100644 --- a/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php +++ b/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php @@ -146,4 +146,5 @@ protected function setFieldOnlyIfTranslatable($field_name, $value) { $this->translation->set($field_name, $value); } } + } diff --git a/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php index f1c9d4c..a45fda4 100644 --- a/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php +++ b/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php @@ -140,4 +140,5 @@ public function testSetTranslatable() { $this->assertNotEqual($metadata_source_translation->isPublished(), $metadata_target_translation->isPublished(), 'Metadata published field correctly different on both translations.'); $this->assertNotEqual($metadata_source_translation->getAuthor()->id(), $metadata_target_translation->getAuthor()->id(), 'Metadata author field correctly different on both translations.'); } + } diff --git a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php index eef4d80..e5d2c85 100644 --- a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php +++ b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php @@ -184,4 +184,5 @@ protected function renderContextualLinks($ids, $current_path) { } return $this->drupalPostWithFormat('contextual/render', 'json', $post, array('query' => array('destination' => $current_path))); } + } diff --git a/core/modules/datetime/src/Plugin/views/argument/Date.php b/core/modules/datetime/src/Plugin/views/argument/Date.php index 914f585..fb2bc4a 100644 --- a/core/modules/datetime/src/Plugin/views/argument/Date.php +++ b/core/modules/datetime/src/Plugin/views/argument/Date.php @@ -37,4 +37,5 @@ public function getDateFormat($format) { // Pass in the string-field option. return $this->query->getDateFormat($this->getDateField(), $format, TRUE); } + } diff --git a/core/modules/datetime/src/Plugin/views/sort/Date.php b/core/modules/datetime/src/Plugin/views/sort/Date.php index 4e6afe2..2c8338a 100644 --- a/core/modules/datetime/src/Plugin/views/sort/Date.php +++ b/core/modules/datetime/src/Plugin/views/sort/Date.php @@ -31,5 +31,4 @@ public function getDateFormat($format) { return $this->query->getDateFormat($this->getDateField(), $format, TRUE); } - } diff --git a/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php b/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php index 50ad3d8..4ac76f0 100644 --- a/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php +++ b/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php @@ -49,4 +49,5 @@ public function get($id = NULL) { throw new BadRequestHttpException(t('No log entry ID was provided')); } + } diff --git a/core/modules/dblog/src/Tests/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php index 4d5c16b..e973887 100644 --- a/core/modules/dblog/src/Tests/DbLogTest.php +++ b/core/modules/dblog/src/Tests/DbLogTest.php @@ -84,6 +84,39 @@ function testDbLog() { } /** + * Test individual log event page. + */ + public function testLogEventPage() { + // Login the admin user. + $this->drupalLogin($this->adminUser); + + // Since referrer and location links vary by how the tests are run, inject + // fake log data to test these. + $context = [ + 'request_uri' => 'http://example.com?dblog=1', + 'referer' => 'http://example.org?dblog=2', + 'uid' => 0, + 'channel' => 'testing', + 'link' => 'foo/bar', + 'ip' => '0.0.1.0', + 'timestamp' => REQUEST_TIME, + ]; + \Drupal::service('logger.dblog')->log(RfcLogLevel::NOTICE, 'Test message', $context); + $wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField(); + + // Verify the links appear correctly. + $this->drupalGet('admin/reports/dblog/event/' . $wid); + $this->assertLinkByHref($context['request_uri']); + $this->assertLinkByHref($context['referer']); + + // Verify hostname. + $this->assertRaw($context['ip'], 'Found hostname on the detail page.'); + + // Verify severity. + $this->assertText('Notice', 'The severity was properly displayed on the detail page.'); + } + + /** * Verifies setting of the database log row limit. * * @param int $row_limit @@ -114,12 +147,23 @@ private function verifyCron($row_limit) { $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField(); $this->assertTrue($count > $row_limit, format_string('Dblog row count of @count exceeds row limit of @limit', array('@count' => $count, '@limit' => $row_limit))); + // Get last ID to compare against; log entries get deleted, so we can't + // reliably add the number of newly created log entries to the current count + // to measure number of log entries created by cron. + $last_id = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField(); + // Run a cron job. $this->cronRun(); - // Verify that the database log row count equals the row limit plus one - // because cron adds a record after it runs. - $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField(); - $this->assertTrue($count == $row_limit + 1, format_string('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit))); + + // Get last ID after cron was run. + $current_id = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField(); + + // Get the number of enabled modules. Cron adds a log entry for each module. + $list = \Drupal::moduleHandler()->getImplementations('cron'); + $module_count = count($list); + + $count = $current_id - $last_id; + $this->assertTrue(($current_id - $last_id) == $module_count + 1, format_string('Cron added @count of @expected new log entries', array('@count' => $count, '@expected' => $module_count + 1))); } /** @@ -218,7 +262,6 @@ private function verifyReports($response = 200) { if ($response == 200) { $this->assertText(t('Details'), 'DBLog event node was displayed'); } - } /** diff --git a/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php b/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php index 6a74f1e..1dd1f11 100644 --- a/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php +++ b/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php @@ -61,4 +61,5 @@ public function testWatchdog() { $decoded = Json::decode($response); $this->assertEqual($decoded['error'], 'No log entry ID was provided', 'Response message is correct.'); } + } diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php index 25f1cb0..bc99dcd 100644 --- a/core/modules/editor/src/Form/EditorImageDialog.php +++ b/core/modules/editor/src/Form/EditorImageDialog.php @@ -85,8 +85,8 @@ public function buildForm(array $form, FormStateInterface $form_state, FilterFor // Construct strings to use in the upload validators. $image_upload = $editor->getImageUploadSettings(); - if (!empty($image_upload['dimensions'])) { - $max_dimensions = $image_upload['dimensions']['max_width'] . '×' . $image_upload['dimensions']['max_height']; + if (!empty($image_upload['max_dimensions']['width']) || !empty($image_upload['max_dimensions']['height'])) { + $max_dimensions = $image_upload['max_dimensions']['width'] . 'x' . $image_upload['max_dimensions']['height']; } else { $max_dimensions = 0; diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php index 0d6840b..c771439 100644 --- a/core/modules/editor/src/Tests/EditorSecurityTest.php +++ b/core/modules/editor/src/Tests/EditorSecurityTest.php @@ -431,4 +431,5 @@ function testEditorXssFilterOverride() { $dom_node = $this->xpath('//textarea[@id="edit-body-0-value"]'); $this->assertIdentical(self::$sampleContent, (string) $dom_node[0], 'The value was filtered by the Insecure text editor XSS filter.'); } + } diff --git a/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php b/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php new file mode 100644 index 0000000..ac6e46b --- /dev/null +++ b/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php @@ -0,0 +1,172 @@ + 'basic_html', + 'name' => 'Basic HTML', + 'weight' => 0, + ])->save(); + + // Set up text editor. + Editor::create([ + 'format' => 'basic_html', + 'editor' => 'unicorn', + 'image_upload' => [ + 'status' => TRUE, + 'scheme' => 'public', + 'directory' => 'inline-images', + 'max_size' => '', + 'max_dimensions' => [ + 'width' => '', + 'height' => '' + ], + ] + ])->save(); + + // Create admin user. + $this->adminUser = $this->drupalCreateUser(['administer filters', 'use text format basic_html']); + $this->drupalLogin($this->adminUser); + } + + /** + * Tests scaling of inline images. + */ + public function testEditorUploadImageScale() { + // Generate testing images. + $testing_image_list = $this->drupalGetTestFiles('image'); + + // Case 1: no max dimensions set: uploaded image not scaled. + $test_image = $testing_image_list[0]; + list($image_file_width, $image_file_height) = $this->getTestImageInfo($test_image->uri); + $max_width = ''; + $max_height = ''; + $this->setMaxDimensions($max_width, $max_height); + list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri); + $this->assertEqual($uploaded_image_file_width, $image_file_width); + $this->assertEqual($uploaded_image_file_height, $image_file_height); + $this->assertNoRaw(t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height])); + + // Case 2: max width smaller than uploaded image: image scaled down. + $test_image = $testing_image_list[1]; + list($image_file_width, $image_file_height) = $this->getTestImageInfo($test_image->uri); + $max_width = $image_file_width - 5; + $max_height = $image_file_height; + $this->setMaxDimensions($max_width, $max_height); + list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri); + $this->assertEqual($uploaded_image_file_width, $max_width); + $this->assertEqual($uploaded_image_file_height, $uploaded_image_file_height * ($uploaded_image_file_width / $max_width)); + $this->assertRaw(t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height])); + + // Case 3: max height smaller than uploaded image: image scaled down. + $test_image = $testing_image_list[2]; + list($image_file_width, $image_file_height) = $this->getTestImageInfo($test_image->uri); + $max_width = $image_file_width; + $max_height = $image_file_height - 5; + $this->setMaxDimensions($max_width, $max_height); + list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri); + $this->assertEqual($uploaded_image_file_width, $uploaded_image_file_width * ($uploaded_image_file_height / $max_height)); + $this->assertEqual($uploaded_image_file_height, $max_height); + $this->assertRaw(t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height])); + + // Case 4: max dimensions greater than uploaded image: image not scaled. + $test_image = $testing_image_list[3]; + list($image_file_width, $image_file_height) = $this->getTestImageInfo($test_image->uri); + $max_width = $image_file_width + 5; + $max_height = $image_file_height + 5; + $this->setMaxDimensions($max_width, $max_height); + list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri); + $this->assertEqual($uploaded_image_file_width, $image_file_width); + $this->assertEqual($uploaded_image_file_height, $image_file_height); + $this->assertNoRaw(t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height])); + } + + /** + * Gets the dimensions of an uploaded image. + * + * @param string $uri + * The URI of the image. + * + * @return array + * An array containing the uploaded image's width and height. + */ + protected function getTestImageInfo($uri) { + $image_file = $this->container->get('image.factory')->get($uri); + return [ + (int) $image_file->getWidth(), + (int) $image_file->getHeight(), + ]; + } + + /** + * Sets the maximum dimensions and saves the configuration. + * + * @param string|int $width + * The width of the image. + * @param string|int $height + * The height of the image. + */ + protected function setMaxDimensions($width, $height) { + $editor = Editor::load('basic_html'); + $image_upload_settings = $editor->getImageUploadSettings(); + $image_upload_settings['max_dimensions']['width'] = $width; + $image_upload_settings['max_dimensions']['height'] = $height; + $editor->setImageUploadSettings($image_upload_settings); + $editor->save(); + } + + /** + * Uploads an image via the editor dialog. + * + * @param string $uri + * The URI of the image. + * + * @return array + * An array containing the uploaded image's width and height. + */ + protected function uploadImage($uri) { + $edit = [ + 'files[fid]' => drupal_realpath($uri), + ]; + $this->drupalGet('editor/dialog/image/basic_html'); + $this->drupalPostForm('editor/dialog/image/basic_html', $edit, t('Upload')); + $uploaded_image_file = $this->container->get('image.factory')->get('public://inline-images/' . basename($uri)); + return [ + (int) $uploaded_image_file->getWidth(), + (int) $uploaded_image_file->getHeight(), + ]; + } + +} diff --git a/core/modules/field/src/Plugin/migrate/source/d7/Field.php b/core/modules/field/src/Plugin/migrate/source/d7/Field.php index 91ec73e..2e8f745 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/Field.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/Field.php @@ -70,4 +70,5 @@ public function getIds() { ), ); } + } diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php index 08a0680..3c076e5 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php @@ -103,4 +103,5 @@ public function getIds() { ), ); } + } diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php index b638d4c..6aef0f8 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php @@ -125,4 +125,5 @@ public function testFileUpload() { $this->drupalPostForm(NULL, $edit, 'Save'); $this->assertResponse(200); } + } diff --git a/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php index 5a472ef..e677dbc 100644 --- a/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php +++ b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php @@ -141,4 +141,5 @@ public function testSelectionHandlerRelationship() { $result = $handler->getReferenceableEntities(); $this->assertResults($result); } + } diff --git a/core/modules/field/src/Tests/FieldAccessTest.php b/core/modules/field/src/Tests/FieldAccessTest.php index 0907a46..0553406 100644 --- a/core/modules/field/src/Tests/FieldAccessTest.php +++ b/core/modules/field/src/Tests/FieldAccessTest.php @@ -88,4 +88,5 @@ function testFieldAccess() { $this->drupalGet('node/' . $this->node->id()); $this->assertNoText($this->testViewFieldValue); } + } diff --git a/core/modules/field/src/Tests/FieldTestBase.php b/core/modules/field/src/Tests/FieldTestBase.php index ca23d03..2b1b020 100644 --- a/core/modules/field/src/Tests/FieldTestBase.php +++ b/core/modules/field/src/Tests/FieldTestBase.php @@ -58,4 +58,5 @@ function assertFieldValues(EntityInterface $entity, $field_name, $expected_value $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value))); } } + } diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php index 51c80b3..c2efc17 100644 --- a/core/modules/field/src/Tests/FormTest.php +++ b/core/modules/field/src/Tests/FormTest.php @@ -230,14 +230,6 @@ function testFieldFormSingleRequired() { $this->assertRaw(t('@name field is required.', array('@name' => $this->field['label'])), 'Required field with no value fails validation'); } -// function testFieldFormMultiple() { -// $this->field = $this->field_multiple; -// $field_name = $this->field['field_name']; -// $this->instance['field_name'] = $field_name; -// FieldStorageConfig::create($this->field)->save(); -// FieldConfig::create($this->instance)->save(); -// } - function testFieldFormUnlimited() { $field_storage = $this->fieldStorageUnlimited; $field_name = $field_storage['field_name']; diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php index 366024c..14777ec 100644 --- a/core/modules/field/src/Tests/Number/NumberFieldTest.php +++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php @@ -558,4 +558,5 @@ function assertSetMinimumValue($field, $minimum_value) { $this->drupalGet($field_configuration_url); $this->assertFieldById('edit-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) . ' value was set on a ' . $field->getType() . ' field.'); } + } diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php index 9284426..ed71ebc 100644 --- a/core/modules/field/src/Tests/String/StringFieldTest.php +++ b/core/modules/field/src/Tests/String/StringFieldTest.php @@ -97,4 +97,5 @@ function _testTextfieldWidgets($field_type, $widget_type) { $this->setRawContent(\Drupal::service('renderer')->renderRoot($content)); $this->assertText($value, 'Filtered tags are not displayed'); } + } diff --git a/core/modules/field/src/Tests/TranslationWebTest.php b/core/modules/field/src/Tests/TranslationWebTest.php index 397e1c1..5271fd2 100644 --- a/core/modules/field/src/Tests/TranslationWebTest.php +++ b/core/modules/field/src/Tests/TranslationWebTest.php @@ -130,4 +130,5 @@ private function checkTranslationRevisions($id, $revision_id, $available_langcod $this->assertTrue($passed, format_string('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->getRevisionId()))); } } + } diff --git a/core/modules/field/src/Tests/Update/FieldUpdateTest.php b/core/modules/field/src/Tests/Update/FieldUpdateTest.php index c3f967c..be31a09 100644 --- a/core/modules/field/src/Tests/Update/FieldUpdateTest.php +++ b/core/modules/field/src/Tests/Update/FieldUpdateTest.php @@ -140,4 +140,5 @@ protected function assertEntityRefDependency(Config $config, $present) { $dependencies += ['module' => []]; $this->assertEqual(in_array('entity_reference', $dependencies['module']), $present); } + } diff --git a/core/modules/field/src/Tests/Views/FieldUITest.php b/core/modules/field/src/Tests/Views/FieldUITest.php index 28b7024..b51abb2 100644 --- a/core/modules/field/src/Tests/Views/FieldUITest.php +++ b/core/modules/field/src/Tests/Views/FieldUITest.php @@ -137,4 +137,5 @@ public function testBooleanFilterHandler() { $option = $this->xpath('//label[@for="edit-options-value-0"]'); $this->assertEqual(t('False'), (string) $option[0]); } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php index f3662b4..c2916f5 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php @@ -36,4 +36,5 @@ public static function isApplicable(FieldDefinitionInterface $field_definition) public function viewElements(FieldItemListInterface $items, $langcode) { return array('#markup' => 'Nothing to see here'); } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php index 0419672..5eb0354 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php @@ -66,4 +66,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $elements; } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php index b638783..ca08861 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php @@ -69,4 +69,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $elements; } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php index 399aeba..97bb1e6 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php @@ -71,4 +71,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $elements; } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php index 5fb45e0..f7df0c0 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php @@ -79,4 +79,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $elements; } + } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php index d26e225..f1e96dc 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php @@ -21,7 +21,6 @@ * } * ) */ - class TestItemWithDependencies extends TestItem { /** diff --git a/core/modules/field/tests/src/Kernel/DisplayApiTest.php b/core/modules/field/tests/src/Kernel/DisplayApiTest.php index 9a85255..d639e6a 100644 --- a/core/modules/field/tests/src/Kernel/DisplayApiTest.php +++ b/core/modules/field/tests/src/Kernel/DisplayApiTest.php @@ -308,4 +308,5 @@ function testFieldEmpty() { // default "empty" text. $this->assertText($display['settings']['test_empty_string']); } + } diff --git a/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php index 7606076..8cd0291 100644 --- a/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php @@ -48,4 +48,5 @@ function testImportChange() { $field = FieldConfig::load($field_id); $this->assertEqual($field->getLabel(), $new_label, 'field label updated'); } + } diff --git a/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php index 78a136e..3478dd3 100644 --- a/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php @@ -115,4 +115,5 @@ function testImportCreate() { $field = FieldConfig::load($field_id_2b); $this->assertTrue($field, 'Test import field 2b from sync exists'); } + } diff --git a/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php index 220aa46..b536fe8 100644 --- a/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php @@ -108,4 +108,5 @@ public function testImportDelete() { $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array(); $this->assertTrue(empty($deleted_storages), 'Fields are deleted'); } + } diff --git a/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php index 41cb06a..b52a92f 100644 --- a/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php @@ -156,4 +156,5 @@ public function testStringFormatter() { $this->assertLink($value, 0); $this->assertLinkByHref('/entity_test_rev/' . $entity_new_revision->id() . '/revision/' . $entity_new_revision->getRevisionId() . '/view'); } + } diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php index 89655fd..f7b6fc7 100644 --- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php +++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php @@ -51,4 +51,5 @@ public function testDefaultsException() { sprintf('Failed to lookup field type %s in the static map.', var_export([], TRUE))); $this->plugin->transform([], $this->migrateExecutable, $this->row, 'property'); } + } diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php index 54ff0a6..3ebf959 100644 --- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php +++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php @@ -186,4 +186,5 @@ public function alterLocalTasks(&$local_tasks) { } } } + } diff --git a/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php b/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php index b2950e7..898b417 100644 --- a/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php +++ b/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php @@ -37,4 +37,5 @@ function testIndentation() { $this->drupalGet('admin/structure/types/manage/page/display'); $this->assertRaw('js-indentation indentation'); } + } diff --git a/core/modules/file/src/FileInterface.php b/core/modules/file/src/FileInterface.php index d078946..5b5a6bb 100644 --- a/core/modules/file/src/FileInterface.php +++ b/core/modules/file/src/FileInterface.php @@ -113,4 +113,5 @@ public function setTemporary(); * Creation timestamp of the file entity. */ public function getCreatedTime(); + } diff --git a/core/modules/file/src/FileStorageInterface.php b/core/modules/file/src/FileStorageInterface.php index 296be7b..3bbd92c 100644 --- a/core/modules/file/src/FileStorageInterface.php +++ b/core/modules/file/src/FileStorageInterface.php @@ -23,4 +23,5 @@ * An integer containing the number of bytes used. */ public function spaceUsed($uid = NULL, $status = FILE_STATUS_PERMANENT); + } diff --git a/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php index eeab8af..12647b1 100644 --- a/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php +++ b/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php @@ -107,4 +107,5 @@ public function listUsage(FileInterface $file) { } return $references; } + } diff --git a/core/modules/file/src/FileUsage/FileUsageBase.php b/core/modules/file/src/FileUsage/FileUsageBase.php index 5ebc793..c90359b 100644 --- a/core/modules/file/src/FileUsage/FileUsageBase.php +++ b/core/modules/file/src/FileUsage/FileUsageBase.php @@ -32,4 +32,5 @@ public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $ $file->save(); } } + } diff --git a/core/modules/file/src/FileUsage/FileUsageInterface.php b/core/modules/file/src/FileUsage/FileUsageInterface.php index cd8bea8..6acda42 100644 --- a/core/modules/file/src/FileUsage/FileUsageInterface.php +++ b/core/modules/file/src/FileUsage/FileUsageInterface.php @@ -66,4 +66,5 @@ public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $ * the third level contains the usage count. */ public function listUsage(FileInterface $file); + } diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php index 745743c..e92cef3 100644 --- a/core/modules/file/src/Tests/DownloadTest.php +++ b/core/modules/file/src/Tests/DownloadTest.php @@ -168,4 +168,5 @@ private function checkUrl($scheme, $directory, $filename, $expected_url) { $file->delete(); } + } diff --git a/core/modules/file/src/Tests/FileFieldPathTest.php b/core/modules/file/src/Tests/FileFieldPathTest.php index b3773be..c9a15de 100644 --- a/core/modules/file/src/Tests/FileFieldPathTest.php +++ b/core/modules/file/src/Tests/FileFieldPathTest.php @@ -89,4 +89,5 @@ function assertPathMatch($expected_path, $actual_path, $message) { $result = preg_match('/' . preg_quote($base_path, '/') . '(_[0-9]+)?\.' . preg_quote($extension, '/') . '/', $actual_path); $this->assertTrue($result, $message); } + } diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php index 1fc4177..665649a 100644 --- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php +++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php @@ -64,4 +64,5 @@ function testFileFieldRSSContent() { ); $this->assertRaw($test_element, 'File field RSS enclosure is displayed when viewing the RSS feed.'); } + } diff --git a/core/modules/file/src/Tests/FileFieldRevisionTest.php b/core/modules/file/src/Tests/FileFieldRevisionTest.php index 09a8572..f5d00c7 100644 --- a/core/modules/file/src/Tests/FileFieldRevisionTest.php +++ b/core/modules/file/src/Tests/FileFieldRevisionTest.php @@ -138,4 +138,5 @@ function testRevisions() { $this->assertFileNotExists($node_file_r1, 'Original file is deleted after deleting the entire node with two revisions remaining.'); $this->assertFileEntryNotExists($node_file_r1, 'Original file entry is deleted after deleting the entire node with two revisions remaining.'); } + } diff --git a/core/modules/file/src/Tests/FileManagedAccessTest.php b/core/modules/file/src/Tests/FileManagedAccessTest.php index ce016af..391f91a 100644 --- a/core/modules/file/src/Tests/FileManagedAccessTest.php +++ b/core/modules/file/src/Tests/FileManagedAccessTest.php @@ -65,4 +65,5 @@ function testFileAccess() { $this->assertFalse($file->access('view', $account), 'Private file is not viewable to anonymous user'); $this->assertFalse($file->access('download', $account), 'Private file is not downloadable to anonymous user'); } + } diff --git a/core/modules/file/src/Tests/FilePrivateTest.php b/core/modules/file/src/Tests/FilePrivateTest.php index 9f2ba0b..2705ef2 100644 --- a/core/modules/file/src/Tests/FilePrivateTest.php +++ b/core/modules/file/src/Tests/FilePrivateTest.php @@ -111,4 +111,5 @@ function testPrivateFile() { $this->drupalGet($file_url); $this->assertResponse(403, 'Confirmed that access is denied for another user to the temporary file.'); } + } diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php index de76327..dfb9e51 100644 --- a/core/modules/file/src/Tests/FileTokenReplaceTest.php +++ b/core/modules/file/src/Tests/FileTokenReplaceTest.php @@ -93,4 +93,5 @@ function testFileTokenReplacement() { $this->assertEqual($output, $expected, format_string('Unsanitized file token %token replaced.', array('%token' => $input))); } } + } diff --git a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php index 64a49be..b1ee6a6 100644 --- a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php +++ b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php @@ -20,4 +20,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php index 0f0f5ec..3aaa5cf 100644 --- a/core/modules/file/src/Tests/SaveUploadTest.php +++ b/core/modules/file/src/Tests/SaveUploadTest.php @@ -358,4 +358,5 @@ function testDrupalMovingUploadedFileError() { '@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename() )), 'Found upload error log entry.'); } + } diff --git a/core/modules/file/tests/file_test/src/Form/FileTestForm.php b/core/modules/file/tests/file_test/src/Form/FileTestForm.php index 5b06335..628bb55 100644 --- a/core/modules/file/tests/file_test/src/Form/FileTestForm.php +++ b/core/modules/file/tests/file_test/src/Form/FileTestForm.php @@ -117,4 +117,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message(t('Epic upload FAIL!'), 'error'); } } + } diff --git a/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php index fd6da2e..c0a7c05 100644 --- a/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php +++ b/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php @@ -46,4 +46,5 @@ function getInternalUri() { function getExternalUrl() { return '/dummy/example.txt'; } + } diff --git a/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php index 7736751..12019e6 100644 --- a/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php +++ b/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php @@ -30,4 +30,5 @@ public function getDescription() { function realpath() { return FALSE; } + } diff --git a/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php index 8ae028a..1428300 100644 --- a/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php +++ b/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php @@ -46,4 +46,5 @@ function getInternalUri() { function getExternalUrl() { return '/dummy/example.txt'; } + } diff --git a/core/modules/file/tests/src/Kernel/CopyTest.php b/core/modules/file/tests/src/Kernel/CopyTest.php index b9bf8bc..8836bd4 100644 --- a/core/modules/file/tests/src/Kernel/CopyTest.php +++ b/core/modules/file/tests/src/Kernel/CopyTest.php @@ -141,4 +141,5 @@ function testExistingError() { $this->assertFileUnchanged($source, File::load($source->id())); $this->assertFileUnchanged($target, File::load($target->id())); } + } diff --git a/core/modules/file/tests/src/Kernel/DeleteTest.php b/core/modules/file/tests/src/Kernel/DeleteTest.php index a6577d8..b880571 100644 --- a/core/modules/file/tests/src/Kernel/DeleteTest.php +++ b/core/modules/file/tests/src/Kernel/DeleteTest.php @@ -68,4 +68,5 @@ function testInUse() { $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.'); $this->assertFalse(File::load($file->id()), 'File was removed from the database.'); } + } diff --git a/core/modules/file/tests/src/Kernel/MoveTest.php b/core/modules/file/tests/src/Kernel/MoveTest.php index 9262b03..a56caea 100644 --- a/core/modules/file/tests/src/Kernel/MoveTest.php +++ b/core/modules/file/tests/src/Kernel/MoveTest.php @@ -156,4 +156,5 @@ function testExistingError() { $this->assertFileUnchanged($source, File::load($source->id())); $this->assertFileUnchanged($target, File::load($target->id())); } + } diff --git a/core/modules/file/tests/src/Kernel/SaveDataTest.php b/core/modules/file/tests/src/Kernel/SaveDataTest.php index e079454..c5637d0 100644 --- a/core/modules/file/tests/src/Kernel/SaveDataTest.php +++ b/core/modules/file/tests/src/Kernel/SaveDataTest.php @@ -130,4 +130,5 @@ function testExistingError() { // Ensure that the existing file wasn't overwritten. $this->assertFileUnchanged($existing, File::load($existing->id())); } + } diff --git a/core/modules/file/tests/src/Kernel/SaveTest.php b/core/modules/file/tests/src/Kernel/SaveTest.php index d5a3eef..69c7f2b 100644 --- a/core/modules/file/tests/src/Kernel/SaveTest.php +++ b/core/modules/file/tests/src/Kernel/SaveTest.php @@ -82,4 +82,5 @@ function testFileSave() { $this->assertEqual(array($uppercase_file->id() => $uppercase_file->id()), $fids); } + } diff --git a/core/modules/file/tests/src/Kernel/SpaceUsedTest.php b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php index 95efbaf..f8752c4 100644 --- a/core/modules/file/tests/src/Kernel/SpaceUsedTest.php +++ b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php @@ -71,4 +71,5 @@ function testFileSpaceUsed() { $this->assertEqual($file->spaceUsed(3, 0), 3); $this->assertEqual($file->spaceUsed(3, FILE_STATUS_PERMANENT), 300); } + } diff --git a/core/modules/file/tests/src/Kernel/UsageTest.php b/core/modules/file/tests/src/Kernel/UsageTest.php index 1b8918d..fdf1231 100644 --- a/core/modules/file/tests/src/Kernel/UsageTest.php +++ b/core/modules/file/tests/src/Kernel/UsageTest.php @@ -202,4 +202,5 @@ function testTempFileCustomCleanup() { $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.'); $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.'); } + } diff --git a/core/modules/file/tests/src/Kernel/ValidateTest.php b/core/modules/file/tests/src/Kernel/ValidateTest.php index c3bd453..0bfcfdd 100644 --- a/core/modules/file/tests/src/Kernel/ValidateTest.php +++ b/core/modules/file/tests/src/Kernel/ValidateTest.php @@ -34,4 +34,5 @@ function testCallerValidation() { $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), 'Validating returns errors.'); $this->assertFileHooksCalled(array('validate')); } + } diff --git a/core/modules/file/tests/src/Kernel/ValidatorTest.php b/core/modules/file/tests/src/Kernel/ValidatorTest.php index 2d8f4cb..30a6fe8 100644 --- a/core/modules/file/tests/src/Kernel/ValidatorTest.php +++ b/core/modules/file/tests/src/Kernel/ValidatorTest.php @@ -153,4 +153,5 @@ function testFileValidateSize() { $errors = file_validate_size($file, 1, 1); $this->assertEqual(count($errors), 2, 'Errors for both the file and their limit.', 'File'); } + } diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml index ffcbbb5..6b767f2 100644 --- a/core/modules/filter/migration_templates/d6_filter_format.yml +++ b/core/modules/filter/migration_templates/d6_filter_format.yml @@ -6,14 +6,8 @@ source: plugin: d6_filter_format process: format: - - - plugin: machine_name - source: name - - - plugin: dedupe_entity - entity_type: filter_format - field: format - length: 32 + plugin: machine_name + source: name name: name cache: cache filters: diff --git a/core/modules/filter/src/Plugin/DataType/FilterFormat.php b/core/modules/filter/src/Plugin/DataType/FilterFormat.php index 65bfa19..11ef4cc 100644 --- a/core/modules/filter/src/Plugin/DataType/FilterFormat.php +++ b/core/modules/filter/src/Plugin/DataType/FilterFormat.php @@ -44,4 +44,5 @@ public function getSettableOptions(AccountInterface $account = NULL) { // @todo: Avoid calling functions but move to injected dependencies. return array_map(function ($format) { return $format->label(); }, filter_formats($account)); } + } diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/filter/src/Plugin/Filter/FilterImageStyle.php similarity index 94% rename from core/modules/image/src/Plugin/Filter/FilterImageStyle.php rename to core/modules/filter/src/Plugin/Filter/FilterImageStyle.php index 8475fcb..532e990 100644 --- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php +++ b/core/modules/filter/src/Plugin/Filter/FilterImageStyle.php @@ -1,16 +1,8 @@ assertRaw(t('Disabled text format %format.', array('%format' => $name))); $this->assertText('hook_filter_format_disable invoked.'); } + } diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php index c7a2ee3..5ce4e6d 100644 --- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php +++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php @@ -154,4 +154,5 @@ function testImageSource() { $this->assertTrue($found, format_string('@image was found.', array('@image' => $image))); } } + } diff --git a/core/modules/filter/src/Tests/FilterNoFormatTest.php b/core/modules/filter/src/Tests/FilterNoFormatTest.php index 32d5d43..3dcc9f6 100644 --- a/core/modules/filter/src/Tests/FilterNoFormatTest.php +++ b/core/modules/filter/src/Tests/FilterNoFormatTest.php @@ -33,4 +33,5 @@ function testCheckMarkupNoFormat() { // format, it is filtered as though it is in the fallback format. $this->assertEqual(check_markup($text), check_markup($text, filter_fallback_format()), 'Text with no format is filtered the same as text in the fallback format.'); } + } diff --git a/core/modules/filter/src/Tests/FilterSecurityTest.php b/core/modules/filter/src/Tests/FilterSecurityTest.php index 4ea141c..b86e072 100644 --- a/core/modules/filter/src/Tests/FilterSecurityTest.php +++ b/core/modules/filter/src/Tests/FilterSecurityTest.php @@ -86,4 +86,5 @@ function testSkipSecurityFilters() { $this->assertEqual(check_markup($text, 'filtered_html', '', array()), $expected_filtered_text, 'Expected filter result.'); $this->assertEqual(check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR)), $expected_filtered_text, 'Expected filter result, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.'); } + } diff --git a/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php index cc90cb3..dc77eb4 100644 --- a/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php @@ -58,4 +58,5 @@ function testFilterDefaults() { ))); } } + } diff --git a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php index 860f672..3f46739 100644 --- a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php @@ -1174,4 +1174,5 @@ function assertNormalized($haystack, $needle, $message = '', $group = 'Other') { function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') { return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) === FALSE, $message, $group); } + } diff --git a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php index 0d4e5d0..a50a069 100644 --- a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php +++ b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php @@ -102,4 +102,5 @@ protected function setUp() { } parent::setUp(); } + } diff --git a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php index 4bde297..6604001 100644 --- a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php +++ b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php @@ -17,7 +17,7 @@ * This just holds the dependency-injected config, entity manager, and forum * manager objects. */ -abstract class ForumBreadcrumbBuilderBase implements BreadcrumbBuilderInterface { +abstract class ForumBreadcrumbBuilderBase implements BreadcrumbBuilderInterface { use StringTranslationTrait; /** diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index 9e77482..ba9c033 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -10,7 +10,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/* +/** * Provides forum overview form for the forum vocabulary. */ class Overview extends OverviewTerms { diff --git a/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php index 50551ee..d57628f 100644 --- a/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php +++ b/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php @@ -24,4 +24,5 @@ protected function buildForumQuery() { ->orderBy('f.created', 'DESC') ->range(0, $this->configuration['block_count']); } + } diff --git a/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraint.php b/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraint.php index 1791a71..eec87cb 100644 --- a/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraint.php +++ b/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraint.php @@ -16,4 +16,5 @@ class ForumLeafConstraint extends Constraint { public $selectForum = 'Select a forum.'; public $noLeafMessage = 'The item %forum is a forum container, not a forum. Select one of the forums below instead.'; + } diff --git a/core/modules/forum/src/Tests/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php index 6b1399b..1bcc9bc 100644 --- a/core/modules/forum/src/Tests/ForumBlockTest.php +++ b/core/modules/forum/src/Tests/ForumBlockTest.php @@ -176,4 +176,5 @@ protected function createForumTopics($count = 5) { return $topics; } + } diff --git a/core/modules/forum/src/Tests/ForumIndexTest.php b/core/modules/forum/src/Tests/ForumIndexTest.php index 64fe0d1..8ead34f 100644 --- a/core/modules/forum/src/Tests/ForumIndexTest.php +++ b/core/modules/forum/src/Tests/ForumIndexTest.php @@ -79,4 +79,5 @@ function testForumIndexStatus() { $this->drupalGet('forum/' . $tid); $this->assertNoText($title, 'Unpublished forum topic no longer appears on index.'); } + } diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php index 57b2c60..1327714 100644 --- a/core/modules/forum/src/Tests/ForumTest.php +++ b/core/modules/forum/src/Tests/ForumTest.php @@ -677,4 +677,5 @@ private function generateForumTopics() { $this->nids[] = $node->id(); } } + } diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php index 8ff3235..fd8158b 100644 --- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php +++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php @@ -244,4 +244,5 @@ protected function getTypedDataIds($types, $context = array()) { return $typed_data_ids; } + } diff --git a/core/modules/hal/tests/src/Kernel/DenormalizeTest.php b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php index 3e99f2f..64c8311 100644 --- a/core/modules/hal/tests/src/Kernel/DenormalizeTest.php +++ b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php @@ -203,4 +203,5 @@ public function testPatchDenormalization() { // Check the custom property that contains the list of fields to merge. $this->assertEqual($denormalized->_restSubmittedFields, ['field_test_text']); } + } diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php index 6cb3991..76e2ee3 100644 --- a/core/modules/help/src/Tests/HelpTest.php +++ b/core/modules/help/src/Tests/HelpTest.php @@ -158,4 +158,5 @@ protected function getModuleList() { } return $modules; } + } diff --git a/core/modules/help/src/Tests/NoHelpTest.php b/core/modules/help/src/Tests/NoHelpTest.php index 9d087b7..7a6fb7a 100644 --- a/core/modules/help/src/Tests/NoHelpTest.php +++ b/core/modules/help/src/Tests/NoHelpTest.php @@ -45,4 +45,5 @@ public function testMainPageNoHelp() { $this->drupalGet('admin/help/menu_test'); $this->assertResponse(404, 'Getting a module overview help page for a module that does not implement hook_help() results in a 404.'); } + } diff --git a/core/modules/history/src/Tests/HistoryTest.php b/core/modules/history/src/Tests/HistoryTest.php index 9e5d970..17bba34 100644 --- a/core/modules/history/src/Tests/HistoryTest.php +++ b/core/modules/history/src/Tests/HistoryTest.php @@ -144,4 +144,5 @@ function testHistory() { $this->markNodeAsRead($nid); $this->assertResponse(403); } + } diff --git a/core/modules/history/src/Tests/Views/HistoryTimestampTest.php b/core/modules/history/src/Tests/Views/HistoryTimestampTest.php index 1e34b79..0f48401 100644 --- a/core/modules/history/src/Tests/Views/HistoryTimestampTest.php +++ b/core/modules/history/src/Tests/Views/HistoryTimestampTest.php @@ -85,4 +85,5 @@ public function testHandlers() { $this->executeView($view); } + } diff --git a/core/modules/image/src/Tests/FileMoveTest.php b/core/modules/image/src/Tests/FileMoveTest.php index 5868e85..1957994 100644 --- a/core/modules/image/src/Tests/FileMoveTest.php +++ b/core/modules/image/src/Tests/FileMoveTest.php @@ -48,4 +48,5 @@ function testNormal() { // Check if derivative image has been flushed. $this->assertFalse(file_exists($derivative_uri), 'Make sure derivative image has been flushed.'); } + } diff --git a/core/modules/image/src/Tests/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php index d36aafc..2532524 100644 --- a/core/modules/image/src/Tests/ImageFieldValidateTest.php +++ b/core/modules/image/src/Tests/ImageFieldValidateTest.php @@ -101,4 +101,5 @@ function testRequiredAttributes() { $this->assertNoText(t('Alternative text field is required.')); $this->assertNoText(t('Title field is required.')); } + } diff --git a/core/modules/image/src/Tests/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php index 1f7c8e4..63c0d80 100644 --- a/core/modules/image/src/Tests/ImageStyleFlushTest.php +++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php @@ -106,4 +106,5 @@ function testFlush() { // Post flush, expected no image in the 'private' wrapper. $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'private'))); } + } diff --git a/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php index bf0a4cd..52cf6c6 100644 --- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php +++ b/core/modules/image/src/Tests/ImageThemeFunctionTest.php @@ -217,4 +217,5 @@ function testImageAltFunctionality() { $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', array(":class" => "image-with-attribute-alt", ":alt" => "Attribute alt")); $this->assertEqual(count($elements), 1, 'Attribute alt overrides alt property if both set.'); } + } diff --git a/core/modules/language/src/Form/NegotiationBrowserForm.php b/core/modules/language/src/Form/NegotiationBrowserForm.php index 1e38a9b..dfbdabb 100644 --- a/core/modules/language/src/Form/NegotiationBrowserForm.php +++ b/core/modules/language/src/Form/NegotiationBrowserForm.php @@ -211,4 +211,5 @@ protected function language_get_browser_drupal_langcode_mappings() { } return $config->get('map'); } + } diff --git a/core/modules/language/src/LanguageServiceProvider.php b/core/modules/language/src/LanguageServiceProvider.php index 566bd63..cb4ad88 100644 --- a/core/modules/language/src/LanguageServiceProvider.php +++ b/core/modules/language/src/LanguageServiceProvider.php @@ -100,4 +100,5 @@ protected function getDefaultLanguageValues() { } return FALSE; } + } diff --git a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php index f92514b..ee6912e 100644 --- a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php +++ b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php @@ -23,4 +23,5 @@ public function testUnnecessaryLanguageSettingsVisibility() { $this->assertFieldByXPath('//input[@id="edit-visibility-language-langcodes-en"]', NULL, '\'English\' option appears at block config, language settings section.'); $this->assertFieldByXpath('//input[@id="edit-visibility-language-langcodes-hu"]', NULL, '\'Hungarian\' option appears at block config, language settings section.'); } + } diff --git a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php b/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php index c6b7319..3991b2a 100644 --- a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php +++ b/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php @@ -86,4 +86,5 @@ function testUIBrowserLanguageMappings() { $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.'); $this->assertField('edit-mappings-xx-drupal-langcode', 'zh-hans', 'Drupal language code found.'); } + } diff --git a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php index 9cf69ad..dbd35cd 100644 --- a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php +++ b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php @@ -97,4 +97,5 @@ public function testLanguageConfiguration() { )); $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); } + } diff --git a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php b/core/modules/language/src/Tests/LanguageListModuleInstallTest.php index ea9cdd5..3df9bdc 100644 --- a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php +++ b/core/modules/language/src/Tests/LanguageListModuleInstallTest.php @@ -37,4 +37,5 @@ function testModuleInstallLanguageList() { $this->rebuildContainer(); $this->assertTrue(\Drupal::moduleHandler()->moduleExists('language'), 'Language module is enabled'); } + } diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php index 2f1a455..d407530 100644 --- a/core/modules/language/src/Tests/LanguageListTest.php +++ b/core/modules/language/src/Tests/LanguageListTest.php @@ -205,4 +205,5 @@ function testLanguageStates() { $conf_languages = $this->container->get('language_manager')->getLanguages(); $this->assertEqual(array_diff_key($expected_conf_languages, $conf_languages), array(), 'Configurable languages loaded correctly.'); } + } diff --git a/core/modules/language/src/Tests/LanguageLocaleListTest.php b/core/modules/language/src/Tests/LanguageLocaleListTest.php index ec05c44..dd3e02a 100644 --- a/core/modules/language/src/Tests/LanguageLocaleListTest.php +++ b/core/modules/language/src/Tests/LanguageLocaleListTest.php @@ -69,4 +69,5 @@ function testLanguageLocaleList() { // Check the language list displayed is ordered. $this->assertTrue($options === $options_ordered, 'Language list is ordered.'); } + } diff --git a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php b/core/modules/language/src/Tests/LanguagePathMonolingualTest.php index 1f79604..510d805 100644 --- a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php +++ b/core/modules/language/src/Tests/LanguagePathMonolingualTest.php @@ -69,4 +69,5 @@ function testPageLinks() { $this->assertResponse(200, 'Clicked link results in a valid page'); $this->assertText(t('Add language'), 'Page contains the add language text'); } + } diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php index 7e19d4f..ef2abee 100644 --- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php @@ -532,4 +532,5 @@ public function testDisableLanguageSwitcher() { $block = Block::load($block_id); $this->assertFalse($block, 'Language switcher block was removed.'); } + } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php index e89f86a..99b2fff 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php @@ -46,4 +46,5 @@ public function buildForm(array $form, FormStateInterface $form_state) { */ public function submitForm(array &$form, FormStateInterface $form_state) { } + } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php index d538fcc..0aa6c49 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php @@ -34,4 +34,5 @@ public function buildForm(array $form, FormStateInterface $form_state) { */ public function submitForm(array &$form, FormStateInterface $form_state) { } + } diff --git a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php index 4fa83a4..8ecdbf7 100644 --- a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php +++ b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php @@ -249,6 +249,7 @@ public function providerTestDomain() { ); return $domain_configuration; } + } } diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php index 4849d32..f737037 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php @@ -85,4 +85,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { } return $element; } + } diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php index 3fe76a6..4f706f6 100644 --- a/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php +++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php @@ -74,4 +74,5 @@ public function validate($value, Constraint $constraint) { } } } + } diff --git a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php index b80624f..ec06ca6 100644 --- a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php +++ b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php @@ -94,4 +94,5 @@ public function testLinkViewsTokens() { $this->assertRaw("Raw options: ."); } } + } diff --git a/core/modules/locale/src/Form/ImportForm.php b/core/modules/locale/src/Form/ImportForm.php index 5a20e27..0ea7180 100644 --- a/core/modules/locale/src/Form/ImportForm.php +++ b/core/modules/locale/src/Form/ImportForm.php @@ -192,4 +192,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $form_state->setRedirect('locale.translate_page'); } + } diff --git a/core/modules/locale/src/Gettext.php b/core/modules/locale/src/Gettext.php index 7bfa2dd..5573f43 100644 --- a/core/modules/locale/src/Gettext.php +++ b/core/modules/locale/src/Gettext.php @@ -93,4 +93,5 @@ public static function fileToDatabase($file, $options) { $report['seek'] = $reader->getSeek(); return $report; } + } diff --git a/core/modules/locale/src/Locale.php b/core/modules/locale/src/Locale.php index 3627b57..3e2a9f5 100644 --- a/core/modules/locale/src/Locale.php +++ b/core/modules/locale/src/Locale.php @@ -20,4 +20,5 @@ class Locale { public static function config() { return \Drupal::service('locale.config_manager'); } + } diff --git a/core/modules/locale/src/LocaleProjectStorage.php b/core/modules/locale/src/LocaleProjectStorage.php index e0189de..907bd6c 100644 --- a/core/modules/locale/src/LocaleProjectStorage.php +++ b/core/modules/locale/src/LocaleProjectStorage.php @@ -165,4 +165,5 @@ public function getAll() { } return $this->cache; } + } diff --git a/core/modules/locale/src/LocaleProjectStorageInterface.php b/core/modules/locale/src/LocaleProjectStorageInterface.php index be3fe57..b56174d 100644 --- a/core/modules/locale/src/LocaleProjectStorageInterface.php +++ b/core/modules/locale/src/LocaleProjectStorageInterface.php @@ -98,4 +98,5 @@ public function resetCache(); * The number of saved items. */ public function countProjects(); + } diff --git a/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/core/modules/locale/src/StreamWrapper/TranslationsStream.php index 7797ad1..d59949b 100644 --- a/core/modules/locale/src/StreamWrapper/TranslationsStream.php +++ b/core/modules/locale/src/StreamWrapper/TranslationsStream.php @@ -47,4 +47,5 @@ function getDirectoryPath() { function getExternalUrl() { throw new \LogicException('PO files URL should not be public.'); } + } diff --git a/core/modules/locale/src/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php index fc6552a..01a0544 100644 --- a/core/modules/locale/src/StringDatabaseStorage.php +++ b/core/modules/locale/src/StringDatabaseStorage.php @@ -536,4 +536,5 @@ protected function dbDelete($table, $keys) { protected function dbExecute($query, array $args = array()) { return $this->connection->query($query, $args, $this->options); } + } diff --git a/core/modules/locale/src/StringStorageInterface.php b/core/modules/locale/src/StringStorageInterface.php index 2aad73e..da1c8fb 100644 --- a/core/modules/locale/src/StringStorageInterface.php +++ b/core/modules/locale/src/StringStorageInterface.php @@ -176,4 +176,5 @@ public function createString($values = array()); * New string translation object. */ public function createTranslation($values = array()); + } diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php index c2ecc1a..0b69da2 100644 --- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php +++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php @@ -638,4 +638,5 @@ public function getPoFileWithConfigDe() { EOF; } + } diff --git a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php b/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php index 0993e28..e84e3dd 100644 --- a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php +++ b/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php @@ -32,4 +32,5 @@ public function testLibraryAlter() { $js_assets = $this->container->get('asset.resolver')->getJsAssets($assets, FALSE)[1]; $this->assertTrue(array_key_exists('core/modules/locale/locale.datepicker.js', $js_assets), 'locale.datepicker.js added to scripts.'); } + } diff --git a/core/modules/locale/src/Tests/LocalePathTest.php b/core/modules/locale/src/Tests/LocalePathTest.php index 7bd2615..cc4f31a 100644 --- a/core/modules/locale/src/Tests/LocalePathTest.php +++ b/core/modules/locale/src/Tests/LocalePathTest.php @@ -147,4 +147,5 @@ public function testPathLanguageConfiguration() { $this->assertText($second_node->label(), 'Custom alias with prefix returns second node.'); } + } diff --git a/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/core/modules/locale/src/Tests/LocalePluralFormatTest.php index 0f6c9c1..00fe8d5 100644 --- a/core/modules/locale/src/Tests/LocalePluralFormatTest.php +++ b/core/modules/locale/src/Tests/LocalePluralFormatTest.php @@ -444,4 +444,5 @@ public function getPoFileWithBrokenPlural() { msgstr "Ponedjeljak" EOF; } + } diff --git a/core/modules/locale/src/Tests/LocaleStringTest.php b/core/modules/locale/src/Tests/LocaleStringTest.php index f70a964..2f467e7 100644 --- a/core/modules/locale/src/Tests/LocaleStringTest.php +++ b/core/modules/locale/src/Tests/LocaleStringTest.php @@ -201,4 +201,5 @@ public function createTranslation($source, $langcode, $values = array()) { 'translation' => $this->randomMachineName(100), ))->save(); } + } diff --git a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php index dae9e5b..b117e2c 100644 --- a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php +++ b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php @@ -87,4 +87,5 @@ function testTranslatedUpdate() { $this->assertRaw('messages--status', 'No pending updates.'); $this->assertNoLinkByHref('fr/update.php/run', 'No link to run updates.'); } + } diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php index 1f790b6..aad0119 100644 --- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php +++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php @@ -205,7 +205,7 @@ public function testStringTranslation() { $this->assertNoText(t('No strings available.'), 'The translation has been removed'); } - /* + /** * Adds a language and checks that the JavaScript translation files are * properly created and rebuilt on deletion. */ @@ -539,4 +539,5 @@ public function testUICustomizedStrings() { $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter')); $this->assertText($string->getString(), "Translation is marked as customized."); } + } diff --git a/core/modules/locale/src/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php index a763458..85196ad 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateBase.php +++ b/core/modules/locale/src/Tests/LocaleUpdateBase.php @@ -301,4 +301,5 @@ protected function assertTranslation($source, $translation, $langcode, $message $db_translation = $db_translation == FALSE ? '' : $db_translation; $this->assertEqual($translation, $db_translation, $message ? $message : format_string('Correct translation of %source (%language)', array('%source' => $source, '%language' => $langcode))); } + } diff --git a/core/modules/locale/src/Tests/LocaleUpdateCronTest.php b/core/modules/locale/src/Tests/LocaleUpdateCronTest.php index 073258d..569b818 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateCronTest.php +++ b/core/modules/locale/src/Tests/LocaleUpdateCronTest.php @@ -106,4 +106,5 @@ public function testUpdateCron() { $this->assertTrue($current->timestamp > $initial->timestamp, 'Timestamp is updated'); $this->assertTrue($current->last_checked > $initial->last_checked, 'Last checked is updated'); } + } diff --git a/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php b/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php index 4dd7913..cfd2446 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php +++ b/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php @@ -28,4 +28,5 @@ public function testLocaleUpdateDevelopmentRelease() { $this->verbose($projects['contrib']->info['version']); $this->assertEqual($projects['contrib']->info['version'], '12.x-10.x', 'The branch of the contrib module dev release.'); } + } diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php index 5be8bed..1bdc927 100644 --- a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php +++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php @@ -64,4 +64,5 @@ public function testMenuLinkContentFormValidation() { ); $this->assertText(t('Manually entered paths should start with /, ? or #.')); } + } diff --git a/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/core/modules/menu_ui/src/Form/MenuDeleteForm.php index 86fbd6b..22bfb0a 100644 --- a/core/modules/menu_ui/src/Form/MenuDeleteForm.php +++ b/core/modules/menu_ui/src/Form/MenuDeleteForm.php @@ -92,4 +92,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); } + } diff --git a/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php b/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php index c0e9856..0396f17 100644 --- a/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php +++ b/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php @@ -63,4 +63,5 @@ function testDefaultMenuLinkReorder() { $this->assertLink('Home'); } + } diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php index ce47fb1..3fc8423 100644 --- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php +++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php @@ -337,4 +337,5 @@ function testMultilingualMenuNodeFormWidget() { $this->drupalGet($url); $this->assertFieldById('edit-menu-title', $translated_node_title); } + } diff --git a/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php b/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php index 121276c..f08da3b 100644 --- a/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php +++ b/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php @@ -44,4 +44,5 @@ class MigrateProcessPlugin extends Plugin { * @var bool (optional) */ public $handle_multiples = FALSE; + } diff --git a/core/modules/migrate/src/MigrateBuildDependencyInterface.php b/core/modules/migrate/src/MigrateBuildDependencyInterface.php index 5c52998..bb02c88 100644 --- a/core/modules/migrate/src/MigrateBuildDependencyInterface.php +++ b/core/modules/migrate/src/MigrateBuildDependencyInterface.php @@ -18,4 +18,5 @@ * An array of migrations. */ public function buildDependencyMigration(array $migrations, array $dynamic_ids); + } diff --git a/core/modules/migrate/src/MigrateMessageInterface.php b/core/modules/migrate/src/MigrateMessageInterface.php index 2b55651..628a684 100644 --- a/core/modules/migrate/src/MigrateMessageInterface.php +++ b/core/modules/migrate/src/MigrateMessageInterface.php @@ -14,4 +14,5 @@ * The type of message, for example: status or warning. */ public function display($message, $type = 'status'); + } diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php index 56dcb9f..86294b5 100644 --- a/core/modules/migrate/src/Plugin/Migration.php +++ b/core/modules/migrate/src/Plugin/Migration.php @@ -712,4 +712,5 @@ public function getTrackLastImported() { public function getDestinationIds() { $this->destinationIds; } + } diff --git a/core/modules/migrate/src/Row.php b/core/modules/migrate/src/Row.php index 4f07ef4..94cb8b2 100644 --- a/core/modules/migrate/src/Row.php +++ b/core/modules/migrate/src/Row.php @@ -335,4 +335,5 @@ public function getHash() { public function isStub() { return $this->isStub; } + } diff --git a/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php b/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php index 9700975..72d37ed 100644 --- a/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php +++ b/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php @@ -47,4 +47,5 @@ public function getRequirementsProvider() { ), ); } + } diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php index d08e035..da20b49 100644 --- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php +++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php @@ -115,4 +115,5 @@ public function setEntity($entity) { protected function getEntity(Row $row, array $old_destination_id_values) { return $this->entity; } + } diff --git a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php index c12478b..1be14bc 100644 --- a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php +++ b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php @@ -63,4 +63,5 @@ protected function getEntity($entity_type, $bundle, $view_mode) { public function getTestValues() { return $this->testValues; } + } diff --git a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php index a99af42..18df362 100644 --- a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php +++ b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php @@ -63,4 +63,5 @@ protected function getEntity($entity_type, $bundle, $form_mode) { public function getTestValues() { return $this->testValues; } + } diff --git a/core/modules/migrate/tests/src/Unit/process/ConcatTest.php b/core/modules/migrate/tests/src/Unit/process/ConcatTest.php index d13c33b..1d0d4c3 100644 --- a/core/modules/migrate/tests/src/Unit/process/ConcatTest.php +++ b/core/modules/migrate/tests/src/Unit/process/ConcatTest.php @@ -49,6 +49,7 @@ public function testConcatWithDelimiter() { $value = $this->plugin->transform(array('foo', 'bar'), $this->migrateExecutable, $this->row, 'destinationproperty'); $this->assertSame($value, 'foo_bar'); } + } class TestConcat extends Concat { diff --git a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php index 27aad89..a1960de 100644 --- a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php +++ b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php @@ -160,4 +160,5 @@ protected function entityQueryExpects($count) { ->method('execute') ->will($this->returnCallback(function () use (&$count) { return $count--;})); } + } diff --git a/core/modules/migrate/tests/src/Unit/process/GetTest.php b/core/modules/migrate/tests/src/Unit/process/GetTest.php index bdbb551..316cbfc 100644 --- a/core/modules/migrate/tests/src/Unit/process/GetTest.php +++ b/core/modules/migrate/tests/src/Unit/process/GetTest.php @@ -114,4 +114,5 @@ public function __construct() { public function setSource($source) { $this->configuration['source'] = $source; } + } diff --git a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php index 48f5647..7c731a2 100644 --- a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php +++ b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php @@ -78,4 +78,5 @@ public function testIterator() { $this->assertSame($new_value[42]['foo'], 'test'); $this->assertSame($new_value[42]['id'], 42); } + } diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php index abe3d04..87d5457 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php @@ -17,7 +17,7 @@ * * @ingroup migration */ -abstract class CckFieldPluginBase extends PluginBase implements MigrateCckFieldInterface { +abstract class CckFieldPluginBase extends PluginBase implements MigrateCckFieldInterface { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php index 0a43d30..e27a353 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php @@ -125,6 +125,7 @@ public function testVariableGet() { // Test non-default. $this->assertSame(TRUE, $this->base->variableGetWrapper('my_variable', FALSE)); } + } namespace Drupal\Tests\migrate_drupal\Unit\source\d6; @@ -217,4 +218,5 @@ public function variableGetWrapper($name, $default) { public function getIds() { return array(); } + } diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php index fd22c6e..d073c18 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php @@ -43,7 +43,7 @@ protected function getEntityCounts() { 'field_config' => 62, 'field_storage_config' => 43, 'file' => 7, - 'filter_format' => 8, + 'filter_format' => 7, 'image_style' => 5, 'migration' => 105, 'node' => 9, diff --git a/core/modules/node/src/NodeStorageInterface.php b/core/modules/node/src/NodeStorageInterface.php index 70562ff..b09d7b7 100644 --- a/core/modules/node/src/NodeStorageInterface.php +++ b/core/modules/node/src/NodeStorageInterface.php @@ -64,4 +64,5 @@ public function updateType($old_type, $new_type); * The language object. */ public function clearRevisionsLanguage(LanguageInterface $language); + } diff --git a/core/modules/node/src/NodeTypeInterface.php b/core/modules/node/src/NodeTypeInterface.php index 7e657bd..c034ffb 100644 --- a/core/modules/node/src/NodeTypeInterface.php +++ b/core/modules/node/src/NodeTypeInterface.php @@ -80,4 +80,5 @@ public function getHelp(); * The description of this node type. */ public function getDescription(); + } diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php index 927861c..d161a0a 100644 --- a/core/modules/node/src/Plugin/Search/NodeSearch.php +++ b/core/modules/node/src/Plugin/Search/NodeSearch.php @@ -623,7 +623,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) { } } - /* + /** * {@inheritdoc} */ public function buildSearchUrlQuery(FormStateInterface $form_state) { diff --git a/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php index 248b15c..33b20b8 100644 --- a/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php +++ b/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php @@ -29,4 +29,5 @@ protected function getUrlInfo(ResultRow $row) { protected function getDefaultLabel() { return $this->t('Revert'); } + } diff --git a/core/modules/node/src/Tests/AssertButtonsTrait.php b/core/modules/node/src/Tests/AssertButtonsTrait.php index 89d3bce..58d484d 100644 --- a/core/modules/node/src/Tests/AssertButtonsTrait.php +++ b/core/modules/node/src/Tests/AssertButtonsTrait.php @@ -44,4 +44,5 @@ public function assertButtons($buttons, $dropbutton = TRUE) { $this->assertNoRaw('dropbutton-wrapper'); } } + } diff --git a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php index e84fc0e..74e2340 100644 --- a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php +++ b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php @@ -222,4 +222,5 @@ protected function assertTaxonomyPage($is_admin) { } } } + } diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php index e3a7754..dcfa43d 100644 --- a/core/modules/node/src/Tests/NodeAccessFieldTest.php +++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php @@ -109,4 +109,5 @@ function testNodeAccessAdministerField() { $this->drupalGet('node/add/page'); $this->assertRaw($default, 'The updated default value is displayed when creating a new node.'); } + } diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php index cfd351b..7db264c 100644 --- a/core/modules/node/src/Tests/NodeAccessPagerTest.php +++ b/core/modules/node/src/Tests/NodeAccessPagerTest.php @@ -96,4 +96,5 @@ public function testForumPager() { $this->assertRaw('page=1'); $this->assertNoRaw('page=2'); } + } diff --git a/core/modules/node/src/Tests/NodeAccessRebuildTest.php b/core/modules/node/src/Tests/NodeAccessRebuildTest.php index b6c3723..187f3a0 100644 --- a/core/modules/node/src/Tests/NodeAccessRebuildTest.php +++ b/core/modules/node/src/Tests/NodeAccessRebuildTest.php @@ -32,4 +32,5 @@ function testNodeAccessRebuild() { $this->drupalPostForm(NULL, array(), t('Rebuild permissions')); $this->assertText(t('Content permissions have been rebuilt.')); } + } diff --git a/core/modules/node/src/Tests/NodeAccessRecordsTest.php b/core/modules/node/src/Tests/NodeAccessRecordsTest.php index 9e05d84..4126539 100644 --- a/core/modules/node/src/Tests/NodeAccessRecordsTest.php +++ b/core/modules/node/src/Tests/NodeAccessRecordsTest.php @@ -80,4 +80,5 @@ function testNodeAccessRecords() { $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node6->id()))->fetchAll(); $this->assertEqual(count($records), 0, 'Returned no records for unpublished node.'); } + } diff --git a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php index 3ffd3a3..25ae6b6 100644 --- a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php +++ b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php @@ -46,4 +46,5 @@ function testNodeViewModeChange() { $build = $this->drupalBuildEntityView($node); $this->assertEqual($build['#view_mode'], 'teaser', 'The view mode has correctly been set to teaser.'); } + } diff --git a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php index e9a96a9..9beae5d 100644 --- a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php +++ b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php @@ -97,7 +97,7 @@ function testMultilingualNodeForm() { $this->assertRaw($body_value, 'Body correctly displayed using English as requested language'); } - /* + /** * Tests multilingual field display settings. */ function testMultilingualDisplaySettings() { diff --git a/core/modules/node/src/Tests/NodeFormButtonsTest.php b/core/modules/node/src/Tests/NodeFormButtonsTest.php index bf555d6..9f6732b 100644 --- a/core/modules/node/src/Tests/NodeFormButtonsTest.php +++ b/core/modules/node/src/Tests/NodeFormButtonsTest.php @@ -131,4 +131,5 @@ function testNodeFormButtons() { $node_3 = $node_storage->load(3); $this->assertFalse($node_3->isPublished(), 'Node is unpublished'); } + } diff --git a/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php index 69f3963..aecf8a9 100644 --- a/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php +++ b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php @@ -68,4 +68,5 @@ public function testChangedTimeAfterSaveWithoutChanges() { $node = entity_load('node', 1, TRUE); $this->assertNotEqual($changed_timestamp, $node->getChangedTime(), "The entity's changed time was updated after form save without changes."); } + } diff --git a/core/modules/node/src/Tests/NodeHelpTest.php b/core/modules/node/src/Tests/NodeHelpTest.php index 9ede4ab..2946011 100644 --- a/core/modules/node/src/Tests/NodeHelpTest.php +++ b/core/modules/node/src/Tests/NodeHelpTest.php @@ -73,4 +73,5 @@ public function testNodeShowHelpText() { $this->assertResponse(200); $this->assertText($this->testText); } + } diff --git a/core/modules/node/src/Tests/NodeLoadMultipleTest.php b/core/modules/node/src/Tests/NodeLoadMultipleTest.php index d7c4360..31a30ee 100644 --- a/core/modules/node/src/Tests/NodeLoadMultipleTest.php +++ b/core/modules/node/src/Tests/NodeLoadMultipleTest.php @@ -58,4 +58,5 @@ function testNodeMultipleLoad() { $this->assertTrue(is_object($node), 'Node is an object'); } } + } diff --git a/core/modules/node/src/Tests/NodePostSettingsTest.php b/core/modules/node/src/Tests/NodePostSettingsTest.php index 3cfca2a..bc3dd99 100644 --- a/core/modules/node/src/Tests/NodePostSettingsTest.php +++ b/core/modules/node/src/Tests/NodePostSettingsTest.php @@ -54,4 +54,5 @@ function testPagePostInfo() { $elements = $this->xpath('//div[contains(@class, :class)]', array(':class' => 'node__submitted')); $this->assertEqual(count($elements), 0, 'Post information is not displayed.'); } + } diff --git a/core/modules/node/src/Tests/NodeQueryAlterTest.php b/core/modules/node/src/Tests/NodeQueryAlterTest.php index 2f1b11b..022625b 100644 --- a/core/modules/node/src/Tests/NodeQueryAlterTest.php +++ b/core/modules/node/src/Tests/NodeQueryAlterTest.php @@ -193,4 +193,5 @@ function testNodeQueryAlterOverride() { } \Drupal::state()->delete('node_access_test.no_access_uid'); } + } diff --git a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php index 1f5c9b7..e000fb8 100644 --- a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php +++ b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php @@ -165,4 +165,5 @@ function testNodeRevisionAccessPerType() { $this->assertFalse($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->typeMap[$case['op']]} did not grant revision permission for articles."); } } + } diff --git a/core/modules/node/src/Tests/NodeRevisionsAllTest.php b/core/modules/node/src/Tests/NodeRevisionsAllTest.php index f7b81bc..582ca5b 100644 --- a/core/modules/node/src/Tests/NodeRevisionsAllTest.php +++ b/core/modules/node/src/Tests/NodeRevisionsAllTest.php @@ -146,4 +146,5 @@ function testRevisions() { '%revision-date' => format_date($old_revision_date), ))); } + } diff --git a/core/modules/node/src/Tests/NodeSaveTest.php b/core/modules/node/src/Tests/NodeSaveTest.php index 9c7d70f..f01724b 100644 --- a/core/modules/node/src/Tests/NodeSaveTest.php +++ b/core/modules/node/src/Tests/NodeSaveTest.php @@ -178,4 +178,5 @@ function testNodeSaveOnInsert() { $node = $this->drupalCreateNode(array('title' => 'new')); $this->assertEqual($node->getTitle(), 'Node ' . $node->id(), 'Node saved on node insert.'); } + } diff --git a/core/modules/node/src/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php index ba898ee..59ee021 100644 --- a/core/modules/node/src/Tests/NodeTitleTest.php +++ b/core/modules/node/src/Tests/NodeTitleTest.php @@ -99,4 +99,5 @@ function testNodeTitle() { $this->assertTitle($edge_case_title_escaped . ' | Drupal', 'Page title is equal to article\'s "title".', 'Node'); } + } diff --git a/core/modules/node/src/Tests/NodeTitleXSSTest.php b/core/modules/node/src/Tests/NodeTitleXSSTest.php index 2a3e94f..c410275 100644 --- a/core/modules/node/src/Tests/NodeTitleXSSTest.php +++ b/core/modules/node/src/Tests/NodeTitleXSSTest.php @@ -38,4 +38,5 @@ function testNodeTitleXSS() { $this->drupalGet('node/' . $node->id() . '/edit'); $this->assertNoRaw($xss, 'Harmful tags are escaped when editing a node.'); } + } diff --git a/core/modules/node/src/Tests/PageViewTest.php b/core/modules/node/src/Tests/PageViewTest.php index 6cac963..086b3e1 100644 --- a/core/modules/node/src/Tests/PageViewTest.php +++ b/core/modules/node/src/Tests/PageViewTest.php @@ -38,4 +38,5 @@ function testPageView() { $this->drupalGet("node/" . $node->id() . "/edit"); $this->assertResponse(200); } + } diff --git a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php index d245399..050068b 100644 --- a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php +++ b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php @@ -169,4 +169,5 @@ public function testNodeDeleteAccess() { $own_node = Node::load($own_node->id()); $this->assertNull($own_node, 'The own node is deleted.'); } + } diff --git a/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php b/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php index 6822807..6b6d5e2 100644 --- a/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php +++ b/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php @@ -105,4 +105,5 @@ protected function assertPageCounts($path, $counts, $message) { $this->assertEqual(substr_count($text, $this->nodeTitles[$langcode]), 2 * $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message); } } + } diff --git a/core/modules/node/tests/src/Kernel/NodeConditionTest.php b/core/modules/node/tests/src/Kernel/NodeConditionTest.php index 07986cc..7636d52 100644 --- a/core/modules/node/tests/src/Kernel/NodeConditionTest.php +++ b/core/modules/node/tests/src/Kernel/NodeConditionTest.php @@ -79,4 +79,5 @@ function testConditions() { $condition = $manager->createInstance('node_type', array('bundles' => array('article' => 'article'), 'context' => array('node' => $article))); $this->assertTrue($condition->execute(), 'Constructor injection of context and configuration working as anticipated.'); } + } diff --git a/core/modules/node/tests/src/Kernel/NodeValidationTest.php b/core/modules/node/tests/src/Kernel/NodeValidationTest.php index ae0bf01..9fd646e 100644 --- a/core/modules/node/tests/src/Kernel/NodeValidationTest.php +++ b/core/modules/node/tests/src/Kernel/NodeValidationTest.php @@ -68,4 +68,5 @@ public function testValidation() { $this->assertEqual($violations[0]->getPropertyPath(), ''); $this->assertEqual($violations[0]->getMessage(), 'The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.'); } + } diff --git a/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php b/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php index 8ceb7a7..287bf48 100644 --- a/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php +++ b/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php @@ -71,5 +71,4 @@ public function testRevisionCreateTimestampView() { ], ['vid' => 'vid', 'revision_timestamp' => 'revision_timestamp']); } - } diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php index 9015758..2d3f0fb 100644 --- a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php +++ b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php @@ -75,4 +75,5 @@ protected function setUp() { 'uri' => $this->entity->url(), ]; } + } diff --git a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php index 4c571a8..df3365c 100644 --- a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php +++ b/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php @@ -30,4 +30,5 @@ function testSelectListDynamic() { } } } + } diff --git a/core/modules/options/tests/src/Kernel/OptionsFieldTest.php b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php index b3437f3..89ac127 100644 --- a/core/modules/options/tests/src/Kernel/OptionsFieldTest.php +++ b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php @@ -96,4 +96,5 @@ function testUpdateAllowedValues() { $entity->{$this->fieldName}->generateSampleItems(); $this->entityValidateAndSave($entity); } + } diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php index 4a1a779..4ee5729 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php @@ -28,7 +28,7 @@ class PathItem extends FieldItemBase { public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) { $properties['alias'] = DataDefinition::create('string') ->setLabel(t('Path alias')); - $properties['pid'] = DataDefinition::create('string') + $properties['pid'] = DataDefinition::create('integer') ->setLabel(t('Path id')); return $properties; } diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php index 449a0ae..df4e18d 100644 --- a/core/modules/path/src/Tests/PathAliasTest.php +++ b/core/modules/path/src/Tests/PathAliasTest.php @@ -345,4 +345,5 @@ function testDuplicateNodeAlias() { $this->assertText(t('The alias is already in use.')); $this->assertFieldByXPath("//input[@name='path[0][alias]' and contains(@class, 'error')]", $edit['path[0][alias]'], 'Textfield exists and has the error class.'); } + } diff --git a/core/modules/path/src/Tests/PathLanguageTest.php b/core/modules/path/src/Tests/PathLanguageTest.php index 028d359..695f6be 100644 --- a/core/modules/path/src/Tests/PathLanguageTest.php +++ b/core/modules/path/src/Tests/PathLanguageTest.php @@ -187,4 +187,5 @@ function testAliasTranslation() { $english_node->save(); $this->assertFalse($this->container->get('path.alias_storage')->aliasExists('/' . $french_alias, 'fr'), 'Alias for French translation is removed when translation is deleted.'); } + } diff --git a/core/modules/path/src/Tests/PathLanguageUiTest.php b/core/modules/path/src/Tests/PathLanguageUiTest.php index 9ff0ea2..540cc85 100644 --- a/core/modules/path/src/Tests/PathLanguageUiTest.php +++ b/core/modules/path/src/Tests/PathLanguageUiTest.php @@ -77,4 +77,5 @@ function testNonDefaultUrl() { $this->drupalGet('fr/' . $name); $this->assertText(t('Filter aliases'), 'Foreign URL alias works'); } + } diff --git a/core/modules/path/src/Tests/PathTaxonomyTermTest.php b/core/modules/path/src/Tests/PathTaxonomyTermTest.php index faeceab..f62fb6c 100644 --- a/core/modules/path/src/Tests/PathTaxonomyTermTest.php +++ b/core/modules/path/src/Tests/PathTaxonomyTermTest.php @@ -82,4 +82,5 @@ function testTermAlias() { $this->assertNoText($description, 'Old URL alias has been removed after altering.'); $this->assertResponse(404, 'Old URL alias returns 404.'); } + } diff --git a/core/modules/path/src/Tests/PathTestBase.php b/core/modules/path/src/Tests/PathTestBase.php index c16c4d1..c4a88af 100644 --- a/core/modules/path/src/Tests/PathTestBase.php +++ b/core/modules/path/src/Tests/PathTestBase.php @@ -25,4 +25,5 @@ protected function setUp() { $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); } } + } diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php index b9ebf12..6baaed3 100644 --- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php +++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php @@ -559,4 +559,5 @@ public function testImageField() { $ajax_commands = Json::decode($response); $this->assertIdentical('
save(); return $comment; } + } diff --git a/core/modules/rdf/src/Tests/GetNamespacesTest.php b/core/modules/rdf/src/Tests/GetNamespacesTest.php index 3ecd2f1..8aeaf79 100644 --- a/core/modules/rdf/src/Tests/GetNamespacesTest.php +++ b/core/modules/rdf/src/Tests/GetNamespacesTest.php @@ -46,4 +46,5 @@ function testGetRdfNamespaces() { )); $this->assertTrue(!empty($element), 'When a prefix has conflicting namespaces, the first declared one is used.'); } + } diff --git a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php index 0ddec66..7fde6f0 100644 --- a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php +++ b/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php @@ -40,4 +40,5 @@ function testGetRdfNamespaces() { $this->pass('Expected exception thrown: ' . $e->getMessage()); } } + } diff --git a/core/modules/rdf/src/Tests/NodeAttributesTest.php b/core/modules/rdf/src/Tests/NodeAttributesTest.php index bcc5d50..5c6b267 100644 --- a/core/modules/rdf/src/Tests/NodeAttributesTest.php +++ b/core/modules/rdf/src/Tests/NodeAttributesTest.php @@ -90,4 +90,5 @@ function testNodeAttributes() { ); $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/created', $expected_value), 'Node date found in RDF output (dc:created).'); } + } diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php index 1c72d71..e6c358d 100644 --- a/core/modules/rdf/src/Tests/StandardProfileTest.php +++ b/core/modules/rdf/src/Tests/StandardProfileTest.php @@ -533,4 +533,5 @@ protected function getRdfGraph(Url $url) { $parser->parse($graph, $this->drupalGet($url), 'rdfa', $this->baseUri); return $graph; } + } diff --git a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php b/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php index 8e18035..6be2c5b 100644 --- a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php +++ b/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php @@ -77,4 +77,5 @@ function testTaxonomyTermRdfaAttributes() { // @todo Add test for term description once it is a field: // https://www.drupal.org/node/569434. } + } diff --git a/core/modules/rdf/src/Tests/UserAttributesTest.php b/core/modules/rdf/src/Tests/UserAttributesTest.php index c68dd99..232b5b2 100644 --- a/core/modules/rdf/src/Tests/UserAttributesTest.php +++ b/core/modules/rdf/src/Tests/UserAttributesTest.php @@ -104,4 +104,5 @@ function testUserAttributesInMarkup() { } } + } diff --git a/core/modules/rdf/tests/src/Kernel/CrudTest.php b/core/modules/rdf/tests/src/Kernel/CrudTest.php index 39dddc4..60b4208 100644 --- a/core/modules/rdf/tests/src/Kernel/CrudTest.php +++ b/core/modules/rdf/tests/src/Kernel/CrudTest.php @@ -107,4 +107,5 @@ function testFieldMapping() { ->getFieldMapping($field_name); $this->assertEqual($mapping, $field_mapping, 'Field mapping updated.'); } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php index 012b57d..a35a9c4 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php @@ -50,4 +50,5 @@ protected function setUp() { public function testDefaultFormatter() { $this->assertFormatterRdfa(array('type' => 'datetime_default'), 'http://schema.org/dateCreated', array('value' => $this->testValue . 'Z', 'type' => 'literal', 'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime')); } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php index 88f9a7c..c121751 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php @@ -47,4 +47,5 @@ public function testAllFormatters() { // Test the mailto formatter. $this->assertFormatterRdfa(array('type' => 'email_mailto'), 'http://schema.org/email', array('value' => $this->testValue)); } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php index d2b1239..514ca9d 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php @@ -200,4 +200,5 @@ protected function createTestEntity($testValue) { $this->entity = EntityTest::create(array()); $this->entity->{$this->fieldName}->value = $testValue; } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php index 6f0f9d3..a0b28e9 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php @@ -54,4 +54,5 @@ public function testStringFormatters() { // Tests the string formatter. $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/text', array('value' => $this->testValue)); } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php index e26bd79..9741256 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php @@ -65,4 +65,5 @@ public function testAllFormatters() { // Tests the telephone link formatter with custom title. $this->assertFormatterRdfa($formatter, 'http://schema.org/telephone', $expected_rdf_value); } + } diff --git a/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php index c50cc16..cce3499 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php @@ -69,4 +69,5 @@ public function testAllFormatters() { // Tests the trimmed formatter. $this->assertFormatterRdfa(array('type' => 'text_trimmed'), 'http://schema.org/text', array('value' => $formatted_value)); } + } diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php index de33d84..b91ef18 100644 --- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php @@ -246,4 +246,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { } return $elements; } + } diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php index c0fbc90..f5b277d 100644 --- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php +++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php @@ -514,4 +514,5 @@ private function assertResponsiveImageFieldFormattersLink($link_type) { break; } } + } diff --git a/core/modules/responsive_image/tests/modules/responsive_image_test_module/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php b/core/modules/responsive_image/tests/modules/responsive_image_test_module/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php index bbe8d9e..883322e 100644 --- a/core/modules/responsive_image/tests/modules/responsive_image_test_module/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php +++ b/core/modules/responsive_image/tests/modules/responsive_image_test_module/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php @@ -31,4 +31,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { } return $elements; } + } diff --git a/core/modules/rest/src/LinkManager/RelationLinkManager.php b/core/modules/rest/src/LinkManager/RelationLinkManager.php index 988e57c..297ffd9 100644 --- a/core/modules/rest/src/LinkManager/RelationLinkManager.php +++ b/core/modules/rest/src/LinkManager/RelationLinkManager.php @@ -138,4 +138,5 @@ protected function writeCache($context = array()) { // and only clear it when the fields cache is cleared. $this->cache->set('rest:links:relations', $data, Cache::PERMANENT, array('entity_field_info')); } + } diff --git a/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php b/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php index 3873358..484ca76 100644 --- a/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php +++ b/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php @@ -36,4 +36,5 @@ public function getTypeUri($entity_type, $bundle, $context = array()); * bundle. Otherwise, returns false. */ public function getTypeInternalIds($type_uri, $context = array()); + } diff --git a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php index 52e31f0..6a6ddae 100644 --- a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php +++ b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php @@ -93,4 +93,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { } return $this->derivatives; } + } diff --git a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php index 97fbf1c..9a3587c 100644 --- a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php +++ b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php @@ -42,4 +42,5 @@ public function getInstance(array $options){ return $this->createInstance($options['id']); } } + } diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php index e81ee09..6ec5f26 100644 --- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php +++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php @@ -245,5 +245,4 @@ protected function getBaseRoute($canonical_path, $method) { return $route; } - } diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php index 9efdb35..c585166 100644 --- a/core/modules/rest/src/RequestHandler.php +++ b/core/modules/rest/src/RequestHandler.php @@ -131,4 +131,5 @@ public function handle(RouteMatchInterface $route_match, Request $request) { public function csrfToken() { return new Response(\Drupal::csrfToken()->get('rest'), 200, array('Content-Type' => 'text/plain')); } + } diff --git a/core/modules/rest/src/ResourceResponse.php b/core/modules/rest/src/ResourceResponse.php index 6d30415..20a7e78 100644 --- a/core/modules/rest/src/ResourceResponse.php +++ b/core/modules/rest/src/ResourceResponse.php @@ -49,4 +49,5 @@ public function __construct($data = NULL, $status = 200, $headers = array()) { public function getResponseData() { return $this->responseData; } + } diff --git a/core/modules/rest/src/Tests/CsrfTest.php b/core/modules/rest/src/Tests/CsrfTest.php index 3835ab8..f98abad 100644 --- a/core/modules/rest/src/Tests/CsrfTest.php +++ b/core/modules/rest/src/Tests/CsrfTest.php @@ -114,4 +114,5 @@ protected function getCurlOptions() { ), ); } + } diff --git a/core/modules/rest/src/Tests/DeleteTest.php b/core/modules/rest/src/Tests/DeleteTest.php index 3d97540..ccba38e 100644 --- a/core/modules/rest/src/Tests/DeleteTest.php +++ b/core/modules/rest/src/Tests/DeleteTest.php @@ -72,4 +72,5 @@ public function testDelete() { $this->assertEqual($account->id(), $user->id(), 'User still exists in the database.'); $this->assertResponse(405); } + } diff --git a/core/modules/rest/src/Tests/NodeTest.php b/core/modules/rest/src/Tests/NodeTest.php index 357109c..7f0ed81 100644 --- a/core/modules/rest/src/Tests/NodeTest.php +++ b/core/modules/rest/src/Tests/NodeTest.php @@ -194,4 +194,5 @@ public function testMissingBundle() { $this->assertResponse(400); $this->assertResponseBody('{"error":"A string must be provided as a bundle value."}'); } + } diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php index 099957e..71b1a08 100644 --- a/core/modules/rest/src/Tests/RESTTestBase.php +++ b/core/modules/rest/src/Tests/RESTTestBase.php @@ -425,4 +425,5 @@ protected function removeNodeFieldsForNonAdminUsers(NodeInterface $node) { protected function assertResponseBody($expected, $message = '', $group = 'REST Response') { return $this->assertIdentical($expected, $this->responseBody, $message ? $message : strtr('Response body @expected (expected) is equal to @response (actual).', array('@expected' => var_export($expected, TRUE), '@response' => var_export($this->responseBody, TRUE))), $group); } + } diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php index 04dfa12..a884342 100644 --- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php +++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php @@ -785,4 +785,5 @@ public function testMulEntityRows() { $expected = ['mul-l1-l2', 'mul-l1-orig', 'mul-l2-l1', 'mul-l2-orig', 'mul-none']; $this->assertIdentical($names, $expected, 'The translated content was found in the JSON.'); } + } diff --git a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php index d5d46f3..6c19ca4 100644 --- a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php +++ b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php @@ -133,4 +133,5 @@ class StubRequestHandlerResourcePlugin extends ResourceBase { function get() {} function patch() {} + } diff --git a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php index 4cc1e7d..53ebbd5 100644 --- a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php +++ b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php @@ -133,4 +133,5 @@ public function testRoutesRequirements() { $this->assertEquals(count($requirements_1), 0, 'First route has no requirement.'); $this->assertEquals(count($requirements_2), 2, 'Views route with rest export had the format and method requirements added.'); } + } diff --git a/core/modules/search/src/Form/ReindexConfirm.php b/core/modules/search/src/Form/ReindexConfirm.php index 5096d10..9cd4a15 100644 --- a/core/modules/search/src/Form/ReindexConfirm.php +++ b/core/modules/search/src/Form/ReindexConfirm.php @@ -67,4 +67,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $form_state->setRedirectUrl($this->getCancelUrl()); } } + } diff --git a/core/modules/search/src/Form/SearchBlockForm.php b/core/modules/search/src/Form/SearchBlockForm.php index 1e63d65..cc9d89e 100644 --- a/core/modules/search/src/Form/SearchBlockForm.php +++ b/core/modules/search/src/Form/SearchBlockForm.php @@ -115,4 +115,5 @@ public function buildForm(array $form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) { // This form submits to the search page, so processing happens there. } + } diff --git a/core/modules/search/src/Form/SearchPageForm.php b/core/modules/search/src/Form/SearchPageForm.php index bc1ee58..1521beb 100644 --- a/core/modules/search/src/Form/SearchPageForm.php +++ b/core/modules/search/src/Form/SearchPageForm.php @@ -101,4 +101,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { array('query' => $query) ); } + } diff --git a/core/modules/search/src/Plugin/SearchPluginBase.php b/core/modules/search/src/Plugin/SearchPluginBase.php index c7beea8..d253972 100644 --- a/core/modules/search/src/Plugin/SearchPluginBase.php +++ b/core/modules/search/src/Plugin/SearchPluginBase.php @@ -129,7 +129,7 @@ public function suggestedTitle() { return $this->t('Search'); } - /* + /** * {@inheritdoc} */ public function buildSearchUrlQuery(FormStateInterface $form_state) { @@ -140,7 +140,7 @@ public function buildSearchUrlQuery(FormStateInterface $form_state) { return $query; } - /* + /** * {@inheritdoc} */ public function getHelp() { diff --git a/core/modules/search/src/Plugin/views/field/Score.php b/core/modules/search/src/Plugin/views/field/Score.php index 03e8fd9..643fcc4 100644 --- a/core/modules/search/src/Plugin/views/field/Score.php +++ b/core/modules/search/src/Plugin/views/field/Score.php @@ -43,4 +43,5 @@ public function render(ResultRow $values) { return parent::render($values); } } + } diff --git a/core/modules/search/src/SearchPluginManager.php b/core/modules/search/src/SearchPluginManager.php index fa407ff..e70039b 100644 --- a/core/modules/search/src/SearchPluginManager.php +++ b/core/modules/search/src/SearchPluginManager.php @@ -27,4 +27,5 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac $this->setCacheBackend($cache_backend, 'search_plugins'); $this->alterInfo('search_plugin'); } + } diff --git a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php index 3e19fb2..48f8bb6 100644 --- a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php +++ b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php @@ -111,4 +111,5 @@ function testSearchCommentCountToggle() { $this->assertNoText(t('0 comments'), 'Empty comment count does not display for nodes with comment status set to Hidden'); $this->assertNoText(t('1 comment'), 'Non-empty comment count does not display for nodes with comment status set to Hidden'); } + } diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php index 1af1194..f67637f 100644 --- a/core/modules/search/src/Tests/SearchCommentTest.php +++ b/core/modules/search/src/Tests/SearchCommentTest.php @@ -350,4 +350,5 @@ function testAddNewComment() { $this->assertText($node->label(), 'Search for keyword worked'); $this->assertNoText(t('Add new comment')); } + } diff --git a/core/modules/search/src/Tests/SearchDateIntervalTest.php b/core/modules/search/src/Tests/SearchDateIntervalTest.php index 30f26bd..967f1f5 100644 --- a/core/modules/search/src/Tests/SearchDateIntervalTest.php +++ b/core/modules/search/src/Tests/SearchDateIntervalTest.php @@ -71,4 +71,5 @@ public function testDateIntervalQueryAlter() { $this->assertLink('Node ES', 0, 'Spanish translation found in search results'); $this->assertNoLink('Node EN', 'Search results do not contain English node'); } + } diff --git a/core/modules/search/src/Tests/SearchEmbedFormTest.php b/core/modules/search/src/Tests/SearchEmbedFormTest.php index b62706b..22da9b6 100644 --- a/core/modules/search/src/Tests/SearchEmbedFormTest.php +++ b/core/modules/search/src/Tests/SearchEmbedFormTest.php @@ -81,4 +81,5 @@ function testEmbeddedForm() { $this->assertEqual($this->submitCount, $count, 'Form submission count is correct'); $this->submitCount = $count; } + } diff --git a/core/modules/search/src/Tests/SearchExactTest.php b/core/modules/search/src/Tests/SearchExactTest.php index eaf3edb..d17646b 100644 --- a/core/modules/search/src/Tests/SearchExactTest.php +++ b/core/modules/search/src/Tests/SearchExactTest.php @@ -75,4 +75,5 @@ function testExactQuery() { $this->assertNoText(format_date($node->getChangedTime(), 'short'), 'Basic page node does not display post date when post settings are off.'); } + } diff --git a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php b/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php index 731d0ea..1625d8d 100644 --- a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php +++ b/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php @@ -58,4 +58,5 @@ function testSearchKeywordsConditions() { $this->assertText("Dummy search snippet to display."); $this->assertRaw(Html::escape(print_r(array('keys' => 'bike', 'search_conditions' => $keys), TRUE))); } + } diff --git a/core/modules/search/src/Tests/SearchLanguageTest.php b/core/modules/search/src/Tests/SearchLanguageTest.php index f359a99..cdd0bd4 100644 --- a/core/modules/search/src/Tests/SearchLanguageTest.php +++ b/core/modules/search/src/Tests/SearchLanguageTest.php @@ -133,4 +133,5 @@ function testLanguages() { $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.'); $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete')); } + } diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php index a7a3070..e133101 100644 --- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php +++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php @@ -318,4 +318,5 @@ protected function assertDatabaseCounts($count_node, $count_foo, $message) { $this->assertEqual($count_foo, count($results), 'Foo count was ' . $count_foo . ' for ' . $message); } + } diff --git a/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php b/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php index a8b5369..a8b45a5 100644 --- a/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php +++ b/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php @@ -76,4 +76,5 @@ function testPhraseSearchPunctuation() { $this->drupalPostForm('search/node', $edit, t('Search')); $this->assertNoRaw('æll'); } + } diff --git a/core/modules/search/src/Tests/SearchNodePunctuationTest.php b/core/modules/search/src/Tests/SearchNodePunctuationTest.php index 77449ba..c185aea 100644 --- a/core/modules/search/src/Tests/SearchNodePunctuationTest.php +++ b/core/modules/search/src/Tests/SearchNodePunctuationTest.php @@ -59,4 +59,5 @@ function testPhraseSearchPunctuation() { $this->assertNoRaw('&amp;'); $this->assertText('You must include at least one keyword'); } + } diff --git a/core/modules/search/src/Tests/SearchNumberMatchingTest.php b/core/modules/search/src/Tests/SearchNumberMatchingTest.php index 179c9ae..a6ad057 100644 --- a/core/modules/search/src/Tests/SearchNumberMatchingTest.php +++ b/core/modules/search/src/Tests/SearchNumberMatchingTest.php @@ -95,4 +95,5 @@ function testNumberSearching() { } } + } diff --git a/core/modules/search/src/Tests/SearchNumbersTest.php b/core/modules/search/src/Tests/SearchNumbersTest.php index 4ddb831..30d3906 100644 --- a/core/modules/search/src/Tests/SearchNumbersTest.php +++ b/core/modules/search/src/Tests/SearchNumbersTest.php @@ -100,4 +100,5 @@ function testNumberSearching() { $this->assertText($node->label(), format_string('%type: node title shown (search found the node) in search for number %number.', array('%type' => $type, '%number' => $number))); } } + } diff --git a/core/modules/search/src/Tests/SearchPageOverrideTest.php b/core/modules/search/src/Tests/SearchPageOverrideTest.php index 0401720..9768904 100644 --- a/core/modules/search/src/Tests/SearchPageOverrideTest.php +++ b/core/modules/search/src/Tests/SearchPageOverrideTest.php @@ -40,4 +40,5 @@ function testSearchPageHook() { $this->assertText('Dummy search snippet', 'Dummy search snippet is shown'); $this->assertText('Test page text is here', 'Page override is working'); } + } diff --git a/core/modules/search/src/Tests/SearchPageTextTest.php b/core/modules/search/src/Tests/SearchPageTextTest.php index 4eead8b..db33d85 100644 --- a/core/modules/search/src/Tests/SearchPageTextTest.php +++ b/core/modules/search/src/Tests/SearchPageTextTest.php @@ -159,4 +159,5 @@ function testSearchText() { $this->assertResponse(200, 'Searching for .something does not lead to a 403 error'); $this->assertText('no results', 'Searching for .something gives you a no search results page'); } + } diff --git a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php b/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php index e260251..38cb350 100644 --- a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php +++ b/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php @@ -95,4 +95,5 @@ function testPreprocessStemming() { $this->assertText('Search results'); $this->assertText('we are testing'); } + } diff --git a/core/modules/search/src/Tests/SearchQueryAlterTest.php b/core/modules/search/src/Tests/SearchQueryAlterTest.php index 2b05816..0cb473f 100644 --- a/core/modules/search/src/Tests/SearchQueryAlterTest.php +++ b/core/modules/search/src/Tests/SearchQueryAlterTest.php @@ -45,4 +45,5 @@ function testQueryAlter() { $this->assertText('article', 'Article is in search results'); $this->assertNoText('page', 'Page is not in search results'); } + } diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php index c138d9f..78e3e24 100644 --- a/core/modules/search/src/Tests/SearchRankingTest.php +++ b/core/modules/search/src/Tests/SearchRankingTest.php @@ -274,4 +274,5 @@ public function testHTMLRankings() { $node->delete(); } } + } diff --git a/core/modules/search/src/Tests/SearchSetLocaleTest.php b/core/modules/search/src/Tests/SearchSetLocaleTest.php index d098c47..0ec4137 100644 --- a/core/modules/search/src/Tests/SearchSetLocaleTest.php +++ b/core/modules/search/src/Tests/SearchSetLocaleTest.php @@ -47,4 +47,5 @@ public function testSearchWithNumericLocale() { // necessary here. $this->nodeSearchPlugin->execute(); } + } diff --git a/core/modules/search/src/Tests/SearchSimplifyTest.php b/core/modules/search/src/Tests/SearchSimplifyTest.php index 2dc9ff6..bdb96c9 100644 --- a/core/modules/search/src/Tests/SearchSimplifyTest.php +++ b/core/modules/search/src/Tests/SearchSimplifyTest.php @@ -77,4 +77,5 @@ function testSearchSimplifyPunctuation() { $this->assertEqual($out, $case[1], $case[2]); } } + } diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php index 0a605c6..83967b3 100644 --- a/core/modules/search/src/Tests/SearchTestBase.php +++ b/core/modules/search/src/Tests/SearchTestBase.php @@ -88,4 +88,5 @@ protected function submitGetForm($path, $edit, $submit, $form_html_id = NULL) { $this->fail(format_string('Found the requested form fields at @path', array('@path' => $path))); } } + } diff --git a/core/modules/search/src/Tests/SearchTokenizerTest.php b/core/modules/search/src/Tests/SearchTokenizerTest.php index fd410c9..f8b3ccb 100644 --- a/core/modules/search/src/Tests/SearchTokenizerTest.php +++ b/core/modules/search/src/Tests/SearchTokenizerTest.php @@ -147,4 +147,5 @@ function code2utf($num) { return ''; } + } diff --git a/core/modules/search/tests/src/Kernel/SearchMatchTest.php b/core/modules/search/tests/src/Kernel/SearchMatchTest.php index 1469efa..0a17f71 100644 --- a/core/modules/search/tests/src/Kernel/SearchMatchTest.php +++ b/core/modules/search/tests/src/Kernel/SearchMatchTest.php @@ -251,4 +251,5 @@ function _testQueryScores($query, $set, $results) { // Check range. $this->assertEqual(!count($scores) || (min($scores) > 0.0 && max($scores) <= 1.0001), TRUE, "Query scoring '$query'"); } + } diff --git a/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php b/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php index 767a81b..d634207 100644 --- a/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php +++ b/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php @@ -281,4 +281,5 @@ public function __construct(array $values) { public function label($langcode = NULL) { return $this->label; } + } diff --git a/core/modules/serialization/src/Encoder/XmlEncoder.php b/core/modules/serialization/src/Encoder/XmlEncoder.php index 1a88364..abd7896 100644 --- a/core/modules/serialization/src/Encoder/XmlEncoder.php +++ b/core/modules/serialization/src/Encoder/XmlEncoder.php @@ -78,4 +78,5 @@ public function decode($data, $format, array $context = array()){ public function supportsDecoding($format) { return in_array($format, static::$format); } + } diff --git a/core/modules/serialization/src/Normalizer/EntityNormalizer.php b/core/modules/serialization/src/Normalizer/EntityNormalizer.php index 81549ba..b800e81 100644 --- a/core/modules/serialization/src/Normalizer/EntityNormalizer.php +++ b/core/modules/serialization/src/Normalizer/EntityNormalizer.php @@ -88,4 +88,5 @@ public function denormalize($data, $class, $format = NULL, array $context = []) return $entity; } + } diff --git a/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php b/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php index 96b1e91..90a2c26 100644 --- a/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php +++ b/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php @@ -58,4 +58,5 @@ protected function sort($services) { return $sorted; } + } diff --git a/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php b/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php index 6d3a9f8..e1f73d7 100644 --- a/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php +++ b/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php @@ -71,4 +71,5 @@ protected function sort($services) { return $sorted; } + } diff --git a/core/modules/serialization/src/SerializationServiceProvider.php b/core/modules/serialization/src/SerializationServiceProvider.php index fbd34c0..9521185 100644 --- a/core/modules/serialization/src/SerializationServiceProvider.php +++ b/core/modules/serialization/src/SerializationServiceProvider.php @@ -19,4 +19,5 @@ public function register(ContainerBuilder $container) { // Add a compiler pass for adding concrete Resolvers to chain Resolver. $container->addCompilerPass(new RegisterEntityResolversCompilerPass()); } + } diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php index 90cd1c5..00ea14f 100644 --- a/core/modules/serialization/src/Tests/EntitySerializationTest.php +++ b/core/modules/serialization/src/Tests/EntitySerializationTest.php @@ -222,4 +222,5 @@ public function testDenormalize() { $this->assertIdentical($denormalized->uuid(), $this->entity->uuid(), 'Expected entity UUID found.'); } } + } diff --git a/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php index 509347d..0eb9aa5 100644 --- a/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php +++ b/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php @@ -27,4 +27,5 @@ public function encode($data, $format, array $context = array()) { public function supportsEncoding($format) { return static::$format === $format; } + } diff --git a/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php index 34beb2d..1677553 100644 --- a/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php +++ b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php @@ -36,7 +36,7 @@ public function normalize($object, $format = NULL, array $context = array()) { /** * Checks whether format is supported by this normalizer. * - * @param mixed $data + * @param mixed $data * Data to normalize. * @param string $format * Format the normalization result will be encoded as. @@ -47,4 +47,5 @@ public function normalize($object, $format = NULL, array $context = array()) { public function supportsNormalization($data, $format = NULL) { return static::$format === $format; } + } diff --git a/core/modules/serialization/tests/src/Kernel/SerializationTest.php b/core/modules/serialization/tests/src/Kernel/SerializationTest.php index cd8ba96..8b700a3 100644 --- a/core/modules/serialization/tests/src/Kernel/SerializationTest.php +++ b/core/modules/serialization/tests/src/Kernel/SerializationTest.php @@ -51,4 +51,5 @@ public function testSerializerComponentRegistration() { $this->pass('The serializer threw an exception for an unsupported format.'); } } + } diff --git a/core/modules/shortcut/src/Plugin/migrate/destination/EntityShortcutSet.php b/core/modules/shortcut/src/Plugin/migrate/destination/EntityShortcutSet.php index 72964bb..fddf08a 100644 --- a/core/modules/shortcut/src/Plugin/migrate/destination/EntityShortcutSet.php +++ b/core/modules/shortcut/src/Plugin/migrate/destination/EntityShortcutSet.php @@ -22,4 +22,5 @@ protected function getEntity(Row $row, array $old_destination_id_values) { $entity->setSyncing(TRUE); return $entity; } + } diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php index 1e87ea6..0744053 100644 --- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php +++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php @@ -207,4 +207,5 @@ function testShortcutSetCreateWithSetName() { $this->drupalGet('user/' . $this->adminUser->id() . '/shortcuts'); $this->assertText($new_set->label(), 'Generated shortcut set was listed as a choice on the user account page.'); } + } diff --git a/core/modules/simpletest/src/RandomGeneratorTrait.php b/core/modules/simpletest/src/RandomGeneratorTrait.php index d702c5f..f9f7aec 100644 --- a/core/modules/simpletest/src/RandomGeneratorTrait.php +++ b/core/modules/simpletest/src/RandomGeneratorTrait.php @@ -14,4 +14,5 @@ */ trait RandomGeneratorTrait { use BaseGeneratorTrait; + } diff --git a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php b/core/modules/simpletest/src/Tests/BrokenSetUpTest.php index 459a9d1..e988f4d 100644 --- a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php +++ b/core/modules/simpletest/src/Tests/BrokenSetUpTest.php @@ -116,4 +116,5 @@ function testMethod() { $this->pass('The test method has run.'); } } + } diff --git a/core/modules/simpletest/src/Tests/FolderTest.php b/core/modules/simpletest/src/Tests/FolderTest.php index 1eb8fe4..d43c638 100644 --- a/core/modules/simpletest/src/Tests/FolderTest.php +++ b/core/modules/simpletest/src/Tests/FolderTest.php @@ -23,4 +23,5 @@ function testFolderSetup() { $directory = file_default_scheme() . '://styles'; $this->assertTrue(file_prepare_directory($directory, FALSE), 'Directory created.'); } + } diff --git a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php index 4c32512..a1063e7 100644 --- a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php +++ b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php @@ -58,4 +58,5 @@ function testInstallationProfileTests() { $this->drupalPostForm(NULL, $edit, t('Run tests')); $this->assertText('SystemListingCompatibleTest test executed.'); } + } diff --git a/core/modules/simpletest/src/Tests/MailCaptureTest.php b/core/modules/simpletest/src/Tests/MailCaptureTest.php index cf36c5d..700c757 100644 --- a/core/modules/simpletest/src/Tests/MailCaptureTest.php +++ b/core/modules/simpletest/src/Tests/MailCaptureTest.php @@ -74,4 +74,5 @@ function testMailSend() { $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test_4')); $this->assertEqual(count($captured_emails), 2, 'All emails with the same id are returned when filtering by id.', 'Email'); } + } diff --git a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php b/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php index 27e1001..0b21d54 100644 --- a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php +++ b/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php @@ -53,4 +53,5 @@ public function testCheckRequirements() { $this->fail('Test ran when it failed requirements check.'); } } + } diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php index 290403b..19ab17f 100644 --- a/core/modules/simpletest/src/Tests/SimpleTestTest.php +++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php @@ -284,11 +284,16 @@ function getTestIdFromResults() { /** * Asserts that an assertion with specified values is displayed in results. * - * @param string $message Assertion message. - * @param string $type Assertion type. - * @param string $status Assertion status. - * @param string $file File where the assertion originated. - * @param string $function Function where the assertion originated. + * @param string $message + * Assertion message. + * @param string $type + * Assertion type. + * @param string $status + * Assertion status. + * @param string $file + * File where the assertion originated. + * @param string $function + * Function where the assertion originated. * * @return Assertion result. */ diff --git a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php index 73210c5..6fb61d5 100644 --- a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php +++ b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php @@ -19,4 +19,5 @@ public function testWillDie() { } $this->assertTrue(TRUE, 'Assertion to ensure test pass'); } + } diff --git a/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php b/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php index 1ec4604..d321a4b 100644 --- a/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php +++ b/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\simpletest\Functional; +use Drupal\Core\Url; use Drupal\Tests\BrowserTestBase; /** @@ -31,6 +32,14 @@ public function testGoTo() { // Test page contains some text. $this->assertSession()->pageTextContains('Test page text.'); + + // Test drupalGet with a url object. + $url = Url::fromRoute('test_page_test.render_title'); + $this->drupalGet($url); + $this->assertSession()->statusCodeEquals(200); + + // Test page contains some text. + $this->assertSession()->pageTextContains('Hello Drupal'); } /** diff --git a/core/modules/simpletest/tests/src/Unit/AssertHelperTraitTest.php b/core/modules/simpletest/tests/src/Unit/AssertHelperTraitTest.php index 835f5c1..8c816b0 100644 --- a/core/modules/simpletest/tests/src/Unit/AssertHelperTraitTest.php +++ b/core/modules/simpletest/tests/src/Unit/AssertHelperTraitTest.php @@ -36,6 +36,7 @@ public function providerCastSafeStrings() { [['test safe string', 'mixed array', 'test safe string'], [$safe_string, 'mixed array', $safe_string]], ]; } + } class AssertHelperTestClass { @@ -44,4 +45,5 @@ class AssertHelperTestClass { public function testMethod($value) { return $this->castSafeStrings($value); } + } diff --git a/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php b/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php index 0a82609..25211fc 100644 --- a/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php +++ b/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php @@ -36,4 +36,5 @@ public function testPhpUnitXmlParsing() { // didn't run. simpletest_phpunit_xml_to_rows(1, 'foobar'); } + } diff --git a/core/modules/statistics/src/StatisticsSettingsForm.php b/core/modules/statistics/src/StatisticsSettingsForm.php index 5bd150c..2abb564 100644 --- a/core/modules/statistics/src/StatisticsSettingsForm.php +++ b/core/modules/statistics/src/StatisticsSettingsForm.php @@ -96,4 +96,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); } + } diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php index ad573c1..565925c 100644 --- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php +++ b/core/modules/statistics/src/Tests/StatisticsAdminTest.php @@ -167,4 +167,5 @@ function testExpiredLogs() { ->fetchField(); $this->assertFalse($result, 'Daycounter is zero.'); } + } diff --git a/core/modules/statistics/src/Tests/StatisticsTestBase.php b/core/modules/statistics/src/Tests/StatisticsTestBase.php index f9b2d24..b18b0ac 100644 --- a/core/modules/statistics/src/Tests/StatisticsTestBase.php +++ b/core/modules/statistics/src/Tests/StatisticsTestBase.php @@ -47,4 +47,5 @@ protected function setUp() { ->set('count_content_views', 1) ->save(); } + } diff --git a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php index bf35de3..b7d22b8 100644 --- a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php +++ b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php @@ -48,4 +48,5 @@ function testStatisticsTokenReplacement() { $this->assertEqual($output, $expected, format_string('Statistics token %token replaced.', array('%token' => $input))); } } + } diff --git a/core/modules/syslog/src/Tests/SyslogTest.php b/core/modules/syslog/src/Tests/SyslogTest.php index fc67465..a40847c 100644 --- a/core/modules/syslog/src/Tests/SyslogTest.php +++ b/core/modules/syslog/src/Tests/SyslogTest.php @@ -37,4 +37,5 @@ function testSettings() { } } } + } diff --git a/core/modules/system/src/Access/CronAccessCheck.php b/core/modules/system/src/Access/CronAccessCheck.php index 2e5a865..bdc582d 100644 --- a/core/modules/system/src/Access/CronAccessCheck.php +++ b/core/modules/system/src/Access/CronAccessCheck.php @@ -30,4 +30,5 @@ public function access($key) { } return AccessResult::allowed()->setCacheMaxAge(0); } + } diff --git a/core/modules/system/src/Access/DbUpdateAccessCheck.php b/core/modules/system/src/Access/DbUpdateAccessCheck.php index d2aa5e8..2bcc5fb 100644 --- a/core/modules/system/src/Access/DbUpdateAccessCheck.php +++ b/core/modules/system/src/Access/DbUpdateAccessCheck.php @@ -34,4 +34,5 @@ public function access(AccountInterface $account) { return AccessResult::forbidden()->cachePerPermissions(); } } + } diff --git a/core/modules/system/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php index 617270b..a06810e 100644 --- a/core/modules/system/src/Form/ModulesUninstallForm.php +++ b/core/modules/system/src/Form/ModulesUninstallForm.php @@ -187,4 +187,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { // Redirect to the confirm form. $form_state->setRedirect('system.modules_uninstall_confirm'); } + } diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php index c3c2725..bbc34c1 100644 --- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php @@ -431,4 +431,5 @@ public function extensionToImageType($extension) { protected static function supportedTypes() { return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF); } + } diff --git a/core/modules/system/src/SystemConfigSubscriber.php b/core/modules/system/src/SystemConfigSubscriber.php index 86ec402..3c0de5f 100644 --- a/core/modules/system/src/SystemConfigSubscriber.php +++ b/core/modules/system/src/SystemConfigSubscriber.php @@ -88,4 +88,5 @@ public static function getSubscribedEvents() { $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidateSiteUUID', 256); return $events; } + } diff --git a/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php b/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php index 3016edb..4ca7390 100644 --- a/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php +++ b/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php @@ -28,4 +28,5 @@ function testSimpleAjaxFormValue() { $this->assertText('AJAX checkbox in a nested group'); $this->assertText('Another AJAX checkbox in a nested group'); } + } diff --git a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php index 03ade3f..e4db3bd 100644 --- a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php +++ b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php @@ -59,4 +59,5 @@ protected function assertCommand($haystack, $needle, $message) { } $this->assertTrue($found, $message); } + } diff --git a/core/modules/system/src/Tests/Ajax/ElementValidationTest.php b/core/modules/system/src/Tests/Ajax/ElementValidationTest.php index 12b1aae..5133ce3 100644 --- a/core/modules/system/src/Tests/Ajax/ElementValidationTest.php +++ b/core/modules/system/src/Tests/Ajax/ElementValidationTest.php @@ -34,4 +34,5 @@ function testAjaxElementValidation() { $this->assertNoText(t('Error message'), 'No error message in resultant JSON'); $this->assertText('ajax_forms_test_validation_number_form_callback invoked', 'The correct callback was invoked'); } + } diff --git a/core/modules/system/src/Tests/Ajax/FormValuesTest.php b/core/modules/system/src/Tests/Ajax/FormValuesTest.php index 3c592ee..0a23db1 100644 --- a/core/modules/system/src/Tests/Ajax/FormValuesTest.php +++ b/core/modules/system/src/Tests/Ajax/FormValuesTest.php @@ -60,4 +60,5 @@ function testSimpleAjaxFormValue() { // Not using File API; a potential error must trigger a PHP warning. unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log'); } + } diff --git a/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php index 9441a01..fb59bcc 100644 --- a/core/modules/system/src/Tests/Ajax/FrameworkTest.php +++ b/core/modules/system/src/Tests/Ajax/FrameworkTest.php @@ -211,4 +211,5 @@ public function testLazyLoadOverriddenCSS() { // cache control. $this->assertNoText('js.module.css?', 'Ajax lazy loading does not add overridden CSS files.'); } + } diff --git a/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php index 3a8ef1f..e07204c 100644 --- a/core/modules/system/src/Tests/Ajax/MultiFormTest.php +++ b/core/modules/system/src/Tests/Ajax/MultiFormTest.php @@ -94,4 +94,5 @@ function testMultiForm() { } } } + } diff --git a/core/modules/system/src/Tests/Batch/ProcessingTest.php b/core/modules/system/src/Tests/Batch/ProcessingTest.php index c85890d..66c0fc6 100644 --- a/core/modules/system/src/Tests/Batch/ProcessingTest.php +++ b/core/modules/system/src/Tests/Batch/ProcessingTest.php @@ -292,4 +292,5 @@ function _resultMessages($id) { } return $messages; } + } diff --git a/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php index 9d5ef09..50bbc6b 100644 --- a/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php +++ b/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php @@ -57,4 +57,5 @@ function testDrupalGetFilename() { // Restore the original error handler. restore_error_handler(); } + } diff --git a/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php index 1e7b6dd..b15c877 100644 --- a/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php +++ b/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php @@ -37,4 +37,5 @@ function testDrupalStatic() { drupal_static_reset(); $this->assertEqual($var, 'foo', 'Variable was reset after second invocation of global reset.'); } + } diff --git a/core/modules/system/src/Tests/Cache/CacheTestBase.php b/core/modules/system/src/Tests/Cache/CacheTestBase.php index c527991..efca9fd 100644 --- a/core/modules/system/src/Tests/Cache/CacheTestBase.php +++ b/core/modules/system/src/Tests/Cache/CacheTestBase.php @@ -82,4 +82,5 @@ function assertCacheRemoved($message, $cid = NULL, $bin = NULL) { $cached = \Drupal::cache($bin)->get($cid); $this->assertFalse($cached, $message); } + } diff --git a/core/modules/system/src/Tests/Cache/ClearTest.php b/core/modules/system/src/Tests/Cache/ClearTest.php index 2b1c691..3a3fe90 100644 --- a/core/modules/system/src/Tests/Cache/ClearTest.php +++ b/core/modules/system/src/Tests/Cache/ClearTest.php @@ -38,4 +38,5 @@ function testFlushAllCaches() { $this->assertFalse($this->checkCacheExists($cid, $this->defaultValue, $bin), format_string('All cache entries removed from @bin.', array('@bin' => $bin))); } } + } diff --git a/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php b/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php index 0fbb183..6a37b81 100644 --- a/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php +++ b/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php @@ -22,4 +22,5 @@ protected function createCacheBackend($bin) { \Drupal::service('cache_tags.invalidator')->addInvalidator($backend); return $backend; } + } diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php index a4176fe..b539281 100644 --- a/core/modules/system/src/Tests/Common/AddFeedTest.php +++ b/core/modules/system/src/Tests/Common/AddFeedTest.php @@ -91,4 +91,5 @@ function testFeedIconEscaping() { $text = \Drupal::service('renderer')->renderRoot($variables); $this->assertEqual(trim(strip_tags($text)), 'Subscribe to <>&"'', 'feed_icon template escapes reserved HTML characters.'); } + } diff --git a/core/modules/system/src/Tests/Common/AlterTest.php b/core/modules/system/src/Tests/Common/AlterTest.php index 33eb1f8..86bed7d 100644 --- a/core/modules/system/src/Tests/Common/AlterTest.php +++ b/core/modules/system/src/Tests/Common/AlterTest.php @@ -68,4 +68,5 @@ function testDrupalAlter() { \Drupal::theme()->alter(array('drupal_alter', 'drupal_alter_foo'), $array_copy); $this->assertEqual($array_copy, $array_expected, 'hook_TYPE_alter() implementations ran in correct order.'); } + } diff --git a/core/modules/system/src/Tests/Common/FormatDateTest.php b/core/modules/system/src/Tests/Common/FormatDateTest.php index 59b9619..36589ef 100644 --- a/core/modules/system/src/Tests/Common/FormatDateTest.php +++ b/core/modules/system/src/Tests/Common/FormatDateTest.php @@ -118,4 +118,5 @@ function testFormatDate() { $this->assertIdentical($formatter->format($timestamp, 'custom', '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'Y\'\)\;\<\/\s\c\r\i\p\t\>'), "", 'Script tags not removed from dates.'); $this->assertIdentical($formatter->format($timestamp, 'custom', '\<\e\m\>Y\<\/\e\m\>'), '2007', 'Em tags are not removed from dates.'); } + } diff --git a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php index e36ed7e..1be7e94 100644 --- a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php +++ b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php @@ -90,4 +90,5 @@ function assertError($error, $group, $function, $file, $message = NULL) { $this->assertEqual($error['message'], $message, format_string("Message was %message", array('%message' => $message))); } } + } diff --git a/core/modules/system/src/Tests/Common/SizeUnitTest.php b/core/modules/system/src/Tests/Common/SizeUnitTest.php index 4fd5c17..39c06bb 100644 --- a/core/modules/system/src/Tests/Common/SizeUnitTest.php +++ b/core/modules/system/src/Tests/Common/SizeUnitTest.php @@ -65,4 +65,5 @@ function testCommonParseSizeFormatSize() { ); } } + } diff --git a/core/modules/system/src/Tests/Common/SystemListingTest.php b/core/modules/system/src/Tests/Common/SystemListingTest.php index a9bf480..e2d5c6f 100644 --- a/core/modules/system/src/Tests/Common/SystemListingTest.php +++ b/core/modules/system/src/Tests/Common/SystemListingTest.php @@ -50,4 +50,5 @@ function testDirectoryPrecedence() { ))); } } + } diff --git a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php index 9760868..9b456a9 100644 --- a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php +++ b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php @@ -137,4 +137,5 @@ function testTableSortInit() { $this->verbose(strtr('$ts: 
!ts
', array('!ts' => Html::escape(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Complex table headers plus $_GET parameters sorted correctly.'); } + } diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php index f7bfd94..062e3e4 100644 --- a/core/modules/system/src/Tests/Common/UrlTest.php +++ b/core/modules/system/src/Tests/Common/UrlTest.php @@ -316,4 +316,5 @@ function testExternalUrls() { $result = Url::fromUri($url, array('query' => $query))->toString(); $this->assertEqual($url . '&' . http_build_query($query, '', '&'), $result); } + } diff --git a/core/modules/system/src/Tests/Common/XssUnitTest.php b/core/modules/system/src/Tests/Common/XssUnitTest.php index eef42b7..1797737 100644 --- a/core/modules/system/src/Tests/Common/XssUnitTest.php +++ b/core/modules/system/src/Tests/Common/XssUnitTest.php @@ -53,4 +53,5 @@ function testBadProtocolStripping() { $this->assertIdentical(UrlHelper::stripDangerousProtocols($url), $expected_plain, '\Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() filters a URL and returns plain text.'); } + } diff --git a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php index 4e6e3ec..d484d68 100644 --- a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php +++ b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php @@ -22,4 +22,5 @@ protected function setUp() { DatabaseTestBase::addSampleData(); } + } diff --git a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php index eeb7572..cdfeab8 100644 --- a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php +++ b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php @@ -164,4 +164,5 @@ function testElementNumbers() { $this->assertEqual($name, 'John', 'Pager query #3 with a generated element ID returned the correct results.'); } + } diff --git a/core/modules/system/src/Tests/Database/TemporaryQueryTest.php b/core/modules/system/src/Tests/Database/TemporaryQueryTest.php index 5b30e54..1bfa754 100644 --- a/core/modules/system/src/Tests/Database/TemporaryQueryTest.php +++ b/core/modules/system/src/Tests/Database/TemporaryQueryTest.php @@ -53,4 +53,5 @@ function testTemporaryQuery() { $table_name_test = db_query_temporary($sql, array()); $this->assertEqual($this->countTableRows($table_name_test), $this->countTableRows('test'), 'Leading white space and comments do not interfere with temporary table creation.'); } + } diff --git a/core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php b/core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php index db3808a..cc1a381 100644 --- a/core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php +++ b/core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php @@ -54,4 +54,5 @@ public function testDestructionUnused() { $kernel->terminate($request, $response); $this->assertNull(\Drupal::state()->get('service_provider_test.destructed')); } + } diff --git a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php index f7420b4..bee4ec2 100644 --- a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php +++ b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php @@ -112,4 +112,5 @@ protected function runRevisionsTests($entity_type) { $this->assertFieldById('edit-name-0-value', $entity->name->value, format_string('%entity_type: Name matches in UI.', array('%entity_type' => $entity_type))); $this->assertFieldById('edit-field-test-text-0-value', $entity->field_test_text->value, format_string('%entity_type: Text matches in UI.', array('%entity_type' => $entity_type))); } + } diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php index 1512874..101569c 100644 --- a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php +++ b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php @@ -110,4 +110,5 @@ function testEntityFormLanguage() { $form_langcode = \Drupal::state()->get('entity_test.form_langcode'); $this->assertTrue($langcode2 == $form_langcode, "Node edit form language is $langcode2."); } + } diff --git a/core/modules/system/src/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php index 61256fa..5e9e44a 100644 --- a/core/modules/system/src/Tests/File/DirectoryTest.php +++ b/core/modules/system/src/Tests/File/DirectoryTest.php @@ -159,4 +159,5 @@ function testFileDirectoryTemp() { $this->assertEqual(empty($tmp_directory), FALSE, 'file_directory_temp() returned a non-empty value.'); $this->assertEqual($config->get('path.temporary'), $tmp_directory); } + } diff --git a/core/modules/system/src/Tests/File/FileTestBase.php b/core/modules/system/src/Tests/File/FileTestBase.php index c3d6ba2..219ff6c 100644 --- a/core/modules/system/src/Tests/File/FileTestBase.php +++ b/core/modules/system/src/Tests/File/FileTestBase.php @@ -164,4 +164,5 @@ function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) { $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file'); return $filepath; } + } diff --git a/core/modules/system/src/Tests/File/MimeTypeTest.php b/core/modules/system/src/Tests/File/MimeTypeTest.php index b96b1bf..8120c0a 100644 --- a/core/modules/system/src/Tests/File/MimeTypeTest.php +++ b/core/modules/system/src/Tests/File/MimeTypeTest.php @@ -86,4 +86,5 @@ public function testFileMimeTypeDetection() { $this->assertIdentical($output, $expected, format_string('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected))); } } + } diff --git a/core/modules/system/src/Tests/File/NameMungingTest.php b/core/modules/system/src/Tests/File/NameMungingTest.php index f4d7ce8..52163fc 100644 --- a/core/modules/system/src/Tests/File/NameMungingTest.php +++ b/core/modules/system/src/Tests/File/NameMungingTest.php @@ -83,4 +83,5 @@ function testUnMunge() { $unmunged_name = file_unmunge_filename($munged_name); $this->assertIdentical($unmunged_name, $this->name, format_string('The unmunged (%unmunged) filename matches the original (%original)', array('%unmunged' => $unmunged_name, '%original' => $this->name))); } + } diff --git a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php index 838d458..d1128c4 100644 --- a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php +++ b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php @@ -85,4 +85,5 @@ function testReadOnlyBehavior() { // Remove the temporary directory. drupal_rmdir($dir); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php index 180af4d..7c286fe 100644 --- a/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php index 6913ff3..8b30aba 100644 --- a/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php index d672452..9c6c0d6 100644 --- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php index 37a4279..7c47526 100644 --- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php index 8f39ef3..d628bee 100644 --- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php index 9350118..ee3ef7f 100644 --- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php index c9f20ee..2af252a 100644 --- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php +++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php @@ -34,4 +34,5 @@ protected function setUp() { parent::setUp(); $this->config('system.file')->set('default_scheme', 'dummy-remote')->save(); } + } diff --git a/core/modules/system/src/Tests/File/ScanDirectoryTest.php b/core/modules/system/src/Tests/File/ScanDirectoryTest.php index 99913fc..d372671 100644 --- a/core/modules/system/src/Tests/File/ScanDirectoryTest.php +++ b/core/modules/system/src/Tests/File/ScanDirectoryTest.php @@ -141,4 +141,5 @@ function testOptionMinDepth() { $files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 1)); $this->assertTrue(empty($files), 'Minimum-depth of 1 successfully excludes files from current directory.'); } + } diff --git a/core/modules/system/src/Tests/File/StreamWrapperTest.php b/core/modules/system/src/Tests/File/StreamWrapperTest.php index 2d83627..9524388 100644 --- a/core/modules/system/src/Tests/File/StreamWrapperTest.php +++ b/core/modules/system/src/Tests/File/StreamWrapperTest.php @@ -145,4 +145,5 @@ function testGetValidStreamScheme() { $this->assertTrue(file_stream_wrapper_valid_scheme(file_uri_scheme('public://asdf')), 'Got a valid stream scheme from public://asdf'); $this->assertFalse(file_stream_wrapper_valid_scheme(file_uri_scheme('foo://asdf')), 'Did not get a valid stream scheme from foo://asdf'); } + } diff --git a/core/modules/system/src/Tests/File/UnmanagedCopyTest.php b/core/modules/system/src/Tests/File/UnmanagedCopyTest.php index 4e7b97f..97a8b4c 100644 --- a/core/modules/system/src/Tests/File/UnmanagedCopyTest.php +++ b/core/modules/system/src/Tests/File/UnmanagedCopyTest.php @@ -85,4 +85,5 @@ function testOverwriteSelf() { $this->assertTrue(file_exists($new_filepath), 'Copied file exists after copying onto itself.'); $this->assertFilePermissions($new_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE)); } + } diff --git a/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php index 5808eb8..b8c33e0 100644 --- a/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php +++ b/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php @@ -70,4 +70,5 @@ function testSubDirectory() { $this->assertFalse(file_exists($subdirectory), 'Subdirectory has been deleted.'); $this->assertFalse(file_exists($directory), 'Directory has been deleted.'); } + } diff --git a/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php index b193123..d93e213 100644 --- a/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php +++ b/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php @@ -39,4 +39,5 @@ function testDirectory() { $this->assertFalse(file_unmanaged_delete($directory), 'Could not delete the delete directory.'); $this->assertTrue(file_exists($directory), 'Directory has not been deleted.'); } + } diff --git a/core/modules/system/src/Tests/File/UnmanagedMoveTest.php b/core/modules/system/src/Tests/File/UnmanagedMoveTest.php index 1cf41f9..562ab5f 100644 --- a/core/modules/system/src/Tests/File/UnmanagedMoveTest.php +++ b/core/modules/system/src/Tests/File/UnmanagedMoveTest.php @@ -69,4 +69,5 @@ function testOverwriteSelf() { $this->assertFalse(file_exists($uri), 'Original file has been removed.'); $this->assertTrue(file_exists($new_filepath), 'File exists after moving onto itself.'); } + } diff --git a/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php index 3bc4f1b..7b869f8 100644 --- a/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php +++ b/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php @@ -28,4 +28,5 @@ function testFileSaveData() { $this->assertEqual($contents, file_get_contents($filepath), 'Contents of the file are correct.'); $this->assertFilePermissions($filepath, 0777); } + } diff --git a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php index c8e3820..e8a6789 100644 --- a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php +++ b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php @@ -89,4 +89,5 @@ function testJail() { } $this->assertTrue($gotit, 'Was able to copy a directory inside of the jailed area'); } + } diff --git a/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php b/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php index 10ccc14..7e63dc7 100644 --- a/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php +++ b/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php @@ -19,4 +19,5 @@ function flushCommands() { $this->commandsRun = array(); return $out; } + } diff --git a/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php b/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php index 40c2b8c..eb73ebc 100644 --- a/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php +++ b/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php @@ -61,4 +61,5 @@ function isFile($path) { function chmodJailed($path, $mode, $recursive) { return; } + } diff --git a/core/modules/system/src/Tests/Form/AlterTest.php b/core/modules/system/src/Tests/Form/AlterTest.php index b6e44bc..ae30722 100644 --- a/core/modules/system/src/Tests/Form/AlterTest.php +++ b/core/modules/system/src/Tests/Form/AlterTest.php @@ -35,4 +35,5 @@ function testExecutionOrder() { $content = preg_replace('/\s+/', ' ', Xss::filter($this->content, array())); $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, 'Form alter hooks executed in the expected order.'); } + } diff --git a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php index 2f22fa7..3702d35 100644 --- a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php +++ b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php @@ -72,4 +72,5 @@ function testUserRegistrationMultipleField() { $this->assertFieldByName('name', 'foo', 'Entered username has been kept.'); $this->assertFieldByName('mail', 'bar@example.com', 'Entered mail address has been kept.'); } + } diff --git a/core/modules/system/src/Tests/Form/CheckboxTest.php b/core/modules/system/src/Tests/Form/CheckboxTest.php index 6e48865..ebeeeea 100644 --- a/core/modules/system/src/Tests/Form/CheckboxTest.php +++ b/core/modules/system/src/Tests/Form/CheckboxTest.php @@ -53,20 +53,22 @@ function testFormCheckbox() { } } - // Ensure that $form_state->getValues() is populated correctly for a checkboxes - // group that includes a 0-indexed array of options. - $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero', array(), 'Save')); + // Ensure that $form_state->getValues() is populated correctly for a + // checkboxes group that includes a 0-indexed array of options. + $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero/1', array(), 'Save')); $this->assertIdentical($results->checkbox_off, array(0, 0, 0), 'All three in checkbox_off are zeroes: off.'); $this->assertIdentical($results->checkbox_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_zero_default'); $this->assertIdentical($results->checkbox_string_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_string_zero_default'); $edit = array('checkbox_off[0]' => '0'); - $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero', $edit, 'Save')); + $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero/1', $edit, 'Save')); $this->assertIdentical($results->checkbox_off, array('0', 0, 0), 'The first choice is on in checkbox_off but the rest is not'); // Ensure that each checkbox is rendered correctly for a checkboxes group // that includes a 0-indexed array of options. $this->drupalPostForm('form-test/checkboxes-zero/0', array(), 'Save'); $checkboxes = $this->xpath('//input[@type="checkbox"]'); + + $this->assertIdentical(count($checkboxes), 9, 'Correct number of checkboxes found.'); foreach ($checkboxes as $checkbox) { $checked = isset($checkbox['checked']); $name = (string) $checkbox['name']; @@ -75,10 +77,13 @@ function testFormCheckbox() { $edit = array('checkbox_off[0]' => '0'); $this->drupalPostForm('form-test/checkboxes-zero/0', $edit, 'Save'); $checkboxes = $this->xpath('//input[@type="checkbox"]'); + + $this->assertIdentical(count($checkboxes), 9, 'Correct number of checkboxes found.'); foreach ($checkboxes as $checkbox) { $checked = isset($checkbox['checked']); $name = (string) $checkbox['name']; $this->assertIdentical($checked, $name == 'checkbox_off[0]' || $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', array('%name' => $name))); } } + } diff --git a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php index 93aeba2..5965dc25 100644 --- a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php +++ b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php @@ -146,4 +146,5 @@ protected function getFormWithLimitedProperties() { return $form; } + } diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php index b964e9d..34a558c 100644 --- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php +++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php @@ -254,4 +254,5 @@ private function formSubmitHelper($form, $edit) { // to allow the caller lowlevel access to the form. return array($form, $form_state, $errors); } + } diff --git a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php index 5bd1a9f..3de1867 100644 --- a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php +++ b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php @@ -85,4 +85,5 @@ function testDefaultTabCleaned() { $values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', [], t('Submit'))); $this->assertFalse(isset($values['vertical_tabs__active_tab']), SafeMarkup::format('%element was removed.', ['%element' => 'vertical_tabs__active_tab'])); } + } diff --git a/core/modules/system/src/Tests/Form/EmailTest.php b/core/modules/system/src/Tests/Form/EmailTest.php index 715279d..e53247f 100644 --- a/core/modules/system/src/Tests/Form/EmailTest.php +++ b/core/modules/system/src/Tests/Form/EmailTest.php @@ -45,4 +45,5 @@ function testFormEmail() { $this->assertEqual($values['email'], 'foo@example.com'); $this->assertEqual($values['email_required'], 'example@drupal.org'); } + } diff --git a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php index d231778..7b3d73c 100644 --- a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php +++ b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php @@ -113,4 +113,5 @@ protected function _testLanguageSelectElementOptions($id, $options) { } $this->assertEqual($count, count($options), format_string('The number of languages and the number of options shown by the language element are the same: @languages languages, @number options', array('@languages' => count($options), '@number' => $count))); } + } diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php index b6b5152..5fbefb5 100644 --- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php +++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php @@ -115,4 +115,5 @@ public function testProgrammaticAccessBypass() { $this->assertNotEqual($values['field_restricted'], 'dummy value', 'The value for the restricted field is not stored.'); } + } diff --git a/core/modules/system/src/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php index 8953718..bee15fe 100644 --- a/core/modules/system/src/Tests/Form/RebuildTest.php +++ b/core/modules/system/src/Tests/Form/RebuildTest.php @@ -115,4 +115,5 @@ function testPreserveFormActionAfterAJAX() { $url = parse_url($forms[0]['action'])['path']; $this->assertEqual(Url::fromRoute('node.add', ['node_type' => 'page'])->toString(), $url); } + } diff --git a/core/modules/system/src/Tests/Form/RedirectTest.php b/core/modules/system/src/Tests/Form/RedirectTest.php index 8932008..6b6d360 100644 --- a/core/modules/system/src/Tests/Form/RedirectTest.php +++ b/core/modules/system/src/Tests/Form/RedirectTest.php @@ -102,4 +102,5 @@ public function testRedirectFromErrorPages() { $this->assertResponse(200); $this->assertUrl($expected, [], 'Redirected to correct URL/query.'); } + } diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php index 27cacf3..eb53244 100644 --- a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php +++ b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php @@ -47,4 +47,5 @@ function testFormStateValuesCleanAdvanced() { $this->assertResponse(200, 'Received a 200 response for posted test file.'); $this->assertRaw(t('You WIN!'), 'Found the success message.'); } + } diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php index 1211eb7..7761bd8 100644 --- a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php +++ b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php @@ -54,4 +54,5 @@ function testFormStateValuesClean() { // Verify that actual form values equal resulting form values. $this->assertEqual($values, $result, 'Expected form values equal actual form values.'); } + } diff --git a/core/modules/system/src/Tests/Form/TriggeringElementTest.php b/core/modules/system/src/Tests/Form/TriggeringElementTest.php index 28b625b..5d8a180 100644 --- a/core/modules/system/src/Tests/Form/TriggeringElementTest.php +++ b/core/modules/system/src/Tests/Form/TriggeringElementTest.php @@ -93,4 +93,5 @@ function testAttemptAccessControlBypass() { $this->assertNoText('The clicked button is button1.', '$form_state->getTriggeringElement() not set to a restricted button.'); $this->assertText('The clicked button is button2.', '$form_state->getTriggeringElement() not set to a restricted button.'); } + } diff --git a/core/modules/system/src/Tests/Form/UrlTest.php b/core/modules/system/src/Tests/Form/UrlTest.php index 1347b4a..4bf6f60 100644 --- a/core/modules/system/src/Tests/Form/UrlTest.php +++ b/core/modules/system/src/Tests/Form/UrlTest.php @@ -46,4 +46,5 @@ function testFormUrl() { $this->assertEqual($values['url'], $edit['url']); $this->assertEqual($values['url_required'], $edit['url_required']); } + } diff --git a/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php b/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php index 4439eb8..66989de 100644 --- a/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php +++ b/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php @@ -70,4 +70,5 @@ function testToolkitSetupForm() { $this->drupalGet('admin/config/media/image-toolkit'); $this->assertResponse(403); } + } diff --git a/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php index 4a3beaa..53ede0d 100644 --- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php +++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php @@ -150,4 +150,5 @@ function imageTestReset() { function imageTestGetAllCalls() { return \Drupal::state()->get('image_test.results') ?: array(); } + } diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php index e697991..ca2ea0c 100644 --- a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php @@ -55,4 +55,5 @@ function testInstallerTranslationCache() { $this->assertFalse(in_array('locale', $info_en['dependencies']), 'Locale is not set when installing in English.'); $this->assertTrue(in_array('locale', $info_nl['dependencies']), 'Locale is set when installing in Dutch.'); } + } diff --git a/core/modules/system/src/Tests/Lock/LockUnitTest.php b/core/modules/system/src/Tests/Lock/LockUnitTest.php index 994b98b..fc3b341 100644 --- a/core/modules/system/src/Tests/Lock/LockUnitTest.php +++ b/core/modules/system/src/Tests/Lock/LockUnitTest.php @@ -67,4 +67,5 @@ public function testBackendLockReleaseAll() { $is_free = $this->lock->lockMayBeAvailable('lock_b'); $this->assertTrue($is_free, 'Second lock has been released.'); } + } diff --git a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php index 32733d3..f396acd 100644 --- a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php +++ b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php @@ -383,4 +383,5 @@ public function testUsenetSignature() { $mail_lines = explode("\n", MailFormatHelper::wrapMail($text)); $this->assertEqual("--", $mail_lines[1], 'Trailing whitespace removed for incorrect dash-dash-space signatures.'); } + } diff --git a/core/modules/system/src/Tests/Mail/MailTest.php b/core/modules/system/src/Tests/Mail/MailTest.php index 200585b..70f5a4b 100644 --- a/core/modules/system/src/Tests/Mail/MailTest.php +++ b/core/modules/system/src/Tests/Mail/MailTest.php @@ -98,4 +98,5 @@ public function testFromAndReplyToHeader() { $this->assertFalse(isset($sent_message['headers']['Reply-to']), 'Message reply-to is not set if not specified.'); $this->assertFalse(isset($sent_message['headers']['Errors-To']), 'Errors-to header must not be set, it is deprecated.'); } + } diff --git a/core/modules/system/src/Tests/Module/ClassLoaderTest.php b/core/modules/system/src/Tests/Module/ClassLoaderTest.php index 5d654fd..5d1db03 100644 --- a/core/modules/system/src/Tests/Module/ClassLoaderTest.php +++ b/core/modules/system/src/Tests/Module/ClassLoaderTest.php @@ -47,4 +47,5 @@ function testClassLoadingDisabledModules() { $this->assertNoText($this->expected, 'Autoloader does not load classes from a disabled module.'); } } + } diff --git a/core/modules/system/src/Tests/Module/HookRequirementsTest.php b/core/modules/system/src/Tests/Module/HookRequirementsTest.php index a589a8c..ccbbff9 100644 --- a/core/modules/system/src/Tests/Module/HookRequirementsTest.php +++ b/core/modules/system/src/Tests/Module/HookRequirementsTest.php @@ -23,4 +23,5 @@ function testHookRequirementsFailure() { $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.'); $this->assertModules(array('requirements1_test'), FALSE); } + } diff --git a/core/modules/system/src/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php index d9194d1..e212617 100644 --- a/core/modules/system/src/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/src/Tests/Module/ModuleTestBase.php @@ -190,4 +190,5 @@ function assertLogMessage($type, $message, $variables = array(), $severity = Rfc ->fetchField(); $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => format_string($message, $variables)))); } + } diff --git a/core/modules/system/src/Tests/Module/RequiredTest.php b/core/modules/system/src/Tests/Module/RequiredTest.php index 0b8f062..004854b 100644 --- a/core/modules/system/src/Tests/Module/RequiredTest.php +++ b/core/modules/system/src/Tests/Module/RequiredTest.php @@ -28,4 +28,5 @@ function testDisableRequired() { } } } + } diff --git a/core/modules/system/src/Tests/Module/VersionTest.php b/core/modules/system/src/Tests/Module/VersionTest.php index b1ff44d..031d4ba 100644 --- a/core/modules/system/src/Tests/Module/VersionTest.php +++ b/core/modules/system/src/Tests/Module/VersionTest.php @@ -52,4 +52,5 @@ function testModuleVersions() { $this->assertEqual(!empty($checkbox[0]['disabled']), $i % 2, $dependencies[$i]); } } + } diff --git a/core/modules/system/src/Tests/Pager/PagerTest.php b/core/modules/system/src/Tests/Pager/PagerTest.php index 7f2f07a..1000b1c 100644 --- a/core/modules/system/src/Tests/Pager/PagerTest.php +++ b/core/modules/system/src/Tests/Pager/PagerTest.php @@ -233,4 +233,5 @@ protected function assertNoClass(\SimpleXMLElement $element, $class, $message = } $this->assertTrue(strpos($element['class'], $class) === FALSE, $message); } + } diff --git a/core/modules/system/src/Tests/Path/PathUnitTestBase.php b/core/modules/system/src/Tests/Path/PathUnitTestBase.php index b487561..b245b0e 100644 --- a/core/modules/system/src/Tests/Path/PathUnitTestBase.php +++ b/core/modules/system/src/Tests/Path/PathUnitTestBase.php @@ -28,4 +28,5 @@ protected function tearDown() { parent::tearDown(); } + } diff --git a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php index 92984ff..a527fc5 100644 --- a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php +++ b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php @@ -93,4 +93,5 @@ public function tableDefinition() { return $tables; } + } diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php index f48ad76..743b74b 100644 --- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php +++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php @@ -109,4 +109,5 @@ protected function assertUrlInboundAlter($original, $final) { $result = $this->container->get('path.alias_manager')->getPathByAlias($original); return $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); } + } diff --git a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php index dbdb3ac..6c37dcf 100644 --- a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php +++ b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php @@ -137,4 +137,5 @@ public function testConditions() { $this->assertEqual($condition->summary(), 'Return true on the following pages: /my/pass/*', 'The condition summary matches for a wildcard path'); } + } diff --git a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php index 1711041..ca36a3b 100644 --- a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php +++ b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php @@ -102,4 +102,5 @@ function testContext() { // Test the title method for the complex context plugin. $this->assertEqual($user->label() . ' -- ' . $node->label(), $complex_plugin->getTitle()); } + } diff --git a/core/modules/system/src/Tests/Plugin/DerivativeTest.php b/core/modules/system/src/Tests/Plugin/DerivativeTest.php index 98b3f1e..1ff5e69 100644 --- a/core/modules/system/src/Tests/Plugin/DerivativeTest.php +++ b/core/modules/system/src/Tests/Plugin/DerivativeTest.php @@ -28,4 +28,5 @@ function testDerivativeDecorator() { $this->assertIdentical($this->mockBlockManager->getDefinition('menu:non_existing', FALSE), NULL, 'NULL returned as the definition of a non-existing derivative plugin.'); $this->assertIdentical($this->mockBlockManager->getDefinition('menu', FALSE), NULL, 'NULL returned as the definition of a base plugin that may not be used without deriving.'); } + } diff --git a/core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php index 869ac18..b68f709 100644 --- a/core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php +++ b/core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php @@ -42,4 +42,5 @@ protected function setUp() { } $this->emptyDiscovery = $discovery; } + } diff --git a/core/modules/system/src/Tests/Plugin/FactoryTest.php b/core/modules/system/src/Tests/Plugin/FactoryTest.php index 2660144..1cdaf3a 100644 --- a/core/modules/system/src/Tests/Plugin/FactoryTest.php +++ b/core/modules/system/src/Tests/Plugin/FactoryTest.php @@ -71,4 +71,5 @@ function testReflectionFactory() { } } } + } diff --git a/core/modules/system/src/Tests/Queue/QueueTest.php b/core/modules/system/src/Tests/Queue/QueueTest.php index a62b7d9..2c0513c 100644 --- a/core/modules/system/src/Tests/Queue/QueueTest.php +++ b/core/modules/system/src/Tests/Queue/QueueTest.php @@ -116,4 +116,5 @@ protected function queueScore($items, $new_items) { } return $score; } + } diff --git a/core/modules/system/src/Tests/Render/AjaxPageStateTest.php b/core/modules/system/src/Tests/Render/AjaxPageStateTest.php index 550e229..08cd276 100644 --- a/core/modules/system/src/Tests/Render/AjaxPageStateTest.php +++ b/core/modules/system/src/Tests/Render/AjaxPageStateTest.php @@ -103,4 +103,5 @@ public function testMultipleLibrariesAreNotLoaded() { 'The drupalSettings library from core should be excluded from loading.' ); } + } diff --git a/core/modules/system/src/Tests/Routing/MockAliasManager.php b/core/modules/system/src/Tests/Routing/MockAliasManager.php index ff48785..7c7920f4 100644 --- a/core/modules/system/src/Tests/Routing/MockAliasManager.php +++ b/core/modules/system/src/Tests/Routing/MockAliasManager.php @@ -91,4 +91,5 @@ public function getAliasByPath($path, $langcode = NULL) { public function cacheClear($source = NULL) { // Not needed. } + } diff --git a/core/modules/system/src/Tests/Routing/MockMatcher.php b/core/modules/system/src/Tests/Routing/MockMatcher.php index 9e18284..924acd1 100644 --- a/core/modules/system/src/Tests/Routing/MockMatcher.php +++ b/core/modules/system/src/Tests/Routing/MockMatcher.php @@ -32,4 +32,5 @@ public function matchRequest(Request $request) { $matcher = $this->matcher; return $matcher($request); } + } diff --git a/core/modules/system/src/Tests/Routing/RouterPermissionTest.php b/core/modules/system/src/Tests/Routing/RouterPermissionTest.php index ce5de16..2fb0099 100644 --- a/core/modules/system/src/Tests/Routing/RouterPermissionTest.php +++ b/core/modules/system/src/Tests/Routing/RouterPermissionTest.php @@ -36,4 +36,5 @@ public function testPermissionAccess() { $this->assertNoRaw('Access denied'); $this->assertRaw('test7text', 'The correct string was returned because the route was successful.'); } + } diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php index f9c52ed..139fba5 100644 --- a/core/modules/system/src/Tests/Session/SessionTest.php +++ b/core/modules/system/src/Tests/Session/SessionTest.php @@ -320,4 +320,5 @@ function assertSessionEmpty($empty) { $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '0', 'Session was not empty.'); } } + } diff --git a/core/modules/system/src/Tests/System/AdminMetaTagTest.php b/core/modules/system/src/Tests/System/AdminMetaTagTest.php index 75d4514..ea92bd9 100644 --- a/core/modules/system/src/Tests/System/AdminMetaTagTest.php +++ b/core/modules/system/src/Tests/System/AdminMetaTagTest.php @@ -19,4 +19,5 @@ public function testMetaTag() { $this->drupalGet('node'); $this->assertRaw($string, 'Fingerprinting meta tag generated correctly.', 'System'); } + } diff --git a/core/modules/system/src/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php index 7c1d0d1..8921ad0 100644 --- a/core/modules/system/src/Tests/System/AdminTest.php +++ b/core/modules/system/src/Tests/System/AdminTest.php @@ -167,4 +167,5 @@ function testCompactMode() { $this->drupalGet(''); $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode persists on new requests.'); } + } diff --git a/core/modules/system/src/Tests/System/CronRunTest.php b/core/modules/system/src/Tests/System/CronRunTest.php index 9cd563d..ec35b72 100644 --- a/core/modules/system/src/Tests/System/CronRunTest.php +++ b/core/modules/system/src/Tests/System/CronRunTest.php @@ -125,4 +125,5 @@ public function testManualCron() { $this->assertResponse(200); $this->assertText(t('Cron ran successfully.')); } + } diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php index 14aeb3e..98d82d3 100644 --- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php +++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php @@ -45,4 +45,5 @@ public function testRemovingDefaultMetaTags() { $this->assertNoRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System'); } } + } diff --git a/core/modules/system/src/Tests/System/FrontPageTest.php b/core/modules/system/src/Tests/System/FrontPageTest.php index 39295f8..03666fd 100644 --- a/core/modules/system/src/Tests/System/FrontPageTest.php +++ b/core/modules/system/src/Tests/System/FrontPageTest.php @@ -84,4 +84,5 @@ public function testDrupalFrontPage() { $this->drupalGet($this->nodePath); $this->assertText(t('On front page.'), 'Path is the front page.'); } + } diff --git a/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php b/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php index dc3f5c9..8b35bdf 100644 --- a/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php +++ b/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php @@ -39,4 +39,5 @@ function testSystemInitIgnoresSecondaries() { $this->assertIdentical($db1, $db2, 'System Init ignores secondaries when requested.'); } + } diff --git a/core/modules/system/src/Tests/System/IndexPhpTest.php b/core/modules/system/src/Tests/System/IndexPhpTest.php index 55c6253..72811a8 100644 --- a/core/modules/system/src/Tests/System/IndexPhpTest.php +++ b/core/modules/system/src/Tests/System/IndexPhpTest.php @@ -26,4 +26,5 @@ function testIndexPhpHandling() { $this->drupalGet($index_php . '/user', array('external' => TRUE)); $this->assertResponse(200, 'Make sure index.php/user returns a valid page.'); } + } diff --git a/core/modules/system/src/Tests/System/InfoAlterTest.php b/core/modules/system/src/Tests/System/InfoAlterTest.php index c104a00..b09893b 100644 --- a/core/modules/system/src/Tests/System/InfoAlterTest.php +++ b/core/modules/system/src/Tests/System/InfoAlterTest.php @@ -32,4 +32,5 @@ function testSystemInfoAlter() { $info = system_rebuild_module_data(); $this->assertTrue($info['node']->info['required'], 'After the module_required_test is installed the node module is required.'); } + } diff --git a/core/modules/system/src/Tests/System/MainContentFallbackTest.php b/core/modules/system/src/Tests/System/MainContentFallbackTest.php index cc3b20a..551e4c7 100644 --- a/core/modules/system/src/Tests/System/MainContentFallbackTest.php +++ b/core/modules/system/src/Tests/System/MainContentFallbackTest.php @@ -70,4 +70,5 @@ function testMainContentFallback() { $this->rebuildContainer(); $this->assertTrue(\Drupal::moduleHandler()->moduleExists('block'), 'Block module re-enabled.'); } + } diff --git a/core/modules/system/src/Tests/System/RetrieveFileTest.php b/core/modules/system/src/Tests/System/RetrieveFileTest.php index 938a7b4..8f6fe4a 100644 --- a/core/modules/system/src/Tests/System/RetrieveFileTest.php +++ b/core/modules/system/src/Tests/System/RetrieveFileTest.php @@ -45,4 +45,5 @@ function testFileRetrieving() { file_unmanaged_delete_recursive($sourcedir); file_unmanaged_delete_recursive($targetdir); } + } diff --git a/core/modules/system/src/Tests/System/SettingsRewriteTest.php b/core/modules/system/src/Tests/System/SettingsRewriteTest.php index 6212f4a..630db65 100644 --- a/core/modules/system/src/Tests/System/SettingsRewriteTest.php +++ b/core/modules/system/src/Tests/System/SettingsRewriteTest.php @@ -122,4 +122,5 @@ function testDrupalRewriteSettings() { // Check that the result is just the php opening tag and the settings. $this->assertEqual(file_get_contents(\Drupal::root() . '/' . $filename), "assertRaw('Drupal is <blink>awesome</blink>.'); } } + } diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php index f1d75c0..6a86083 100644 --- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php +++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php @@ -130,4 +130,5 @@ protected function testSiteMaintenance() { $this->drupalGet(''); $this->assertEqual('Site under maintenance', $this->cssSelect('main h1')[0]); } + } diff --git a/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php b/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php index f989d22..f9331ba 100644 --- a/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php +++ b/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php @@ -107,4 +107,5 @@ protected function settingsFile($site_path) { $settings_file = $site_path . '/settings.php'; return $settings_file; } + } diff --git a/core/modules/system/src/Tests/System/SystemAuthorizeTest.php b/core/modules/system/src/Tests/System/SystemAuthorizeTest.php index a860c6d..d82a210 100644 --- a/core/modules/system/src/Tests/System/SystemAuthorizeTest.php +++ b/core/modules/system/src/Tests/System/SystemAuthorizeTest.php @@ -57,4 +57,5 @@ function testFileTransferHooks() { // expected to the first page of the authorize.php script. $this->assertRaw('core/misc/states.js'); } + } diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php index 55294c4..08f741d 100644 --- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php +++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php @@ -63,4 +63,5 @@ public function testConfigForm() { $this->assertEqual($data['#value'], $this->config($data['#config_name'])->get($data['#config_key'])); } } + } diff --git a/core/modules/system/src/Tests/Theme/FastTest.php b/core/modules/system/src/Tests/Theme/FastTest.php index 5dba0e8..a05666f 100644 --- a/core/modules/system/src/Tests/Theme/FastTest.php +++ b/core/modules/system/src/Tests/Theme/FastTest.php @@ -32,4 +32,5 @@ function testUserAutocomplete() { $this->assertRaw($this->account->getUsername()); $this->assertNoText('registry initialized', 'The registry was not initialized'); } + } diff --git a/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php b/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php index 1798ca9..f103caa 100644 --- a/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php +++ b/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php @@ -28,4 +28,5 @@ function testThemeHtmlAttributes() { $attributes = $this->xpath('/html/body[@theme_test_body_attribute="theme test body attribute value"]'); $this->assertTrue(count($attributes) == 1, "Attribute set in the 'body' element via hook_preprocess_HOOK() found."); } + } diff --git a/core/modules/system/src/Tests/Theme/MessageTest.php b/core/modules/system/src/Tests/Theme/MessageTest.php index 32516d0..6605e81 100644 --- a/core/modules/system/src/Tests/Theme/MessageTest.php +++ b/core/modules/system/src/Tests/Theme/MessageTest.php @@ -33,4 +33,5 @@ function testMessages() { $this->assertRaw('messages messages--error'); $this->assertRaw('messages messages--status'); } + } diff --git a/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php b/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php index a7920a5..ddbb770 100644 --- a/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php +++ b/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php @@ -30,4 +30,5 @@ function testRequestListener() { // system was initialized early. $this->assertRaw('classy/css/components/action-links.css'); } + } diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php index eec3e1e..48a80836 100644 --- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php +++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php @@ -630,4 +630,5 @@ public function testTypedDataValidation() { $this->assertEqual($violations[0]->getInvalidValue(), 'string'); $this->assertIdentical($violations[0]->getPropertyPath(), '0.value'); } + } diff --git a/core/modules/system/src/Tests/Update/CompatibilityFixTest.php b/core/modules/system/src/Tests/Update/CompatibilityFixTest.php index 1452693..6689c2f 100644 --- a/core/modules/system/src/Tests/Update/CompatibilityFixTest.php +++ b/core/modules/system/src/Tests/Update/CompatibilityFixTest.php @@ -40,4 +40,5 @@ function testFixCompatibility() { $themes = $extension_config->get('theme'); $this->assertFalse(in_array('incompatible_theme', array_keys($themes)), 'Fixed themes compatibility.'); } + } diff --git a/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php b/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php index e66675b..a9723c2 100644 --- a/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php +++ b/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php @@ -33,4 +33,5 @@ function testHookUpdateDependencies() { $this->assertTrue($update_dependencies['update_test_0'][8001]['update_test_2'] == 8002, 'An update function that has a dependency on two separate modules has the second dependency recorded correctly.'); $this->assertTrue($update_dependencies['update_test_0'][8002]['update_test_1'] == 8003, 'An update function that depends on more than one update from the same module only has the dependency on the higher-numbered update function recorded.'); } + } diff --git a/core/modules/system/src/Tests/Update/DependencyMissingTest.php b/core/modules/system/src/Tests/Update/DependencyMissingTest.php index 17a468d..9764b4c 100644 --- a/core/modules/system/src/Tests/Update/DependencyMissingTest.php +++ b/core/modules/system/src/Tests/Update/DependencyMissingTest.php @@ -34,4 +34,5 @@ function testMissingUpdate() { $this->assertFalse($update_graph['update_test_2_update_8002']['allowed'], "The module's second update function is not allowed to run, since it has a direct dependency on a missing update."); $this->assertFalse($update_graph['update_test_2_update_8003']['allowed'], "The module's third update function is not allowed to run, since it has an indirect dependency on a missing update."); } + } diff --git a/core/modules/system/src/Tests/Update/DependencyOrderingTest.php b/core/modules/system/src/Tests/Update/DependencyOrderingTest.php index d3838d2..bb3ae37 100644 --- a/core/modules/system/src/Tests/Update/DependencyOrderingTest.php +++ b/core/modules/system/src/Tests/Update/DependencyOrderingTest.php @@ -54,4 +54,5 @@ function testUpdateOrderingModuleInterdependency() { $second_dependency_satisfied = array_search('update_test_3_update_8001', $update_order) < array_search('update_test_2_update_8002', $update_order); $this->assertTrue($second_dependency_satisfied, 'The dependency of the first module on the second module is respected by the update function order.'); } + } diff --git a/core/modules/system/src/Tests/Update/UpdateScriptTest.php b/core/modules/system/src/Tests/Update/UpdateScriptTest.php index 3f4edff..d788636 100644 --- a/core/modules/system/src/Tests/Update/UpdateScriptTest.php +++ b/core/modules/system/src/Tests/Update/UpdateScriptTest.php @@ -399,4 +399,5 @@ public function getSystemSchema() { ), ); } + } diff --git a/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php b/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php index bced4a4..9782d91 100644 --- a/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php +++ b/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php @@ -51,4 +51,5 @@ function testWith7x() { $this->clickLink(t('Continue')); $this->assertText(t('Some of the pending updates cannot be applied because their dependencies were not met.')); } + } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 43665ab..154fa3f 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -996,7 +996,7 @@ function system_schema() { * @{ */ -/* +/** * Change two fields on the default menu link storage to be serialized data. */ function system_update_8001(&$sandbox = NULL) { diff --git a/core/modules/system/tests/modules/condition_test/src/FormController.php b/core/modules/system/tests/modules/condition_test/src/FormController.php index cfbb17f..38b21cc 100644 --- a/core/modules/system/tests/modules/condition_test/src/FormController.php +++ b/core/modules/system/tests/modules/condition_test/src/FormController.php @@ -69,4 +69,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message(t('Executed successfully.')); } } + } diff --git a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php b/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php index 560fb66..7de24d4 100644 --- a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php +++ b/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php @@ -142,4 +142,5 @@ public function testTablesortFirst() { 'tasks' => $tasks, )); } + } diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php index 14a4857..a91e2cb 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php @@ -41,4 +41,5 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { return $fields; } + } diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php index 090c1e8..aaca0ae 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php @@ -41,4 +41,5 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, } return $fields; } + } diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php index 4ae6652..5fbc408 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php @@ -71,4 +71,5 @@ public function save() { sleep(1); parent::save(); } + } diff --git a/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php b/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php index 25d3682..7f1c10e 100644 --- a/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php +++ b/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php @@ -20,4 +20,5 @@ class ErrorServiceTestServiceProvider implements ServiceModifierInterface { public function alter(ContainerBuilder $container) { static::$containerBuilder = $container; } + } diff --git a/core/modules/system/tests/modules/form_test/form_test.routing.yml b/core/modules/system/tests/modules/form_test/form_test.routing.yml index d8c5833..42a6ba4 100644 --- a/core/modules/system/tests/modules/form_test/form_test.routing.yml +++ b/core/modules/system/tests/modules/form_test/form_test.routing.yml @@ -382,7 +382,6 @@ form_test.checkboxes_zero: defaults: _form: '\Drupal\form_test\Form\FormTestCheckboxesZeroForm' _title: 'FAPI test involving checkboxes and zero' - json: TRUE requirements: _access: 'TRUE' diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php index df875b1..2f2a38f 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php @@ -51,7 +51,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $json = T * {@inheritdoc} */ public function submitForm(array &$form, FormStateInterface $form_state) { - if ($form_state->has('json')) { + if ($form_state->get('json')) { $form_state->setResponse(new JsonResponse($form_state->getValues())); } else { diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php index b86dd51..3457db8 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php @@ -52,4 +52,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { print Json::encode($form_state->getValues()); exit; } + } diff --git a/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php b/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php index 2a4f9c1..8963462 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php @@ -35,4 +35,5 @@ public function buildForm(array $form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) { $form_state->setRedirect('form_test.route1', array(), array('query' => array('test1' => 'test2'))); } + } diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php index 5e1611f..d5b9df4 100644 --- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php +++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php @@ -18,4 +18,5 @@ class BrokenToolkit extends TestToolkit { public static function isAvailable() { return FALSE; } + } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php index e6a87b1..10c0810 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php @@ -19,4 +19,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { } return $this->derivatives; } + } diff --git a/core/modules/system/tests/modules/menu_test/src/TestControllers.php b/core/modules/system/tests/modules/menu_test/src/TestControllers.php index d602d11..9ed7851 100644 --- a/core/modules/system/tests/modules/menu_test/src/TestControllers.php +++ b/core/modules/system/tests/modules/menu_test/src/TestControllers.php @@ -82,4 +82,5 @@ public function testContextual() { ] ]; } + } diff --git a/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php b/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php index 45d7862..b46f374 100644 --- a/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php +++ b/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php @@ -6,4 +6,5 @@ class SomeClass { function testMethod() { return 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.'; } + } diff --git a/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php b/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php index c8a3a80..6ea4306 100644 --- a/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php +++ b/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php @@ -24,4 +24,5 @@ public function testEntityLanguage(NodeInterface $node) { \Drupal::service('renderer')->addCacheableDependency($build, $node); return $build; } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php index 8d94fa1..aebb473 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php @@ -133,4 +133,5 @@ protected function createContextDefinition($data_type, $label, $required = TRUE) // printing TranslatableMarkup objects. return new ContextDefinition($data_type, (string) $label, $required); } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php index 37be2f5..60e74d8 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php @@ -35,4 +35,5 @@ public function __construct() { // so we provide it the discovery object. $this->factory = new DefaultFactory($this->discovery); } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php index df45af3..e044e27 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php @@ -16,4 +16,5 @@ public function getTitle() { $node = $this->getContextValue('node'); return $user->label() . ' -- ' . $node->label(); } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php index 25084b9..d2fa3a4 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php @@ -47,4 +47,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { return $derivatives; } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php index 2a51835..f13b56e 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php @@ -44,4 +44,5 @@ public function getContent() { } return $content; } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php index 538a862..413eb13 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php @@ -51,4 +51,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { return $derivatives; } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php index 1e675ec..6741eac 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php @@ -26,4 +26,5 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition public function getTitle() { return $this->title; } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php index 6328fd0..6b4688d 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php @@ -15,4 +15,5 @@ public function getTitle() { $user = $this->getContextValue('user'); return $user->label(); } + } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php index 7dac172..b47d46b 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php @@ -15,4 +15,5 @@ class TypedDataStringBlock extends ContextAwarePluginBase { public function getTitle() { return $this->getContextValue('string'); } + } diff --git a/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php b/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php index 2e66973..0cbe9db 100644 --- a/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php +++ b/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php @@ -21,4 +21,5 @@ public function access() { // allowed or not. return AccessResult::neutral(); } + } diff --git a/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php b/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php index c3d342e..7635704 100644 --- a/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php +++ b/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php @@ -18,4 +18,5 @@ public function register(ContainerBuilder $container) { $container->register('access_check.router_test', 'Drupal\router_test\Access\TestAccessCheck') ->addTag('access_check', array('applies_to' => '_access_router_test')); } + } diff --git a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php index 8ee0bd1..00e00a0 100644 --- a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php +++ b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php @@ -26,4 +26,5 @@ public function alter(ContainerBuilder $container) { $container->setParameter('container_rebuild_test_parameter', $parameter); } } + } diff --git a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php index 2e7baea..9a87c97 100644 --- a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php +++ b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php @@ -69,4 +69,5 @@ static function getSubscribedEvents() { public function destruct() { $this->state->set('service_provider_test.destructed', TRUE); } + } diff --git a/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php b/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php index dad2918..4189e49 100644 --- a/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php +++ b/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php @@ -24,4 +24,5 @@ public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $ */ public function listUsage(FileInterface $file) { } + } diff --git a/core/modules/system/tests/modules/system_mail_failure_test/src/Plugin/Mail/TestPhpMailFailure.php b/core/modules/system/tests/modules/system_mail_failure_test/src/Plugin/Mail/TestPhpMailFailure.php index 108930f..7e1c8c2 100644 --- a/core/modules/system/tests/modules/system_mail_failure_test/src/Plugin/Mail/TestPhpMailFailure.php +++ b/core/modules/system/tests/modules/system_mail_failure_test/src/Plugin/Mail/TestPhpMailFailure.php @@ -29,4 +29,5 @@ public function mail(array $message) { // Simulate a failed mail send by returning FALSE. return FALSE; } + } diff --git a/core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php b/core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php index a15e681..7401f81 100644 --- a/core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php +++ b/core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php @@ -27,4 +27,5 @@ public function content(Request $request) { return new CacheableResponse("

oh hai this is html.

"); } } + } diff --git a/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php b/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php index 9e71600..de065af 100644 --- a/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php +++ b/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php @@ -28,4 +28,5 @@ public function getSettingsForm() { ); return $form; } + } diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module index 0d6bad8..550b5ca 100644 --- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module +++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module @@ -76,7 +76,7 @@ function twig_theme_test_theme($existing, $type, $theme, $path) { return $items; } -/* +/** * Helper function to test PHP variables in the Twig engine. */ function _test_theme_twig_php_values() { diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php index 4bbbc03..b59fe4c 100644 --- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php +++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php @@ -29,4 +29,5 @@ public function processInbound($path, Request $request) { } return $path; } + } diff --git a/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php index ea39f69..040cf1a 100644 --- a/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php +++ b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php @@ -153,4 +153,5 @@ public function testSystemDateTokenReplacement() { $this->assertEqual($output, $expected, format_string('Date token %token replaced.', array('%token' => $input))); } } + } diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php index b5f1ef7..cdc6619 100644 --- a/core/modules/taxonomy/src/Form/OverviewTerms.php +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php @@ -9,7 +9,7 @@ use Drupal\taxonomy\VocabularyInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -/* +/** * Provides terms overview form for a taxonomy vocabulary. */ class OverviewTerms extends FormBase { diff --git a/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php index aa3090d..7ffbba7 100644 --- a/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php +++ b/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php @@ -28,4 +28,5 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o } } } + } diff --git a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php index faa5d70..40c8fc7 100644 --- a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php +++ b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php @@ -16,7 +16,7 @@ * * @ViewsRelationship("node_term_data") */ -class NodeTermData extends RelationshipPluginBase { +class NodeTermData extends RelationshipPluginBase { /** * The vocabulary storage. diff --git a/core/modules/taxonomy/src/Tests/EfqTest.php b/core/modules/taxonomy/src/Tests/EfqTest.php index 80cf580..572ae8f 100644 --- a/core/modules/taxonomy/src/Tests/EfqTest.php +++ b/core/modules/taxonomy/src/Tests/EfqTest.php @@ -65,4 +65,5 @@ function testTaxonomyEfq() { $term = _field_create_entity_from_ids($ids); $this->assertEqual($term->id(), $tid, 'Taxonomy term can be created based on the IDs.'); } + } diff --git a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php index 1076f41..349516c 100644 --- a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php +++ b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php @@ -58,4 +58,5 @@ function testTaxonomyTermMultipleLoad() { $loaded_term = reset($loaded_terms); $this->assertEqual($term->id(), $loaded_term->id(), 'Term loaded by name successfully.'); } + } diff --git a/core/modules/taxonomy/src/Tests/RssTest.php b/core/modules/taxonomy/src/Tests/RssTest.php index 3350b33..10e47af 100644 --- a/core/modules/taxonomy/src/Tests/RssTest.php +++ b/core/modules/taxonomy/src/Tests/RssTest.php @@ -126,4 +126,5 @@ function testTaxonomyRss() { $this->drupalGet('taxonomy/term/all/feed'); $this->assertNoRaw($raw_xml); } + } diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php index cac3672..aa91237 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php @@ -32,4 +32,5 @@ protected function setUp() { $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); } } + } diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php index 8a68458..f04be00 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php @@ -56,4 +56,5 @@ function createTerm(Vocabulary $vocabulary, $values = array()) { $term->save(); return $term; } + } diff --git a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php b/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php index aec5211..de77654 100644 --- a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php +++ b/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php @@ -75,4 +75,5 @@ function testSelectionTestVocabularyRestriction() { $this->assertIdentical($result, $expected_result, 'Terms selection restricted to a single vocabulary.'); } + } diff --git a/core/modules/taxonomy/src/Tests/TermIndexTest.php b/core/modules/taxonomy/src/Tests/TermIndexTest.php index 2ec8bc3..28e816c 100644 --- a/core/modules/taxonomy/src/Tests/TermIndexTest.php +++ b/core/modules/taxonomy/src/Tests/TermIndexTest.php @@ -210,4 +210,5 @@ function testTaxonomyTermHierarchyBreadcrumbs() { // language from being added to the options. $this->assertRaw(\Drupal::l($term2->getName(), $term2->urlInfo('canonical', ['language' => NULL])), 'Parent term link is displayed when viewing the node.'); } + } diff --git a/core/modules/taxonomy/src/Tests/TermLanguageTest.php b/core/modules/taxonomy/src/Tests/TermLanguageTest.php index 39248ca..e894ad2 100644 --- a/core/modules/taxonomy/src/Tests/TermLanguageTest.php +++ b/core/modules/taxonomy/src/Tests/TermLanguageTest.php @@ -106,4 +106,5 @@ function testDefaultTermLanguage() { $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add'); $this->assertOptionSelected('edit-langcode-0-value', 'cc', "The expected langcode, 'cc', was selected."); } + } diff --git a/core/modules/taxonomy/src/Tests/ThemeTest.php b/core/modules/taxonomy/src/Tests/ThemeTest.php index abf3eea..54ad6e4 100644 --- a/core/modules/taxonomy/src/Tests/ThemeTest.php +++ b/core/modules/taxonomy/src/Tests/ThemeTest.php @@ -45,4 +45,5 @@ function testTaxonomyTermThemes() { $this->drupalGet('taxonomy/term/' . $term->id() . '/edit'); $this->assertRaw('seven/css/base/elements.css', t("The administrative theme's CSS appears on the page for editing a taxonomy term.")); } + } diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php index 2a55a6d..f3c6c5d 100644 --- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php +++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php @@ -143,4 +143,5 @@ function testTaxonomyTokenReplacement() { $this->assertEqual($output, $expected, format_string('Sanitized taxonomy vocabulary token %token replaced.', array('%token' => $input))); } } + } diff --git a/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php b/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php index 2966ee5..d049f82 100644 --- a/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php +++ b/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php @@ -37,4 +37,5 @@ public function testRelationship() { ); $this->assertIdenticalResultset($view, $expected_result, $map); } + } diff --git a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php index c8d33a3..914b7f2 100644 --- a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php +++ b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php @@ -178,4 +178,5 @@ function testUninstallReinstall() { FieldStorageConfig::create($storage_definition)->save(); FieldConfig::create($field_definition)->save(); } + } diff --git a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php index 5810626..3326e51 100644 --- a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php +++ b/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php @@ -121,4 +121,5 @@ function testVocabularyDefaultLanguageForTerms() { $this->assertEqual($new_settings->getDefaultLangcode(), 'authors_default', 'The langcode was saved.'); $this->assertFalse($new_settings->isLanguageAlterable(), 'The new visibility setting was saved.'); } + } diff --git a/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php b/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php index 8011fd4..5468f8a 100644 --- a/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php +++ b/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php @@ -124,4 +124,5 @@ function testVocabularyPermissionsTaxonomyTerm() { $this->drupalGet('taxonomy/term/' . $term->id() . '/delete'); $this->assertResponse(403, 'Delete taxonomy term form open failed.'); } + } diff --git a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php index 8d2b85b..3066ef0 100644 --- a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php +++ b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php @@ -153,4 +153,5 @@ function testTaxonomyAdminDeletingVocabulary() { $this->container->get('entity.manager')->getStorage('taxonomy_vocabulary')->resetCache(); $this->assertFalse(Vocabulary::load($vid), 'Vocabulary not found.'); } + } diff --git a/core/modules/taxonomy/src/VocabularyInterface.php b/core/modules/taxonomy/src/VocabularyInterface.php index 22d2d48..ff52bec 100644 --- a/core/modules/taxonomy/src/VocabularyInterface.php +++ b/core/modules/taxonomy/src/VocabularyInterface.php @@ -38,4 +38,5 @@ public function setHierarchy($hierarchy); * The vocabulary description. */ public function getDescription(); + } diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php index 37c7664..2da51e4 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php @@ -82,4 +82,5 @@ public function testStubWithWeightMapping() { $this->assertIdentical(count($stub_entity->validate()), 0, 'Stub is a valid entity'); } } + } diff --git a/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php b/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php index 3972052..1e2b232 100644 --- a/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php @@ -148,4 +148,5 @@ public function testTaxonomyVocabularyTree() { $ancestors = $storage->loadAllParents($term[3]->id()); $this->assertEqual(5, count($ancestors), 'The term has five ancestors including the term itself.'); } + } diff --git a/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php b/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php index be74413..3d9cfb7 100644 --- a/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php @@ -64,4 +64,5 @@ public function testValidation() { $violations = $term->validate(); $this->assertEqual(count($violations), 0, 'No violations for parent id 0.'); } + } diff --git a/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php b/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php index 23852c8..f77b751 100644 --- a/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php +++ b/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php @@ -89,4 +89,5 @@ public function viewElements(FieldItemListInterface $items, $langcode) { return $element; } + } diff --git a/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/core/modules/telephone/src/Tests/TelephoneFieldTest.php index a7497c9..f7452b0 100644 --- a/core/modules/telephone/src/Tests/TelephoneFieldTest.php +++ b/core/modules/telephone/src/Tests/TelephoneFieldTest.php @@ -98,4 +98,5 @@ function testTelephoneField() { $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertRaw('', 'Telephone link is output with whitespace removed.'); } + } diff --git a/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php b/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php index e8e8c29..6995d59 100644 --- a/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php +++ b/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php @@ -143,5 +143,4 @@ protected function installExtraModules(array $module_list) { $this->container->get('router.builder')->rebuildIfNeeded(); } - } diff --git a/core/modules/tour/src/Tests/TourTest.php b/core/modules/tour/src/Tests/TourTest.php index 910eb6e..ab2fe4a 100644 --- a/core/modules/tour/src/Tests/TourTest.php +++ b/core/modules/tour/src/Tests/TourTest.php @@ -184,4 +184,5 @@ public function testTourFunctionality() { )); $this->assertEqual(count($elements), 0, 'Did not find English variant of tip 1.'); } + } diff --git a/core/modules/tour/src/TipPluginBase.php b/core/modules/tour/src/TipPluginBase.php index 16138f8..b760847 100644 --- a/core/modules/tour/src/TipPluginBase.php +++ b/core/modules/tour/src/TipPluginBase.php @@ -78,4 +78,5 @@ public function get($key) { public function set($key, $value) { $this->configuration[$key] = $value; } + } diff --git a/core/modules/tour/tests/src/Unit/Entity/TourTest.php b/core/modules/tour/tests/src/Unit/Entity/TourTest.php index f08ea2d..2c71aa9 100644 --- a/core/modules/tour/tests/src/Unit/Entity/TourTest.php +++ b/core/modules/tour/tests/src/Unit/Entity/TourTest.php @@ -41,7 +41,7 @@ public function testHasMatchingRoute($routes, $route_name, $route_params, $resul $tour->resetKeyedRoutes(); } - /* + /** * Provides sample routes for testing. */ public function routeProvider() { diff --git a/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php b/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php index 347299e..471eacf 100644 --- a/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php +++ b/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php @@ -26,4 +26,5 @@ class ViewOwnTrackerAccessCheck implements AccessInterface { public function access(AccountInterface $account, UserInterface $user) { return AccessResult::allowedIf($user && $account->isAuthenticated() && ($user->id() == $account->id()))->cachePerUser(); } + } diff --git a/core/modules/tracker/src/Controller/TrackerPage.php b/core/modules/tracker/src/Controller/TrackerPage.php index 4d8cfea..03b077d 100644 --- a/core/modules/tracker/src/Controller/TrackerPage.php +++ b/core/modules/tracker/src/Controller/TrackerPage.php @@ -16,4 +16,5 @@ public function getContent() { module_load_include('inc', 'tracker', 'tracker.pages'); return tracker_page(); } + } diff --git a/core/modules/tracker/src/Controller/TrackerUserRecent.php b/core/modules/tracker/src/Controller/TrackerUserRecent.php index 7ce5a58..4ca428e 100644 --- a/core/modules/tracker/src/Controller/TrackerUserRecent.php +++ b/core/modules/tracker/src/Controller/TrackerUserRecent.php @@ -17,4 +17,5 @@ public function getContent(UserInterface $user) { module_load_include('inc', 'tracker', 'tracker.pages'); return tracker_page($user); } + } diff --git a/core/modules/tracker/src/Controller/TrackerUserTab.php b/core/modules/tracker/src/Controller/TrackerUserTab.php index 00fcddb..d9c774d 100644 --- a/core/modules/tracker/src/Controller/TrackerUserTab.php +++ b/core/modules/tracker/src/Controller/TrackerUserTab.php @@ -24,4 +24,5 @@ public function getContent(UserInterface $user) { public function getTitle(UserInterface $user) { return $user->getUsername(); } + } diff --git a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php index 30934d0..29492bc 100644 --- a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php +++ b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php @@ -71,4 +71,5 @@ function testTrackerNodeAccess() { $this->assertNoText($private_node->getTitle(), 'Private node is not visible to user without private access.'); $this->assertText($public_node->getTitle(), 'Public node is visible to user without private access.'); } + } diff --git a/core/modules/update/src/Tests/UpdateTestBase.php b/core/modules/update/src/Tests/UpdateTestBase.php index 24eb2aa..de15b0b 100644 --- a/core/modules/update/src/Tests/UpdateTestBase.php +++ b/core/modules/update/src/Tests/UpdateTestBase.php @@ -78,4 +78,5 @@ protected function standardTests() { $this->assertRaw(\Drupal::l(t('Drupal'), Url::fromUri('http://example.com/project/drupal')), 'Link to the Drupal project appears.'); $this->assertNoText(t('No available releases found')); } + } diff --git a/core/modules/update/src/UpdateFetcherInterface.php b/core/modules/update/src/UpdateFetcherInterface.php index db284ab..8d8f2a9 100644 --- a/core/modules/update/src/UpdateFetcherInterface.php +++ b/core/modules/update/src/UpdateFetcherInterface.php @@ -56,4 +56,5 @@ public function fetchProjectData(array $project, $site_key = ''); * @see \Drupal\update\UpdateManager::getProjects() */ public function buildFetchUrl(array $project, $site_key = ''); + } diff --git a/core/modules/update/src/UpdateManagerInterface.php b/core/modules/update/src/UpdateManagerInterface.php index 4dbdecd..d3ea88f 100644 --- a/core/modules/update/src/UpdateManagerInterface.php +++ b/core/modules/update/src/UpdateManagerInterface.php @@ -98,4 +98,5 @@ public function refreshUpdateData(); * array when the storage is cleared. */ public function projectStorage($key); + } diff --git a/core/modules/update/src/UpdateProcessorInterface.php b/core/modules/update/src/UpdateProcessorInterface.php index ed4f525..f744bfb 100644 --- a/core/modules/update/src/UpdateProcessorInterface.php +++ b/core/modules/update/src/UpdateProcessorInterface.php @@ -78,4 +78,5 @@ public function numberOfQueueItems(); * @see \Drupal\Core\Queue\QueueInterface::deleteItem() */ public function deleteQueueItem($item); + } diff --git a/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php b/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php index 9e40b65..2194b43 100644 --- a/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php +++ b/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php @@ -28,4 +28,5 @@ public function getSettingsForm() { ); return $form; } + } diff --git a/core/modules/user/src/Access/RegisterAccessCheck.php b/core/modules/user/src/Access/RegisterAccessCheck.php index 6946bf0..c539974 100644 --- a/core/modules/user/src/Access/RegisterAccessCheck.php +++ b/core/modules/user/src/Access/RegisterAccessCheck.php @@ -24,4 +24,5 @@ public function access(AccountInterface $account) { $user_settings = \Drupal::config('user.settings'); return AccessResult::allowedIf($account->isAnonymous() && $user_settings->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY)->cacheUntilConfigurationChanges($user_settings); } + } diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php index 46603cc..dbdb08b 100644 --- a/core/modules/user/src/AccountForm.php +++ b/core/modules/user/src/AccountForm.php @@ -391,4 +391,5 @@ public function submitForm(array &$form, FormStateInterface $form_state) { unset($_SESSION['pass_reset_' . $user->id()]); } } + } diff --git a/core/modules/user/src/Plugin/Search/UserSearch.php b/core/modules/user/src/Plugin/Search/UserSearch.php index 5332939..f847121 100644 --- a/core/modules/user/src/Plugin/Search/UserSearch.php +++ b/core/modules/user/src/Plugin/Search/UserSearch.php @@ -158,7 +158,7 @@ public function execute() { return $results; } - /* + /** * {@inheritdoc} */ public function getHelp() { diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php index effb26c..3c64921 100644 --- a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php +++ b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php @@ -20,4 +20,5 @@ class UserNameConstraint extends Constraint { public $multipleSpacesMessage = 'The username cannot contain multiple spaces in a row.'; public $illegalMessage = 'The username contains an illegal character.'; public $tooLongMessage = 'The username %name is too long: it must be %max characters or less.'; + } diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php index 042dcb1..fa71464 100644 --- a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php +++ b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php @@ -57,4 +57,5 @@ public function validate($items, Constraint $constraint) { $this->context->addViolation($constraint->tooLongMessage, array('%name' => $name, '%max' => USERNAME_MAX_LENGTH)); } } + } diff --git a/core/modules/user/src/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php index 411e04b..fa61dbf 100644 --- a/core/modules/user/src/Plugin/views/argument_validator/User.php +++ b/core/modules/user/src/Plugin/views/argument_validator/User.php @@ -109,5 +109,4 @@ public function calculateDependencies() { return $dependencies; } - } diff --git a/core/modules/user/src/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php index 7554adf..d31c781 100644 --- a/core/modules/user/src/Plugin/views/filter/Name.php +++ b/core/modules/user/src/Plugin/views/filter/Name.php @@ -28,7 +28,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) { '#target_type' => 'user', '#tags' => TRUE, '#default_value' => $default_value, - '#process_default_value' => FALSE, + '#process_default_value' => $this->isExposed(), ); $user_input = $form_state->getUserInput(); diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php index fdc7516..bb02246 100644 --- a/core/modules/user/src/PrivateTempStore.php +++ b/core/modules/user/src/PrivateTempStore.php @@ -203,4 +203,5 @@ protected function createkey($key) { protected function getOwner() { return $this->currentUser->id() ?: $this->requestStack->getCurrentRequest()->getSession()->getId(); } + } diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index 2db540b..9bc047b 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -135,4 +135,5 @@ public function save(array $form, FormStateInterface $form_state) { $form_state->setRedirect(''); } } + } diff --git a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php index aef94e6..2fba848 100644 --- a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php +++ b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php @@ -44,4 +44,5 @@ protected function setUp() { ), ); } + } diff --git a/core/modules/user/src/Tests/UserAdminTest.php b/core/modules/user/src/Tests/UserAdminTest.php index d8252ec..6569ad2 100644 --- a/core/modules/user/src/Tests/UserAdminTest.php +++ b/core/modules/user/src/Tests/UserAdminTest.php @@ -196,4 +196,5 @@ function testNotificationEmailAddress() { )); $this->assertTrue(count($user_mail), 'New user mail to user is sent from configured Notification Email address'); } + } diff --git a/core/modules/user/src/Tests/UserBlocksTest.php b/core/modules/user/src/Tests/UserBlocksTest.php index dff52b5..40e63d8 100644 --- a/core/modules/user/src/Tests/UserBlocksTest.php +++ b/core/modules/user/src/Tests/UserBlocksTest.php @@ -130,4 +130,5 @@ private function updateAccess($uid, $access = REQUEST_TIME) { ->fields(array('access' => $access)) ->execute(); } + } diff --git a/core/modules/user/src/Tests/UserCreateFailMailTest.php b/core/modules/user/src/Tests/UserCreateFailMailTest.php index cd5c630..a51229a 100644 --- a/core/modules/user/src/Tests/UserCreateFailMailTest.php +++ b/core/modules/user/src/Tests/UserCreateFailMailTest.php @@ -41,4 +41,5 @@ public function testUserAdd() { $this->assertText(t('Unable to send email. Contact the site administrator if the problem persists.')); $this->assertNoText(t('A welcome message with further instructions has been emailed to the new user @name.', array('@name' => $edit['name']))); } + } diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php index b0dec49..efc7ddf 100644 --- a/core/modules/user/src/Tests/UserCreateTest.php +++ b/core/modules/user/src/Tests/UserCreateTest.php @@ -126,4 +126,5 @@ public function testUserAdd() { $this->assertText("Created a new user account for $name. No email has been sent"); $this->assertNoText('Password field is required'); } + } diff --git a/core/modules/user/src/Tests/UserDeleteTest.php b/core/modules/user/src/Tests/UserDeleteTest.php index 5a48552..dbb3002 100644 --- a/core/modules/user/src/Tests/UserDeleteTest.php +++ b/core/modules/user/src/Tests/UserDeleteTest.php @@ -51,4 +51,5 @@ function testUserDeleteMultiple() { $this->assertNull(User::load($user_b->id()), format_string('User with id @uid deleted.', array('@uid' => $user_b->id()))); $this->assertNull(User::load($user_c->id()), format_string('User with id @uid deleted.', array('@uid' => $user_c->id()))); } + } diff --git a/core/modules/user/src/Tests/UserEditTest.php b/core/modules/user/src/Tests/UserEditTest.php index 81bae39..225b194 100644 --- a/core/modules/user/src/Tests/UserEditTest.php +++ b/core/modules/user/src/Tests/UserEditTest.php @@ -136,4 +136,5 @@ function testUserWithoutEmailEdit() { $this->drupalPostForm("user/" . $user1->id() . "/edit", array('mail' => ''), t('Save')); $this->assertRaw(t("The changes have been saved.")); } + } diff --git a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php b/core/modules/user/src/Tests/UserEditedOwnAccountTest.php index ce1b91f..6c058bf 100644 --- a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php +++ b/core/modules/user/src/Tests/UserEditedOwnAccountTest.php @@ -39,4 +39,5 @@ function testUserEditedOwnAccount() { $account->name = $edit['name']; $this->drupalLogin($account); } + } diff --git a/core/modules/user/src/Tests/UserLanguageCreationTest.php b/core/modules/user/src/Tests/UserLanguageCreationTest.php index 5124204..08ca707 100644 --- a/core/modules/user/src/Tests/UserLanguageCreationTest.php +++ b/core/modules/user/src/Tests/UserLanguageCreationTest.php @@ -99,4 +99,5 @@ function testLocalUserCreation() { $this->drupalGet($user_edit); $this->assertOptionSelected("edit-preferred-langcode", $langcode, 'Language selector is accessible and correct language is selected.'); } + } diff --git a/core/modules/user/src/Tests/UserLanguageTest.php b/core/modules/user/src/Tests/UserLanguageTest.php index 5b7b566..5c5f73f 100644 --- a/core/modules/user/src/Tests/UserLanguageTest.php +++ b/core/modules/user/src/Tests/UserLanguageTest.php @@ -63,4 +63,5 @@ function testUserLanguageConfiguration() { $this->drupalLogout(); } + } diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php index a22cd17..af00c74 100644 --- a/core/modules/user/src/Tests/UserLoginTest.php +++ b/core/modules/user/src/Tests/UserLoginTest.php @@ -174,4 +174,5 @@ function assertFailedLogin($account, $flood_trigger = NULL) { $this->assertText(t('Unrecognized username or password. Forgot your password?')); } } + } diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php index 03c453a..3f8db42 100644 --- a/core/modules/user/src/Tests/UserPictureTest.php +++ b/core/modules/user/src/Tests/UserPictureTest.php @@ -139,4 +139,5 @@ function saveUserPicture($image) { $account = $user_storage->load($this->webUser->id()); return File::load($account->user_picture->target_id); } + } diff --git a/core/modules/user/src/Tests/UserRoleAdminTest.php b/core/modules/user/src/Tests/UserRoleAdminTest.php index 58b2e97..62b4bc1 100644 --- a/core/modules/user/src/Tests/UserRoleAdminTest.php +++ b/core/modules/user/src/Tests/UserRoleAdminTest.php @@ -128,4 +128,5 @@ function testRoleWeightOrdering() { // The order of the roles should be reversed. $this->assertIdentical($rids, array_reverse($saved_rids)); } + } diff --git a/core/modules/user/src/Tests/UserRolesAssignmentTest.php b/core/modules/user/src/Tests/UserRolesAssignmentTest.php index 544e4bb..485bd2f 100644 --- a/core/modules/user/src/Tests/UserRolesAssignmentTest.php +++ b/core/modules/user/src/Tests/UserRolesAssignmentTest.php @@ -90,4 +90,5 @@ private function userLoadAndCheckRoleAssigned($account, $rid, $is_assigned = TRU $this->assertTrue(array_search($rid, $account->getRoles()) === FALSE, 'The role is not present in the user object.'); } } + } diff --git a/core/modules/user/src/Tests/UserSearchTest.php b/core/modules/user/src/Tests/UserSearchTest.php index 49e2e89..d154030 100644 --- a/core/modules/user/src/Tests/UserSearchTest.php +++ b/core/modules/user/src/Tests/UserSearchTest.php @@ -116,4 +116,5 @@ function testUserSearch() { $this->assertResponse('403', 'User without search permission cannot search'); $this->drupalLogout(); } + } diff --git a/core/modules/user/src/Tests/UserTimeZoneTest.php b/core/modules/user/src/Tests/UserTimeZoneTest.php index 944fca8..09513fd 100644 --- a/core/modules/user/src/Tests/UserTimeZoneTest.php +++ b/core/modules/user/src/Tests/UserTimeZoneTest.php @@ -83,4 +83,5 @@ function testUserTimeZone() { $this->drupalGet('/system-test/date'); $this->assertText('2016-01-13 08:29 PST', 'Date should be PST.'); } + } diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php index 2e6f90e..b8cfde0 100644 --- a/core/modules/user/src/Tests/UserTokenReplaceTest.php +++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php @@ -164,4 +164,5 @@ function testUserTokenReplacement() { $output = $token_service->replace($input, ['user' => $user1]); $this->assertEqual($output, $expected, new FormattableMarkup('User token %token does not escape safe markup.', ['%token' => 'display-name'])); } + } diff --git a/core/modules/user/src/Tests/Views/AccessTestBase.php b/core/modules/user/src/Tests/Views/AccessTestBase.php index 3a5c674..90a3d2f 100644 --- a/core/modules/user/src/Tests/Views/AccessTestBase.php +++ b/core/modules/user/src/Tests/Views/AccessTestBase.php @@ -62,4 +62,5 @@ protected function setUp() { // @todo when all the plugin information is cached make a reset function and // call it here. } + } diff --git a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php index 1102b8e..47d2833 100644 --- a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php +++ b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php @@ -127,4 +127,5 @@ public function testUserDeleteAccess() { $account = User::load($account2->id()); $this->assertNull($account, 'The user "may_delete" is deleted.'); } + } diff --git a/core/modules/user/src/Tests/Views/BulkFormTest.php b/core/modules/user/src/Tests/Views/BulkFormTest.php index e80b31a..a4ff23d 100644 --- a/core/modules/user/src/Tests/Views/BulkFormTest.php +++ b/core/modules/user/src/Tests/Views/BulkFormTest.php @@ -135,4 +135,5 @@ public function testBulkFormCombineFilter() { $errors = $view->validate(); $this->assertEqual(reset($errors['default']), t('Field %field set in %filter is not usable for this filter type. Combined field filter only works for simple fields.', array('%field' => 'User: Bulk update', '%filter' => 'Global: Combine fields filter'))); } + } diff --git a/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php index e0cba5e..eaf24aa 100644 --- a/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php +++ b/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php @@ -137,6 +137,17 @@ public function testExposedFilter() { $this->drupalGet($path, $options); $this->assertRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users)))); + // Pass in an invalid target_id in for the entity_autocomplete value format. + // There should be no errors, but all results should be returned as the + // default value for the autocomplete will not match any users so should + // be empty. + $options['query']['uid'] = [['target_id' => 9999]]; + $this->drupalGet($path, $options); + // The actual result should contain all of the user ids. + foreach ($this->accounts as $account) { + $this->assertRaw($account->id()); + } + // Pass in an invalid username and a valid username. $users = array($this->randomMachineName(), $this->names[0]); $users = array_map('strtolower', $users); @@ -156,6 +167,18 @@ public function testExposedFilter() { foreach ($this->accounts as $account) { $this->assertRaw($account->id()); } + + // Pass in just valid user IDs in the entity_autocomplete target_id format. + $options['query']['uid'] = array_map(function($account) { + return ['target_id' => $account->id()]; + }, $this->accounts); + + $this->drupalGet($path, $options); + $this->assertNoRaw('Unable to find user'); + // The actual result should contain all of the user ids. + foreach ($this->accounts as $account) { + $this->assertRaw($account->id()); + } } } diff --git a/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php b/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php index d2ca79e..8958c54 100644 --- a/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php +++ b/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php @@ -94,4 +94,5 @@ function testUserSelectionByRole() { $matches = $autocomplete->getMatches('user', 'default', $field_definition->getSetting('handler_settings'), 'aabbbb'); $this->assertEqual(count($matches), 0, ''); } + } diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php index 6a2b26f..593d8c4 100644 --- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php +++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php @@ -426,6 +426,7 @@ public function titleProvider() { ), ); } + } /** diff --git a/core/modules/views/src/DisplayPluginCollection.php b/core/modules/views/src/DisplayPluginCollection.php index 176f138..e94a6ac 100644 --- a/core/modules/views/src/DisplayPluginCollection.php +++ b/core/modules/views/src/DisplayPluginCollection.php @@ -105,5 +105,4 @@ public function remove($instance_id) { parent::remove($instance_id); } - } diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php index cf76b88..1b05c1b 100644 --- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php +++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php @@ -88,7 +88,6 @@ protected function getEntityManager() { /** * {@inheritdoc} */ - protected function getLanguageManager() { return $this->languageManager; } diff --git a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php index 1520026..00ae524 100644 --- a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php +++ b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php @@ -74,4 +74,5 @@ public function getLangcode(ResultRow $row) { public function getCacheContexts() { return ['languages:' . LanguageInterface::TYPE_CONTENT]; } + } diff --git a/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php index 6bfec5b..072d692 100644 --- a/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php +++ b/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php @@ -31,4 +31,5 @@ public function getDerivativeDefinitions($base_plugin_definition) { } return parent::getDerivativeDefinitions($base_plugin_definition); } + } diff --git a/core/modules/views/src/Plugin/ViewsHandlerManager.php b/core/modules/views/src/Plugin/ViewsHandlerManager.php index f6ddf04..d138d72 100644 --- a/core/modules/views/src/Plugin/ViewsHandlerManager.php +++ b/core/modules/views/src/Plugin/ViewsHandlerManager.php @@ -132,4 +132,5 @@ public function createInstance($plugin_id, array $configuration = array()) { public function getFallbackPluginId($plugin_id, array $configuration = array()) { return 'broken'; } + } diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php index fab36a0..12cd72b 100644 --- a/core/modules/views/src/Plugin/views/HandlerBase.php +++ b/core/modules/views/src/Plugin/views/HandlerBase.php @@ -815,4 +815,5 @@ public function submitTemporaryForm($form, FormStateInterface $form_state) { // Write to cache $view->cacheSet(); } + } diff --git a/core/modules/views/src/Plugin/views/area/Entity.php b/core/modules/views/src/Plugin/views/area/Entity.php index abb6288..b1f5a1b 100644 --- a/core/modules/views/src/Plugin/views/area/Entity.php +++ b/core/modules/views/src/Plugin/views/area/Entity.php @@ -194,4 +194,5 @@ public function calculateDependencies() { return $dependencies; } + } diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 4a899d1..193e20b 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -2674,6 +2674,7 @@ protected function isBaseTableTranslatable() { } return FALSE; } + } /** diff --git a/core/modules/views/src/Plugin/views/display/EntityReference.php b/core/modules/views/src/Plugin/views/display/EntityReference.php index c4d3fa2..22c8c8c 100644 --- a/core/modules/views/src/Plugin/views/display/EntityReference.php +++ b/core/modules/views/src/Plugin/views/display/EntityReference.php @@ -175,4 +175,5 @@ public function validate() { } return $errors; } + } diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php index 292986f..f5a6035 100644 --- a/core/modules/views/src/Plugin/views/filter/Combine.php +++ b/core/modules/views/src/Plugin/views/filter/Combine.php @@ -118,9 +118,10 @@ public function validate() { return $errors; } - // By default things like opEqual uses add_where, that doesn't support - // complex expressions, so override all operators. - + /** + * By default things like opEqual uses add_where, that doesn't support + * complex expressions, so override opEqual (and all operators below). + */ function opEqual($expression) { $placeholder = $this->placeholder(); $operator = $this->operator(); diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index cf00bf7..c458e63 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -1227,7 +1227,7 @@ public function exposedInfo() { ); } - /* + /** * Transform the input from a grouped filter into a standard filter. * * When a filter is a group, find the set of operator and values diff --git a/core/modules/views/src/Plugin/views/filter/LanguageFilter.php b/core/modules/views/src/Plugin/views/filter/LanguageFilter.php index 1e11846..69fdc81 100644 --- a/core/modules/views/src/Plugin/views/filter/LanguageFilter.php +++ b/core/modules/views/src/Plugin/views/filter/LanguageFilter.php @@ -79,4 +79,5 @@ public function query() { parent::query(); } + } diff --git a/core/modules/views/src/Plugin/views/pager/Full.php b/core/modules/views/src/Plugin/views/pager/Full.php index 67b850d..76e6469 100644 --- a/core/modules/views/src/Plugin/views/pager/Full.php +++ b/core/modules/views/src/Plugin/views/pager/Full.php @@ -95,5 +95,4 @@ public function render($input) { ); } - } diff --git a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php index c1b8821..42d6fa1 100644 --- a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php +++ b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php @@ -13,7 +13,7 @@ * * @ViewsRelationship("entity_reverse") */ -class EntityReverse extends RelationshipPluginBase { +class EntityReverse extends RelationshipPluginBase { /** * Constructs an EntityReverse object. diff --git a/core/modules/views/src/Plugin/views/row/EntityReference.php b/core/modules/views/src/Plugin/views/row/EntityReference.php index d6f2e00..4ca79ba 100644 --- a/core/modules/views/src/Plugin/views/row/EntityReference.php +++ b/core/modules/views/src/Plugin/views/row/EntityReference.php @@ -53,4 +53,5 @@ public function preRender($row) { return parent::preRender($row); } + } diff --git a/core/modules/views/src/Plugin/views/style/EntityReference.php b/core/modules/views/src/Plugin/views/style/EntityReference.php index 310cd27..f694b00 100644 --- a/core/modules/views/src/Plugin/views/style/EntityReference.php +++ b/core/modules/views/src/Plugin/views/style/EntityReference.php @@ -100,4 +100,5 @@ public function render() { public function evenEmpty() { return TRUE; } + } diff --git a/core/modules/views/src/Render/ViewsRenderPipelineMarkup.php b/core/modules/views/src/Render/ViewsRenderPipelineMarkup.php index ab8da7f..e0f3df1 100644 --- a/core/modules/views/src/Render/ViewsRenderPipelineMarkup.php +++ b/core/modules/views/src/Render/ViewsRenderPipelineMarkup.php @@ -20,4 +20,5 @@ */ final class ViewsRenderPipelineMarkup implements MarkupInterface, \Countable { use MarkupTrait; + } diff --git a/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php b/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php index 21f5c55..88db8b1 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php @@ -102,4 +102,5 @@ public function testDisabledAttachments() { $result = $this->xpath('//div[contains(@class, "attachment-after")]'); $this->assertEqual(count($result), 0, 'The attachment_2 is not rendered.'); } + } diff --git a/core/modules/views/src/Tests/Plugin/MenuLinkTest.php b/core/modules/views/src/Tests/Plugin/MenuLinkTest.php index f1e58bd..06e661f 100644 --- a/core/modules/views/src/Tests/Plugin/MenuLinkTest.php +++ b/core/modules/views/src/Tests/Plugin/MenuLinkTest.php @@ -94,4 +94,5 @@ public function testHierarchicalMenuLinkVisibility() { $this->assertText('Primary level node'); $this->assertText('Secondary level view page'); } + } diff --git a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php index 8617e71..94f752b 100644 --- a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php +++ b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php @@ -156,4 +156,5 @@ protected function createFile() { return $file; } + } diff --git a/core/modules/views/src/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php index e3282a3..f922748 100644 --- a/core/modules/views/src/Tests/Plugin/PagerTest.php +++ b/core/modules/views/src/Tests/Plugin/PagerTest.php @@ -449,4 +449,5 @@ protected function createTranslation($source, $translation, $langcode) { ); return $this->localeStorage->createTranslation($values)->save(); } + } diff --git a/core/modules/views/src/Tests/Plugin/ViewsFormTest.php b/core/modules/views/src/Tests/Plugin/ViewsFormTest.php index a3bbe64..01f7a8c 100644 --- a/core/modules/views/src/Tests/Plugin/ViewsFormTest.php +++ b/core/modules/views/src/Tests/Plugin/ViewsFormTest.php @@ -30,4 +30,5 @@ public function testFormWrapper() { $result = (bool) preg_match('#]*?>(?!/form).*getRawContent()); $this->assertFalse($result, 'The views form element is not nested.'); } + } diff --git a/core/modules/views/src/ViewEntityInterface.php b/core/modules/views/src/ViewEntityInterface.php index d18179d..7eeb539 100644 --- a/core/modules/views/src/ViewEntityInterface.php +++ b/core/modules/views/src/ViewEntityInterface.php @@ -66,5 +66,4 @@ public function duplicateDisplayAsType($old_display_id, $new_display_type); */ public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL); - } diff --git a/core/modules/views/src/ViewsData.php b/core/modules/views/src/ViewsData.php index dcfc05d..021ea78 100644 --- a/core/modules/views/src/ViewsData.php +++ b/core/modules/views/src/ViewsData.php @@ -319,4 +319,5 @@ public function clear() { $this->fullyLoaded = FALSE; Cache::invalidateTags(array('views_data')); } + } diff --git a/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php b/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php index dd60f92..f80092b 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php +++ b/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php @@ -37,4 +37,5 @@ public function buildForm(array $form, FormStateInterface $form_state) { */ public function submitForm(array &$form, FormStateInterface $form_state) { } + } diff --git a/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php index 526b743..527bd72 100644 --- a/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php @@ -315,4 +315,5 @@ public function testYearMonthHandler() { $expected = array(); $this->assertIdenticalResultset($view, $expected, $this->columnMap); } + } diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php index 190f476..12f68ed 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php @@ -84,7 +84,9 @@ function testSimple() { $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter))); } - // @TODO: Write tests for pager. + /** + * @todo: Write tests for pager. + */ function testPager() { } diff --git a/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php index 8a1fc96..27f21c2 100644 --- a/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php +++ b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php @@ -70,4 +70,5 @@ public function testCreateView() { $this->assertEqual($view->get('base_table'), 'views_test_data'); $this->assertEqual($view->get('langcode'), 'it'); } + } diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index e6d8f9f..c3e93ed 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -962,6 +962,7 @@ class TestEntityViewsData extends EntityViewsData { public function setEntityType(EntityTypeInterface $entity_type) { $this->entityType = $entity_type; } + } class TestEntityType extends EntityType { diff --git a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php index b6e15d7..f137105 100644 --- a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php @@ -249,7 +249,9 @@ public function testExecuteCountQueryWithOffset() { } -// As StatementInterface extends \Traversable, which though always needs -// an additional interface. The Statement class itself can't be mocked because -// of its __wakeup function. +/** + * As StatementInterface extends \Traversable, which though always needs + * an additional interface. The Statement class itself can't be mocked because + * of its __wakeup function. + */ interface TestStatementInterface extends StatementInterface, \Iterator {} diff --git a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php index 346eb89..d522bcf 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php @@ -163,6 +163,7 @@ public function testRenderWithoutDestination() { $build = $this->plugin->render($result); $this->assertSame($expected_build, $build); } + } } diff --git a/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php b/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php index c303553..b62f876 100644 --- a/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php +++ b/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php @@ -53,4 +53,5 @@ protected function saveArgumentHandlerWithValidationOptions($specify_validation) $this->drupalPostForm('admin/structure/views/nojs/handler/test_argument/default/argument/id', $options, t('Apply')); $this->drupalPostForm('admin/structure/views/view/test_argument', array(), t('Save')); } + } diff --git a/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php index 1172fb2..fbacb14 100644 --- a/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php +++ b/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php @@ -57,4 +57,5 @@ public function testAttachmentUI() { $view->initDisplay(); $this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected'); } + } diff --git a/core/modules/views_ui/src/Tests/DuplicateTest.php b/core/modules/views_ui/src/Tests/DuplicateTest.php index 8cf9b0d..a6948f0 100644 --- a/core/modules/views_ui/src/Tests/DuplicateTest.php +++ b/core/modules/views_ui/src/Tests/DuplicateTest.php @@ -39,4 +39,5 @@ public function testDuplicateView() { // Assert that the page title is correctly displayed. $this->assertText($view['label']); } + } diff --git a/core/modules/views_ui/src/Tests/ExposedFormUITest.php b/core/modules/views_ui/src/Tests/ExposedFormUITest.php index a74300d..fd70978 100644 --- a/core/modules/views_ui/src/Tests/ExposedFormUITest.php +++ b/core/modules/views_ui/src/Tests/ExposedFormUITest.php @@ -169,4 +169,5 @@ function testExposedAdminUi() { $this->assertEqual($display['display_options']['sorts']['created']['expose'], ['label' => $edit['options[expose][label]']]); $this->assertEqual($display['display_options']['sorts']['created']['order'], 'DESC'); } + } diff --git a/core/modules/views_ui/src/Tests/FilterUITest.php b/core/modules/views_ui/src/Tests/FilterUITest.php index 36b782a..371800f 100644 --- a/core/modules/views_ui/src/Tests/FilterUITest.php +++ b/core/modules/views_ui/src/Tests/FilterUITest.php @@ -119,4 +119,5 @@ public function testFilterIdentifier() { $this->drupalPostForm($path, $edit, t('Apply')); $this->assertText('This identifier has illegal characters.'); } + } diff --git a/core/modules/views_ui/src/Tests/HandlerTest.php b/core/modules/views_ui/src/Tests/HandlerTest.php index 63d7e03..bc61a37 100644 --- a/core/modules/views_ui/src/Tests/HandlerTest.php +++ b/core/modules/views_ui/src/Tests/HandlerTest.php @@ -278,4 +278,5 @@ public function assertNoDuplicateField($field_name, $entity_type) { $elements = $this->xpath('//td[.=:entity_type]/preceding-sibling::td[@class="title" and .=:title]', [':title' => $field_name, ':entity_type' => $entity_type]); $this->assertEqual(1, count($elements), $field_name . ' appears just once in ' . $entity_type . '.'); } + } diff --git a/core/modules/views_ui/src/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php index 216df7d..74b6f4f 100644 --- a/core/modules/views_ui/src/Tests/UITestBase.php +++ b/core/modules/views_ui/src/Tests/UITestBase.php @@ -87,5 +87,4 @@ protected function drupalGet($path, array $options = array(), array $headers = a return parent::drupalGet($path, $options, $headers); } - } diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 129168a..aa93c42 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -13,10 +13,14 @@ + + + +