Skip to content

Commit

Permalink
Merge pull request #1129 from wagnert/1.1
Browse files Browse the repository at this point in the history
Extend error handling with exception support
  • Loading branch information
wagnert authored Jun 22, 2019
2 parents ae73a48 + 2bf176d commit e0b8891
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 77 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ matrix:
before_install:
- if [[ "$TRAVIS_PHP_VERSION" < "7.0" ]]; then pecl install pthreads-2.0.10; fi
- if [[ "$TRAVIS_PHP_VERSION" = "7.0" ]] || [[ "$TRAVIS_PHP_VERSION" > "7.0" ]]; then pecl install pthreads-3.1.6; fi
- pecl install xdebug-2.5.5
- phpenv rehash
- wget https://scrutinizer-ci.com/ocular.phar
- wget https://getcomposer.org/composer.phar
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# Version 1.1.23

## Bugfixes

* None

## Features

* Extend error handling with exception support
* Add encryption support for LDAP functionality
* Update to appserver-io/ldap version 3.0.*
* Update to appserver-io/description version 33.0.*
* Update to appserver-io/provisioning version 2.0.*
* Update to appserver-io-psr/cli version 2.0.*
* Update to appserver-io-psr/application-server version 2.0.*

# Version 1.1.22

## Bugfixes
Expand Down
3 changes: 3 additions & 0 deletions UPGRADE-1.1.23.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Upgrade from 1.1.22 to 1.1.23

Updating from 1.1.22 to 1.1.23 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.23.
2 changes: 1 addition & 1 deletion build.default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
;--------------------------------------------------------------------------------

; ---- Module Release Settings --------------------------------------------------
release.version = 1.1.22
release.version = 1.1.23
release.name = Iron Knight

; ---- PHPCPD Settings ----------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
"appserver-io-psr/epb": "7.0.*",
"appserver-io-psr/pms": "2.0.*",
"appserver-io-psr/mop": "2.0.*",
"appserver-io-psr/cli": "1.0.*",
"appserver-io-psr/cli": "2.0.*",
"appserver-io-psr/auth": "2.0.*",
"appserver-io-psr/naming": "1.1.*",
"appserver-io-psr/servlet": "4.1.*",
"appserver-io-psr/security": "1.4.*",
"appserver-io-psr/deployment": "2.0.*",
"appserver-io-psr/application": "1.5.*",
"appserver-io-psr/application-server": "1.0.*",
"appserver-io-psr/application-server": "2.0.*",
"appserver-io/rmi": "3.2.*",
"appserver-io/http": "2.2.*",
"appserver-io/lang": "3.0.*",
"appserver-io/ldap": "2.0.*",
"appserver-io/ldap": "3.0.*",
"appserver-io/logger": "2.0.*",
"appserver-io/fastcgi" : "2.0.*",
"appserver-io/storage": "2.0.*",
Expand All @@ -39,10 +39,10 @@
"appserver-io/dnsserver": "2.0.*",
"appserver-io/single-app": "3.0.*",
"appserver-io/properties": "2.1.*",
"appserver-io/provisioning": "1.0.*",
"appserver-io/provisioning": "2.0.*",
"appserver-io/concurrency": "0.3.*",
"appserver-io/robo-tasks": "0.2.*",
"appserver-io/description": "12.0.*",
"appserver-io/description": "13.0.*",
"appserver-io/authenticator": "1.0.*",
"appserver-io/configuration": "3.0.*",
"appserver-io/doppelgaenger": "1.7.*",
Expand Down
Loading

0 comments on commit e0b8891

Please sign in to comment.