Deprecate the 'userid.attribute' option. We should define specific options for each module using it, in order to avoid confussions.

# By dialogik
# Via Jaime Pérez Crespo (1) and dialogik (1)
* 'master' of github.com:simplesamlphp/simplesamlphp:
  Add trusted.url.domains default value change to upgrade notes
  Set trusted.url.domains default to array()

Set trusted.url.domains default to array()

Bugfix: if there's no session, getCookieSessionId() cannot return a session identifier, therefore there's no session we can return. This resolves #256.

# By Tim van Dijen
# Via Thijs Kinkhorst (1) and Tim van Dijen (1)
* 'master' of github.com:simplesamlphp/simplesamlphp:
  Update LDAP.php

Update LDAP.php

Fixed to follow PSR-2 coding guidelines, proper indentation and a minor fix in equality operand (== vs ===)

Update Negotiate.php

This commit addresses Issue 268 and makes the negotiate module a bit more configurable, like the ldap-module it's leaning on..

See https://github.com/simplesamlphp/simplesamlphp/issues/265

to a default value and then executing a test to change it.

Added some very basic tests for the AttributeAlter module.

Fixed a bug in how %replace is handled when 'target' is specified to avoid multiple attribute values
instead of replacing the attribute value.

Removed new call before makeException.

The `makeException` function returns an instantiated object, so the
caller shouldn't also call `new`.

# By ezero
# Via ezero
* 'master' of github.com:simplesamlphp/simplesamlphp:
  MINOR: When using HTTP protocol the $_SERVER['HTTPS'] is not set.

Checking for $_SERVER['HTTPS'] to be set, as it wasn't set when accessing simplesamlphp using HTTP protocol. This just gives a notice type error.