PHP linter looks for phpcs.xml by default. Also removed a couple of exceptions that...

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index bdbd6735d989ce344d10c407e8dea13f9ff31e84..ab6f910c49a543d2c07999cee6afe1520c80368e 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -6,14 +6,15 @@ require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');
 
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');
 

-$aCMDOptions = array(
-        "Import and export special phrases",
-        array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-        array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
-        array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-        array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
-        array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
-);
+$aCMDOptions
+= array(
+   "Import and export special phrases",
+   array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+   array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
+   array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
+   array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
+   array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
+  );

 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 include(CONST_InstallPath.'/settings/phrase_settings.php');
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 include(CONST_InstallPath.'/settings/phrase_settings.php');


@@ -41,23 +42,24 @@ if ($aCMDResult['wiki-import']) {
                 $sLabel = trim($aMatch[1]);
                 $sClass = trim($aMatch[2]);
                 $sType = trim($aMatch[3]);
                 $sLabel = trim($aMatch[1]);
                 $sClass = trim($aMatch[2]);
                 $sType = trim($aMatch[3]);

-                # hack around a bug where building=yes was imported with
-                # quotes into the wiki
+                // hack around a bug where building=yes was imported with
+                // quotes into the wiki

                 $sType = preg_replace('/"/', '', $sType);
                 $sType = preg_replace('/"/', '', $sType);

-                # sanity check, in case somebody added garbage in the wiki
-                if (preg_match('/^\\w+$/', $sClass) < 1 ||
-                    preg_match('/^\\w+$/', $sType) < 1) {
+                // sanity check, in case somebody added garbage in the wiki
+                if (preg_match('/^\\w+$/', $sClass) < 1
+                    || preg_match('/^\\w+$/', $sType) < 1
+                ) {

                     trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
                     exit;
                 }
                     trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
                     exit;
                 }

-                # blacklisting: disallow certain class/type combinations
+                // blacklisting: disallow certain class/type combinations

                 if (isset($aTagsBlacklist[$sClass]) && in_array($sType, $aTagsBlacklist[$sClass])) {
                 if (isset($aTagsBlacklist[$sClass]) && in_array($sType, $aTagsBlacklist[$sClass])) {

-                    # fwrite(STDERR, "Blacklisted: ".$sClass."/".$sType."\n");
+                    // fwrite(STDERR, "Blacklisted: ".$sClass."/".$sType."\n");

                     continue;
                 }
                     continue;
                 }

-                # whitelisting: if class is in whitelist, allow only tags in the list
+                // whitelisting: if class is in whitelist, allow only tags in the list

                 if (isset($aTagsWhitelist[$sClass]) && !in_array($sType, $aTagsWhitelist[$sClass])) {
                 if (isset($aTagsWhitelist[$sClass]) && !in_array($sType, $aTagsWhitelist[$sClass])) {

-                    # fwrite(STDERR, "Non-Whitelisted: ".$sClass."/".$sType."\n");
+                    // fwrite(STDERR, "Non-Whitelisted: ".$sClass."/".$sType."\n");

                     continue;
                 }
                 $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
                     continue;
                 }
                 $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);