Merge remote-tracking branch 'origin/development'

ConductionNL · Jan 3, 2020 · 4798447 · 4798447
2 parents 9d65a17 + 4e17ae5
commit 4798447
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 519 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/api/src/Entity/Catalogue.php b/api/src/Entity/Catalogue.php
@@ -35,7 +35,6 @@ class Catalogue
 {
     /**
      * @var UuidInterface The UUID identifier of this object
-     *
      * @example e2984465-190a-4562-829e-a8cca81aa35d
      *
      * @Groups({"read"})
@@ -49,22 +48,8 @@ class Catalogue
 
     /**
      * @var string The name of this Catalogue
-     *
      * @example My Catalogue
      *
-     * @ApiProperty(
-     * 	   iri="http://schema.org/name",
-     *     attributes={
-     *         "swagger_context"={
-     *         	   "description" = "The name of this Catalogue",
-     *             "type"="string",
-     *             "example"="My Catalogue",
-     *             "maxLength"="255",
-     *             "required" = true
-     *         }
-     *     }
-     * )
-     *
      * @Assert\NotNull
      * @Assert\Length(
      *      max = 255
@@ -76,21 +61,8 @@ class Catalogue
 
     /**
      * @var string An short description of this Catalogue
-     *
      * @example This is the best catalogue ever
      *
-     * @ApiProperty(
-     * 	   iri="https://schema.org/description",
-     *     attributes={
-     *         "swagger_context"={
-     *         	   "description" = "An short description of this Catalogue",
-     *             "type"="string",
-     *             "example"="This is the best catalogue ever",
-     *             "maxLength"="2550"
-     *         }
-     *     }
-     * )
-     *
      * @Assert\Length(
      *      max = 2550
      * )
@@ -101,22 +73,8 @@ class Catalogue
 
     /**
      * @var string The logo for this component
-     *
      * @example https://www.my-organization.com/logo.png
      *
-     * @ApiProperty(
-     * 	   iri="https://schema.org/logo",
-     *     attributes={
-     *         "swagger_context"={
-     *         	   "description" = "The logo for this component",
-     *             "type"="string",
-     *             "format"="url",
-     *             "example"="https://www.my-organization.com/logo.png",
-     *             "maxLength"=255
-     *         }
-     *     }
-     * )
-     *
      * @Assert\Url
      * @Assert\Length(
      *      max = 255
@@ -128,21 +86,8 @@ class Catalogue
 
     /**
      * @var string The RSIN of the organization that provides this catalogue
-     *
      * @example 002851234
      *
-     * @ApiProperty(
-     *     attributes={
-     *         "swagger_context"={
-     *         	   "description" = "The RSIN of the organization that provides this catalogue",
-     *             "type"="string",
-     *             "example"="002851234",
-     *              "maxLength"="255",
-     *             "required" = true
-     *         }
-     *     }
-     * )
-     *
      * @Assert\NotNull
      * @Assert\Length(
      *      min = 8,

diff --git a/api/src/Entity/CustomerType.php b/api/src/Entity/CustomerType.php
@@ -34,7 +34,6 @@ class CustomerType
 {
     /**
      * @var UuidInterface The UUID identifier of this object
-     *
      * @example e2984465-190a-4562-829e-a8cca81aa35d
      *
      * @Groups({"read"})
@@ -48,7 +47,6 @@ class CustomerType
 
     /**
      * @var string The name of this CustomerType
-     *
      * @example My CustomerType
      *
      * @Groups({"read","write"})
@@ -62,7 +60,6 @@ class CustomerType
 
     /**
      * @var string The description for this CustomerType
-     *
      * @example this is the best customertype ever
      *
      * @Groups({"read","write"})