Changeset 42343 for trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php

Timestamp:

11/30/2017 11:09:33 PM (6 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php (modified) (12 diffs)

trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php

@@ -27 +27 @@
     public function test_type_integer() {
         $schema = array(
-            'type' => 'integer',
+            'type'    => 'integer',
             'minimum' => 1,
             'maximum' => 2,
@@ -65 +65 @@
     public function test_format_email() {
         $schema = array(
-            'type'  => 'string',
+            'type'   => 'string',
             'format' => 'email',
         );
@@ -75 +75 @@
     public function test_format_date_time() {
         $schema = array(
-            'type'  => 'string',
+            'type'   => 'string',
             'format' => 'date-time',
         );
@@ -88 +88 @@
     public function test_format_ip() {
         $schema = array(
-            'type'  => 'string',
+            'type'   => 'string',
             'format' => 'ip',
         );
@@ -114 +114 @@
     public function test_type_array() {
         $schema = array(
-            'type' => 'array',
+            'type'  => 'array',
             'items' => array(
                 'type' => 'number',
@@ -125 +125 @@
     public function test_type_array_nested() {
         $schema = array(
-            'type' => 'array',
-            'items' => array(
-                'type' => 'array',
+            'type'  => 'array',
+            'items' => array(
+                'type'  => 'array',
                 'items' => array(
                     'type' => 'number',
@@ -138 +138 @@
     public function test_type_array_as_csv() {
         $schema = array(
-            'type' => 'array',
+            'type'  => 'array',
             'items' => array(
                 'type' => 'number',
@@ -179 +179 @@
             ),
         );
-        $this->assertWPError( rest_validate_value_from_schema( array( 'first' => '1', 'second' => '2' ), $schema ) );
+        $this->assertWPError(
+            rest_validate_value_from_schema(
+                array(
+                    'first'  => '1',
+                    'second' => '2',
+                ), $schema
+            )
+        );
     }
 
@@ -192 +199 @@
         );
         $this->assertTrue( rest_validate_value_from_schema( array( 'a' => 1 ), $schema ) );
-        $this->assertTrue( rest_validate_value_from_schema( array( 'a' => 1, 'b' => 2 ), $schema ) );
+        $this->assertTrue(
+            rest_validate_value_from_schema(
+                array(
+                    'a' => 1,
+                    'b' => 2,
+                ), $schema
+            )
+        );
         $this->assertWPError( rest_validate_value_from_schema( array( 'a' => 'invalid' ), $schema ) );
     }
 
     public function test_type_object_additional_properties_false() {
+        $schema = array(
+            'type'                 => 'object',
+            'properties'           => array(
+                'a' => array(
+                    'type' => 'number',
+                ),
+            ),
+            'additionalProperties' => false,
+        );
+        $this->assertTrue( rest_validate_value_from_schema( array( 'a' => 1 ), $schema ) );
+        $this->assertWPError(
+            rest_validate_value_from_schema(
+                array(
+                    'a' => 1,
+                    'b' => 2,
+                ), $schema
+            )
+        );
+    }
+
+    public function test_type_object_nested() {
         $schema = array(
             'type'       => 'object',
             'properties' => array(
                 'a' => array(
-                    'type' => 'number',
-                ),
-            ),
-            'additionalProperties' => false,
-        );
-        $this->assertTrue( rest_validate_value_from_schema( array( 'a' => 1 ), $schema ) );
-        $this->assertWPError( rest_validate_value_from_schema( array( 'a' => 1, 'b' => 2 ), $schema ) );
-    }
-
-    public function test_type_object_nested() {
-        $schema = array(
-            'type' => 'object',
-            'properties' => array(
-                'a' => array(
-                    'type'  => 'object',
+                    'type'       => 'object',
                     'properties' => array(
                         'b' => array( 'type' => 'number' ),
                         'c' => array( 'type' => 'number' ),
-                    )
-                )
+                    ),
+                ),
             ),
         );
@@ -234 +255 @@
             )
         );
-        $this->assertWPError( rest_validate_value_from_schema( array( 'a' => array( 'b' => 1, 'c' => 'invalid' ) ), $schema ) );
+        $this->assertWPError(
+            rest_validate_value_from_schema(
+                array(
+                    'a' => array(
+                        'b' => 1,
+                        'c' => 'invalid',
+                    ),
+                ), $schema
+            )
+        );
         $this->assertWPError( rest_validate_value_from_schema( array( 'a' => 1 ), $schema ) );
     }
@@ -243 +273 @@
             'properties' => array(
                 'a' => array(
-                    'type' => 'number'
+                    'type' => 'number',
                 ),
             ),
@@ -252 +282 @@
     public function test_type_unknown() {
         $schema = array(
-            'type'  => 'lalala',
+            'type' => 'lalala',
         );
         $this->assertTrue( rest_validate_value_from_schema( 'Best lyrics', $schema ) );