Merge branch 'release/4.3'

Author: MKodde

.travis.yml

@@ -30,11 +30,6 @@ before_script:
 script:
   - ant
 
-branches:
-  only:
-    - master
-    - develop
-
 addons:
   apt:
     packages:

CHANGELOG.md

@@ -1,3 +1,7 @@
+4.3.3
+**Feature**
+*  Add internal-collabPersonId to attribute dictionary #111 
+
 # 4.3.2
 **Bugfix**
 * Secure the way the verifySignature method is used #104

src/Resources/config/saml_attributes.yml

@@ -170,6 +170,15 @@ services:
         tags:
             - { name: 'saml.attribute' }
 
+    saml.attribute.internalCollabPersonId:
+        class: Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition
+        arguments:
+            - internalCollabPersonId
+            - 'urn:mace:surf.nl:attribute-def:internal-collabPersonId'
+            - ~
+        tags:
+            - { name: 'saml.attribute' }
+
     saml.attribute.isMemberOf:
         class: Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition
         arguments: