clean up tests, improve coverage

Author: spawnia

tests/Rules/UseSafeCallables/expr.php

@@ -0,0 +1,4 @@
+<?php
+
+$json_encode_name = 'json_encode';
+$encode_from_expression = $json_encode_name(...);

tests/Rules/UseSafeCallables/native_safe.php

@@ -0,0 +1,3 @@
+<?php
+
+var_dump(...);

tests/Rules/UseSafeCallables/unsafe.php

@@ -0,0 +1,3 @@
+<?php
+
+json_encode(...);

tests/Rules/UseSafeCallables/use_safe.php

@@ -0,0 +1,5 @@
+<?php
+
+use function Safe\json_encode;
+
+json_encode(...);

tests/Rules/UseSafeCallablesRuleTest.php

@@ -15,13 +15,28 @@ protected function getRule(): Rule
         return new UseSafeCallablesRule();
     }
 
-    public function testFirstClassCallable(): void
+    public function testUnsafe(): void
     {
-        $this->analyse([__DIR__ . '/data/first_class_callable.php'], [
+        $this->analyse([__DIR__ . '/UseSafeCallables/unsafe.php'], [
             [
                 "Function json_encode is unsafe to use. It can return FALSE instead of throwing an exception. Please add 'use function Safe\\json_encode;' at the beginning of the file to use the variant provided by the 'thecodingmachine/safe' library.",
                 3,
             ],
         ]);
     }
+
+    public function testUseSafe(): void
+    {
+        $this->analyse([__DIR__ . '/UseSafeCallables/use_safe.php'], []);
+    }
+
+    public function testNativeSafe(): void
+    {
+        $this->analyse([__DIR__ . '/UseSafeCallables/native_safe.php'], []);
+    }
+
+    public function testExpr(): void
+    {
+        $this->analyse([__DIR__ . '/UseSafeCallables/expr.php'], []);
+    }
 }

tests/Rules/data/datetime.php renamed to tests/Rules/UseSafeClassesRule/datetime.php

@@ -17,7 +17,7 @@ protected function getRule(): Rule
 
     public function testDateTime(): void
     {
-        $this->analyse([__DIR__ . '/data/datetime.php'], [
+        $this->analyse([__DIR__ . '/UseSafeClassesRule/datetime.php'], [
             [
                 "Class DateTime is unsafe to use. Its methods can return FALSE instead of throwing an exception. Please add 'use Safe\DateTime;' at the beginning of the file to use the variant provided by the 'thecodingmachine/safe' library.",
                 3,

tests/Rules/UseSafeClassesRuleTest.php

@@ -0,0 +1,4 @@
+<?php
+
+$fopen = 'fopen';
+$fopen('foobar', 'r');

tests/Rules/UseSafeFunctionsRule/expr.php

@@ -1,5 +1,7 @@
 <?php
 
+var_dump();
+
 // Test various combinations of flags
 json_decode("{}", true, 512, JSON_THROW_ON_ERROR);
 json_decode("{}", true, 512, JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR);
@@ -12,3 +14,16 @@
 
 // Test named arguments instead of positional
 json_decode("{}", flags: JSON_THROW_ON_ERROR);
+
+// Various combinations of flags
+json_encode([], JSON_THROW_ON_ERROR, 512);
+json_encode([], JSON_FORCE_OBJECT | JSON_THROW_ON_ERROR, 512);
+json_encode([], JSON_FORCE_OBJECT | JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR, 512);
+
+// Test raw integers too
+json_encode([], 4194304, 512);
+json_encode([], 16 | 4194304, 512);
+json_encode([], 16 | 1048576 | 4194304, 512);
+
+// Named arguments
+json_encode([], flags: JSON_THROW_ON_ERROR);

tests/Rules/data/safe_json_decode.php renamed to tests/Rules/UseSafeFunctionsRule/native_safe.php

@@ -0,0 +1,3 @@
+<?php
+
+fopen('foobar', 'r');

tests/Rules/UseSafeFunctionsRule/unsafe.php

@@ -1,7 +1,11 @@
 <?php
+
+use function Safe\fopen;
 use function Safe\preg_replace;
 
+fopen('foobar', 'r');
+
 $x = preg_replace('/foo/', 'bar', 'baz');
 $y = stripos($x, 'foo');
 
-$x = preg_replace(['/foo/'], ['bar'], ['baz']);
+$x = Safe\preg_replace(['/foo/'], ['bar'], ['baz']);

tests/Rules/data/safe_pregreplace.php renamed to tests/Rules/UseSafeFunctionsRule/use_safe.php

@@ -15,33 +15,28 @@ protected function getRule(): Rule
         return new UseSafeFunctionsRule();
     }
 
-    public function testCatch(): void
+    public function testUnsafe(): void
     {
-        $this->analyse([__DIR__ . '/data/fopen.php'], [
+        $this->analyse([__DIR__ . '/UseSafeFunctionsRule/unsafe.php'], [
             [
                 "Function fopen is unsafe to use. It can return FALSE instead of throwing an exception. Please add 'use function Safe\\fopen;' at the beginning of the file to use the variant provided by the 'thecodingmachine/safe' library.",
-                4,
+                3,
             ],
         ]);
     }
 
-    public function testNoCatchSafe(): void
+    public function testUseSafe(): void
     {
-        $this->analyse([__DIR__ . '/data/safe_fopen.php'], []);
+        $this->analyse([__DIR__ . '/UseSafeFunctionsRule/use_safe.php'], []);
     }
 
-    public function testExprCall(): void
+    public function testNativeSafe(): void
     {
-        $this->analyse([__DIR__ . '/data/undirect_call.php'], []);
+        $this->analyse([__DIR__ . '/UseSafeFunctionsRule/native_safe.php'], []);
     }
 
-    public function testJSONDecodeNoCatchSafe(): void
+    public function testExpr(): void
     {
-        $this->analyse([__DIR__ . '/data/safe_json_decode.php'], []);
-    }
-
-    public function testJSONEncodeNoCatchSafe(): void
-    {
-        $this->analyse([__DIR__ . '/data/safe_json_encode.php'], []);
+        $this->analyse([__DIR__ . '/UseSafeFunctionsRule/expr.php'], []);
     }
 }