Drop thecodingmachine/safe (#191)

staabm · web-flow · commit 17f7be926a2f · 2024-12-14T07:30:14.000+01:00
diff --git a/bin/phpstan-baseline-analyze.php b/bin/phpstan-baseline-analyze.php
@@ -1,7 +1,6 @@
 <?php
 
 use staabm\PHPStanBaselineAnalysis\ResultPrinter;
-use function Safe\ini_set;
 
 // Finding composer
 
diff --git a/bin/phpstan-baseline-filter.php b/bin/phpstan-baseline-filter.php
@@ -2,7 +2,6 @@
 
 use staabm\PHPStanBaselineAnalysis\FilterApplication;
 use staabm\PHPStanBaselineAnalysis\ResultPrinter;
-use function Safe\ini_set;
 
 // Finding composer
 
diff --git a/bin/phpstan-baseline-graph.php b/bin/phpstan-baseline-graph.php
@@ -1,7 +1,5 @@
 <?php
 
-use function Safe\ini_set;
-
 // Finding composer
 
 $paths = [
diff --git a/bin/phpstan-baseline-trend.php b/bin/phpstan-baseline-trend.php
@@ -1,9 +1,5 @@
 <?php
 
-use function Safe\ini_set;
-use function Safe\substr;
-use function Safe\sprintf;
-
 // Finding composer
 
 $paths = [
diff --git a/composer.json b/composer.json
@@ -13,16 +13,14 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "nette/neon": "^3.2",
-        "symfony/polyfill-php80": "^1.26",
-        "thecodingmachine/safe": "^1.3 || ^2.0"
+        "symfony/polyfill-php80": "^1.26"
     },
     "require-dev": {
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-deprecation-rules": "^1.2",
         "phpunit/phpunit": "^9.6",
         "symfony/var-dumper": "^5.3",
-        "thecodingmachine/phpstan-safe-rule": "^1.2",
         "tomasvotruba/cognitive-complexity": "0.2.3",
         "tomasvotruba/type-coverage": "1.0.0",
         "tomasvotruba/unused-public": "1.1.0"
diff --git a/lib/AnalyzeApplication.php b/lib/AnalyzeApplication.php
@@ -20,8 +20,6 @@ final class AnalyzeApplication
      *
      * @return self::EXIT_*
      *
-     * @throws \Safe\Exceptions\FilesystemException
-     *
      * @api
      */
     public function start(string $glob, string $format): int
diff --git a/lib/AnalyzerResultReader.php b/lib/AnalyzerResultReader.php
@@ -2,14 +2,9 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use function Safe\file_get_contents;
-use function Safe\json_decode;
-
 final class AnalyzerResultReader {
     /**
      * @return array<string, AnalyzerResult>
-     * @throws \Safe\Exceptions\FilesystemException
-     * @throws \Safe\Exceptions\JsonException
      */
     public function readFile(string $filePath): array
     {
@@ -41,12 +36,10 @@ public function readFile(string $filePath): array
     /**
      * @param string $filePath
      * @return array<mixed>
-     * @throws \Safe\Exceptions\FilesystemException
-     * @throws \Safe\Exceptions\JsonException
      */
     private function readResultArray(string $filePath): array
     {
-        \Safe\fwrite(STDERR, 'Reading file ' . $filePath . PHP_EOL);
+        fwrite(STDERR, 'Reading file ' . $filePath . PHP_EOL);
 
         $content = file_get_contents($filePath);
         if ($content === '') {
diff --git a/lib/Baseline.php b/lib/Baseline.php
@@ -5,9 +5,6 @@
 use Iterator;
 use Nette\Neon\Neon;
 use RuntimeException;
-use Safe\Exceptions\FilesystemException;
-use function Safe\file_get_contents;
-use function Safe\sprintf;
 
 final class Baseline {
     /**
@@ -20,9 +17,6 @@ final class Baseline {
      */
     private $filePath;
 
-    /**
-     * @throws FilesystemException
-     */
     static public function forFile(string $filePath):self {
         $baselineExtension = pathinfo($filePath, PATHINFO_EXTENSION);
 
diff --git a/lib/BaselineAnalyzer.php b/lib/BaselineAnalyzer.php
@@ -2,8 +2,7 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use Safe\DateTimeImmutable;
-use function Safe\preg_match;
+use DateTimeImmutable;
 
 final class BaselineAnalyzer
 {
@@ -152,6 +151,6 @@ private function printfToScanfFormat(string $format): string {
 
     private function normalizeMessage(BaselineError $baselineError): string {
         // makes the message format of tomasvotruba/type-coverage 0.2.* compatible with tomasvotruba/type-coverage 0.1.*
-        return \Safe\preg_replace('/only \d+ \- (\d+).\d %/', 'only $1 %', $baselineError->unwrapMessage());
+        return preg_replace('/only \d+ \- (\d+).\d %/', 'only $1 %', $baselineError->unwrapMessage());
     }
 }
diff --git a/lib/BaselineError.php b/lib/BaselineError.php
@@ -2,8 +2,6 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use function Safe\preg_match;
-
 /**
  * @immutable
  */
diff --git a/lib/BaselineFilter.php b/lib/BaselineFilter.php
@@ -2,9 +2,6 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use Safe\DateTimeImmutable;
-use function Safe\preg_match;
-
 final class BaselineFilter
 {
     private Baseline $baseline;
diff --git a/lib/BaselineFinder.php b/lib/BaselineFinder.php
@@ -2,15 +2,10 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use Safe\Exceptions\FilesystemException;
-use function Safe\glob;
-
 final class BaselineFinder
 {
     /**
      * @return Baseline[]
-     *
-     * @throws FilesystemException
      */
     static public function forGlob(string $glob): array
     {
@@ -35,13 +30,15 @@ static public function forGlob(string $glob): array
      * from https://stackoverflow.com/a/17161106
      *
      * @return string[]
-     *
-     * @throws FilesystemException
      */
     static private function rglob(string $pattern,int $flags = 0):array
     {
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
+        if (!$files) {
+            return [];
+        }
+
+        foreach (glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) ?: [] as $dir) {
             if (basename($dir) == 'vendor') {
                 continue;
             }
diff --git a/lib/FilterApplication.php b/lib/FilterApplication.php
@@ -4,7 +4,6 @@
 
 use Nette\DI\Helpers;
 use Nette\Neon\Neon;
-use function Safe\substr;
 use PHPStan\ShouldNotHappenException;
 
 final class FilterApplication
@@ -21,8 +20,6 @@ final class FilterApplication
     /**
      * @return self::EXIT_*
      *
-     * @throws \Safe\Exceptions\FilesystemException
-     *
      * @api
      */
     public function start(string $glob, FilterConfig $filterConfig): int
diff --git a/lib/FilterConfig.php b/lib/FilterConfig.php
@@ -2,8 +2,6 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use function Safe\substr;
-
 /**
  * @immutable
  */
diff --git a/lib/GraphApplication.php b/lib/GraphApplication.php
@@ -3,20 +3,17 @@
 namespace staabm\PHPStanBaselineAnalysis;
 
 use \Iterator;
-use function Safe\glob;
-
 final class GraphApplication
 {
     /**
-     * @throws \Safe\Exceptions\JsonException
-     *
-     * @throws \Safe\Exceptions\FilesystemException
-     *
      * @api
      */
     public function start(string $jsonGlob): int
     {
         $jsonFiles = glob($jsonGlob);
+        if (!$jsonFiles) {
+            throw new \RuntimeException('No files found for ' . $jsonGlob);
+        }
 
         $it = $this->iterateOverFiles($jsonFiles);
 
diff --git a/lib/GraphTemplate.php b/lib/GraphTemplate.php
@@ -3,8 +3,6 @@
 namespace staabm\PHPStanBaselineAnalysis;
 
 use Iterator;
-use function Safe\json_encode;
-
 final class GraphTemplate
 {
     private const COMPLEXITY_COLOR = '#C24642';
diff --git a/lib/ResultPrinter.php b/lib/ResultPrinter.php
@@ -2,11 +2,8 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use Exception;
+use \DateTimeImmutable;
 use \Iterator;
-use Safe\DateTimeImmutable;
-use function Safe\sprintf;
-use function Safe\json_encode;
 
 final class ResultPrinter {
     const DATE_FORMAT = DateTimeImmutable::RFC2822;
diff --git a/lib/TrendApplication.php b/lib/TrendApplication.php
@@ -2,8 +2,6 @@
 
 namespace staabm\PHPStanBaselineAnalysis;
 
-use function Safe\json_encode;
-
 final class TrendApplication
 {
     /**
@@ -40,9 +38,6 @@ public static function getAllowedOutputFormats(): array
     /**
      * @param self::OUTPUT_FORMAT_* $outputFormat
      * @return self::EXIT_*
-     * @throws \Safe\Exceptions\JsonException
-     *
-     * @throws \Safe\Exceptions\FilesystemException
      *
      * @api
      */
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,36 +1,27 @@
 parameters:
 	ignoreErrors:
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\sprintf\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
-			count: 1
-			path: bin/phpstan-baseline-trend.php
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
+			count: 2
+			path: lib/AnalyzeApplication.php
 
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\substr\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: bin/phpstan-baseline-trend.php
+			path: lib/AnalyzerResultReader.php
 
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\sprintf\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
-			count: 3
+			message: "#^Call to function is_array\\(\\) with array\\{ignoreErrors\\?\\: list\\<array\\{message\\: string, count\\: int, path\\: string\\}\\>\\} will always evaluate to true\\.$#"
+			count: 1
 			path: lib/Baseline.php
 
 		-
-			message: "#^Call to function is_array\\(\\) with array\\{ignoreErrors\\?\\: list\\<array\\{message\\: string, count\\: int, path\\: string\\}\\>\\} will always evaluate to true\\.$#"
+			message: "#^Call to function is_array\\(\\) with list\\<array\\{message\\: string, count\\: int, path\\: string\\}\\> will always evaluate to true\\.$#"
 			count: 1
 			path: lib/Baseline.php
 
 		-
-			message: "#^Call to function is_array\\(\\) with list\\<array\\{message\\: string, count\\: int, path\\: string\\}\\> will always evaluate to true\\.$#"
+			message: "#^Parameter \\#1 \\$input of static method Nette\\\\Neon\\\\Neon\\:\\:decode\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
 			path: lib/Baseline.php
 
@@ -40,30 +31,36 @@ parameters:
 			path: lib/Baseline.php
 
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\substr\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
+			message: "#^Method staabm\\\\PHPStanBaselineAnalysis\\\\BaselineAnalyzer\\:\\:normalizeMessage\\(\\) should return string but returns string\\|null\\.$#"
+			count: 1
+			path: lib/BaselineAnalyzer.php
+
+		-
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
+			count: 4
+			path: lib/BaselineAnalyzer.php
+
+		-
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
 			count: 2
 			path: lib/FilterApplication.php
 
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\substr\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
-			count: 2
-			path: lib/FilterConfig.php
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
+			count: 1
+			path: lib/GraphTemplate.php
 
 		-
-			message: "#^Parameter \\#1 \\$jsonFiles of method staabm\\\\PHPStanBaselineAnalysis\\\\GraphApplication\\:\\:iterateOverFiles\\(\\) expects list\\<string\\>, array given\\.$#"
+			message: "#^Generator expects value type string, string\\|false given\\.$#"
 			count: 1
-			path: lib/GraphApplication.php
+			path: lib/ResultPrinter.php
 
 		-
-			message: """
-				#^Call to deprecated function Safe\\\\sprintf\\(\\)\\:
-				The Safe version of this function is no longer needed in PHP 8\\.0\\+$#
-			"""
-			count: 12
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
+			count: 14
 			path: lib/ResultPrinter.php
+
+		-
+			message: "#^Out of 28 possible constant types, only 0 \\- 0\\.0 %% actually have it\\. Add more constant types to get over 99 %%$#"
+			count: 5
+			path: lib/TrendApplication.php
diff --git a/tests/AnalyzeApplicationTest.php b/tests/AnalyzeApplicationTest.php
@@ -4,7 +4,6 @@
 
 use staabm\PHPStanBaselineAnalysis\AnalyzeApplication;
 use staabm\PHPStanBaselineAnalysis\ResultPrinter;
-use function Safe\json_encode;
 
 class AnalyzeApplicationTest extends BaseTestCase
 {
diff --git a/tests/GraphApplicationTest.php b/tests/GraphApplicationTest.php
@@ -5,8 +5,6 @@
 use staabm\PHPStanBaselineAnalysis\AnalyzeApplication;
 use staabm\PHPStanBaselineAnalysis\GraphApplication;
 use staabm\PHPStanBaselineAnalysis\ResultPrinter;
-use function Safe\json_encode;
-use function Safe\file_get_contents;
 
 class GraphApplicationTest extends BaseTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ final class AnalyzeApplication`
`20`	`20`	`*`
`21`	`21`	`* @return self::EXIT_*`
`22`	`22`	`*`
`23`		`- * @throws \Safe\Exceptions\FilesystemException`
`24`		`- *`
`25`	`23`	`* @api`
`26`	`24`	`*/`
`27`	`25`	`public function start(string $glob, string $format): int`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace staabm\PHPStanBaselineAnalysis;`
`4`	`4`
`5`		`-use Safe\DateTimeImmutable;`
`6`		`-use function Safe\preg_match;`
	`5`	`+use DateTimeImmutable;`
`7`	`6`
`8`	`7`	`final class BaselineAnalyzer`
`9`	`8`	`{`
`@@ -152,6 +151,6 @@ private function printfToScanfFormat(string $format): string {`
`152`	`151`
`153`	`152`	`private function normalizeMessage(BaselineError $baselineError): string {`
`154`	`153`	`// makes the message format of tomasvotruba/type-coverage 0.2.* compatible with tomasvotruba/type-coverage 0.1.*`
`155`		`- return \Safe\preg_replace('/only \d+ \- (\d+).\d %/', 'only $1 %', $baselineError->unwrapMessage());`
	`154`	`+ return preg_replace('/only \d+ \- (\d+).\d %/', 'only $1 %', $baselineError->unwrapMessage());`
`156`	`155`	`}`
`157`	`156`	`}`