Merge pull request #1119 from wagnert/1.1

Fixed exception when application has not yet been loaded completely

CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 1.1.20
+
+## Bugfixes
+
+* Fixed issue with invald constructor generation for bean proxies
+* Fixed invalid order of hook invocation when initializing application
+
+## Features
+
+* None
+
 # Version 1.1.19
 
 ## Bugfixes

ROADMAP.md

@@ -67,11 +67,11 @@ implemented features have a look in the CHANGELOG.md or visit our [github](https
 - [x] Optimise naming directory for performance
 - [x] Authentication- and Authorization services
 - [ ] Extend Dependency Injection to support simple beans
-- [ ] Clean-Up Manager Interfaces and Managers
 
 ## Version 1.2.x
 - [ ] PHP 7
 - [ ] HTTP 2
+- [ ] Clean-Up Manager Interfaces and Managers
 - [ ] Allow direct execution of web application as PHAR file
 - [ ] Expose Stateless Session Beans as SOAP Web Service endpoint
 - [ ] 100 % Coverage for PHPUnit test suite for appserver project

UPGRADE-1.1.20.md

@@ -0,0 +1,3 @@
+# Upgrade from 1.1.19 to 1.1.20
+
+Updating from 1.1.19 to 1.1.20 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.19.

build.default.properties

@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.19
+release.version = 1.1.20
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

src/AppserverIo/Appserver/Application/Application.php

@@ -998,6 +998,9 @@ public function run()
                 $profileLogger->appendThreadContext('application');
             }
 
+            // invoke the application's managers postStartup() lifecycle callbacks
+            $this->postStartupManagers();
+
             // the application has successfully been initialized
             $this->synchronized(function ($self) {
                 $self->applicationState = ApplicationStateKeys::get(ApplicationStateKeys::INITIALIZATION_SUCCESSFUL);
@@ -1006,9 +1009,6 @@ public function run()
             // log a message that we has successfully been connected now
             \info(sprintf('%s has successfully been connected', $this->getName()));
 
-            // invoke the application's managers postStartup() lifecycle callbacks
-            $this->postStartupManagers();
-
             // initialize the flag to keep the application running
             $keepRunning = true;
 

src/AppserverIo/Appserver/PersistenceContainer/RemoteMethodInvocation/Proxy/RemoteProxy.dhtml

@@ -8,7 +8,7 @@ echo '<?php';
 namespace <?php echo $reflectionClass->getNamespaceName() ?>;
 
 class <?php echo $this->generateRemoteProxyClassName($reflectionClass); ?> extends \AppserverIo\RemoteMethodInvocation\RemoteProxy<?php if ($reflectionClass->getInterfaceNames()) { ?> implements <?php echo $this->generateImplements($reflectionClass); } ?> {
-    <?php foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflectionMethod) { ?>public function <?php echo $reflectionMethod->getName() ?>(<?php echo $this->generateMethodSignature($reflectionMethod) ?>) {
+    <?php foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflectionMethod) { ?><?php if ($reflectionMethod->isConstructor()) { continue; } ?>public function <?php echo $reflectionMethod->getName() ?>(<?php echo $this->generateMethodSignature($reflectionMethod) ?>) {
         return $this->__call('<?php echo $reflectionMethod->getName() ?>', array(<?php echo $this->generateMethodParams($reflectionMethod) ?>));
     }<?php } ?>
 }