add ListResponse and more tests

tmilos · Nov 25, 2017 · d041c9b · d041c9b
1 parent cf2cc1c
commit d041c9b
Show file tree

Hide file tree

Showing 32 changed files with 397 additions and 161 deletions.
diff --git a/src/Accessor/PropertyAccessor.php b/src/Accessor/PropertyAccessor.php
diff --git a/src/Builder/SchemaBuilder.php b/src/Builder/SchemaBuilder.php
@@ -39,7 +39,7 @@ public function setSchemasEndpointUrl($schemasEndpointUrl)
     /**
      * @param string $schemaId
      *
-     * @return Schema
+     * @return \Tmilos\ScimSchema\Model\v1\Schema|\Tmilos\ScimSchema\Model\v2\Schema|Schema
      */
     public function get($schemaId)
     {

diff --git a/src/Builder/SchemaBuilderV1.php b/src/Builder/SchemaBuilderV1.php
@@ -2066,6 +2066,11 @@ class SchemaBuilderV1 extends SchemaBuilder
         ),
     );
 
+    public function __construct($schemasEndpointUrl = null)
+    {
+        parent::__construct($schemasEndpointUrl ?: 'http://localhost/'.ScimConstantsV1::ENDPOINT_SCHEMAS);
+    }
+
     protected function getSchemaClass()
     {
         return Schema::class;

diff --git a/src/Model/ListResponse.php b/src/Model/ListResponse.php
@@ -74,7 +74,7 @@ public function getResources()
     public function serializeObject()
     {
         $result = [
-            'schemas' => [Schema::LIST_RESPONSE],
+            'schemas' => $this->getSchemas(),
             'totalResults' => $this->totalResults,
             'Resources' => [],
         ];

diff --git a/src/Model/Resource.php b/src/Model/Resource.php
@@ -150,9 +150,11 @@ protected static function deserializeCommonAttributes(array $data)
         if (isset($arr['externalId'])) {
             $result->externalId = $data['externalId'];
         }
-        foreach ($data['schemas'] as $schemaId) {
-            if ($schemaId != $result->getSchemaId()) {
-                $result->extensions[$schemaId] = isset($data[$schemaId]) ? $data[$schemaId] : null;
+        if (isset($data['schemas'])) {
+            foreach ($data['schemas'] as $schemaId) {
+                if ($schemaId != $result->getSchemaId()) {
+                    $result->extensions[$schemaId] = isset($data[$schemaId]) ? $data[$schemaId] : null;
+                }
             }
         }
 

diff --git a/src/Model/ServiceProviderConfig.php b/src/Model/ServiceProviderConfig.php
@@ -139,6 +139,7 @@ public function getAuthenticationSchemes()
     public function serializeObject()
     {
         $result = parent::serializeObject();
+        unset($result['id']);
 
         if ($this->documentationUri) {
             $result['documentationUri'] = $this->documentationUri;

diff --git a/src/Model/v1/ListResponse.php b/src/Model/v1/ListResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tmilos\ScimSchema\Model\v1;
+
+use Tmilos\ScimSchema\ScimConstantsV1;
+
+class ListResponse extends \Tmilos\ScimSchema\Model\ListResponse
+{
+    public function getSchemaId()
+    {
+        return ScimConstantsV1::MESSAGE_LIST_RESPONSE;
+    }
+}
diff --git a/src/Model/v1/Schema.php b/src/Model/v1/Schema.php
@@ -19,4 +19,23 @@ public function getSchemaId()
     {
         return ScimConstantsV1::SCHEMA_SCHEMA;
     }
+
+    public function serializeObject()
+    {
+        $parentValue = parent::serializeObject();
+
+        $result = [
+            'id' => $parentValue['id'],
+            'schema' => ScimConstantsV1::CORE,
+        ];
+
+        unset($parentValue['id']);
+        unset($parentValue['schemas']);
+
+        foreach ($parentValue as $k=>$v) {
+            $result[$k] = $v;
+        }
+
+        return $result;
+    }
 }
diff --git a/src/Model/v1/ServiceProviderConfig.php b/src/Model/v1/ServiceProviderConfig.php
@@ -17,6 +17,6 @@ class ServiceProviderConfig extends \Tmilos\ScimSchema\Model\ServiceProviderConf
 {
     public function getSchemaId()
     {
-        return ScimConstantsV1::SCHEMA_SERVICE_PROVIDER_CONFIG;
+        return ScimConstantsV1::CORE;
     }
 }
diff --git a/src/Model/v2/ListResponse.php b/src/Model/v2/ListResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tmilos\ScimSchema\Model\v2;
+
+use Tmilos\ScimSchema\ScimConstantsV2;
+
+class ListResponse extends \Tmilos\ScimSchema\Model\ListResponse
+{
+    public function getSchemaId()
+    {
+        return ScimConstantsV2::MESSAGE_LIST_RESPONSE;
+    }
+}
diff --git a/src/ScimConstantsV1.php b/src/ScimConstantsV1.php
@@ -13,11 +13,12 @@
 
 abstract class ScimConstantsV1
 {
-    const SCHEMA_USER = 'urn:scim:schemas:core:1.0';
+    const CORE = 'urn:scim:schemas:core:1.0';
+    const SCHEMA_USER = 'urn:scim:schemas:core:1.0:User';
     const SCHEMA_ENTERPRISE_USER = 'urn:scim:schemas:extension:enterprise:1.0';
-    const SCHEMA_GROUP = 'urn:scim:schemas:core:1.0';
-    const SCHEMA_SERVICE_PROVIDER_CONFIG = 'urn:scim:schemas:core:1.0';
-    const SCHEMA_SCHEMA = 'urn:scim:schemas:core:1.0';
+    const SCHEMA_GROUP = 'urn:scim:schemas:core:1.0:Group';
+    const SCHEMA_SERVICE_PROVIDER_CONFIG = 'urn:scim:schemas:core:1.0:Service Provider Configuration';
+    const SCHEMA_SCHEMA = 'urn:scim:schemas:core:1.0:Schema';
 
     const MESSAGE_LIST_RESPONSE = 'urn:scim:schemas:core:1.0';
     const MESSAGE_SEARCH_REQUEST = 'urn:ietf:params:scim:api:messages:2.0:SearchRequest';

diff --git a/tests/Builder/ResourceTypeBuilderTest.php b/tests/Builder/ResourceTypeBuilderTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Tmilos\ScimSchema\Builder;
 
+use Tests\Tmilos\ScimSchema\TestHelper;
 use Tmilos\ScimSchema\Builder\ResourceTypeBuilder;
 use Tmilos\ScimSchema\ScimConstants;
 
@@ -17,16 +18,6 @@ public function test_group()
         $resourceTypes[] = $builder->build(ScimConstants::RESOURCE_TYPE_SCHEMA)->serializeObject();
         $resourceTypes[] = $builder->build(ScimConstants::RESOURCE_TYPE_RESOURCE_TYPE)->serializeObject();
 
-        $this->assertEquals($this->getExpected(), $resourceTypes);
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpected()
-    {
-        $json = file_get_contents(__DIR__.'/resource_type.all.json');
-
-        return json_decode($json, true);
+        $this->assertEquals(TestHelper::getExpected('v2.resource_type.all.json'), $resourceTypes);
     }
 }
diff --git a/tests/Builder/SchemaBuilderV1Test.php b/tests/Builder/SchemaBuilderV1Test.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Tmilos\ScimSchema\Builder;
+
+use Tests\Tmilos\ScimSchema\TestHelper;
+use Tmilos\ScimSchema\Builder\SchemaBuilderV1;
+
+class SchemaBuilderV1Test extends \PHPUnit_Framework_TestCase
+{
+    public function test_group()
+    {
+        $builder = new SchemaBuilderV1();
+        $schema = $builder->getGroup()->serializeObject();
+
+        TestHelper::compare(TestHelper::getExpected('v1.schema.group.json'), $schema, $this);
+    }
+}
diff --git a/tests/Builder/SchemaBuilderV2Test.php b/tests/Builder/SchemaBuilderV2Test.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Tmilos\ScimSchema\Builder;
 
+use Tests\Tmilos\ScimSchema\TestHelper;
 use Tmilos\ScimSchema\Builder\SchemaBuilderV2;
 
 class SchemaBuilderV2Test extends \PHPUnit_Framework_TestCase
@@ -11,130 +12,46 @@ public function test_group()
         $builder = new SchemaBuilderV2();
         $schema = $builder->getGroup()->serializeObject();
 
-        $this->compare($this->getExpectedGroup(), $schema);
+        TestHelper::compare(TestHelper::getExpected('v2.schema.group.json'), $schema, $this);
     }
 
     public function test_user()
     {
         $builder = new SchemaBuilderV2();
         $schema = $builder->getUser()->serializeObject();
 
-        $this->compare($this->getExpectedUser(), $schema);
+        TestHelper::compare(TestHelper::getExpected('v2.schema.user.json'), $schema, $this);
     }
 
     public function test_schema()
     {
         $builder = new SchemaBuilderV2();
         $schema = $builder->getSchema()->serializeObject();
 
-        $this->compare($this->getExpectedSchema(), $schema);
+        TestHelper::compare(TestHelper::getExpected('v2.schema.schema.json'), $schema, $this);
     }
 
     public function test_resource_type()
     {
         $builder = new SchemaBuilderV2();
         $schema = $builder->getResourceType()->serializeObject();
 
-        $this->compare($this->getExpectedResourceType(), $schema);
+        TestHelper::compare(TestHelper::getExpected('v2.schema.resource_type.json'), $schema, $this);
     }
 
     public function test_service_provider_config()
     {
         $builder = new SchemaBuilderV2();
         $schema = $builder->getServiceProviderConfig()->serializeObject();
 
-        $this->compare($this->getExpectedServiceProviderConfig(), $schema);
+        TestHelper::compare(TestHelper::getExpected('v2.schema.service_provider_config.json'), $schema, $this);
     }
 
     public function test_enterprise_user()
     {
         $builder = new SchemaBuilderV2();
         $schema = $builder->getEnterpriseUser()->serializeObject();
 
-        $this->compare($this->getExpectedEnterpriseUser(), $schema);
-    }
-
-    private function compare($expected, $actual)
-    {
-        $expectedArr = explode("\n", str_replace("\r", '', json_encode($expected, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)));
-        $actualArr = explode("\n", str_replace("\r", '', json_encode($actual, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)));
-
-        $minSize = min(count($expectedArr), count($actualArr));
-        for ($i=0; $i<$minSize; $i++) {
-            if ($expectedArr[$i] != $actualArr[$i]) {
-                $expectedArr[$i] = '!'.$expectedArr[$i];
-                $actualArr[$i] = '!'.$actualArr[$i];
-                print "\nMismatch at line $i:\n";
-                $start = $i - 10;
-                if ($start < 0) { $start = 0; }
-                $expectedBuffer = implode("\n", array_slice($expectedArr, $start, 20));
-                $actualBuffer = implode("\n", array_slice($actualArr, $start, 20));
-
-                print "Expected:\n$expectedBuffer\n\nbut got:\n$actualBuffer\n";
-
-                $this->fail();
-            }
-        }
-
-        $this->assertEquals($expected, $actual);
-    }
-
-    private function getExpected($filename)
-    {
-        $json = trim(file_get_contents(__DIR__.'/'.$filename));
-        $result = json_decode($json, true);
-        if (!$result) {
-            $this->fail("Error json decoding file '$filename': ".json_last_error_msg());
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedGroup()
-    {
-        return $this->getExpected('schema.group.json');
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedUser()
-    {
-        return $this->getExpected('schema.user.json');
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedSchema()
-    {
-        return $this->getExpected('schema.schema.json');
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedResourceType()
-    {
-        return $this->getExpected('schema.resource_type.json');
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedServiceProviderConfig()
-    {
-        return $this->getExpected('schema.service_provider_config.json');
-    }
-
-    /**
-     * @return \stdClass
-     */
-    private function getExpectedEnterpriseUser()
-    {
-        return $this->getExpected('schema.enterprise_user.json');
+        TestHelper::compare(TestHelper::getExpected('v2.schema.enterprise_user.json'), $schema, $this);
     }
 }
diff --git a/tests/Builder/ServiceProviderConfigBuilderV1Test.php b/tests/Builder/ServiceProviderConfigBuilderV1Test.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Tmilos\ScimSchema\Builder;
+
+use Tests\Tmilos\ScimSchema\TestHelper;
+use Tmilos\ScimSchema\Builder\ServiceProviderConfigBuilderV1;
+
+class ServiceProviderConfigBuilderV1Test extends \PHPUnit_Framework_TestCase
+{
+    public function test_builds_default_service_provider_config()
+    {
+        $builder = new ServiceProviderConfigBuilderV1();
+        $spc = $builder->buildServiceProviderConfig();
+        $arr = $spc->serializeObject();
+
+        $this->assertEquals(TestHelper::getExpected('v1.service_provider_config.default.json'), $arr);
+    }
+}