Merge remote-tracking branch 'upstream/master'

ConductionNL · Jan 21, 2020 · a850dfc · a850dfc
2 parents 74c1d43 + a9aef16
commit a850dfc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/.env b/.env
@@ -24,7 +24,6 @@ APP_BUILD=dev
 # The description for this api
 APP_DESCRIPTION='This component provides a products and services catalogue that can be used by a order component in order to provide the products in the orders with better details. The design considerations are given in [DESIGN.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN.md) and [DESIGN-PDC.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN-PDC.md)'
 
-
 APP_LOGO=pc.zaakonline.nl
 APP_HOME=pc.zaakonline.nl
 

diff --git a/api/src/Swagger/SwaggerDecorator.php b/api/src/Swagger/SwaggerDecorator.php
@@ -442,7 +442,7 @@ private function getAdditionalEntityDocs($entity)
                         $groups = $propertyAnnotation->getGroups();
                         break;
 
-                    // Constrainds (Validation)
+                        // Constrainds (Validation)
                     case "Assert\Date":
                         $atributes['type'] = 'string';
                         $atributes['format'] = 'date';

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -180,7 +180,7 @@ services:
   #    - db-data:/var/lib/postgresql/data:rw
 
   db:
-    image: mysql:5.6
+    image: mysql:5.7
     restart: always
     environment:
       - MYSQL_ROOT_PASSWORD=example

diff --git a/openapi.yaml b/openapi.yaml
@@ -0,0 +1 @@
+api/public/schema/openapi.yaml
diff --git a/publiccode.yaml b/publiccode.yaml
@@ -0,0 +1 @@
+api/public/schema/publiccode.yaml