Merge pull request GOCDB#212 from GOCDB/release-5.7.5

Release 5.7.5 to master

.travis.yml

@@ -1,5 +1,5 @@
-# N.B. Ubuntu Precise available on Travis until March 2018
-dist: precise
+os: linux
+dist: trusty
 language: php
 before_install:
     - mysql -e 'CREATE DATABASE doctrine;'
@@ -8,20 +8,33 @@ script: .travis/run_tests.sh
 services:
     - mysql
 php:
-    - '5.3'
     - '5.4'
     - '5.5'
-env:
-    - DB=sqlite
-    - DB=mysql
-matrix:
+    - '5.6'
+    - '7.0'
+    - '7.1'
+    - '7.2'
+    - '7.3'
+    - '7.4'
+env: DB=mysql
+
+jobs:
     include:
-    - dist: trusty
+      # N.B. Ubuntu Precise required to use PHP 5.3
+    - dist: precise
       env: DB=mysql
-      php: '5.4'
-    - dist: trusty
-      env: DB=mysql
-      php: '5.5'
+      php: '5.3'
+    - env: DB=sqlite
+      php: '5.6'
     allow_failures:
     - env: DB=sqlite
+    - env: DB=mysql
+      php: '7.2'
+    - env: DB=mysql
+      php: '7.3'
+    - env: DB=mysql
+      php: '7.4'
     fast_finish: true
+
+after_success:
+    - bash <(curl -s https://codecov.io/bash)

.travis/run_tests.sh

@@ -7,7 +7,7 @@ if [[ $TRAVIS ]]; then
     git diff --name-only --diff-filter=ACMRTUXB HEAD^ | grep '\.php$' | xargs -r -n 1 php -l || exit 1
 
     # Run test suite
-    vendor/bin/phpunit tests/DoctrineTestSuite1.php
+    vendor/bin/phpunit --coverage-clover=coverage.xml tests/DoctrineTestSuite1.php
 else
     echo 'ABORTED: NOT RUNNING ON TRAVIS'
     exit 2

README.md

@@ -1,25 +1,22 @@
-Gocdb
-=====
-Grid Operations Configuration Management Database. A Repository, Portal and 
-REST style API for managing Grid and Cloud topology objects including; projects, 
-administrative domains, sites, services, service-endpoints, service-groups, 
-downtimes, users, roles and business rules.  The View and Controller layers 
-(i.e. the 'VC' in 'MVC') are inherited legacy from
-v4 and are scheduled to be re-implement using a modern MVC framework. 
+# GOCDB
 
-<img src="htdocs/landing/egi_logo.jpg" height="25" style="float: left;" />
-GOCDB is an EGI service provided by <a class="Licence_Link" href="http://www.stfc.ac.uk/">
-STFC</a>, co-funded by <a class="Licence_Link" href="http://www.egi.eu">EGI.eu</a> and 
-<a href="http://go.egi.eu/eng">EGI-Engage</a>. Licensed under the 
-<a class="Licence_Link" href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2 License</a>
+[![Build Status](https://travis-ci.org/GOCDB/gocdb.svg?branch=dev)](https://travis-ci.org/GOCDB/gocdb)
 
+Grid Operations Configuration Management Database. A Repository, Portal and REST style API for managing Grid and Cloud topology objects including; projects, administrative domains, sites, services, service-endpoints, service-groups, downtimes, users, roles and business rules.
 
-Documentation 
-=============
-* [GOCDB Executive Summary](https://wiki.egi.eu/w/images/d/d3/GOCDB5_Grid_Topology_Information_System.pdf)
-* [EGI GOCDB wiki landing page](https://wiki.egi.eu/wiki/GOCDB) 
-* [GOCDB Documentation index](https://wiki.egi.eu/wiki/GOCDB_Documentation_Index)
-* [User docs](https://wiki.egi.eu/wiki/GOCDB/Input_System_User_Documentation) 
-* INSTALL.md for installation 
+<span>
+  <img alt="STFC logo" src="htdocs/web_portal/img/UKRI_STF_Council-Logo_Horiz-RGB_crop.png" height=57/>
+  <img alt="EU flag" src="htdocs/web_portal/img/eu_flag_yellow_low_150.png" height=57 />
+  <img alt="EGI logo" src="htdocs/web_portal/img/egi_logo.jpg" height=57 />
+  <img alt="EOSC-hub logo" src="htdocs/web_portal/img/eosc-hub-v-web_150.png" height=57 />
+</span>
+
+GOCDB is provided by [STFC](https://stfc.ukri.org/) for [EGI](https://www.egi.eu/federation/), co-funded by [EGI.eu](https://www.egi.eu/) and [EOSC-hub](https://www.eosc-hub.eu/). Licensed under the [Apache 2 License](http://www.apache.org/licenses/LICENSE-2.0).
 
+## Documentation
 
+* [GOCDB Executive Summary](https://wiki.egi.eu/w/images/d/d3/GOCDB5_Grid_Topology_Information_System.pdf)
+* [EGI GOCDB wiki landing page](https://wiki.egi.eu/wiki/GOCDB)
+* [GOCDB Documentation index](https://wiki.egi.eu/wiki/GOCDB_Documentation_Index)
+* [User documentation](https://wiki.egi.eu/wiki/GOCDB/Input_System_User_Documentation)
+* [INSTALL.md](INSTALL.md) for installation

config/gocdb_schema.xml

@@ -163,6 +163,29 @@
 	    <length>255</length>
 	    <regex>/^(([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}[,;]?)+$/</regex>
 	</field>
+  <field>
+      <fname>URL</fname>
+      <length>255</length>
+      <!-- Support for all URI chars (unreserved, gen-delims, sub-delims and percent) RFC 3986 -->
+	    <regex>/^[0-9a-zA-Z:\/\.\&amp;\?\_\$\+\!\*\'\(\)\,\-#\[\]@;=~%]*$/</regex>
+      <ftype>string</ftype>
+  </field>
+  <field>
+      <fname>PRODUCTION</fname>
+      <ftype>boolean</ftype>
+  </field>
+  <field>
+      <fname>BETA</fname>
+      <ftype>boolean</ftype>
+  </field>
+  <field>
+      <fname>MONITORED</fname>
+      <ftype>boolean</ftype>
+  </field>
+  <field>
+      <fname>NOTIFY</fname>
+      <ftype>boolean</ftype>
+  </field>
     </entity>
     <!-- ==========================================================  -->
     <entity>
@@ -309,19 +332,6 @@
 	</field>
     </entity>
 
-    <!-- ====================================================
-    This can be deleted once add service form is redone.
-    -->
-    <entity>
-	<name>endpoint_location</name>
-	<field>
-	    <fname>URL</fname>
-	    <length>255</length>
-	    <!-- Support for all URI chars (unreserved, gen-delims, sub-delims and percent) RFC 3986 -->
-	    <regex>/^[0-9a-zA-Z:\/\.\&amp;\?\_\$\+\!\*\'\(\)\,\-#\[\]@;=~%]*$/</regex>
-	</field>
-    </entity>
-
     <!-- ==========================================================  -->
     <entity>
 	<name>endpoint</name>
@@ -362,6 +372,10 @@
         <length>255</length>
         <regex>/^(([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}[,;]?)*$/</regex>
     </field>
+    <field>
+        <fname>MONITORED</fname>
+        <ftype>boolean</ftype>
+    </field>
     </entity>
 
     <!-- ==========================================================  -->