Passed
Pull Request — master (#2)
by Akpé Aurelle Emmanuel Moïse
01:34
created
tests/Similar_textTest.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@
 block discarded – undo
16 16
             $this->assertTrue(0.0===similarText('qwerty', ';lkjhg'));
17 17
             $this->assertTrue(haveSameRoot('qwerty', 'qwertyuiop'));
18 18
             $this->assertTrue(wordsReorderOccured('joker is a cloon.', 'a cloon is joker'));
19
-			$this->assertTrue(similarButNotEqual('qwerty', 'ytrewq'));
20
-			$this->assertTrue(StrippedUrl('yahoo.com', 'yahoo'));
21
-			$this->assertTrue(acronymorExpanded('p.d.a', 'personal digital assistant'));
22
-			$this->assertTrue(wordsAddedOrRemoved('personal digital', 'personal digital assistant'));
19
+            $this->assertTrue(similarButNotEqual('qwerty', 'ytrewq'));
20
+            $this->assertTrue(StrippedUrl('yahoo.com', 'yahoo'));
21
+            $this->assertTrue(acronymorExpanded('p.d.a', 'personal digital assistant'));
22
+            $this->assertTrue(wordsAddedOrRemoved('personal digital', 'personal digital assistant'));
23 23
         }
24 24
     }
25 25
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace Ezama\tests{
3
-    require($dir=dirname(__DIR__)).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'similar_text.php';
3
+    require($dir = dirname(__DIR__)).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'similar_text.php';
4 4
     require $dir.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'commonTextSimilarities.php';
5 5
     require $dir.DIRECTORY_SEPARATOR.'similar_text.php';
6 6
 
@@ -10,10 +10,10 @@  discard block
 block discarded – undo
10 10
     {
11 11
         public function testSimilarText()
12 12
         {
13
-            $this->assertTrue(100.0===similarText('qwerty', 'ytrewq'));
14
-            $this->assertTrue(similarText('qwerty', 'ytreq')>=80);
13
+            $this->assertTrue(100.0 === similarText('qwerty', 'ytrewq'));
14
+            $this->assertTrue(similarText('qwerty', 'ytreq') >= 80);
15 15
             $this->assertTrue(areAnagrams('qwerty', 'ytrewq'));
16
-            $this->assertTrue(0.0===similarText('qwerty', ';lkjhg'));
16
+            $this->assertTrue(0.0 === similarText('qwerty', ';lkjhg'));
17 17
             $this->assertTrue(haveSameRoot('qwerty', 'qwertyuiop'));
18 18
             $this->assertTrue(wordsReorderOccured('joker is a cloon.', 'a cloon is joker'));
19 19
 			$this->assertTrue(similarButNotEqual('qwerty', 'ytrewq'));
Please login to merge, or discard this patch.
src/commonTextSimilarities.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,8 +159,8 @@
 block discarded – undo
159 159
             
160 160
             $a = array_filter(self::getParts(self::strtolower($a)), $filter);
161 161
             $b = array_filter(self::getParts(self::strtolower($b)), $filter);
162
-			$ca=count($a);
163
-			$cb=count($b);
162
+            $ca=count($a);
163
+            $cb=count($b);
164 164
             return (bool)(($ca>$cb)?array_diff_assoc(array_values($a), array_values($b)):array_diff_assoc(array_values($b), array_values($a)));
165 165
         }
166 166
     }
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -15,39 +15,39 @@  discard block
 block discarded – undo
15 15
     
16 16
     class commonTextSimilarities extends similar_text
17 17
     {
18
-        const URL_FORMAT_EXTENDED_PATTERN = '/^((https?|ftps?|file):\/\/){0,1}'. // protocol
19
-                                            '(([a-z0-9$_\.\+!\*\'\(\),;\?&=-]|%[0-9a-f]{2})+'. // username
20
-                                            '(:([a-z0-9$_\.\+!\*\'\(\),;\?&=-]|%[0-9a-f]{2})+)?'. // password
21
-                                            '@)?(?#'. // auth requires @
22
-                                            ')((([a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*'. // domain segments AND
23
-                                            '[a-z][a-z0-9-]*[a-z0-9]'. // top level domain OR
18
+        const URL_FORMAT_EXTENDED_PATTERN = '/^((https?|ftps?|file):\/\/){0,1}'.// protocol
19
+                                            '(([a-z0-9$_\.\+!\*\'\(\),;\?&=-]|%[0-9a-f]{2})+'.// username
20
+                                            '(:([a-z0-9$_\.\+!\*\'\(\),;\?&=-]|%[0-9a-f]{2})+)?'.// password
21
+                                            '@)?(?#'.// auth requires @
22
+                                            ')((([a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*'.// domain segments AND
23
+                                            '[a-z][a-z0-9-]*[a-z0-9]'.// top level domain OR
24 24
                                             '|((\d|[1-9]\d|1\d{2}|2[0-4][0-9]|25[0-5])\.){3}'.
25
-                                            '(\d|[1-9]\d|1\d{2}|2[0-4][0-9]|25[0-5])'. // IP address
26
-                                            ')(:\d+)?'. // port
27
-                                            ')(((\/+([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)*'. // path
28
-                                            '(\?([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)'. // query string
29
-                                            '?)?)?'. // path and query string optional
30
-                                            '(#([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)?'. // fragment
25
+                                            '(\d|[1-9]\d|1\d{2}|2[0-4][0-9]|25[0-5])'.// IP address
26
+                                            ')(:\d+)?'.// port
27
+                                            ')(((\/+([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)*'.// path
28
+                                            '(\?([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)'.// query string
29
+                                            '?)?)?'.// path and query string optional
30
+                                            '(#([a-z0-9$_\.\+!\*\'\(\),;:@&=-]|%[0-9a-f]{2})*)?'.// fragment
31 31
                                             '$/i';
32 32
 
33 33
 
34 34
 
35 35
 
36
-        const URL_POSIX_FORMAT='"^(\b(https?|ftps?|file):\/\/)?[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]$"i';
36
+        const URL_POSIX_FORMAT = '"^(\b(https?|ftps?|file):\/\/)?[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]$"i';
37 37
         
38
-        protected static function isUrl($url, &$getDomain='')
38
+        protected static function isUrl($url, &$getDomain = '')
39 39
         {
40
-            $bool= is_string($url)&&preg_match(self::URL_POSIX_FORMAT, $url)&&preg_match(self::URL_FORMAT_EXTENDED_PATTERN, $url, $matches)/*?true:false*/;
41
-            $getDomain=rtrim($matches[9], '.');
40
+            $bool = is_string($url) && preg_match(self::URL_POSIX_FORMAT, $url) && preg_match(self::URL_FORMAT_EXTENDED_PATTERN, $url, $matches)/*?true:false*/;
41
+            $getDomain = rtrim($matches[9], '.');
42 42
             return $bool;
43 43
         }
44 44
         
45 45
         public static function strippedUrl($a, $b)
46 46
         {
47
-            if (self::isUrl($a, $domain)&&is_string($b)) {
48
-                return $domain===trim($b);
49
-            } elseif (self::isUrl($b, $domain)&&is_string($a)) {
50
-                return $domain===trim($a);
47
+            if (self::isUrl($a, $domain) && is_string($b)) {
48
+                return $domain === trim($b);
49
+            } elseif (self::isUrl($b, $domain) && is_string($a)) {
50
+                return $domain === trim($a);
51 51
             } else {
52 52
                 return false;
53 53
             }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         
56 56
         public static function areAnagrams($a, $b)
57 57
         {
58
-            return  self::similarText($a, $b, 2, true, $check)&&$check['similar'] === 100.0 && $check['contain'] === true;
58
+            return  self::similarText($a, $b, 2, true, $check) && $check['similar'] === 100.0 && $check['contain'] === true;
59 59
         }
60 60
         
61 61
         public static function similarButNotEqual($a, $b)
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         
66 66
         public static function aIsSuperStringOfB($a, $b)
67 67
         {
68
-            if (strlen($a)>strlen($b)) {
68
+            if (strlen($a) > strlen($b)) {
69 69
                 return   self::similarText($a, $b, 2, true, $check) && is_array($check) && $check['substr'] === 100.0;
70 70
             } else {
71 71
                 return false;
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         
75 75
         public static function haveSameRoot($a, $b)
76 76
         {
77
-            return self::similarText($a, $b, 2, true, $check, true, true) && is_array($check)&&range(0, count($check['a&b'])-1)===array_keys($check['a&b'])/*?true:false*/;
77
+            return self::similarText($a, $b, 2, true, $check, true, true) && is_array($check) && range(0, count($check['a&b']) - 1) === array_keys($check['a&b'])/*?true:false*/;
78 78
         }
79 79
         
80 80
         public static function areStems($a, $b)
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
             return true;
94 94
         }
95 95
         
96
-        public static function wordsReorderOccured($a, $b, $considerPunctuation=true)
96
+        public static function wordsReorderOccured($a, $b, $considerPunctuation = true)
97 97
         {
98
-            $filter=function ($v) use ($considerPunctuation) {
99
-                return $considerPunctuation?!(ctype_space($v)||ctype_punct($v)):!ctype_space($v);
98
+            $filter = function($v) use ($considerPunctuation) {
99
+                return $considerPunctuation ? !(ctype_space($v) || ctype_punct($v)) : !ctype_space($v);
100 100
             };
101 101
             return
102 102
                     self::similarText($a, $b, 2, true, $check, true) &&
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
                     :false;
110 110
         }
111 111
         
112
-        public static function punctuactionChangesOccured($a, $b, $insensitive=true, $considerSpace=true)
112
+        public static function punctuactionChangesOccured($a, $b, $insensitive = true, $considerSpace = true)
113 113
         {
114
-            $filter=function ($v) use ($considerSpace) {
115
-                return $considerSpace?!(ctype_space($v)||ctype_punct($v)):!ctype_punct($v);
114
+            $filter = function($v) use ($considerSpace) {
115
+                return $considerSpace ? !(ctype_space($v) || ctype_punct($v)) : !ctype_punct($v);
116 116
             };
117 117
             if (!is_string($a) || !is_string($b)) {
118 118
                 return false;
@@ -134,14 +134,14 @@  discard block
 block discarded – undo
134 134
             if (!is_string($a) || !is_string($b)) {
135 135
                 return false;
136 136
             }
137
-            $filter=function ($v) {
138
-                return !(ctype_space($v)||ctype_punct($v));
137
+            $filter = function($v) {
138
+                return !(ctype_space($v) || ctype_punct($v));
139 139
             };
140 140
             
141 141
             $a = array_filter(self::getParts(self::strtolower($a)), $filter);
142 142
             $b = array_filter(self::getParts(self::strtolower($b)), $filter);
143 143
             foreach ($a as $index=>$word) {
144
-                if (!self::haveSameRoot($word, $b[$index])||(isset($a[$index][2])&&isset($b[$index][2]))) {
144
+                if (!self::haveSameRoot($word, $b[$index]) || (isset($a[$index][2]) && isset($b[$index][2]))) {
145 145
                     return false;
146 146
                 }
147 147
             }
@@ -153,15 +153,15 @@  discard block
 block discarded – undo
153 153
             if (!is_string($a) || !is_string($b)) {
154 154
                 return false;
155 155
             }
156
-            $filter=function ($v) {
156
+            $filter = function($v) {
157 157
                 return !(ctype_space($v));
158 158
             };
159 159
             
160 160
             $a = array_filter(self::getParts(self::strtolower($a)), $filter);
161 161
             $b = array_filter(self::getParts(self::strtolower($b)), $filter);
162
-			$ca=count($a);
163
-			$cb=count($b);
164
-            return (bool)(($ca>$cb)?array_diff_assoc(array_values($a), array_values($b)):array_diff_assoc(array_values($b), array_values($a)));
162
+			$ca = count($a);
163
+			$cb = count($b);
164
+            return (bool) (($ca > $cb) ?array_diff_assoc(array_values($a), array_values($b)) : array_diff_assoc(array_values($b), array_values($a)));
165 165
         }
166 166
     }
167 167
 }
Please login to merge, or discard this patch.
src/similar_text.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
         private function __construct()
18 18
         {
19 19
         }
20
-        public static function similarText($a, $b, $round = 2, $insensitive = true, &$stats = false, $getParts = false, $checkposition=false)
20
+        public static function similarText($a, $b, $round = 2, $insensitive = true, &$stats = false, $getParts = false, $checkposition = false)
21 21
         {
22 22
             if (!is_string($a) || !is_string($b)) {
23 23
                 return false;
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
             return $stats['similar'];
44 44
         }
45 45
         
46
-        protected static function _check($a, $b, $getParts, $round, $checkposition=false)
46
+        protected static function _check($a, $b, $getParts, $round, $checkposition = false)
47 47
         {
48 48
             $diff = array();
49 49
             if ($getParts) {
50 50
                 $diff[] = array_diff($a, $b);
51 51
                 $diff[] = array_diff($b, $a);
52 52
             }
53
-            $diff[] = $checkposition?array_intersect_assoc($a, $b):array_intersect($a, $b);
53
+            $diff[] = $checkposition ?array_intersect_assoc($a, $b) : array_intersect($a, $b);
54 54
             $diff[] = round(count(array_intersect(self::getParts($a, $c), self::getParts($b))) / $c * 100, $round);
55 55
             $diff[] = $a === $b;
56 56
             return $diff;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
             $tmp = '';
83 83
             $c = 0;
84 84
             foreach ($b as $k=>$v) {
85
-                if (ctype_space($v)||ctype_punct($v)) {
85
+                if (ctype_space($v) || ctype_punct($v)) {
86 86
                     $parts[] = $tmp;
87 87
                     $parts[] = $v;
88 88
                     $c += 2;
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
             if (is_array($split)) {
116 116
                 return
117 117
                     array_map(
118
-                        function ($val) {
118
+                        function($val) {
119 119
                             if (self::is_ascii($val)) {
120 120
                                 return strtolower($val);
121 121
                             }
Please login to merge, or discard this patch.
similar_text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $insensitive = true,
21 21
         &$stats = false,
22 22
         $getParts = false,
23
-        $checkposition=false
23
+        $checkposition = false
24 24
                         ) {
25 25
         return similar_text::similarText(
26 26
             $firstString,
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
         return commonTextSimilarities::haveSameRoot($a, $b);
53 53
     }
54 54
     
55
-    function wordsReorderOccured($a, $b, $considerPunctuation=true)
55
+    function wordsReorderOccured($a, $b, $considerPunctuation = true)
56 56
     {
57 57
         return commonTextSimilarities::wordsReorderOccured($a, $b, $considerPunctuation);
58 58
     }
59 59
     
60
-    function punctuactionChangesOccured($a, $b, $considerSpace=true)
60
+    function punctuactionChangesOccured($a, $b, $considerSpace = true)
61 61
     {
62 62
         return commonTextSimilarities::punctuactionChangesOccured($a, $b, $considerSpace);
63 63
     }
Please login to merge, or discard this patch.