Cleanup: Change @codingStandardsIgnore tags to phpcs:disable, resolves …

…moodle-an-hochschulen#676. (moodle-an-hochschulen#677)
NJahreis · Jun 13, 2024 · 62296f8 · 62296f8
1 parent 6ce7bdd
commit 62296f8
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 45 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased 
 
+* 2024-06-13 - Cleanup: Change @codingStandardsIgnore tags to phpcs:disable, resolves #676.
 * 2024-06-12 - Cleanup: Fix CSS warnings in external SCSS tests, resolves #674.
 
 ### v4.3-r14 

diff --git a/config.php b/config.php
@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-// @codingStandardsIgnoreFile
 // Let codechecker ignore this file. We prefer being able to diff this file easily than to make codechecker happy.
+// phpcs:disable NormalizedArrays.Arrays.CommaAfterLast.MissingMultiLine
 
 // Require own locallib.php.
 require_once($CFG->dirroot . '/theme/boost_union/locallib.php');

diff --git a/flavours/styles.php b/flavours/styles.php
@@ -30,11 +30,9 @@
 define('NO_UPGRADE_CHECK', true);
 
 // Require config.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
-// after requiring config.php which is really not needed.require('../config.php');
-require(__DIR__.'/../../../config.php');
-// @codingStandardsIgnoreEnd
+// after requiring config.php which is really not needed.
+require(__DIR__.'/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require css sending libraries.
 require_once($CFG->dirroot.'/lib/csslib.php');

diff --git a/h5p/styles.php b/h5p/styles.php
@@ -30,11 +30,9 @@
 define('NO_UPGRADE_CHECK', true);
 
 // Require config.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
-// after requiring config.php which is really not needed.require('../config.php');
-require(__DIR__.'/../../../config.php');
-// @codingStandardsIgnoreEnd
+// after requiring config.php which is really not needed.
+require(__DIR__.'/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require css sending libraries.
 require_once($CFG->dirroot.'/lib/csslib.php');

diff --git a/locallogin.php b/locallogin.php
@@ -26,11 +26,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__.'/../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__.'/../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/lib/authlib.php');

diff --git a/mobile/styles.php b/mobile/styles.php
@@ -30,11 +30,9 @@
 define('NO_UPGRADE_CHECK', true);
 
 // Require config.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
-// after requiring config.php which is really not needed.require('../config.php');
-require(__DIR__.'/../../../config.php');
-// @codingStandardsIgnoreEnd
+// after requiring config.php which is really not needed.
+require(__DIR__.'/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require css sending libraries.
 require_once($CFG->dirroot.'/lib/csslib.php');

diff --git a/pages/aboutus.php b/pages/aboutus.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/contact.php b/pages/contact.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/help.php b/pages/help.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/imprint.php b/pages/imprint.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/maintenance.php b/pages/maintenance.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/offers.php b/pages/offers.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/page1.php b/pages/page1.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/page2.php b/pages/page2.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/pages/page3.php b/pages/page3.php
@@ -23,11 +23,9 @@
  */
 
 // Include config.php.
-// @codingStandardsIgnoreStart
 // Let codechecker ignore the next line because otherwise it would complain about a missing login check
 // after requiring config.php which is really not needed.
-require(__DIR__ . '/../../../config.php');
-// @codingStandardsIgnoreEnd
+require(__DIR__ . '/../../../config.php'); // phpcs:disable moodle.Files.RequireLogin.Missing
 
 // Require the necessary libraries.
 require_once($CFG->dirroot.'/theme/boost_union/lib.php');

diff --git a/settings.php b/settings.php
@@ -108,8 +108,7 @@
     }
 
     // Create full settings page structure.
-    // @codingStandardsIgnoreLine
-    else if ($ADMIN->fulltree) {
+    else if ($ADMIN->fulltree) { // phpcs:disable moodle.ControlStructures.ControlSignature.Found
 
         // Require the necessary libraries.
         require_once($CFG->dirroot . '/theme/boost_union/lib.php');