From 99f56b9aca239aeecffc47331411a1601cedab81 Mon Sep 17 00:00:00 2001 From: Arandi Lopez Date: Sun, 10 Jan 2021 22:43:22 -0600 Subject: [PATCH 1/5] New strict mode, this fixes #9 --- src/ProfaneServiceProvider.php | 19 ++++---- src/ProfaneValidator.php | 54 ++++++++++++++++------- src/Str.php | 5 ++- tests/ProfaneValidatorTest.php | 29 +++++++++++- tests/StrTest.php | 20 +++++++++ tests/Support/ProfaneValidatorBuilder.php | 6 ++- 6 files changed, 104 insertions(+), 29 deletions(-) diff --git a/src/ProfaneServiceProvider.php b/src/ProfaneServiceProvider.php index a1e70c1..181a4fd 100644 --- a/src/ProfaneServiceProvider.php +++ b/src/ProfaneServiceProvider.php @@ -10,21 +10,24 @@ class ProfaneServiceProvider extends ServiceProvider { public function boot() { - $this->loadTranslationsFrom(__DIR__.'/lang', 'laravel-profane'); + $this->loadTranslationsFrom(__DIR__ . '/lang', 'laravel-profane'); $this->publishes([ - __DIR__.'/lang' => resource_path('lang/vendor/laravel-profane'), + __DIR__ . '/lang' => resource_path('lang/vendor/laravel-profane'), ]); + // Rule for caseless content matching Validator::extend('profane', 'LaravelProfane\ProfaneValidator@validate', Lang::get('laravel-profane::validation.profane')); - Validator::replacer('profane', function ($message, $attribute, $rule, $parameters) { + Validator::replacer('profane', function ($message, $attribute) { + return str_replace(':attribute', $attribute, $message); + }); + + // Rule for caseless but strict word matching + Validator::extend('strictly_profane', 'LaravelProfane\ProfaneValidator@validateStrict', Lang::get('laravel-profane::validation.profane')); + + Validator::replacer('strictly_profane', function ($message, $attribute) { return str_replace(':attribute', $attribute, $message); }); } - - public function register() - { - // code... - } } diff --git a/src/ProfaneValidator.php b/src/ProfaneValidator.php index 5edff30..dbc1d2e 100644 --- a/src/ProfaneValidator.php +++ b/src/ProfaneValidator.php @@ -2,27 +2,19 @@ namespace LaravelProfane; -use Illuminate\Contracts\Validation\Validator; - class ProfaneValidator { /** - * [$dictionary description]. - * - * @var [type] + * @var Dictionary */ protected $dictionary; /** - * [$badwords description]. - * * @var array */ protected $badwords = []; /** - * [__construct description]. - * * @param Dictionary $dictionary [description] */ public function __construct(Dictionary $dictionary) @@ -32,25 +24,41 @@ class ProfaneValidator } /** - * Method to extends to Validator. + * Method to extends to Validation Service. * * @param string $attribute - * @param midex $value + * @param mixed $value * @param array $parameters - * @param \Illuminate\Contracts\Validation\Validator $validator [description] * * @return bool */ public function validate($attribute, $value, $parameters) { if ($parameters) { - $this->dictionary->setDictionary($parameters); - $this->badwords = $this->dictionary->getDictionary(); + $this->setDictionary($parameters); } return !$this->isProfane($value); } + /** + * Method to extends to Validation Service for strict word matching. + * + * @param string $attribute + * @param mixed $value + * @param array $parameters + * + * @return bool + */ + public function validateStrict($attribute, $value, $parameters) + { + if ($parameters) { + $this->setDictionary($parameters); + } + + return !$this->isProfane($value, true); + } + /** * Check profanity of text. * @@ -58,11 +66,23 @@ class ProfaneValidator * * @return bool */ - public function isProfane($text) + public function isProfane($text, $strict = false) { return Str::containsCaseless( - Str::removeAccent($text), - $this->badwords + $this->sanitizeText($text), + $this->badwords, + $strict ); } + + private function setDictionary($dictionaries) + { + $this->dictionary->setDictionary($dictionaries); + $this->badwords = $this->dictionary->getDictionary(); + } + + private function sanitizeText($text) + { + return Str::removeAccent(strip_tags($text)); + } } diff --git a/src/Str.php b/src/Str.php index 1a90e75..df88f0a 100644 --- a/src/Str.php +++ b/src/Str.php @@ -13,11 +13,12 @@ class Str * * @return bool */ - public static function containsCaseless($haystack, $needles) + public static function containsCaseless($haystack, $needles, $strict=false) { foreach ((array) $needles as $needle) { $needle = preg_quote($needle); - if ($needle != '' && preg_match("/$needle/iu", $haystack)) { + $regex = $strict ? "/\b$needle\b/iu" : "/$needle/iu"; + if ($needle != '' && preg_match($regex, $haystack)) { return true; } } diff --git a/tests/ProfaneValidatorTest.php b/tests/ProfaneValidatorTest.php index fa24664..95ffb7f 100644 --- a/tests/ProfaneValidatorTest.php +++ b/tests/ProfaneValidatorTest.php @@ -13,6 +13,13 @@ class ProfaneValidatorTest extends TestCase $this->assertFalse($builder->validate(['username', 'culero23', ['es']])); } + public function test_can_not_validate_a_word_with_numbers_in_strict_mode() + { + $builder = new ProfaneValidatorBuilder(); + + $this->assertTrue($builder->validate(['username', 'culero23', ['es']], true)); + } + public function test_can_validate_a_text() { $builder = new ProfaneValidatorBuilder(); @@ -38,6 +45,15 @@ class ProfaneValidatorTest extends TestCase $this->assertTrue($builder->build()->isProfane($word)); } + public function test_can_evaluate_profanity_of_a_sentence_in_strict_mode() + { + $builder = new ProfaneValidatorBuilder(); + + $word = 'fuck you if you read this'; + + $this->assertTrue($builder->build()->isProfane($word), true); + } + public function test_can_evaluate_profanity_of_a_html_string() { $builder = new ProfaneValidatorBuilder(); @@ -56,7 +72,7 @@ class ProfaneValidatorTest extends TestCase $this->assertTrue($builder->build()->isProfane($word)); } - public function test_match_exact_word() + public function test_match_content() { $builder = new ProfaneValidatorBuilder(); @@ -67,6 +83,17 @@ class ProfaneValidatorTest extends TestCase $this->assertTrue($builder->build()->isProfane('sucker96')); } + public function test_match_exact_word_in_strict_mode() + { + $builder = new ProfaneValidatorBuilder(); + + // class is a safe word + $this->assertFalse($builder->build()->isProfane('class', true)); + + // in strict mode this will pass a safe word + $this->assertFalse($builder->build()->isProfane('sucker96', true)); + } + public function test_can_validate_a_bad_word_with_accent() { $builder = new ProfaneValidatorBuilder('sk'); diff --git a/tests/StrTest.php b/tests/StrTest.php index 963e350..38c4295 100644 --- a/tests/StrTest.php +++ b/tests/StrTest.php @@ -21,6 +21,26 @@ class StrTest extends TestCase $this->assertTrue(Str::containsCaseless('Fuck! This class is so bad!', 'fUcK')); } + public function test_text_does_not_contain_match_in_strict_mode() + { + $this->assertFalse(Str::containsCaseless('This class is so bad!', 'ass', true)); + $this->assertFalse(Str::containsCaseless('Theorem Analisys', 'anal', true)); + } + + public function test_text_contains_match_in_strict_mode() + { + $this->assertTrue(Str::containsCaseless('This class is a crap!', 'crap', true)); + $this->assertFalse(Str::containsCaseless('Theorem Analisys', 'anal', true)); + $this->assertFalse(Str::containsCaseless('Sucker69', 'sucker', true)); + } + + public function test_text_contains_match_in_not_strict_mode() + { + $this->assertTrue(Str::containsCaseless('This class is so bad!', 'ass', false)); + $this->assertTrue(Str::containsCaseless('Theorem Analisys', 'anal', false)); + } + + public function test_text_contains_the_same_insensitive_match_from_string() { $this->assertTrue(Str::containsCaseless('Fuck! This class is so bad!', 'Fuck')); diff --git a/tests/Support/ProfaneValidatorBuilder.php b/tests/Support/ProfaneValidatorBuilder.php index e9f50e7..2056197 100644 --- a/tests/Support/ProfaneValidatorBuilder.php +++ b/tests/Support/ProfaneValidatorBuilder.php @@ -31,10 +31,14 @@ class ProfaneValidatorBuilder * * @return [type] [description] */ - public function validate(array $parameters) + public function validate(array $parameters, $strict = false) { list($attribute, $text, $dictionaries) = $parameters; + if ($strict) { + return $this->build()->validateStrict($attribute, $text, $dictionaries); + } + return $this->build()->validate($attribute, $text, $dictionaries); } From 8a41077665d7b3c11226a1d9d718a0a0ab4a83e9 Mon Sep 17 00:00:00 2001 From: Arandi Lopez Date: Sun, 10 Jan 2021 22:46:09 -0600 Subject: [PATCH 2/5] Remove phpunit cached results --- .phpunit.result.cache | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 318f431..0000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -C:37:"PHPUnit\Runner\DefaultTestResultCache":1921:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:22:{s:67:"LaravelProfaneTests\DictionaryTest::test_words_from_only_one_locale";d:0.006;s:65:"LaravelProfaneTests\DictionaryTest::test_words_from_only_one_file";d:0;s:64:"LaravelProfaneTests\DictionaryTest::test_words_from_locale_array";d:0;s:62:"LaravelProfaneTests\DictionaryTest::test_words_from_file_array";d:0;s:79:"LaravelProfaneTests\ProfaneValidatorTest::test_can_validate_a_word_with_numbers";d:0.001;s:66:"LaravelProfaneTests\ProfaneValidatorTest::test_can_validate_a_text";d:0.001;s:79:"LaravelProfaneTests\ProfaneValidatorTest::test_can_evaluate_profanity_of_a_word";d:0;s:83:"LaravelProfaneTests\ProfaneValidatorTest::test_can_evaluate_profanity_of_a_sentence";d:0;s:86:"LaravelProfaneTests\ProfaneValidatorTest::test_can_evaluate_profanity_of_a_html_string";d:0;s:76:"LaravelProfaneTests\ProfaneValidatorTest::test_can_evaluate_as_caseless_mode";d:0;s:63:"LaravelProfaneTests\ProfaneValidatorTest::test_match_exact_word";d:0;s:82:"LaravelProfaneTests\ProfaneValidatorTest::test_can_validate_a_bad_word_with_accent";d:0;s:75:"LaravelProfaneTests\ProfaneValidatorTest::test_enie_in_spanish_is_evaluated";d:0;s:75:"LaravelProfaneTests\ProfaneValidatorTest::test_can_validate_a_word_in_greek";d:0.001;s:75:"LaravelProfaneTests\ProfaneValidatorTest::test_can_validate_a_text_in_greek";d:0;s:85:"LaravelProfaneTests\StrTest::test_string_contains_a_piece_insensitive_match_from_text";d:0;s:76:"LaravelProfaneTests\StrTest::test_text_contains_insensitive_match_from_array";d:0;s:77:"LaravelProfaneTests\StrTest::test_text_contains_insensitive_match_from_string";d:0;s:86:"LaravelProfaneTests\StrTest::test_text_contains_the_same_insensitive_match_from_string";d:0;s:64:"LaravelProfaneTests\StrTest::test_remove_accents_in_spanish_text";d:0;s:54:"LaravelProfaneTests\StrTest::test_enie_char_is_allowed";d:0;s:57:"LaravelProfaneTests\StrTest::test_remove_accents_in_greek";d:0;}}} \ No newline at end of file From ba2b808b364925a9d653db860be0d3c0dfa5390d Mon Sep 17 00:00:00 2001 From: Arandi Lopez Date: Sun, 10 Jan 2021 22:49:14 -0600 Subject: [PATCH 3/5] Styling Str class --- src/Str.php | 85 +++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/src/Str.php b/src/Str.php index df88f0a..822bcd2 100644 --- a/src/Str.php +++ b/src/Str.php @@ -13,7 +13,8 @@ class Str * * @return bool */ - public static function containsCaseless($haystack, $needles, $strict=false) + + public static function containsCaseless($haystack, $needles, $strict = false) { foreach ((array) $needles as $needle) { $needle = preg_quote($needle); @@ -36,48 +37,48 @@ class Str public static function removeAccent($string) { $replace = [ - 'ъ'=> '-', 'Ь'=>'-', 'Ъ'=>'-', 'ь'=>'-', - 'Ă'=> 'A', 'Ą'=>'A', 'À'=>'A', 'Ã'=>'A', 'Á'=>'A', 'Æ'=>'A', 'Â'=>'A', 'Å'=>'A', 'Ä'=>'Ae', - 'Þ'=> 'B', - 'Ć'=> 'C', 'ץ'=>'C', 'Ç'=>'C', - 'È'=> 'E', 'Ę'=>'E', 'É'=>'E', 'Ë'=>'E', 'Ê'=>'E', - 'Ğ'=> 'G', - 'İ'=> 'I', 'Ï'=>'I', 'Î'=>'I', 'Í'=>'I', 'Ì'=>'I', - 'Ł'=> 'L', - 'Ñ'=> 'N', 'Ń'=>'N', - 'Ø'=> 'O', 'Ó'=>'O', 'Ò'=>'O', 'Ô'=>'O', 'Õ'=>'O', 'Ö'=>'Oe', - 'Ş'=> 'S', 'Ś'=>'S', 'Ș'=>'S', 'Š'=>'S', - 'Ț'=> 'T', - 'Ù'=> 'U', 'Û'=>'U', 'Ú'=>'U', 'Ü'=>'Ue', - 'Ý'=> 'Y', - 'Ź'=> 'Z', 'Ž'=>'Z', 'Ż'=>'Z', - 'â'=> 'a', 'ǎ'=>'a', 'ą'=>'a', 'á'=>'a', 'ă'=>'a', 'ã'=>'a', 'Ǎ'=>'a', 'а'=>'a', 'А'=>'a', 'å'=>'a', 'à'=>'a', 'א'=>'a', 'Ǻ'=>'a', 'Ā'=>'a', 'ǻ'=>'a', 'ā'=>'a', 'ä'=>'ae', 'æ'=>'ae', 'Ǽ'=>'ae', 'ǽ'=>'ae', - 'б'=> 'b', 'ב'=>'b', 'Б'=>'b', 'þ'=>'b', - 'ĉ'=> 'c', 'Ĉ'=>'c', 'Ċ'=>'c', 'ć'=>'c', 'ç'=>'c', 'ц'=>'c', 'צ'=>'c', 'ċ'=>'c', 'Ц'=>'c', 'Č'=>'c', 'č'=>'c', 'Ч'=>'ch', 'ч'=>'ch', - 'ד'=> 'd', 'ď'=>'d', 'Đ'=>'d', 'Ď'=>'d', 'đ'=>'d', 'д'=>'d', 'Д'=>'D', 'ð'=>'d', - 'є'=> 'e', 'ע'=>'e', 'е'=>'e', 'Е'=>'e', 'Ə'=>'e', 'ę'=>'e', 'ĕ'=>'e', 'ē'=>'e', 'Ē'=>'e', 'Ė'=>'e', 'ė'=>'e', 'ě'=>'e', 'Ě'=>'e', 'Є'=>'e', 'Ĕ'=>'e', 'ê'=>'e', 'ə'=>'e', 'è'=>'e', 'ë'=>'e', 'é'=>'e', - 'ф'=> 'f', 'ƒ'=>'f', 'Ф'=>'f', - 'ġ'=> 'g', 'Ģ'=>'g', 'Ġ'=>'g', 'Ĝ'=>'g', 'Г'=>'g', 'г'=>'g', 'ĝ'=>'g', 'ğ'=>'g', 'ג'=>'g', 'Ґ'=>'g', 'ґ'=>'g', 'ģ'=>'g', - 'ח'=> 'h', 'ħ'=>'h', 'Х'=>'h', 'Ħ'=>'h', 'Ĥ'=>'h', 'ĥ'=>'h', 'х'=>'h', 'ה'=>'h', - 'î'=> 'i', 'ï'=>'i', 'í'=>'i', 'ì'=>'i', 'į'=>'i', 'ĭ'=>'i', 'ı'=>'i', 'Ĭ'=>'i', 'И'=>'i', 'ĩ'=>'i', 'ǐ'=>'i', 'Ĩ'=>'i', 'Ǐ'=>'i', 'и'=>'i', 'Į'=>'i', 'י'=>'i', 'Ї'=>'i', 'Ī'=>'i', 'І'=>'i', 'ї'=>'i', 'і'=>'i', 'ī'=>'i', 'ij'=>'ij', 'IJ'=>'ij', - 'й'=> 'j', 'Й'=>'j', 'Ĵ'=>'j', 'ĵ'=>'j', 'я'=>'ja', 'Я'=>'ja', 'Э'=>'je', 'э'=>'je', 'ё'=>'jo', 'Ё'=>'jo', 'ю'=>'ju', 'Ю'=>'ju', - 'ĸ'=> 'k', 'כ'=>'k', 'Ķ'=>'k', 'К'=>'k', 'к'=>'k', 'ķ'=>'k', 'ך'=>'k', - 'Ŀ'=> 'l', 'ŀ'=>'l', 'Л'=>'l', 'ł'=>'l', 'ļ'=>'l', 'ĺ'=>'l', 'Ĺ'=>'l', 'Ļ'=>'l', 'л'=>'l', 'Ľ'=>'l', 'ľ'=>'l', 'ל'=>'l', - 'מ'=> 'm', 'М'=>'m', 'ם'=>'m', 'м'=>'m', + 'ъ' => '-', 'Ь' => '-', 'Ъ' => '-', 'ь' => '-', + 'Ă' => 'A', 'Ą' => 'A', 'À' => 'A', 'Ã' => 'A', 'Á' => 'A', 'Æ' => 'A', 'Â' => 'A', 'Å' => 'A', 'Ä' => 'Ae', + 'Þ' => 'B', + 'Ć' => 'C', 'ץ' => 'C', 'Ç' => 'C', + 'È' => 'E', 'Ę' => 'E', 'É' => 'E', 'Ë' => 'E', 'Ê' => 'E', + 'Ğ' => 'G', + 'İ' => 'I', 'Ï' => 'I', 'Î' => 'I', 'Í' => 'I', 'Ì' => 'I', + 'Ł' => 'L', + 'Ñ' => 'N', 'Ń' => 'N', + 'Ø' => 'O', 'Ó' => 'O', 'Ò' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'Oe', + 'Ş' => 'S', 'Ś' => 'S', 'Ș' => 'S', 'Š' => 'S', + 'Ț' => 'T', + 'Ù' => 'U', 'Û' => 'U', 'Ú' => 'U', 'Ü' => 'Ue', + 'Ý' => 'Y', + 'Ź' => 'Z', 'Ž' => 'Z', 'Ż' => 'Z', + 'â' => 'a', 'ǎ' => 'a', 'ą' => 'a', 'á' => 'a', 'ă' => 'a', 'ã' => 'a', 'Ǎ' => 'a', 'а' => 'a', 'А' => 'a', 'å' => 'a', 'à' => 'a', 'א' => 'a', 'Ǻ' => 'a', 'Ā' => 'a', 'ǻ' => 'a', 'ā' => 'a', 'ä' => 'ae', 'æ' => 'ae', 'Ǽ' => 'ae', 'ǽ' => 'ae', + 'б' => 'b', 'ב' => 'b', 'Б' => 'b', 'þ' => 'b', + 'ĉ' => 'c', 'Ĉ' => 'c', 'Ċ' => 'c', 'ć' => 'c', 'ç' => 'c', 'ц' => 'c', 'צ' => 'c', 'ċ' => 'c', 'Ц' => 'c', 'Č' => 'c', 'č' => 'c', 'Ч' => 'ch', 'ч' => 'ch', + 'ד' => 'd', 'ď' => 'd', 'Đ' => 'd', 'Ď' => 'd', 'đ' => 'd', 'д' => 'd', 'Д' => 'D', 'ð' => 'd', + 'є' => 'e', 'ע' => 'e', 'е' => 'e', 'Е' => 'e', 'Ə' => 'e', 'ę' => 'e', 'ĕ' => 'e', 'ē' => 'e', 'Ē' => 'e', 'Ė' => 'e', 'ė' => 'e', 'ě' => 'e', 'Ě' => 'e', 'Є' => 'e', 'Ĕ' => 'e', 'ê' => 'e', 'ə' => 'e', 'è' => 'e', 'ë' => 'e', 'é' => 'e', + 'ф' => 'f', 'ƒ' => 'f', 'Ф' => 'f', + 'ġ' => 'g', 'Ģ' => 'g', 'Ġ' => 'g', 'Ĝ' => 'g', 'Г' => 'g', 'г' => 'g', 'ĝ' => 'g', 'ğ' => 'g', 'ג' => 'g', 'Ґ' => 'g', 'ґ' => 'g', 'ģ' => 'g', + 'ח' => 'h', 'ħ' => 'h', 'Х' => 'h', 'Ħ' => 'h', 'Ĥ' => 'h', 'ĥ' => 'h', 'х' => 'h', 'ה' => 'h', + 'î' => 'i', 'ï' => 'i', 'í' => 'i', 'ì' => 'i', 'į' => 'i', 'ĭ' => 'i', 'ı' => 'i', 'Ĭ' => 'i', 'И' => 'i', 'ĩ' => 'i', 'ǐ' => 'i', 'Ĩ' => 'i', 'Ǐ' => 'i', 'и' => 'i', 'Į' => 'i', 'י' => 'i', 'Ї' => 'i', 'Ī' => 'i', 'І' => 'i', 'ї' => 'i', 'і' => 'i', 'ī' => 'i', 'ij' => 'ij', 'IJ' => 'ij', + 'й' => 'j', 'Й' => 'j', 'Ĵ' => 'j', 'ĵ' => 'j', 'я' => 'ja', 'Я' => 'ja', 'Э' => 'je', 'э' => 'je', 'ё' => 'jo', 'Ё' => 'jo', 'ю' => 'ju', 'Ю' => 'ju', + 'ĸ' => 'k', 'כ' => 'k', 'Ķ' => 'k', 'К' => 'k', 'к' => 'k', 'ķ' => 'k', 'ך' => 'k', + 'Ŀ' => 'l', 'ŀ' => 'l', 'Л' => 'l', 'ł' => 'l', 'ļ' => 'l', 'ĺ' => 'l', 'Ĺ' => 'l', 'Ļ' => 'l', 'л' => 'l', 'Ľ' => 'l', 'ľ' => 'l', 'ל' => 'l', + 'מ' => 'm', 'М' => 'm', 'ם' => 'm', 'м' => 'm', // 'ñ'=>'n', // for spanish cono != coño - 'н'=> 'n', 'Ņ'=>'n', 'ן'=>'n', 'ŋ'=>'n', 'נ'=>'n', 'Н'=>'n', 'ń'=>'n', - 'Ŋ'=> 'n', 'ņ'=>'n', 'ʼn'=>'n', 'Ň'=>'n', 'ň'=>'n', - 'о'=> 'o', 'О'=>'o', 'ő'=>'o', 'õ'=>'o', 'ô'=>'o', 'Ő'=>'o', 'ŏ'=>'o', 'Ŏ'=>'o', 'Ō'=>'o', 'ō'=>'o', 'ø'=>'o', 'ǿ'=>'o', 'ǒ'=>'o', 'ò'=>'o', 'Ǿ'=>'o', 'Ǒ'=>'o', 'ơ'=>'o', 'ó'=>'o', 'Ơ'=>'o', 'œ'=>'oe', 'Œ'=>'oe', 'ö'=>'oe', - 'פ'=> 'p', 'ף'=>'p', 'п'=>'p', 'П'=>'p', - 'ק'=> 'q', - 'ŕ'=> 'r', 'ř'=>'r', 'Ř'=>'r', 'ŗ'=>'r', 'Ŗ'=>'r', 'ר'=>'r', 'Ŕ'=>'r', 'Р'=>'r', 'р'=>'r', - 'ș'=> 's', 'с'=>'s', 'Ŝ'=>'s', 'š'=>'s', 'ś'=>'s', 'ס'=>'s', 'ş'=>'s', 'С'=>'s', 'ŝ'=>'s', 'Щ'=>'sch', 'щ'=>'sch', 'ш'=>'sh', 'Ш'=>'sh', 'ß'=>'ss', - 'т'=> 't', 'ט'=>'t', 'ŧ'=>'t', 'ת'=>'t', 'ť'=>'t', 'ţ'=>'t', 'Ţ'=>'t', 'Т'=>'t', 'ț'=>'t', 'Ŧ'=>'t', 'Ť'=>'t', '™'=>'tm', - 'ū'=> 'u', 'у'=>'u', 'Ũ'=>'u', 'ũ'=>'u', 'Ư'=>'u', 'ư'=>'u', 'Ū'=>'u', 'Ǔ'=>'u', 'ų'=>'u', 'Ų'=>'u', 'ŭ'=>'u', 'Ŭ'=>'u', 'Ů'=>'u', 'ů'=>'u', 'ű'=>'u', 'Ű'=>'u', 'Ǖ'=>'u', 'ǔ'=>'u', 'Ǜ'=>'u', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'У'=>'u', 'ǚ'=>'u', 'ǜ'=>'u', 'Ǚ'=>'u', 'Ǘ'=>'u', 'ǖ'=>'u', 'ǘ'=>'u', 'ü'=>'ue', - 'в'=> 'v', 'ו'=>'v', 'В'=>'v', - 'ש'=> 'w', 'ŵ'=>'w', 'Ŵ'=>'w', - 'ы'=> 'y', 'ŷ'=>'y', 'ý'=>'y', 'ÿ'=>'y', 'Ÿ'=>'y', 'Ŷ'=>'y', - 'Ы'=> 'y', 'ž'=>'z', 'З'=>'z', 'з'=>'z', 'ź'=>'z', 'ז'=>'z', 'ż'=>'z', 'ſ'=>'z', 'Ж'=>'zh', 'ж'=>'zh', 'ά' => 'α', 'έ' => 'ε', 'ή' => 'η', 'ί' => 'ι', 'ό' => 'ο', 'ύ' => 'υ', 'ώ' => 'ω', + 'н' => 'n', 'Ņ' => 'n', 'ן' => 'n', 'ŋ' => 'n', 'נ' => 'n', 'Н' => 'n', 'ń' => 'n', + 'Ŋ' => 'n', 'ņ' => 'n', 'ʼn' => 'n', 'Ň' => 'n', 'ň' => 'n', + 'о' => 'o', 'О' => 'o', 'ő' => 'o', 'õ' => 'o', 'ô' => 'o', 'Ő' => 'o', 'ŏ' => 'o', 'Ŏ' => 'o', 'Ō' => 'o', 'ō' => 'o', 'ø' => 'o', 'ǿ' => 'o', 'ǒ' => 'o', 'ò' => 'o', 'Ǿ' => 'o', 'Ǒ' => 'o', 'ơ' => 'o', 'ó' => 'o', 'Ơ' => 'o', 'œ' => 'oe', 'Œ' => 'oe', 'ö' => 'oe', + 'פ' => 'p', 'ף' => 'p', 'п' => 'p', 'П' => 'p', + 'ק' => 'q', + 'ŕ' => 'r', 'ř' => 'r', 'Ř' => 'r', 'ŗ' => 'r', 'Ŗ' => 'r', 'ר' => 'r', 'Ŕ' => 'r', 'Р' => 'r', 'р' => 'r', + 'ș' => 's', 'с' => 's', 'Ŝ' => 's', 'š' => 's', 'ś' => 's', 'ס' => 's', 'ş' => 's', 'С' => 's', 'ŝ' => 's', 'Щ' => 'sch', 'щ' => 'sch', 'ш' => 'sh', 'Ш' => 'sh', 'ß' => 'ss', + 'т' => 't', 'ט' => 't', 'ŧ' => 't', 'ת' => 't', 'ť' => 't', 'ţ' => 't', 'Ţ' => 't', 'Т' => 't', 'ț' => 't', 'Ŧ' => 't', 'Ť' => 't', '™' => 'tm', + 'ū' => 'u', 'у' => 'u', 'Ũ' => 'u', 'ũ' => 'u', 'Ư' => 'u', 'ư' => 'u', 'Ū' => 'u', 'Ǔ' => 'u', 'ų' => 'u', 'Ų' => 'u', 'ŭ' => 'u', 'Ŭ' => 'u', 'Ů' => 'u', 'ů' => 'u', 'ű' => 'u', 'Ű' => 'u', 'Ǖ' => 'u', 'ǔ' => 'u', 'Ǜ' => 'u', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'У' => 'u', 'ǚ' => 'u', 'ǜ' => 'u', 'Ǚ' => 'u', 'Ǘ' => 'u', 'ǖ' => 'u', 'ǘ' => 'u', 'ü' => 'ue', + 'в' => 'v', 'ו' => 'v', 'В' => 'v', + 'ש' => 'w', 'ŵ' => 'w', 'Ŵ' => 'w', + 'ы' => 'y', 'ŷ' => 'y', 'ý' => 'y', 'ÿ' => 'y', 'Ÿ' => 'y', 'Ŷ' => 'y', + 'Ы' => 'y', 'ž' => 'z', 'З' => 'z', 'з' => 'z', 'ź' => 'z', 'ז' => 'z', 'ż' => 'z', 'ſ' => 'z', 'Ж' => 'zh', 'ж' => 'zh', 'ά' => 'α', 'έ' => 'ε', 'ή' => 'η', 'ί' => 'ι', 'ό' => 'ο', 'ύ' => 'υ', 'ώ' => 'ω', ]; return strtr($string, $replace); From 0b325d6f6290386b1a07b8a352616a5bb4aa4266 Mon Sep 17 00:00:00 2001 From: Arandi Lopez Date: Sun, 10 Jan 2021 22:57:12 -0600 Subject: [PATCH 4/5] Update README for strict mode --- README.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 10ebfce..e450226 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,13 @@ I made this package to perform a validation for swearwords using Laravel validat ## Installation Install via composer + ```shell composer require arandilopez/laravel-profane ``` ## Configuration + Add the `ProfaneServiceProvider` class in your `config/app.php` file. ```php @@ -98,10 +100,34 @@ class MyController extends Controller } ``` +#### Strict validation + +Now you can strictly validate the exact profane word in the content. + +```php +validate($request, [ + 'username' => 'required|strictly_profane:es,en' + ]); + + // ... + } +} +``` + +This fixes known issues when you get a error in validation for words like `class` or `analysis`, as they include `ass` and `anal` respectively, but fails the validation for content like `sucker69`. + ## Getting Help + If you're stuck getting something to work, or need to report a bug, please [post an issue in the Github Issues for this project](https://github.com/arandilopez/laravel-profane/issues). ## Contributing + If you're interesting in contributing code to this project, clone it by running: ```shell @@ -112,9 +138,10 @@ Please read the [CONTRIBUTING](CONTRIBUTING.md) file. Pull requests are welcome, but please make sure you provide unit tests to cover your changes. **You can help to add and support more locales!** -*Thanks to [@dorianneto](https://github.com/dorianneto) for his contributions.* +_Thanks to [@dorianneto](https://github.com/dorianneto) for his contributions._ ### Supported Locales + - English ( provided by [@arandilopez](https://github.com/arandilopez) ) - Spanish ( provided by [@arandilopez](https://github.com/arandilopez) and [@xDidier901](https://github.com/xDidier901)) - Italian ( provided by [@aletundo](https://github.com/aletundo) ) @@ -131,4 +158,5 @@ Pull requests are welcome, but please make sure you provide unit tests to cover - Indonesian ( provided by [@rizasaputra](https://github.com/rizasaputra) ) ## License + This project is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). From 03eb1459eef2cbbe141edcd9dd0e327a13e9204f Mon Sep 17 00:00:00 2001 From: arandilopez Date: Mon, 11 Jan 2021 05:04:40 +0000 Subject: [PATCH 5/5] Apply fixes from StyleCI --- src/ProfaneServiceProvider.php | 4 ++-- src/ProfaneValidator.php | 12 ++++++------ src/Str.php | 1 - tests/StrTest.php | 1 - 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/ProfaneServiceProvider.php b/src/ProfaneServiceProvider.php index 181a4fd..8ca8eb0 100644 --- a/src/ProfaneServiceProvider.php +++ b/src/ProfaneServiceProvider.php @@ -10,10 +10,10 @@ class ProfaneServiceProvider extends ServiceProvider { public function boot() { - $this->loadTranslationsFrom(__DIR__ . '/lang', 'laravel-profane'); + $this->loadTranslationsFrom(__DIR__.'/lang', 'laravel-profane'); $this->publishes([ - __DIR__ . '/lang' => resource_path('lang/vendor/laravel-profane'), + __DIR__.'/lang' => resource_path('lang/vendor/laravel-profane'), ]); // Rule for caseless content matching diff --git a/src/ProfaneValidator.php b/src/ProfaneValidator.php index dbc1d2e..5dcf43e 100644 --- a/src/ProfaneValidator.php +++ b/src/ProfaneValidator.php @@ -26,9 +26,9 @@ class ProfaneValidator /** * Method to extends to Validation Service. * - * @param string $attribute - * @param mixed $value - * @param array $parameters + * @param string $attribute + * @param mixed $value + * @param array $parameters * * @return bool */ @@ -44,9 +44,9 @@ class ProfaneValidator /** * Method to extends to Validation Service for strict word matching. * - * @param string $attribute - * @param mixed $value - * @param array $parameters + * @param string $attribute + * @param mixed $value + * @param array $parameters * * @return bool */ diff --git a/src/Str.php b/src/Str.php index 822bcd2..04b66cd 100644 --- a/src/Str.php +++ b/src/Str.php @@ -13,7 +13,6 @@ class Str * * @return bool */ - public static function containsCaseless($haystack, $needles, $strict = false) { foreach ((array) $needles as $needle) { diff --git a/tests/StrTest.php b/tests/StrTest.php index 38c4295..a7427ca 100644 --- a/tests/StrTest.php +++ b/tests/StrTest.php @@ -40,7 +40,6 @@ class StrTest extends TestCase $this->assertTrue(Str::containsCaseless('Theorem Analisys', 'anal', false)); } - public function test_text_contains_the_same_insensitive_match_from_string() { $this->assertTrue(Str::containsCaseless('Fuck! This class is so bad!', 'Fuck'));