Skip to content

Remove function validateSearchSynonymsFile and validateSearchIgnoreWo… #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Remove function validateSearchSynonymsFile and validateSearchIgnoreWo… #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f50191
Remove function validateSearchSynonymsFile and validateSearchIgnoreWo…
Crizz0 Sep 25, 2025
abc0d84
Remove tests for search_ignore_words and search_synonyms
Crizz0 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 0 additions & 97 deletions src/Phpbb/TranslationValidator/Validator/FileValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,6 @@ public function validate($sourceFile, $originFile)
{
$this->validateHelpFile($sourceFile, $originFile);
}
else if ($originFile == $this->originLanguagePath . 'search_synonyms.php')
{
$this->validateSearchSynonymsFile($originFile);
}
else if ($originFile == $this->originLanguagePath . 'search_ignore_words.php')
{
$this->validateSearchIgnoreWordsFile($originFile);
}
else if (substr($originFile, -4) === '.php')
{
$this->validateLangFile($sourceFile, $originFile);
Expand Down Expand Up @@ -589,95 +581,6 @@ public function validateHelpFile($sourceFile, $originFile)
}
}

/**
* Validates the search_synonyms.php file
*
* Files must only contain the variable $synonyms.
* This variable must be an array of string => string entries.
*
* @todo Check for template vars and html
*
* @param string $originFile File to validate
* @return null
*/
public function validateSearchSynonymsFile($originFile)
{
$originFilePath = $this->originPath . '/' . $originFile;

if (!$this->safeMode)
{
/** @var $synonyms */
include($originFilePath);

$defined_variables = get_defined_vars();
if (sizeof($defined_variables) != 3 || !isset($defined_variables['synonyms']) || gettype($defined_variables['synonyms']) != 'array')
{
$this->output->addMessage(Output::FATAL, 'Must only contain the synonyms-array', $originFile);
return;
}
}

else
{
/** @var $synonyms */
$synonyms = ValidatorRunner::langParser($originFilePath);
$this->output->addMessage(Output::NOTICE, '<bg=yellow;options=bold>[Safe Mode]</> Manually run the translation validator to check synonym variables.', $originFile);
}

foreach ($synonyms as $synonym1 => $synonym2)
{
if (gettype($synonym1) != 'string' || gettype($synonym2) != 'string')
{
$this->output->addMessage(Output::FATAL, 'Must only contain entries of type string => string: ' . serialize($synonym1) . ' => ' . serialize($synonym2), $originFile);
}
}
}

/**
* Validates the search_ignore_words.php file
*
* Files must only contain the variable $words.
* This variable must be an array of string entries.
*
* @todo Check for template vars and html
*
* @param string $originFile File to validate
* @return null
*/
public function validateSearchIgnoreWordsFile($originFile)
{
$originFilePath = $this->originPath . '/' . $originFile;

if (!$this->safeMode)
{
/** @var $words */
include($originFilePath);

$defined_variables = get_defined_vars();
if (sizeof($defined_variables) != 3 || !isset($defined_variables['words']) || gettype($defined_variables['words']) != 'array')
{
$this->output->addMessage(Output::FATAL, 'Must only contain the words-array', $originFile);
return;
}
}

else
{
/** @var $words */
$words = ValidatorRunner::langParser($originFilePath);
$this->output->addMessage(Output::NOTICE, '<bg=yellow;options=bold>[Safe Mode]</> Manually run the translation validator to check word variables.', $originFile);
}

foreach ($words as $word)
{
if (gettype($word) != 'string')
{
//@todo use $i
$this->output->addMessage(Output::FATAL, 'Must only contain entries of type string: ' . serialize($word), $originFile);
}
}
}

/**
* Validates the LICENSE file
*
Expand Down
72 changes: 0 additions & 72 deletions tests/FileValidator/ValidateSearchTest.php
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions tests/FileValidator/fixtures/origin/search_ignore_words/additional_variable.php
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions tests/FileValidator/fixtures/origin/search_ignore_words/invalid_word.php
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/FileValidator/fixtures/origin/search_ignore_words/invalid_words.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/FileValidator/fixtures/origin/search_ignore_words/no_words.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/FileValidator/fixtures/origin/search_ignore_words/valid.php
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions tests/FileValidator/fixtures/origin/search_synonyms/additional_variable.php
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions tests/FileValidator/fixtures/origin/search_synonyms/invalid_synonym.php
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/FileValidator/fixtures/origin/search_synonyms/invalid_synonyms.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/FileValidator/fixtures/origin/search_synonyms/no_synonyms.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/FileValidator/fixtures/origin/search_synonyms/valid.php
View file
Open in desktop

This file was deleted.