Add standardized version of php-cs-fixer

scrivo · May 15, 2023 · d1c6b09 · d1c6b09
1 parent 4ad3348
commit d1c6b09
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -5,8 +5,9 @@
     ->in('src')
     ->in('test')
     ->in('tools')
-    ->exclude('lib_dojo')
+    ->in('translator')
     ->exclude('lib_highlight')
+    ->exclude('output')
 ;
 
 $config = new PhpCsFixer\Config();

diff --git a/composer.json b/composer.json
@@ -11,9 +11,11 @@
     "type": "library",
     "license": "BSD-3-Clause",
     "scripts": {
+        "format": "php-cs-fixer fix $(if [ ! -z $CI ]; then echo \"--format=checkstyle\"; fi)",
         "test:detection": "phpunit test/Highlight/DetectionTest.php",
         "test:markup": "phpunit test/Highlight/MarkupTest.php",
-        "test": "phpunit -v"
+        "test": "phpunit -v",
+        "tools": "@composer bin all install --ansi"
     },
     "support": {
         "issues": "https://github.com/scrivo/highlight.php/issues",
@@ -55,6 +57,8 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
+        "php": ">=8.0",
+        "bamarni/composer-bin-plugin": "^1.8",
         "phpbench/phpbench": "^1.0",
         "phpunit/phpunit": "^5.7",
         "sabberworm/php-css-parser": "^8.3",
@@ -67,6 +71,9 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        }
     }
 }
diff --git a/demo/compare.php b/demo/compare.php
@@ -70,11 +70,11 @@ function getLanguageDemo($lang)
 
     if (isset($_GET['raw'])) {
         echo getLanguageRaw($lang);
-        die();
+        die;
     }
 
     echo getLanguageDemo($_GET['lang']);
-    die();
+    die;
 }
 
 ?>

diff --git a/demo/demo.php b/demo/demo.php
@@ -84,11 +84,11 @@ function getLanguageDemo($lang)
 
     if (isset($_GET['raw'])) {
         echo getLanguageRaw($lang);
-        die();
+        die;
     }
 
     echo getLanguageDemo($_GET['lang']);
-    die();
+    die;
 }
 
 $styles = HighlightUtilities\Functions::getAvailableStyleSheets();

diff --git a/demo/line-numbers.php b/demo/line-numbers.php
@@ -78,11 +78,11 @@
 
         <?php
         $hl = new Highlight\Highlighter();
-        $snippet = file_get_contents("../test/detect/php/default.txt");
-        $result = $hl->highlight("php", $snippet);
+$snippet = file_get_contents("../test/detect/php/default.txt");
+$result = $hl->highlight("php", $snippet);
 
-        $lines = HighlightUtilities\Functions::splitCodeIntoArray($result->value);
-        ?>
+$lines = HighlightUtilities\Functions::splitCodeIntoArray($result->value);
+?>
         <table>
             <tbody>
                 <?php foreach ($lines as $number => $line): ?>

diff --git a/test/Benchmark/HighlighterBench.php b/test/Benchmark/HighlighterBench.php
@@ -10,6 +10,7 @@ class HighlighterBench
 {
     /**
      * @Revs(500)
+     *
      * @Iterations(5)
      */
     public function benchLoadNoLanguages()
@@ -20,6 +21,7 @@ public function benchLoadNoLanguages()
 
     /**
      * @Revs(500)
+     *
      * @Iterations(5)
      */
     public function benchLoadAllLanguages()

diff --git a/tools/get_language_definitions.php b/tools/get_language_definitions.php
@@ -74,10 +74,10 @@
     $jsonLangDef = preg_replace('/(\[[^:]*?\w)(-)([^a-zA-Z0-9\\\\]+?)/um', '$1\\\\\\-$3', $jsonLangDef);
 
     if (!$languageName) {
-        die(sprintf("ERROR: No language name on line %d\n", ($i + 1)));
+        die(sprintf("ERROR: No language name on line %d\n", $i + 1));
     }
     if (!@json_decode($jsonLangDef)) {
-        die(sprintf("ERROR: Invalid JSON data on line %d\n", ($i + 2)));
+        die(sprintf("ERROR: Invalid JSON data on line %d\n", $i + 2));
     }
 
     if (isset($patches[$languageName])) {

diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json
@@ -0,0 +1,6 @@
+{
+    "require": {
+        "friendsofphp/php-cs-fixer": "^3.16",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^3.14"
+    }
+}