Update ORM to 2.11

composer.json

@@ -2,7 +2,9 @@
     "name": "stfc-egi/gocdb",
     "description": "A web portal and REST style API for e-Infrastructure topology managment",
     "require": {
-	"doctrine/orm": "2.5.14"
+	"doctrine/orm": "2.11.*",
+    "symfony/cache": "*",
+    "doctrine/annotations": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",

htdocs/web_portal/controllers/user/register.php

@@ -56,23 +56,35 @@ function draw() {
     die();
     }
 
-    //Extract users email from oidc claims
-    $authDetails = $_SERVER['OIDC_CLAIM_external_authn'];
-    $startPos = 3+strpos($authDetails, ":", (strpos($authDetails, "MAIL")));
-    $endPos = strpos($authDetails, "\"", 3+$startPos);
-    $length = $endPos-$startPos;
-    $userEmail = substr($authDetails, $startPos, $length);
     $params = [];
+
+    //Extract users email from oidc claims
+    $params['email'] = '';
+    if (key_exists('OIDC_CLAIM_external_authn', $_SERVER)) {
+        $authDetails = $_SERVER['OIDC_CLAIM_external_authn'];
+        $startPos = 3+strpos($authDetails, ":", (strpos($authDetails, "MAIL")));
+        $endPos = strpos($authDetails, "\"", 3+$startPos);
+        $length = $endPos-$startPos;
+        $params['email'] = substr($authDetails, $startPos, $length);
+    }
+
     getPolicyURLs($params);
 
     /* @var $authToken \org\gocdb\security\authentication\IAuthentication */
     $authToken = Get_User_AuthToken();
     $params['authAttributes'] = $authToken->getDetails();
 
-    $params['given_name'] = $_SERVER['OIDC_CLAIM_given_name'];
-    $params['family_name'] = $_SERVER['OIDC_CLAIM_family_name'];
-    $params['email'] = $userEmail;
+    $params['given_name'] = '';
+    if (key_exists('OIDC_CLAIM_given_name', $_SERVER)) {
+        $params['given_name'] = $_SERVER['OIDC_CLAIM_given_name'];
+    }
+    $params['family_name'] = '';
+    if (key_exists('OIDC_CLAIM_family_name', $_SERVER)) {
+        $params['family_name'] = $_SERVER['OIDC_CLAIM_family_name'];
+    }
+
     $params['idString'] = $idString;
+
     show_view('user/register.php', $params);
 }
 

htdocs/web_portal/views/admin/view_service_types.php

@@ -34,7 +34,7 @@
             </tr>
             <?php
             $num = 2;
-            if(sizeof($numberOfServiceTypes > 0)) {
+            if($numberOfServiceTypes > 0) {
                 foreach($params['ServiceTypes'] as $serviceType) {
                 ?>
                 <tr class="site_table_row_<?php echo $num ?>">
@@ -59,4 +59,4 @@
             ?>
         </table>
     </div>
-</div>
+</div>

htdocs/web_portal/views/political_role/view_requests.php

@@ -76,8 +76,8 @@
                 </tr>
                 <?php
                 $num = 2;
-                if(sizeof($params['myRequests'] > 0)) {
-                foreach($params['myRequests'] as $request) {
+                if (is_array($params['myRequests']) && sizeof($params['myRequests']) > 0) {
+                    foreach ($params['myRequests'] as $request) {
                 ?>
                 <tr class="site_table_row_<?php echo $num ?>">
                     <td class="site_table" style="width: 50%">
@@ -144,8 +144,8 @@
                 </tr>
                 <?php
                 $num = 2;
-                if(sizeof($params['allRequests'] > 0)) {
-                foreach($params['allRequests'] as $request) {
+                if (is_array($params['allRequests']) && sizeof($params['allRequests']) > 0) {
+                    foreach ($params['allRequests'] as $request) {
                 ?>
                 <tr class="site_table_row_<?php echo $num ?>">
                     <td class="site_table">

htdocs/web_portal/views/user/view_user.php

@@ -95,7 +95,7 @@
                         </div>
                     </td>
                 </tr>-->
-                <?php if(sizeof($params['user']->getHomeSite()) != 0) { ?>
+                <?php if ($params['user']->getHomeSite() != null) { ?>
                     <tr class="site_table_row_2">
                         <td class="site_table">Home Site</td>
                         <td class="site_table">
@@ -346,4 +346,4 @@
         margin-bottom: 0;
         font-size: 12px;
     }
-</style>
+</style>

tests/doctrine/DoctrineCleanInsert1Test.php

@@ -182,11 +182,11 @@ public function testShowDoctrineReadFailiureUntilCommitted(){
     $this->em->persist($site);
     // After persist, Doctrine querying does not return our site until we flush, hence we get 0
     // returned from our repository.
-    $this->assertEquals(0, count($this->em->getRepository('Site')->findOneBy(array('shortName' => 'site' . $n))));
+    $this->assertEquals(0, count($this->em->getRepository('Site')->findBy(array('shortName' => 'site' . $n))));
     // When we flush or commit we get one.
     $this->em->commit();
     $this->em->flush();
-    $this->assertEquals(1, count($this->em->getRepository('Site')->findOneBy(array('shortName' => 'site' . $n))));
+    $this->assertEquals(1, count($this->em->getRepository('Site')->findBy(array('shortName' => 'site' . $n))));
   }
 
 
@@ -464,7 +464,7 @@ public function testRollback() {
    * first have to delete the services that holds the FK to the site (one site
    * to many services).
    *
-   * @expectedException \Doctrine\DBAL\DBALException
+   * @expectedException \Doctrine\DBAL\Exception
    */
   public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade(){
     print __METHOD__ . "\n";
@@ -496,7 +496,7 @@ public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade(){
     // services first as we have no cascade-delete option set.
     $this->em->remove($refetchedSite);
     $this->em->flush();
-    $this->fail('Should not get to this point - DBALException expected');
+    $this->fail('Should not get to this point - \Doctrine\DBAL\Exception expected');
 
   }
 
@@ -659,7 +659,7 @@ public function testServiceToEndpointCascadeDelete_WithNoDTs(){
    * association to a downtime (this relationship would need to be deleted first
    * to allow the endpoint to be deleted cleanly by the cascade).
    *
-   * @expectedException \Doctrine\DBAL\DBALException
+   * @expectedException \Doctrine\DBAL\Exception
    */
   public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs(){
     print __METHOD__ . "\n";
@@ -707,7 +707,7 @@ public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs
     // services first as we have no cascade-delete option set.
     $this->em->remove($se);
     $this->em->flush();
-    $this->fail('Should not get to this point - DBALException expected');
+    $this->fail('Should not get to this point - \Doctrine\DBAL\Exception expected');
   }
 
   /**

tests/doctrine/RolesTest.php

@@ -194,7 +194,7 @@ public function testRoleDiscriminatorNGI() {
    * Add a role type, user, NGI and a role linking
    * them all together. Assert that $newRole->getOwnedEntity()
    * returns an instance of NGI.
-   * @expectedException \Doctrine\DBAL\DBALException
+   * @expectedException \Doctrine\DBAL\Exception
    */
   public function testRoleTypeIntegrityConstraint() {
     print __METHOD__ . "\n";
@@ -226,7 +226,7 @@ public function testRoleTypeIntegrityConstraint() {
 
   /**
    * Ensure no duplicate role types are inserted
-   * @expectedException \Doctrine\DBAL\DBALException
+   * @expectedException \Doctrine\DBAL\Exception
    */
   public function testDuplicateRoleTypes() {
     print __METHOD__ . "\n";

tests/phpunit.xml

@@ -9,12 +9,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
- * @author David Meredith <[email protected]> 
+ *
+ * @author David Meredith <[email protected]>
  */-->
 
-<!-- 
-PHPUnit configuration file for tests. 
+<!--
+PHPUnit configuration file for tests.
 -->
 <phpunit
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -43,7 +43,7 @@ PHPUnit configuration file for tests.
          <!--printerFile="/path/to/ResultPrinter.php"-->
          <!--testSuiteLoaderFile="/path/to/StandardTestSuiteLoader.php"-->
          <!--bootstrap="/path/to/bootstrap.php" -->
-  
+
 <filter>
   <!--<blacklist>
     <directory suffix=".php">/path/to/files</directory>
@@ -53,12 +53,12 @@ PHPUnit configuration file for tests.
       <file>/path/to/file</file>
     </exclude>
   </blacklist>-->
-  
-  <!-- 
-  Name the core packages to be included in coverage reports. 
+
+  <!--
+  Name the core packages to be included in coverage reports.
   It is not desirable to produce coverage for every package, it is not useful
-  to do so. We have to be selective on which tests to write for which packages.  
-  --> 
+  to do so. We have to be selective on which tests to write for which packages.
+  -->
   <whitelist processUncoveredFilesFromWhitelist="true">
     <directory suffix=".php">../lib/Doctrine/entities/</directory>
     <directory suffix=".php">../lib/DAOs/</directory>
@@ -71,5 +71,5 @@ PHPUnit configuration file for tests.
     </exclude>
   </whitelist>
 </filter>
-  
-</phpunit>
+
+</phpunit>