Couple phpstan fixes

donatj · Oct 29, 2023 · b818658 · b818658
1 parent 24b084b
commit b818658
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/ApacheModRewriteGenerator.php b/src/ApacheModRewriteGenerator.php
@@ -77,7 +77,12 @@ public function generateRewrite( string $from, string $to, int $type ) : string
 	}
 
 	private function escapeSubstitution( string $input ) : string {
-		return preg_replace('/[-\s%$\\\\]/', '\\\\$0', $input);
+		$result = preg_replace('/[-\s%$\\\\]/', '\\\\$0', $input);
+		if( $result === null ) {
+			throw new \RuntimeException('preg_replace failed - ' . preg_last_error());
+		}
+
+		return $result;
 	}
 
 }
diff --git a/src/Engine.php b/src/Engine.php
@@ -6,12 +6,9 @@
 
 class Engine {
 
-	/**
-	 * @var \donatj\RewriteGenerator\GeneratorInterface
-	 */
-	private $generator;
+	private GeneratorInterface $generator;
 
-	private $lastErrorCount = 0;
+	private int $lastErrorCount = 0;
 
 	public function __construct( GeneratorInterface $generator ) {
 		$this->generator = $generator;
@@ -22,6 +19,9 @@ public function generate( string $input, int $type, bool $comments ) : string {
 		$output = '';
 
 		$input = preg_replace('/\h+/', "\t", $input); // Spacing Cleanup
+		if( $input === null ) {
+			throw new \RuntimeException('preg_replace failed - ' . preg_last_error());
+		}
 
 		$lines = explode(PHP_EOL, $input);
 

diff --git a/tests/tests/ApacheIntegrationTest.php b/tests/tests/ApacheIntegrationTest.php
@@ -13,7 +13,7 @@ class ApacheIntegrationTest extends TestCase {
 	/**
 	 * @dataProvider exampleProvider
 	 */
-	public function test_examples( string $input, string $output301, string $outputRewrite ) {
+	public function test_examples( string $input, string $output301, string $outputRewrite ) : void {
 		$engine = new Engine(new ApacheModRewriteGenerator);
 
 		$given = $engine->generate($input, RewriteTypes::PERMANENT_REDIRECT, true);
@@ -136,7 +136,7 @@ public function exampleProvider() : Generator {
 	/**
 	 * @dataProvider failureProvider
 	 */
-	public function test_failures( string $input, string $output, int $errorCount ) {
+	public function test_failures( string $input, string $output, int $errorCount ) : void {
 		$engine = new Engine(new ApacheModRewriteGenerator);
 
 		$given = $engine->generate($input, RewriteTypes::PERMANENT_REDIRECT, true);