code style

Author: Oscar Otero

.php_cs.dist

@@ -0,0 +1,11 @@
+<?php
+
+return My\PhpCsFixerConfig::create()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->files()
+            ->name('*.php')
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
+            ->exclude('assets')
+    );

composer.json

@@ -24,7 +24,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.0",
+        "oscarotero/php-cs-fixer-config": "^1.0",
+        "friendsofphp/php-cs-fixer": "^2.15"
     },
     "autoload": {
         "psr-4": {
@@ -41,6 +43,6 @@
             "phpunit",
             "phpcs"
         ],
-        "codefix": "phpcbf"
+        "cs-fix": "php-cs-fixer fix"
     }
 }

src/PhpFunctionsScanner.php

@@ -3,10 +3,9 @@
 
 namespace Gettext\Scanner;
 
+use PhpParser\NodeTraverser;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
-use PhpParser\NodeTraverser;
-use PhpParser\NodeDumper;
 
 class PhpFunctionsScanner implements FunctionsScannerInterface
 {
@@ -16,7 +15,7 @@ class PhpFunctionsScanner implements FunctionsScannerInterface
     public function __construct(array $validFunctions = null, Parser $parser = null)
     {
         $this->validFunctions = $validFunctions;
-        $this->parser = $parser ?: (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
+        $this->parser = $parser ?: (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
     }
 
     public function scan(string $code, string $filename = null): array

src/PhpNodeVisitor.php

@@ -3,11 +3,10 @@
 
 namespace Gettext\Scanner;
 
-use PhpParser\NodeVisitor;
+use PhpParser\Comment;
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Stmt\Nop;
-use PhpParser\Comment;
+use PhpParser\NodeVisitor;
 
 class PhpNodeVisitor implements NodeVisitor
 {
@@ -30,7 +29,7 @@ public function enterNode(Node $node)
     {
         if ($node instanceof FuncCall) {
             $name = $node->name->getLast();
-    
+
             if ($this->validFunctions === null || in_array($name, $this->validFunctions)) {
                 $this->functions[] = $this->createFunction($node);
             }
@@ -66,7 +65,7 @@ protected function createFunction(FuncCall $node): ParsedFunction
             $node->getEndLine()
         );
 
-        foreach($node->getComments() as $comment) {
+        foreach ($node->getComments() as $comment) {
             $function->addComment(static::getComment($comment));
         }
 
@@ -83,7 +82,6 @@ protected function createFunction(FuncCall $node): ParsedFunction
                 case 'Scalar_DNumber':
                     $function->addArgument($value->value);
                     break;
-                
                 default:
                     $function->addArgument();
             }

src/PhpScanner.php

@@ -3,12 +3,7 @@
 
 namespace Gettext\Scanner;
 
-use Exception;
 use Gettext\Translations;
-use Gettext\Translation;
-use Gettext\Scanner\ParsedFunction;
-use Gettext\Scanner\PhpFunctionsScanner;
-use Gettext\Scanner\FunctionsScannerInterface;
 
 /**
  * Class to scan PHP files and get gettext translations

tests/PhpFunctionsScannerTest.php

@@ -102,7 +102,6 @@ public function testPhpFunctionsExtractor()
         $this->assertSame('fn_8();', array_shift($comments));
         $this->assertSame('ALLOW: This is a comment to fn9', array_shift($comments));
 
-
         //fn10
         $function = array_shift($functions);
         $this->assertSame('fn10', $function->getName());
@@ -180,34 +179,4 @@ public function _testPhpFunctionsScannerWithPrefixedComments()
         $this->assertSame(23, $comment->getLastLine());
         $this->assertSame('ALLOW: Related comment 3', $comment->getComment());
     }
-
-    public function stringDecodeProvider()
-    {
-        return [
-            ['"test"', 'test'],
-            ["'test'", 'test'],
-            ["'DATE \a\\t TIME'", 'DATE \a\t TIME'],
-            ["'DATE \a\\t TIME$'", 'DATE \a\t TIME$'],
-            ["'DATE \a\\t TIME\$'", 'DATE \a\t TIME$'],
-            ["'DATE \a\\t TIME\$a'", 'DATE \a\t TIME$a'],
-            ['"FIELD\\tFIELD"', "FIELD\tFIELD"],
-            ['"$"', '$'],
-            ['"Hi $"', 'Hi $'],
-            ['"$ hi"', '$ hi'],
-            ['"Hi\t$name"', "Hi\t\$name"],
-            ['"Hi\\\\"', 'Hi\\'],
-            ['"{$obj->name}"', '{$obj->name}'],
-            ['"a\x20b $c"', 'a b $c'],
-            ['"a\x01b\2 \1 \01 \001 \r \n \t \v \f"', "a\1b\2 \1 \1 \1 \r \n \t \v \f"],
-            ['"$ \$a \""', '$ $a "'],
-        ];
-    }
-
-    /**
-     * @dataProvider stringDecodeProvider
-     */
-    public function _testStringDecode($source, $decoded)
-    {
-        $this->assertSame($decoded, PhpFunctionsScanner::decode($source));
-    }
 }

tests/PhpScannerTest.php

@@ -35,4 +35,4 @@ public function testPhpCodeScanner()
         $this->assertCount(4, $domain2);
         $this->assertCount(1, $domain3);
     }
-}
+}