Add more rules for phpcs

abrain · Nov 2, 2024 · 47057ff · 47057ff
1 parent 2f626ea
commit 47057ff
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -113,4 +113,12 @@
     <rule ref="Universal.CodeAnalysis.StaticInFinalClass"/>
     <rule ref="Universal.ControlStructures.DisallowLonelyIf"/>
     <rule ref="Universal.Files.SeparateFunctionsFromOO"/>
+
+    <rule ref="WordPress.CodeAnalysis.EscapedNotTranslated"/>
+    <rule ref="WordPress.NamingConventions.ValidPostTypeSlug"/>
+
+    <rule ref="WordPress.PHP.DevelopmentFunctions"/>
+    <rule ref="WordPress.PHP.DiscouragedPHPFunctions"/>
+    <rule ref="WordPress.PHP.IniSet"/>
+    <rule ref="WordPress.PHP.PregQuoteDelimiter"/>
 </ruleset>
diff --git a/src/includes/Core.php b/src/includes/Core.php
@@ -7,7 +7,6 @@
 use abrain\Einsatzverwaltung\Util\Formatter;
 use function add_action;
 use function add_option;
-use function error_log;
 use function get_option;
 use function plugin_basename;
 use function plugin_dir_url;
@@ -107,7 +106,7 @@ private function __construct()
     public function addHooks()
     {
         if (empty($this->pluginFile)) {
-            error_log('einsatzverwaltung: Plugin file has not been set via setPluginFile()');
+            wp_trigger_error(__FUNCTION__, 'Plugin file has not been set via setPluginFile()', E_USER_WARNING);
             return;
         }
 
@@ -225,7 +224,11 @@ private function maybeUpdate()
         $update = new Update();
         $updateResult = $update->doUpdate($currentDbVersion, self::DB_VERSION);
         if (is_wp_error($updateResult)) {
-            error_log("Das Datenbank-Upgrade wurde mit folgendem Fehler beendet: {$updateResult->get_error_message()}");
+            wp_trigger_error(
+                __FUNCTION__,
+                'The database upgrade was terminated with the following error: ' . $updateResult->get_error_message(),
+                E_USER_WARNING
+            );
         }
     }
 

diff --git a/src/includes/Data.php b/src/includes/Data.php
@@ -15,7 +15,6 @@
 use function current_user_can;
 use function defined;
 use function delete_post_meta;
-use function error_log;
 use function filter_input;
 use function get_post_meta;
 use function get_post_type;
@@ -286,7 +285,7 @@ private function adjustPostDate(WP_Post $post)
         $updateArgs['post_date_gmt'] = get_gmt_from_date($updateArgs['post_date']);
         $updateResult = wp_update_post($updateArgs);
         if (is_wp_error($updateResult)) {
-            error_log($updateResult->get_error_message());
+            wp_trigger_error(__FUNCTION__, 'Error updating post date: ' . $updateResult->get_error_message(), E_USER_WARNING);
         }
 
         // Zwischenspeicher wird nur in der Entwurfsphase benötigt

diff --git a/src/includes/Model/IncidentReport.php b/src/includes/Model/IncidentReport.php
@@ -7,6 +7,7 @@
 use abrain\Einsatzverwaltung\Types\Vehicle;
 use abrain\Einsatzverwaltung\Utilities;
 use DateTime;
+use Exception;
 use WP_Post;
 use WP_Term;
 use function array_filter;
@@ -15,7 +16,6 @@
 use function array_map;
 use function get_post;
 use function get_post_type;
-use function error_log;
 use function get_the_terms;
 use function in_array;
 use function intval;
@@ -42,6 +42,7 @@ class IncidentReport
      * IncidentReport constructor.
      *
      * @param int|WP_Post $post
+     * @throws Exception
      */
     public function __construct($post = null)
     {
@@ -50,8 +51,7 @@ public function __construct($post = null)
         }
 
         if (get_post_type($post) !== 'einsatz') {
-            error_log('The given post object is not an incident report'); // TODO throw exception
-            return;
+            throw new Exception('The given post object is not an incident report');
         }
 
         $this->post = get_post($post);

diff --git a/src/includes/Options.php b/src/includes/Options.php
@@ -35,7 +35,7 @@ public function getOption(string $key)
 
         // Fehlenden Standardwert beklagen, außer es handelt sich um eine Rechteeinstellung
         if (strpos($key, 'einsatzvw_cap_roles_') !== 0) {
-            error_log(sprintf('Kein Standardwert für %s gefunden!', $key));
+            wp_trigger_error(__FUNCTION__, sprintf('Did not find default value for option %s', $key), E_USER_WARNING);
         }
 
         return get_option($key, false);

diff --git a/src/includes/Update.php b/src/includes/Update.php
@@ -11,7 +11,6 @@
 use function array_map;
 use function delete_option;
 use function delete_term_meta;
-use function error_log;
 use function function_exists;
 use function get_editable_roles;
 use function get_option;
@@ -159,7 +158,7 @@ private function upgrade054()
                 array('%d')
             );
             if (false === $result) {
-                error_log('Problem beim Aktualisieren des GMT-Datums bei Post-ID ' . $bericht->ID);
+                wp_trigger_error(__FUNCTION__, 'Problem beim Aktualisieren des GMT-Datums bei Post-ID ' . $bericht->ID);
             }
         }
 
@@ -565,7 +564,7 @@ public function upgrade180()
         foreach ($oldUnits as $oldUnit) {
             $newUnit = wp_insert_term($oldUnit->post_title, 'evw_unit');
             if (is_wp_error($newUnit)) {
-                error_log('Could not create term for Unit: ' . $newUnit->get_error_message());
+                wp_trigger_error(__FUNCTION__, 'Could not create term for Unit: ' . $newUnit->get_error_message());
                 continue;
             }
             $termId = $newUnit['term_id'];