Update code standards

TavoNiievez · TavoNiievez · commit 8755f423f95e · 2021-12-04T09:08:43.000-05:00
diff --git a/tests/data/app/controllers.php b/tests/data/app/controllers.php
@@ -130,9 +130,9 @@ function GET($matches) {
     }
 
     function POST() {
-        setcookie('f', 'b', time() + 60, null, null, false, true);
-        setcookie('foo', 'bar1', time() + 60, null, 'sub.localhost', false, true);
-        setcookie('baz', 'bar2', time() + 60,  null, 'sub.localhost', false, true);
+        setcookie('f', 'b', ['expires' => time() + 60, 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => true]);
+        setcookie('foo', 'bar1', ['expires' => time() + 60, 'path' => null, 'domain' => 'sub.localhost', 'secure' => false, 'httponly' => true]);
+        setcookie('baz', 'bar2', ['expires' => time() + 60, 'path' => null, 'domain' => 'sub.localhost', 'secure' => false, 'httponly' => true]);
         data::set('form', $_POST);
         include __DIR__.'/view/cookies.php';
     }
diff --git a/tests/data/app/data.php b/tests/data/app/data.php
@@ -1,7 +1,7 @@
 <?php
 class data {
 
-    public static $filename = '/db';
+    public static string $filename = '/db';
 
     public static function get($key) {
         $data = self::load();
diff --git a/tests/data/rest/index.php b/tests/data/rest/index.php
@@ -5,30 +5,26 @@
 $GLOBALS['RESTmap'] = [];
 
 $GLOBALS['RESTmap']['GET'] = [
-    'user' => function() {
-        return [
-            'name'    => 'davert',
-            'email'   => 'davert@mail.ua',
-            'aliases' => [
-                'DavertMik',
-                'davert.ua'
-            ],
-            'address' => [
-                'city'    => 'Kyiv',
-                'country' => 'Ukraine',
-            ]];
-    },
-    'zeroes' => function() {
-        return [
-            'responseCode' => 0,
-            'message' => 'OK',
-            'data' => [
-                9,
-                0,
-                0
-            ],
-        ];
-    },
+    'user' => fn() => [
+        'name'    => 'davert',
+        'email'   => 'davert@mail.ua',
+        'aliases' => [
+            'DavertMik',
+            'davert.ua'
+        ],
+        'address' => [
+            'city'    => 'Kyiv',
+            'country' => 'Ukraine',
+        ]],
+    'zeroes' => fn() => [
+        'responseCode' => 0,
+        'message' => 'OK',
+        'data' => [
+            9,
+            0,
+            0
+        ],
+    ],
     'foo' => function() {
         if (isset($_SERVER['HTTP_FOO'])) {
             return 'foo: "' . $_SERVER['HTTP_FOO'] . '"';
@@ -43,11 +39,9 @@
         $name = $_POST['name'];
         return ['name' => $name];
     },
-    'file-upload' => function() {
-        return [
-            'uploaded' => isset($_FILES['file']['tmp_name']) && file_exists($_FILES['file']['tmp_name']),
-        ];
-    }
+    'file-upload' => fn() => [
+        'uploaded' => isset($_FILES['file']['tmp_name']) && file_exists($_FILES['file']['tmp_name']),
+    ]
 ];
 
 $GLOBALS['RESTmap']['PUT'] = [
diff --git a/tests/data/rest/server.php b/tests/data/rest/server.php
@@ -17,14 +17,14 @@ function RESTServer()
         if ($_SERVER['REQUEST_METHOD'] == 'GET') {
             $data = $_GET;
         } else if ($tmp = file_get_contents('php://input')) {
-            $data = json_decode($tmp);
+            $data = json_decode($tmp, null, 512, JSON_THROW_ON_ERROR);
         }
 
         $response = call_user_func($callback, $data);
         if (is_scalar($response)) {
             print $response;
             return;
         }
-        print json_encode($response);
+        print json_encode($response, JSON_THROW_ON_ERROR);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,9 @@ function GET($matches) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`function POST() {`
`133`		`- setcookie('f', 'b', time() + 60, null, null, false, true);`
`134`		`- setcookie('foo', 'bar1', time() + 60, null, 'sub.localhost', false, true);`
`135`		`- setcookie('baz', 'bar2', time() + 60, null, 'sub.localhost', false, true);`
	`133`	`+ setcookie('f', 'b', ['expires' => time() + 60, 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => true]);`
	`134`	`+ setcookie('foo', 'bar1', ['expires' => time() + 60, 'path' => null, 'domain' => 'sub.localhost', 'secure' => false, 'httponly' => true]);`
	`135`	`+ setcookie('baz', 'bar2', ['expires' => time() + 60, 'path' => null, 'domain' => 'sub.localhost', 'secure' => false, 'httponly' => true]);`
`136`	`136`	`data::set('form', $_POST);`
`137`	`137`	`include __DIR__.'/view/cookies.php';`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ function RESTServer()`
`17`	`17`	`if ($_SERVER['REQUEST_METHOD'] == 'GET') {`
`18`	`18`	`$data = $_GET;`
`19`	`19`	`} else if ($tmp = file_get_contents('php://input')) {`
`20`		`- $data = json_decode($tmp);`
	`20`	`+ $data = json_decode($tmp, null, 512, JSON_THROW_ON_ERROR);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`$response = call_user_func($callback, $data);`
`24`	`24`	`if (is_scalar($response)) {`
`25`	`25`	`print $response;`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`		`- print json_encode($response);`
	`28`	`+ print json_encode($response, JSON_THROW_ON_ERROR);`
`29`	`29`	`}`
`30`	`30`	`}`