Merge pull request #1122 from wagnert/1.1

Add Doctrine like LDAP integration (see https://github.com/appserver-io/ldap)
appserver-io · May 21, 2019 · 48146f4 · 48146f4
2 parents 2a5be73 + 992c10c
commit 48146f4
Show file tree

Hide file tree

Showing 17 changed files with 1,800 additions and 178 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 1.1.21
+
+## Bugfixes
+
+* Fixed #1120
+
+## Features
+
+* Add Doctrine like LDAP integration (see https://github.com/appserver-io/ldap)
+
 # Version 1.1.20
 
 ## Bugfixes

diff --git a/UPGRADE-1.1.21.md b/UPGRADE-1.1.21.md
@@ -0,0 +1,3 @@
+# Upgrade from 1.1.20 to 1.1.21
+
+Updating from 1.1.20 to 1.1.21 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.20.
diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.20
+release.version = 1.1.21
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
         "react/socket-client": "0.5.0",
         "doctrine/orm": "2.5.*",
         "league/event": "2.1.*",
+        "symfony/ldap": "3.4.7",
         "symfony/var-dumper": "3.4.7",
         "zendframework/zend-diactoros" : "1.4.*",
         "appserver-io-psr/di": "3.0.*",
@@ -28,6 +29,7 @@
         "appserver-io/rmi": "3.2.*",
         "appserver-io/http": "2.2.*",
         "appserver-io/lang": "3.0.*",
+        "appserver-io/ldap": "2.0.*",
         "appserver-io/logger": "2.0.*",
         "appserver-io/fastcgi" : "2.0.*",
         "appserver-io/storage": "2.0.*",