diff --git a/core/modules/contextual/contextual.api.php b/core/modules/contextual/contextual.api.php index d972045..428c514 100644 --- a/core/modules/contextual/contextual.api.php +++ b/core/modules/contextual/contextual.api.php @@ -18,9 +18,9 @@ * is passed in by reference. Further links may be added or existing links can * be altered. * - * @param $element + * @param array $element * A renderable array representing the contextual links. - * @param $items + * @param array $items * An associative array containing the original contextual link items, as * generated by * \Drupal\Core\Menu\ContextualLinkManagerInterface::getContextualLinksArrayByGroup(), diff --git a/core/modules/contextual/css/contextual.icons.css b/core/modules/contextual/css/contextual.icons.css index 2a755ca..7b2bd6e 100644 --- a/core/modules/contextual/css/contextual.icons.css +++ b/core/modules/contextual/css/contextual.icons.css @@ -34,8 +34,8 @@ /* Override the .focusable height: auto */ width: 28px !important; text-indent: -9999px; - } + .no-svg .contextual .trigger { background-image: url("../../../misc/icons/bebebe/pencil.png"); } diff --git a/core/modules/contextual/css/contextual.toolbar.css b/core/modules/contextual/css/contextual.toolbar.css index dd06c75..b9023bd 100644 --- a/core/modules/contextual/css/contextual.toolbar.css +++ b/core/modules/contextual/css/contextual.toolbar.css @@ -20,10 +20,10 @@ padding-right: 1.3333em; } .toolbar .toolbar-bar .contextual-toolbar-tab .toolbar-item.active { - background-image:-moz-linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%); - background-image:-webkit-gradient(linear,color-stop(0, rgb(78,159,234)),color-stop(1, rgb(69,132,221))); + background-image: -moz-linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%); + background-image: -webkit-gradient(linear,color-stop(0, rgb(78,159,234)),color-stop(1, rgb(69,132,221))); background-image: -webkit-linear-gradient(top, rgb(78,159,234) 0%, rgb(69,132,221) 100%); - background-image:linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%); + background-image: linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%); } /* @todo get rid of this declaration by making toolbar.module's CSS less specific */ diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php index 21ff324..aedeb95 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php +++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php @@ -116,8 +116,8 @@ public function render(ResultRow $values) { array(), array( 'contextual-views-field-links' => drupal_encode_path(Json::encode($links)), - ) - ) + ), + ), ); $element = array( @@ -131,6 +131,6 @@ public function render(ResultRow $values) { } } - public function query() { } + public function query() {} } diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php index 4e1e6d0..28fba22 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php +++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php @@ -31,13 +31,17 @@ public static function getInfo() { ); } - function setUp() { + public function setUp() { parent::setUp(); $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page')); $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); - $this->editor_user = $this->drupalCreateUser(array('access content', 'access contextual links', 'edit any article content')); + $this->editor_user = $this->drupalCreateUser(array( + 'access content', + 'access contextual links', + 'edit any article content', + )); $this->authenticated_user = $this->drupalCreateUser(array('access content', 'access contextual links')); $this->anonymous_user = $this->drupalCreateUser(array('access content')); } @@ -48,7 +52,7 @@ function setUp() { * Ensures that contextual link placeholders always exist, even if the user is * not allowed to use contextual links. */ - function testDifferentPermissions() { + public function testDifferentPermissions() { $this->drupalLogin($this->editor_user); // Create three nodes in the following order: @@ -126,7 +130,7 @@ protected function assertContextualLinkPlaceHolder($id) { } /** - * Asserts that a contextual link placeholder with the given id does not exist. + * Asserts that a contextual link placeholder with given id does not exist. * * @param string $id * A contextual link id. diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php index fcb3a03..86c8013 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php +++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php @@ -30,9 +30,9 @@ public static function getInfo() { } /** - * Provides testcases for testContextualLinksToId() and + * Provides testcases for testContextualLinksToId() and. */ - function _contextual_links_id_testcases() { + public function runContextualLinksIdTestcases() { // Test branch conditions: // - one group. // - one dynamic path argument. @@ -43,7 +43,7 @@ function _contextual_links_id_testcases() { 'route_parameters' => array( 'node' => '14031991', ), - 'metadata' => array() + 'metadata' => array(), ), ), 'id' => 'node:node=14031991:', @@ -56,10 +56,10 @@ function _contextual_links_id_testcases() { $tests[] = array( 'links' => array( 'foo' => array( - 'route_parameters'=> array( - 'bar', + 'route_parameters' => array( + 0 => 'bar', 'key' => 'baz', - 'qux', + 1 => 'qux', ), 'metadata' => array(), ), @@ -75,7 +75,7 @@ function _contextual_links_id_testcases() { 'links' => array( 'views_ui_edit' => array( 'route_parameters' => array( - 'view' => 'frontpage' + 'view' => 'frontpage', ), 'metadata' => array( 'location' => 'page', @@ -99,9 +99,9 @@ function _contextual_links_id_testcases() { ), 'foo' => array( 'route_parameters' => array( - 'bar', + 0 => 'bar', 'key' => 'baz', - 'qux', + 1 => 'qux', ), 'metadata' => array(), ), @@ -119,8 +119,8 @@ function _contextual_links_id_testcases() { /** * Tests _contextual_links_to_id(). */ - function testContextualLinksToId() { - $tests = $this->_contextual_links_id_testcases(); + public function testContextualLinksToId() { + $tests = $this->runContextualLinksIdTestcases(); foreach ($tests as $test) { $this->assertIdentical(_contextual_links_to_id($test['links']), $test['id']); } @@ -129,8 +129,8 @@ function testContextualLinksToId() { /** * Tests _contextual_id_to_links(). */ - function testContextualIdToLinks() { - $tests = $this->_contextual_links_id_testcases(); + public function testContextualIdToLinks() { + $tests = $this->runContextualLinksIdTestcases(); foreach ($tests as $test) { $this->assertIdentical(_contextual_id_to_links($test['id']), $test['links']); }