]> git.joonet.de Git - adminer.git/commitdiff
Check more style
authorJakub Vrana <jakub@vrana.cz>
Tue, 11 Mar 2025 11:21:07 +0000 (12:21 +0100)
committerJakub Vrana <jakub@vrana.cz>
Tue, 11 Mar 2025 11:21:07 +0000 (12:21 +0100)
adminer/drivers/pgsql.inc.php
editor/example.php
phpcs.xml
plugins/pretty-json-column.php

index 7b4061bc28f7b3fc28a5101852641404024021d1..e11879375d0e0067ea085c824fee83acc1151388 100644 (file)
@@ -661,7 +661,6 @@ ORDER BY conkey, conname") as $row
 
        function truncate_tables($tables) {
                return queries("TRUNCATE " . implode(", ", array_map('Adminer\table', $tables)));
-               return true;
        }
 
        function drop_views($views) {
index 37dfd4508a567968d0699597167d13004cece344..987ac2e09b89eb357daebe2e3b426e86d42dc666 100644 (file)
@@ -1,6 +1,5 @@
 <?php
 function adminer_object() {
-
        class AdminerCds extends Adminer\Adminer {
 
                function name() {
index ffe78d221acb524a3bcbeb0d8ad18239e1e1135f..56c71c353c7bc87018959336d2337dbb502830dc 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
        <rule ref="Generic.VersionControl.GitMergeConflict"/>
        <rule ref="Generic.Whitespace.DisallowSpaceIndent"/>
        <rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
+
+       <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
+       <rule ref="Squiz.Classes.LowercaseClassKeywords"/>
+       <rule ref="Squiz.Classes.SelfMemberReference"/>
+       <rule ref="Squiz.CSS.ClassDefinitionNameSpacing"/>
+       <rule ref="Squiz.CSS.ColonSpacing"/>
+       <rule ref="Squiz.CSS.DuplicateClassDefinition"/>
+       <rule ref="Squiz.CSS.DuplicateStyleDefinition"/>
+       <rule ref="Squiz.CSS.EmptyClassDefinition"/>
+       <rule ref="Squiz.CSS.EmptyStyleDefinition"/>
+       <rule ref="Squiz.CSS.ForbiddenStyles"/>
+       <rule ref="Squiz.CSS.Indentation"/>
+       <rule ref="Squiz.CSS.MissingColon"/>
+       <rule ref="Squiz.CSS.Opacity"/>
+       <rule ref="Squiz.CSS.SemicolonSpacing"/>
+       <rule ref="Squiz.Functions.FunctionDuplicateArgument"/>
+       <rule ref="Squiz.Objects.ObjectMemberComma"/>
+       <rule ref="Squiz.Operators.IncrementDecrementUsage"/>
+       <rule ref="Squiz.Operators.ValidLogicalOperators"/>
+       <rule ref="Squiz.PHP.DiscouragedFunctions"/>
+       <rule ref="Squiz.PHP.Eval"/>
+       <rule ref="Squiz.PHP.Heredoc"/>
+       <rule ref="Squiz.PHP.InnerFunctions"/>
+       <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
+       <rule ref="Squiz.PHP.NonExecutableCode"/>
+       <rule ref="Squiz.Scope.StaticThisUsage"/>
+       <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
+       <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+       <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
+       <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing"/>
 </ruleset>
index f814276fec143598536a892cf3266769810598ca..cf99bff80a3f03f2b1a31b304b5f8422953edb8e 100644 (file)
@@ -21,9 +21,7 @@ class AdminerPrettyJsonColumn {
                $json = $this->testJson($value);
                if ($json !== $value) {
                        $jsonText = json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-                       return <<<HTML
-<textarea $attrs cols="50" rows="20">$jsonText</textarea>
-HTML;
+                       return "<textarea$attrs cols='50' rows='20'>" . h($jsonText) . "</textarea>";
                }
                return '';
        }