simplifying

Author: tmilos

composer.json

@@ -20,8 +20,6 @@
         }
     },
     "require": {
-        "tmilos/value": "~2.0.1",
-        "doctrine/collections": "^1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.6",

composer.lock

@@ -11,19 +11,17 @@
 
 namespace Tmilos\ScimSchema\Builder;
 
-use Tmilos\ScimSchema\Model\Attribute;
-use Tmilos\ScimSchema\Model\AttributeTypeValue;
-use Tmilos\ScimSchema\Model\MutabilityValue;
-use Tmilos\ScimSchema\Model\ReferenceTypeValue;
-use Tmilos\ScimSchema\Model\ReturnedValue;
-use Tmilos\ScimSchema\Model\UniquenessValue;
+use Tmilos\ScimSchema\Model\Schema\Attribute;
+use Tmilos\ScimSchema\Model\Schema\MutabilityValue;
+use Tmilos\ScimSchema\Model\Schema\ReturnedValue;
+use Tmilos\ScimSchema\Model\Schema\UniquenessValue;
 
 class AttributeBuilder
 {
     /** @var string */
     protected $name;
 
-    /** @var AttributeTypeValue */
+    /** @var string */
     protected $type;
 
     /** @var bool */
@@ -44,26 +42,26 @@ class AttributeBuilder
     /** @var bool */
     protected $caseExact = false;
 
-    /** @var MutabilityValue */
+    /** @var string */
     protected $mutability;
 
-    /** @var ReturnedValue */
+    /** @var string */
     protected $returned;
 
-    /** @var UniquenessValue */
+    /** @var string */
     protected $uniqueness;
 
     /** @var string[] */
     protected $referenceTypes = [];
 
     /**
-     * @param string             $name
-     * @param AttributeTypeValue $type
-     * @param string             $description
+     * @param string $name
+     * @param string $type
+     * @param string $description
      *
      * @return AttributeBuilder
      */
-    public static function create($name, AttributeTypeValue $type, $description = null)
+    public static function create($name, $type, $description = null)
     {
         $result = new static();
         $result->name = $name;
@@ -75,9 +73,9 @@ public static function create($name, AttributeTypeValue $type, $description = nu
 
     protected function __construct()
     {
-        $this->mutability = MutabilityValue::READ_WRITE();
-        $this->returned = ReturnedValue::BY_DEFAULT();
-        $this->uniqueness = UniquenessValue::NONE();
+        $this->mutability = MutabilityValue::READ_WRITE;
+        $this->returned = ReturnedValue::BY_DEFAULT;
+        $this->uniqueness = UniquenessValue::NONE;
     }
 
     /**
@@ -138,35 +136,35 @@ public function setCaseExact($caseExact)
     }
 
     /**
-     * @param MutabilityValue $mutability
+     * @param string $mutability
      *
      * @return AttributeBuilder
      */
-    public function setMutability(MutabilityValue $mutability)
+    public function setMutability($mutability)
     {
         $this->mutability = $mutability;
 
         return $this;
     }
 
     /**
-     * @param ReturnedValue $returned
+     * @param string $returned
      *
      * @return AttributeBuilder
      */
-    public function setReturned(ReturnedValue $returned)
+    public function setReturned($returned)
     {
         $this->returned = $returned;
 
         return $this;
     }
 
     /**
-     * @param UniquenessValue $uniqueness
+     * @param string $uniqueness
      *
      * @return AttributeBuilder
      */
-    public function setUniqueness(UniquenessValue $uniqueness)
+    public function setUniqueness($uniqueness)
     {
         $this->uniqueness = $uniqueness;
 
@@ -227,13 +225,13 @@ public function setReferenceTypes(array $referenceTypes)
     }
 
     /**
-     * @param ReferenceTypeValue $referenceType
+     * @param string $referenceType
      *
      * @return AttributeBuilder
      */
-    public function addReferenceType(ReferenceTypeValue $referenceType)
+    public function addReferenceType($referenceType)
     {
-        $this->referenceTypes[] = $referenceType->getValue();
+        $this->referenceTypes[] = $referenceType;
 
         return $this;
     }

src/Builder/AttributeBuilder.php

@@ -107,7 +107,7 @@ public function buildUser()
         $result->setDescription('User Account');
         $result->setEndpoint('/Users');
         $result->setSchema(Schema::USER);
-        $result->addSchemaExtension(Schema::ENTERPRISE_USER, true);
+        $result->addSchemaExtension(Schema::ENTERPRISE_USER, false);
         $result->getMeta()->setLocation($this->locationBase.'/ResourceTypes/'.$result->getId());
 
         return $result;

src/Builder/ResourceTypeBuilder.php

@@ -11,8 +11,27 @@
 
 namespace Tmilos\ScimSchema;
 
+use Tmilos\ScimSchema\Model\Schema\Attribute;
+
 abstract class Helper
 {
+    /**
+     * @param string      $name
+     * @param Attribute[] $attributes
+     *
+     * @return Attribute|null
+     */
+    public static function findAttribute($name, $attributes)
+    {
+        foreach ($attributes as $attribute) {
+            if ($attribute->getName() === $name) {
+                return $attribute;
+            }
+        }
+
+        return null;
+    }
+
     public static function dateTime2string(\DateTime $dateTime)
     {
         if ($dateTime->getTimezone()->getName() === \DateTimeZone::UTC) {

src/Builder/SchemaBuilder.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the tmilos/scim-schema package.
+ *
+ * (c) Milos Tomic <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Tmilos\ScimSchema\Model;
+
+interface DeserializableInterface
+{
+    /**
+     * @param array $data
+     *
+     * @return object
+     */
+    public static function deserializeObject(array $data);
+}