[php] Use -prefix setting in type declarations

Examples/test-suite/php/prefix_runme.php

@@ -2,10 +2,10 @@
 
 require "tests.php";
 
-// No new functions
-check::functions(array());
+// New functions
+check::functions(array('self'));
 // New classes
-check::classes(array('ProjectBar','ProjectFoo'));
+check::classes(array('Project','ProjectBar','ProjectFoo'));
 // No new vars
 check::globals(array());
 
@@ -13,4 +13,6 @@ $f = new ProjectFoo();
 // This resulted in "Fatal error: Class 'Foo' not found"
 $f->get_self();
 
+Project::self(new ProjectBar());
+
 check::done();

Examples/test-suite/prefix.i

@@ -15,6 +15,16 @@ public:
 // __set and __isset methods weren't getting the prefix.
 class Bar : public Foo {
 public:
+  Bar *get_self() {
+    return this;
+  }
 };
 
+// This failed in git pre 4.1.0 with PHP 8.x because we weren't adding the
+// prefix to class names in type declarations.  Error was at extension load
+// time:
+//
+// Fatal error: Bar must be registered before ProjectBar in Unknown on line 0
+Bar* self(Bar* bar) { return bar->get_self(); }
+
 %}

Source/Modules/php.cxx

@@ -246,6 +246,7 @@ public:
 	  Append(result, c);
 	} else {
 	  if (Len(classtypes) > 0) Append(classtypes, "|");
+	  Append(classtypes, prefix);
 	  Append(classtypes, i.item);
 	}
 	prev = i.item;