PHP 7.x compatibility

packages/collections/pub/eadlist.php

@@ -36,7 +36,7 @@
                {
                   ?>
          <a href='?p=collections/ead&amp;id=<?php echo($objCollection['ID']); ?>&amp;templateset=ead&amp;disabletheme=1&amp;output=<?php echo(encode(formatFileName($objCollection['SortTitle']),ENCODE_HTML)); ?>'><?php echo(encode(trim($objCollection['Title']),ENCODE_HTML)); ?></a><br/>
-                  <?
+                  <?php
                }
             }
             else

packages/core/lib/archon.inc.php

@@ -2673,7 +2673,13 @@ public function initialize()
          }
 
          //$result = call_user_func(array($MixinClass, initialize));
-         eval("\$result = {$MixinClass}::initialize();");
+         $myMixinClass = "___{$MixinClass}___";
+         if (!class_exists($myMixinClass)) {
+            eval("class $myMixinClass extends $MixinClass {}");
+         }
+         $mixin = new $myMixinClass;
+         $closure = (new ReflectionMethod($myMixinClass, 'initialize'))->getClosure($mixin);
+         $result = call_user_func($closure->bindTo($this));
       }
    }
 

packages/core/lib/archonobject.inc.php

@@ -10,20 +10,19 @@ public function callOverridden()
       $args = func_get_args();
       $MixinClass = prev($methodInfo->Classes);
 
-      $arrStrArgs = array();
-
-      for($i = 0; $i < count($args); $i++)
-      {
-         $arrStrArgs[] = "\$args[{$i}]";
-      }
-
       // Simulate mixing after.
       if($_ARCHON->Mixins[get_class($this)]->Methods[$method]->Parameters[$MixinClass]->MixOrder == MIX_AFTER)
       {
          $prevresult = call_user_func_array(array($this, 'callOverridden'), $args);
       }
 
-      eval("\$result = {$MixinClass}::{$method}(" . implode(',', $arrStrArgs) . ");");
+      $myMixinClass = "___{$MixinClass}___";
+      if (!class_exists($myMixinClass)) {
+         eval("class $myMixinClass extends $MixinClass {}");
+      }
+      $mixin = new $myMixinClass;
+      $closure = (new ReflectionMethod($myMixinClass, $method))->getClosure($mixin);
+      $result = call_user_func_array($closure->bindTo($this), $args);
 
       // Simulate mixing before.
       if($_ARCHON->Mixins[get_class($this)]->Methods[$method]->Parameters[$MixinClass]->MixOrder == MIX_BEFORE)
@@ -234,21 +233,20 @@ public function __call($method, $args)
          $_ARCHON->Callstack[] = $stackmember;
          $MixinClass = end(end($_ARCHON->Callstack)->Classes);
 
-         $arrStrArgs = array();
-
-         for($i = 0; $i < count($args); $i++)
-         {
-            $arrStrArgs[] = "\$args[{$i}]";
-         }
-
          // Simulate mixing after.
          if($_ARCHON->Mixins[get_class($this)]->Methods[$method]->Parameters[$MixinClass]->MixOrder == MIX_AFTER)
          {
             $prevresult = call_user_func_array(array($this, 'callOverridden'), $args);
          }
 
-         eval("\$result = {$MixinClass}::{$method}(" . implode(',', $arrStrArgs) . ");");
          //$result = call_user_func_array(array(($MixinClass) $this, $method), $args);
+	 $myMixinClass = "___{$MixinClass}___";
+	 if (!class_exists($myMixinClass)) {
+            eval("class $myMixinClass extends $MixinClass {}");
+         }
+         $mixin = new $myMixinClass;
+         $closure = (new ReflectionMethod($myMixinClass, $method))->getClosure($mixin);
+         $result = call_user_func_array($closure->bindTo($this), $args);
 
          // Simulate mixing before.
          if($_ARCHON->Mixins[get_class($this)]->Methods[$method]->Parameters[$MixinClass]->MixOrder == MIX_BEFORE)

packages/core/lib/querylog.inc.php

@@ -5,7 +5,7 @@ public function logQuery(&$DB, $Scope, $Message, $IsManip = NULL)
     {
         $this->QueryCount++;
 
-        if($OutputQueries)
+        if($this->OutputQueries)
         {
             echo("\n\n$Message\n\n");
         }