From 3ab6d25ec0b6c3115b99250561dfbd5d1455ffea Mon Sep 17 00:00:00 2001
From: Juan Lago <juan@leadsupply.dk>
Date: Wed, 20 Jun 2018 13:21:31 +0200
Subject: [PATCH 1/2] Fixed bug that prevent to set the settings to
 Webservices.

---
 src/Webservice/Settings.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Webservice/Settings.php b/src/Webservice/Settings.php
index 66dbe61..9beaa50 100644
--- a/src/Webservice/Settings.php
+++ b/src/Webservice/Settings.php
@@ -2,6 +2,8 @@
 
 namespace Nodes\NemId\PidCprMatch;
 
+use Nodes\NemId\Core\Mode;
+
 /**
  * Class Settings.
  *
@@ -49,6 +51,11 @@ class Settings
      */
     public function __construct(array $settings, $mode = null)
     {
+        // Fallback to default mode
+        if (!$mode || !($mode instanceof Mode)) {
+            $mode = new Mode();
+        }
+
         // Retrieve settings
         $this->settings = $settings;
 

From e270407fea9cf6c648e00e58e87fd0d650c6205f Mon Sep 17 00:00:00 2001
From: Juan Lago <juan@leadsupply.dk>
Date: Wed, 20 Jun 2018 13:23:26 +0200
Subject: [PATCH 2/2] MacOs and JetBrains project paths were added to
 gitignore.

---
 .gitignore | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8d8c6a3..71068d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,86 @@
 /vendor/
 /testcertificates/
 !/testcertificates/.gitkeep
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+