diff --git a/language/control-structures/versions.xml b/language/control-structures/versions.xml
index 6ca3d4ba30..b39ec8564a 100644
--- a/language/control-structures/versions.xml
+++ b/language/control-structures/versions.xml
@@ -5,29 +5,29 @@
 -->
 
 <versions>
- <function name='include' from='PHP 4, PHP 5, PHP 7'/>
- <function name='include_once' from='PHP 4, PHP 5, PHP 7'/>
- <function name='require' from='PHP 4, PHP 5, PHP 7'/>
- <function name='require_once' from='PHP 4, PHP 5, PHP 7'/>
- <function name='control-structures.alternative-syntax' from='PHP 4, PHP 5, PHP 7'/>
- <function name='foreach' from='PHP 4, PHP 5, PHP 7'/>
- <function name='foreach.list' from='PHP 5 &gt;= 5.5.0, PHP 7'/>
- <function name='continue' from='PHP 4, PHP 5, PHP 7'/>
- <function name='switch' from='PHP 4, PHP 5, PHP 7'/>
- <function name='for' from='PHP 4, PHP 5, PHP 7'/>
- <function name='require' from='PHP 4, PHP 5, PHP 7'/>
- <function name='goto' from='PHP 5 &gt;= 5.3.0, PHP 7'/>
- <function name='elseif' from='PHP 4, PHP 5, PHP 7'/>
- <function name='dowhile' from='PHP 4, PHP 5, PHP 7'/>
- <function name='include' from='PHP 4, PHP 5, PHP 7'/>
- <function name='declare' from='PHP 4, PHP 5, PHP 7'/>
- <function name='if' from='PHP 4, PHP 5, PHP 7'/>
- <function name='while' from='PHP 4, PHP 5, PHP 7'/>
- <function name='include_once' from='PHP 4, PHP 5, PHP 7'/>
- <function name='require_once' from='PHP 4, PHP 5, PHP 7'/>
- <function name='return' from='PHP 4, PHP 5, PHP 7'/>
- <function name='else' from='PHP 4, PHP 5, PHP 7'/>
- <function name='break' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='include' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='include_once' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='require' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='require_once' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='control-structures.alternative-syntax' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='foreach' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='foreach.list' from='PHP 5 &gt;= 5.5.0, PHP 7, PHP 8'/>
+ <function name='continue' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='switch' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='for' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='require' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='goto' from='PHP 5 &gt;= 5.3.0, PHP 7, PHP 8'/>
+ <function name='elseif' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='dowhile' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='include' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='declare' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='if' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='while' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='include_once' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='require_once' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='return' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='else' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
+ <function name='break' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
 </versions>
 
 <!-- Keep this comment at the end of the file
diff --git a/language/predefined/versions.xml b/language/predefined/versions.xml
index a9333d6600..a0e39a552d 100644
--- a/language/predefined/versions.xml
+++ b/language/predefined/versions.xml
@@ -6,115 +6,115 @@
 <versions>
  <function name="__autoload" from="PHP 5, PHP 7" deprecated="PHP 7.2.0" removed="PHP 8"/>
 
- <function name="error" from="PHP 7"/>
- <function name="error::__clone" from="PHP 7"/>
- <function name="error::__construct" from="PHP 7"/>
- <function name="error::__tostring" from="PHP 7"/>
- <function name="error::getmessage" from="PHP 7"/>
- <function name="error::getcode" from="PHP 7"/>
- <function name="error::getfile" from="PHP 7"/>
- <function name="error::getline" from="PHP 7"/>
- <function name="error::gettrace" from="PHP 7"/>
- <function name="error::gettraceasstring" from="PHP 7"/>
- <function name="error::getprevious" from="PHP 7"/>
+ <function name="error" from="PHP 7, PHP 8"/>
+ <function name="error::__clone" from="PHP 7, PHP 8"/>
+ <function name="error::__construct" from="PHP 7, PHP 8"/>
+ <function name="error::__tostring" from="PHP 7, PHP 8"/>
+ <function name="error::getmessage" from="PHP 7, PHP 8"/>
+ <function name="error::getcode" from="PHP 7, PHP 8"/>
+ <function name="error::getfile" from="PHP 7, PHP 8"/>
+ <function name="error::getline" from="PHP 7, PHP 8"/>
+ <function name="error::gettrace" from="PHP 7, PHP 8"/>
+ <function name="error::gettraceasstring" from="PHP 7, PHP 8"/>
+ <function name="error::getprevious" from="PHP 7, PHP 8"/>
 
- <function name="arithmeticerror" from="PHP 7"/>
- <function name="assertionerror" from="PHP 7"/>
- <function name="divisionbyzeroerror" from="PHP 7"/>
- <function name="compileerror" from="PHP 7 &gt; 7.3.0"/>
- <function name="parseerror" from="PHP 7"/>
- <function name="typeerror" from="PHP 7"/>
- <function name="argumentcounterror" from="PHP 7 &gt;= PHP 7.1.0"/>
+ <function name="arithmeticerror" from="PHP 7, PHP 8"/>
+ <function name="assertionerror" from="PHP 7, PHP 8"/>
+ <function name="divisionbyzeroerror" from="PHP 7, PHP 8"/>
+ <function name="compileerror" from="PHP 7 &gt; 7.3.0, PHP 8"/>
+ <function name="parseerror" from="PHP 7, PHP 8"/>
+ <function name="typeerror" from="PHP 7, PHP 8"/>
+ <function name="argumentcounterror" from="PHP 7 &gt;= PHP 7.1.0, PHP 8"/>
  <function name="valueerror" from="PHP 8"/>
 
- <function name="exception" from="PHP 5, PHP 7"/>
- <function name="exception::__clone" from="PHP 5, PHP 7"/>
- <function name="exception::__construct" from="PHP 5, PHP 7"/>
- <function name="exception::__tostring" from="PHP 5, PHP 7"/>
- <function name="exception::getmessage" from="PHP 5, PHP 7"/>
- <function name="exception::getcode" from="PHP 5, PHP 7"/>
- <function name="exception::getfile" from="PHP 5, PHP 7"/>
- <function name="exception::getline" from="PHP 5, PHP 7"/>
- <function name="exception::gettrace" from="PHP 5, PHP 7"/>
- <function name="exception::gettraceasstring" from="PHP 5, PHP 7"/>
- <function name="exception::getprevious" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="exception" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::getmessage" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::getcode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::getfile" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::getline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::gettrace" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::gettraceasstring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="exception::getprevious" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="errorexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="errorexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="errorexception::getseverity" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="errorexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="errorexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="errorexception::getseverity" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="traversable" from="PHP 5, PHP 7"/>
+ <function name="traversable" from="PHP 5, PHP 7, PHP 8"/>
  
- <function name="iterator" from="PHP 5, PHP 7"/>
- <function name="iterator::current" from="PHP 5, PHP 7"/>
- <function name="iterator::key" from="PHP 5, PHP 7"/>
- <function name="iterator::next" from="PHP 5, PHP 7"/>
- <function name="iterator::rewind" from="PHP 5, PHP 7"/>
- <function name="iterator::valid" from="PHP 5, PHP 7"/>
+ <function name="iterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iterator::current" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iterator::valid" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="iteratoraggregate" from="PHP 5, PHP 7"/>
- <function name="iteratoraggregate::getiterator" from="PHP 5, PHP 7"/>
+ <function name="iteratoraggregate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="iteratoraggregate::getiterator" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="arrayaccess" from="PHP 5, PHP 7"/>
- <function name="arrayaccess::offsetexists" from="PHP 5, PHP 7"/>
- <function name="arrayaccess::offsetget" from="PHP 5, PHP 7"/>
- <function name="arrayaccess::offsetset" from="PHP 5, PHP 7"/>
- <function name="arrayaccess::offsetunset" from="PHP 5, PHP 7"/>
+ <function name="arrayaccess" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayaccess::offsetexists" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayaccess::offsetget" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayaccess::offsetset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayaccess::offsetunset" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="serializable" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="serializable::serialize" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="serializable::unserialize" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="serializable" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="serializable::serialize" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="serializable::unserialize" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="closure" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="closure::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="closure::bind" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="closure::bindto" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="closure::call" from="PHP 7"/>
+ <function name="closure" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="closure::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="closure::bind" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="closure::bindto" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="closure::call" from="PHP 7, PHP 8"/>
  <function name="closure::fromcallable" from="PHP 7 &gt;= 7.1.0"/>
 
- <function name="namespaces" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="generators" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="namespaces" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="generators" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
 
- <function name="generator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::current" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::getreturn" from="PHP 7"/>
- <function name="generator::key" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::next" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::rewind" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::send" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::throw" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::valid" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="generator::__wakeup" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="generator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::current" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::getreturn" from="PHP 7, PHP 8"/>
+ <function name="generator::key" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::next" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::rewind" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::send" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::throw" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::valid" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="generator::__wakeup" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
 
- <function name="throwable" from="PHP 7"/>
- <function name="throwable::getmessage" from="PHP 7"/>
- <function name="throwable::getcode" from="PHP 7"/>
- <function name="throwable::getfile" from="PHP 7"/>
- <function name="throwable::getline" from="PHP 7"/>
- <function name="throwable::gettrace" from="PHP 7"/>
- <function name="throwable::gettraceasstring" from="PHP 7"/>
- <function name="throwable::getprevious" from="PHP 7"/>
- <function name="throwable::__toString" from="PHP 7"/>
+ <function name="throwable" from="PHP 7, PHP 8"/>
+ <function name="throwable::getmessage" from="PHP 7, PHP 8"/>
+ <function name="throwable::getcode" from="PHP 7, PHP 8"/>
+ <function name="throwable::getfile" from="PHP 7, PHP 8"/>
+ <function name="throwable::getline" from="PHP 7, PHP 8"/>
+ <function name="throwable::gettrace" from="PHP 7, PHP 8"/>
+ <function name="throwable::gettraceasstring" from="PHP 7, PHP 8"/>
+ <function name="throwable::getprevious" from="PHP 7, PHP 8"/>
+ <function name="throwable::__toString" from="PHP 7, PHP 8"/>
 
  <function name="WeakReference" from="PHP 7 &gt;= 7.4.0"/>
  <function name="WeakReference::__construct" from="PHP 7 &gt;= 7.4.0"/>
  <function name="WeakReference::create" from="PHP 7 &gt;= 7.4.0"/>
  <function name="WeakReference::get" from="PHP 7 &gt;= 7.4.0"/>
 
- <function name="_COOKIE" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_ENV" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_FILES" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_GET" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="GLOBALS" from="PHP 4, PHP 5, PHP 7"/>
- <function name="http_response_header" from="PHP 4 &gt;= 4.0.4, PHP 5, PHP 7"/>
+ <function name="_COOKIE" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_ENV" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_FILES" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_GET" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="GLOBALS" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
+ <function name="http_response_header" from="PHP 4 &gt;= 4.0.4, PHP 5, PHP 7, PHP 8"/>
  <function name="php_errormsg" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.2.0" removed="PHP 8"/>
- <function name="_POST" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_REQUEST" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_SERVER" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="_SESSION" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
+ <function name="_POST" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_REQUEST" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_SERVER" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
+ <function name="_SESSION" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
 
- <function name="argc" from="PHP 4, PHP 5, PHP 7"/>
- <function name="argv" from="PHP 4, PHP 5, PHP 7"/>
+ <function name="argc" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
+ <function name="argv" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
 </versions>
 <!-- Keep this comment at the end of the file
 Local variables: