Merge pull request #38 from VincentLanglet/fix

VincentLanglet · web-flow · commit 5dc14fb2b3a7 · 2019-04-23T17:38:01.000+02:00
🐛 Fix to handle utf8
diff --git a/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php b/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -284,7 +284,7 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $
         if (false === $indent) {
             $currentIndent = 0;
         } else {
-            $currentIndent = strlen($tokens[$indent]['content']);
+            $currentIndent = mb_strlen($tokens[$indent]['content']);
         }
 
         // Check the closing bracket is on a new line.
@@ -462,7 +462,7 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $
                     );
                 }
 
-                $indexLength = strlen($currentEntry['index_content']);
+                $indexLength = mb_strlen($currentEntry['index_content']);
                 if ($maxLength < $indexLength) {
                     $maxLength = $indexLength;
                 }
@@ -652,9 +652,9 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $
             }
 
             if ($tokens[$index['arrow']]['column'] !== $arrowStart) {
-                $expected = ($arrowStart - (strlen($index['index_content']) + $tokens[$index['index']]['column']));
+                $expected = ($arrowStart - (mb_strlen($index['index_content']) + $tokens[$index['index']]['column']));
                 $found    = $tokens[$index['arrow']]['column']
-                    - (strlen($index['index_content']) + $tokens[$index['index']]['column']);
+                    - (mb_strlen($index['index_content']) + $tokens[$index['index']]['column']);
 
                 if ($found < 0) {
                     $found = 'newline';
diff --git a/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc b/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc
@@ -69,5 +69,32 @@ class TestClass
             ),
             'short_name' => 'big'
         );
+
+        $utf8 = array(
+            '/[áàâãªäå]/u' => 'a',
+            '/[ÁÀÂÃÄÅ]/u'  => 'A',
+            '/[ÍÌÎÏ]/u'    => 'I',
+            '/[íìîï]/u'    => 'i',
+            '/[éèêë]/u'    => 'e',
+            '/[ÉÈÊË]/u'    => 'E',
+            '/[óòôõºöø]/u' => 'o',
+            '/[ÓÒÔÕÖØ]/u'  => 'O',
+            '/ÿ/'          => 'y',
+            '/Ÿ/'          => 'Y',
+            '/æ/'          => 'ae',
+            '/Æ/'          => 'AE',
+            '/œ/'          => 'oe',
+            '/Œ/'          => 'OE',
+            '/[úùûü]/u'    => 'u',
+            '/[ÚÙÛÜ]/u'    => 'U',
+            '/ç/'          => 'c',
+            '/Ç/'          => 'C',
+            '/ñ/'          => 'n',
+            '/Ñ/'          => 'N',
+            '/–/'          => '-',
+            '/[’‘‹›‚]/u'   => ' ',
+            '/[“”«»„]/u'   => ' ',
+            '/ +/'         => ' ',
+        );
     }
 }
diff --git a/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed b/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed
@@ -69,5 +69,32 @@ class TestClass
             ),
             'short_name' => 'big',
         );
+
+        $utf8 = array(
+            '/[áàâãªäå]/u' => 'a',
+            '/[ÁÀÂÃÄÅ]/u'  => 'A',
+            '/[ÍÌÎÏ]/u'    => 'I',
+            '/[íìîï]/u'    => 'i',
+            '/[éèêë]/u'    => 'e',
+            '/[ÉÈÊË]/u'    => 'E',
+            '/[óòôõºöø]/u' => 'o',
+            '/[ÓÒÔÕÖØ]/u'  => 'O',
+            '/ÿ/'          => 'y',
+            '/Ÿ/'          => 'Y',
+            '/æ/'          => 'ae',
+            '/Æ/'          => 'AE',
+            '/œ/'          => 'oe',
+            '/Œ/'          => 'OE',
+            '/[úùûü]/u'    => 'u',
+            '/[ÚÙÛÜ]/u'    => 'U',
+            '/ç/'          => 'c',
+            '/Ç/'          => 'C',
+            '/ñ/'          => 'n',
+            '/Ñ/'          => 'N',
+            '/–/'          => '-',
+            '/[’‘‹›‚]/u'   => ' ',
+            '/[“”«»„]/u'   => ' ',
+            '/ +/'         => ' ',
+        );
     }
 }
diff --git a/build.properties b/build.properties
@@ -2,6 +2,9 @@
 composer.url = http://getcomposer.org/composer.phar
 composer.path = ${basedir}/composer.phar
 
+# Php Unit
+phpunit.bin = ${basedir}/vendor/bin/phpunit
+
 # PHP Code Sniffer
 ## Paths
 phpcs.bin = ${basedir}/vendor/bin/phpcs
diff --git a/build.xml b/build.xml
@@ -7,8 +7,9 @@
     <target name="test" depends="vendor,lint,phpunit,phpcs"/>
 
     <target name="vendor" depends="composer" description="Load composer repositories">
-        <exec executable="composer" failonerror="true">
-            <arg value="install"/>
+        <exec executable="/bin/bash" failonerror="true">
+            <arg value="-c" />
+            <arg value="php composer.phar install"/>
         </exec>
     </target>
 
@@ -27,7 +28,7 @@
     </target>
 
     <target name="phpunit" depends="symlink-cs" description="Run unit tests with PHPUnit">
-        <exec executable="phpunit" failonerror="true" >
+        <exec executable="${phpunit.bin}" failonerror="true" >
             <arg value="--verbose"/>
             <arg value="--group=SymfonyCustom"/>
             <arg value="${phpcs.dir}/tests/AllTests.php"/>
diff --git a/composer.json b/composer.json
@@ -17,5 +17,8 @@
     ],
     "require": {
         "squizlabs/php_codesniffer": "3.0.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $`
`284`	`284`	`if (false === $indent) {`
`285`	`285`	`$currentIndent = 0;`
`286`	`286`	`} else {`
`287`		`- $currentIndent = strlen($tokens[$indent]['content']);`
	`287`	`+ $currentIndent = mb_strlen($tokens[$indent]['content']);`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`// Check the closing bracket is on a new line.`
`@@ -462,7 +462,7 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $`
`462`	`462`	`);`
`463`	`463`	`}`
`464`	`464`
`465`		`- $indexLength = strlen($currentEntry['index_content']);`
	`465`	`+ $indexLength = mb_strlen($currentEntry['index_content']);`
`466`	`466`	`if ($maxLength < $indexLength) {`
`467`	`467`	`$maxLength = $indexLength;`
`468`	`468`	`}`
`@@ -652,9 +652,9 @@ public function processMultiLineArray(File $phpcsFile, $stackPtr, $arrayStart, $`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`if ($tokens[$index['arrow']]['column'] !== $arrowStart) {`
`655`		`- $expected = ($arrowStart - (strlen($index['index_content']) + $tokens[$index['index']]['column']));`
	`655`	`+ $expected = ($arrowStart - (mb_strlen($index['index_content']) + $tokens[$index['index']]['column']));`
`656`	`656`	`$found = $tokens[$index['arrow']]['column']`
`657`		`- - (strlen($index['index_content']) + $tokens[$index['index']]['column']);`
	`657`	`+ - (mb_strlen($index['index_content']) + $tokens[$index['index']]['column']);`
`658`	`658`
`659`	`659`	`if ($found < 0) {`
`660`	`660`	`$found = 'newline';`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,8 @@`
`17`	`17`	`],`
`18`	`18`	`"require": {`
`19`	`19`	`"squizlabs/php_codesniffer": "3.0.*"`
	`20`	`+ },`
	`21`	`+ "require-dev": {`
	`22`	`+ "phpunit/phpunit": "~4.0"`
`20`	`23`	`}`
`21`	`24`	`}`