diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt index 6882e8f..96904f0 100644 --- a/core/CHANGELOG.txt +++ b/core/CHANGELOG.txt @@ -97,7 +97,6 @@ Drupal 8.0, xxxx-xx-xx (development version) * Added language select form element in the Form API. - Added E-mail field type to core. - Added Link field type to core. -- Added Phone number field type to core. - Added local image input filter, to enable secure image posting. - Added Views and Views UI module to core. diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 7652003..8f8edb2 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -111,6 +111,7 @@ Markup - Daniel F. Kudwien 'sun' http://drupal.org/user/54136 Menu system +- Peter Wolanin 'pwolanin' http://drupal.org/user/49851 - Károly Négyesi 'chx' http://drupal.org/user/9446 Path system @@ -260,6 +261,9 @@ PHP module Picture module - Peter Droogmans 'attiks' http://drupal.org/user/105002 +Poll module +- Andrei Mateescu 'amateescu' http://drupal.org/user/729614 + RDF module - Stéphane Corlosquet 'scor' http://drupal.org/user/52142 - Lin Clark 'linclark' http://drupal.org/user/396253 diff --git a/core/authorize.php b/core/authorize.php index 114dcd3..46c6a29 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -78,11 +78,11 @@ function authorize_access_allowed() { // We have to enable the user and system modules, even to check access and // display errors via the maintenance theme. -$module_list['system'] = 'core/modules/system/system.module'; -$module_list['user'] = 'core/modules/user/user.module'; -drupal_container()->get('module_handler')->setModuleList($module_list); -drupal_container()->get('module_handler')->load('system'); -drupal_container()->get('module_handler')->load('user'); +$module_list['system']['filename'] = 'core/modules/system/system.module'; +$module_list['user']['filename'] = 'core/modules/user/user.module'; +module_list(NULL, $module_list); +drupal_load('module', 'system'); +drupal_load('module', 'user'); // Initialize the language system. drupal_language_initialize(); diff --git a/core/composer.json b/core/composer.json index 47ffad1..ab2dc0e 100644 --- a/core/composer.json +++ b/core/composer.json @@ -13,10 +13,10 @@ "symfony/yaml": "<2.4", "twig/twig": "1.*@stable", "doctrine/common": "2.3.*@stable", - "guzzle/http": "3.1.*@stable", + "guzzle/http": "*", "kriswallsmith/assetic": "1.1.*@alpha", - "symfony-cmf/routing": "dev-master#ea4a10", - "easyrdf/easyrdf": "dev-master" + "symfony-cmf/routing": "1.0.*@dev", + "njh/easyrdf": "0.8.*" }, "minimum-stability": "dev" } diff --git a/core/composer.lock b/core/composer.lock index 7d2a943..07d030c 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,5 +1,5 @@ { - "hash": "4c18d6f1c91b78555300b0036b5a8a7e", + "hash": "27b5fb7194e0d492c69d372d8ba17b2b", "packages": [ { "name": "doctrine/common", @@ -25,6 +25,7 @@ "dev-master": "2.3.x-dev" } }, + "installation-source": "dist", "autoload": { "psr-0": { "Doctrine\\Common": "lib/" @@ -71,85 +72,27 @@ ] }, { - "name": "easyrdf/easyrdf", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/njh/easyrdf.git", - "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2" - }, - "dist": { - "type": "zip", - "url": "https://github.com/njh/easyrdf/archive/d1c363bd04cd55169fbefe52328e86031c6db3a2.zip", - "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2", - "shasum": "" - }, - "require": { - "php": ">=5.2.8" - }, - "replace": { - "njh/easyrdf": "self.version" - }, - "require-dev": { - "phpunit/phpunit": ">=3.5.15", - "squizlabs/php_codesniffer": ">=1.4.3", - "sami/sami": "dev-master" - }, - "time": "2013-01-13 01:20:04", - "type": "library", - "autoload": { - "psr-0": { - "EasyRdf_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nicholas Humfrey", - "email": "njh@aelius.com", - "homepage": "http://www.aelius.com/njh/", - "role": "Developer" - } - ], - "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", - "homepage": "http://www.easyrdf.org/", - "keywords": [ - "rdfa", - "RDF", - "Semantic Web", - "Turtle", - "Linked Data" - ] - }, - { "name": "guzzle/common", - "version": "v3.1.0", + "version": "dev-master", "target-dir": "Guzzle/Common", "source": { "type": "git", "url": "git://github.com/guzzle/common.git", - "reference": "v3.1.0" + "reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/common/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/common/archive/23162d56daa85b1ee6f1d73d9b5a5ecda2d70849.zip", + "reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849", "shasum": "" }, "require": { "php": ">=5.3.2", "symfony/event-dispatcher": ">=2.1" }, - "time": "2013-01-13 05:14:34", + "time": "2012-12-06 02:26:39", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, + "installation-source": "source", "autoload": { "psr-0": { "Guzzle\\Common": "" @@ -170,33 +113,28 @@ }, { "name": "guzzle/http", - "version": "v3.1.0", + "version": "dev-master", "target-dir": "Guzzle/Http", "source": { "type": "git", "url": "git://github.com/guzzle/http.git", - "reference": "v3.1.0" + "reference": "v3.0.5" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/http/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/http/archive/v3.0.5.zip", + "reference": "v3.0.5", "shasum": "" }, "require": { "php": ">=5.3.2", - "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", "guzzle/stream": "self.version" }, - "time": "2013-01-13 05:09:32", + "time": "2012-11-18 05:28:55", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, + "installation-source": "source", "autoload": { "psr-0": { "Guzzle\\Http": "" @@ -225,29 +163,25 @@ }, { "name": "guzzle/parser", - "version": "v3.1.0", + "version": "dev-master", "target-dir": "Guzzle/Parser", "source": { "type": "git", "url": "git://github.com/guzzle/parser.git", - "reference": "v3.1.0" + "reference": "v3.0.5" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/parser/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/parser/archive/v3.0.5.zip", + "reference": "v3.0.5", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2013-01-12 21:43:21", + "time": "2012-11-19 00:07:13", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, + "installation-source": "source", "autoload": { "psr-0": { "Guzzle\\Parser": "" @@ -269,30 +203,26 @@ }, { "name": "guzzle/stream", - "version": "v3.1.0", + "version": "dev-master", "target-dir": "Guzzle/Stream", "source": { "type": "git", "url": "https://github.com/guzzle/stream", - "reference": "v3.1.0" + "reference": "v3.0.5" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/stream/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/stream/archive/v3.0.5.zip", + "reference": "v3.0.5", "shasum": "" }, "require": { "php": ">=5.3.2", "guzzle/common": "self.version" }, - "time": "2012-12-07 16:45:11", + "time": "2012-11-11 23:54:57", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, + "installation-source": "source", "autoload": { "psr-0": { "Guzzle\\Stream": "" @@ -354,6 +284,7 @@ "dev-master": "1.1-dev" } }, + "installation-source": "dist", "autoload": { "psr-0": { "Assetic": "src/" @@ -385,12 +316,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/Routing", - "reference": "ea4a10" + "reference": "1.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony-cmf/Routing/archive/ea4a10dd971580a9a57a69397f165e25233ba667.zip", - "reference": "ea4a10", + "url": "https://github.com/symfony-cmf/Routing/archive/1.0.0-alpha3.zip", + "reference": "1.0.0-alpha3", "shasum": "" }, "require": { @@ -398,13 +329,14 @@ "symfony/routing": ">=2.1,<2.3-dev", "symfony/http-kernel": ">=2.1,<2.3-dev" }, - "time": "2013-01-21 20:33:16", + "time": "2012-12-16 17:52:57", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Cmf\\Component\\Routing": "" @@ -428,6 +360,39 @@ ] }, { + "name": "njh/easyrdf", + "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", + "version": "0.8.0", + "type": "library", + "keywords": ["RDF", "Semantic Web", "Turtle", "RDFa"], + "homepage": "http://www.aelius.com/njh/easyrdf/", + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Nicholas Humfrey", + "email": "njh@aelius.com", + "homepage": "http://www.aelius.com/njh/", + "role": "Developer" + } + ], + "support": { + "forum": "http://groups.google.com/group/easyrdf/", + "issues": "http://github.com/njh/easyrdf/issues" + }, + "require": { + "php": ">=5.2.8" + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/njh/easyrdf" + } + ], + "autoload": { + "psr-0": { "EasyRdf": "lib/" } + } + }, + { "name": "symfony/class-loader", "version": "dev-master", "target-dir": "Symfony/Component/ClassLoader", @@ -455,6 +420,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\ClassLoader\\": "" @@ -510,6 +476,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\DependencyInjection\\": "" @@ -564,6 +531,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" @@ -611,6 +579,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -682,6 +651,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" @@ -724,6 +694,7 @@ }, "time": "2012-12-06 10:00:55", "type": "library", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process": "" @@ -782,6 +753,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" @@ -829,6 +801,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Serializer\\": "" @@ -876,6 +849,7 @@ "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Yaml\\": "" @@ -922,6 +896,7 @@ "dev-master": "1.11-dev" } }, + "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -956,9 +931,7 @@ "stability-flags": { "twig/twig": 0, "doctrine/common": 0, - "guzzle/http": 0, "kriswallsmith/assetic": 15, - "symfony-cmf/routing": 20, - "easyrdf/easyrdf": 20 + "symfony-cmf/routing": 20 } } diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc index d8eb913..a7fbe7b 100644 --- a/core/includes/ajax.inc +++ b/core/includes/ajax.inc @@ -5,6 +5,8 @@ * Functions for use with Drupal's Ajax framework. */ +use Drupal\Component\Utility\NestedArray; + /** * @defgroup ajax Ajax framework * @{ @@ -289,8 +291,8 @@ function ajax_render($commands = array()) { // Now add a command to merge changes and additions to Drupal.settings. $scripts = drupal_add_js(); if (!empty($scripts['settings'])) { - $settings = drupal_merge_js_settings($scripts['settings']['data']); - array_unshift($commands, ajax_command_settings($settings, TRUE)); + $settings = $scripts['settings']; + array_unshift($commands, ajax_command_settings(NestedArray::mergeDeepArray($settings['data']), TRUE)); } // Allow modules to alter any Ajax response. diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 676a948..cd65323 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -7,7 +7,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Symfony\Component\ClassLoader\UniversalClassLoader; use Symfony\Component\ClassLoader\ApcUniversalClassLoader; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Exception\RuntimeException as DependencyInjectionRuntimeException; @@ -888,14 +887,6 @@ function drupal_get_filename($type, $name, $filename = NULL) { // nothing } else { - if ($type == 'module') { - if (empty($files[$type])) { - $files[$type] = drupal_container()->get('module_handler')->getModuleList(); - } - if (isset($files[$type][$name])) { - return $files[$type][$name]; - } - } // Verify that we have an keyvalue service before using it. This is required // because this function is called during installation. // @todo Inject database connection into KeyValueStore\DatabaseStorage. @@ -1141,9 +1132,8 @@ function drupal_page_is_cacheable($allow_caching = NULL) { * @see bootstrap_hooks() */ function bootstrap_invoke_all($hook) { - $module_handler = drupal_container()->get('module_handler'); - foreach ($module_handler->getBootstrapModules() as $module) { - $module_handler->load($module); + foreach (module_list('bootstrap') as $module) { + drupal_load('module', $module); module_invoke($module, $hook); } } @@ -1162,10 +1152,6 @@ function bootstrap_invoke_all($hook) { * TRUE if the item is loaded or has already been loaded. */ function drupal_load($type, $name) { - if ($type == 'module' && drupal_container()->get('module_handler')->moduleExists($name)) { - return drupal_container()->get('module_handler')->load($name); - } - // Once a file is included this can't be reversed during a request so do not // use drupal_static() here. static $files = array(); @@ -2289,6 +2275,10 @@ function _drupal_exception_handler($exception) { * Sets up the script environment and loads settings.php. */ function _drupal_bootstrap_configuration() { + // Set the Drupal custom error handler. + set_error_handler('_drupal_error_handler'); + set_exception_handler('_drupal_exception_handler'); + drupal_environment_initialize(); // Start a page timer: timer_start('page'); @@ -2303,11 +2293,6 @@ function _drupal_bootstrap_configuration() { // Load the procedural configuration system helper functions. require_once DRUPAL_ROOT . '/core/includes/config.inc'; - - // Set the Drupal custom error handler. (requires config()) - set_error_handler('_drupal_error_handler'); - set_exception_handler('_drupal_exception_handler'); - // Redirect the user to the installation script if Drupal has not been // installed yet (i.e., if no $databases array has been defined in the // settings.php file) and we are not already installing. @@ -2437,7 +2422,7 @@ function _drupal_bootstrap_variables() { $conf = variable_initialize(isset($conf) ? $conf : array()); // Load bootstrap modules. require_once DRUPAL_ROOT . '/core/includes/module.inc'; - drupal_container()->get('module_handler')->loadBootstrapModules(); + module_load_all(TRUE); } /** @@ -2472,14 +2457,14 @@ function drupal_get_bootstrap_phase() { * * @see Drupal\Core\DrupalKernel * - * @param Symfony\Component\DependencyInjection\ContainerInterface $new_container + * @param Symfony\Component\DependencyInjection\Container $new_container * (optional) A new container instance to replace the current. * - * @return Symfony\Component\DependencyInjection\ContainerInterface|bool - * The instance of the ContainerInterface used to set up and maintain - * object instances or FALSE if none exist yet. + * @return Symfony\Component\DependencyInjection\Container|bool + * The instance of the Container used to set up and maintain object + * instances or FALSE if none exist yet. */ -function drupal_container(ContainerInterface $new_container = NULL) { +function drupal_container(Container $new_container = NULL) { // We do not use drupal_static() here because we do not have a mechanism by // which to reinitialize the stored objects, so a drupal_static_reset() call // would leave Drupal in a nonfunctional state. @@ -2491,82 +2476,6 @@ function drupal_container(ContainerInterface $new_container = NULL) { } /** - * Returns the list of enabled modules. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->getModuleList(). - * - * @see \Drupal\Core\Extension\ModuleHandler::getModuleList() - */ -function module_list() { - $modules = array_keys(drupal_container()->get('module_handler')->getModuleList()); - return array_combine($modules, $modules); -} - -/** - * Determines which modules are implementing a hook. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->getImplementations($hook). - * - * @see \Drupal\Core\Extension\ModuleHandler::getImplementations() - */ -function module_implements($hook) { - return drupal_container()->get('module_handler')->getImplementations($hook); -} - -/** - * Invokes a hook in all enabled modules that implement it. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->invokeAll($hook). - * - * @see \Drupal\Core\Extension\ModuleHandler::invokeAll() - */ -function module_invoke_all($hook) { - $args = func_get_args(); - // Remove $hook from the arguments. - array_shift($args); - return drupal_container()->get('module_handler')->invokeAll($hook, $args); -} - -/** - * Passes alterable variables to specific hook_TYPE_alter() implementations. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->alter($hook). - * - * @see \Drupal\Core\Extension\ModuleHandler::alter() - */ -function drupal_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) { - return drupal_container()->get('module_handler')->alter($type, $data, $context1, $context2); -} - -/** - * Determines whether a given module exists. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->moduleExists($hook). - * - * @see \Drupal\Core\Extension\ModuleHandler::moduleExists() - */ -function module_exists($module) { - return drupal_container()->get('module_handler')->moduleExists($module); -} - -/** - * Determines whether a module implements a hook. - * - * @deprecated as of Drupal 8.0. Use - * drupal_container()->get('module_handler')->implementsHook($module, $hook). - * - * @see \Drupal\Core\Extension\ModuleHandler::implementsHook() - */ -function module_hook($module, $hook) { - return drupal_container()->get('module_handler')->implementsHook($module, $hook); -} - -/** * Returns the state storage service. * * Use this to store machine-generated data, local to a specific environment diff --git a/core/includes/common.inc b/core/includes/common.inc index e22307a..2638468 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -688,8 +688,8 @@ function drupal_goto($path = '', array $options = array(), $http_response_code = // A destination in $_GET always overrides the function arguments. // We do not allow absolute URLs to be passed via $_GET, as this can be an // attack vector, with the following exception: - // - Absolute URLs that point to this site (i.e. same base URL and - // base path) are allowed. + // - absolute URLs that point to this site (i.e. same base URL and + // base path) are allowed if (isset($_GET['destination']) && (!url_is_external($_GET['destination']) || _external_url_is_local($_GET['destination']))) { $destination = drupal_parse_url($_GET['destination']); $path = $destination['path']; @@ -722,18 +722,13 @@ function drupal_goto($path = '', array $options = array(), $http_response_code = * TRUE if the URL has the same domain and base path. */ function _external_url_is_local($url) { - $url_parts = parse_url($url); - $base_host = parse_url($GLOBALS['base_url'], PHP_URL_HOST); + $url_parts = parse_url($url); + $base_host = parse_url($GLOBALS['base_url'], PHP_URL_HOST); - if (!isset($url_parts['path'])) { - return ($url_parts['host'] == $base_host); - } - else { // When comparing base paths, we need a trailing slash to make sure a // partial URL match isn't occuring. Since base_path() always returns with // a trailing slash, we don't need to add the trailing slash here. return ($url_parts['host'] == $base_host && stripos($url_parts['path'], base_path()) === 0); - } } /** @@ -3874,63 +3869,6 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS } /** - * Merges an array of settings arrays into a single settings array. - * - * This function merges the items in the same way that - * - * @code - * jQuery.extend(true, {}, $settings_items[0], $settings_items[1], ...) - * @endcode - * - * would. This means integer indeces are preserved just like string indeces are, - * rather than re-indexed as is common in PHP array merging. - * - * Example: - * @code - * function module1_page_build(&$page) { - * $page['#attached']['js'][] = array( - * 'type' => 'setting', - * 'data' => array('foo' => array('a', 'b', 'c')), - * ); - * } - * function module2_page_build(&$page) { - * $page['#attached']['js'][] = array( - * 'type' => 'setting', - * 'data' => array('foo' => array('d')), - * ); - * } - * // When the page is rendered after the above code, and the browser runs the - * // resulting '; - config('user.settings')->set('anonymous', $anonymous_name)->save(); - // Test that anonymous username is in the result when requested and escaped - // with check_plain(). - $users = $this->drupalGetAjax('user/autocomplete/anonymous', array('query' => array('q' => drupal_substr($anonymous_name, 0, 4)))); - $this->assertTrue(in_array(check_plain($anonymous_name), $users), 'The anonymous name found in autocompletion results.'); - $users = $this->drupalGetAjax('user/autocomplete', array('query' => array('q' => drupal_substr($anonymous_name, 0, 4)))); - $this->assertFalse(isset($users[$anonymous_name]), 'The anonymous name not found in autocompletion results without enabling anonymous username.'); } } diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php index 052c254..a2f027f 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php @@ -80,8 +80,9 @@ function testUserLoginBlock() { * Test the Who's Online block. */ function testWhosOnlineBlock() { - $block = $this->drupalPlaceBlock('user_online_block'); - $config = $block->get('settings'); + $plugin_id = 'plugin.core.block.' . variable_get('theme_default', 'stark') . '.online'; + $block = $this->container->get('plugin.manager.block')->getInstance(array('config' => $plugin_id)); + $config = $block->getConfig(); // Generate users. $user1 = $this->drupalCreateUser(array()); @@ -99,7 +100,7 @@ function testWhosOnlineBlock() { $this->updateAccess($this->adminUser->uid, $inactive_time); // Test block output. - $content = entity_view($block, 'block'); + $content = $block->build(); $this->drupalSetContent(render($content)); $this->assertRaw(t('2 users'), 'Correct number of online users (2 users).'); $this->assertText($user1->name, 'Active user 1 found in online list.'); diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php index 38ca376..30164f0 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php @@ -53,7 +53,7 @@ function testRegistrationWithEmailVerification() { $edit['name'] = $name = $this->randomName(); $edit['mail'] = $mail = $edit['name'] . '@example.com'; $this->drupalPost('user/register', $edit, t('Create new account')); - $this->container->get('plugin.manager.entity')->getStorageController('user')->resetCache(); + entity_get_controller('user')->resetCache(); $accounts = entity_load_multiple_by_properties('user', array('name' => $name, 'mail' => $mail)); $new_user = reset($accounts); $this->assertFalse($new_user->status, 'New account is blocked until approved by an administrator.'); @@ -82,7 +82,7 @@ function testRegistrationWithoutEmailVerification() { $edit['pass[pass1]'] = $new_pass = $this->randomName(); $edit['pass[pass2]'] = $new_pass; $this->drupalPost('user/register', $edit, t('Create new account')); - $this->container->get('plugin.manager.entity')->getStorageController('user')->resetCache(); + entity_get_controller('user')->resetCache(); $accounts = entity_load_multiple_by_properties('user', array('name' => $name, 'mail' => $mail)); $new_user = reset($accounts); $this->assertText(t('Registration successful. You are now logged in.'), 'Users are logged in after registering.'); diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php index d322a64..50d4da7 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php @@ -37,10 +37,10 @@ function testRoleAdministration() { // correspond to an integer, to test that the role administration pages // correctly distinguish between role names and IDs.) $role_name = '123'; - $edit = array('role[label]' => $role_name, 'role[id]' => $role_name); + $edit = array('role[name]' => $role_name, 'role[rid]' => $role_name); $this->drupalPost('admin/people/roles', $edit, t('Add role')); $this->assertText(t('The role has been added.'), 'The role has been added.'); - $role = entity_load('user_role', $role_name); + $role = user_role_load($role_name); $this->assertTrue(is_object($role), 'The role was successfully retrieved from the database.'); // Try adding a duplicate role. @@ -50,18 +50,18 @@ function testRoleAdministration() { // Test renaming a role. $old_name = $role_name; $role_name = '456'; - $edit = array('role[label]' => $role_name); - $this->drupalPost("admin/people/roles/edit/{$role->id()}", $edit, t('Save role')); + $edit = array('role[name]' => $role_name); + $this->drupalPost("admin/people/roles/edit/{$role->rid}", $edit, t('Save role')); $this->assertText(t('The role has been renamed.'), 'The role has been renamed.'); - $new_role = entity_load('user_role', $old_name); - $this->assertEqual($new_role->label(), $role_name, 'The role name has been successfully changed.'); + $new_role = user_role_load($old_name); + $this->assertEqual($new_role->name, $role_name, 'The role name has been successfully changed.'); // Test deleting a role. - $this->drupalPost("admin/people/roles/edit/{$role->id()}", NULL, t('Delete role')); + $this->drupalPost("admin/people/roles/edit/{$role->rid}", NULL, t('Delete role')); $this->drupalPost(NULL, NULL, t('Delete')); $this->assertText(t('The role has been deleted.'), 'The role has been deleted'); - $this->assertNoLinkByHref("admin/people/roles/edit/{$role->id()}", 'Role edit link removed.'); - $this->assertFalse(entity_load('user_role', $role_name), 'A deleted role can no longer be loaded.'); + $this->assertNoLinkByHref("admin/people/roles/edit/{$role->rid}", 'Role edit link removed.'); + $this->assertFalse(user_role_load($role_name), 'A deleted role can no longer be loaded.'); // Make sure that the system-defined roles can be edited via the user // interface. @@ -74,36 +74,24 @@ function testRoleAdministration() { } /** - * Test user role weight change operation and ordering. + * Test user role weight change operation. */ - function testRoleWeightOrdering() { + function testRoleWeightChange() { $this->drupalLogin($this->admin_user); - $roles = user_roles(); - $weight = count($roles); - $new_role_weights = array(); - $saved_rids = array(); - - // Change the role weights to make the roles in reverse order. - $edit = array(); - foreach ($roles as $role) { - $edit['roles['. $role->id() .'][weight]'] = $weight; - $new_role_weights[$role->id()] = $weight; - $saved_rids[] = $role->id; - $weight--; - } + + // Pick up a random role and get its weight. + $rid = array_rand(user_roles()); + $role = user_role_load($rid); + $old_weight = $role->weight; + + // Change the role weight and submit the form. + $edit = array('roles['. $rid .'][weight]' => $old_weight + 1); $this->drupalPost('admin/people/roles', $edit, t('Save order')); $this->assertText(t('The role settings have been updated.'), 'The role settings form submitted successfully.'); - // Load up the user roles with the new weights. - drupal_static_reset('user_roles'); - $roles = user_roles(); - $rids = array(); - // Test that the role weights have been correctly saved. - foreach ($roles as $role) { - $this->assertEqual($role->weight, $new_role_weights[$role->id()]); - $rids[] = $role->id; - } - // The order of the roles should be reversed. - $this->assertIdentical($rids, array_reverse($saved_rids)); + // Retrieve the saved role and compare its weight. + $role = user_role_load($rid); + $new_weight = $role->weight; + $this->assertTrue(($old_weight + 1) == $new_weight, 'Role weight updated successfully.'); } } diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php index 31f01b9..9ed88ca 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php @@ -41,17 +41,19 @@ function setUp() { // Prefetch and create text formats. $this->plain_text_format = filter_format_load('plain_text'); - $this->filtered_html_format = entity_create('filter_format', array( + $filtered_html_format = array( 'format' => 'filtered_html', 'name' => 'Filtered HTML', - )); - $this->filtered_html_format->save(); + ); + $this->filtered_html_format = (object) $filtered_html_format; + filter_format_save($this->filtered_html_format); - $this->full_html_format = entity_create('filter_format', array( + $full_html_format = array( 'format' => 'full_html', 'name' => 'Full HTML', - )); - $this->full_html_format->save(); + ); + $this->full_html_format = (object) $full_html_format; + filter_format_save($this->full_html_format); user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array(filter_permission_name($this->filtered_html_format))); $this->checkPermissions(array(), TRUE); diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php deleted file mode 100644 index f85d7fa..0000000 --- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php +++ /dev/null @@ -1,60 +0,0 @@ - 'User: Role Field', - 'description' => 'Tests the handler of the user: role field.', - 'group' => 'Views Modules', - ); - } - - public function testRole() { - // Create a couple of roles for the view. - $rolename_a = 'a' . $this->randomName(8); - $rid_a = $this->drupalCreateRole(array('access content'), $rolename_a, $rolename_a, 9); - - $rolename_b = 'b' . $this->randomName(8); - $rid_b = $this->drupalCreateRole(array('access content'), $rolename_b, $rolename_b, 8); - - $rolename_not_assigned = $this->randomName(8); - $this->drupalCreateRole(array('access content'), $rolename_not_assigned, $rolename_not_assigned); - - // Add roles to user 1. - $user = user_load(1); - $user->roles[$rid_a] = $rolename_a; - $user->roles[$rid_b] = $rolename_b; - $user->save(); - - $view = views_get_view('test_views_handler_field_role'); - $this->executeView($view); - $view->row_index = 0; - // The role field is populated during pre_render. - $view->field['rid']->pre_render($view->result); - $render = $view->field['rid']->advanced_render($view->result[0]); - - $this->assertEqual($rolename_b . $rolename_a, $render, 'View test_views_handler_field_role renders role assigned to user in the correct order.'); - $this->assertFalse(strpos($render, $rolename_not_assigned), 'View test_views_handler_field_role does not render a role not assigned to a user.'); - } - -} diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php index 3d8e981..5d7b634 100644 --- a/core/modules/user/lib/Drupal/user/UserStorageController.php +++ b/core/modules/user/lib/Drupal/user/UserStorageController.php @@ -34,9 +34,9 @@ function attachLoad(&$queried_users, $load_revision = FALSE) { } // Add any additional roles from the database. - $result = db_query('SELECT rid, uid FROM {users_roles} WHERE uid IN (:uids)', array(':uids' => array_keys($queried_users))); + $result = db_query('SELECT r.rid, r.name, ur.uid FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid IN (:uids)', array(':uids' => array_keys($queried_users))); foreach ($result as $record) { - $queried_users[$record->uid]->roles[$record->rid] = $record->rid; + $queried_users[$record->uid]->roles[$record->rid] = $record->name; } // Call the default attachLoad() method. This will add fields and call diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml deleted file mode 100644 index 193c15b..0000000 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml +++ /dev/null @@ -1,153 +0,0 @@ -base_field: uid -base_table: users -core: 8.x -description: '' -disabled: '0' -display: - default: - display_plugin: default - id: default - display_title: Master - position: '' - display_options: - access: - type: perm - perm: 'access user profiles' - cache: - type: none - query: - type: views_query - exposed_form: - type: basic - pager: - type: none - options: - items_per_page: '' - style: - type: default - row: - type: fields - fields: - name: - id: name - table: users - field: name - relationship: none - group_type: group - admin_label: '' - label: Name - exclude: '0' - alter: - alter_text: '0' - text: '' - make_link: '0' - path: '' - absolute: '0' - external: '0' - replace_spaces: '0' - path_case: none - trim_whitespace: '0' - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: '0' - max_length: '' - word_boundary: '1' - ellipsis: '1' - more_link: '0' - more_link_text: '' - more_link_path: '' - strip_tags: '0' - trim: '0' - preserve_tags: '' - html: '0' - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: '1' - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: '1' - empty: '' - hide_empty: '0' - empty_zero: '0' - hide_alter_empty: '1' - link_to_user: '1' - overwrite_anonymous: '0' - anonymous_text: '' - format_username: '1' - rid: - id: rid - table: users_roles - field: rid - relationship: none - group_type: group - admin_label: '' - label: Roles - exclude: '0' - alter: - alter_text: '0' - text: '' - make_link: '0' - path: '' - absolute: '0' - external: '0' - replace_spaces: '0' - path_case: none - trim_whitespace: '0' - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: '0' - max_length: '' - word_boundary: '1' - ellipsis: '1' - more_link: '0' - more_link_text: '' - more_link_path: '' - strip_tags: '0' - trim: '0' - preserve_tags: '' - html: '0' - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: '1' - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: '1' - empty: '' - hide_empty: '0' - empty_zero: '0' - hide_alter_empty: '1' - type: separator - separator: '' - filters: - status: - value: '1' - table: users - field: status - id: status - expose: - operator: '0' - group: '1' - sorts: { } - title: test_user_role - page_1: - display_plugin: page - id: page_1 - display_title: Page - position: '' - display_options: - path: test-views-handler-field-role -human_name: test_views_handler_field_role -id: test_views_handler_field_role -tag: '' diff --git a/core/modules/user/tests/modules/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php b/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php similarity index 100% rename from core/modules/user/tests/modules/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php rename to core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php diff --git a/core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.info b/core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.info similarity index 100% rename from core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.info rename to core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.info diff --git a/core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.module b/core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.module similarity index 100% rename from core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.module rename to core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.module diff --git a/core/modules/user/tests/modules/user_form_test/user_form_test.info b/core/modules/user/tests/user_form_test.info similarity index 100% rename from core/modules/user/tests/modules/user_form_test/user_form_test.info rename to core/modules/user/tests/user_form_test.info diff --git a/core/modules/user/tests/modules/user_form_test/user_form_test.module b/core/modules/user/tests/user_form_test.module similarity index 100% rename from core/modules/user/tests/modules/user_form_test/user_form_test.module rename to core/modules/user/tests/user_form_test.module diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml similarity index 91% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml index cab4e3f..f509323 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -24,5 +25,5 @@ display: id: default position: '0' human_name: '' -id: test_access_perm +name: test_access_perm tag: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml similarity index 90% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml index e8df49d..3d2b4d9 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_access_role +name: test_access_role tag: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml similarity index 97% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml index 8b09600..7d79d11 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_field: uid base_table: users core: 8.0-dev @@ -71,5 +72,5 @@ display: human_name: test_groupwise_user langcode: und module: views -id: test_groupwise_user +name: test_groupwise_user tag: default diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml similarity index 94% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml index 40b8ff1..54180b6 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -51,5 +52,5 @@ display: id: default position: '0' human_name: '' -id: test_plugin_argument_default_current_user +name: test_plugin_argument_default_current_user tag: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml similarity index 96% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml index 3288594..ab243bc 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: users core: '8' description: '' @@ -48,5 +49,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_user_name +name: test_user_name tag: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml similarity index 97% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml index 3c19d4e..096fa16 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -97,5 +98,5 @@ display: id: default position: '0' human_name: test_user_relationship -id: test_user_relationship +name: test_user_relationship tag: default diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml similarity index 89% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml index 6309f8a..7dfce3e 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: users core: '8' description: '' @@ -22,4 +23,4 @@ display: id: default position: '0' human_name: -id: test_user_uid_argument +name: test_user_uid_argument diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml similarity index 91% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml index dba19db..2750f43 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -32,5 +33,5 @@ display: id: default position: '0' human_name: '' -id: test_view_argument_validate_user +name: test_view_argument_validate_user tag: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml similarity index 94% rename from core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml rename to core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml index f068501..48522e0 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: users core: '8' description: '' @@ -45,5 +46,5 @@ display: id: default position: '0' human_name: test_views_handler_field_user_name -id: test_views_handler_field_user_name +name: test_views_handler_field_user_name tag: default diff --git a/core/modules/user/tests/modules/user_test_views/user_test_views.info b/core/modules/user/tests/user_test_views/user_test_views.info similarity index 100% rename from core/modules/user/tests/modules/user_test_views/user_test_views.info rename to core/modules/user/tests/user_test_views/user_test_views.info diff --git a/core/modules/user/tests/modules/user_test_views/user_test_views.module b/core/modules/user/tests/user_test_views/user_test_views.module similarity index 100% rename from core/modules/user/tests/modules/user_test_views/user_test_views.module rename to core/modules/user/tests/user_test_views/user_test_views.module diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index 4da13b8..1689f62 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -208,7 +208,7 @@ function user_admin_account() { $destination = drupal_get_destination(); $status = array(t('blocked'), t('active')); - $roles = array_map('check_plain', user_role_names(TRUE)); + $roles = array_map('check_plain', user_roles(TRUE)); $accounts = array(); foreach ($result as $account) { $account = user_load($account->uid); @@ -316,7 +316,7 @@ function user_admin_settings($form, &$form_state) { // Do not allow users to set the anonymous or authenticated user roles as the // administrator role. - $roles = user_role_names(); + $roles = user_roles(); unset($roles[DRUPAL_ANONYMOUS_RID]); unset($roles[DRUPAL_AUTHENTICATED_RID]); $roles[0] = t('disabled'); @@ -439,27 +439,6 @@ function user_admin_settings($form, &$form_state) { '#rows' => 8, ); - $form['email_pending_approval_admin'] = array( - '#type' => 'details', - '#title' => t('Admin (user awaiting approval)'), - '#collapsible' => TRUE, - '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL), - '#description' => t('Edit the e-mail notifying the site administrator that there are new members awaiting administrative approval.') . ' ' . $email_token_help, - '#group' => 'email', - ); - $form['email_pending_approval_admin']['register_pending_approval_admin_subject'] = array( - '#type' => 'textfield', - '#title' => t('Subject'), - '#default_value' => $mail_config->get('register_pending_approval_admin.subject'), - '#maxlength' => 180, - ); - $form['email_pending_approval_admin']['register_pending_approval_admin_body'] = array( - '#type' => 'textarea', - '#title' => t('Body'), - '#default_value' => $mail_config->get('register_pending_approval_admin.body'), - '#rows' => 8, - ); - $form['email_no_approval_required'] = array( '#type' => 'details', '#title' => t('Welcome (no approval required)'), @@ -677,7 +656,7 @@ function user_admin_settings_submit($form, &$form_state) { function user_admin_permissions($form, $form_state, $rid = NULL) { // Retrieve role names for columns. - $role_names = user_role_names(); + $role_names = user_roles(); if (isset($rid)) { $role_names = array($rid => $role_names[$rid]); } @@ -778,7 +757,7 @@ function user_admin_permissions_submit($form, &$form_state) { function theme_user_admin_permissions($variables) { $form = $variables['form']; - $roles = user_role_names(); + $roles = user_roles(); foreach (element_children($form['permission']) as $key) { $row = array(); // Module name @@ -847,21 +826,27 @@ function theme_user_permission_description($variables) { * @see theme_user_admin_roles() */ function user_admin_roles($form, $form_state) { - $roles = user_roles(); + $roles = db_select('role', 'r') + ->addTag('translatable') + ->fields('r') + ->orderBy('weight') + ->orderBy('name') + ->execute(); $form['roles'] = array( '#tree' => TRUE, ); - - foreach ($roles as $rid => $role) { - $form['roles'][$rid]['#role'] = $role; - $form['roles'][$rid]['#weight'] = $role->weight; - $form['roles'][$rid]['name'] = array( - '#markup' => check_plain($role->label()), + $max_weight = 0; + foreach ($roles as $role) { + $max_weight = max($max_weight, $role->weight); + $form['roles'][$role->rid]['#role'] = $role; + $form['roles'][$role->rid]['#weight'] = $role->weight; + $form['roles'][$role->rid]['name'] = array( + '#markup' => check_plain($role->name), ); - $form['roles'][$rid]['weight'] = array( + $form['roles'][$role->rid]['weight'] = array( '#type' => 'textfield', - '#title' => t('Weight for @title', array('@title' => $role->label())), + '#title' => t('Weight for @title', array('@title' => $role->name)), '#title_display' => 'invisible', '#size' => 4, '#default_value' => $role->weight, @@ -869,25 +854,26 @@ function user_admin_roles($form, $form_state) { ); $links['edit'] = array( 'title' => t('edit role'), - 'href' => 'admin/people/roles/edit/' . $rid, + 'href' => 'admin/people/roles/edit/' . $role->rid, 'weight' => 0, ); $links['permissions'] = array( 'title' => t('edit permissions'), - 'href' => 'admin/people/permissions/' . $rid, + 'href' => 'admin/people/permissions/' . $role->rid, 'weight' => 5, ); - $form['roles'][$rid]['operations'] = array( + $form['roles'][$role->rid]['operations'] = array( '#type' => 'operations', '#links' => $links, ); } // Embed the role add form. - $add_role = entity_create('user_role', array( - 'id' => NULL, - 'label' => NULL, - )); + $add_role = (object) array( + 'rid' => NULL, + 'name' => NULL, + 'weight' => $max_weight + 1, + ); $add_form = user_admin_role(array(), $form_state, $add_role); $add_form['actions']['submit']['#submit'] = array('user_admin_role_submit'); $add_form['role']['actions'] = $add_form['actions']; @@ -913,7 +899,7 @@ function user_admin_roles_order_submit($form, &$form_state) { foreach ($form_state['values']['roles'] as $rid => $role_values) { $role = $form['roles'][$rid]['#role']; $role->weight = $role_values['weight']; - $role->save(); + user_role_save($role); } drupal_set_message(t('The role settings have been updated.')); } @@ -967,33 +953,32 @@ function theme_user_admin_roles($variables) { * * @ingroup forms * @see user_admin_role_submit() - * - * @todo Move into a RoleFormController. */ function user_admin_role($form, $form_state, $role) { $form['role'] = array( '#tree' => TRUE, '#parents' => array('role'), ); - $form['role']['label'] = array( + + $form['role']['name'] = array( '#type' => 'textfield', '#title' => t('Role name'), - '#default_value' => $role->label(), + '#default_value' => $role->name, '#size' => 30, '#required' => TRUE, '#maxlength' => 64, '#description' => t('The name for this role. Example: "Moderator", "Editorial board", "Site architect".'), ); - $form['role']['id'] = array( + $form['role']['rid'] = array( '#type' => 'machine_name', - '#default_value' => $role->id(), + '#default_value' => $role->rid, '#required' => TRUE, - '#disabled' => !$role->isNew(), + '#disabled' => !empty($role->rid), '#size' => 30, '#maxlength' => 64, '#machine_name' => array( 'exists' => 'user_role_load', - 'source' => array('role', 'label'), + 'source' => array('role', 'name'), ), ); $form['role']['weight'] = array( @@ -1003,12 +988,12 @@ function user_admin_role($form, $form_state, $role) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', - '#value' => !$role->isNew() ? t('Save role') : t('Add role'), + '#value' => !empty($role->rid) ? t('Save role') : t('Add role'), ); $form['actions']['delete'] = array( '#type' => 'submit', '#value' => t('Delete role'), - '#access' => !$role->isNew() && !in_array($role->id(), array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID)), + '#access' => !empty($role->rid) && !in_array($role->rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID)), '#submit' => array('user_admin_role_delete_submit'), ); @@ -1019,11 +1004,9 @@ function user_admin_role($form, $form_state, $role) { * Form submit handler for the user_admin_role() form. */ function user_admin_role_submit($form, &$form_state) { - // Prevent leading and trailing spaces in role names. - $form_state['values']['role']['label'] = trim($form_state['values']['role']['label']); - - $role = entity_create('user_role', $form_state['values']['role']); - if ($role->save() == SAVED_UPDATED) { + $role = (object) $form_state['values']['role']; + $status = user_role_save($role); + if ($status === SAVED_UPDATED) { drupal_set_message(t('The role has been renamed.')); } else { @@ -1036,25 +1019,26 @@ function user_admin_role_submit($form, &$form_state) { * Form submit handler for the user_admin_role() form. */ function user_admin_role_delete_submit($form, &$form_state) { - $form_state['redirect'] = 'admin/people/roles/delete/' . $form_state['values']['role']['id']; + $form_state['redirect'] = 'admin/people/roles/delete/' . $form_state['values']['role']['rid']; } /** * Form to confirm role delete operation. */ function user_admin_role_delete_confirm($form, &$form_state, $role) { - $form['id'] = array( + $form['rid'] = array( '#type' => 'value', - '#value' => $role->id(), + '#value' => $role->rid, ); - return confirm_form($form, t('Are you sure you want to delete the role %name ?', array('%name' => $role->label())), 'admin/people/roles', t('This action cannot be undone.'), t('Delete')); + return confirm_form($form, t('Are you sure you want to delete the role %name ?', array('%name' => $role->name)), 'admin/people/roles', t('This action cannot be undone.'), t('Delete')); } /** * Form submit handler for user_admin_role_delete_confirm(). */ function user_admin_role_delete_confirm_submit($form, &$form_state) { - entity_delete_multiple('user_role', array($form_state['values']['id'])); + user_role_delete($form_state['values']['rid']); drupal_set_message(t('The role has been deleted.')); $form_state['redirect'] = 'admin/people/roles'; } + diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index 652c5b5..cae3dde 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -440,7 +440,7 @@ function hook_user_role_insert($role) { // Save extra fields provided by the module to user roles. db_insert('my_module_table') ->fields(array( - 'rid' => $role->id(), + 'rid' => $role->rid, 'role_description' => $role->description, )) ->execute(); @@ -460,7 +460,7 @@ function hook_user_role_insert($role) { function hook_user_role_update($role) { // Save extra fields provided by the module to user roles. db_merge('my_module_table') - ->key(array('rid' => $role->id())) + ->key(array('rid' => $role->rid)) ->fields(array( 'role_description' => $role->description )) @@ -481,7 +481,7 @@ function hook_user_role_update($role) { function hook_user_role_delete($role) { // Delete existing instances of the deleted role. db_delete('my_module_table') - ->condition('rid', $role->id()) + ->condition('rid', $role->rid) ->execute(); } diff --git a/core/modules/user/user.css b/core/modules/user/user.css index 42ca431..8513db4 100644 --- a/core/modules/user/user.css +++ b/core/modules/user/user.css @@ -65,37 +65,6 @@ div.password-suggestions ul { width: 36.3em; } - /** - * Password strength indicator on narrow viewport. - */ -@media screen and (max-width: 600px) { - .password-strength { - margin-top: 0; - width: auto; - } - .password-indicator { - margin-bottom: 0.4em; - } - input.password-confirm, - input.password-field { - margin-bottom: 0; - width: 100%; - } - div.password-confirm { - margin-top: 0; - width: auto; - } - div.form-item div.password-suggestions { - width: auto; - } - .confirm-parent, - .password-parent { - clear: none; - margin: 0; - width: 100%; - } -} - /** * Toolbar icon. */ diff --git a/core/modules/user/user.install b/core/modules/user/user.install index 9a0b663..1475cda 100644 --- a/core/modules/user/user.install +++ b/core/modules/user/user.install @@ -75,7 +75,7 @@ function user_schema() { 'type' => 'varchar', 'length' => 255, 'not null' => FALSE, - 'description' => 'The filter format ID of the signature.', + 'description' => 'The {filter_format}.format of the signature.', ), 'created' => array( 'type' => 'int', @@ -148,6 +148,39 @@ function user_schema() { ), ); + $schema['role'] = array( + 'description' => 'Stores user roles.', + 'fields' => array( + 'rid' => array( + 'type' => 'varchar', + // The role ID is often used as part of a compound index; at least MySQL + // has a maximum index length of 1000 characters (333 on utf8), so we + // limit the maximum length. + 'length' => 64, + 'not null' => TRUE, + 'description' => 'Primary Key: Unique role ID.', + ), + 'name' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + 'description' => 'Role label.', + 'translatable' => TRUE, + ), + 'weight' => array( + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + 'description' => 'The weight of this role in listings and the user interface.', + ), + ), + 'primary key' => array('rid'), + 'indexes' => array( + 'name_weight' => array('name', 'weight'), + ), + ); + $schema['role_permission'] = array( 'description' => 'Stores the permissions assigned to user roles.', 'fields' => array( @@ -293,6 +326,13 @@ function user_install() { 'status' => 1, )) ->execute(); + + // Insert built-in roles. + db_insert('role') + ->fields(array('rid', 'name', 'weight')) + ->values(array(DRUPAL_ANONYMOUS_RID, 'Anonymous user', 0)) + ->values(array(DRUPAL_AUTHENTICATED_RID, 'Authenticated user', 1)) + ->execute(); } /** @@ -585,8 +625,6 @@ function user_update_8006() { 'register_admin_created_body' => 'register_admin_created.body', 'register_pending_approval_subject' => 'register_pending_approval.subject', 'register_pending_approval_body' => 'register_pending_approval.body', - 'register_pending_approval_admin_body' => 'register_pending_approval_admin.body', - 'register_pending_approval_admin_subject' => 'register_pending_approval_admin.subject', 'register_no_approval_required_subject' => 'register_no_approval_required.subject', 'register_no_approval_required_body' => 'register_no_approval_required.body', 'password_reset_subject' => 'password_reset.subject', @@ -1017,33 +1055,5 @@ function user_update_8016() { } /** - * Migrate user roles into configuration. - * - * @ingroup config_upgrade - */ -function user_update_8017() { - $uuid = new Uuid(); - - $roles = db_select('role', 'r') - ->fields('r') - ->execute() - ->fetchAll(); - - foreach ($roles as $role) { - config('user.role.' . $role->rid) - ->set('id', $role->rid) - ->set('uuid', $uuid->generate()) - ->set('label', $role->name) - ->set('weight', $role->weight) - ->set('langcode', LANGUAGE_NOT_SPECIFIED) - ->save(); - } - - update_config_manifest_add('user.role', array_map(function ($role) { - return $role->rid; - }, $roles)); -} - -/** * @} End of "addtogroup updates-7.x-to-8.x". */ diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 55314bb..747758d 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -6,7 +6,6 @@ use Drupal\entity\Plugin\Core\Entity\EntityDisplay; use Drupal\file\Plugin\Core\Entity\File; use Drupal\user\Plugin\Core\Entity\User; -use Drupal\user\UserRole; use Drupal\Core\Template\Attribute; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -124,33 +123,6 @@ function user_page_build(&$page) { } /** - * Implements hook_entity_view_mode_info(). - */ -function user_entity_view_mode_info() { - $view_modes['user']['full'] = array( - 'label' => t('User account'), - ); - $view_modes['user']['compact'] = array( - 'label' => t('Compact'), - 'custom_settings' => TRUE, - ); - return $view_modes; -} - -/** - * Implements hook_entity_bundle_info(). - */ -function user_entity_bundle_info() { - $bundles['user']['user'] = array( - 'label' => t('User'), - 'admin' => array( - 'path' => 'admin/config/people/accounts', - ), - ); - return $bundles; -} - -/** * Entity URI callback. */ function user_uri($user) { @@ -917,15 +889,6 @@ function user_menu() { 'file' => 'user.pages.inc', ); - $items['user/autocomplete/anonymous'] = array( - 'title' => 'User autocomplete including anonymous', - 'page callback' => 'user_autocomplete', - 'page arguments' => array(TRUE), - 'access callback' => 'user_access', - 'access arguments' => array('access user profiles'), - 'type' => MENU_CALLBACK, - 'file' => 'user.pages.inc', - ); // Registration and login pages. $items['user'] = array( 'title' => 'User account', @@ -1855,25 +1818,6 @@ function user_mail_tokens(&$replacements, $data, $options) { * An associative array with the role id as the key and the role name as * value. */ -function user_role_names($membersonly = FALSE, $permission = NULL) { - return array_map(function($item) { - return $item->label(); - }, user_roles($membersonly, $permission)); -} - -/** - * Retrieve an array of roles matching specified conditions. - * - * @param $membersonly - * Set this to TRUE to exclude the 'anonymous' role. - * @param $permission - * A string containing a permission. If set, only roles containing that - * permission are returned. - * - * @return - * An associative array with the role id as the key and the role object as - * value. - */ function user_roles($membersonly = FALSE, $permission = NULL) { $user_roles = &drupal_static(__FUNCTION__); @@ -1886,22 +1830,23 @@ function user_roles($membersonly = FALSE, $permission = NULL) { } } - $roles = entity_load_multiple('user_role'); - if ($membersonly) { - unset($roles[DRUPAL_ANONYMOUS_RID]); - } - + $query = db_select('role', 'r'); + $query->addTag('translatable'); + $query->fields('r', array('rid', 'name')); + $query->orderBy('weight'); + $query->orderBy('name'); if (!empty($permission)) { - $result = db_select('role_permission', 'p') - ->fields('p', array('rid')) - ->condition('p.rid', array_keys($roles)) - ->condition('p.permission', $permission) - ->execute()->fetchCol(); - $roles = array_intersect_key($roles, array_flip($result)); + $query->innerJoin('role_permission', 'p', 'r.rid = p.rid'); + $query->condition('p.permission', $permission); + } + if ($membersonly) { + $query->condition('r.rid', DRUPAL_ANONYMOUS_RID, '!='); } + $roles = $query->execute()->fetchAllKeyed(); if (empty($permission)) { $user_roles[$cid] = $roles; + return $user_roles[$cid]; } return $roles; @@ -1918,7 +1863,87 @@ function user_roles($membersonly = FALSE, $permission = NULL) { * otherwise. */ function user_role_load($rid) { - return entity_load('user_role', $rid); + return db_select('role', 'r') + ->fields('r') + ->condition('rid', $rid) + ->execute() + ->fetchObject(); +} + +/** + * Save a user role to the database. + * + * @param $role + * A role object to modify or add. + * + * @return + * Status constant indicating if role was created or updated. + * Failure to write the user role record will return FALSE. Otherwise + * SAVED_NEW or SAVED_UPDATED is returned depending on the operation + * performed. + */ +function user_role_save($role) { + if ($role->name) { + // Prevent leading and trailing spaces in role names. + $role->name = trim($role->name); + } + if (!isset($role->weight)) { + // Set a role weight to make this new role last. + $query = db_select('role'); + $query->addExpression('MAX(weight)'); + $role->weight = $query->execute()->fetchField() + 1; + } + + // Let modules modify the user role before it is saved to the database. + module_invoke_all('user_role_presave', $role); + + $exists = db_select('role', 'r') + ->fields('r', array('rid')) + ->condition('rid', $role->rid) + ->execute() + ->fetchAll(); + + if (empty($exists)) { + $status = drupal_write_record('role', $role); + module_invoke_all('user_role_insert', $role); + } + else { + $status = drupal_write_record('role', $role, 'rid'); + module_invoke_all('user_role_update', $role); + } + + // Clear the user access cache. + drupal_static_reset('user_access'); + drupal_static_reset('user_role_permissions'); + + return $status; +} + +/** + * Delete a user role from database. + * + * @param $role + * A string with the role ID. + */ +function user_role_delete($role) { + $role = user_role_load($role); + + db_delete('role') + ->condition('rid', $role->rid) + ->execute(); + db_delete('role_permission') + ->condition('rid', $role->rid) + ->execute(); + // Update the users who have this role set: + db_delete('users_roles') + ->condition('rid', $role->rid) + ->execute(); + + module_invoke_all('user_role_delete', $role); + + // Clear the user access cache. + drupal_static_reset('user_access'); + drupal_static_reset('user_role_permissions'); } /** @@ -1926,7 +1951,7 @@ function user_role_load($rid) { */ function user_role_delete_access($role) { // Prevent the system-defined roles from being removed. - if ($role->id() == DRUPAL_ANONYMOUS_RID || $role->id() == DRUPAL_AUTHENTICATED_RID) { + if ($role->rid == DRUPAL_ANONYMOUS_RID || $role->rid == DRUPAL_AUTHENTICATED_RID) { return FALSE; } @@ -2065,7 +2090,7 @@ function user_user_operations($form = array(), $form_state = array()) { ); if (user_access('administer permissions')) { - $roles = user_role_names(TRUE); + $roles = user_roles(TRUE); unset($roles[DRUPAL_AUTHENTICATED_RID]); // Can't edit authenticated role. $add_roles = array(); @@ -2150,7 +2175,7 @@ function user_user_operations_block($accounts) { * Callback function for admin mass adding/deleting a user role. */ function user_multiple_role_edit($accounts, $operation, $rid) { - $role_name = entity_load('user_role', $rid)->label(); + $role_name = db_query('SELECT name FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchField(); switch ($operation) { case 'add_role': @@ -2282,7 +2307,7 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) { function user_filters() { // Regular filters $filters = array(); - $roles = user_role_names(TRUE); + $roles = user_roles(TRUE); unset($roles[DRUPAL_AUTHENTICATED_RID]); // Don't list authorized role. if (count($roles)) { $filters['role'] = array( @@ -2789,9 +2814,6 @@ function user_library_info() { 'js' => array( drupal_get_path('module', 'user') . '/user.js' => array(), ), - 'css' => array( - drupal_get_path('module', 'user') . '/user.css' => array(), - ), 'dependencies' => array( array('system', 'jquery'), array('system', 'drupal'), diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index 5a872ab..c1b9349 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -12,29 +12,11 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; /** - * Menu callback for user autocompletion. - * - * Like other autocomplete functions, this function inspects the 'q' query - * parameter for the string to use to search for suggestions. - * - * @param bool $include_anonymous - * (optional) TRUE if the the name used to indicate anonymous users (e.g. - * "Anonymous") should be autocompleted. Defaults to FALSE. - * - * @return \Symfony\Component\HttpFoundation\JsonResponse - * A JSON response containing the autocomplete suggestions for existing users. + * Menu callback; Retrieve a JSON object containing autocomplete suggestions for existing users. */ -function user_autocomplete($include_anonymous = FALSE) { +function user_autocomplete() { $matches = array(); - $query = drupal_container()->get('request')->query; - if ($string = $query->get('q')) { - if ($include_anonymous) { - $anonymous_name = config('user.settings')->get('anonymous'); - // Allow autocompletion for the anonymous user. - if (stripos($anonymous_name, $string) !== FALSE) { - $matches[$anonymous_name] = check_plain($anonymous_name); - } - } + if ($string = drupal_container()->get('request')->query->get('q')) { $result = db_select('users')->fields('users', array('name'))->condition('name', db_like($string) . '%', 'LIKE')->range(0, 10)->execute(); foreach ($result as $account) { $matches[$account->name] = check_plain($account->name); diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc index 5aefa46..9264381 100644 --- a/core/modules/user/user.views.inc +++ b/core/modules/user/user.views.inc @@ -32,6 +32,7 @@ function user_views_data() { 'help' => t('The user ID'), // The help that appears on the UI, 'field' => array( 'id' => 'user', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'user_uid', @@ -99,6 +100,7 @@ function user_views_data() { 'help' => t('The user or author name.'), // The help that appears on the UI, 'field' => array( 'id' => 'user_name', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'standard', @@ -120,6 +122,7 @@ function user_views_data() { 'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'), // The help that appears on the UI, 'field' => array( 'id' => 'user_mail', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'standard', @@ -138,6 +141,7 @@ function user_views_data() { 'help' => t('Language of the user'), 'field' => array( 'id' => 'user_language', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'standard', @@ -156,7 +160,6 @@ function user_views_data() { 'title' => t('Link'), 'help' => t('Provide a simple link to the user.'), 'id' => 'user_link', - 'click sortable' => FALSE, ), ); @@ -166,6 +169,7 @@ function user_views_data() { 'help' => t('The date the user was created.'), // The help that appears on the UI, 'field' => array( 'id' => 'date', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'date' @@ -235,6 +239,7 @@ function user_views_data() { 'help' => t("The user's last access date."), // The help that appears on the UI, 'field' => array( 'id' => 'date', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'date' @@ -250,6 +255,7 @@ function user_views_data() { 'help' => t("The user's last login date."), // The help that appears on the UI, 'field' => array( 'id' => 'date', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'date' @@ -266,6 +272,7 @@ function user_views_data() { // Information for displaying a title as a field 'field' => array( 'id' => 'boolean', + 'click sortable' => TRUE, 'output formats' => array( 'active-blocked' => array(t('Active'), t('Blocked')), ), @@ -288,7 +295,6 @@ function user_views_data() { 'field' => array( 'id' => 'markup', 'format' => filter_fallback_format(), - 'click sortable' => FALSE, ), 'filter' => array( 'id' => 'string', @@ -300,7 +306,6 @@ function user_views_data() { 'title' => t('Edit link'), 'help' => t('Provide a simple link to edit the user.'), 'id' => 'user_link_edit', - 'click sortable' => FALSE, ), ); @@ -309,7 +314,6 @@ function user_views_data() { 'title' => t('Cancel link'), 'help' => t('Provide a simple link to cancel the user.'), 'id' => 'user_link_cancel', - 'click sortable' => FALSE, ), ); @@ -347,6 +351,22 @@ function user_views_data() { ), ); + // role table + + $data['role']['table']['join'] = array( + // Directly links to users table. + 'users' => array( + 'left_table' => 'users_roles', + 'left_field' => 'rid', + 'field' => 'rid', + ), + // needed for many to one helper sometimes + 'users_roles' => array( + 'left_field' => 'rid', + 'field' => 'rid', + ), + ); + // permission table $data['role_permission']['table']['group'] = t('User'); $data['role_permission']['table']['join'] = array( diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index 1623e79..f018c57 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: node -id: archive +name: archive description: 'A list of months that link to content for that month.' tag: default base_table: node diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index 58de2ca..3d9011b 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: search -id: backlinks +name: backlinks description: 'A list of other content items which have a link to the content item.' tag: default base_table: node diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml index 57aab63..336f0da 100644 --- a/core/modules/views/config/views.view.comments_recent.yml +++ b/core/modules/views/config/views.view.comments_recent.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: comment -id: comments_recent +name: comments_recent description: 'A block and a page with recent comments.' tag: default base_table: comment diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/views/config/views.view.frontpage.yml index 09c507d..a635a0e 100644 --- a/core/modules/views/config/views.view.frontpage.yml +++ b/core/modules/views/config/views.view.frontpage.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: node -id: frontpage +name: frontpage description: 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.' tag: default base_table: node diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index 6ac297a..18f059c 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: node -id: glossary +name: glossary description: 'A list of all content, by letter.' tag: default base_table: node diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml index 704bb67..40d85ed 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: taxonomy -id: taxonomy_term +name: taxonomy_term description: 'Customize the default taxonomy/term display.' tag: default base_table: node diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index 253259f..e9c903d 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -1,6 +1,7 @@ disabled: true +api_version: '3.0' module: node -id: tracker +name: tracker description: 'Shows all new activity on the system.' tag: default base_table: node diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc index 5cf0caf..61f913c 100644 --- a/core/modules/views/includes/ajax.inc +++ b/core/modules/views/includes/ajax.inc @@ -208,7 +208,7 @@ function views_ajax_command_replace_title($title) { $command = array( 'command' => 'viewsReplaceTitle', 'title' => $title, - 'siteName' => config('system.site')->id(), + 'siteName' => config('system.site')->get('name'), ); return $command; } diff --git a/core/modules/views/views_ui/js/ajax.js b/core/modules/views/js/ajax.js similarity index 100% rename from core/modules/views/views_ui/js/ajax.js rename to core/modules/views/js/ajax.js diff --git a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php index bf7eca2..4434cab 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php @@ -32,7 +32,7 @@ * config_prefix = "views.view", * fieldable = FALSE, * entity_keys = { - * "id" = "id", + * "id" = "name", * "label" = "human_name", * "uuid" = "uuid" * } @@ -48,11 +48,11 @@ class View extends ConfigEntityBase implements ViewStorageInterface { protected $base_table = 'node'; /** - * The unique ID of the view. + * The name of the view. * * @var string */ - public $id = NULL; + public $name = NULL; /** * The description of the view, which is used only in the interface. @@ -86,6 +86,13 @@ class View extends ConfigEntityBase implements ViewStorageInterface { protected $core = DRUPAL_CORE_COMPATIBILITY; /** + * The views API version this view was created by. + * + * @var string + */ + protected $api_version = VIEWS_API_VERSION; + + /** * Stores all display handlers of this view. * * An array containing Drupal\views\Plugin\views\display\DisplayPluginBase @@ -155,6 +162,13 @@ public function uri() { } /** + * Overrides Drupal\Core\Entity\EntityInterface::id(). + */ + public function id() { + return $this->get('name'); + } + + /** * Overrides Drupal\Core\Config\Entity\ConfigEntityBase::createDuplicate(). */ public function createDuplicate() { @@ -193,7 +207,7 @@ public function isEnabled() { */ public function getHumanName() { if (!$human_name = $this->get('human_name')) { - $human_name = $this->id(); + $human_name = $this->get('name'); } return $human_name; } @@ -382,6 +396,7 @@ public function getPaths() { */ public function getExportProperties() { $names = array( + 'api_version', 'base_field', 'base_table', 'core', @@ -390,7 +405,7 @@ public function getExportProperties() { 'display', 'human_name', 'module', - 'id', + 'name', 'tag', 'uuid', ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php index ade4e8c..1bb7cfe 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php @@ -49,7 +49,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { foreach ($executable->displayHandlers as $display) { // Add a block plugin definition for each block display. if (isset($display) && !empty($display->definition['uses_hook_block'])) { - $delta = $view->id() . '-' . $display->display['id']; + $delta = $view->get('name') . '-' . $display->display['id']; $desc = $display->getOption('block_description'); if (empty($desc)) { diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php index e1ceb24..c537184 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php @@ -50,8 +50,8 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { if (isset($display) && $display->getOption('exposed_block')) { // Add a block definition for the block. if ($display->usesExposedFormInBlock()) { - $delta = $view->id() . '-' . $display->display['id']; - $desc = t('Exposed form: @view-@display_id', array('@view' => $view->id(), '@display_id' => $display->display['id'])); + $delta = $view->get('name') . '-' . $display->display['id']; + $desc = t('Exposed form: @view-@display_id', array('@view' => $view->get('name'), '@display_id' => $display->display['id'])); $this->derivatives[$delta] = array( 'subject' => $desc, 'cache' => DRUPAL_NO_CACHE, diff --git a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php index c861095..296212c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php @@ -8,7 +8,6 @@ namespace Drupal\views\Plugin\block\block; use Drupal\block\BlockBase; -use Drupal\block\Plugin\Core\Entity\Block; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\Component\Plugin\Discovery\DiscoveryInterface; @@ -42,8 +41,8 @@ class ViewsBlock extends BlockBase { /** * Overrides \Drupal\Component\Plugin\PluginBase::__construct(). */ - public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery, Block $entity) { - parent::__construct($configuration, $plugin_id, $discovery, $entity); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); list($plugin, $delta) = explode(':', $this->getPluginId()); list($name, $this->displayID) = explode('-', $delta, 2); @@ -70,12 +69,12 @@ public function blockForm($form, &$form_state) { } /** - * Implements \Drupal\block\BlockBase::build(). + * Implements \Drupal\block\BlockBase::blockBuild(). */ - public function build() { + public function blockBuild() { $output = $this->view->executeDisplay($this->displayID); - // Set the label to the title configured in the view. - $this->entity->set('label', filter_xss_admin($this->view->getTitle())); + // Set the subject to the title configured in the view. + $this->configuration['subject'] = filter_xss_admin($this->view->getTitle()); // Before returning the block output, convert it to a renderable array // with contextual links. views_add_block_contextual_links($output, $this->view, $this->displayID); diff --git a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php index 0330de9..2d51c25 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php @@ -23,9 +23,9 @@ class ViewsExposedFilterBlock extends ViewsBlock { /** - * Implements \Drupal\block\BlockBase::build(). + * Implements \Drupal\block\BlockBase::blockBuild(). */ - public function build() { + public function blockBuild() { $type = 'exp'; $output = $this->view->display_handler->viewSpecialBlocks($type); // Before returning the block output, convert it to a renderable array with diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php index ad0798b..7c789e6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php @@ -821,7 +821,7 @@ public function getEntityType() { return $views_data['table']['entity type']; } else { - throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id()))); + throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->get('name')))); } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php index b860d0e..8ce189a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php @@ -162,7 +162,9 @@ public function preRender(array $results) { /** * Render the area */ - public abstract function render($empty = FALSE); + function render($empty = FALSE) { + return ''; + } /** * Area handlers shouldn't have groupby. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php index 3908547..52f6a7a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php @@ -58,11 +58,4 @@ public function preRender(array $results) { return ''; } - /** - * Implements \Drupal\views\Plugins\views\area\AreaPluginBase::render(); - */ - public function render($empty = FALSE) { - // Do nothing for this handler. - } - } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php index a766c5d..1da8146 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php @@ -35,7 +35,7 @@ protected function defineOptions() { public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); - $view_display = $this->view->storage->id() . ':' . $this->view->current_display; + $view_display = $this->view->storage->get('name') . ':' . $this->view->current_display; $options = array('' => t('-Select-')); $options += views_get_views_as_options(FALSE, 'all', $view_display, FALSE, TRUE); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php index 7df986e..6cce4b0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php @@ -180,7 +180,7 @@ function cache_get($type) { * to be sure that we catch everything. Maybe that's a bad idea. */ function cache_flush() { - cache($this->table)->deleteTags(array($this->view->storage->id() => TRUE)); + cache($this->table)->deleteTags(array($this->view->storage->get('name') => TRUE)); } /** @@ -295,7 +295,7 @@ public function generateResultsKey() { } } - $this->resultsKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data)); + $this->resultsKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data)); } return $this->resultsKey; @@ -319,7 +319,7 @@ public function generateOutputKey() { 'base_url' => $GLOBALS['base_url'], ); - $this->outputKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data)); + $this->outputKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data)); } return $this->outputKey; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php index b0c6511..bf02934 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php @@ -977,7 +977,7 @@ public function optionLink($text, $section, $class = '', $title = '') { $title = $text; } - return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->id() . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE)); + return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->get('name') . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE)); } /** @@ -1259,9 +1259,8 @@ public function optionsSummary(&$categories, &$options) { if ($this->usesLinkDisplay()) { $display_id = $this->getLinkDisplay(); - $displays = $this->view->storage->get('display'); - $link_display = empty($displays[$display_id]) ? t('None') : check_plain($displays[$display_id]['display_title']); - $link_display = $this->getOption('link_display') == 'custom_url' ? t('Custom URL') : $link_display; + $link_display = empty($this->view->display[$display_id]) ? t('None') : check_plain($this->view->display[$display_id]['display_title']); + $link_display = $this->getOption('link_display') == 'custom_url' ? t('Custom URL') : $link_display; $options['link_display'] = array( 'category' => 'other', 'title' => t('Link display'), @@ -2627,8 +2626,8 @@ public function getSpecialBlocks() { $blocks = array(); if ($this->usesExposedFormInBlock()) { - $delta = '-exp-' . $this->view->storage->id() . '-' . $this->display['id']; - $desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->id(), '@display_id' => $this->display['id'])); + $delta = '-exp-' . $this->view->storage->get('name') . '-' . $this->display['id']; + $desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->get('name'), '@display_id' => $this->display['id'])); $blocks[$delta] = array( 'info' => $desc, diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php index 8a0a85e..8136f38 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php @@ -41,7 +41,7 @@ public function executeHookMenu($callbacks) { // views_arg_load -- which lives in views.module. $bits = explode('/', $this->getOption('path')); - $page_arguments = array($this->view->storage->id(), $this->display['id']); + $page_arguments = array($this->view->storage->name, $this->display['id']); $this->view->initHandlers(); $view_arguments = $this->view->argument; @@ -103,7 +103,7 @@ public function executeHookMenu($callbacks) { 'access callback' => 'views_access', 'access arguments' => $access_arguments, // Identify URL embedded arguments and correlate them to a handler. - 'load arguments' => array($this->view->storage->id(), $this->display['id'], '%index'), + 'load arguments' => array($this->view->storage->name, $this->display['id'], '%index'), ); $menu = $this->getOption('menu'); if (empty($menu)) { @@ -165,7 +165,7 @@ public function executeHookMenu($callbacks) { 'access arguments' => $access_arguments, // Identify URL embedded arguments and correlate them to a // handler. - 'load arguments' => array($this->view->storage->id(), $this->display['id'], '%index'), + 'load arguments' => array($this->view->storage->name, $this->display['id'], '%index'), 'title' => $tab_options['title'], 'description' => $tab_options['description'], 'menu_name' => $tab_options['name'], diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php index 1c61147..06bb4ea 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -124,7 +124,7 @@ function render_exposed_form($block = FALSE) { // Deal with any exposed filters we may have, before building. $form_state = array( 'view' => &$this->view, - 'display' => &$this->view->display_handler->display, + 'display' => &$this->display, 'method' => 'get', 'rerender' => TRUE, 'no_redirect' => TRUE, @@ -284,8 +284,8 @@ function reset_form(&$form, &$form_state) { // remember settings. $display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display; - if (isset($_SESSION['views'][$this->view->storage->id()][$display_id])) { - unset($_SESSION['views'][$this->view->storage->id()][$display_id]); + if (isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) { + unset($_SESSION['views'][$this->view->storage->get('name')][$display_id]); } // Set the form to allow redirect. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index f72db81..2c866d3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -177,13 +177,9 @@ function click_sort($order) { /** * Determine if this field is click sortable. - * - * @return bool - * The value of 'click sortable' from the plugin definition, this defaults - * to TRUE if not set. */ function click_sortable() { - return isset($this->definition['click sortable']) ? $this->definition['click sortable'] : TRUE; + return !empty($this->definition['click sortable']); } /** @@ -1615,19 +1611,19 @@ public function themeFunctions() { $display = $this->view->display_handler->display; if (!empty($display)) { - $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['id'] . '__' . $this->options['id']; - $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['id']; + $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['id'] . '__' . $this->options['id']; + $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['id']; $themes[] = $hook . '__' . $display['id'] . '__' . $this->options['id']; $themes[] = $hook . '__' . $display['id']; if ($display['id'] != $display['display_plugin']) { - $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['display_plugin'] . '__' . $this->options['id']; - $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['display_plugin']; + $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['display_plugin'] . '__' . $this->options['id']; + $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['display_plugin']; $themes[] = $hook . '__' . $display['display_plugin'] . '__' . $this->options['id']; $themes[] = $hook . '__' . $display['display_plugin']; } } - $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $this->options['id']; - $themes[] = $hook . '__' . $this->view->storage->id(); + $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $this->options['id']; + $themes[] = $hook . '__' . $this->view->storage->get('name'); $themes[] = $hook . '__' . $this->options['id']; $themes[] = $hook; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php index b737cc7..c7771c0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php @@ -551,7 +551,7 @@ public function buildExposeForm(&$form, &$form_state) { '#default_value' => $this->options['expose']['remember'], ); - $role_options = array_map('check_plain', user_role_names()); + $role_options = array_map('check_plain', user_roles()); $form['expose']['remember_roles'] = array( '#type' => 'checkboxes', '#title' => t('User roles'), @@ -1244,8 +1244,8 @@ function store_group_input($input, $status) { // false means that we got a setting that means to recuse ourselves, // so we should erase whatever happened to be there. - if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) { - $session = &$_SESSION['views'][$this->view->storage->id()][$display_id]; + if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) { + $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id]; if (isset($session[$this->options['group_info']['identifier']])) { unset($session[$this->options['group_info']['identifier']]); @@ -1253,11 +1253,11 @@ function store_group_input($input, $status) { } if ($status !== FALSE) { - if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) { - $_SESSION['views'][$this->view->storage->id()][$display_id] = array(); + if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) { + $_SESSION['views'][$this->view->storage->get('name')][$display_id] = array(); } - $session = &$_SESSION['views'][$this->view->storage->id()][$display_id]; + $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id]; $session[$this->options['group_info']['identifier']] = $input[$this->options['group_info']['identifier']]; } @@ -1338,8 +1338,8 @@ public function storeExposedInput($input, $status) { // false means that we got a setting that means to recuse ourselves, // so we should erase whatever happened to be there. - if (!$status && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) { - $session = &$_SESSION['views'][$this->view->storage->id()][$display_id]; + if (!$status && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) { + $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id]; if ($operator && isset($session[$this->options['expose']['operator_id']])) { unset($session[$this->options['expose']['operator_id']]); } @@ -1350,11 +1350,11 @@ public function storeExposedInput($input, $status) { } if ($status) { - if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) { - $_SESSION['views'][$this->view->storage->id()][$display_id] = array(); + if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) { + $_SESSION['views'][$this->view->storage->get('name')][$display_id] = array(); } - $session = &$_SESSION['views'][$this->view->storage->id()][$display_id]; + $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id]; if ($operator && isset($input[$this->options['expose']['operator_id']])) { $session[$this->options['expose']['operator_id']] = $input[$this->options['expose']['operator_id']]; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php index e0a7821..cc2db4e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php @@ -22,28 +22,79 @@ * help = @Translation("Paged output, full Drupal style") * ) */ -class Full extends SqlBase { +class Full extends PagerPluginBase { + + public function summaryTitle() { + if (!empty($this->options['offset'])) { + return format_plural($this->options['items_per_page'], '@count item, skip @skip', 'Paged, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset'])); + } + return format_plural($this->options['items_per_page'], '@count item', 'Paged, @count items', array('@count' => $this->options['items_per_page'])); + } - /** - * Overrides \Drupal\views\Plugin\views\SqlBase::defineOptions(). - */ protected function defineOptions() { $options = parent::defineOptions(); - + $options['items_per_page'] = array('default' => 10); + $options['offset'] = array('default' => 0); + $options['id'] = array('default' => 0); + $options['total_pages'] = array('default' => ''); // Use the same default quantity that core uses by default. $options['quantity'] = array('default' => 9); + $options['expose'] = array( + 'contains' => array( + 'items_per_page' => array('default' => FALSE, 'bool' => TRUE), + 'items_per_page_label' => array('default' => 'Items per page', 'translatable' => TRUE), + 'items_per_page_options' => array('default' => '5, 10, 20, 40, 60'), + 'items_per_page_options_all' => array('default' => FALSE, 'bool' => TRUE), + 'items_per_page_options_all_label' => array('default' => '- All -', 'translatable' => TRUE), - $options['tags']['contains']['first'] = array('default' => '« first', 'translatable' => TRUE); - $options['tags']['contains']['last'] = array('default' => 'last »', 'translatable' => TRUE); - + 'offset' => array('default' => FALSE, 'bool' => TRUE), + 'offset_label' => array('default' => 'Offset', 'translatable' => TRUE), + ), + ); + $options['tags'] = array( + 'contains' => array( + 'first' => array('default' => '« first', 'translatable' => TRUE), + 'previous' => array('default' => '‹ previous', 'translatable' => TRUE), + 'next' => array('default' => 'next ›', 'translatable' => TRUE), + 'last' => array('default' => 'last »', 'translatable' => TRUE), + ), + ); return $options; } /** - * Overrides \Drupal\views\Plugin\views\SqlBase::buildOptionsForm(). + * Provide the default form for setting options. */ public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); + $pager_text = $this->displayHandler->getPagerText(); + $form['items_per_page'] = array( + '#title' => $pager_text['items per page title'], + '#type' => 'number', + '#description' => $pager_text['items per page description'], + '#default_value' => $this->options['items_per_page'], + ); + + $form['offset'] = array( + '#type' => 'number', + '#title' => t('Offset'), + '#description' => t('The number of items to skip. For example, if this field is 3, the first 3 items will be skipped and not displayed.'), + '#default_value' => $this->options['offset'], + ); + + $form['id'] = array( + '#type' => 'number', + '#title' => t('Pager ID'), + '#description' => t("Unless you're experiencing problems with pagers related to this view, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."), + '#default_value' => $this->options['id'], + ); + + $form['total_pages'] = array( + '#type' => 'number', + '#title' => t('Number of pages'), + '#description' => t('The total number of pages. Leave empty to show all pages.'), + '#default_value' => $this->options['total_pages'], + ); $form['quantity'] = array( '#type' => 'number', @@ -52,34 +103,188 @@ public function buildOptionsForm(&$form, &$form_state) { '#default_value' => $this->options['quantity'], ); + $form['tags'] = array( + '#type' => 'details', + '#collapsible' => FALSE, + '#collapsed' => FALSE, + '#tree' => TRUE, + '#title' => t('Pager link labels'), + '#input' => TRUE, + ); + $form['tags']['first'] = array( '#type' => 'textfield', '#title' => t('First page link text'), '#default_value' => $this->options['tags']['first'], - '#weight' => -10, + ); + + $form['tags']['previous'] = array( + '#type' => 'textfield', + '#title' => t('Previous page link text'), + '#default_value' => $this->options['tags']['previous'], + ); + + $form['tags']['next'] = array( + '#type' => 'textfield', + '#title' => t('Next page link text'), + '#default_value' => $this->options['tags']['next'], ); $form['tags']['last'] = array( '#type' => 'textfield', '#title' => t('Last page link text'), '#default_value' => $this->options['tags']['last'], - '#weight' => 10, + ); + + $form['expose'] = array( + '#type' => 'details', + '#collapsible' => FALSE, + '#collapsed' => FALSE, + '#tree' => TRUE, + '#title' => t('Exposed options'), + '#input' => TRUE, + '#description' => t('Exposing this options allows users to define their values in a exposed form when view is displayed'), + ); + + $form['expose']['items_per_page'] = array( + '#type' => 'checkbox', + '#title' => t('Expose items per page'), + '#description' => t('When checked, users can determine how many items per page show in a view'), + '#default_value' => $this->options['expose']['items_per_page'], + ); + + $form['expose']['items_per_page_label'] = array( + '#type' => 'textfield', + '#title' => t('Items per page label'), + '#required' => TRUE, + '#description' => t('Label to use in the exposed items per page form element.'), + '#default_value' => $this->options['expose']['items_per_page_label'], + '#states' => array( + 'invisible' => array( + 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE), + ), + ), + ); + + $form['expose']['items_per_page_options'] = array( + '#type' => 'textfield', + '#title' => t('Exposed items per page options'), + '#required' => TRUE, + '#description' => t('Set between which values the user can choose when determining the items per page. Separated by comma.'), + '#default_value' => $this->options['expose']['items_per_page_options'], + '#states' => array( + 'invisible' => array( + 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE), + ), + ), + ); + + + $form['expose']['items_per_page_options_all'] = array( + '#type' => 'checkbox', + '#title' => t('Include all items option'), + '#description' => t('If checked, an extra item will be included to items per page to display all items'), + '#default_value' => $this->options['expose']['items_per_page_options_all'], + ); + + $form['expose']['items_per_page_options_all_label'] = array( + '#type' => 'textfield', + '#title' => t('All items label'), + '#description' => t('Which label will be used to display all items'), + '#default_value' => $this->options['expose']['items_per_page_options_all_label'], + '#states' => array( + 'invisible' => array( + 'input[name="pager_options[expose][items_per_page_options_all]"]' => array('checked' => FALSE), + ), + ), + ); + + $form['expose']['offset'] = array( + '#type' => 'checkbox', + '#title' => t('Expose Offset'), + '#description' => t('When checked, users can determine how many items should be skipped at the beginning.'), + '#default_value' => $this->options['expose']['offset'], + ); + + $form['expose']['offset_label'] = array( + '#type' => 'textfield', + '#title' => t('Offset label'), + '#required' => TRUE, + '#description' => t('Label to use in the exposed offset form element.'), + '#default_value' => $this->options['expose']['offset_label'], + '#states' => array( + 'invisible' => array( + 'input[name="pager_options[expose][offset]"]' => array('checked' => FALSE), + ), + ), ); } - /** - * Overrides \Drupal\views\Plugin\views\pager\PagerPluginBase::summaryTitle(). - */ - public function summaryTitle() { - if (!empty($this->options['offset'])) { - return format_plural($this->options['items_per_page'], '@count item, skip @skip', 'Paged, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset'])); + public function validateOptionsForm(&$form, &$form_state) { + // Only accept integer values. + $error = FALSE; + $exposed_options = $form_state['values']['pager_options']['expose']['items_per_page_options']; + if (strpos($exposed_options, '.') !== FALSE) { + $error = TRUE; + } + $options = explode(',', $exposed_options); + if (!$error && is_array($options)) { + foreach ($options as $option) { + if (!is_numeric($option) || intval($option) == 0) { + $error = TRUE; + } + } + } + else { + $error = TRUE; + } + if ($error) { + form_set_error('pager_options][expose][items_per_page_options', t('Please insert a list of integer numeric values separated by commas: e.g: 10, 20, 50, 100')); + } + + // Take sure that the items_per_page is part of the expose settings. + if (!empty($form_state['values']['pager_options']['expose']['items_per_page']) && !empty($form_state['values']['pager_options']['items_per_page'])) { + $items_per_page = $form_state['values']['pager_options']['items_per_page']; + if (array_search($items_per_page, $options) === FALSE) { + form_set_error('pager_options][expose][items_per_page_options', t('Please insert the items per page (@items_per_page) from above.', + array('@items_per_page' => $items_per_page)) + ); + } } - return format_plural($this->options['items_per_page'], '@count item', 'Paged, @count items', array('@count' => $this->options['items_per_page'])); } - /** - * Overrides \Drupal\views\Plugin\views\pager\PagerPluginBase::render(). - */ + public function query() { + if ($this->items_per_page_exposed()) { + $query = drupal_container()->get('request')->query; + $items_per_page = $query->get('items_per_page'); + if ($items_per_page > 0) { + $this->options['items_per_page'] = $items_per_page; + } + elseif ($items_per_page == 'All' && $this->options['expose']['items_per_page_options_all']) { + $this->options['items_per_page'] = 0; + } + } + if ($this->offset_exposed()) { + $query = drupal_container()->get('request')->query; + $offset = $query->get('offset'); + if (isset($offset) && $offset >= 0) { + $this->options['offset'] = $offset; + } + } + + $limit = $this->options['items_per_page']; + $offset = $this->current_page * $this->options['items_per_page'] + $this->options['offset']; + if (!empty($this->options['total_pages'])) { + if ($this->current_page >= $this->options['total_pages']) { + $limit = $this->options['items_per_page']; + $offset = $this->options['total_pages'] * $this->options['items_per_page']; + } + } + + $this->view->query->set_limit($limit); + $this->view->query->set_offset($offset); + } + function render($input) { $pager_theme = views_theme_functions('pager', $this->view, $this->view->display_handler->display); // The 0, 1, 3, 4 index are correct. See theme_pager documentation. @@ -98,5 +303,136 @@ function render($input) { return $output; } + /** + * Set the current page. + * + * @param $number + * If provided, the page number will be set to this. If NOT provided, + * the page number will be set from the global page array. + */ + function set_current_page($number = NULL) { + if (isset($number)) { + $this->current_page = max(0, $number); + return; + } + + // If the current page number was not specified, extract it from the global + // page array. + global $pager_page_array; + + if (empty($pager_page_array)) { + $pager_page_array = array(); + } + + // Fill in missing values in the global page array, in case the global page + // array hasn't been initialized before. + $page = drupal_container()->get('request')->query->get('page'); + $page = isset($page) ? explode(',', $page) : array(); + + for ($i = 0; $i <= $this->options['id'] || $i < count($pager_page_array); $i++) { + $pager_page_array[$i] = empty($page[$i]) ? 0 : $page[$i]; + } + + // Don't allow the number to be less than zero. + $this->current_page = max(0, intval($pager_page_array[$this->options['id']])); + } + + function get_pager_total() { + if ($items_per_page = intval($this->get_items_per_page())) { + return ceil($this->total_items / $items_per_page); + } + else { + return 1; + } + } + + /** + * Update global paging info. + * + * This is called after the count query has been run to set the total + * items available and to update the current page if the requested + * page is out of range. + */ + function update_page_info() { + if (!empty($this->options['total_pages'])) { + if (($this->options['total_pages'] * $this->options['items_per_page']) < $this->total_items) { + $this->total_items = $this->options['total_pages'] * $this->options['items_per_page']; + } + } + + // Don't set pager settings for items per page = 0. + $items_per_page = $this->get_items_per_page(); + if (!empty($items_per_page)) { + // Dump information about what we already know into the globals. + global $pager_page_array, $pager_total, $pager_total_items, $pager_limits; + // Set the limit. + $pager_limits[$this->options['id']] = $this->options['items_per_page']; + // Set the item count for the pager. + $pager_total_items[$this->options['id']] = $this->total_items; + // Calculate and set the count of available pages. + $pager_total[$this->options['id']] = $this->get_pager_total(); + + // See if the requested page was within range: + if ($this->current_page >= $pager_total[$this->options['id']]) { + // Pages are numbered from 0 so if there are 10 pages, the last page is 9. + $this->set_current_page($pager_total[$this->options['id']] - 1); + } + + // Put this number in to guarantee that we do not generate notices when the pager + // goes to look for it later. + $pager_page_array[$this->options['id']] = $this->current_page; + } + } + + function uses_exposed() { + return $this->items_per_page_exposed() || $this->offset_exposed(); + } + + function items_per_page_exposed() { + return !empty($this->options['expose']['items_per_page']); + } + + function offset_exposed() { + return !empty($this->options['expose']['offset']); + } + + function exposed_form_alter(&$form, &$form_state) { + if ($this->items_per_page_exposed()) { + $options = explode(',', $this->options['expose']['items_per_page_options']); + $sanitized_options = array(); + if (is_array($options)) { + foreach ($options as $option) { + $sanitized_options[intval($option)] = intval($option); + } + if (!empty($this->options['expose']['items_per_page_options_all']) && !empty($this->options['expose']['items_per_page_options_all_label'])) { + $sanitized_options['All'] = $this->options['expose']['items_per_page_options_all_label']; + } + $form['items_per_page'] = array( + '#type' => 'select', + '#title' => $this->options['expose']['items_per_page_label'], + '#options' => $sanitized_options, + '#default_value' => $this->get_items_per_page(), + ); + } + } + + if ($this->offset_exposed()) { + $form['offset'] = array( + '#type' => 'textfield', + '#size' => 10, + '#maxlength' => 10, + '#title' => $this->options['expose']['offset_label'], + '#default_value' => $this->get_offset(), + ); + } + } + + function exposed_form_validate(&$form, &$form_state) { + if (!empty($form_state['values']['offset']) && trim($form_state['values']['offset'])) { + if (!is_numeric($form_state['values']['offset']) || $form_state['values']['offset'] < 0) { + form_set_error('offset', t('Offset must be an number greather or equal than 0.')); + } + } + } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php index 56e0727..4783b2a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php @@ -22,25 +22,8 @@ * help = @Translation("Use the mini pager output.") * ) */ -class Mini extends SqlBase { +class Mini extends Full { - /** - * Overrides \Drupal\views\Plugin\views\pager\PagerPlugin::defineOptions(). - * - * Provides sane defaults for the next/previous links. - */ - public function defineOptions() { - $options = parent::defineOptions(); - - $options['tags']['contains']['previous']['default'] = '‹‹'; - $options['tags']['contains']['next']['default'] = '››'; - - return $options; - } - - /** - * Overrides \Drupal\views\Plugin\views\pager\PagerPluginBase::summaryTitle(). - */ public function summaryTitle() { if (!empty($this->options['offset'])) { return format_plural($this->options['items_per_page'], 'Mini pager, @count item, skip @skip', 'Mini pager, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset'])); @@ -48,22 +31,10 @@ public function summaryTitle() { return format_plural($this->options['items_per_page'], 'Mini pager, @count item', 'Mini pager, @count items', array('@count' => $this->options['items_per_page'])); } - /** - * Overrides \Drupal\views\Plugin\views\pager\PagerPluginBase::render(). - */ function render($input) { $pager_theme = views_theme_functions('views_mini_pager', $this->view, $this->view->display_handler->display); - // The 1, 3 index are correct, see theme_pager(). - $tags = array( - 1 => $this->options['tags']['previous'], - 3 => $this->options['tags']['next'], - ); - $output = theme($pager_theme, array( - 'parameters' => $input, - 'element' => $this->options['id'], - 'tags' => $tags, - )); - return $output; + return theme($pager_theme, array( + 'parameters' => $input, 'element' => $this->options['id'])); } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php deleted file mode 100644 index 5e5d9e8..0000000 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php +++ /dev/null @@ -1,379 +0,0 @@ - 10); - $options['offset'] = array('default' => 0); - $options['id'] = array('default' => 0); - $options['total_pages'] = array('default' => ''); - $options['expose'] = array( - 'contains' => array( - 'items_per_page' => array('default' => FALSE, 'bool' => TRUE), - 'items_per_page_label' => array('default' => 'Items per page', 'translatable' => TRUE), - 'items_per_page_options' => array('default' => '5, 10, 20, 40, 60'), - 'items_per_page_options_all' => array('default' => FALSE, 'bool' => TRUE), - 'items_per_page_options_all_label' => array('default' => '- All -', 'translatable' => TRUE), - - 'offset' => array('default' => FALSE, 'bool' => TRUE), - 'offset_label' => array('default' => 'Offset', 'translatable' => TRUE), - ), - ); - $options['tags'] = array( - 'contains' => array( - 'previous' => array('default' => '‹ previous', 'translatable' => TRUE), - 'next' => array('default' => 'next ›', 'translatable' => TRUE), - ), - ); - return $options; - } - - /** - * Provide the default form for setting options. - */ - public function buildOptionsForm(&$form, &$form_state) { - parent::buildOptionsForm($form, $form_state); - $pager_text = $this->displayHandler->getPagerText(); - $form['items_per_page'] = array( - '#title' => $pager_text['items per page title'], - '#type' => 'number', - '#description' => $pager_text['items per page description'], - '#default_value' => $this->options['items_per_page'], - ); - - $form['offset'] = array( - '#type' => 'number', - '#title' => t('Offset'), - '#description' => t('The number of items to skip. For example, if this field is 3, the first 3 items will be skipped and not displayed.'), - '#default_value' => $this->options['offset'], - ); - - $form['id'] = array( - '#type' => 'number', - '#title' => t('Pager ID'), - '#description' => t("Unless you're experiencing problems with pagers related to this view, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."), - '#default_value' => $this->options['id'], - ); - - $form['total_pages'] = array( - '#type' => 'number', - '#title' => t('Number of pages'), - '#description' => t('The total number of pages. Leave empty to show all pages.'), - '#default_value' => $this->options['total_pages'], - ); - - $form['tags'] = array( - '#type' => 'details', - '#collapsible' => FALSE, - '#collapsed' => FALSE, - '#tree' => TRUE, - '#title' => t('Pager link labels'), - '#input' => TRUE, - ); - - $form['tags']['previous'] = array( - '#type' => 'textfield', - '#title' => t('Previous page link text'), - '#default_value' => $this->options['tags']['previous'], - ); - - $form['tags']['next'] = array( - '#type' => 'textfield', - '#title' => t('Next page link text'), - '#default_value' => $this->options['tags']['next'], - ); - - $form['expose'] = array( - '#type' => 'details', - '#collapsible' => FALSE, - '#collapsed' => FALSE, - '#tree' => TRUE, - '#title' => t('Exposed options'), - '#input' => TRUE, - '#description' => t('Exposing this options allows users to define their values in a exposed form when view is displayed'), - ); - - $form['expose']['items_per_page'] = array( - '#type' => 'checkbox', - '#title' => t('Expose items per page'), - '#description' => t('When checked, users can determine how many items per page show in a view'), - '#default_value' => $this->options['expose']['items_per_page'], - ); - - $form['expose']['items_per_page_label'] = array( - '#type' => 'textfield', - '#title' => t('Items per page label'), - '#required' => TRUE, - '#description' => t('Label to use in the exposed items per page form element.'), - '#default_value' => $this->options['expose']['items_per_page_label'], - '#states' => array( - 'invisible' => array( - 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE), - ), - ), - ); - - $form['expose']['items_per_page_options'] = array( - '#type' => 'textfield', - '#title' => t('Exposed items per page options'), - '#required' => TRUE, - '#description' => t('Set between which values the user can choose when determining the items per page. Separated by comma.'), - '#default_value' => $this->options['expose']['items_per_page_options'], - '#states' => array( - 'invisible' => array( - 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE), - ), - ), - ); - - - $form['expose']['items_per_page_options_all'] = array( - '#type' => 'checkbox', - '#title' => t('Include all items option'), - '#description' => t('If checked, an extra item will be included to items per page to display all items'), - '#default_value' => $this->options['expose']['items_per_page_options_all'], - ); - - $form['expose']['items_per_page_options_all_label'] = array( - '#type' => 'textfield', - '#title' => t('All items label'), - '#description' => t('Which label will be used to display all items'), - '#default_value' => $this->options['expose']['items_per_page_options_all_label'], - '#states' => array( - 'invisible' => array( - 'input[name="pager_options[expose][items_per_page_options_all]"]' => array('checked' => FALSE), - ), - ), - ); - - $form['expose']['offset'] = array( - '#type' => 'checkbox', - '#title' => t('Expose Offset'), - '#description' => t('When checked, users can determine how many items should be skipped at the beginning.'), - '#default_value' => $this->options['expose']['offset'], - ); - - $form['expose']['offset_label'] = array( - '#type' => 'textfield', - '#title' => t('Offset label'), - '#required' => TRUE, - '#description' => t('Label to use in the exposed offset form element.'), - '#default_value' => $this->options['expose']['offset_label'], - '#states' => array( - 'invisible' => array( - 'input[name="pager_options[expose][offset]"]' => array('checked' => FALSE), - ), - ), - ); - } - - public function validateOptionsForm(&$form, &$form_state) { - // Only accept integer values. - $error = FALSE; - $exposed_options = $form_state['values']['pager_options']['expose']['items_per_page_options']; - if (strpos($exposed_options, '.') !== FALSE) { - $error = TRUE; - } - $options = explode(',', $exposed_options); - if (!$error && is_array($options)) { - foreach ($options as $option) { - if (!is_numeric($option) || intval($option) == 0) { - $error = TRUE; - } - } - } - else { - $error = TRUE; - } - if ($error) { - form_set_error('pager_options][expose][items_per_page_options', t('Please insert a list of integer numeric values separated by commas: e.g: 10, 20, 50, 100')); - } - - // Take sure that the items_per_page is part of the expose settings. - if (!empty($form_state['values']['pager_options']['expose']['items_per_page']) && !empty($form_state['values']['pager_options']['items_per_page'])) { - $items_per_page = $form_state['values']['pager_options']['items_per_page']; - if (array_search($items_per_page, $options) === FALSE) { - form_set_error('pager_options][expose][items_per_page_options', t('Please insert the items per page (@items_per_page) from above.', - array('@items_per_page' => $items_per_page)) - ); - } - } - } - - public function query() { - if ($this->items_per_page_exposed()) { - $query = drupal_container()->get('request')->query; - $items_per_page = $query->get('items_per_page'); - if ($items_per_page > 0) { - $this->options['items_per_page'] = $items_per_page; - } - elseif ($items_per_page == 'All' && $this->options['expose']['items_per_page_options_all']) { - $this->options['items_per_page'] = 0; - } - } - if ($this->offset_exposed()) { - $query = drupal_container()->get('request')->query; - $offset = $query->get('offset'); - if (isset($offset) && $offset >= 0) { - $this->options['offset'] = $offset; - } - } - - $limit = $this->options['items_per_page']; - $offset = $this->current_page * $this->options['items_per_page'] + $this->options['offset']; - if (!empty($this->options['total_pages'])) { - if ($this->current_page >= $this->options['total_pages']) { - $limit = $this->options['items_per_page']; - $offset = $this->options['total_pages'] * $this->options['items_per_page']; - } - } - - $this->view->query->set_limit($limit); - $this->view->query->set_offset($offset); - } - - - /** - * Set the current page. - * - * @param $number - * If provided, the page number will be set to this. If NOT provided, - * the page number will be set from the global page array. - */ - function set_current_page($number = NULL) { - if (isset($number)) { - $this->current_page = max(0, $number); - return; - } - - // If the current page number was not specified, extract it from the global - // page array. - global $pager_page_array; - - if (empty($pager_page_array)) { - $pager_page_array = array(); - } - - // Fill in missing values in the global page array, in case the global page - // array hasn't been initialized before. - $page = drupal_container()->get('request')->query->get('page'); - $page = isset($page) ? explode(',', $page) : array(); - - for ($i = 0; $i <= $this->options['id'] || $i < count($pager_page_array); $i++) { - $pager_page_array[$i] = empty($page[$i]) ? 0 : $page[$i]; - } - - // Don't allow the number to be less than zero. - $this->current_page = max(0, intval($pager_page_array[$this->options['id']])); - } - - function get_pager_total() { - if ($items_per_page = intval($this->get_items_per_page())) { - return ceil($this->total_items / $items_per_page); - } - else { - return 1; - } - } - - /** - * Update global paging info. - * - * This is called after the count query has been run to set the total - * items available and to update the current page if the requested - * page is out of range. - */ - function update_page_info() { - if (!empty($this->options['total_pages'])) { - if (($this->options['total_pages'] * $this->options['items_per_page']) < $this->total_items) { - $this->total_items = $this->options['total_pages'] * $this->options['items_per_page']; - } - } - - // Don't set pager settings for items per page = 0. - $items_per_page = $this->get_items_per_page(); - if (!empty($items_per_page)) { - // Dump information about what we already know into the globals. - global $pager_page_array, $pager_total, $pager_total_items, $pager_limits; - // Set the limit. - $pager_limits[$this->options['id']] = $this->options['items_per_page']; - // Set the item count for the pager. - $pager_total_items[$this->options['id']] = $this->total_items; - // Calculate and set the count of available pages. - $pager_total[$this->options['id']] = $this->get_pager_total(); - - // See if the requested page was within range: - if ($this->current_page >= $pager_total[$this->options['id']]) { - // Pages are numbered from 0 so if there are 10 pages, the last page is 9. - $this->set_current_page($pager_total[$this->options['id']] - 1); - } - - // Put this number in to guarantee that we do not generate notices when the pager - // goes to look for it later. - $pager_page_array[$this->options['id']] = $this->current_page; - } - } - - function uses_exposed() { - return $this->items_per_page_exposed() || $this->offset_exposed(); - } - - function items_per_page_exposed() { - return !empty($this->options['expose']['items_per_page']); - } - - function offset_exposed() { - return !empty($this->options['expose']['offset']); - } - - function exposed_form_alter(&$form, &$form_state) { - if ($this->items_per_page_exposed()) { - $options = explode(',', $this->options['expose']['items_per_page_options']); - $sanitized_options = array(); - if (is_array($options)) { - foreach ($options as $option) { - $sanitized_options[intval($option)] = intval($option); - } - if (!empty($this->options['expose']['items_per_page_options_all']) && !empty($this->options['expose']['items_per_page_options_all_label'])) { - $sanitized_options['All'] = $this->options['expose']['items_per_page_options_all_label']; - } - $form['items_per_page'] = array( - '#type' => 'select', - '#title' => $this->options['expose']['items_per_page_label'], - '#options' => $sanitized_options, - '#default_value' => $this->get_items_per_page(), - ); - } - } - - if ($this->offset_exposed()) { - $form['offset'] = array( - '#type' => 'textfield', - '#size' => 10, - '#maxlength' => 10, - '#title' => $this->options['expose']['offset_label'], - '#default_value' => $this->get_offset(), - ); - } - } - - function exposed_form_validate(&$form, &$form_state) { - if (!empty($form_state['values']['offset']) && trim($form_state['values']['offset'])) { - if (!is_numeric($form_state['values']['offset']) || $form_state['values']['offset'] < 0) { - form_set_error('offset', t('Offset must be an number greather or equal than 0.')); - } - } - } - -} diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index 55785d2..12b9795 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -1283,7 +1283,7 @@ public function query($get_count = FALSE) { $query = Database::getConnection($target, $key) ->select($this->view->storage->get('base_table'), $this->view->storage->get('base_table'), $options) ->addTag('views') - ->addTag('views_' . $this->view->storage->id()); + ->addTag('views_' . $this->view->storage->get('name')); // Add the tags added to the view itself. foreach ($this->tags as $tag) { @@ -1514,7 +1514,7 @@ function execute(ViewExecutable $view) { drupal_set_message($e->getMessage(), 'error'); } else { - throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage()))); + throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->get('name'), '@message' => $e->getMessage()))); } } @@ -1646,7 +1646,7 @@ function load_entities(&$results) { } function add_signature(ViewExecutable $view) { - $view->query->add_field(NULL, "'" . $view->storage->id() . ':' . $view->current_display . "'", 'view_name'); + $view->query->add_field(NULL, "'" . $view->storage->get('name') . ':' . $view->current_display . "'", 'view_name'); } function get_aggregation_info() { diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php index cd2a73f..0b085c6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php @@ -132,10 +132,10 @@ public function buildOptionsForm(&$form, &$form_state) { // TODO: check the field is the correct sort? // or let users hang themselves at this stage and check later? if ($view->type == 'Default') { - $views[t('Default Views')][$view->storage->id()] = $view->storage->id(); + $views[t('Default Views')][$view->storage->get('name')] = $view->storage->get('name'); } else { - $views[t('Existing Views')][$view->storage->id()] = $view->storage->id(); + $views[t('Existing Views')][$view->storage->get('name')] = $view->storage->get('name'); } } } @@ -171,7 +171,7 @@ function get_temporary_view() { * When the form is submitted, take sure to clear the subquery string cache. */ public function submitOptionsForm(&$form, &$form_state) { - $cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id']; + $cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id']; cache('views_results')->delete($cid); } @@ -362,7 +362,7 @@ public function query() { } else { // Get the stored subquery SQL string. - $cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id']; + $cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id']; $cache = cache('views_results')->get($cid); if (isset($cache->data)) { $def['left_query'] = $cache->data; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php index 50013dc..7df19f3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php @@ -558,12 +558,12 @@ protected function build_filters(&$form, &$form_state) { // Find all the fields we are allowed to filter by. $fields = views_fetch_fields($this->base_table, 'filter'); - $bundles = entity_get_bundles($this->entity_type); + $entity_info = $this->entity_info; // If the current base table support bundles and has more than one (like user). - if (isset($this->entity_info['bundle_keys']) && !empty($bundles)) { + if (isset($entity_info['bundle_keys']) && isset($entity_info['bundles'])) { // Get all bundles and their human readable names. $options = array('all' => t('All')); - foreach ($bundles as $type => $bundle) { + foreach ($entity_info['bundles'] as $type => $bundle) { $options[$type] = $bundle['label']; } $form['displays']['show']['type'] = array( @@ -621,7 +621,7 @@ protected function build_sorts(&$form, &$form_state) { protected function instantiate_view($form, &$form_state) { // Build the basic view properties and create the view. $values = array( - 'id' => $form_state['values']['id'], + 'name' => $form_state['values']['name'], 'human_name' => $form_state['values']['human_name'], 'description' => $form_state['values']['description'], 'base_table' => $this->base_table, diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php index a075b6a..01eaca3 100644 --- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php @@ -119,7 +119,7 @@ protected function setUp() { */ public function testDefaultViews() { // Get all default views. - $controller = $this->container->get('plugin.manager.entity')->getStorageController('view'); + $controller = entity_get_controller('view'); $views = $controller->load(); foreach ($views as $name => $view_storage) { @@ -133,7 +133,7 @@ public function testDefaultViews() { $view->preExecute($this->viewArgMap[$name]); } - $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->id()))); + $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->get('name')))); $view->execute(); $tokens = array('@name' => $name, '@display_id' => $display_id); @@ -150,13 +150,11 @@ public function testDefaultViews() { * Returns a new term with random properties in vocabulary $vid. */ function createTerm($vocabulary) { - $filter_formats = filter_formats(); - $format = array_pop($filter_formats); $term = entity_create('taxonomy_term', array( 'name' => $this->randomName(), 'description' => $this->randomName(), // Use the first available text format. - 'format' => $format->format, + 'format' => db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField(), 'vid' => $vocabulary->id(), 'langcode' => LANGUAGE_NOT_SPECIFIED, )); diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php index fadce30..21224c3 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php @@ -34,7 +34,8 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableModules(array('system', 'user', 'filter')); + $this->enableModules(array('system')); + $this->enableModules(array('filter')); } public function testAreaText() { diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php index 5b21a67..b9c6257 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php @@ -47,8 +47,6 @@ protected function setUp() { protected function viewsData() { $data = parent::viewsData(); $data['views_test_data']['job']['field']['id'] = 'test_field'; - $data['views_test_data']['job']['field']['click sortable'] = FALSE; - $data['views_test_data']['id']['field']['click sortable'] = TRUE; return $data; } @@ -516,21 +514,4 @@ function testIsValueEmpty() { $this->assertTrue($field->is_value_empty(NULL, TRUE, FALSE), 'Null should be always seen as empty, regardless of no_skip_empty.'); } - /** - * Tests whether the filters are click sortable as expected. - */ - public function testClickSortable() { - // Test that click_sortable is TRUE by default. - $plugin = views_get_handler('views_test_data', 'name', 'field'); - $this->assertTrue($plugin->click_sortable(), 'TRUE as a default value is correct.'); - - // Test that click_sortable is TRUE by when set TRUE in the data. - $plugin = views_get_handler('views_test_data', 'id', 'field'); - $this->assertTrue($plugin->click_sortable(), 'TRUE as a views data value is correct.'); - - // Test that click_sortable is FALSE by when set FALSE in the data. - $plugin = views_get_handler('views_test_data', 'job', 'field'); - $this->assertFalse($plugin->click_sortable(), 'FALSE as a views data value is correct.'); - } - } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php index 63cb46b..cbab5ea 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php @@ -8,14 +8,13 @@ namespace Drupal\views\Tests\Handler; use Drupal\views\Tests\ViewUnitTestBase; -use Drupal\views\Tests\Plugin\RelationshipJoinTestBase; /** * Tests the base relationship handler. * * @see Drupal\views\Plugin\views\relationship\RelationshipPluginBase */ -class RelationshipTest extends RelationshipJoinTestBase { +class RelationshipTest extends ViewUnitTestBase { /** * Views used by this test. @@ -42,6 +41,56 @@ public static function getInfo() { ); } + protected function setUp() { + parent::setUp(); + + $this->enableModules(array('field', 'user')); + } + + /** + * Overrides Drupal\views\Tests\ViewTestBase::schemaDefinition(). + * + * Adds a uid column to test the relationships. + * + * @return array + */ + protected function schemaDefinition() { + $schema = parent::schemaDefinition(); + + $schema['views_test_data']['fields']['uid'] = array( + 'description' => "The {users}.uid of the author of the beatle entry.", + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0 + ); + + return $schema; + } + + + /** + * Overrides Drupal\views\Tests\ViewTestBase::viewsData(). + * + * Adds a relationship for the uid column. + * + * @return array + */ + protected function viewsData() { + $data = parent::viewsData(); + $data['views_test_data']['uid'] = array( + 'title' => t('UID'), + 'help' => t('The test data UID'), + 'relationship' => array( + 'id' => 'standard', + 'base' => 'users', + 'base field' => 'uid' + ) + ); + + return $data; + } + /** * Tests the query result of a view with a relationship. */ diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php index 5b9b6cd..5ecedec 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php @@ -112,7 +112,7 @@ function testviews_get_handler() { */ public function testLoadFunctions() { $this->enableModules(array('node'), FALSE); - $controller = $this->container->get('plugin.manager.entity')->getStorageController('view'); + $controller = entity_get_controller('view'); // Test views_view_is_enabled/disabled. $load = $controller->load(array('archive')); @@ -208,7 +208,7 @@ protected function formatViewOptions(array $views = array()) { foreach ($views as $id => $view) { foreach ($view->get('display') as $display_id => $display) { $expected_options[$view->id() . ':' . $display['id']] = t('View: @view - Display: @display', - array('@view' => $view->id(), '@display' => $display['id'])); + array('@view' => $view->name, '@display' => $display['id'])); } } diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php index 6ac76d7..0f32a60 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php @@ -131,7 +131,7 @@ function testHeaderStorage() { // so they should be added to the css/js storage. $view = views_get_view('test_view'); $view->setDisplay(); - $view->storage->set('id', 'test_cache_header_storage'); + $view->storage->set('name', 'test_cache_header_storage'); $view->display_handler->overrideOption('cache', array( 'type' => 'time', 'options' => array( @@ -158,7 +158,7 @@ function testHeaderStorage() { // Now add some css/jss before running the view. // Make sure that this css is not added when running the cached view. - $view->storage->set('id', 'test_cache_header_storage_2'); + $view->storage->set('name', 'test_cache_header_storage_2'); $system_css_path = drupal_get_path('module', 'system') . '/system.maintenance.css'; drupal_add_css($system_css_path); diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php index e4755bc..1276bd9 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php @@ -49,7 +49,7 @@ protected function setUp() { } /** - * Tests whether the reset button works on an exposed form. + * Tests whether the reset button works on an expoed form. */ public function testResetButton() { $this->drupalGet('test_reset_button', array('query' => array('type' => 'article'))); @@ -89,22 +89,6 @@ public function testRenameResetButton() { } /** - * Tests the exposed form markup. - */ - public function testExposedFormRender() { - $view = views_get_view('test_reset_button'); - $this->executeView($view); - $exposed_form = $view->display_handler->getPlugin('exposed_form'); - $this->drupalSetContent($exposed_form->render_exposed_form()); - - $expected_id = drupal_clean_css_identifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display); - $this->assertFieldByXpath('//form/@id', $expected_id, 'Expected form ID found.'); - - $expected_action = url($view->display_handler->getUrl()); - $this->assertFieldByXPath('//form/@action', $expected_action, 'The expected value for the action attribute was found.'); - } - - /** * Tests the admin interface of exposed filter and sort items. */ function testExposedAdminUi() { diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php index df011c4..8430a45 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php @@ -13,23 +13,13 @@ /** * Tests a generic join plugin and the join plugin base. - * - * @see \Drupal\views_test_data\Plugin\views\join\JoinTest - * @see \Drupal\views\Plugin\views\join\JoinPluginBase */ -class JoinTest extends RelationshipJoinTestBase { - - /** - * Views used by this test. - * - * @var array - */ - public static $testViews = array('test_view'); +class JoinTest extends PluginTestBase { /** * A plugin manager which handlers the instances of joins. * - * @var \Drupal\views\Plugin\ViewsPluginManager + * @var Drupal\views\Plugin\Type\ViewsPluginManager */ protected $manager; @@ -48,18 +38,19 @@ protected function setUp() { $this->manager = drupal_container()->get('plugin.manager.views.join'); } + /** * Tests an example join plugin. */ public function testExamplePlugin() { // Setup a simple join and test the result sql. - $view = views_get_view('test_view'); + $view = views_get_view('frontpage'); $view->initDisplay(); $view->initQuery(); $configuration = array( - 'left_table' => 'views_test_data', + 'left_table' => 'node', 'left_field' => 'uid', 'table' => 'users', 'field' => 'uid', @@ -70,13 +61,14 @@ public function testExamplePlugin() { $rand_int = rand(0, 1000); $join->setJoinValue($rand_int); - $query = db_select('views_test_data'); + $query = db_select('node'); $table = array('alias' => 'users'); $join->buildJoin($query, $table, $view->query); $tables = $query->getTables(); $join_info = $tables['users']; - $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = $rand_int") !== FALSE, 'Make sure that the custom join plugin can extend the join base and alter the result.'); + debug($join_info); + $this->assertTrue(strpos($join_info['condition'], "node.uid = $rand_int") !== FALSE, 'Make sure that the custom join plugin can extend the join base and alter the result.'); } /** @@ -85,14 +77,14 @@ public function testExamplePlugin() { public function testBasePlugin() { // Setup a simple join and test the result sql. - $view = views_get_view('test_view'); + $view = views_get_view('frontpage'); $view->initDisplay(); $view->initQuery(); // First define a simple join without an extra condition. // Set the various options on the join object. $configuration = array( - 'left_table' => 'views_test_data', + 'left_table' => 'node', 'left_field' => 'uid', 'table' => 'users', 'field' => 'uid', @@ -105,7 +97,7 @@ public function testBasePlugin() { // Build the actual join values and read them back from the dbtng query // object. - $query = db_select('views_test_data'); + $query = db_select('node'); $table = array('alias' => 'users'); $join->buildJoin($query, $table, $view->query); @@ -114,7 +106,7 @@ public function testBasePlugin() { $this->assertEqual($join_info['join type'], 'LEFT', 'Make sure the default join type is LEFT'); $this->assertEqual($join_info['table'], $configuration['table']); $this->assertEqual($join_info['alias'], 'users'); - $this->assertEqual($join_info['condition'], 'views_test_data.uid = users.uid'); + $this->assertEqual($join_info['condition'], 'node.uid = users.uid'); // Set a different alias and make sure table info is as expected. $join = $this->manager->createInstance('standard', $configuration); diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php deleted file mode 100644 index e239e7b..0000000 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php +++ /dev/null @@ -1,66 +0,0 @@ - 'Pager: Mini', - 'description' => 'Test the mini pager plugin.', - 'group' => 'Views Plugins', - ); - } - - protected function setUp() { - parent::setUp(); - - // Create a bunch of test nodes. - for ($i = 0; $i < 20; $i++) { - $this->nodes[] = $this->drupalCreateNode(); - } - } - - /** - * Tests the rendering of mini pagers. - */ - public function testMiniPagerRender() { - menu_router_rebuild(); - $this->drupalGet('test_mini_pager'); - $this->assertText('›› test', 'Make sure the next link appears on the first page.'); - $this->assertNoText('‹‹ test', 'Make sure the previous link does not appear on the first page.'); - - $this->drupalGet('test_mini_pager', array('query' => array('page' => 1))); - $this->assertText('‹‹ test', 'Make sure the previous link appears.'); - $this->assertText('›› test', 'Make sure the next link appears.'); - - $this->drupalGet('test_mini_pager', array('query' => array('page' => 6))); - $this->assertNoText('›› test', 'Make sure the next link appears on the last page.'); - $this->assertText('‹‹ test', 'Make sure the previous link does not appear on the last page.'); - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php deleted file mode 100644 index 63a9f23..0000000 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php +++ /dev/null @@ -1,70 +0,0 @@ -enableViewsTestModule(); - } - - /** - * Overrides \Drupal\views\Tests\ViewTestBase::schemaDefinition(). - * - * Adds a uid column to test the relationships. - */ - protected function schemaDefinition() { - $schema = parent::schemaDefinition(); - - $schema['views_test_data']['fields']['uid'] = array( - 'description' => "The {users}.uid of the author of the beatle entry.", - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0 - ); - - return $schema; - } - - /** - * Overrides \Drupal\views\Tests\ViewTestBase::viewsData(). - * - * Adds a relationship for the uid column. - */ - protected function viewsData() { - $data = parent::viewsData(); - $data['views_test_data']['uid'] = array( - 'title' => t('UID'), - 'help' => t('The test data UID'), - 'relationship' => array( - 'id' => 'standard', - 'base' => 'users', - 'base field' => 'uid' - ) - ); - - return $data; - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php index 632504f..c3c24b1 100644 --- a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php @@ -44,7 +44,7 @@ function testTokenReplacement() { $expected = array( '[view:name]' => 'Test tokens', '[view:description]' => 'Test view to token replacement tests.', - '[view:id]' => 'test_tokens', + '[view:machine-name]' => 'test_tokens', '[view:title]' => 'Test token page', '[view:url]' => url('test_tokens', array('absolute' => TRUE)), '[view:total-rows]' => (string) $view->total_rows, diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php index 3ce171b..a96172b 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php @@ -84,7 +84,7 @@ function testDefaultViews() { $this->drupalGet('admin/structure/views'); $this->clickViewsOperationLink(t('Clone'), '/frontpage'); $edit = array( - 'id' => 'clone_of_frontpage', + 'name' => 'clone_of_frontpage', ); $this->assertTitle(t('Clone of @human_name | @site-name', array('@human_name' => 'Front page', '@site-name' => config('system.site')->get('name')))); $this->drupalPost(NULL, $edit, t('Clone')); @@ -94,7 +94,7 @@ function testDefaultViews() { $this->drupalGet('admin/structure/views'); $this->clickViewsOperationLink(t('Clone'), '/frontpage'); $random_name = strtolower($this->randomName()); - $this->drupalPost(NULL, array('id' => $random_name), t('Clone')); + $this->drupalPost(NULL, array('name' => $random_name), t('Clone')); $this->assertUrl("admin/structure/views/view/$random_name/edit", array(), 'The custom view name got saved.'); // Now disable the view, and make sure it stops appearing on the main view diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php index 7f11dec..c56e59c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php @@ -34,7 +34,7 @@ public function testDisplayExtenderUI() { config('views.settings')->set('display_extenders', array('display_extender_test'))->save(); $view = views_get_view('test_view'); - $view_edit_url = "admin/structure/views/view/{$view->storage->id()}/edit"; + $view_edit_url = "admin/structure/views/view/{$view->storage->get('name')}/edit"; $display_option_url = 'admin/structure/views/nojs/display/test_view/default/test_extender_test_option'; $this->drupalGet($view_edit_url); @@ -44,7 +44,7 @@ public function testDisplayExtenderUI() { $this->drupalPost($display_option_url, array('test_extender_test_option' => $random_text), t('Apply')); $this->assertLink($random_text); $this->drupalPost(NULL, array(), t('Save')); - $view = views_get_view($view->storage->id()); + $view = views_get_view($view->storage->get('name')); $view->initDisplay(); $this->assertEqual($view->display_handler->getOption('test_extender_test_option'), $random_text, 'Make sure that the display extender option got saved.'); } diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php index e726162..b9342cd 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php @@ -34,10 +34,10 @@ public function randomView(array $view = array()) { // Create a new view in the UI. $default = array(); $default['human_name'] = $this->randomName(16); - $default['id'] = strtolower($this->randomName(16)); + $default['name'] = strtolower($this->randomName(16)); $default['description'] = $this->randomName(16); $default['page[create]'] = TRUE; - $default['page[path]'] = $default['id']; + $default['page[path]'] = $default['name']; $view += $default; @@ -51,7 +51,7 @@ public function randomView(array $view = array()) { */ public function testRemoveDisplay() { $view = $this->randomView(); - $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit'; + $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit'; $this->drupalGet($path_prefix . '/default'); $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'delete Page', 'Make sure there is no delete button on the default display.'); @@ -65,9 +65,6 @@ public function testRemoveDisplay() { $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link')); $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.'); - $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link')); - $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.'); - // Undo the deleting of the display. $this->drupalPost($path_prefix . '/page_1', array(), 'undo delete of Page'); $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'undo delete of Page', 'Make sure there is no undo button on the page display after reverting.'); @@ -90,7 +87,7 @@ public function testAddDisplay() { $settings['page[create]'] = FALSE; $view = $this->randomView($settings); - $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit'; + $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit'; $this->drupalGet($path_prefix); // Add a new display. @@ -109,7 +106,7 @@ public function testReorderDisplay() { 'block[create]' => TRUE ); $view = $this->randomView($view); - $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit'; + $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit'; $this->clickLink(t('reorder displays')); $this->assertTrue($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing'); @@ -124,7 +121,7 @@ public function testReorderDisplay() { $this->drupalPost(NULL, $edit, t('Apply')); $this->drupalPost(NULL, array(), t('Save')); - $view = views_get_view($view['id']); + $view = views_get_view($view['name']); $displays = $view->storage->get('display'); $this->assertEqual($displays['default']['position'], 0, 'Make sure the master display comes first.'); $this->assertEqual($displays['block_1']['position'], 1, 'Make sure the block display comes before the page display.'); @@ -145,39 +142,11 @@ public function testDefaultDisplay() { */ public function testCloneDisplay() { $view = $this->randomView(); - $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit'; + $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit'; $this->drupalGet($path_prefix); $this->drupalPost(NULL, array(), 'clone Page'); - $this->assertLinkByHref($path_prefix . '/page_2', 0, 'Make sure after cloning the new display appears in the UI'); - $this->assertUrl($path_prefix . '/page_2', array(), 'The user got redirected to the new display.'); - - // Set the title and override the css classes. - $random_title = $this->randomName(); - $random_css = $this->randomName(); - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_2/title", array('title' => $random_title), t('Apply')); - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_2/css_class", array('override[dropdown]' => 'page_2', 'css_class' => $random_css), t('Apply')); - - // Clone as a different display type. - $this->drupalPost(NULL, array(), 'clone as Block'); - $this->assertLinkByHref($path_prefix . '/block_1', 0, 'Make sure after cloning the new display appears in the UI'); - $this->assertUrl($path_prefix . '/block_1', array(), 'The user got redirected to the new display.'); - $this->assertText(t('Block settings')); - $this->assertNoText(t('Page settings')); - - $this->drupalPost(NULL, array(), t('Save')); - $view = views_get_view($view['id']); - $view->initDisplay(); - - $page_2 = $view->displayHandlers->get('page_2'); - $this->assertTrue($page_2, 'The new page display got saved.'); - $this->assertEqual($page_2->display['display_title'], 'Page'); - $block_1 = $view->displayHandlers->get('block_1'); - $this->assertTrue($block_1, 'The new block display got saved.'); - $this->assertEqual($block_1->display['display_plugin'], 'block'); - $this->assertEqual($block_1->display['display_title'], 'Block', 'The new display title got generated as expected.'); - $this->assertEqual($block_1->getOption('title'), $random_title, 'The overridden title option from the display got copied into the clone'); - $this->assertEqual($block_1->getOption('css_class'), $random_css, 'The overridden css_class option from the display got copied into the clone'); + $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after cloning the new display appears in the UI'); } /** @@ -185,7 +154,7 @@ public function testCloneDisplay() { */ public function testDisableDisplay() { $view = $this->randomView(); - $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit'; + $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit'; $this->drupalGet($path_prefix); $this->assertFalse($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class does not appear after initial adding of a view.'); @@ -246,26 +215,4 @@ public function testDisplayAreas() { } } - /** - * Tests the link-display setting. - */ - public function testLinkDisplay() { - // Test setting the link display in the UI form. - $path = 'admin/structure/views/view/test_display/edit/block_1'; - $link_display_path = 'admin/structure/views/nojs/display/test_display/block_1/link_display'; - $this->drupalPost($link_display_path, array('link_display' => 'page_1'), t('Apply')); - // The form redirects to the master display. - $this->drupalGet($path); - - $result = $this->xpath("//a[contains(@href, :path)]", array(':path' => $link_display_path)); - $this->assertEqual($result[0], 'Page', 'Make sure that the link option summary shows the right linked display.'); - - $link_display_path = 'admin/structure/views/nojs/display/test_display/block_1/link_display'; - $this->drupalPost($link_display_path, array('link_display' => 'custom_url'), t('Apply')); - // The form redirects to the master display. - $this->drupalGet($path); - - $this->assertLink(t('Custom URL'), 0, 'The link option has custom url as summary.'); - } - } diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php index b60f9d4..be4868e 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php @@ -27,7 +27,7 @@ function testOverrideDisplays() { // Create a basic view that shows all content, with a page and a block // display. $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['page[create]'] = 1; $view['page[path]'] = $this->randomName(16); $view['block[create]'] = 1; @@ -41,8 +41,8 @@ function testOverrideDisplays() { $edit = array(); $edit['title'] = $original_title = $this->randomName(16); $edit['override[dropdown]'] = 'default'; - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply')); - $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save')); + $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply')); + $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save')); // Add a node that will appear in the view, so that the block will actually // be displayed. @@ -58,7 +58,7 @@ function testOverrideDisplays() { $this->assertText('View: ' . $view['human_name']); // Place the block. - $this->drupalPlaceBlock("views_block:{$view['id']}-block_1"); + $this->drupalPlaceBlock("views_block:{$view['name']}-block_1"); // Make sure the title appears in the block. $this->drupalGet(''); @@ -69,8 +69,8 @@ function testOverrideDisplays() { $edit = array(); $edit['title'] = $new_title = $this->randomName(16); $edit['override[dropdown]'] = 'page_1'; - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply')); - $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save')); + $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply')); + $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save')); $this->drupalGet($view_path); $this->assertResponse(200); $this->assertText($new_title); @@ -86,7 +86,7 @@ function testWizardMixedDefaultOverriddenDisplays() { // page and feed to inherit their titles from the default display, but the // block to override it. $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['page[create]'] = 1; $view['page[title]'] = $this->randomName(16); $view['page[path]'] = $this->randomName(16); @@ -117,7 +117,7 @@ function testWizardMixedDefaultOverriddenDisplays() { $this->assertText('View: ' . $view['human_name']); // Place the block. - $this->drupalPlaceBlock("views_block:{$view['id']}-block_1"); + $this->drupalPlaceBlock("views_block:{$view['name']}-block_1"); $this->drupalGet(''); $this->assertText($view['block[title]']); $this->assertNoText($view['page[title]']); @@ -126,8 +126,8 @@ function testWizardMixedDefaultOverriddenDisplays() { // the feed's title also, but not the block. $edit = array(); $edit['title'] = $new_default_title = $this->randomName(16); - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply')); - $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save')); + $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply')); + $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save')); $this->drupalGet($view['page[path]']); $this->assertResponse(200); $this->assertText($new_default_title); @@ -146,8 +146,8 @@ function testWizardMixedDefaultOverriddenDisplays() { // the block title only, and leave the defaults alone. $edit = array(); $edit['title'] = $new_block_title = $this->randomName(16); - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply')); - $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save')); + $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply')); + $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save')); $this->drupalGet($view['page[path]']); $this->assertResponse(200); $this->assertText($new_default_title); @@ -168,7 +168,7 @@ function testRevertAllDisplays() { // Because there is both a title on page and block we expect the title on // the block be overriden. $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['page[create]'] = 1; $view['page[title]'] = $this->randomName(16); $view['page[path]'] = $this->randomName(16); @@ -182,8 +182,8 @@ function testRevertAllDisplays() { $edit['title'] = $new_block_title = $this->randomName(); $edit['override[dropdown]'] = 'default_revert'; - $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply')); - $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save')); + $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply')); + $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save')); $this->assertText($view['page[title]']); } diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php index 28978d6..a97a9e8 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php @@ -45,7 +45,7 @@ function testEditUI() { $view = array(); $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['description'] = $this->randomName(16); $view['page[create]'] = TRUE; $view['page[title]'] = $this->randomName(16); @@ -65,7 +65,7 @@ function testEditUI() { // Create a view with an additional display, so master should be hidden. $view['page[create]'] = TRUE; - $view['id'] = strtolower($this->randomName()); + $view['name'] = strtolower($this->randomName()); $this->drupalPost('admin/structure/views/add', $view, t('Save and edit')); $this->assertNoLink(t('Master')); @@ -79,7 +79,7 @@ function testEditUI() { ); $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration')); - $view['id'] = strtolower($this->randomName()); + $view['name'] = strtolower($this->randomName()); $this->drupalPost('admin/structure/views/add', $view, t('Save and edit')); $this->assertFieldById('edit-displays-top-add-display-embed'); @@ -97,7 +97,7 @@ function testEditUI() { ); $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration')); - $view['id'] = strtolower($this->randomName()); + $view['name'] = strtolower($this->randomName()); $this->drupalPost('admin/structure/views/add', $view, t('Save and edit')); $this->drupalPost(NULL, array(), t('Update preview')); @@ -109,7 +109,7 @@ function testEditUI() { ); $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration')); - $view['id'] = strtolower($this->randomName()); + $view['name'] = strtolower($this->randomName()); $this->drupalPost('admin/structure/views/add', $view, t('Save and edit')); $this->drupalPost(NULL, array(), t('Update preview')); diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php index e5cac15..6c87423 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php @@ -34,7 +34,7 @@ public function testViewsUiAutocompleteTag() { $suffix = $i % 2 ? 'odd' : 'even'; $tag = 'autocomplete_tag_test_' . $suffix . $this->randomName(); $tags[] = $tag; - entity_create('view', array('tag' => $tag, 'id' => $this->randomName()))->save(); + entity_create('view', array('tag' => $tag, 'name' => $this->randomName()))->save(); } // Make sure just ten results are returns. diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php index b5c6711..8f3ad63 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php @@ -36,6 +36,7 @@ class ViewExecutableTest extends ViewUnitTestBase { */ protected $configProperties = array( 'disabled', + 'api_version', 'name', 'description', 'tag', @@ -78,7 +79,7 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableModules(array('system', 'node', 'comment', 'user', 'filter')); + $this->enableModules(array('node', 'comment', 'user', 'filter')); } /** diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php index ec36ae1..e50a950 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php @@ -28,8 +28,9 @@ class ViewStorageTest extends ViewUnitTestBase { */ protected $config_properties = array( 'disabled', + 'api_version', 'module', - 'id', + 'name', 'description', 'tag', 'base_table', @@ -73,7 +74,7 @@ public static function getInfo() { function testConfigurationEntityCRUD() { // Get the configuration entity information and controller. $this->info = entity_get_info('view'); - $this->controller = $this->container->get('plugin.manager.entity')->getStorageController('view'); + $this->controller = entity_get_controller('view'); // Confirm that an info array has been returned. $this->assertTrue(!empty($this->info) && is_array($this->info), 'The View info array is loaded.'); @@ -157,7 +158,7 @@ protected function createTests() { } // Check the UUID of the loaded View. - $created->set('id', 'test_view_storage_new'); + $created->set('name', 'test_view_storage_new'); $created->save(); $created_loaded = entity_load('view', 'test_view_storage_new'); $this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.'); @@ -180,7 +181,7 @@ protected function displayTests() { $executable->initDisplay(); $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.'); - $view->set('id', 'test_view_storage_new_new2'); + $view->set('name', 'test_view_storage_new_new2'); $view->save(); $values = config('views.view.test_view_storage_new_new2')->get(); @@ -377,6 +378,7 @@ public function testCreateDuplicate() { // @todo Create a reusable property on the base test class for these? $config_properties = array( 'disabled', + 'api_version', 'description', 'tag', 'base_table', diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php index 5547a00..a33244e 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php @@ -137,6 +137,7 @@ public static function viewsData() { 'help' => t('The test data ID'), 'field' => array( 'id' => 'numeric', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'numeric', @@ -153,6 +154,7 @@ public static function viewsData() { 'help' => t('The name of the person'), 'field' => array( 'id' => 'standard', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'string', @@ -169,6 +171,7 @@ public static function viewsData() { 'help' => t('The age of the person'), 'field' => array( 'id' => 'numeric', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'numeric', @@ -185,6 +188,7 @@ public static function viewsData() { 'help' => t('The job of the person'), 'field' => array( 'id' => 'standard', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'string', @@ -201,6 +205,7 @@ public static function viewsData() { 'help' => t('The creation date of this record'), 'field' => array( 'id' => 'date', + 'click sortable' => TRUE, ), 'argument' => array( 'id' => 'date', diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php index b786859..aff9227 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php @@ -31,7 +31,7 @@ function testViewsWizardAndListing() { // Create a simple and not at all useful view. $view1 = array(); $view1['human_name'] = $this->randomName(16); - $view1['id'] = strtolower($this->randomName(16)); + $view1['name'] = strtolower($this->randomName(16)); $view1['description'] = $this->randomName(16); $view1['page[create]'] = FALSE; $this->drupalPost('admin/structure/views/add', $view1, t('Save and edit')); @@ -41,7 +41,7 @@ function testViewsWizardAndListing() { $this->assertText($view1['description']); // @todo For now, clone is being left to config.module to solve. foreach (array('delete', 'edit') as $operation) { - $this->assertLinkByHref(url('admin/structure/views/view/' . $view1['id'] . '/' . $operation)); + $this->assertLinkByHref(url('admin/structure/views/view/' . $view1['name'] . '/' . $operation)); } // This view should not have a block. @@ -55,7 +55,7 @@ function testViewsWizardAndListing() { // Now create a page with simple node listing and an attached feed. $view2 = array(); $view2['human_name'] = $this->randomName(16); - $view2['id'] = strtolower($this->randomName(16)); + $view2['name'] = strtolower($this->randomName(16)); $view2['description'] = $this->randomName(16); $view2['page[create]'] = 1; $view2['page[title]'] = $this->randomName(16); @@ -97,7 +97,7 @@ function testViewsWizardAndListing() { // Create a view with a page and a block, and filter the listing. $view3 = array(); $view3['human_name'] = $this->randomName(16); - $view3['id'] = strtolower($this->randomName(16)); + $view3['name'] = strtolower($this->randomName(16)); $view3['description'] = $this->randomName(16); $view3['show[wizard_key]'] = 'node'; $view3['show[type]'] = 'page'; @@ -127,7 +127,7 @@ function testViewsWizardAndListing() { $this->assertText('View: ' . $view3['human_name']); // Place the block. - $this->drupalPlaceBlock("views_block:{$view3['id']}-block_1"); + $this->drupalPlaceBlock("views_block:{$view3['name']}-block_1"); // Visit a random page (not the one that displays the view itself) and look // for the expected node title in the block. @@ -139,15 +139,4 @@ function testViewsWizardAndListing() { $this->assertNoText('tracker', t('Default tracker view does not show on the listing page.')); } - /** - * Tests the actual wizard form. - * - * @see \Drupal\views_ui\ViewAddFormController::form() - */ - protected function testWizardForm() { - $this->drupalGet('admin/structure/views/add'); - - $result = $this->xpath('//small[@id = "edit-human-name-machine-name-suffix"]'); - $this->assertTrue(count($result), 'Ensure that the machine name is applied to the name field.'); - } } diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php index 16e86fa..95f4709 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php @@ -41,7 +41,7 @@ function testItemsPerPage() { // 3 in the block. $view = array(); $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['description'] = $this->randomName(16); $view['show[wizard_key]'] = 'node'; $view['show[type]'] = 'article'; @@ -79,7 +79,7 @@ function testItemsPerPage() { $this->assertText('View: ' . $view['human_name']); // Place the block, visit a page that displays the block, and check that the // nodes we expect appear in the correct order. - $this->drupalPlaceBlock("views_block:{$view['id']}-block_1"); + $this->drupalPlaceBlock("views_block:{$view['name']}-block_1"); $this->drupalGet('user'); $content = $this->drupalGetContent(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php index 9c9ab60..7b4bd2c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php @@ -27,7 +27,7 @@ function testMenus() { // Create a view with a page display and a menu link in the Main Menu. $view = array(); $view['human_name'] = $this->randomName(16); - $view['id'] = strtolower($this->randomName(16)); + $view['name'] = strtolower($this->randomName(16)); $view['description'] = $this->randomName(16); $view['page[create]'] = 1; $view['page[title]'] = $this->randomName(16); diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php index 0813353..5492904 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php @@ -33,7 +33,7 @@ function testSorting() { // Create a view that sorts oldest first. $view1 = array(); $view1['human_name'] = $this->randomName(16); - $view1['id'] = strtolower($this->randomName(16)); + $view1['name'] = strtolower($this->randomName(16)); $view1['description'] = $this->randomName(16); $view1['show[sort]'] = 'created:ASC'; $view1['page[create]'] = 1; @@ -58,7 +58,7 @@ function testSorting() { // Create a view that sorts newest first. $view2 = array(); $view2['human_name'] = $this->randomName(16); - $view2['id'] = strtolower($this->randomName(16)); + $view2['name'] = strtolower($this->randomName(16)); $view2['description'] = $this->randomName(16); $view2['show[sort]'] = 'created:DESC'; $view2['page[create]'] = 1; diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php index 6416193..693ed68 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php @@ -125,7 +125,7 @@ function testTaggedWith() { $this->drupalPost('admin/structure/views/add', $view1, t('Update "of type" choice')); // Now resubmit the entire form to the same URL. $view1['human_name'] = $this->randomName(16); - $view1['id'] = strtolower($this->randomName(16)); + $view1['name'] = strtolower($this->randomName(16)); $view1['description'] = $this->randomName(16); $view1['show[tagged_with]'] = 'tag1'; $view1['page[create]'] = 1; @@ -147,7 +147,7 @@ function testTaggedWith() { $this->drupalPost('admin/structure/views/add', $view2, t('Update "of type" choice')); $this->assertResponse(200); $view2['human_name'] = $this->randomName(16); - $view2['id'] = strtolower($this->randomName(16)); + $view2['name'] = strtolower($this->randomName(16)); $view2['description'] = $this->randomName(16); $view2['show[tagged_with]'] = 'tag2'; $view2['page[create]'] = 1; diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index 7447488..99cf668 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -572,8 +572,8 @@ public function getExposedInput() { // remember settings. $display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display; - if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->id()][$display_id])) { - $this->exposed_input = $_SESSION['views'][$this->storage->id()][$display_id]; + if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->get('name')][$display_id])) { + $this->exposed_input = $_SESSION['views'][$this->storage->get('name')][$display_id]; } } @@ -1227,6 +1227,9 @@ public function render($display_id = NULL) { drupal_theme_initialize(); $config = config('views.settings'); + // Set the response so other parts can alter it. + $this->response = new Response('', 200); + $start = microtime(TRUE); if (!empty($this->live_preview) && $config->get('ui.show.additional_queries')) { $this->startQueryCapture(); @@ -1257,11 +1260,6 @@ public function render($display_id = NULL) { // Initialize the style plugin. $this->initStyle(); - if (!isset($this->response)) { - // Set the response so other parts can alter it. - $this->response = new Response('', 200); - } - // Give field handlers the opportunity to perform additional queries // using the entire resultset prior to rendering. if ($this->style_plugin->usesFields()) { @@ -1415,7 +1413,7 @@ public function preExecute($args = array()) { } // Allow hook_views_pre_view() to set the dom_id, then ensure it is set. - $this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->id() . REQUEST_TIME . mt_rand()); + $this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->get('name') . REQUEST_TIME . mt_rand()); // Allow the display handler to set up for execution $this->display_handler->preExecute(); diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml index 2d75b3a..a78537d 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -29,5 +30,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_access_dynamic +name: test_access_dynamic tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml index 8595c89..79019ef 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_access_none +name: test_access_none tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml index 6c3410f..cd3a94c 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -29,5 +30,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_access_static +name: test_access_static tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml index 95ebe54..7a42247 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -52,5 +53,5 @@ display: id: default position: '0' human_name: '' -id: test_aggregate_count +name: test_aggregate_count tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml index e1e4478..3755f24 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: users core: 8.0-dev description: '' @@ -82,6 +83,6 @@ display: position: '0' human_name: test_alias module: views -id: test_alias +name: test_alias tag: default uuid: 3bdfd3e6-15aa-4324-9005-5ad8b321d265 diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml index 6ba4d7f..3cf754d 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -48,5 +49,5 @@ display: id: default position: '0' human_name: '' -id: test_argument_default_current_user +name: test_argument_default_current_user tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml index ea0540c..061b209 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -51,5 +52,5 @@ display: id: default position: '0' human_name: '' -id: test_argument_default_fixed +name: test_argument_default_fixed tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml index d114623..3d3702e 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -63,5 +64,5 @@ display: guid_field_is_permalink: '0' path: test_attachment_ui_feed position: '3' -id: test_attachment_ui +name: test_attachment_ui tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml index 5177f9b..b15a64a 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -36,6 +37,6 @@ display: field: id relationship: none human_name: '' -id: test_cache +name: test_cache tag: '' base_field: nid diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml index f212edc..8aa2eb2 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -47,5 +48,5 @@ display: id: page_1 position: '0' human_name: { } -id: test_click_sort +name: test_click_sort tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml index 800179f..a28c6b1 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -155,5 +156,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_destroy +name: test_destroy tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml index b5c70f4..d9c5430 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml @@ -1,9 +1,10 @@ +api_version: '3.0' base_table: node core: '8' description: '' disabled: '1' display: - block_1: + block: display_options: defaults: pager: '0' @@ -29,7 +30,7 @@ display: style_plugin: default display_plugin: block display_title: Block - id: block_1 + id: block position: '2' default: display_options: @@ -82,5 +83,5 @@ display: id: page_1 position: '1' human_name: '' -id: test_display +name: test_display tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml index b80669c..82a87fc 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_field: id base_table: views_test_data core: 8.x @@ -62,5 +63,5 @@ display: page_1: page_1 human_name: test_display_attachment module: views -id: test_display_attachment +name: test_display_attachment tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml index b985e0b..2d4fe32 100755 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_field: nid base_table: node core: 8.x @@ -222,5 +223,5 @@ display: link_to_node: '0' human_name: test_dropbutton module: views -id: test_dropbutton +name: test_dropbutton tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml index 39fcb4e..2a8fb0b 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -29,5 +30,5 @@ display: id: default position: '0' human_name: { } -id: test_example_area +name: test_example_area tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml index 18031d8..f4645c4 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -19,5 +20,5 @@ display: id: page_2 position: '2' human_name: '' -id: test_executable_displays +name: test_executable_displays tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml index 92b775f..d73dfb8 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -48,5 +49,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_exposed_admin_ui +name: test_exposed_admin_ui tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml index 6d6adb3..736ba03 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_exposed_form +name: test_exposed_form tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml index bf58c2a..6ba9d11 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: 8.0-dev description: '' @@ -86,5 +87,5 @@ display: position: '0' human_name: test_feed_display module: views -id: test_feed_display +name: test_feed_display tag: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml index a3a118f..d2fe5b2 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -28,5 +29,5 @@ display: id: page_1 position: '0' human_name: { } -id: test_field_classes +name: test_field_classes tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml index f39d416..5ba2fc9 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: comment core: 8.0-dev description: '' @@ -59,5 +60,5 @@ display: id: default position: '0' human_name: test_field_get_entity -id: test_field_get_entity +name: test_field_get_entity tag: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml index b6275ce..6d0d73f 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -21,5 +22,5 @@ display: id: default position: '0' human_name: '' -id: test_field_output +name: test_field_output tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml index 18afed9..01431a6 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -40,5 +41,5 @@ display: display_title: Defaults id: default position: '0' -id: test_field_tokens +name: test_field_tokens tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml index a031aab..c9172bc 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -15,5 +16,5 @@ display: id: default position: '0' human_name: '' -id: test_field_type +name: test_field_type tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml index aedaf23..3f11e83 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: 8 disabled: false @@ -36,4 +37,4 @@ display: id: default position: '0' human_name: 'Test filters' -id: test_filter +name: test_filter diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml index 9a2e16d..71f4b2f 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -36,5 +37,5 @@ display: id: default position: '0' human_name: '' -id: test_filter_date_between +name: test_filter_date_between tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml index a4de3cb..379eff6 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -49,5 +50,5 @@ display: id: page_1 position: '0' human_name: test_filter_group_override -id: test_filter_group_override +name: test_filter_group_override tag: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml index de084bc..d71c02e 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -106,5 +107,5 @@ display: id: page position: '0' human_name: test_filter_groups -id: test_filter_groups +name: test_filter_groups tag: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml index 6cfe7e1..a68c790 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -34,5 +35,5 @@ display: id: default position: '0' human_name: '' -id: test_filter_in_operator_ui +name: test_filter_in_operator_ui tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml index 89b6ce1..96a1be7 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml @@ -1,9 +1,10 @@ base_table: node -id: test_get_attach_displays +name: test_get_attach_displays description: '' tag: '' human_name: test_get_attach_displays core: 8.x +api_version: '3.0' display: default: display_plugin: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml index 71dbbc5..33045e5 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -43,5 +44,5 @@ display: id: default position: '0' human_name: test_glossary -id: test_glossary +name: test_glossary tag: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml index 22e9a5d..7ea0ab8 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -55,5 +56,5 @@ display: id: default position: '0' human_name: '' -id: test_group_by_count +name: test_group_by_count tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml index 446c6d8..c494b09 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -48,5 +49,5 @@ display: id: default position: '0' human_name: '' -id: test_group_by_in_filters +name: test_group_by_in_filters tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml index b60fa39..409fb2c 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -25,5 +26,5 @@ display: id: default position: '0' human_name: '' -id: test_handler_relationships +name: test_handler_relationships tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml index 4063a89..f7cbce5 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: 8 display: @@ -43,4 +44,4 @@ display: display_title: Master id: default position: '0' -id: test_handler_test_access +name: test_handler_test_access diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml index ba96ad1..ee816ef 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_field: nid base_table: node core: 8.x @@ -203,5 +204,5 @@ display: 1: AND human_name: test_history module: views -id: test_history +name: test_history tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_mini_pager.yml deleted file mode 100644 index 83c7a70..0000000 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_mini_pager.yml +++ /dev/null @@ -1,83 +0,0 @@ -base_table: node -id: test_mini_pager -description: '' -tag: '' -human_name: test_mini_pager -core: 8.x -api_version: '3.0' -display: - default: - display_plugin: default - id: default - display_title: Master - position: '' - display_options: - access: - type: perm - cache: - type: none - query: - type: views_query - exposed_form: - type: basic - pager: - type: mini - options: - items_per_page: '3' - offset: '0' - id: '0' - total_pages: '' - tags: - previous: ‹‹ test - next: ›› test - expose: - items_per_page: '0' - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 20, 40, 60' - items_per_page_options_all: '0' - items_per_page_options_all_label: '- All -' - offset: '0' - offset_label: Offset - style: - type: default - row: - type: node - options: - build_mode: teaser - links: '1' - comments: '0' - fields: - title: - id: title - table: node - field: title - label: '' - alter: - alter_text: '0' - make_link: '0' - absolute: '0' - trim: '0' - word_boundary: '0' - ellipsis: '0' - strip_tags: '0' - html: '0' - hide_empty: '0' - empty_zero: '0' - link_to_node: '1' - filters: { } - sorts: { } - title: test_mini_pager - filter_groups: - operator: AND - groups: { } - page_1: - display_plugin: page - id: page_1 - display_title: Page - position: '' - display_options: - path: test_mini_pager -base_field: nid -disabled: '0' -module: views -langcode: und diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml index 0027a58..92ed6c7 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -28,5 +29,5 @@ display: id: page_2 position: '0' human_name: '' -id: test_page_display +name: test_page_display tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml index 5000688..08be354 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -26,5 +27,5 @@ display: id: default position: '0' human_name: '' -id: test_pager_full +name: test_pager_full tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml index 96b046e..7b20316 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_pager_none +name: test_pager_none tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml index 0c6bb7f..d9ecda5 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -25,5 +26,5 @@ display: id: default position: '0' human_name: '' -id: test_pager_some +name: test_pager_some tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml index 0c2eb5f..91ba690 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_field: id base_table: views_test_data core: 8.x @@ -56,5 +57,5 @@ display: title: '' human_name: test_preview module: views -id: test_preview +name: test_preview tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml index 31cfe08..1217693 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml @@ -1,9 +1,10 @@ base_table: node -id: test_redirect_view +name: test_redirect_view description: '' tag: '' human_name: test_redirect_view core: 8.x +api_version: '3.0' display: default: display_plugin: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml index e66e2fc..e01c83e 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -49,5 +50,5 @@ display: id: page_1 position: '0' human_name: '' -id: test_reset_button +name: test_reset_button tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml index 0d1c3a5..8f1e259 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -81,5 +82,5 @@ display: id: default position: '0' human_name: '' -id: test_simple_argument +name: test_simple_argument tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml index 1ec7885..0c4acfe 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_store_pager_settings +name: test_store_pager_settings tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml index a4339fc..30d4dd9 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -53,5 +54,5 @@ display: id: default position: '0' human_name: '' -id: test_style_mapping +name: test_style_mapping tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml index 58c8433..f6e640c 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml @@ -1,9 +1,10 @@ base_table: views_test_data -id: test_tokens +name: test_tokens description: 'Test view to token replacement tests.' tag: '' human_name: 'Test tokens' core: 8.x +api_version: '3.0' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml index 7200766..57dd103 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -43,5 +44,5 @@ display: id: default position: '0' human_name: '' -id: test_view +name: test_view tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 515aa6a..446aa63 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -32,5 +33,5 @@ display: id: default position: '0' human_name: '' -id: test_view_argument_validate_numeric +name: test_view_argument_validate_numeric tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml index 3ec9cb2..1b4dc28 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -32,5 +33,5 @@ display: id: default position: '0' human_name: '' -id: test_view_argument_validate_php +name: test_view_argument_validate_php tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml index 3b43da5..ca28db8 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -24,5 +25,5 @@ display: id: default position: '0' human_name: test_view_delete -id: test_view_delete +name: test_view_delete tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml index ebcfd0e..cf47d54 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -58,5 +59,5 @@ display: id: default position: '0' human_name: '' -id: test_view_handler_weight +name: test_view_handler_weight tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml index 105a3f8..5b909ea 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -42,5 +43,5 @@ display: id: default position: '0' human_name: '' -id: test_view_pager_full_zero_items_per_page +name: test_view_pager_full_zero_items_per_page tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml index c63da26..e3ad228 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' description: '' @@ -45,5 +46,5 @@ display: id: default position: '0' human_name: '' -id: test_view_render +name: test_view_render tag: '' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml index 886ce2c..08261f5 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml @@ -1,9 +1,10 @@ base_table: views_test_data -id: test_view_status +name: test_view_status description: '' tag: '' human_name: test_view_status core: 8.x +api_version: '3.0' display: default: display_plugin: default diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml index ab0c603..c28829f 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: views_test_data core: '8' module: views @@ -48,5 +49,5 @@ display: type: views_query options: { } human_name: 'Storage Test View' -id: test_view_storage +name: test_view_storage tag: 'test' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml index 9db8ce8..05f9b5c 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml @@ -1,3 +1,4 @@ +api_version: '3.0' base_table: node core: '8' description: '' @@ -22,5 +23,5 @@ display: id: default position: '0' human_name: '' -id: test_views_groupby_save +name: test_views_groupby_save tag: '' diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php index 48060f0..5d0cb73 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php @@ -51,7 +51,7 @@ public function setJoinValue($join_value) { */ public function buildJoin($select_query, $table, $view_query) { // Add an additional hardcoded condition to the query. - $this->extra = 'views_test_data.uid = ' . $this->getJoinValue(); + $this->extra = 'node.uid = ' . $this->getJoinValue(); parent::buildJoin($select_query, $table, $view_query); } diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/views_test_data/views_test_data.module index 9e23992..324a446 100644 --- a/core/modules/views/tests/views_test_data/views_test_data.module +++ b/core/modules/views/tests/views_test_data/views_test_data.module @@ -78,7 +78,7 @@ function views_test_data_handler_test_access_callback_argument($argument = FALSE * @see \Drupal\views\Tests\Plugin\RenderTest */ function views_test_data_views_pre_render(ViewExecutable $view) { - if ($view->storage->id() == 'test_cache_header_storage') { + if ($view->storage->get('name') == 'test_cache_header_storage') { $path = drupal_get_path('module', 'views_test_data'); $view->element['#attached']['js'][] = "$path/views_cache.test.js"; $view->element['#attached']['css'][] = "$path/views_cache.test.css"; @@ -91,7 +91,7 @@ function views_test_data_views_pre_render(ViewExecutable $view) { * Implements hook_preprocess_HOOK() for views-view-table.tpl.php. */ function views_test_data_preprocess_views_view_table(&$variables) { - if ($variables['view']->storage->id() == 'test_view_render') { + if ($variables['view']->storage->get('name') == 'test_view_render') { $views_render_test = state()->get('views_render.test'); $views_render_test++; state()->set('views_render.test', $views_render_test); @@ -102,7 +102,7 @@ function views_test_data_preprocess_views_view_table(&$variables) { * Implements hook_views_post_build(). */ function views_test_data_views_post_build(ViewExecutable $view) { - if ($view->storage->id() == 'test_page_display') { + if ($view->storage->get('name') == 'test_page_display') { if ($view->current_display == 'page_1') { $view->build_info['denied'] = TRUE; } diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php index 0687b9d..6e9dae8 100644 --- a/core/modules/views/views.api.php +++ b/core/modules/views/views.api.php @@ -191,6 +191,7 @@ function hook_views_data() { 'help' => t('Just a plain text field.'), 'field' => array( 'id' => 'standard', + 'click sortable' => TRUE, // This is use by the table display plugin. ), 'sort' => array( 'id' => 'standard', @@ -209,6 +210,7 @@ function hook_views_data() { 'help' => t('Just a numeric field.'), 'field' => array( 'id' => 'numeric', + 'click sortable' => TRUE, ), 'filter' => array( 'id' => 'numeric', @@ -224,6 +226,7 @@ function hook_views_data() { 'help' => t('Just an on/off field.'), 'field' => array( 'id' => 'boolean', + 'click sortable' => TRUE, ), 'filter' => array( 'id' => 'boolean', @@ -245,6 +248,7 @@ function hook_views_data() { 'help' => t('Just a timestamp field.'), 'field' => array( 'id' => 'date', + 'click sortable' => TRUE, ), 'sort' => array( 'id' => 'date', diff --git a/core/modules/views/views.install b/core/modules/views/views.install index 8bda10e..d395d08 100644 --- a/core/modules/views/views.install +++ b/core/modules/views/views.install @@ -26,17 +26,3 @@ function views_schema() { return $schema; } - -/** - * Provide an initial schema. - * - * @see update_module_enable(). - */ -function views_schema_0() { - module_load_install('system'); - // Add the cache_views_info and cache_views_results tables. - $cache_schema = system_schema_cache_8007(); - $schema['cache_views_info'] = $cache_schema; - $schema['cache_views_results'] = $cache_schema; - return $schema; -} diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 8a85c97..957416f 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -15,6 +15,11 @@ use Drupal\views\Plugin\Core\Entity\View; /** + * Views API version string. + */ +const VIEWS_API_VERSION = '3.0'; + +/** * Implements hook_forms(). * * To provide distinct form IDs for Views forms, the View name and @@ -38,7 +43,7 @@ function views_forms($form_id, $args) { function views_form_id($view) { $parts = array( 'views_form', - $view->storage->id(), + $view->storage->get('name'), $view->current_display, ); @@ -218,7 +223,7 @@ function views_plugin_list() { } // Add this view to the list for this plugin. - $plugins[$key]['views'][$view->id()] = $view->id(); + $plugins[$key]['views'][$view->get('name')] = $view->get('name'); } } } @@ -235,11 +240,11 @@ function views_plugin_list() { */ function views_preprocess_node(&$vars) { // The 'view' attribute of the node is added in views_preprocess_node() - if (!empty($vars['node']->view) && $vars['node']->view->storage->id()) { + if (!empty($vars['node']->view) && $vars['node']->view->storage->get('name')) { $vars['view'] = $vars['node']->view; - $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id(); + $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->get('name'); if (!empty($vars['node']->view->current_display)) { - $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id() . '__' . $vars['node']->view->current_display; + $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->get('name') . '__' . $vars['node']->view->current_display; // If a node is being rendered in a view, and the view does not have a path, // prevent drupal from accidentally setting the $page variable: @@ -261,11 +266,11 @@ function views_preprocess_node(&$vars) { */ function views_preprocess_comment(&$vars) { // The 'view' attribute of the node is added in template_preprocess_views_view_row_comment() - if (!empty($vars['comment']->view) && $vars['comment']->view->storage->id()) { + if (!empty($vars['comment']->view) && $vars['comment']->view->storage->get('name')) { $vars['view'] = &$vars['comment']->view; - $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id(); + $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->get('name'); if (!empty($vars['node']->view->current_display)) { - $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id() . '__' . $vars['comment']->view->current_display; + $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->get('name') . '__' . $vars['comment']->view->current_display; } } } @@ -658,7 +663,7 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable $render_element['#views_contextual_links_info'][$module] = array( 'location' => $location, 'view' => $view, - 'view_name' => $view->storage->id(), + 'view_name' => $view->storage->get('name'), 'view_display_id' => $display_id, ); } @@ -909,6 +914,7 @@ function views_library_info() { 'version' => VERSION, 'js' => array( "$path/base.js" => array('group' => JS_DEFAULT), + "$path/ajax.js" => array('group' => JS_DEFAULT), "$path/ajax_view.js" => array('group' => JS_DEFAULT), ), 'dependencies' => array( @@ -1150,7 +1156,7 @@ function views_get_applicable_views($type) { * Returns an array of all views as fully loaded $view objects. */ function views_get_all_views() { - return drupal_container()->get('plugin.manager.entity')->getStorageController('view')->load(); + return entity_get_controller('view')->load(); } /** @@ -1522,7 +1528,7 @@ function views_exposed_form($form, &$form_state) { // Let form plugins know this is for exposed widgets. $form_state['exposed'] = TRUE; // Check if the form was already created - if ($cache = views_exposed_form_cache($view->storage->id(), $view->current_display)) { + if ($cache = views_exposed_form_cache($view->storage->get('name'), $view->current_display)) { return $cache; } @@ -1556,19 +1562,24 @@ function views_exposed_form($form, &$form_state) { '#name' => '', '#type' => 'submit', '#value' => t('Apply'), - '#id' => drupal_html_id('edit-submit-' . $view->storage->id()), + '#id' => drupal_html_id('edit-submit-' . $view->storage->get('name')), ); $form['#action'] = url($view->display_handler->getUrl()); $form['#theme'] = views_theme_functions('views_exposed_form', $view, $display); - $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->storage->id()) . '-' . check_plain($display['id'])); + $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->storage->get('name')) . '-' . check_plain($display['id'])); // $form['#attributes']['class'] = array('views-exposed-form'); + // If using AJAX, we need the form plugin. + if ($view->use_ajax) { + $form['#attached']['library'][] = array('system', 'jquery.form'); + } + $exposed_form_plugin = $form_state['exposed_form_plugin']; $exposed_form_plugin->exposed_form_alter($form, $form_state); // Save the form - views_exposed_form_cache($view->storage->id(), $view->current_display, $form); + views_exposed_form_cache($view->storage->get('name'), $view->current_display, $form); return $form; } diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 395f275..23dc731 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -22,7 +22,7 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) { $themes = array(); if ($display) { - $themes[] = $hook . '__' . $view->storage->id() . '__' . $display['id']; + $themes[] = $hook . '__' . $view->storage->get('name') . '__' . $display['id']; $themes[] = $hook . '__' . $display['id']; // Add theme suggestions for each single tag. foreach (drupal_explode_tags($view->storage->get('tag')) as $tag) { @@ -30,11 +30,11 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) { } if ($display['id'] != $display['display_plugin']) { - $themes[] = $hook . '__' . $view->storage->id() . '__' . $display['display_plugin']; + $themes[] = $hook . '__' . $view->storage->get('name') . '__' . $display['display_plugin']; $themes[] = $hook . '__' . $display['display_plugin']; } } - $themes[] = $hook . '__' . $view->storage->id(); + $themes[] = $hook . '__' . $view->storage->get('name'); $themes[] = $hook; return $themes; } @@ -53,8 +53,8 @@ function template_preprocess_views_view(&$vars) { $vars['rows'] = array('#markup' => $vars['rows']); } - $vars['css_name'] = drupal_clean_css_identifier($view->storage->id()); - $vars['id'] = $view->storage->id(); + $vars['css_name'] = drupal_clean_css_identifier($view->storage->get('name')); + $vars['name'] = $view->storage->get('name'); $vars['display_id'] = $view->current_display; // Basic classes @@ -62,8 +62,8 @@ function template_preprocess_views_view(&$vars) { $vars['attributes']['class'] = array(); $vars['attributes']['class'][] = 'view'; - $vars['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($vars['id']); - $vars['attributes']['class'][] = 'view-id-' . $vars['id']; + $vars['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($vars['name']); + $vars['attributes']['class'][] = 'view-id-' . $vars['name']; $vars['attributes']['class'][] = 'view-display-id-' . $vars['display_id']; $css_class = $view->display_handler->getOption('css_class'); @@ -136,7 +136,7 @@ function template_preprocess_views_view(&$vars) { 'ajax_path' => url('views/ajax'), 'ajaxViews' => array( 'views_dom_id:' . $vars['dom_id'] => array( - 'view_name' => $view->storage->id(), + 'view_name' => $view->storage->get('name'), 'view_display_id' => $view->current_display, 'view_args' => check_plain(implode('/', $view->args)), 'view_path' => check_plain(current_path()), @@ -877,7 +877,7 @@ function template_preprocess_views_view_rss(&$vars) { $vars['description'] = check_plain(decode_entities(strip_tags($style->get_description()))); if ($view->display_handler->getOption('sitename_title')) { - $title = $config->id(); + $title = $config->get('name'); if ($slogan = $config->get('slogan')) { $title .= ' - ' . $slogan; } @@ -1044,57 +1044,65 @@ function theme_views_mini_pager($vars) { $parameters = $vars['parameters']; $quantity = $vars['quantity']; + // Calculate various markers within this pager piece: + // Middle is used to "center" pages around the current page. + $pager_middle = ceil($quantity / 2); // current is the page we are currently paged to $pager_current = $pager_page_array[$element] + 1; // max is the maximum page number $pager_max = $pager_total[$element]; // End of marker calculations. - $li_previous = array(); - if ($pager_total[$element] > 1 && $pager_page_array[$element] > 0) { - $li_previous = array( - '#theme' => 'pager_link__previous', - '#text' => (isset($tags[1]) ? $tags[1] : t('‹‹')), - '#page_new' => pager_load_array($pager_page_array[$element] - 1, $element, $pager_page_array), - '#element' => $element, - '#interval' => 1, - '#parameters' => $parameters, + if ($pager_total[$element] > 1) { + + $li_previous = theme('pager_previous', + array( + 'text' => (isset($tags[1]) ? $tags[1] : t('‹‹')), + 'element' => $element, + 'interval' => 1, + 'parameters' => $parameters, + ) ); - } + if (empty($li_previous)) { + $li_previous = " "; + } - $li_next = array(); - if ($pager_page_array[$element] < ($pager_total[$element] - 1)) { - $li_next = array( - '#theme' => 'pager_link__next', - '#text' => (isset($tags[3]) ? $tags[3] : t('››')), - '#page_new' => pager_load_array($pager_page_array[$element] + 1, $element, $pager_page_array), - '#element' => $element, - '#interval' => 1, - '#parameters' => $parameters, + $li_next = theme('pager_next', + array( + 'text' => (isset($tags[3]) ? $tags[3] : t('››')), + 'element' => $element, + 'interval' => 1, + 'parameters' => $parameters, + ) ); - } - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-previous')), - ) + $li_previous; - - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-current')), - '#markup' => t('@current of @max', array('@current' => $pager_current, '@max' => $pager_max)), - ); - - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-next')), - ) + $li_next; - - return theme('item_list', - array( - 'items' => $items, - 'title' => NULL, - 'type' => 'ul', - 'attributes' => array('class' => array('pager')), - ) - ); + if (empty($li_next)) { + $li_next = " "; + } + + $items[] = array( + 'class' => array('pager-previous'), + 'data' => $li_previous, + ); + + $items[] = array( + 'class' => array('pager-current'), + 'data' => t('@current of @max', array('@current' => $pager_current, '@max' => $pager_max)), + ); + + $items[] = array( + 'class' => array('pager-next'), + 'data' => $li_next, + ); + return theme('item_list', + array( + 'items' => $items, + 'title' => NULL, + 'type' => 'ul', + 'attributes' => array('class' => array('pager')), + ) + ); + } } /** diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc index 9ca541a..4674d1b 100644 --- a/core/modules/views/views.tokens.inc +++ b/core/modules/views/views.tokens.inc @@ -22,9 +22,9 @@ function views_token_info() { 'name' => t('Description'), 'description' => t('The description of the view.'), ); - $info['tokens']['view']['id'] = array( - 'name' => t('ID'), - 'description' => t('The machine-readable ID of the view.'), + $info['tokens']['view']['machine-name'] = array( + 'name' => t('Machine name'), + 'description' => t('The machine-readable name of the view.'), ); $info['tokens']['view']['title'] = array( 'name' => t('Title'), @@ -89,8 +89,8 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar $replacements[$original] = $sanitize ? check_plain($view->storage->get('description')) : $view->storage->get('description'); break; - case 'id': - $replacements[$original] = $view->storage->id(); + case 'machine-name': + $replacements[$original] = $view->storage->get('name'); break; case 'title': diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc index 9e9f1ba..2639878 100644 --- a/core/modules/views/views_ui/admin.inc +++ b/core/modules/views/views_ui/admin.inc @@ -285,19 +285,19 @@ function views_ui_break_lock_confirm($form, &$form_state, ViewUI $view) { $form = array(); if (empty($view->locked)) { - $form['message']['#markup'] = t('There is no lock on view %name to break.', array('%name' => $view->id())); + $form['message']['#markup'] = t('There is no lock on view %name to break.', array('%name' => $view->get('name'))); return $form; } $cancel = drupal_container()->get('request')->query->get('cancel'); if (empty($cancel)) { - $cancel = 'admin/structure/views/view/' . $view->id() . '/edit'; + $cancel = 'admin/structure/views/view/' . $view->get('name') . '/edit'; } $account = user_load($view->locked->owner); $form = confirm_form($form, t('Do you want to break the lock on view %name?', - array('%name' => $view->id())), + array('%name' => $view->get('name'))), $cancel, t('By breaking this lock, any unsaved changes made by !user will be lost.', array('!user' => theme('username', array('account' => $account)))), t('Break lock'), @@ -418,16 +418,9 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) { $displays = $executable->displayHandlers; $current_display = $executable->display_handler; - // @todo Move this to a separate function if it's needed on any forms that - // don't have the display dropdown. - $form['override'] = array( - '#prefix' => '
', - '#suffix' => '
', - '#weight' => -1000, - '#tree' => TRUE, - ); - // Add the "2 of 3" progress indicator. + // @TODO: Move this to a separate function if it's needed on any forms that + // don't have the display dropdown. if ($form_progress = $view->getFormProgress()) { $form['progress']['#markup'] = '
' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '
'; $form['progress']['#weight'] = -1001; @@ -456,6 +449,12 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) { $display_dropdown['default_revert'] = t('Revert to default'); } + $form['override'] = array( + '#prefix' => '
', + '#suffix' => '
', + '#weight' => -1000, + '#tree' => TRUE, + ); $form['override']['dropdown'] = array( '#type' => 'select', '#title' => t('For'), // @TODO: Translators may need more context than this. @@ -541,7 +540,7 @@ function views_ui_ajax_forms($key = NULL) { function views_ui_build_form_url($form_state) { $form = views_ui_ajax_forms($form_state['form_key']); $ajax = empty($form_state['ajax']) ? 'nojs' : 'ajax'; - $name = $form_state['view']->id(); + $name = $form_state['view']->get('name'); $url = "admin/structure/views/$ajax/$form_state[form_key]/$name/$form_state[display_id]"; foreach ($form['args'] as $arg) { $url .= '/' . $form_state[$arg]; @@ -622,7 +621,7 @@ function views_ui_ajax_form($js, $key, ViewUI $view, $display_id = '') { } elseif (!$js) { // if nothing on the stack, non-js forms just go back to the main view editor. - return drupal_goto("admin/structure/views/view/{$view->id()}/edit"); + return drupal_goto("admin/structure/views/view/{$view->get('name')}/edit"); } else { $output = array(); @@ -636,9 +635,7 @@ function views_ui_ajax_form($js, $key, ViewUI $view, $display_id = '') { // If this form was for view-wide changes, there's no need to regenerate // the display section of the form. if ($display_id !== '') { - drupal_container()->get('plugin.manager.entity') - ->getFormController('view', 'edit') - ->rebuildCurrentTab($view, $output, $display_id); + entity_form_controller('view', 'edit')->rebuildCurrentTab($view, $output, $display_id); } } @@ -673,7 +670,7 @@ function views_ui_analyze_view_form($form, &$form_state) { * Submit handler for views_ui_analyze_view_form */ function views_ui_analyze_view_form_submit($form, &$form_state) { - $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->id() . '/edit'; + $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->get('name') . '/edit'; } /** @@ -1217,6 +1214,7 @@ function views_ui_add_item_form($form, &$form_state) { $type = $form_state['type']; $form = array( + 'override' => array(), 'options' => array( '#theme_wrappers' => array('container'), '#attributes' => array('class' => array('scroll')), @@ -2274,7 +2272,7 @@ function views_ui_field_list() { && $field_data = $table_data[$item['field']][$type]) { // The final check that we have a fieldapi field now. if (isset($field_data['field_name'])) { - $fields[$field_data['field_name']][$view->id()] = $view->id(); + $fields[$field_data['field_name']][$view->get('name')] = $view->get('name'); } } } diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php index ca6478d..ea0bf11 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php @@ -44,7 +44,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) { '#default_value' => '', '#maxlength' => 255, ); - $form['name']['id'] = array( + $form['name']['name'] = array( '#type' => 'machine_name', '#maxlength' => 128, '#machine_name' => array( @@ -160,7 +160,7 @@ public function submit(array $form, array &$form_state) { } $view->save(); - $form_state['redirect'] = array('admin/structure/views/view/' . $view->id()); + $form_state['redirect'] = array('admin/structure/views/view/' . $view->get('name')); } /** diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php index dcf319a..70f18a9 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php @@ -36,7 +36,7 @@ public function form(array $form, array &$form_state, EntityInterface $entity) { '#maxlength' => 255, '#default_value' => t('Clone of @human_name', array('@human_name' => $entity->getHumanName())), ); - $form['id'] = array( + $form['name'] = array( '#type' => 'machine_name', '#maxlength' => 128, '#machine_name' => array( diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php index 595113f..a885f27 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php @@ -8,7 +8,6 @@ namespace Drupal\views_ui; use Drupal\Core\Entity\EntityInterface; -use Drupal\Component\Utility\NestedArray; use Drupal\views\ViewExecutable; /** @@ -88,7 +87,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) { $form['locked'] = array( '#type' => 'container', '#attributes' => array('class' => array('view-locked', 'messages', 'warning')), - '#children' => t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to break this lock.', array('!user' => theme('username', array('account' => user_load($view->locked->owner))), '!age' => format_interval(REQUEST_TIME - $view->locked->updated), '!break' => url('admin/structure/views/view/' . $view->id() . '/break-lock'))), + '#children' => t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to break this lock.', array('!user' => theme('username', array('account' => user_load($view->locked->owner))), '!age' => format_interval(REQUEST_TIME - $view->locked->updated), '!break' => url('admin/structure/views/view/' . $view->get('name') . '/break-lock'))), '#weight' => -10, ); } @@ -240,7 +239,7 @@ public function submit(array $form, array &$form_state) { $displays[$new_id] = $displays[$id]; unset($displays[$id]); // Redirect the user to the renamed display to be sure that the page itself exists and doesn't throw errors. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $new_id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $new_id; } } $view->set('display', $displays); @@ -251,7 +250,7 @@ public function submit(array $form, array &$form_state) { $destination = $query->get('destination'); if (!empty($destination)) { // Find out the first display which has a changed path and redirect to this url. - $old_view = views_get_view($view->id()); + $old_view = views_get_view($view->get('name')); $old_view->initDisplay(); foreach ($old_view->displayHandlers as $id => $display) { // Only check for displays with a path. @@ -275,7 +274,7 @@ public function submit(array $form, array &$form_state) { drupal_set_message(t('The view %name has been saved.', array('%name' => $view->getHumanName()))); // Remove this view from cache so we can edit it properly. - drupal_container()->get('user.tempstore')->get('views')->delete($view->id()); + drupal_container()->get('user.tempstore')->get('views')->delete($view->get('name')); } /** @@ -289,7 +288,7 @@ public function submit(array $form, array &$form_state) { public function cancel(array $form, array &$form_state) { // Remove this view from cache so edits will be lost. $view = $this->getEntity($form_state); - drupal_container()->get('user.tempstore')->get('views')->delete($view->id()); + drupal_container()->get('user.tempstore')->get('views')->delete($view->get('name')); $form_state['redirect'] = 'admin/structure/views'; } @@ -423,21 +422,6 @@ public function getDisplayDetails($view, $display) { "#suffix" => '', ); } - - foreach (views_fetch_plugin_names('display', NULL, array($view->get('storage')->get('base_table'))) as $type => $label) { - if ($type == $display['display_plugin']) { - continue; - } - - $build['top']['actions']['clone_as'][$type] = array( - '#type' => 'submit', - '#value' => t('clone as @type', array('@type' => $label)), - '#limit_validation_errors' => array(), - '#submit' => array(array($this, 'submitCloneDisplayAsType'), array($this, 'submitDelayDestination')), - '#prefix' => '
  • ', - '#suffix' => '
    • ', - ); - } } else { $build['top']['actions']['undo_delete'] = array( @@ -554,7 +538,7 @@ public function submitDisplayUndoDelete($form, &$form_state) { views_ui_cache_set($view); // Redirect to the top-level edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id; } /** @@ -570,7 +554,7 @@ public function submitDisplayEnable($form, &$form_state) { views_ui_cache_set($view); // Redirect to the top-level edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id; } /** @@ -585,7 +569,7 @@ public function submitDisplayDisable($form, &$form_state) { views_ui_cache_set($view); // Redirect to the top-level edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id; } /** @@ -603,7 +587,7 @@ public function submitDisplayDelete($form, &$form_state) { // Redirect to the top-level edit page. The first remaining display will // become the active display. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id(); + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name'); } /** @@ -644,21 +628,21 @@ public function renderDisplayTop(ViewUI $view) { '#links' => array( 'edit-details' => array( 'title' => t('edit view name/description'), - 'href' => "admin/structure/views/nojs/edit-details/{$view->id()}", + 'href' => "admin/structure/views/nojs/edit-details/{$view->get('name')}", 'attributes' => array('class' => array('views-ajax-link')), ), 'analyze' => array( 'title' => t('analyze view'), - 'href' => "admin/structure/views/nojs/analyze/{$view->id()}/$display_id", + 'href' => "admin/structure/views/nojs/analyze/{$view->get('name')}/$display_id", 'attributes' => array('class' => array('views-ajax-link')), ), 'clone' => array( 'title' => t('clone view'), - 'href' => "admin/structure/views/view/{$view->id()}/clone", + 'href' => "admin/structure/views/view/{$view->get('name')}/clone", ), 'reorder' => array( 'title' => t('reorder displays'), - 'href' => "admin/structure/views/nojs/reorder-displays/{$view->id()}/$display_id", + 'href' => "admin/structure/views/nojs/reorder-displays/{$view->get('name')}/$display_id", 'attributes' => array('class' => array('views-ajax-link')), ), ), @@ -671,14 +655,14 @@ public function renderDisplayTop(ViewUI $view) { if ($view->type == t('Overridden')) { $element['extra_actions']['#links']['revert'] = array( 'title' => t('revert view'), - 'href' => "admin/structure/views/view/{$view->id()}/revert", - 'query' => array('destination' => "admin/structure/views/view/{$view->id()}"), + 'href' => "admin/structure/views/view/{$view->get('name')}/revert", + 'query' => array('destination' => "admin/structure/views/view/{$view->get('name')}"), ); } else { $element['extra_actions']['#links']['delete'] = array( 'title' => t('delete view'), - 'href' => "admin/structure/views/view/{$view->id()}/delete", + 'href' => "admin/structure/views/view/{$view->get('name')}/delete", ); } } @@ -761,7 +745,7 @@ public function submitDisplayDuplicate($form, &$form_state) { views_ui_cache_set($view); // Redirect to the new display's edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $new_display_id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $new_display_id; } /** @@ -779,39 +763,7 @@ public function submitDisplayAdd($form, &$form_state) { views_ui_cache_set($view); // Redirect to the new display's edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $display_id; - } - - /** - * Submit handler to clone a display as another display type. - */ - public function submitCloneDisplayAsType($form, &$form_state) { - $view = $this->getEntity($form_state); - $display_id = $view->displayID; - - // Create the new display. - $parents = $form_state['triggering_element']['#parents']; - $display_type = array_pop($parents); - $new_display_id = $view->addDisplay($display_type); - $displays = $view->get('display'); - - // Let the display title be generated by the addDisplay method and set the - // right display plugin, but keep the rest from the original display. - $display_clone = $displays[$display_id]; - unset($display_clone['display_title']); - unset($display_clone['display_plugin']); - - $displays[$new_display_id] = NestedArray::mergeDeep($displays[$new_display_id], $display_clone); - $displays[$new_display_id]['id'] = $new_display_id; - $view->set('display', $displays); - - // By setting the current display the changed marker will appear on the new - // display. - $view->get('executable')->current_display = $new_display_id; - views_ui_cache_set($view); - - // Redirect to the new display's edit page. - $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $new_display_id; + $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $display_id; } /** @@ -865,17 +817,11 @@ public function getFormBucket(ViewUI $view, $type, $display) { $build['#name'] = $build['#title'] = $types[$type]['title']; - $rearrange_url = "admin/structure/views/nojs/rearrange/{$view->id()}/{$display['id']}/$type"; - $rearrange_text = t('Rearrange'); - $class = 'icon compact rearrange'; - // Different types now have different rearrange forms, so we use this switch // to get the right one. switch ($type) { case 'filter': - // The rearrange form for filters contains the and/or UI, so override - // the used path. - $rearrange_url = "admin/structure/views/nojs/rearrange-$type/{$view->id()}/{$display['id']}/$type"; + $rearrange_url = "admin/structure/views/nojs/rearrange-$type/{$view->get('name')}/{$display['id']}/$type"; $rearrange_text = t('And/Or, Rearrange'); // TODO: Add another class to have another symbol for filter rearrange. $class = 'icon compact rearrange'; @@ -892,7 +838,6 @@ public function getFormBucket(ViewUI $view, $type, $display) { ); return $build; } - break; case 'header': case 'footer': case 'empty': @@ -904,7 +849,10 @@ public function getFormBucket(ViewUI $view, $type, $display) { ); return $build; } - break; + default: + $rearrange_url = "admin/structure/views/nojs/rearrange/{$view->get('name')}/{$display['id']}/$type"; + $rearrange_text = t('Rearrange'); + $class = 'icon compact rearrange'; } // Create an array of actions to pass to theme_links @@ -912,7 +860,7 @@ public function getFormBucket(ViewUI $view, $type, $display) { $count_handlers = count($view->get('executable')->displayHandlers->get($display['id'])->getHandlers($type)); $actions['add'] = array( 'title' => t('Add'), - 'href' => "admin/structure/views/nojs/add-item/{$view->id()}/{$display['id']}/$type", + 'href' => "admin/structure/views/nojs/add-item/{$view->get('name')}/{$display['id']}/$type", 'attributes' => array('class' => array('icon compact add', 'views-ajax-link'), 'title' => t('Add'), 'id' => 'views-add-' . $type), 'html' => TRUE, ); @@ -977,7 +925,7 @@ public function getFormBucket(ViewUI $view, $type, $display) { if (empty($handler)) { $build['fields'][$id]['#class'][] = 'broken'; $field_name = t('Broken/missing handler: @table > @field', array('@table' => $field['table'], '@field' => $field['field'])); - $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE)); + $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/config-item/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE)); continue; } @@ -992,15 +940,15 @@ public function getFormBucket(ViewUI $view, $type, $display) { if (!empty($field['exclude'])) { $link_attributes['class'][] = 'views-field-excluded'; } - $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE)); + $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE)); $build['fields'][$id]['#class'][] = drupal_clean_css_identifier($display['id']. '-' . $type . '-' . $id); if ($view->get('executable')->displayHandlers->get($display['id'])->useGroupBy() && $handler->usesGroupBy()) { - $build['fields'][$id]['#settings_links'][] = l('' . t('Aggregation settings') . '', "admin/structure/views/nojs/config-item-group/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE)); + $build['fields'][$id]['#settings_links'][] = l('' . t('Aggregation settings') . '', "admin/structure/views/nojs/config-item-group/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE)); } if ($handler->hasExtraOptions()) { - $build['fields'][$id]['#settings_links'][] = l('' . t('Settings') . '', "admin/structure/views/nojs/config-item-extra/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => TRUE)); + $build['fields'][$id]['#settings_links'][] = l('' . t('Settings') . '', "admin/structure/views/nojs/config-item-extra/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => TRUE)); } if ($grouping) { diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php index e9ed64f..3683875 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php @@ -92,7 +92,7 @@ public function getDisplayTabs(ViewUI $view) { '#theme' => 'menu_local_task', '#link' => array( 'title' => $this->getDisplayLabel($view, $id), - 'href' => 'admin/structure/views/view/' . $view->id() . '/edit/' . $id, + 'href' => 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id, 'localized_options' => array(), ), ); diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php index f6798fe..a710ab4 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php @@ -61,7 +61,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) { '#markup' => $view->renderPreview($view->displayID, $args), ); } - $form['#action'] = url('admin/structure/views/view/' . $view->id() .'/preview/' . $view->displayID); + $form['#action'] = url('admin/structure/views/view/' . $view->get('name') .'/preview/' . $view->displayID); return $form; } @@ -82,7 +82,7 @@ protected function actions(array $form, array &$form_state) { '#submit' => array(array($this, 'submitPreview')), '#id' => 'preview-submit', '#ajax' => array( - 'path' => 'admin/structure/views/view/' . $view->id() . '/preview/' . $view->displayID . '/ajax', + 'path' => 'admin/structure/views/view/' . $view->get('name') . '/preview/' . $view->displayID . '/ajax', 'wrapper' => 'views-preview-wrapper', 'event' => 'click', 'progress' => array('type' => 'throbber'), @@ -98,7 +98,7 @@ protected function actions(array $form, array &$form_state) { public function submitPreview($form, &$form_state) { // Rebuild the form with a pristine $view object. $view = $this->getEntity($form_state); - $form_state['build_info']['args'][0] = views_ui_cache_load($view->id()); + $form_state['build_info']['args'][0] = views_ui_cache_load($view->get('name')); $view->renderPreview = TRUE; $form_state['show_preview'] = TRUE; $form_state['rebuild'] = TRUE; diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php index d161c97..0dead3b 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -215,7 +215,7 @@ public function standardCancel($form, &$form_state) { views_ui_cache_set($this); } - $form_state['redirect'] = 'admin/structure/views/view/' . $this->id() . '/edit'; + $form_state['redirect'] = 'admin/structure/views/view/' . $this->get('name') . '/edit'; } /** @@ -348,8 +348,8 @@ public function getOverrideValues($form, $form_state) { * Submit handler to break_lock a view. */ public function submitBreakLock(&$form, &$form_state) { - drupal_container()->get('user.tempstore')->get('views')->delete($this->id()); - $form_state['redirect'] = 'admin/structure/views/view/' . $this->id() . '/edit'; + drupal_container()->get('user.tempstore')->get('views')->delete($this->get('name')); + $form_state['redirect'] = 'admin/structure/views/view/' . $this->get('name') . '/edit'; drupal_set_message(t('The lock has been broken and you may now edit this view.')); } @@ -411,7 +411,7 @@ public function buildDisplaysReorderForm($form, &$form_state) { 'limit' => 0, ); - $form['#action'] = url('admin/structure/views/nojs/reorder-displays/' . $this->id() . '/' . $display_id); + $form['#action'] = url('admin/structure/views/nojs/reorder-displays/' . $this->get('name') . '/' . $display_id); $this->getStandardButtons($form, $form_state, 'views_ui_reorder_displays_form'); $form['buttons']['submit']['#submit'] = array(array($this, 'submitDisplaysReorderForm')); @@ -463,7 +463,7 @@ public function submitDisplaysReorderForm($form, &$form_state) { // Store in cache views_ui_cache_set($this); - $form_state['redirect'] = array('admin/structure/views/view/' . $this->id() . '/edit', array('fragment' => 'views-tab-default')); + $form_state['redirect'] = array('admin/structure/views/view/' . $this->get('name') . '/edit', array('fragment' => 'views-tab-default')); } /** @@ -630,7 +630,7 @@ public function renderPreview($display_id, $args = array()) { } // Make view links come back to preview. - $this->override_path = 'admin/structure/views/nojs/preview/' . $this->id() . '/' . $display_id; + $this->override_path = 'admin/structure/views/nojs/preview/' . $this->get('name') . '/' . $display_id; // Also override the current path so we get the pager. $original_path = current_path(); @@ -795,7 +795,7 @@ public function buildIdentifier($key, $display_id, $args) { $form = views_ui_ajax_forms($key); // Automatically remove the single-form cache if it exists and // does not match the key. - $identifier = implode('-', array($key, $this->id(), $display_id)); + $identifier = implode('-', array($key, $this->get('name'), $display_id)); foreach ($form['args'] as $id) { $arg = (!empty($args)) ? array_shift($args) : NULL; diff --git a/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php b/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php index d651c4a..5f5e02f 100644 --- a/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php +++ b/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php @@ -21,7 +21,7 @@ @base.', - array('%name' => $view->id(), '@base' => $base_table)); ?> + array('%name' => $view->get('name'), '@base' => $base_table)); ?> diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module index 5157195..3162b7c 100644 --- a/core/modules/views/views_ui/views_ui.module +++ b/core/modules/views/views_ui/views_ui.module @@ -277,14 +277,11 @@ function views_ui_theme() { function views_ui_library_info() { $libraries = array(); - $path = drupal_get_path('module', 'views_ui') . '/js/'; - $libraries['views_ui.admin'] = array( 'title' => 'Views UI ADMIN', 'version' => VERSION, 'js' => array( - $path . 'ajax.js' => array('group' => JS_DEFAULT), - $path . 'views-admin.js' => array('group' => JS_DEFAULT), + drupal_get_path('module', 'views_ui') . '/js/views-admin.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( array('system', 'jquery'), @@ -350,7 +347,7 @@ function views_ui_cache_load($name) { if (empty($view)) { return FALSE; } - $view->locked = $views_temp_store->getMetadata($view->id()); + $view->locked = $views_temp_store->getMetadata($view->get('name')); return $view; } @@ -379,7 +376,7 @@ function views_ui_cache_set(ViewUI $view) { unset($executable->default_display); $executable->query = NULL; unset($executable->displayHandlers); - drupal_container()->get('user.tempstore')->get('views')->set($view->id(), $view); + drupal_container()->get('user.tempstore')->get('views')->set($view->get('name'), $view); } /** @@ -441,13 +438,13 @@ function views_ui_view_preview_section_handler_links(ViewExecutable $view, $type $field_name = $handler->adminLabel(TRUE); $links[$type . '-edit-' . $id] = array( 'title' => t('Edit @section', array('@section' => $field_name)), - 'href' => "admin/structure/views/nojs/config-item/{$view->storage->id()}/{$display['id']}/$type/$id", + 'href' => "admin/structure/views/nojs/config-item/{$view->storage->get('name')}/{$display['id']}/$type/$id", 'attributes' => array('class' => array('views-ajax-link')), ); } $links[$type . '-add'] = array( 'title' => t('Add new'), - 'href' => "admin/structure/views/nojs/add-item/{$view->storage->id()}/{$display['id']}/$type", + 'href' => "admin/structure/views/nojs/add-item/{$view->storage->get('name')}/{$display['id']}/$type", 'attributes' => array('class' => array('views-ajax-link')), ); @@ -462,7 +459,7 @@ function views_ui_view_preview_section_display_category_links(ViewExecutable $vi $links = array( $type . '-edit' => array( 'title' => t('Edit @section', array('@section' => $title)), - 'href' => "admin/structure/views/nojs/display/{$view->storage->id()}/{$display['id']}/$type", + 'href' => "admin/structure/views/nojs/display/{$view->storage->get('name')}/{$display['id']}/$type", 'attributes' => array('class' => array('views-ajax-link')), ), ); @@ -490,7 +487,7 @@ function views_ui_view_preview_section_rows_links(ViewExecutable $view) { */ function views_ui_views_plugins_display_alter(&$plugins) { // Attach contextual links to each display plugin. The links will point to - // paths underneath "admin/structure/views/view/{$view->id()}" (i.e., paths + // paths underneath "admin/structure/views/view/{$view->get('name')}" (i.e., paths // for editing and performing other contextual actions on the view). foreach ($plugins as &$display) { $display['contextual links']['views_ui'] = array( @@ -694,7 +691,7 @@ function views_ui_ajax_callback(ViewExecutable $view, $op) { // If the request is via AJAX, return the rendered list as JSON. if (drupal_container()->get('request')->request->get('js')) { - $list = views_ui_list_page(); + $list = entity_list_controller('view')->render(); $commands = array(ajax_command_replace('#views-entity-list', drupal_render($list))); return new JsonResponse(ajax_render($commands)); } @@ -741,7 +738,5 @@ function views_ui_confirm_delete_submit($form, &$form_state) { * @see views_ui_menu() */ function views_ui_list_page() { - return drupal_container()->get('plugin.manager.entity') - ->getListController('view') - ->render(); + return entity_list_controller('view')->render(); } diff --git a/core/profiles/minimal/config/block.block.stark.admin.yml b/core/profiles/minimal/config/block.block.stark.admin.yml deleted file mode 100644 index 5f62f7d..0000000 --- a/core/profiles/minimal/config/block.block.stark.admin.yml +++ /dev/null @@ -1,18 +0,0 @@ -id: stark.admin -label: Administration -region: sidebar_first -weight: '1' -module: system -status: '1' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: { } - visibility__active_tab: edit-visibility-path -plugin: 'system_menu_block:menu-admin' -settings: - cache: '-1' diff --git a/core/profiles/minimal/config/block.block.stark.login.yml b/core/profiles/minimal/config/block.block.stark.login.yml deleted file mode 100644 index 6154106..0000000 --- a/core/profiles/minimal/config/block.block.stark.login.yml +++ /dev/null @@ -1,18 +0,0 @@ -id: stark.login -label: 'User login' -region: sidebar_first -weight: '0' -module: user -status: '1' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: { } - visibility__active_tab: edit-visibility-path -plugin: user_login_block -settings: - cache: '-1' diff --git a/core/profiles/minimal/config/block.block.stark.tools.yml b/core/profiles/minimal/config/block.block.stark.tools.yml deleted file mode 100644 index 4942f50..0000000 --- a/core/profiles/minimal/config/block.block.stark.tools.yml +++ /dev/null @@ -1,18 +0,0 @@ -id: stark.tools -label: Tools -region: sidebar_first -weight: '0' -module: system -status: '1' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: { } - visibility__active_tab: edit-visibility-path -plugin: 'system_menu_block:menu-tools' -settings: - cache: '-1' diff --git a/core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php b/core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php deleted file mode 100644 index fbfb65b..0000000 --- a/core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php +++ /dev/null @@ -1,44 +0,0 @@ - 'Minimal installation profile', - 'description' => 'Tests Minimal installation profile expectations.', - 'group' => 'Minimal', - ); - } - - /** - * Tests Minimal installation profile. - */ - function testMinimal() { - $this->drupalGet(''); - // Check the login block is present. - $this->assertLink(t('Create new account')); - $this->assertResponse(200); - - // Create a user to test tools and navigation blocks for logged in users - // with appropriate permissions. - $user = $this->drupalCreateUser(array('access administration pages', 'administer content types')); - $this->drupalLogin($user); - $this->drupalGet(''); - $this->assertText(t('Tools')); - $this->assertText(t('Administration')); - } -} diff --git a/core/profiles/standard/config/block.block.bartik.footer.yml b/core/profiles/standard/config/block.block.bartik.footer.yml deleted file mode 100644 index 4496313..0000000 --- a/core/profiles/standard/config/block.block.bartik.footer.yml +++ /dev/null @@ -1,21 +0,0 @@ -id: bartik.footer -plugin: 'system_menu_block:menu-footer' -status: '1' -settings: - cache: '-1' -label: 'Footer menu' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: - article: '0' - page: '0' - visibility__active_tab: edit-visibility-path -module: system -region: footer -weight: '0' -langcode: und diff --git a/core/profiles/standard/config/filter.format.filtered_html.yml b/core/profiles/standard/config/filter.format.filtered_html.yml deleted file mode 100644 index 11623fe..0000000 --- a/core/profiles/standard/config/filter.format.filtered_html.yml +++ /dev/null @@ -1,22 +0,0 @@ -format: filtered_html -name: 'Filtered HTML' -status: '1' -weight: '0' -roles: - - anonymous - - authenticated -cache: '1' -filters: - filter_url: - module: filter - status: '1' - filter_html: - module: filter - status: '1' - filter_autop: - module: filter - status: '1' - filter_htmlcorrector: - module: filter - status: '1' -langcode: und diff --git a/core/profiles/standard/config/filter.format.full_html.yml b/core/profiles/standard/config/filter.format.full_html.yml deleted file mode 100644 index 26ff727..0000000 --- a/core/profiles/standard/config/filter.format.full_html.yml +++ /dev/null @@ -1,18 +0,0 @@ -format: full_html -name: 'Full HTML' -status: '1' -weight: '1' -roles: - - administrator -cache: '1' -filters: - filter_url: - module: filter - status: '1' - filter_autop: - module: filter - status: '1' - filter_htmlcorrector: - module: filter - status: '1' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.content.yml b/core/profiles/standard/config/plugin.core.block.bartik.content.yml similarity index 71% rename from core/profiles/standard/config/block.block.bartik.content.yml rename to core/profiles/standard/config/plugin.core.block.bartik.content.yml index 7f1a9f8..e10f903 100644 --- a/core/profiles/standard/config/block.block.bartik.content.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.content.yml @@ -1,8 +1,6 @@ -id: bartik.content -plugin: system_main_block +id: system_main_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' +subject: '' module: system region: content weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.seven.help.yml b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml similarity index 68% copy from core/profiles/standard/config/block.block.seven.help.yml copy to core/profiles/standard/config/plugin.core.block.bartik.footer.yml index 72c4509..7b6f9b7 100644 --- a/core/profiles/standard/config/block.block.seven.help.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml @@ -1,8 +1,7 @@ -id: seven.help -plugin: system_help_block +id: 'system_menu_block:menu-footer' status: '1' -settings: - cache: '-1' +cache: '-1' +subject: 'Footer menu' visibility: path: visibility: '0' @@ -14,8 +13,6 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' module: system -region: help +region: footer weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.help.yml b/core/profiles/standard/config/plugin.core.block.bartik.help.yml similarity index 72% rename from core/profiles/standard/config/block.block.bartik.help.yml rename to core/profiles/standard/config/plugin.core.block.bartik.help.yml index 58d10a3..a5c4467 100644 --- a/core/profiles/standard/config/block.block.bartik.help.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.help.yml @@ -1,8 +1,6 @@ -id: bartik.help -plugin: system_help_block +id: system_help_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' +subject: '' module: system region: help weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.login.yml b/core/profiles/standard/config/plugin.core.block.bartik.login.yml similarity index 72% copy from core/profiles/standard/config/block.block.bartik.login.yml copy to core/profiles/standard/config/plugin.core.block.bartik.login.yml index 21d73d8..8d8923a 100644 --- a/core/profiles/standard/config/block.block.bartik.login.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.login.yml @@ -1,8 +1,7 @@ -id: bartik.login +id: user_login_block whois_new_count: '5' status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,9 +13,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'User login' +subject: 'User login' module: user region: sidebar_first weight: '0' -plugin: user_login_block -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.powered.yml b/core/profiles/standard/config/plugin.core.block.bartik.powered.yml similarity index 70% rename from core/profiles/standard/config/block.block.bartik.powered.yml rename to core/profiles/standard/config/plugin.core.block.bartik.powered.yml index 446e51a..1f9dc52 100644 --- a/core/profiles/standard/config/block.block.bartik.powered.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.powered.yml @@ -1,8 +1,6 @@ -id: bartik.powered -plugin: system_powered_by_block +id: system_powered_by_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' +subject: '' module: system region: footer weight: '10' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.search.yml b/core/profiles/standard/config/plugin.core.block.bartik.search.yml similarity index 71% rename from core/profiles/standard/config/block.block.bartik.search.yml rename to core/profiles/standard/config/plugin.core.block.bartik.search.yml index 3dcda34..d314a49 100644 --- a/core/profiles/standard/config/block.block.bartik.search.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.search.yml @@ -1,8 +1,6 @@ -id: bartik.search -plugin: search_form_block +id: search_form_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'Search' +subject: 'Search' module: search region: sidebar_first weight: '-1' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.tools.yml b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml similarity index 69% copy from core/profiles/standard/config/block.block.bartik.tools.yml copy to core/profiles/standard/config/plugin.core.block.bartik.tools.yml index 44e3aeb..d6a38c9 100644 --- a/core/profiles/standard/config/block.block.bartik.tools.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml @@ -1,8 +1,6 @@ -id: bartik.tools -plugin: 'system_menu_block:menu-tools' +id: 'system_menu_block:menu-tools' status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'Tools' +subject: 'Tools' module: system region: sidebar_first weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.seven.content.yml b/core/profiles/standard/config/plugin.core.block.seven.content.yml similarity index 72% rename from core/profiles/standard/config/block.block.seven.content.yml rename to core/profiles/standard/config/plugin.core.block.seven.content.yml index 675f718..e10f903 100644 --- a/core/profiles/standard/config/block.block.seven.content.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.content.yml @@ -1,8 +1,6 @@ -id: seven.content -plugin: system_main_block +id: system_main_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' +subject: '' module: system region: content weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.seven.help.yml b/core/profiles/standard/config/plugin.core.block.seven.help.yml similarity index 72% rename from core/profiles/standard/config/block.block.seven.help.yml rename to core/profiles/standard/config/plugin.core.block.seven.help.yml index 72c4509..a5c4467 100644 --- a/core/profiles/standard/config/block.block.seven.help.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.help.yml @@ -1,8 +1,6 @@ -id: seven.help -plugin: system_help_block +id: system_help_block status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: '' +subject: '' module: system region: help weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.seven.login.yml b/core/profiles/standard/config/plugin.core.block.seven.login.yml similarity index 70% rename from core/profiles/standard/config/block.block.seven.login.yml rename to core/profiles/standard/config/plugin.core.block.seven.login.yml index c35ba59..8c4eca5 100644 --- a/core/profiles/standard/config/block.block.seven.login.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.login.yml @@ -1,8 +1,7 @@ -id: seven.login -plugin: user_login_block +id: user_login_block +whois_new_count: '5' status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +13,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'User login' +subject: 'User login' module: user region: content weight: '10' -langcode: und diff --git a/core/profiles/standard/config/user.role.administrator.yml b/core/profiles/standard/config/user.role.administrator.yml deleted file mode 100644 index 71187f9..0000000 --- a/core/profiles/standard/config/user.role.administrator.yml +++ /dev/null @@ -1,3 +0,0 @@ -id: administrator -label: Administrator -weight: 2 diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install index 8802bbc..5cb8fb3 100644 --- a/core/profiles/standard/standard.install +++ b/core/profiles/standard/standard.install @@ -12,6 +12,62 @@ * @see system_install() */ function standard_install() { + // Add text formats. + $filtered_html_format = array( + 'format' => 'filtered_html', + 'name' => 'Filtered HTML', + 'weight' => 0, + 'filters' => array( + // URL filter. + 'filter_url' => array( + 'weight' => 0, + 'status' => 1, + ), + // HTML filter. + 'filter_html' => array( + 'weight' => 1, + 'status' => 1, + ), + // Line break filter. + 'filter_autop' => array( + 'weight' => 2, + 'status' => 1, + ), + // HTML corrector filter. + 'filter_htmlcorrector' => array( + 'weight' => 10, + 'status' => 1, + ), + ), + ); + $filtered_html_format = (object) $filtered_html_format; + filter_format_save($filtered_html_format); + + $full_html_format = array( + 'format' => 'full_html', + 'name' => 'Full HTML', + 'weight' => 1, + 'filters' => array( + // URL filter. + 'filter_url' => array( + 'weight' => 0, + 'status' => 1, + ), + // Line break filter. + 'filter_autop' => array( + 'weight' => 1, + 'status' => 1, + ), + // HTML corrector filter. + 'filter_htmlcorrector' => array( + 'weight' => 10, + 'status' => 1, + ), + ), + ); + $full_html_format = (object) $full_html_format; + filter_format_save($full_html_format); + // Enable Bartik theme and set it as default theme instead of Stark. // @see system_install() $default_theme = 'bartik'; @@ -222,17 +278,23 @@ function standard_install() { user_install_picture_field(); // Enable default permissions for system roles. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access content', 'access comments')); - user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access content', 'access comments', 'post comments', 'skip comment approval')); + $filtered_html_permission = filter_permission_name($filtered_html_format); + user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access content', 'access comments', $filtered_html_permission)); + user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access content', 'access comments', 'post comments', 'skip comment approval', $filtered_html_permission)); - // Enable all permissions for the administrator role. - user_role_grant_permissions('administrator', array_keys(module_invoke_all('permission'))); + // Create a default role for site administrators, with all available permissions assigned. + $admin_role = new stdClass(); + $admin_role->rid = 'administrator'; + $admin_role->name = 'Administrator'; + $admin_role->weight = 2; + user_role_save($admin_role); + user_role_grant_permissions($admin_role->rid, array_keys(module_invoke_all('permission'))); // Set this as the administrator role. - $user_settings->set('admin_role', 'administrator')->save(); + $user_settings->set('admin_role', $admin_role->rid)->save(); // Assign user 1 the "administrator" role. db_insert('users_roles') - ->fields(array('uid' => 1, 'rid' => 'administrator')) + ->fields(array('uid' => 1, 'rid' => $admin_role->rid)) ->execute(); // Create a Home link in the main menu. @@ -249,7 +311,7 @@ function standard_install() { user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access site-wide contact form')); // Populate the default shortcut set. - $shortcut_set = shortcut_set_load('default'); + $shortcut_set = shortcut_set_load(SHORTCUT_DEFAULT_SET_NAME); $shortcut_set->links[] = array( 'link_path' => 'node/add', 'link_title' => st('Add content'), @@ -260,7 +322,7 @@ function standard_install() { 'link_title' => st('Find content'), 'weight' => -19, ); - $shortcut_set->save(); + shortcut_set_save($shortcut_set); // Enable the admin theme. theme_enable(array('seven')); diff --git a/core/profiles/standard/config/block.block.bartik.tools.yml b/core/profiles/testing/config/plugin.core.block.stark.admin.yml similarity index 69% copy from core/profiles/standard/config/block.block.bartik.tools.yml copy to core/profiles/testing/config/plugin.core.block.stark.admin.yml index 44e3aeb..960e2cb 100644 --- a/core/profiles/standard/config/block.block.bartik.tools.yml +++ b/core/profiles/testing/config/plugin.core.block.stark.admin.yml @@ -1,8 +1,6 @@ -id: bartik.tools -plugin: 'system_menu_block:menu-tools' +id: 'system_menu_block:menu-admin' status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'Tools' +subject: '' module: system region: sidebar_first weight: '0' -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.login.yml b/core/profiles/testing/config/plugin.core.block.stark.online.yml similarity index 61% rename from core/profiles/standard/config/block.block.bartik.login.yml rename to core/profiles/testing/config/plugin.core.block.stark.online.yml index 21d73d8..3b3f5c5 100644 --- a/core/profiles/standard/config/block.block.bartik.login.yml +++ b/core/profiles/testing/config/plugin.core.block.stark.online.yml @@ -1,8 +1,11 @@ -id: bartik.login -whois_new_count: '5' +id: user_online_block +properties: + administrative: '1' +seconds_online: '900' +max_list_count: '10' status: '1' -settings: - cache: '-1' +cache: '-1' +subject: 'Who''s online' visibility: path: visibility: '0' @@ -13,10 +16,8 @@ visibility: types: article: '0' page: '0' + poll: '0' visibility__active_tab: edit-visibility-path -label: 'User login' module: user region: sidebar_first weight: '0' -plugin: user_login_block -langcode: und diff --git a/core/profiles/standard/config/block.block.bartik.tools.yml b/core/profiles/testing/config/plugin.core.block.stark.tools.yml similarity index 69% rename from core/profiles/standard/config/block.block.bartik.tools.yml rename to core/profiles/testing/config/plugin.core.block.stark.tools.yml index 44e3aeb..5e8b188 100644 --- a/core/profiles/standard/config/block.block.bartik.tools.yml +++ b/core/profiles/testing/config/plugin.core.block.stark.tools.yml @@ -1,8 +1,6 @@ -id: bartik.tools -plugin: 'system_menu_block:menu-tools' +id: 'system_menu_block:menu-tools' status: '1' -settings: - cache: '-1' +cache: '-1' visibility: path: visibility: '0' @@ -14,8 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -label: 'Tools' +subject: '' module: system region: sidebar_first weight: '0' -langcode: und diff --git a/core/scripts/dump-database-d6.sh b/core/scripts/dump-database-d6.sh index 106568d..d39bb43 100644 --- a/core/scripts/dump-database-d6.sh +++ b/core/scripts/dump-database-d6.sh @@ -44,7 +44,7 @@ ENDOFHEADER; -foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) { +foreach (module_list() as $module) { $output .= " * - $module\n"; } $output .= " */\n\n"; diff --git a/core/scripts/dump-database-d7.sh b/core/scripts/dump-database-d7.sh index 3b8597d..3440fa2 100644 --- a/core/scripts/dump-database-d7.sh +++ b/core/scripts/dump-database-d7.sh @@ -45,7 +45,7 @@ ENDOFHEADER; -foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) { +foreach (module_list() as $module) { $output .= " * - $module\n"; } $output .= " */\n\n"; diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css index dc7c2a4..2f4841b 100644 --- a/core/themes/bartik/css/style-rtl.css +++ b/core/themes/bartik/css/style-rtl.css @@ -235,6 +235,22 @@ ul.tips { float: right; } +/* ---------- Poll ----------- */ + +.poll .vote-form { + text-align: right; +} +.poll .total { + text-align: left; +} +.poll .choice-title { + clear: left; +} +.poll .percent { + float: left; + text-align: left; +} + /* ---------- Color Form ----------- */ .color-form #palette { diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 44deab1..db19d88 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -1497,6 +1497,54 @@ div.admin-panel .description { width: auto; } +/* ---------- Poll ----------- */ + +.node .poll { + margin: 2em 0; +} +.node .poll #edit-choice { + margin: 0 0 1.5em; +} +.poll .vote-form { + text-align: left; /* LTR */ + margin: 0; +} +.poll .percent { + font-size: 0.857em; + font-style: italic; + margin-bottom: 3em; + margin-top: -3.2em; + float: right; /* LTR */ + text-align: right; /* LTR */ +} +.poll .choice-title { + clear: right; /* LTR */ +} +.poll .total { + font-size: 0.929em; + font-style: italic; + text-align: right; /* LTR */ + clear: both; +} +.node .poll { + margin: 1.8em 0 0; +} +.node .poll .text { + margin-right: 6.75em; +} +.node .poll #edit-choice { + margin: 0 0 1.2em; +} +.poll .bar .foreground { + background-color: #666; +} +#footer-wrapper .poll .bar { + background-color: #666; +} +#footer-wrapper .poll .bar .foreground { + background-color: #ddd; +} + /* ---------- book ----------- */ .book-navigation .menu { border-top: 1px solid #d6d6d6; diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 8741599..9c4fff4 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -232,13 +232,13 @@ ul.primary { border-bottom: none; text-transform: uppercase; font-size: 0.923em; + height: 2.60em; margin: 0; padding-top: 0; } ul.primary li { float: left; /* LTR */ list-style: none; - height: 2.60em; margin: 0 2px; } ul.primary li a:link, @@ -249,7 +249,9 @@ ul.primary li a:hover, ul.primary li.active a { display: block; float: left; /* LTR */ - padding: 0.615em 18px; + height: 2.60em; + line-height: 2.60em; + padding: 0 18px 8px; background-color: #a6a7a2; color: #000; font-weight: bold; @@ -307,52 +309,6 @@ ul.secondary li.active a.active { #content { clear: left; } -@media screen and (max-width:56.538em) { /* 735px */ - .touch #branding { - padding-right: 0; - position: relative; - } - .touch ul.primary { - clear: both; - float: none; - margin-bottom: -3px; - overflow-x: scroll; - -webkit-overflow-scrolling: touch; - white-space: nowrap; - padding-right: 40px; - } - .touch #branding:after { - background-image: -moz-linear-gradient(360deg, rgba(224, 224, 216, 0), #E0E0D8 80%); - background-image: -o-linear-gradient(360deg, rgba(224, 224, 216, 0), #E0E0D8 80%); - background-image: -webkit-linear-gradient(360deg, rgba(224, 224, 216, 0), #E0E0D8 80%); - background-image: linear-gradient(360deg, rgba(224, 224, 216, 0), #E0E0D8 80%); - content: ' '; - display: block; - float: right; - height: 40px; - width: 80px; - position: relative; - right: 0; - top: -40px; - margin-bottom: -40px; - } - .touch ul.primary li { - float: none; - white-space: nowrap; - } - .touch ul.primary li a:link, - .touch ul.primary li a.active, - .touch ul.primary li a:active, - .touch ul.primary li a:visited, - .touch ul.primary li a:hover, - .touch ul.primary li.active a { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - text-align: center; - width: 100%; - } -} /** * Page layout. @@ -550,6 +506,12 @@ details summary { padding-top: 0.5em; padding-bottom: 0.5em; } +details details { + background-color: #fff; +} +details details details { + background-color: #f8f8f8; +} /** * Form elements. @@ -805,6 +767,7 @@ select.form-select:focus { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + width: 100%; } #dblog-filter-form .form-actions { float: none; @@ -1443,65 +1406,3 @@ details.fieldset-no-legend { /* @end */ /* @end */ - -/** - * Entity meta settings. - */ -.entity-meta { - background-color: #e2e2e2; - border-bottom: 0; - border-left: 1px solid #a5a5a5; - border-right: 1px solid #a5a5a5; - border-top: 0; - -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, .15); - box-shadow: inset 0 0 5px rgba(0, 0, 0, .15); - margin-top: 0; - padding-top: 0; -} -.entity-meta-header, -.entity-meta details { - background-color: #f2f2f2; - border-top: 1px solid #a5a5a5; - border-bottom: 1px solid #a5a5a5; -} -.entity-meta-header { - padding: 1em 1.5em; -} -.entity-meta-header .published { - font-size: 1.231em; - font-weight: bold; - text-shadow: 0 1px 0 #fff; -} -.entity-meta-header .changed { - font-style: italic; /* As-designed, but really: why is this italic? */ -} -.entity-meta details { - border-left: 0; - border-right: 0; - border-top: 1px solid #fff; - margin: 0; -} -.entity-meta details[open] { - background-color: transparent; - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, .15), transparent 5px); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, .15), transparent 5px); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, .15), transparent 5px); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, .15), transparent 5px); - border-top-width: 0; - padding-top: 1px; -} -.entity-meta details[open] + [open] { - background-image: none; - border-top-width: 1px; - padding-top: 0; -} -.entity-meta details > .details-wrapper { - padding-top: 0; -} -.entity-meta details > summary { - padding: 0.85em 1.25em; - text-shadow: 0 1px 0 white; -} -.entity-meta details .summary { - display: none; /* Hide JS summaries. @todo Rethink summaries. */ -} diff --git a/core/update.php b/core/update.php index 1f7ac5f..17b44fd 100644 --- a/core/update.php +++ b/core/update.php @@ -333,15 +333,10 @@ function update_access_allowed() { // Calls to user_access() might fail during the Drupal 6 to 7 update process, // so we fall back on requiring that the user be logged in as user #1. try { - $module_handler = drupal_container()->get('module_handler'); - $module_filenames = $module_handler->getModuleList(); - $module_filenames['user'] = 'core/modules/user/user.module'; - $module_handler->setModuleList($module_filenames); - $module_handler->reload(); - drupal_container()->get('kernel')->updateModules($module_filenames, $module_filenames); + require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'user') . '/user.module'; return user_access('administer software updates'); } - catch (\Exception $e) { + catch (Exception $e) { return ($user->uid == 1); } } @@ -440,14 +435,13 @@ function update_check_requirements($skip_warnings = FALSE) { // Load module basics. include_once DRUPAL_ROOT . '/core/includes/module.inc'; - $module_list['system'] = 'core/modules/system/system.module'; - $module_handler = drupal_container()->get('module_handler'); - $module_handler->setModuleList($module_list); - $module_handler->load('system'); + $module_list['system']['filename'] = 'core/modules/system/system.module'; + module_list(NULL, $module_list); + drupal_load('module', 'system'); - // Reset the module implementations cache so that any new hook implementations + // Reset the module_implements() cache so that any new hook implementations // in updated code are picked up. - $module_handler->resetImplementations(); + module_implements_reset(); // Set up $language, since the installer components require it. drupal_language_initialize(); diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php index b7e5745..622540f 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitdff5596d4902476e49b77f22ebf69e4a::getLoader(); +return ComposerAutoloaderInit4f0cafaacf65c45167c785b9f087e425::getLoader(); diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php index 596c65d..a4a0dc5 100644 --- a/core/vendor/composer/ClassLoader.php +++ b/core/vendor/composer/ClassLoader.php @@ -75,64 +75,31 @@ public function addClassMap(array $classMap) } /** - * Registers a set of classes, merging with any others previously set. + * Registers a set of classes * - * @param string $prefix The classes prefix - * @param array|string $paths The location(s) of the classes - * @param bool $prepend Prepend the location(s) + * @param string $prefix The classes prefix + * @param array|string $paths The location(s) of the classes */ - public function add($prefix, $paths, $prepend = false) + public function add($prefix, $paths) { if (!$prefix) { - if ($prepend) { - $this->fallbackDirs = array_merge( - (array) $paths, - $this->fallbackDirs - ); - } else { - $this->fallbackDirs = array_merge( - $this->fallbackDirs, - (array) $paths - ); + foreach ((array) $paths as $path) { + $this->fallbackDirs[] = $path; } return; } - if (!isset($this->prefixes[$prefix])) { - $this->prefixes[$prefix] = (array) $paths; - - return; - } - if ($prepend) { - $this->prefixes[$prefix] = array_merge( - (array) $paths, - $this->prefixes[$prefix] - ); - } else { + if (isset($this->prefixes[$prefix])) { $this->prefixes[$prefix] = array_merge( $this->prefixes[$prefix], (array) $paths ); + } else { + $this->prefixes[$prefix] = (array) $paths; } } /** - * Registers a set of classes, replacing any others previously set. - * - * @param string $prefix The classes prefix - * @param array|string $paths The location(s) of the classes - */ - public function set($prefix, $paths) - { - if (!$prefix) { - $this->fallbackDirs = (array) $paths; - - return; - } - $this->prefixes[$prefix] = (array) $paths; - } - - /** * Turns on searching the include path for class files. * * @param bool $useIncludePath diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php index 913d6b8..4fa7f51 100644 --- a/core/vendor/composer/autoload_namespaces.php +++ b/core/vendor/composer/autoload_namespaces.php @@ -21,7 +21,7 @@ 'Guzzle\\Parser' => $vendorDir . '/guzzle/parser/', 'Guzzle\\Http' => $vendorDir . '/guzzle/http/', 'Guzzle\\Common' => $vendorDir . '/guzzle/common/', - 'EasyRdf_' => $vendorDir . '/easyrdf/easyrdf/lib/', 'Doctrine\\Common' => $vendorDir . '/doctrine/common/lib/', 'Assetic' => $vendorDir . '/kriswallsmith/assetic/src/', + 'EasyRdf_' => $vendorDir . '/njh/easyrdf/lib/', ); diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index 5784e03..d492d5c 100644 --- a/core/vendor/composer/autoload_real.php +++ b/core/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php generated by Composer -class ComposerAutoloaderInitdff5596d4902476e49b77f22ebf69e4a +class ComposerAutoloaderInit4f0cafaacf65c45167c785b9f087e425 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitdff5596d4902476e49b77f22ebf69e4a', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInit4f0cafaacf65c45167c785b9f087e425', 'loadClassLoader')); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitdff5596d4902476e49b77f22ebf69e4a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4f0cafaacf65c45167c785b9f087e425', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); @@ -36,7 +36,7 @@ public static function getLoader() $loader->addClassMap($classMap); } - $loader->register(true); + $loader->register(); return $loader; } diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index e8e495c..bb8d2e1 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -229,6 +229,237 @@ ] }, { + "name": "guzzle/common", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Guzzle/Common", + "source": { + "type": "git", + "url": "git://github.com/guzzle/common.git", + "reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849" + }, + "dist": { + "type": "zip", + "url": "https://github.com/guzzle/common/archive/23162d56daa85b1ee6f1d73d9b5a5ecda2d70849.zip", + "reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/event-dispatcher": ">=2.1" + }, + "time": "2012-12-06 02:26:39", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Guzzle\\Common": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Common libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "event", + "exception", + "common", + "collection" + ] + }, + { + "name": "guzzle/stream", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Guzzle/Stream", + "source": { + "type": "git", + "url": "https://github.com/guzzle/stream", + "reference": "v3.0.5" + }, + "dist": { + "type": "zip", + "url": "https://github.com/guzzle/stream/archive/v3.0.5.zip", + "reference": "v3.0.5", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "guzzle/common": "self.version" + }, + "time": "2012-11-11 23:54:57", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Guzzle\\Stream": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle stream wrapper component", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "stream", + "Guzzle", + "component" + ] + }, + { + "name": "guzzle/parser", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Guzzle/Parser", + "source": { + "type": "git", + "url": "git://github.com/guzzle/parser.git", + "reference": "v3.0.5" + }, + "dist": { + "type": "zip", + "url": "https://github.com/guzzle/parser/archive/v3.0.5.zip", + "reference": "v3.0.5", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "2012-11-19 00:07:13", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Guzzle\\Parser": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Interchangeable parsers used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "http", + "url", + "message", + "cookie", + "URI Template" + ] + }, + { + "name": "guzzle/http", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Guzzle/Http", + "source": { + "type": "git", + "url": "git://github.com/guzzle/http.git", + "reference": "v3.0.5" + }, + "dist": { + "type": "zip", + "url": "https://github.com/guzzle/http/archive/v3.0.5.zip", + "reference": "v3.0.5", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "guzzle/common": "self.version", + "guzzle/parser": "self.version", + "guzzle/stream": "self.version" + }, + "time": "2012-11-18 05:28:55", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Guzzle\\Http": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "HTTP libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "curl", + "http", + "http client", + "client", + "Guzzle" + ] + }, + { + "name": "symfony-cmf/routing", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Symfony/Cmf/Component/Routing", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/Routing", + "reference": "1.0.0-alpha3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony-cmf/Routing/archive/1.0.0-alpha3.zip", + "reference": "1.0.0-alpha3", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/routing": ">=2.1,<2.3-dev", + "symfony/http-kernel": ">=2.1,<2.3-dev" + }, + "time": "2012-12-16 17:52:57", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Cmf\\Component\\Routing": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/Routing/contributors" + } + ], + "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "database", + "routing" + ] + }, + { "name": "symfony/class-loader", "version": "dev-master", "version_normalized": "9999999-dev", @@ -672,313 +903,5 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com" - }, - { - "name": "guzzle/common", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Common", - "source": { - "type": "git", - "url": "git://github.com/guzzle/common.git", - "reference": "v3.1.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/guzzle/common/archive/v3.1.0.zip", - "reference": "v3.1.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.1" - }, - "time": "2013-01-13 05:14:34", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Guzzle\\Common": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Common libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "event", - "exception", - "common", - "collection" - ] - }, - { - "name": "guzzle/stream", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Stream", - "source": { - "type": "git", - "url": "https://github.com/guzzle/stream", - "reference": "v3.1.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/guzzle/stream/archive/v3.1.0.zip", - "reference": "v3.1.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "guzzle/common": "self.version" - }, - "time": "2012-12-07 16:45:11", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Guzzle\\Stream": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle stream wrapper component", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "stream", - "Guzzle", - "component" - ] - }, - { - "name": "guzzle/parser", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Parser", - "source": { - "type": "git", - "url": "git://github.com/guzzle/parser.git", - "reference": "v3.1.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/guzzle/parser/archive/v3.1.0.zip", - "reference": "v3.1.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "time": "2013-01-12 21:43:21", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Guzzle\\Parser": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Interchangeable parsers used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "http", - "url", - "message", - "cookie", - "URI Template" - ] - }, - { - "name": "guzzle/http", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Http", - "source": { - "type": "git", - "url": "git://github.com/guzzle/http.git", - "reference": "v3.1.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/guzzle/http/archive/v3.1.0.zip", - "reference": "v3.1.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "ext-curl": "*", - "guzzle/common": "self.version", - "guzzle/parser": "self.version", - "guzzle/stream": "self.version" - }, - "time": "2013-01-13 05:09:32", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Guzzle\\Http": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "HTTP libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "curl", - "http", - "http client", - "client", - "Guzzle" - ] - }, - { - "name": "easyrdf/easyrdf", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "git://github.com/njh/easyrdf.git", - "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2" - }, - "dist": { - "type": "zip", - "url": "https://github.com/njh/easyrdf/archive/d1c363bd04cd55169fbefe52328e86031c6db3a2.zip", - "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2", - "shasum": "" - }, - "require": { - "php": ">=5.2.8" - }, - "replace": { - "njh/easyrdf": "self.version" - }, - "require-dev": { - "phpunit/phpunit": ">=3.5.15", - "squizlabs/php_codesniffer": ">=1.4.3", - "sami/sami": "dev-master" - }, - "time": "2013-01-13 01:20:04", - "type": "library", - "installation-source": "source", - "autoload": { - "psr-0": { - "EasyRdf_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nicholas Humfrey", - "email": "njh@aelius.com", - "homepage": "http://www.aelius.com/njh/", - "role": "Developer" - } - ], - "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", - "homepage": "http://www.easyrdf.org/", - "keywords": [ - "rdfa", - "RDF", - "Semantic Web", - "Turtle", - "Linked Data" - ] - }, - { - "name": "symfony-cmf/routing", - "version": "dev-master", - "version_normalized": "9999999-dev", - "target-dir": "Symfony/Cmf/Component/Routing", - "source": { - "type": "git", - "url": "https://github.com/symfony-cmf/Routing", - "reference": "ea4a10" - }, - "dist": { - "type": "zip", - "url": "https://github.com/symfony-cmf/Routing/archive/ea4a10dd971580a9a57a69397f165e25233ba667.zip", - "reference": "ea4a10", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/routing": ">=2.1,<2.3-dev", - "symfony/http-kernel": ">=2.1,<2.3-dev" - }, - "time": "2013-01-21 20:33:16", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "installation-source": "source", - "autoload": { - "psr-0": { - "Symfony\\Cmf\\Component\\Routing": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony CMF Community", - "homepage": "https://github.com/symfony-cmf/Routing/contributors" - } - ], - "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", - "homepage": "http://cmf.symfony.com", - "keywords": [ - "database", - "routing" - ] } ] diff --git a/core/vendor/easyrdf/easyrdf/.gitignore b/core/vendor/easyrdf/easyrdf/.gitignore deleted file mode 100644 index 83892d7..0000000 --- a/core/vendor/easyrdf/easyrdf/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -doap.rdf -docs -samicache -lib/arc/ -reports -*.tar.gz -vendor -composer.phar -composer.lock diff --git a/core/vendor/easyrdf/easyrdf/CHANGELOG.md b/core/vendor/easyrdf/easyrdf/CHANGELOG.md deleted file mode 100644 index 482076e..0000000 --- a/core/vendor/easyrdf/easyrdf/CHANGELOG.md +++ /dev/null @@ -1,254 +0,0 @@ -EasyRdf 0.8.0 -============= - -API changes ------------ -* is_a() has been renamed to isA() - -Major new features ------------------- -* Now PSR-2 compliant -* Added RDFa parser - -Enhancements ------------- - -Bug Fixes ---------- - - - -EasyRdf 0.7.2 -============= - -Enhancements ------------- -* Removed automatic registration of ARC2 and librdf parsers and serialisers -** You must now specifically choose the parser or serialiser -* Refactored `EasyRdf_Literal` with datatypes so that it preserves exact value -* Changed Turtle serialiser to not escape Unicode characters unnecessarily -* Fix for escaping literals objects in Turtle serialiser -* Added a new static function `newAndLoad()` to `EasyRdf_Graph` -* Added setters for each of the components of the URI to the class `EasyRdf_ParsedUri` -* Added option to the converter example, to allow raw output, without any HTML - -Bug Fixes ---------- -* Fixed broken Redland parser (thanks to Jon Phipps) -* Fix for serialising two bnodes that reference each other in Turtle -* Added support for parsing literals with single quotes in Turtle -* Removed require for EasyRdf/Exception.php -* Fix for serialising `EasyRdf_Literal_DateTime` to Turtle -* Fix for serialising Turtle literals with a shorthand syntax -* Several typo fixes and minor corrections - - -EasyRdf 0.7.1 -============= - -Enhancements ------------- -* Changed minimum version of PHPUnit to 3.5.15 -* Added RDFa namespace -* Added Open Graph Protocol namespace -* Made improvements to formatting of the Turtle serialiser -* Added new splitUri() function to EasyRdf_Namespace -* Made improvements to format guessing - -Bug Fixes ---------- -* Fix for RDF/XML parser not returning the number of triples -* Added re-mapping of b-nodes to N-Triples and Redland parsers - - -EasyRdf 0.7.0 -============= - -API Changes ------------ -* You must now wrap full property URIs in angle brackets - -Major new features ------------------- -* Added a new pure-PHP Turtle parser -* Added basic property-path support for traversing graphs -* Added support for serialising to the GraphViz dot format (and generating images) -* Added a new class `EasyRdf_ParsedUri` - a RFC3986 compliant URI parser - -Enhancements ------------- -* The load() function in `EasyRdf_Graph` no-longer takes a $data argument -* The parse() and load() methods, now return the number of triples parsed -* Added count() method to `EasyRdf_Resource` and `EasyRdf_Graph` -* Added localName() method to `EasyRdf_Resource` -* Added htmlLink() method to `EasyRdf_Resource` -* Added methods deleteResource() and deleteLiteral() to `EasyRdf_Graph` -* Added support for guessing the file format based on the file extension -* Performance improvements to built-in serialisers - -Environment changes -------------------- -* Added PHP Composer description to the project -* Now properly PSR-0 autoloader compatible -* New minimum version of PHP is 5.2.8 -* Changed test suite to require PHPUnit 3.6 -* Changed from Phing to GNU Make based build system -* Added automated testing of the examples - -Bug Fixes ---------- -* Fix for loading https:// URLs -* Fix for storing the value 0 in a `EasyRdf_Graph` -* Fix for HTTP servers that return relative URIs in the Location header -* Fix for Literals with languages in the SPARQL Query Results XML Format -* Fix for SPARQL servers that put extra whitespace into the XML result -* Fix for the httpget.php example in PHP 5.4+ - - -EasyRdf 0.6.3 -============= -* Added $graph->parseFile() method. -* Added support for SSL (https) to the built-in HTTP client -* Fixes for HTTP responses with a charset parameter in the Content Type. -* Improved error handling and empty documents in JSON and rapper parsers. -* Added connivence class for xsd:hexBinary literals: - - `EasyRdf_Literal_HexBinary` -* Made EasyRdf more tolerant of 'badly serialised bnodes' -* Fix for SPARQL servers that return charset in the MIME Type. -* Fix for using xml:lang in SPARQL 1.1 Query Results JSON Format -* Changed datetime ISO formatting to use 'Z' instead of +0000 for UTC dateTimes -* Added the namespace for 'The Cert Ontology' to EasyRdf. - - -EasyRdf 0.6.2 -============= -* Bug fix for missing triples in the RDF/XML serialiser. -* Added countTriples() method to `EasyRdf_Graph`. -* Re-factored the mechanism for mapping RDF datatypes to PHP classes. -* Added subclasses of `EasyRdf_Literal` for various XSD datatypes: - - `EasyRdf_Literal_Boolean` - - `EasyRdf_Literal_Date` - - `EasyRdf_Literal_DateTime` - - `EasyRdf_Literal_Decimal` - - `EasyRdf_Literal_Integer` -* Made the Redland based parser write triples directly to `EasyRdf_Graph` -* Added support for datatypes and languages in the `EasyRdf_Parser_Ntriples` parser. -* Fix for parsing XML Literals in RDF/XML - - -EasyRdf 0.6.1 -============= -* Updated API documentation for new classes and methods added in 0.6.0 -* Added a description to the top of the source code for each example. -* Changed the generated bnode identifier names from eidXXX to genidXXX. -* Implemented inlining of resources in the RDF/XML serialiser. -* Added new reversePropertyUris() method to `EasyRdf_Graph` and `EasyRdf_Resource`. -* Added addType() and setType() to `EasyRdf_Resource`. -* Added a textarea to the converter example. -* Added support for parsing the json-triples format. -* Renamed `EasyRdf_SparqlClient` to `EasyRdf_Sparql_Client` -* Renamed `EasyRdf_SparqlResult` to `EasyRdf_Sparql_Result` -* Fix for $graph->isEmpty() failing after adding and deleting some triples -* Added new `EasyRdf_DatatypeMapper` class that allows you to map RDF datatypes to PHP classes. -* Renamed guessDatatype() to getDatatypeForValue() in `EasyRdf_Literal`. -* Added getResource() and allResources() to `EasyRdf_Graph` and `EasyRdf_Resource` -* Implemented value casting in literals based on the datatype. - - -EasyRdf 0.6.0 -============= -* Major re-factor of the way data is stored internally in `EasyRdf_Graph`. -* Parsing and serialising is now much faster and will enable further optimisations. -* API is mostly backwards-compatible apart from: - - Changed inverse property operator from - to ^ to match Sparql 1.1 property paths. - - New `EasyRdf_Graphs` will not automatically be loaded on creation - You must now call $graph->load(); - - Setting the default HTTP client is now part of a new `EasyRdf_Http` class - - It is no-longer possible to add multiple properties at once using an associative array. -* Added methods to `EasyRdf_Graph` for direct manipulation of triples. -* Added new `EasyRdf_GraphStore` - class for fetching, saving and deleting graphs to a Graph Store over HTTP. -* Added new `EasyRdf_SparqlClient` and `EasyRdf_SparqlResult` - class for querying a SPARQL endpoint over HTTP. -* Added q values for each Mime-Type associated with an `EasyRdf_Format`. -* New example demonstrating integration with the Zend Framework. -* New `EasyRdf_HTTP_MockClient` class makes testing easier. - - -EasyRdf 0.5.2 -============= -* Added a built-in RDF/XML parser -* Made the RDF/XML serialiser use the rdf:type to open tags -* Added support for comments in the N-Triples parser -* Added new resolveUriReference() function to `EasyRdf_Utils` -* Added the application/rdf+json and text/rdf+n3 mime types - - -EasyRdf 0.5.1 -============= -* Bug fixes for PHP 5.2 - - -EasyRdf 0.5.0 -============= -* Added support for inverse properties. -* Updated RDF/XML and Turtle serialisers to create new namespaces if possible. -* Added new is_a($type) method to `EasyRdf_Resource`. -* Added support for passing an array of properties to the get() method. -* Added primaryTopic() method to `EasyRdf_Resource`. -* The function label() in `EasyRdf_Resource` will no longer attempted to shorten the URI, - if there is no label available. -* Resource types are now stored as resources, instead of shortened URIs. -* Added support for deleting a specific value for property to `EasyRdf_Resource`. -* Properties and datatypes are now stored as full URIs and not - converted to qnames during import. -* Change the TypeMapper to store full URIs internally. -* Added bibo and geo to the set of default namespaces. -* Improved bnode links in dump format -* Fix for converting non-string `EasyRdf_Literal` to string. -* Created an example that resolves UK postcodes using uk-postcodes.com. - - -EasyRdf 0.4.0 -============= -* Moved source code to Github -* Added an `EasyRdf_Literal` class -* Added proper support for Datatypes and Languages -* Added built-in RDF/XML serialiser -* Added built-in Turtle serialiser -* Added a new `EasyRdf_Format` class to deal with mime types etc. -* finished a major refactoring of the Parser/Serialiser registration -* removed all parsing related code from `EasyRdf_Graph` -* Added a basic serialisation example -* Added additional common namespaces -* Test fixes - - -EasyRdf 0.3.0 -============= -* Generated Wiki pages from phpdoc -* Filtering of literals by language -* Moved parsers into `EasyRdf_Parser_XXX` namespace -* Added support for serialisation -* Wrote RDF generation example (foafmaker.php) -* Added built-in ntriples parser/generator -* Added built-in RDF/PHP serialiser -* Added built-in RDF/JSON serialiser -* Added SKOS and RSS to the set of default namespaces. - - -EasyRdf 0.2.0 -============= -* Added support for Redland PHP bindings -* Added support for n-triples document type. -* Improved blank node handing and added newBNode() method to `EasyRdf_Graph`. -* Add option to `EasyRdf_RapperParser` to choose location of rapper command -* Added Rails style HTML tag helpers to examples to make them simpler - - -EasyRdf 0.1.0 -============= -* First public release -* Support for ARC2 and Rapper -* Built-in HTTP Client -* API Documentation -* PHP Unit tests for every class. -* Several usage examples diff --git a/core/vendor/easyrdf/easyrdf/LICENSE.md b/core/vendor/easyrdf/easyrdf/LICENSE.md deleted file mode 100644 index 274a8e6..0000000 --- a/core/vendor/easyrdf/easyrdf/LICENSE.md +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE -======= - -Copyright (c) 2009-2011 Nicholas J Humfrey. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * The name of the author 'Nicholas J Humfrey" may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/core/vendor/easyrdf/easyrdf/Makefile b/core/vendor/easyrdf/easyrdf/Makefile deleted file mode 100644 index fe45368..0000000 --- a/core/vendor/easyrdf/easyrdf/Makefile +++ /dev/null @@ -1,136 +0,0 @@ -PACKAGE = easyrdf -VERSION = $(shell php -r "print json_decode(file_get_contents('composer.json'))->version;") -distdir = $(PACKAGE)-$(VERSION) -PHP = $(shell which php) -COMPOSER_FLAGS=--no-ansi --no-interaction -PHPUNIT = vendor/bin/phpunit -PHPUNIT_FLAGS = -c config/phpunit.xml -PHPCS = vendor/bin/phpcs -PHPCS_FLAGS = --standard=./config/phpcs_ruleset.xml --encoding=utf8 --extensions=php -SAMI = vendor/bin/sami.php - -EXAMPLE_FILES = examples/*.php -SOURCE_FILES = lib/EasyRdf.php \ - lib/EasyRdf/*.php \ - lib/EasyRdf/*/*.php -TEST_FILES = test/*/*Test.php \ - test/*/*/*Test.php -TEST_SUPPORT = Makefile test/cli_example_wrapper.php \ - test/TestHelper.php \ - test/EasyRdf/TestCase.php \ - test/EasyRdf/Http/MockClient.php \ - test/EasyRdf/Serialiser/NtriplesArray.php \ - test/fixtures/* -DOC_FILES = composer.json \ - doap.rdf \ - docs/api \ - README.md \ - LICENSE.md \ - CHANGELOG.md - -DISTFILES = $(EXAMPLE_FILES) $(SOURCE_FILES) $(TEST_FILES) \ - $(TEST_SUPPORT) $(DOC_FILES) - -.DEFAULT: help -all: help - -# TARGET:test Run all the PHPUnit tests -.PHONY: test -test: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) - -# TARGET:test-examples Run PHPUnit tests for each of the examples -.PHONY: test-examples -test-examples: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --testsuite "EasyRdf Examples" - -# TARGET:test-lib Run PHPUnit tests for the library -.PHONY: test-lib -test-lib: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --testsuite "EasyRdf Library" - -# TARGET:coverage Run the library tests and generate a code coverage report -.PHONY: coverage -coverage: $(PHPUNIT) - mkdir -p reports/coverage - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --coverage-html ./reports/coverage --testsuite "EasyRdf Library" - -# TARGET:apidocs Generate HTML API documentation -.PHONY: apidocs -apidocs: $(SAMI) - $(PHP) $(SAMI) update config/sami.php -n -v --force - -docs/api: apidocs - -doap.rdf: doap.php composer.json - $(PHP) doap.php > doap.rdf - -# TARGET:cs Check the code style of the PHP source code -.PHONY: cs -cs: $(PHPCS) - $(PHPCS) $(PHPCS_FLAGS) lib test - -# TARGET:lint Perform basic PHP syntax check on all files -.PHONY: lint -lint: $(EXAMPLE_FILES) $(SOURCE_FILES) $(TEST_FILES) - @for file in $^; do \ - $(PHP) -l $$file || exit -1; \ - done - -# TARGET:dist Build tarball for distribution -.PHONY: dist -dist: $(distdir) - tar zcf $(distdir).tar.gz $(distdir) - rm -Rf $(distdir) - @echo "Created $(distdir).tar.gz" - -$(distdir): $(DISTFILES) - @for file in $^; do \ - dir=$(distdir)/`dirname "$$file"`; \ - test -d "$$dir" || mkdir -p "$$dir" || exit -1; \ - cp -Rfp "$$file" "$(distdir)/$$file" || exit -1; \ - done - -# TARGET:clean Delete any temporary and generated files -.PHONY: clean -clean: - -rm -Rf $(distdir) reports vendor - -rm -Rf docs/api samicache - -rm -f composer.phar composer.lock - -rm -f doap.rdf - -# TARGET:check-fixme Scan for files containing the words TODO or FIXME -.PHONY: check-fixme -check-fixme: - @git grep -n -E 'FIXME|TODO' || echo "No FIXME or TODO lines found." - -# TARGET:help You're looking at it! -.PHONY: help -help: - # Usage: - # make [OPTION=value] - # - # Targets: - @egrep "^# TARGET:" [Mm]akefile | sed 's/^# TARGET:/# /' - # - # Options: - # PHP Path to php - - - -# Composer rules -composer.phar: - curl -s -z composer.phar -o composer.phar http://getcomposer.org/composer.phar - -composer-install: composer.phar - $(PHP) composer.phar $(COMPOSER_FLAGS) install --dev - -composer-update: clean composer.phar - $(PHP) composer.phar $(COMPOSER_FLAGS) update --dev - -vendor/bin/phpunit: composer-install -vendor/bin/phpcs: composer-install -vendor/bin/sami.php: composer-install diff --git a/core/vendor/easyrdf/easyrdf/README.md b/core/vendor/easyrdf/easyrdf/README.md deleted file mode 100644 index 3a71ccd..0000000 --- a/core/vendor/easyrdf/easyrdf/README.md +++ /dev/null @@ -1,136 +0,0 @@ -EasyRdf -======= -EasyRdf is a PHP library designed to make it easy to consume and produce [RDF]. -It was designed for use in mixed teams of experienced and inexperienced RDF -developers. It is written in Object Oriented PHP and has been tested -extensively using PHPUnit. - -After parsing EasyRdf builds up a graph of PHP objects that can then be walked -around to get the data to be placed on the page. Dump methods are available to -inspect what data is available during development. - -Data is typically loaded into a [EasyRdf_Graph] object from source RDF -documents, loaded from the web via HTTP. The [EasyRdf_GraphStore] class -simplifies loading and saving data to a SPARQL 1.1 Graph Store. - -SPARQL queries can be made over HTTP to a Triplestore using the -[EasyRdf_Sparql_Client] class. SELECT and ASK queries will return an -[EasyRdf_Sparql_Result] object and CONSTRUCT and DESCRIBE queries will return -an [EasyRdf_Graph] object. - -### Example ### - - $foaf = new EasyRdf_Graph("http://njh.me/foaf.rdf"); - $foaf->load(); - $me = $foaf->primaryTopic(); - echo "My name is: ".$me->get('foaf:name')."\n"; - - -Downloads ---------- - -The latest version of EasyRdf can be [downloaded from GitHub]. - - -Links ------ - -* [EasyRdf Homepage](http://www.easyrdf.org/) -* [API documentation](http://www.easyrdf.org/docs/api/) -* [Change Log](http://github.com/njh/easyrdf/blob/master/CHANGELOG.md) -* Source Code: -* Issue Tracker: - - -Requirements ------------- - -* PHP 5.2.8 or higher - - -Features --------- - -* API documentation written in phpdoc -* Extensive unit tests written using phpunit - * Automated testing against PHP 5.2, 5.3 and 5.4 -* Built-in parsers and serialisers: RDF/JSON, N-Triples, RDF/XML, Turtle -* Optional parsing support for: [ARC2], [Redland Bindings], [rapper] -* Optional support for [Zend_Http_Client] -* No required external dependancies upon other libraries (PEAR, Zend, etc...) -* Complies with Zend Framework coding style. -* Type mapper - resources of type foaf:Person can be mapped into PHP object of class Foaf_Person -* Support for visualisation of graphs using [GraphViz] -* Comes with a number of examples - - -Property Paths --------------- - -EasyRdf supports querying the data in a graph using basic property paths. -This is a small subset of the property paths described in [SPARQL 1.1 query language]. - - -You may use the caret character (^) to get an inverse property, for example: - - $person = $homepage->get('^foaf:homepage'); - -You can use the pipe character (|) to get alternate properties, for example: - - $title = $document->get('dc:title|dc11:title'); - -You can use a forward slash (/) to follow a property sequence, for example to get -the names of all my friends: - - $names = $me->all('foaf:knows/foaf:name'); - -Finally, in order to use a full property URI, enclose it in angle brackets: - - $name = $me->get(''); - - -More Examples -------------- - -* [artistinfo.php](https://github.com/njh/easyrdf/blob/master/examples/artistinfo.php#slider) - Example of mapping an RDF class type to a PHP Class -* [basic.php](https://github.com/njh/easyrdf/blob/master/examples/basic.php#slider) - Basic "Hello World" type example -* [basic_sparql.php](https://github.com/njh/easyrdf/blob/master/examples/basic_sparql.php#slider) - Example of making a SPARQL SELECT query -* [converter.php](https://github.com/njh/easyrdf/blob/master/examples/converter.php#slider) - Convert RDF from one format to another -* [dump.php](https://github.com/njh/easyrdf/blob/master/examples/dump.php#slider) - Display the contents of a graph -* [foafinfo.php](https://github.com/njh/easyrdf/blob/master/examples/foafinfo.php#slider) - Display the basic information in a FOAF document -* [foafmaker.php](https://github.com/njh/easyrdf/blob/master/examples/foafmaker.php#slider) - Construct a FOAF document with a choice of serialisations -* [graph_direct.php](https://github.com/njh/easyrdf/blob/master/examples/graph_direct.php#slider) - Example of using EasyRdf_Graph directly without EasyRdf_Resource -* [graphstore.php](https://github.com/njh/easyrdf/blob/master/examples/graphstore.php#slider) - Store and retrieve data from a SPARQL 1.1 Graph Store -* [graphviz.php](https://github.com/njh/easyrdf/blob/master/examples/graphviz.php#slider) - GraphViz rendering example -* [html_tag_helpers.php](https://github.com/njh/easyrdf/blob/master/examples/html_tag_helpers.php#slider) - Rails Style html tag helpers to make the EasyRdf examples simplier -* [httpget.php](https://github.com/njh/easyrdf/blob/master/examples/httpget.php#slider) - No RDF, just test EasyRdf_Http_Client -* [serialise.php](https://github.com/njh/easyrdf/blob/master/examples/serialise.php#slider) - Basic serialisation example -* [sparql_queryform.php](https://github.com/njh/easyrdf/blob/master/examples/sparql_queryform.php#slider) - Form to submit SPARQL queries and display the result -* [uk_postcode.php](https://github.com/njh/easyrdf/blob/master/examples/uk_postcode.php#slider) - Example of resolving UK postcodes using uk-postcodes.com -* [villages.php](https://github.com/njh/easyrdf/blob/master/examples/villages.php#slider) - Fetch and information about villages in Fife from dbpedialite.org -* [zend_framework.php](https://github.com/njh/easyrdf/blob/master/examples/zend_framework.php#slider) - Example of using Zend_Http_Client and Zend_Loader_Autoloader with EasyRdf - - -Licensing ---------- - -The EasyRdf library and tests are licensed under the [BSD-3-Clause] license. -The examples are in the public domain, for more information see [UNLICENSE]. - - - -[EasyRdf_Graph]:http://www.easyrdf.org/docs/api/EasyRdf_Graph.html -[EasyRdf_GraphStore]:http://www.easyrdf.org/docs/api/EasyRdf_GraphStore.html -[EasyRdf_Sparql_Client]:http://www.easyrdf.org/docs/api/EasyRdf_Sparql_Client.html -[EasyRdf_Sparql_Result]:http://www.easyrdf.org/docs/api/EasyRdf_Sparql_Result.html - -[ARC2]:http://github.com/semsol/arc2/ -[BSD-3-Clause]:http://www.opensource.org/licenses/BSD-3-Clause -[downloaded from github]:https://github.com/njh/easyrdf/downloads -[GraphViz]:http://www.graphviz.org/ -[rapper]:http://librdf.org/raptor/rapper.html -[RDF]:http://en.wikipedia.org/wiki/Resource_Description_Framework -[Redland Bindings]:http://librdf.org/bindings/ -[SPARQL 1.1 query language]:http://www.w3.org/TR/sparql11-query/ -[UNLICENSE]:http://unlicense.org/ -[Zend_Http_Client]:http://framework.zend.com/manual/en/zend.http.client.html diff --git a/core/vendor/easyrdf/easyrdf/composer.json b/core/vendor/easyrdf/easyrdf/composer.json deleted file mode 100644 index 8ce254e..0000000 --- a/core/vendor/easyrdf/easyrdf/composer.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "easyrdf/easyrdf", - "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", - "version": "0.8.0", - "type": "library", - "keywords": ["RDF", "Semantic Web", "Linked Data", "Turtle", "RDFa"], - "homepage": "http://www.easyrdf.org/", - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Nicholas Humfrey", - "email": "njh@aelius.com", - "homepage": "http://www.aelius.com/njh/", - "role": "Developer" - } - ], - "support": { - "forum": "http://groups.google.com/group/easyrdf/", - "issues": "http://github.com/njh/easyrdf/issues", - "irc": "irc://chat.freenode.net/easyrdf" - }, - "require": { - "php": ">=5.2.8" - }, - "require-dev": { - "phpunit/PHPUnit": ">=3.5.15", - "squizlabs/php_codesniffer": ">=1.4.3", - "sami/sami": "dev-master" - }, - "replace": { - "njh/easyrdf": "self.version" - }, - "autoload": { - "psr-0": { "EasyRdf_": "lib/" } - } -} diff --git a/core/vendor/easyrdf/easyrdf/doap.php b/core/vendor/easyrdf/easyrdf/doap.php deleted file mode 100644 index 60274ff..0000000 --- a/core/vendor/easyrdf/easyrdf/doap.php +++ /dev/null @@ -1,46 +0,0 @@ -homepage.'doap.rdf'); - $easyrdf = $doap->resource('#easyrdf', 'doap:Project', 'foaf:Project'); - $easyrdf->addLiteral('doap:name', 'EasyRDF'); - $easyrdf->addLiteral('doap:shortname', 'easyrdf'); - $easyrdf->addLiteral('doap:revision', $composer->version); - $easyrdf->addLiteral('doap:shortdesc', $composer->description, 'en'); - $easyrdf->addResource('doap:homepage', $composer->homepage); - - $easyrdf->addLiteral('doap:programming-language', 'PHP'); - $easyrdf->addLiteral( - 'doap:description', 'EasyRdf is a PHP library designed to make it easy to consume and produce RDF. '. - 'It was designed for use in mixed teams of experienced and inexperienced RDF developers. '. - 'It is written in Object Oriented PHP and has been tested extensively using PHPUnit.', 'en' - ); - $easyrdf->addResource('doap:license', 'http://usefulinc.com/doap/licenses/bsd'); - $easyrdf->addResource('doap:download-page', 'http://github.com/njh/easyrdf/downloads'); - $easyrdf->addResource('doap:download-page', 'http://github.com/njh/easyrdf/downloads'); - $easyrdf->addResource('doap:bug-database', 'http://github.com/njh/easyrdf/issues'); - $easyrdf->addResource('doap:mailing-list', 'http://groups.google.com/group/easyrdf'); - - $easyrdf->addResource('doap:category', 'http://dbpedia.org/resource/Resource_Description_Framework'); - $easyrdf->addResource('doap:category', 'http://dbpedia.org/resource/PHP'); - $easyrdf->addResource('doap:category', 'http://dbpedialite.org/things/24131#id'); - $easyrdf->addResource('doap:category', 'http://dbpedialite.org/things/53847#id'); - - $repository = $doap->newBNode('doap:GitRepository'); - $repository->addResource('doap:browse', 'http://github.com/njh/easyrdf'); - $repository->addResource('doap:location', 'git://github.com/njh/easyrdf.git'); - $easyrdf->addResource('doap:repository', $repository); - - $njh = $doap->resource('http://njh.me/', 'foaf:Person'); - $njh->addLiteral('foaf:name', 'Nicholas J Humfrey'); - $njh->addResource('foaf:homepage', 'http://www.aelius.com/njh/'); - $easyrdf->add('doap:maintainer', $njh); - $easyrdf->add('doap:developer', $njh); - $easyrdf->add('foaf:maker', $njh); - - print $doap->serialise('rdfxml'); diff --git a/core/vendor/guzzle/common/Guzzle/Common/Collection.php b/core/vendor/guzzle/common/Guzzle/Common/Collection.php index d0857b2..b82df13 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/Collection.php +++ b/core/vendor/guzzle/common/Guzzle/Common/Collection.php @@ -355,36 +355,21 @@ public function set($key, $value) */ public function inject($input) { - $replace = array(); - foreach ($this->data as $key => $val) { - $replace['{' . $key . '}'] = $val; - } - - return strtr($input, $replace); + // Only perform the preg callback if needed + return strpos($input, '{') === false + ? $input + : preg_replace_callback('/{\s*([A-Za-z_\-\.0-9]+)\s*}/', array($this, 'getPregMatchValue'), $input); } /** - * Gets a value from the collection using an array path (e.g. foo/baz/bar would retrieve bar from two nested arrays) + * Return a collection value for a match array of a preg_replace function * - * @param string $path Path to traverse and retrieve a value from - * @param string $separator Character used to add depth to the search + * @param array $matches preg_replace* matches * - * @return mixed|null + * @return mixed */ - public function getPath($path, $separator = '/') + public function getPregMatchValue(array $matches) { - $parts = explode($separator, $path); - $data = &$this->data; - - // Using an iterative approach rather than recursion for speed - while (null !== ($part = array_shift($parts))) { - // Return null if this path doesn't exist or if there's more depth and the value is not an array - if (!isset($data[$part]) || ($parts && !is_array($data[$part]))) { - return null; - } - $data = &$data[$part]; - } - - return $data; + return $this->get($matches[1]); } } diff --git a/core/vendor/guzzle/common/Guzzle/Common/Exception/ExceptionCollection.php b/core/vendor/guzzle/common/Guzzle/Common/Exception/ExceptionCollection.php index 76d499e..52473e8 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/Exception/ExceptionCollection.php +++ b/core/vendor/guzzle/common/Guzzle/Common/Exception/ExceptionCollection.php @@ -13,20 +13,6 @@ class ExceptionCollection extends \Exception implements GuzzleException, \Iterat protected $exceptions = array(); /** - * Set all of the exceptions - * - * @param array $exceptions Array of exceptions - * - * @return self - */ - public function setExceptions(array $exceptions) - { - $this->exceptions = $exceptions; - - return $this; - } - - /** * Add exceptions to the collection * * @param ExceptionCollection|\Exception $e Exception to add @@ -69,14 +55,4 @@ public function getIterator() { return new \ArrayIterator($this->exceptions); } - - /** - * Get the first exception in the collection - * - * @return \Exception - */ - public function getFirst() - { - return $this->exceptions ? $this->exceptions[0] : null; - } } diff --git a/core/vendor/guzzle/common/Guzzle/Common/Version.php b/core/vendor/guzzle/common/Guzzle/Common/Version.php index 8fd9512..5383311 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/Version.php +++ b/core/vendor/guzzle/common/Guzzle/Common/Version.php @@ -7,5 +7,6 @@ */ class Version { - const VERSION = '3.1.0'; + const VERSION = '3.0.5'; } + diff --git a/core/vendor/guzzle/common/Guzzle/Common/composer.json b/core/vendor/guzzle/common/Guzzle/Common/composer.json index 5693c4d..62431cc 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/composer.json +++ b/core/vendor/guzzle/common/Guzzle/Common/composer.json @@ -11,10 +11,5 @@ "autoload": { "psr-0": { "Guzzle\\Common": "" } }, - "target-dir": "Guzzle/Common", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - } + "target-dir": "Guzzle/Common" } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Client.php b/core/vendor/guzzle/http/Guzzle/Http/Client.php index d38ae14..2bb814f 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Client.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Client.php @@ -75,7 +75,7 @@ public function __construct($baseUrl = '', $config = null) // Allow ssl.certificate_authority config setting to control the certificate authority used by curl $authority = $this->config->get(self::SSL_CERT_AUTHORITY); // Use the system's cacert if in a phar (curl can't read from a phar stream wrapper) - if (strpos(__FILE__, 'phar://') !== false && (null === $authority || $authority === true)) { + if (strpos(__FILE__, 'phar://') === false && $authority === true) { $authority = 'system'; } // Set the config setting to system to use the certificate authority bundle on your system @@ -362,13 +362,18 @@ public function send($requests) try { $curlMulti->send(); } catch (ExceptionCollection $e) { - throw $multipleRequests ? $e : $e->getFirst(); + throw $multipleRequests ? $e : $e->getIterator()->offsetGet(0); } if (!$multipleRequests) { return end($requests)->getResponse(); } else { - return array_map(function ($request) { return $request->getResponse(); }, $requests); + return array_map( + function ($request) { + return $request->getResponse(); + }, + $requests + ); } } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php index 53cfbfc..ffb704c 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php @@ -208,6 +208,7 @@ public static function factory(RequestInterface $request) // Apply the options to a new cURL handle. $handle = curl_init(); curl_setopt_array($handle, $curlOptions); + $request->getParams()->set('curl.last_options', $curlOptions); if ($tempContentLength) { $request->setHeader('Content-Length', $tempContentLength); diff --git a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMulti.php b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMulti.php index ceceb90..3744d7c 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMulti.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMulti.php @@ -3,7 +3,7 @@ namespace Guzzle\Http\Curl; use Guzzle\Common\AbstractHasDispatcher; -use Guzzle\Http\Exception\MultiTransferException; +use Guzzle\Common\Exception\ExceptionCollection; use Guzzle\Http\Exception\CurlException; use Guzzle\Http\Message\RequestInterface; @@ -126,7 +126,7 @@ public function __construct() class_exists('Guzzle\Http\Message\Response'); class_exists('Guzzle\Http\Exception\CurlException'); - $this->createMultiHandle(); + $this->createMutliHandle(); } /** @@ -246,7 +246,7 @@ public function reset($hard = false) } if ($hard) { - $this->createMultiHandle(); + $this->createMutliHandle(); } } @@ -257,11 +257,10 @@ public function send() { $this->scope++; $this->state = self::STATE_SENDING; - $requestsInScope = empty($this->requests[$this->scope]) ? array() : $this->requests[$this->scope]; // Only prepare and send requests that are in the current recursion scope // Only enter the main perform() loop if there are requests in scope - if ($requestsInScope) { + if (!empty($this->requests[$this->scope])) { // Any exceptions thrown from this event should break the entire flow of sending requests $this->dispatch(self::BEFORE_SEND, array( @@ -277,14 +276,20 @@ public function send() try { $this->perform(); } catch (\Exception $e) { - $this->exceptions[] = array('request' => null, 'exception' => $e); + $this->exceptions[] = $e; } } $this->scope--; - // Aggregate exceptions into a MultiTransferException if needed - $multiException = $this->buildMultiTransferException($requestsInScope); + // Aggregate exceptions into an ExceptionCollection + $exceptionCollection = null; + if (!empty($this->exceptions)) { + $exceptionCollection = new ExceptionCollection('Errors during multi transfer'); + while ($e = array_shift($this->exceptions)) { + $exceptionCollection->add($e); + } + } // Complete the transfer if this is not a nested scope if ($this->scope == -1) { @@ -294,8 +299,8 @@ public function send() } // Throw any exceptions that were encountered - if ($multiException) { - throw $multiException; + if ($exceptionCollection) { + throw $exceptionCollection; } } @@ -308,43 +313,6 @@ public function count() } /** - * Build a MultiTransferException if needed - * - * @param array $requestsInScope All requests in the previous scope - * - * @return MultiTransferException|null - */ - protected function buildMultiTransferException(array $requestsInScope) - { - if (empty($this->exceptions)) { - return null; - } - - // Keep a list of all requests, and remove errored requests from the list - $store = new \SplObjectStorage(); - foreach ($requestsInScope as $request) { - $store->attach($request); - } - - $multiException = new MultiTransferException('Errors during multi transfer'); - while ($e = array_shift($this->exceptions)) { - $multiException->add($e['exception']); - if (isset($e['request'])) { - $multiException->addFailedRequest($e['request']); - // Remove from the total list so that it becomes a list of successful requests - unset($store[$e['request']]); - } - } - - // Add successful requests - foreach ($store as $request) { - $multiException->addSuccessfulRequest($request); - } - - return $multiException; - } - - /** * Prepare for sending * * @param RequestInterface $request Request to prepare @@ -411,53 +379,43 @@ protected function perform() // Create the polling event external to the loop $event = array('curl_multi' => $this); - $active = $this->executeHandles(); while (1) { - $this->processMessages(); + $active = $this->executeHandles(); + + // Get messages from curl handles + while ($done = curl_multi_info_read($this->multiHandle)) { + $request = $this->resourceHash[(int) $done['handle']]; + $handle = $this->handles[$request]; + try { + $this->processResponse($request, $handle, $done); + } catch (\Exception $e) { + $this->removeErroredRequest($request, $e); + } + } + + // Notify each request as polling and handled queued responses + $scopedPolling = $this->scope <= 0 ? $this->all() : $this->requests[$this->scope]; // Exit the function if there are no more requests to send - if (!($scopedPolling = $this->scope <= 0 ? $this->all() : $this->requests[$this->scope])) { + if (empty($scopedPolling)) { break; } - // Notify each request as polling - $blocking = $total = 0; + // Notify all requests that requests are being polled foreach ($scopedPolling as $request) { $event['request'] = $request; $request->dispatch(self::POLLING_REQUEST, $event); - ++$total; - // The blocking variable just has to be non-falsey to block the loop - if ($request->getParams()->hasKey(self::BLOCKING)) { - ++$blocking; - } } - if ($blocking == $total) { - // Sleep to prevent eating CPU because no requests are actually pending a select call - usleep(500); - } else { + if ($active) { // Select the curl handles until there is any activity on any of the open file descriptors // See https://github.com/php/php-src/blob/master/ext/curl/multi.c#L170 - $active = $this->executeHandles(true, 0.02, $active); - } - } - } - - /** - * Process any received curl multi messages - */ - private function processMessages() - { - // Get messages from curl handles - while ($done = curl_multi_info_read($this->multiHandle)) { - try { - $request = $this->resourceHash[(int) $done['handle']]; - $handle = $this->handles[$request]; - $this->processResponse($request, $handle, $done); - } catch (\Exception $e) { - $this->removeErroredRequest($request, $e); + $active = $this->executeHandles(true, 0.1); + } else { + // Sleep to prevent eating CPU because no requests are actually pending a select call + usleep(500); } } } @@ -467,27 +425,29 @@ private function processMessages() * * @param bool $select Set to TRUE to select the file descriptors * @param int $timeout Select timeout in seconds - * @param int $active Previous active value * * @return int Returns the number of active handles */ - private function executeHandles($select = false, $timeout = 1, $active = 0) + private function executeHandles($select = false, $timeout = 1) { + $active = $selectResult = 0; + do { - // @codeCoverageIgnoreStart - if ($select && $active && curl_multi_select($this->multiHandle, $timeout) == -1) { - // Perform a usleep if a previously executed select returned -1 - // @see https://bugs.php.net/bug.php?id=61141 - usleep(125); + + if ($select) { + $selectResult = curl_multi_select($this->multiHandle, $timeout); + } + + if ($selectResult === 0) { + do { + $mrc = curl_multi_exec($this->multiHandle, $active); + } while ($mrc == CURLM_CALL_MULTI_PERFORM); + // Check the return value to ensure an error did not occur + $this->checkCurlResult($mrc); } - // @codeCoverageIgnoreEnd - do { - $mrc = curl_multi_exec($this->multiHandle, $active); - } while ($mrc == CURLM_CALL_MULTI_PERFORM); - // Check the return value to ensure an error did not occur - $this->checkCurlResult($mrc); + // Poll once if not selecting, or poll until there are no handles with activity - } while ($select && $active); + } while ($select && $active && $selectResult == 0); return $active; } @@ -500,7 +460,7 @@ private function executeHandles($select = false, $timeout = 1, $active = 0) */ protected function removeErroredRequest(RequestInterface $request, \Exception $e) { - $this->exceptions[] = array('request' => $request, 'exception' => $e); + $this->exceptions[] = $e; $this->remove($request); $request->setState(RequestInterface::STATE_ERROR); $this->dispatch(self::MULTI_EXCEPTION, array( @@ -530,7 +490,7 @@ protected function processResponse(RequestInterface $request, CurlHandle $handle $this->removeHandle($request); if (!$curlException) { - $request->setState(RequestInterface::STATE_COMPLETE, array('handle' => $handle)); + $request->setState(RequestInterface::STATE_COMPLETE); // Only remove the request if it wasn't resent as a result of the state change if ($request->getState() != RequestInterface::STATE_TRANSFER) { $this->remove($request); @@ -592,11 +552,11 @@ private function isCurlException(RequestInterface $request, CurlHandle $handle, } $handle->setErrorNo($curl['result']); - $e = new CurlException(sprintf('[curl] %s: %s [url] %s', - $handle->getErrorNo(), $handle->getError(), $handle->getUrl())); + $e = new CurlException(sprintf('[curl] %s: %s [url] %s [info] %s [debug] %s', + $handle->getErrorNo(), $handle->getError(), $handle->getUrl(), + var_export($handle->getInfo(), true), $handle->getStderr())); $e->setCurlHandle($handle) ->setRequest($request) - ->setCurlInfo($handle->getInfo()) ->setError($handle->getError(), $handle->getErrorNo()); return $e; @@ -612,17 +572,19 @@ private function isCurlException(RequestInterface $request, CurlHandle $handle, private function checkCurlResult($code) { if ($code != CURLM_OK && $code != CURLM_CALL_MULTI_PERFORM) { - throw new CurlException(isset($this->multiErrors[$code]) - ? "cURL error: {$code} ({$this->multiErrors[$code][0]}): cURL message: {$this->multiErrors[$code][1]}" - : 'Unexpected cURL error: ' . $code - ); + if (isset($this->multiErrors[$code])) { + $message = "cURL error: {$code} ({$this->multiErrors[$code][0]}): cURL message: {$this->multiErrors[$code][1]}"; + } else { + $message = 'Unexpected cURL error: ' . $code; + } + throw new CurlException($message); } } /** * Create the new cURL multi handle with error checking */ - private function createMultiHandle() + private function createMutliHandle() { if ($this->multiHandle && is_resource($this->multiHandle)) { curl_multi_close($this->multiHandle); diff --git a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMultiInterface.php b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMultiInterface.php index ff39a1a..17cd684 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMultiInterface.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlMultiInterface.php @@ -17,7 +17,6 @@ const ADD_REQUEST = 'curl_multi.add_request'; const REMOVE_REQUEST = 'curl_multi.remove_request'; const MULTI_EXCEPTION = 'curl_multi.exception'; - const BLOCKING = 'curl_multi.blocking'; const STATE_IDLE = 'idle'; const STATE_SENDING = 'sending'; diff --git a/core/vendor/guzzle/http/Guzzle/Http/Exception/CurlException.php b/core/vendor/guzzle/http/Guzzle/Http/Exception/CurlException.php index a6a744a..39a5468 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Exception/CurlException.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Exception/CurlException.php @@ -7,12 +7,11 @@ /** * cURL request exception */ -class CurlException extends RequestException +class CurlException extends BadResponseException { private $curlError; private $curlErrorNo; private $handle; - private $curlInfo = array(); /** * Set the cURL error message @@ -57,7 +56,7 @@ public function getCurlHandle() /** * Get the associated cURL error message * - * @return string|null + * @return string */ public function getError() { @@ -67,35 +66,10 @@ public function getError() /** * Get the associated cURL error number * - * @return int|null + * @return int */ public function getErrorNo() { return $this->curlErrorNo; } - - /** - * Returns curl information about the transfer - * - * @return array - */ - public function getCurlInfo() - { - return $this->curlInfo; - } - - /** - * Set curl transfer information - * - * @param array $info Array of curl transfer information - * - * @return self - * @link http://php.net/manual/en/function.curl-getinfo.php - */ - public function setCurlInfo(array $info) - { - $this->curlInfo = $info; - - return $this; - } } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Exception/MultiTransferException.php b/core/vendor/guzzle/http/Guzzle/Http/Exception/MultiTransferException.php deleted file mode 100644 index 27e4e58..0000000 --- a/core/vendor/guzzle/http/Guzzle/Http/Exception/MultiTransferException.php +++ /dev/null @@ -1,101 +0,0 @@ -successfulRequests, $this->failedRequests); - } - - /** - * Add to the array of successful requests - * - * @param RequestInterface $request Successful request - * - * @return self - */ - public function addSuccessfulRequest(RequestInterface $request) - { - $this->successfulRequests[] = $request; - - return $this; - } - - /** - * Add to the array of failed requests - * - * @param RequestInterface $request Failed request - * - * @return self - */ - public function addFailedRequest(RequestInterface $request) - { - $this->failedRequests[] = $request; - - return $this; - } - - /** - * Set all of the successful requests - * - * @param array Array of requests - * - * @return self - */ - public function setSuccessfulRequests(array $requests) - { - $this->successfulRequests = $requests; - - return $this; - } - - /** - * Set all of the failed requests - * - * @param array Array of requests - * - * @return self - */ - public function setFailedRequests(array $requests) - { - $this->failedRequests = $requests; - - return $this; - } - - /** - * Get an array of successful requests sent in the multi transfer - * - * @return array - */ - public function getSuccessfulRequests() - { - return $this->successfulRequests; - } - - /** - * Get an array of failed requests sent in the multi transfer - * - * @return array - */ - public function getFailedRequests() - { - return $this->failedRequests; - } -} diff --git a/core/vendor/guzzle/http/Guzzle/Http/IoEmittingEntityBody.php b/core/vendor/guzzle/http/Guzzle/Http/IoEmittingEntityBody.php deleted file mode 100644 index 15193c1..0000000 --- a/core/vendor/guzzle/http/Guzzle/Http/IoEmittingEntityBody.php +++ /dev/null @@ -1,100 +0,0 @@ -eventDispatcher = $eventDispatcher; - - return $this; - } - - /** - * {@inheritdoc} - */ - public function getEventDispatcher() - { - if (!$this->eventDispatcher) { - $this->eventDispatcher = new EventDispatcher(); - } - - return $this->eventDispatcher; - } - - /** - * {@inheritdoc} - */ - public function dispatch($eventName, array $context = array()) - { - $this->getEventDispatcher()->dispatch($eventName, new Event($context)); - } - - /** - * {@inheritdoc} - * @codeCoverageIgnore - */ - public function addSubscriber(EventSubscriberInterface $subscriber) - { - $this->getEventDispatcher()->addSubscriber($subscriber); - - return $this; - } - - /** - * {@inheritdoc} - */ - public function read($length) - { - $event = array( - 'body' => $this, - 'length' => $length, - 'read' => $this->body->read($length) - ); - $this->dispatch('body.read', $event); - - return $event['read']; - } - - /** - * {@inheritdoc} - */ - public function write($string) - { - $event = array( - 'body' => $this, - 'write' => $string, - 'result' => $this->body->write($string) - ); - $this->dispatch('body.write', $event); - - return $event['result']; - } -} diff --git a/core/vendor/guzzle/http/Guzzle/Http/Message/EntityEnclosingRequest.php b/core/vendor/guzzle/http/Guzzle/Http/Message/EntityEnclosingRequest.php index 46bd515..21019e4 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Message/EntityEnclosingRequest.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Message/EntityEnclosingRequest.php @@ -61,9 +61,9 @@ public function __toString() /** * {@inheritdoc} */ - public function setState($state, array $context = array()) + public function setState($state) { - parent::setState($state, $context); + parent::setState($state); if ($state == self::STATE_TRANSFER && !$this->body && !count($this->postFields) && !count($this->postFiles)) { $this->setHeader('Content-Length', 0)->removeHeader('Transfer-Encoding'); } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Message/Request.php b/core/vendor/guzzle/http/Guzzle/Http/Message/Request.php index a41b933..59b7b0d 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Message/Request.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Message/Request.php @@ -5,7 +5,6 @@ use Guzzle\Common\Event; use Guzzle\Common\Collection; use Guzzle\Common\Exception\RuntimeException; -use Guzzle\Common\Exception\InvalidArgumentException; use Guzzle\Http\Utils; use Guzzle\Http\Exception\RequestException; use Guzzle\Http\Exception\BadResponseException; @@ -457,13 +456,13 @@ public function getState() /** * {@inheritdoc} */ - public function setState($state, array $context = array()) + public function setState($state) { $this->state = $state; if ($this->state == self::STATE_NEW) { $this->response = null; } elseif ($this->state == self::STATE_COMPLETE) { - $this->processResponse($context); + $this->processResponse(); $this->responseBody = null; } @@ -543,18 +542,9 @@ public function setResponse(Response $response, $queued = false) /** * {@inheritdoc} */ - public function setResponseBody($body) + public function setResponseBody(EntityBodyInterface $body) { - // Attempt to open a file for writing if a string was passed - if (is_string($body)) { - // @codeCoverageIgnoreStart - if (!($body = fopen($body, 'w+'))) { - throw new InvalidArgumentException('Could not open ' . $body . ' for writing'); - } - // @codeCoverageIgnoreEnd - } - - $this->responseBody = EntityBody::factory($body); + $this->responseBody = $body; return $this; } @@ -725,11 +715,9 @@ protected function getEventArray() /** * Process a received response * - * @param array $context Contextual information - * * @throws BadResponseException on unsuccessful responses */ - protected function processResponse(array $context = array()) + protected function processResponse() { // Use the queued response if one is set if ($this->getParams()->get('queued_response')) { @@ -746,7 +734,7 @@ protected function processResponse(array $context = array()) $this->state = self::STATE_COMPLETE; // A request was sent, but we don't know if we'll send more or if the final response will be successful - $this->dispatch('request.sent', $this->getEventArray() + $context); + $this->dispatch('request.sent', $this->getEventArray()); // Some response processors will remove the response or reset the state (example: ExponentialBackoffPlugin) if ($this->state == RequestInterface::STATE_COMPLETE) { diff --git a/core/vendor/guzzle/http/Guzzle/Http/Message/RequestInterface.php b/core/vendor/guzzle/http/Guzzle/Http/Message/RequestInterface.php index 3928e4e..05bafc5 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Message/RequestInterface.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Message/RequestInterface.php @@ -233,12 +233,11 @@ public function getState(); /** * Set the state of the request * - * @param string $state State of the request (complete, sending, or new) - * @param array $context Contextual information about the state change + * @param string $state State of the request (complete, sending, or new) * * @return RequestInterface */ - public function setState($state, array $context = array()); + public function setState($state); /** * Get the cURL options that will be applied when the cURL handle is created @@ -262,11 +261,11 @@ public function receiveResponseHeader($data); * This method should be invoked when you need to send the response's entity body somewhere other than the normal * php://temp buffer. For example, you can send the entity body to a socket, file, or some other custom stream. * - * @param EntityBodyInterface|string|resource $body Response body object. Pass a string to attempt to store the - * response body in a local file. + * @param EntityBodyInterface $body Response body object + * * @return Request */ - public function setResponseBody($body); + public function setResponseBody(EntityBodyInterface $body); /** * Determine if the response body is repeatable (readable + seekable) diff --git a/core/vendor/guzzle/http/Guzzle/Http/composer.json b/core/vendor/guzzle/http/Guzzle/Http/composer.json index b824003..a55a855 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/composer.json +++ b/core/vendor/guzzle/http/Guzzle/Http/composer.json @@ -13,7 +13,6 @@ ], "require": { "php": ">=5.3.2", - "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", "guzzle/stream": "self.version" @@ -21,10 +20,5 @@ "autoload": { "psr-0": { "Guzzle\\Http": "" } }, - "target-dir": "Guzzle/Http", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - } + "target-dir": "Guzzle/Http" } diff --git a/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php b/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php index 00d2310..93ee40b 100644 --- a/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php +++ b/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php @@ -186,7 +186,7 @@ private function expandMatch(array $matches) if (empty($variable)) { $actuallyUseQueryString = false; - } elseif ($value['modifier'] == '*') { + } else if ($value['modifier'] == '*') { $expanded = implode($joiner, $kvp); if ($isAssoc) { // Don't prepend the value name when using the explode modifier with an associative array diff --git a/core/vendor/guzzle/parser/Guzzle/Parser/composer.json b/core/vendor/guzzle/parser/Guzzle/Parser/composer.json index 9c10342..898ff50 100644 --- a/core/vendor/guzzle/parser/Guzzle/Parser/composer.json +++ b/core/vendor/guzzle/parser/Guzzle/Parser/composer.json @@ -10,10 +10,5 @@ "autoload": { "psr-0": { "Guzzle\\Parser": "" } }, - "target-dir": "Guzzle/Parser", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - } + "target-dir": "Guzzle/Parser" } diff --git a/core/vendor/guzzle/stream/Guzzle/Stream/composer.json b/core/vendor/guzzle/stream/Guzzle/Stream/composer.json index 99edfe8..6c2cc38 100644 --- a/core/vendor/guzzle/stream/Guzzle/Stream/composer.json +++ b/core/vendor/guzzle/stream/Guzzle/Stream/composer.json @@ -18,10 +18,5 @@ "autoload": { "psr-0": { "Guzzle\\Stream": "" } }, - "target-dir": "Guzzle/Stream", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - } + "target-dir": "Guzzle/Stream" } diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf.php b/core/vendor/njh/easyrdf/lib/EasyRdf.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf.php rename to core/vendor/njh/easyrdf/lib/EasyRdf.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Exception.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Exception.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Exception.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Exception.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Format.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Format.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Format.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Format.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Graph.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Graph.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Graph.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Graph.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/GraphStore.php b/core/vendor/njh/easyrdf/lib/EasyRdf/GraphStore.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/GraphStore.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/GraphStore.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Http.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Http.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Client.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Http/Client.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Client.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Http/Client.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Http/Response.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Http/Response.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Boolean.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Boolean.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Boolean.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Boolean.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Date.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Date.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Date.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Date.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/DateTime.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/DateTime.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/DateTime.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/DateTime.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Decimal.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Decimal.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Decimal.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Decimal.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HTML.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/HTML.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HTML.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/HTML.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HexBinary.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/HexBinary.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HexBinary.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/HexBinary.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Integer.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Integer.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Integer.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/Integer.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/XML.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Literal/XML.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/XML.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Literal/XML.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Namespace.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Namespace.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/ParsedUri.php b/core/vendor/njh/easyrdf/lib/EasyRdf/ParsedUri.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/ParsedUri.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/ParsedUri.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Arc.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Arc.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Arc.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Arc.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Json.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Json.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Json.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Json.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Ntriples.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Ntriples.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Ntriples.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Ntriples.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rapper.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Rapper.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rapper.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Rapper.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfPhp.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/RdfPhp.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfPhp.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/RdfPhp.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/RdfXml.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/RdfXml.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rdfa.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Rdfa.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rdfa.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Rdfa.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Redland.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Redland.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Turtle.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Parser/Turtle.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Resource.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Resource.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Resource.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Resource.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Arc.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Arc.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Arc.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Arc.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Json.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Json.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Json.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Json.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Rapper.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Rapper.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Rapper.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Rapper.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Turtle.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Turtle.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Turtle.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Serialiser/Turtle.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Client.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Sparql/Client.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Client.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Sparql/Client.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Result.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Sparql/Result.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Result.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Sparql/Result.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/TypeMapper.php b/core/vendor/njh/easyrdf/lib/EasyRdf/TypeMapper.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/TypeMapper.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/TypeMapper.php diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Utils.php b/core/vendor/njh/easyrdf/lib/EasyRdf/Utils.php similarity index 100% rename from core/vendor/easyrdf/easyrdf/lib/EasyRdf/Utils.php rename to core/vendor/njh/easyrdf/lib/EasyRdf/Utils.php diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.gitignore b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.gitignore deleted file mode 100644 index c089b09..0000000 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -phpunit.xml -composer.lock -/vendor/ diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.travis.yml b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.travis.yml index 48403e9..8bae46c 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.travis.yml +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/.travis.yml @@ -1,9 +1,5 @@ language: php -php: - - 5.3 - - 5.4 - env: - SYMFONY_VERSION=2.1.* - SYMFONY_VERSION=dev-master diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainRouter.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainRouter.php index 0d09558..6160fc3 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainRouter.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainRouter.php @@ -135,7 +135,7 @@ public function match($url) { $methodNotAllowed = null; - /** @var $router RouterInterface */ + /** @var $router ChainedRouterInterface */ foreach ($this->all() as $router) { try { return $router->match($url); @@ -196,13 +196,13 @@ public function matchRequest(Request $request) */ public function generate($name, $parameters = array(), $absolute = false) { - /** @var $router RouterInterface */ + /** @var $router ChainedRouterInterface */ foreach ($this->all() as $router) { // if $name and $router does not implement ChainedRouterInterface and $name is not a string, continue // if $name and $router does not implement ChainedRouterInterface and $name is string but does not match a default Symfony2 route name, continue if ($name && !$router instanceof ChainedRouterInterface) { - if (!is_string($name) || !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name)) { + if (!is_string($name) || !preg_match('/^[a-z0-9A-Z_.]+$/', $name)) { continue; } } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainedRouterInterface.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainedRouterInterface.php index 0c6d192..a4247aa 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainedRouterInterface.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ChainedRouterInterface.php @@ -5,9 +5,21 @@ use Symfony\Component\Routing\RouterInterface; /** - * Interface to combine the VersatileGeneratorInterface with the RouterInterface + * Use this interface on custom routers that can handle non-string route + * "names". */ -interface ChainedRouterInterface extends RouterInterface, VersatileGeneratorInterface +interface ChainedRouterInterface extends RouterInterface { - // nothing new to add + /** + * Whether the router supports the thing in $name to generate a route. + * + * This check does not need to look if the specific instance can be + * resolved to a route, only whether the router can generate routes from + * objects of this class. + + * @param mixed $name The route name or route object + * + * @return bool + */ + public function supports($name); } \ No newline at end of file diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/DynamicRouter.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/DynamicRouter.php index 2a1b936..44407e0 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/DynamicRouter.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/DynamicRouter.php @@ -18,7 +18,7 @@ * A flexible router accepting matcher and generator through injection and * using the RouteEnhancer concept to generate additional data on the routes. * - * @author Larry Garfield + * @author Crell * @author David Buchmann */ class DynamicRouter implements RouterInterface, RequestMatcherInterface, ChainedRouterInterface @@ -130,18 +130,14 @@ public function generate($name, $parameters = array(), $absolute = false) } /** - * Delegate to our generator + * Support any string as route name * * {@inheritDoc} */ public function supports($name) { - if ($this->generator instanceof VersatileGeneratorInterface) { - - return $this->generator->supports($name); - } - - return (!is_string($name) || !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name)); + // TODO: check $this->generator instanceof VersatileGeneratorInterface + return $this->generator->supports($name); } /** diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/ConfigurableUrlMatcher.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/ConfigurableUrlMatcher.php index 40b7711..e1e17b5 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/ConfigurableUrlMatcher.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/ConfigurableUrlMatcher.php @@ -36,19 +36,17 @@ public function finalMatch(RouteCollection $collection, Request $request) $attributes = $matcher->match($request->getPathInfo()); // cleanup route attributes - if (! isset($attributes[RouteObjectInterface::ROUTE_OBJECT]) - || ! $attributes[RouteObjectInterface::ROUTE_OBJECT] instanceof Route - ) { - $name = $attributes['_route']; // this is the field coming from symfony core - $route = $collection->get($name); - $attributes[RouteObjectInterface::ROUTE_OBJECT] = $route; + if (! isset($attributes['_route']) || ! $attributes['_route'] instanceof Route) { + $name = $attributes['_route']; + $route = $collection->get($attributes['_route']); + $attributes['_route'] = $route; if ($route instanceof RouteObjectInterface && is_string($route->getRouteKey())) { $name = $route->getRouteKey(); } - if (is_string($name)) { - $attributes[RouteObjectInterface::ROUTE_NAME] = $name; + if (empty($attributes['_route_name']) && is_string($name)) { + $attributes['_route_name'] = $name; } } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/UrlMatcher.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/UrlMatcher.php index aac6fe7..09bb2c4 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/UrlMatcher.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/UrlMatcher.php @@ -39,8 +39,8 @@ protected function getAttributes(Route $route, $name, array $attributes) if ($route instanceof RouteObjectInterface && is_string($route->getRouteKey())) { $name = $route->getRouteKey(); } - $attributes[RouteObjectInterface::ROUTE_NAME] = $name; - $attributes[RouteObjectInterface::ROUTE_OBJECT] = $route; + $attributes['_route_name'] = $name; + $attributes['_route'] = $route; return $this->mergeDefaults($attributes, $route->getDefaults()); } } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ProviderBasedGenerator.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ProviderBasedGenerator.php index 9607135..1c353f8 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ProviderBasedGenerator.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/ProviderBasedGenerator.php @@ -16,7 +16,7 @@ * * @author Larry Garfield */ -class ProviderBasedGenerator extends UrlGenerator implements VersatileGeneratorInterface +class ProviderBasedGenerator extends UrlGenerator { /** * The route provider for this generator. @@ -46,13 +46,13 @@ public function generate($name, $parameters = array(), $absolute = false) $compiledRoute = $route->compile(); // handle symfony 2.1 and 2.2 - // getHostTokens exists only since 2.2 - $hostTokens = null; - if (method_exists($compiledRoute, 'getHostTokens')) { - $hostTokens = $compiledRoute->getHostTokens(); + // getHostnameTokens exists only since 2.2 + $hostnameTokens = null; + if (method_exists($compiledRoute, 'getHostnameTokens')) { + $hostnameTokens = $compiledRoute->getHostnameTokens(); } - return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostTokens); + return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostnameTokens); } /** diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/RouteObjectInterface.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/RouteObjectInterface.php index cd455e1..496e3cc 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/RouteObjectInterface.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/RouteObjectInterface.php @@ -17,16 +17,6 @@ interface RouteObjectInterface { /** - * Field name that will hold the route name that was matched. - */ - const ROUTE_NAME = '_route'; - - /** - * Field name of the route object that was matched. - */ - const ROUTE_OBJECT = '_route_object'; - - /** * Constant for the field that is given to the ControllerAliasMapper. * The value must be configured in the controllers_by_alias mapping. * diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Enhancer/RouteContentEnhancerTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Enhancer/RouteContentEnhancerTest.php index f097e85..df9008a 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Enhancer/RouteContentEnhancerTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Enhancer/RouteContentEnhancerTest.php @@ -5,7 +5,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer; -use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase; @@ -23,7 +22,7 @@ public function setUp() $this->document = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Enhancer\\RouteObject', array('getRouteContent', 'getRouteDefaults', 'getUrl')); - $this->mapper = new RouteContentEnhancer(RouteObjectInterface::ROUTE_OBJECT, '_content'); + $this->mapper = new RouteContentEnhancer('_route', '_content'); $this->request = Request::create('/test'); } @@ -35,8 +34,8 @@ public function testContent() ->method('getRouteContent') ->will($this->returnValue($targetDocument)); - $defaults = array(RouteObjectInterface::ROUTE_OBJECT => $this->document); - $expected = array(RouteObjectInterface::ROUTE_OBJECT => $this->document, '_content' => $targetDocument); + $defaults = array('_route' => $this->document); + $expected = array('_route' => $this->document, '_content' => $targetDocument); $this->assertEquals($expected, $this->mapper->enhance($defaults, $this->request)); } @@ -48,7 +47,7 @@ public function testFieldAlreadyThere() ->method('getRouteContent') ; - $defaults = array(RouteObjectInterface::ROUTE_OBJECT => $this->document, '_content' => 'foo'); + $defaults = array('_route' => $this->document, '_content' => 'foo'); $this->assertEquals($defaults, $this->mapper->enhance($defaults, $this->request)); } @@ -59,13 +58,13 @@ public function testNoContent() ->method('getRouteContent') ->will($this->returnValue(null)); - $defaults = array(RouteObjectInterface::ROUTE_OBJECT => $this->document); + $defaults = array('_route' => $this->document); $this->assertEquals($defaults, $this->mapper->enhance($defaults, $this->request)); } public function testNoCmfRoute() { - $defaults = array(RouteObjectInterface::ROUTE_OBJECT => $this->buildMock('Symfony\\Component\\Routing\\Route')); + $defaults = array('_route' => $this->buildMock('Symfony\\Component\\Routing\\Route')); $this->assertEquals($defaults, $this->mapper->enhance($defaults, $this->request)); } } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php index 1d672ad..18bcae7 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php @@ -51,12 +51,7 @@ public function testMatch() ->method('getDefaults') ->will($this->returnValue(array('foo' => 'bar'))) ; - $this->routeDocument->expects($this->any()) - ->method('getRouteKey') - ->will($this->returnValue('/routes/company/more')) - ; - // add some other routes to the collection $mockCompiled = $this->buildMock('Symfony\\Component\\Routing\\CompiledRoute'); $mockCompiled->expects($this->any()) ->method('getStaticPrefix') @@ -67,7 +62,6 @@ public function testMatch() ->method('compile') ->will($this->returnValue($mockCompiled)) ; - $routeCollection = new RouteCollection(); $routeCollection->add('some', $mockRoute); $routeCollection->add('_company_more', $this->routeDocument); @@ -75,10 +69,9 @@ public function testMatch() $results = $this->matcher->finalMatch($routeCollection, $this->request); - // the matched route returns a key $expected = array( - RouteObjectInterface::ROUTE_NAME => '/routes/company/more', - RouteObjectInterface::ROUTE_OBJECT => $this->routeDocument, + '_route_name' => '_company_more', + '_route' => $this->routeDocument, 'foo' => 'bar', ); @@ -125,10 +118,9 @@ public function testMatchNoRouteObject() $results = $this->matcher->finalMatch($routeCollection, $this->request); - // the matched route does not return a key $expected = array( - RouteObjectInterface::ROUTE_NAME => '_company_more', - RouteObjectInterface::ROUTE_OBJECT => $this->routeDocument, + '_route_name' => '_company_more', + '_route' => $this->routeDocument, 'foo' => 'bar', ); diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/UrlMatcherTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/UrlMatcherTest.php index 66e99d1..08a1dec 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/UrlMatcherTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/UrlMatcherTest.php @@ -89,8 +89,8 @@ public function doTestMatchRouteKey($routeKey) $results = $this->matcher->finalMatch($routeCollection, $this->request); $expected = array( - RouteObjectInterface::ROUTE_NAME => ($routeKey) ? $routeKey : '_company_more', - RouteObjectInterface::ROUTE_OBJECT => $this->routeDocument, + '_route_name' => ($routeKey) ? $routeKey : '_company_more', + '_route' => $this->routeDocument, 'foo' => 'bar', ); @@ -138,8 +138,8 @@ public function testMatchNoRouteObject() $results = $this->matcher->finalMatch($routeCollection, $this->request); $expected = array( - RouteObjectInterface::ROUTE_NAME => '_company_more', - RouteObjectInterface::ROUTE_OBJECT => $this->routeDocument, + '_route_name' => '_company_more', + '_route' => $this->routeDocument, 'foo' => 'bar', ); diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ContentAwareGeneratorTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ContentAwareGeneratorTest.php index f597854..6ddf3c7 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ContentAwareGeneratorTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ContentAwareGeneratorTest.php @@ -278,7 +278,7 @@ public function testSupports() */ class TestableContentAwareGenerator extends ContentAwareGenerator { - protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostTokens = null) + protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostnameTokens = null) { return 'result_url'; } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/DynamicRouterTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/DynamicRouterTest.php index 6055697..af790a8 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/DynamicRouterTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/DynamicRouterTest.php @@ -29,7 +29,7 @@ public function setUp() $this->routeDocument = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults')); $this->matcher = $this->buildMock('Symfony\\Component\\Routing\\Matcher\\UrlMatcherInterface'); - $this->generator = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\VersatileGeneratorInterface', array('supports', 'generate', 'setContext', 'getContext')); + $this->generator = $this->buildMock('Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface', array('supports', 'generate', 'setContext', 'getContext')); $this->enhancer = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Enhancer\\RouteEnhancerInterface', array('enhance')); $this->context = $this->buildMock('Symfony\\Component\\Routing\\RequestContext'); diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ProviderBasedGeneratorTest.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ProviderBasedGeneratorTest.php index 8f0861c..509232d 100644 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ProviderBasedGeneratorTest.php +++ b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/Routing/ProviderBasedGeneratorTest.php @@ -87,7 +87,7 @@ public function testSupports() */ class TestableProviderBasedGenerator extends ProviderBasedGenerator { - protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostTokens = null) + protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostnameTokens = null) { return 'result_url'; } diff --git a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/VersatileGeneratorInterface.php b/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/VersatileGeneratorInterface.php deleted file mode 100644 index 9895cf0..0000000 --- a/core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/VersatileGeneratorInterface.php +++ /dev/null @@ -1,32 +0,0 @@ -