php7 in upgrade

ee/cli/plugins/site.py

@@ -832,7 +832,7 @@ class EESiteUpdateController(CementBaseController):
             (['--php'],
                 dict(help="update to php site", action='store_true')),
             (['--php7'],
-                dict(help="update to php site", action='store_true')),
+                dict(help="update to php7 site", action='store_true')),
             (['--mysql'],
                 dict(help="update to mysql site", action='store_true')),
             (['--wp'],
@@ -957,9 +957,10 @@ class EESiteUpdateController(CementBaseController):
             old_hhvm = check_site.is_hhvm
             old_pagespeed = check_site.is_pagespeed
             check_ssl = check_site.is_ssl
+            check_php_version = check_site.php_version
 
         if (pargs.password and not (pargs.html or
-            pargs.php or pargs.mysql or pargs.wp or
+            pargs.php or pargs.php7 or pargs.mysql or pargs.wp or
             pargs.w3tc or pargs.wpfc or pargs.wpsc
            or pargs.wpsubdir or pargs.wpsubdomain)):
             try:
@@ -1030,7 +1031,7 @@ class EESiteUpdateController(CementBaseController):
                     if stype == 'wpsubdir':
                         data['wpsubdir'] = True
 
-        if pargs.pagespeed or pargs.hhvm:
+        if pargs.pagespeed or pargs.hhvm or pargs.php7:
             if not data:
                 data = dict(site_name=ee_domain, www_domain=ee_www_domain,
                             currsitetype=oldsitetype,
@@ -1110,6 +1111,14 @@ class EESiteUpdateController(CementBaseController):
                 data['pagespeed'] = False
                 pagespeed = False
 
+            if pargs.php7 != 'off':
+                data['php7'] = True
+                php7 = True
+            elif pargs.php7 == 'off':
+                data['php7'] = False
+                php7 = False
+
+
 
         if pargs.pagespeed:
             if pagespeed is old_pagespeed:
@@ -1121,6 +1130,32 @@ class EESiteUpdateController(CementBaseController):
                              "site")
                 pargs.pagespeed = False
 
+
+
+        if pargs.php7:
+            old_php7 = None
+            if check_php_version == "7.0":
+                old_php7 == True
+            else:
+                old_php7 == False
+
+            if php7 is old_php7:
+                if php7 is False:
+                    Log.info(self, "PHP 7.0 is already disabled for given "
+                             "site")
+                elif pagespeed is True:
+                    Log.info(self, "PHP 7.0 is already enabled for given "
+                             "site")
+                pargs.php7 = False
+
+            if data and (not pargs.pagespeed):
+                if old_php7 is True:
+                    data['php7'] = True
+                    php7 = True
+                else:
+                    data['php7'] = False
+                    php7 = False
+
         #--letsencrypt=renew code goes here
         if pargs.letsencrypt == "renew" and not pargs.all:
             expiry_days = SSL.getExpirationDays(self,ee_domain)

ee/cli/plugins/sitedb.py

@@ -12,14 +12,14 @@ import glob
 def addNewSite(self, site, stype, cache, path,
                enabled=True, ssl=False, fs='ext4', db='mysql',
                db_name=None, db_user=None, db_password=None,
-               db_host='localhost', hhvm=0, pagespeed=0):
+               db_host='localhost', hhvm=0, pagespeed=0, php_version=''):
     """
     Add New Site record information into ee database.
     """
     try:
         newRec = SiteDB(site, stype, cache, path, enabled, ssl, fs, db,
                         db_name, db_user, db_password, db_host, hhvm,
-                        pagespeed)
+                        pagespeed,php_version)
         db_session.add(newRec)
         db_session.commit()
     except Exception as e:
@@ -42,7 +42,7 @@ def getSiteInfo(self, site):
 def updateSiteInfo(self, site, stype='', cache='', webroot='',
                    enabled=True, ssl=False, fs='', db='', db_name=None,
                    db_user=None, db_password=None, db_host=None, hhvm=None,
-                   pagespeed=None):
+                   pagespeed=None,php_version=''):
     """updates site record in database"""
     try:
         q = SiteDB.query.filter(SiteDB.sitename == site).first()
@@ -87,6 +87,9 @@ def updateSiteInfo(self, site, stype='', cache='', webroot='',
     if (pagespeed is not None) and (q.is_pagespeed is not pagespeed):
         q.is_pagespeed = pagespeed
 
+    if php_version and q.php_version != php_version:
+        q.is_php7 = php_version
+
     try:
         q.created_on = func.now()
         db_session.commit()