Issue #1642144 by dawehner, amateescu: Convert views_object() to PSR-0.

includes/handlers.inc

@@ -8,6 +8,7 @@
 use Drupal\Core\Database\Database;
 use Drupal\views\View;
 use Drupal\views\Join;
+use Drupal\views\ViewsObject;
 
 /**
  * Instantiate and construct a new handler
@@ -134,8 +135,6 @@ function views_get_table_join($table, $base_table) {
  * It creates a common interface to create consistency amongst
  * handlers and data.
  *
- * This class would be abstract in PHP5, but PHP4 doesn't understand that.
- *
  * Definition terms:
  * - table: The actual table this uses; only specify if different from
  *          the table this is attached to.
@@ -155,7 +154,7 @@ function views_get_table_join($table, $base_table) {
  *                    control is provided.
  * - access arguments: An array of arguments for the access callback.
  */
-class views_handler extends views_object {
+abstract class views_handler extends ViewsObject {
   /**
    * The top object of a view.
    *

includes/plugins.inc

@@ -5,8 +5,7 @@
  * Built in plugins for Views output handling.
  */
 
-// @todo: Remove this once update.php can use the registry
-views_include('base');
+use Drupal\views\ViewsObject;
 
 /**
  * Implements hook_views_plugins().
@@ -467,7 +466,7 @@ function views_discover_plugins() {
 /**
  * Abstract base class to provide interface common to all plugins.
  */
-class views_plugin extends views_object {
+abstract class views_plugin extends ViewsObject {
   /**
    * The top object of a view.
    *

includes/base.inc → lib/Drupal/views/ViewsObject.php

@@ -2,13 +2,15 @@
 
 /**
  * @file
- * Provides the basic object definitions used by plugins and handlers.
+ * Definition of Drupal\views\ViewsObject;
  */
 
+namespace Drupal\views;
+
 /**
- * Basic definition for many views objects.
+ * Provides the basic object definitions used by plugins and handlers.
  */
-class views_object {
+class ViewsObject {
   /**
    * Except for displays, options for the object will be held here.
    */
@@ -48,8 +50,8 @@ class views_object {
    * @return array
    *   Returns the options of this handler/plugin.
    *
-   * @see views_object::export_option()
-   * @see views_object::unpack_translatable()
+   * @see Drupal\views\ViewsObject::export_option()
+   * @see Drupal\views\ViewsObject::unpack_translatable()
    */
   function option_definition() { return array(); }
 

views.info

@@ -56,7 +56,6 @@ files[] = handlers/views_handler_sort_group_by_numeric.inc
 files[] = handlers/views_handler_sort_menu_hierarchy.inc
 files[] = handlers/views_handler_sort_random.inc
 ; Includes
-files[] = includes/base.inc
 files[] = includes/handlers.inc
 files[] = includes/plugins.inc
 ; Modules

views.module

@@ -1108,7 +1108,6 @@ function views_include_handlers($reset = FALSE) {
     return;
   }
 
-  views_include('base');
   views_include('handlers');
   views_include('cache');
   views_include('plugins');