From f2ac8adac099d7ca67ddad3b7c922f67794ffe43 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Thu, 22 Jan 2015 11:37:15 -0500 Subject: [PATCH 1/4] Improve examples for make command. Follow up to #660. --- commands/make/make.drush.inc | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/commands/make/make.drush.inc b/commands/make/make.drush.inc index 72e9feead3..4a565085b8 100644 --- a/commands/make/make.drush.inc +++ b/commands/make/make.drush.inc @@ -37,6 +37,8 @@ function make_drush_command() { 'drush make example.make example' => 'Build the example.make makefile in the example directory.', 'drush make --no-core --contrib-destination=. installprofile.make' => 'Build an installation profile within an existing Drupal site', 'drush make http://example.com/example.make example' => 'Build the remote example.make makefile in the example directory.', + 'drush make example.make --no-build --lock=example.lock' => 'Write a new makefile to example.lock. All project versions will be resolved.', + 'drush make example.make --no-build --lock-update=example.make' => 'Write a new makefile to example.make. All project versions will be updated.', ), 'options' => array( 'version' => 'Print the make API version and exit.', @@ -71,33 +73,25 @@ function make_drush_command() { 'download-mechanism' => 'How to download files. Should be autodetected, but this is an override if it doesn\'t work. Options are "curl" and "make" (a native download method).', 'projects' => array( 'description' => 'Restrict the make to this comma-separated list of projects. To specify all projects, pass *.', - 'example' => 'views,ctools', + 'example-value' => 'views,ctools', ), 'libraries' => array( 'description' => 'Restrict the make to this comma-separated list of libraries. To specify all libraries, pass *.', - 'example' => 'tinymce', + 'example-value' => 'tinymce', ), 'allow-override' => array( - 'description' => 'Restrict the make options to this comma-separated list of options.', - 'example' => 'all or none or working-copy or no-core, working-copy', + 'description' => 'Restrict the make options to a comma-separated list. Defaults to unrestricted.', ), 'lock' => array( - 'description' => 'Generate a makefile, based on the one passed in, with all versions resolved. Defaults to printing to the terminal, but an output file may be provided.', - 'examples' => array( - 'drush make example.make example --lock=example.lock' => 'Write the compiled version of example.make to example.lock.', - ), + 'description' => 'Generate a makefile, based on the one passed in, with all versions *resolved*. Defaults to printing to the terminal, but an output file may be provided.', + 'example-value' => 'example.make.lock', ), 'lock-update' => array( - 'description' => 'Generate an updated makefile, based on the one passed in, with all versions updated. Defaults to printing to the terminal, but an output file may be provided.', - 'examples' => array( - 'drush make example.make example --lock-update=example.lock' => 'Write the updated version of example.make to example.lock.', - ), + 'description' => 'Generate an updated makefile, based on the one passed in, with all versions *updated*. Defaults to printing to the terminal, but an output file may be provided.', + 'example-value' => 'example.make', ), 'shallow-clone' => array( 'description' => 'For makefile entries which use git for downloading, this option will utilize shallow clones where possible (ie. by using the git-clone\'s depth=1 option). If the "working-copy" option is not desired, this option will significantly speed up makes which involve modules stored in very large git repos. In fact, if "working-copy" option is enabled, this option cannot be used.', - 'examples' => array( - 'drush make example.make example --shallow-clone', - ), ), ), 'engines' => array('release_info'), From 5298b29d8ccb231e844a072e4f11dc03c461a678 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Fri, 23 Jan 2015 13:25:36 +0000 Subject: [PATCH 2/4] Remove DRUPAL_BOOTSTRAP_PAGE_CACHE from Drupal 8 bootstrap --- lib/Drush/Boot/bootstrap.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/Drush/Boot/bootstrap.inc b/lib/Drush/Boot/bootstrap.inc index 170cf9333f..956c753672 100644 --- a/lib/Drush/Boot/bootstrap.inc +++ b/lib/Drush/Boot/bootstrap.inc @@ -811,11 +811,6 @@ function drupal8_bootstrap($phase = NULL) { case DRUPAL_BOOTSTRAP_KERNEL: $kernel->boot(); - break; - - case DRUPAL_BOOTSTRAP_PAGE_CACHE: - $kernel->handlePageCache($request); - break; case DRUPAL_BOOTSTRAP_CODE: case DRUPAL_BOOTSTRAP_FULL: From 8b8526ee6b5a061097f777f39638a104ac54f4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Ara=C3=B1a=20Cruz?= Date: Fri, 23 Jan 2015 17:39:00 +0000 Subject: [PATCH 3/4] Fix error message. --- commands/make/make.drush.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/make/make.drush.inc b/commands/make/make.drush.inc index 4a565085b8..114cf93700 100644 --- a/commands/make/make.drush.inc +++ b/commands/make/make.drush.inc @@ -201,7 +201,7 @@ function drush_make($makefile = NULL, $build_path = NULL) { } if (drush_get_option('shallow-clone', FALSE) && drush_get_option('working-copy', FALSE)) { - drush_set_error('MAKE_SHALLOW_CLONE_WORKING_COPY_CONFLICT', dt('You cannot use "--shallow-copy" and "--working-copy" options together.')); + drush_set_error('MAKE_SHALLOW_CLONE_WORKING_COPY_CONFLICT', dt('You cannot use "--shallow-clone" and "--working-copy" options together.')); return FALSE; } From 43c9f7d1e8a9a2f4740596c96c9e82141a1334c5 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 23 Jan 2015 13:02:20 -0500 Subject: [PATCH 4/4] Drupal 8 changed to logo.svg so use other file in imageTest. --- tests/imageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/imageTest.php b/tests/imageTest.php index 912eb4d6af..3f54acec6e 100644 --- a/tests/imageTest.php +++ b/tests/imageTest.php @@ -20,7 +20,7 @@ function testImage() { 'root' => $this->webroot(), 'uri' => key($sites), ); - $logo = UNISH_DRUPAL_MAJOR_VERSION >= 8 ? 'core/themes/bartik/logo.png' : 'themes/bartik/logo.png'; + $logo = UNISH_DRUPAL_MAJOR_VERSION >= 8 ? 'core/themes/bartik/screenshot.png' : 'themes/bartik/screenshot.png'; $styles_dir = $options['root'] . '/sites/' . key($sites) . '/files/styles/'; $thumbnail = $styles_dir . 'thumbnail/public/' . $logo; $medium = $styles_dir . 'medium/public/' . $logo;