diff --git a/core/Object.php b/core/Object.php index bd4d31ee0..c16f1efd2 100755 --- a/core/Object.php +++ b/core/Object.php @@ -426,12 +426,6 @@ abstract class Object { public static function has_extension($requiredExtension) { $class = get_called_class(); - if(func_num_args() > 1) { - Deprecation::notice('3.2.0', "Object::has_extension() deprecated. Call has_extension() on the class"); - $class = func_get_arg(0); - $requiredExtension = func_get_arg(1); - } - $requiredExtension = strtolower($requiredExtension); $extensions = Config::inst()->get($class, 'extensions'); @@ -459,12 +453,6 @@ abstract class Object { public static function add_extension($extension) { $class = get_called_class(); - if(func_num_args() > 1) { - Deprecation::notice('3.2.0', "Object::add_extension() deprecated. Call add_extension() on the class"); - $class = func_get_arg(0); - $extension = func_get_arg(1); - } - if(!preg_match('/^([^(]*)/', $extension, $matches)) { return false; } @@ -520,12 +508,6 @@ abstract class Object { public static function remove_extension($extension) { $class = get_called_class(); - if(func_num_args() > 1) { - Deprecation::notice('3.2.0', "Object::remove_extension() deprecated. Call remove_extension() on the class"); - $class = func_get_arg(0); - $extension = func_get_arg(1); - } - Config::inst()->remove($class, 'extensions', Config::anything(), $extension); Config::inst()->extraConfigSourcesChanged($class); diff --git a/docs/en/changelogs/3.1.0.md b/docs/en/changelogs/3.1.0.md index c41938a44..e760b0448 100644 --- a/docs/en/changelogs/3.1.0.md +++ b/docs/en/changelogs/3.1.0.md @@ -342,7 +342,6 @@ you can enable those warnings and future-proof your code already. * `TableListField`, `ComplexTableField`, `TableField`, `HasOneComplexTableField`, `HasManyComplexTableField` and `ManyManyComplexTableField` have been removed from the core and placed into a module called "legacytablefields" located at https://github.com/silverstripe-labs/legacytablefields * `prototype.js` and `behaviour.js` have been removed from the core, they are no longer used. If you have custom code relying on these two libraries, please update your code to include the files yourself - * `Object::has_extension()` and `Object::add_extension()` deprecated in favour of using late static binding, please use `{class}::has_extension()` and `{class}::add_extension()` instead, where {class} is the class name of your DataObject class. * Removed `SiteTree.MetaKeywords` since they are irrelevant in terms of SEO ([seomoz article](http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/)) and general page informancy * Removed `SiteTree.MetaTitle` as a means to customize the window title, use `SiteTree.Title` instead * Deprecated `Profiler` class, use third-party solutions like [xhprof](https://github.com/facebook/xhprof/)