refactor: Replace traditional syntax array with short syntax array (#747

) * refactor: Replace traditional syntax array with short syntax array * docs: Update changelog
jsonrainbow · Aug 27, 2024 · cddbef1 · cddbef1
1 parent 2eb0def
commit cddbef1
Show file tree

Hide file tree

Showing 74 changed files with 1,426 additions and 1,422 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -6,14 +6,14 @@
 
 /* Based on ^2.1 of php-cs-fixer */
 $config
-    ->setRules(array(
+    ->setRules([
         // default
         '@PSR2' => true,
         '@Symfony' => true,
         // additionally
-        'array_syntax' => array('syntax' => 'long'),
+        'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => false,
-        'concat_space' => array('spacing' => 'one'),
+        'concat_space' => ['spacing' => 'one'],
         'increment_style' => false,
         'no_superfluous_phpdoc_tags' => false,
         'no_useless_else' => true,
@@ -22,12 +22,12 @@
         'phpdoc_no_package' => false,
         'phpdoc_order' => true,
         'phpdoc_summary' => false,
-        'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'),
+        'phpdoc_types_order' => ['null_adjustment' => 'none', 'sort_algorithm' => 'none'],
         'simplified_null_return' => false,
         'single_line_throw' => false,
         'trailing_comma_in_multiline' => false,
         'yoda_style' => false,
-    ))
+    ])
     ->setFinder($finder)
 ;
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add missing property in UriResolverTest ([#743](https://github.com/jsonrainbow/json-schema/pull/743))
 - Correct casing of paths used in tests ([#745](https://github.com/jsonrainbow/json-schema/pull/745))
 
+### Changed
+- Bump to minimum PHP 7.2 ([#746](https://github.com/jsonrainbow/json-schema/pull/746))
+- Replace traditional syntax array with short syntax array ([#747](https://github.com/jsonrainbow/json-schema/pull/747))
+
 ## [6.0.0] - 2024-07-30
 ### Added
 - Add URI translation, package:// URI scheme & bundle spec schemas ([#362](https://github.com/jsonrainbow/json-schema/pull/362))

diff --git a/bin/validate-json b/bin/validate-json
@@ -20,8 +20,8 @@ if (!$composerAutoload) {
 }
 require($composerAutoload);
 
-$arOptions = array();
-$arArgs = array();
+$arOptions = [];
+$arArgs = [];
 array_shift($argv);//script itself
 foreach ($argv as $arg) {
     if ($arg[0] == '-') {
@@ -66,7 +66,7 @@ if (count($arArgs) == 1) {
 function showJsonError()
 {
     $constants = get_defined_constants(true);
-    $json_errors = array();
+    $json_errors = [];
     foreach ($constants['json'] as $name => $value) {
         if (!strncmp($name, 'JSON_ERROR_', 11)) {
             $json_errors[$value] = $name;
@@ -101,11 +101,11 @@ function getUrlFromPath($path)
 function parseHeaderValue($headerValue)
 {
     if (strpos($headerValue, ';') === false) {
-        return array('_value' => $headerValue);
+        return ['_value' => $headerValue];
     }
 
     $parts = explode(';', $headerValue);
-    $arData = array('_value' => array_shift($parts));
+    $arData = ['_value' => array_shift($parts)];
     foreach ($parts as $part) {
         list($name, $value) = explode('=', $part);
         $arData[$name] = trim($value, ' "\'');
@@ -128,15 +128,15 @@ function output($str) {
 $urlData = getUrlFromPath($pathData);
 
 $context = stream_context_create(
-    array(
-        'http' => array(
-            'header'        => array(
+    [
+        'http' => [
+            'header'        => [
                 'Accept: */*',
                 'Connection: Close'
-            ),
+            ],
             'max_redirects' => 5
-        )
-    )
+        ]
+    ]
 );
 $dataString = file_get_contents($pathData, false, $context);
 if ($dataString == '') {

diff --git a/demo/demo.php b/demo/demo.php
@@ -6,7 +6,7 @@
 
 // Validate
 $validator = new JsonSchema\Validator();
-$validator->validate($data, (object) array('$ref' => 'file://' . realpath('schema.json')));
+$validator->validate($data, (object) ['$ref' => 'file://' . realpath('schema.json')]);
 
 if ($validator->isValid()) {
     echo "The supplied JSON validates against the schema.\n";

diff --git a/src/JsonSchema/ConstraintError.php b/src/JsonSchema/ConstraintError.php
@@ -55,7 +55,7 @@ class ConstraintError extends Enum
     public function getMessage()
     {
         $name = $this->getValue();
-        static $messages = array(
+        static $messages = [
             self::ADDITIONAL_ITEMS => 'The item %s[%s] is not defined and the definition does not allow additional items',
             self::ADDITIONAL_PROPERTIES => 'The property %s is not defined and the definition does not allow additional properties',
             self::ALL_OF => 'Failed to match all schemas',
@@ -101,7 +101,7 @@ public function getMessage()
             self::PROPERTIES_MAX => 'Must contain no more than %d properties',
             self::TYPE => '%s value found, but %s is required',
             self::UNIQUE_ITEMS => 'There are no duplicates allowed in the array'
-        );
+        ];
 
         if (!isset($messages[$name])) {
             throw new InvalidArgumentException('Missing error message for ' . $name);

diff --git a/src/JsonSchema/Constraints/BaseConstraint.php b/src/JsonSchema/Constraints/BaseConstraint.php
@@ -24,7 +24,7 @@ class BaseConstraint
     /**
      * @var array Errors
      */
-    protected $errors = array();
+    protected $errors = [];
 
     /**
      * @var int All error types which have occurred
@@ -44,11 +44,11 @@ public function __construct(?Factory $factory = null)
         $this->factory = $factory ?: new Factory();
     }
 
-    public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = array())
+    public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = [])
     {
         $message = $constraint ? $constraint->getMessage() : '';
         $name = $constraint ? $constraint->getValue() : '';
-        $error = array(
+        $error = [
             'property' => $this->convertJsonPointerIntoPropertyPath($path ?: new JsonPointer('')),
             'pointer' => ltrim(strval($path ?: new JsonPointer('')), '#'),
             'message' => ucfirst(vsprintf($message, array_map(function ($val) {
@@ -58,12 +58,12 @@ public function addError(ConstraintError $constraint, ?JsonPointer $path = null,
 
                 return json_encode($val);
             }, array_values($more)))),
-            'constraint' => array(
+            'constraint' => [
                 'name' => $name,
                 'params' => $more
-            ),
+            ],
             'context' => $this->factory->getErrorContext(),
-        );
+        ];
 
         if ($this->factory->getConfig(Constraint::CHECK_MODE_EXCEPTIONS)) {
             throw new ValidationException(sprintf('Error validating %s: %s', $error['pointer'], $error['message']));
@@ -119,7 +119,7 @@ public function isValid()
      */
     public function reset()
     {
-        $this->errors = array();
+        $this->errors = [];
         $this->errorMask = Validator::ERROR_NONE;
     }
 

diff --git a/src/JsonSchema/Constraints/CollectionConstraint.php b/src/JsonSchema/Constraints/CollectionConstraint.php
@@ -27,12 +27,12 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
     {
         // Verify minItems
         if (isset($schema->minItems) && count($value) < $schema->minItems) {
-            $this->addError(ConstraintError::MIN_ITEMS(), $path, array('minItems' => $schema->minItems));
+            $this->addError(ConstraintError::MIN_ITEMS(), $path, ['minItems' => $schema->minItems]);
         }
 
         // Verify maxItems
         if (isset($schema->maxItems) && count($value) > $schema->maxItems) {
-            $this->addError(ConstraintError::MAX_ITEMS(), $path, array('maxItems' => $schema->maxItems));
+            $this->addError(ConstraintError::MAX_ITEMS(), $path, ['maxItems' => $schema->maxItems]);
         }
 
         // Verify uniqueItems
@@ -101,11 +101,11 @@ protected function validateItems(&$value, $schema = null, ?JsonPointer $path = n
                             $this->addError(
                                 ConstraintError::ADDITIONAL_ITEMS(),
                                 $path,
-                                array(
+                                [
                                     'item' => $i,
                                     'property' => $k,
                                     'additionalItems' => $schema->additionalItems
-                                )
+                                ]
                             );
                         }
                     } else {

diff --git a/src/JsonSchema/Constraints/ConstConstraint.php b/src/JsonSchema/Constraints/ConstConstraint.php
@@ -44,6 +44,6 @@ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i =
             return;
         }
 
-        $this->addError(ConstraintError::CONSTANT(), $path, array('const' => $schema->const));
+        $this->addError(ConstraintError::CONSTANT(), $path, ['const' => $schema->const]);
     }
 }
diff --git a/src/JsonSchema/Constraints/Constraint.php b/src/JsonSchema/Constraints/Constraint.php
@@ -51,7 +51,7 @@ protected function incrementPath(?JsonPointer $path = null, $i)
         $path = $path->withPropertyPaths(
             array_merge(
                 $path->getPropertyPaths(),
-                array($i)
+                [$i]
             )
         );
 
@@ -85,7 +85,7 @@ protected function checkArray(&$value, $schema = null, ?JsonPointer $path = null
      * @param mixed            $patternProperties
      */
     protected function checkObject(&$value, $schema = null, ?JsonPointer $path = null, $properties = null,
-        $additionalProperties = null, $patternProperties = null, $appliedDefaults = array())
+        $additionalProperties = null, $patternProperties = null, $appliedDefaults = [])
     {
         /** @var ObjectConstraint $validator */
         $validator = $this->factory->createInstanceFor('object');

diff --git a/src/JsonSchema/Constraints/ConstraintInterface.php b/src/JsonSchema/Constraints/ConstraintInterface.php
@@ -40,7 +40,7 @@ public function addErrors(array $errors);
      * @param JsonPointer|null $path
      * @param array            $more       more array elements to add to the error
      */
-    public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = array());
+    public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = []);
 
     /**
      * checks if the validator has not raised errors

diff --git a/src/JsonSchema/Constraints/EnumConstraint.php b/src/JsonSchema/Constraints/EnumConstraint.php
@@ -47,6 +47,6 @@ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i =
             }
         }
 
-        $this->addError(ConstraintError::ENUM(), $path, array('enum' => $schema->enum));
+        $this->addError(ConstraintError::ENUM(), $path, ['enum' => $schema->enum]);
     }
 }
diff --git a/src/JsonSchema/Constraints/Factory.php b/src/JsonSchema/Constraints/Factory.php
@@ -39,7 +39,7 @@ class Factory
     /**
      * @var TypeCheck\TypeCheckInterface[]
      */
-    private $typeCheck = array();
+    private $typeCheck = [];
 
     /**
      * @var int Validation context
@@ -49,7 +49,7 @@ class Factory
     /**
      * @var array
      */
-    protected $constraintMap = array(
+    protected $constraintMap = [
         'array' => 'JsonSchema\Constraints\CollectionConstraint',
         'collection' => 'JsonSchema\Constraints\CollectionConstraint',
         'object' => 'JsonSchema\Constraints\ObjectConstraint',
@@ -62,12 +62,12 @@ class Factory
         'format' => 'JsonSchema\Constraints\FormatConstraint',
         'schema' => 'JsonSchema\Constraints\SchemaConstraint',
         'validator' => 'JsonSchema\Validator'
-    );
+    ];
 
     /**
      * @var array<ConstraintInterface>
      */
-    private $instanceCache = array();
+    private $instanceCache = [];
 
     /**
      * @param ?SchemaStorage         $schemaStorage