PHP5 test failures

finally is not supported with PHP < 5.5 and we still support
PHP 5.3 and PHP 5.4

17 files changed, 59 insertions, 18 deletions

diff --git a/php/test/Ice/acm/Client.php b/php/test/Ice/acm/Client.php
index bafcbb62101..3235e33b2ee 100644
--- a/php/test/Ice/acm/Client.php
+++ b/php/test/Ice/acm/Client.php
@@ -117,10 +117,12 @@ class Client extends TestHelper
             testHeartbeatManual($this, $com);
 
             $com->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/binding/Client.php b/php/test/Ice/binding/Client.php
index 19b177151c6..b0ee949457f 100644
--- a/php/test/Ice/binding/Client.php
+++ b/php/test/Ice/binding/Client.php
@@ -526,10 +526,12 @@ class Client extends TestHelper
         {
             $communicator = $this->initialize($args);
             allTests($this);
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/checksum/Client.php b/php/test/Ice/checksum/Client.php
index ed9f3806957..c3afa3ae338 100644
--- a/php/test/Ice/checksum/Client.php
+++ b/php/test/Ice/checksum/Client.php
@@ -22,10 +22,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $checksum = allTests($this);
             $checksum->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/enums/Client.php b/php/test/Ice/enums/Client.php
index cda901fbca6..18d33356810 100644
--- a/php/test/Ice/enums/Client.php
+++ b/php/test/Ice/enums/Client.php
@@ -237,10 +237,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php
index bb9bc1534ea..101e22baa80 100644
--- a/php/test/Ice/exceptions/Client.php
+++ b/php/test/Ice/exceptions/Client.php
@@ -427,10 +427,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($properties);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/facets/Client.php b/php/test/Ice/facets/Client.php
index f4cd7b71aee..0b06e5ca37d 100644
--- a/php/test/Ice/facets/Client.php
+++ b/php/test/Ice/facets/Client.php
@@ -118,10 +118,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/info/Client.php b/php/test/Ice/info/Client.php
index f677aaf689b..6c874521b7a 100644
--- a/php/test/Ice/info/Client.php
+++ b/php/test/Ice/info/Client.php
@@ -190,10 +190,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php
index f84f629707d..e4ca99c0e64 100644
--- a/php/test/Ice/inheritance/Client.php
+++ b/php/test/Ice/inheritance/Client.php
@@ -228,10 +228,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php
index 735d9002467..1f3fc51a491 100644
--- a/php/test/Ice/objects/Client.php
+++ b/php/test/Ice/objects/Client.php
@@ -562,10 +562,12 @@ class Client extends TestHelper
             $communicator->addObjectFactory(new MyObjectFactory(), "TestOF");
             $initial = allTests($this);
             $initial->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php
index bf2565968e7..3d99af5887e 100644
--- a/php/test/Ice/optional/Client.php
+++ b/php/test/Ice/optional/Client.php
@@ -836,10 +836,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy = allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
        }
     }
 }
diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php
index d17d5f85f01..c6964b3e797 100644
--- a/php/test/Ice/proxy/Client.php
+++ b/php/test/Ice/proxy/Client.php
@@ -869,10 +869,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy= allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Ice/scope/Client.php b/php/test/Ice/scope/Client.php
index 8dc23584aad..8f68976078c 100644
--- a/php/test/Ice/scope/Client.php
+++ b/php/test/Ice/scope/Client.php
@@ -129,10 +129,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             allTests($this);
             echo "ok\n";
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
        }
     }
 }
diff --git a/php/test/Ice/slicing/exceptions/Client.php b/php/test/Ice/slicing/exceptions/Client.php
index 7d77344e8f6..4233cb8b67e 100644
--- a/php/test/Ice/slicing/exceptions/Client.php
+++ b/php/test/Ice/slicing/exceptions/Client.php
@@ -424,10 +424,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy = allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
        }
     }
 }
diff --git a/php/test/Ice/slicing/objects/Client.php b/php/test/Ice/slicing/objects/Client.php
index 6ff4e5b8748..eab02bab60a 100644
--- a/php/test/Ice/slicing/objects/Client.php
+++ b/php/test/Ice/slicing/objects/Client.php
@@ -1064,10 +1064,12 @@ class Client extends TestHelper
             $communicator = $this->initialize($args);
             $proxy = allTests($this);
             $proxy->shutdown();
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
        }
     }
 }
diff --git a/php/test/Ice/timeout/Client.php b/php/test/Ice/timeout/Client.php
index 45ce15d9051..41447467fc5 100644
--- a/php/test/Ice/timeout/Client.php
+++ b/php/test/Ice/timeout/Client.php
@@ -424,10 +424,12 @@ class Client extends TestHelper
 
             $communicator = $this->initialize($properties);
             allTests($this);
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Slice/escape/Client.php b/php/test/Slice/escape/Client.php
index 3977d577486..56875dc7f67 100644
--- a/php/test/Slice/escape/Client.php
+++ b/php/test/Slice/escape/Client.php
@@ -70,10 +70,12 @@ class Client extends TestHelper
         {
             $communicator = $this->initialize($args);
             allTests($this);
+            $communicator->destroy();
         }
-        finally
+        catch(Exception $ex)
         {
             $communicator->destroy();
+            throw $ex;
         }
     }
 }
diff --git a/php/test/Slice/structure/Client.php b/php/test/Slice/structure/Client.php
index 1e78f217ec4..c3e4fff4033 100644
--- a/php/test/Slice/structure/Client.php
+++ b/php/test/Slice/structure/Client.php
@@ -212,8 +212,17 @@ class Client extends TestHelper
 {
     function run($args)
     {
-        $communicator = $this->initialize($args);
-        allTests($this);
+        try
+        {
+            $communicator = $this->initialize($args);
+            allTests($this);
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
     }
 }
 ?>