Update swaggest/json-schema to fix const handling (#41)

Author: vearutop

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.33] - 2021-05-27
+
+### Fixes
+- Handling of `const` constraints in generated classes.
+
 ## [0.2.32] - 2021-04-25
 
 ### Added
@@ -88,6 +93,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Description trimming bug.
 
+[0.2.33]: https://github.com/swaggest/php-code-builder/compare/v0.2.32...v0.2.33
 [0.2.32]: https://github.com/swaggest/php-code-builder/compare/v0.2.31...v0.2.32
 [0.2.31]: https://github.com/swaggest/php-code-builder/compare/v0.2.30...v0.2.31
 [0.2.30]: https://github.com/swaggest/php-code-builder/compare/v0.2.29...v0.2.30

composer.json

@@ -14,7 +14,7 @@
   ],
   "require": {
     "ext-json": "*",
-    "swaggest/json-schema": "^0.12.31",
+    "swaggest/json-schema": "^0.12.33",
     "swaggest/code-builder": "^0.3.4",
     "php": ">=5.6.0"
   },

composer.lock

@@ -0,0 +1,78 @@
+<?php
+
+namespace Swaggest\PhpCodeBuilder\Tests\PHPUnit\Issues;
+
+use Swaggest\JsonSchema\Exception\ConstException;
+use Swaggest\JsonSchema\Exception\ObjectException;
+use Swaggest\JsonSchema\Schema;
+use Swaggest\PhpCodeBuilder\App\PhpApp;
+use Swaggest\PhpCodeBuilder\JsonSchema\ClassHookCallback;
+use Swaggest\PhpCodeBuilder\JsonSchema\PhpBuilder;
+use Swaggest\PhpCodeBuilder\PhpClass;
+use Swaggest\PhpCodeBuilder\Tests\Tmp\Issue40\Sample;
+
+/**
+ * @see https://github.com/swaggest/php-code-builder/issues/40
+ */
+class Issue40Test extends \PHPUnit_Framework_TestCase
+{
+    function testIssue40()
+    {
+        $schemaJson = <<<'JSON'
+{
+  "type": "object",
+  "properties": {
+    "foo": {
+      "type": "string",
+      "const":"abc"
+    }
+  }
+}
+JSON;
+
+        $appPath = realpath(__DIR__ . '/../../Tmp') . '/Issue40';
+        $appNs = 'Swaggest\PhpCodeBuilder\Tests\Tmp\\Issue40';
+
+        $app = new PhpApp();
+        $app->setNamespaceRoot($appNs, '.');
+
+        $schema = Schema::import(json_decode($schemaJson));
+        $builder = new PhpBuilder();
+        $builder->buildSetters = false;
+        $builder->makeEnumConstants = true;
+
+        $builder->classCreatedHook = new ClassHookCallback(
+            function (PhpClass $class, $path, $schema) use ($app, $appNs) {
+                $class->setNamespace($appNs);
+                if ('#' === $path) {
+                    $class->setName('Sample'); // Class name for root schema
+                }
+                $app->addClass($class);
+            }
+        );
+
+
+        $builder->getType($schema);
+
+        $app->clearOldFiles($appPath);
+        $app->store($appPath);
+
+        exec('git diff ' . $appPath, $out);
+        $out = implode("\n", $out);
+        $this->assertSame('', $out, "Generated files changed");
+
+    }
+
+
+    function testGeneratedInvalid()
+    {
+        $this->setExpectedException(ConstException::class, 'Const failed at #->$ref[#/definitions/Swaggest\PhpCodeBuilder\Tests\Tmp\Issue40\Sample]->properties:foo');
+        Sample::import((object)array('foo' => 'bar'));
+    }
+
+    function testGeneratedValid()
+    {
+        Sample::import((object)array('foo' => 'abc'));
+    }
+
+}

tests/src/PHPUnit/Issues/Issue40Test.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * @file ATTENTION!!! The code below was carefully crafted by a mean machine.
+ * Please consider to NOT put any emotional human-generated modifications as the splendid AI will throw them away with no mercy.
+ */
+
+namespace Swaggest\PhpCodeBuilder\Tests\Tmp\Issue40;
+
+use Swaggest\JsonSchema\Constraint\Properties;
+use Swaggest\JsonSchema\Schema;
+use Swaggest\JsonSchema\Structure\ClassStructure;
+
+
+class Sample extends ClassStructure
+{
+    /** @var string */
+    public $foo;
+
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $properties->foo = Schema::string();
+        $properties->foo->const = "abc";
+        $ownerSchema->type = Schema::OBJECT;
+    }
+}