Merge pull request #11348 from creative-commoners/pulls/6/replace-ext…

…ension-subclasses

API Replace Extension subclasses

src/Core/Config/Middleware/ExtensionMiddleware.php

@@ -10,7 +10,6 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Extension;
-use SilverStripe\ORM\DataExtension;
 
 class ExtensionMiddleware implements Middleware
 {
@@ -83,8 +82,6 @@ protected function getExtraConfig($class, $classConfig, $excludeMiddleware)
                 // Skip base classes
                 switch ($extensionClassParent) {
                     case Extension::class:
-                    case DataExtension::class:
-                        continue 2;
                     default:
                         // continue
                 }

src/Core/Extensible.php

@@ -154,7 +154,6 @@ protected function defineExtensionMethods()
      * Keep in mind that the extension will only be applied to new
      * instances, not existing ones (including all instances created through {@link singleton()}).
      *
-     * @see http://doc.silverstripe.org/framework/en/trunk/reference/dataextension
      * @param string $classOrExtension Class that should be extended - has to be a subclass of {@link Object}
      * @param string $extension Subclass of {@link Extension} with optional parameters
      *  as a string, e.g. "Versioned"
@@ -256,7 +255,7 @@ public static function remove_extension($extension)
      * @param string $class If omitted, will get extensions for the current class
      * @param bool $includeArgumentString Include the argument string in the return array,
      *  FALSE would return array("Versioned"), TRUE returns array("Versioned('Stage','Live')").
-     * @return array Numeric array of either {@link DataExtension} class names,
+     * @return array Numeric array of either {@link Extension} class names,
      *  or eval'ed class name strings with constructor arguments.
      */
     public static function get_extensions($class = null, $includeArgumentString = false)
@@ -501,7 +500,7 @@ public function hasExtension($extension)
      *
      * This method also provides lazy-population of the extension_instances property.
      *
-     * @return Extension[] Map of {@link DataExtension} instances, keyed by classname.
+     * @return Extension[] Map of {@link Extension} instances, keyed by classname.
      */
     public function getExtensionInstances()
     {

src/Core/Extension.php

@@ -7,7 +7,6 @@
 
 /**
  * Add extension that can be added to an object with {@link Object::add_extension()}.
- * For {@link DataObject} extensions, use {@link DataExtension}.
  * Each extension instance has an "owner" instance, accessible through
  * {@link getOwner()}.
  * Every object instance gets its own set of extension instances,

src/Forms/CompositeValidator.php

@@ -24,7 +24,7 @@
  *   return $compositeValidator
  * }
  *
- * Or by implementing the updateCMSCompositeValidator() method in a DataExtension:
+ * Or by implementing the updateCMSCompositeValidator() method in an Extension:
  *
  * protected function updateCMSCompositeValidator(CompositeValidator $compositeValidator): void
  * {

src/ORM/Connect/TempDatabase.php

@@ -6,10 +6,10 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Environment;
+use SilverStripe\Core\Extension;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 
@@ -148,9 +148,9 @@ public function kill()
             return;
         }
 
-        // Some DataExtensions keep a static cache of information that needs to
+        // Some Extensions keep a static cache of information that needs to
         // be reset whenever the database is killed
-        foreach (ClassInfo::subclassesFor(DataExtension::class) as $class) {
+        foreach (ClassInfo::subclassesFor(Extension::class) as $class) {
             $toCall = [$class, 'on_db_reset'];
             if (is_callable($toCall)) {
                 call_user_func($toCall);
@@ -171,10 +171,10 @@ public function clearAllData()
 
         $this->getConn()->clearAllData();
 
-        // Some DataExtensions keep a static cache of information that needs to
+        // Some Extensions keep a static cache of information that needs to
         // be reset whenever the database is cleaned out
         $classes = array_merge(
-            ClassInfo::subclassesFor(DataExtension::class),
+            ClassInfo::subclassesFor(Extension::class),
             ClassInfo::subclassesFor(DataObject::class)
         );
         foreach ($classes as $class) {