Hello community, here is the log from the commit of package drush for openSUSE:Factory checked in at 2019-07-15 22:43:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drush (Old) and /work/SRC/openSUSE:Factory/.drush.new.1887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drush" Mon Jul 15 22:43:59 2019 rev:12 rq:714515 version:8.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drush/drush.changes 2019-03-27 16:21:49.535524486 +0100 +++ /work/SRC/openSUSE:Factory/.drush.new.1887/drush.changes 2019-07-15 22:44:02.243901982 +0200 @@ -1,0 +2,13 @@ +Wed Jul 10 19:36:17 UTC 2019 - [email protected] + +- Update to version 8.3.0: + * Prep for 8.3.0 + * Support wildcard aliases for Drush 8 (#4109) + * Fix 8.x build (#4110) + * Convert Drush Make to Composer more accurately (#4082) + * Back to dev + * Prep for 8.2.3 + * No timeout by default in DrushTT. (#4029) + * Back to dev + +------------------------------------------------------------------- Old: ---- drush-8.2.2.tar.xz New: ---- drush-8.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drush.spec ++++++ --- /var/tmp/diff_new_pack.ujgNqs/_old 2019-07-15 22:44:02.907901824 +0200 +++ /var/tmp/diff_new_pack.ujgNqs/_new 2019-07-15 22:44:02.915901822 +0200 @@ -17,7 +17,7 @@ Name: drush -Version: 8.2.2 +Version: 8.3.0 Release: 0 Summary: Command line shell and scripting interface for Drupal # See licenses.txt for dependency licenses. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ujgNqs/_old 2019-07-15 22:44:02.943901815 +0200 +++ /var/tmp/diff_new_pack.ujgNqs/_new 2019-07-15 22:44:02.943901815 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">refs/tags/8.2.2</param> + <param name="revision">refs/tags/8.3.0</param> <param name="url">git://github.com/drush-ops/drush.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ujgNqs/_old 2019-07-15 22:44:02.959901812 +0200 +++ /var/tmp/diff_new_pack.ujgNqs/_new 2019-07-15 22:44:02.959901812 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/drush-ops/drush.git</param> - <param name="changesrevision">96622a19d7cabcdee0b08367eb529fed42e5fd0f</param> + <param name="changesrevision">59454e59b1139d3c0264504e42359397d828d459</param> </service> </servicedata> ++++++ drush-8.2.2.tar.xz -> drush-8.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/.travis.yml new/drush-8.3.0/.travis.yml --- old/drush-8.2.2/.travis.yml 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/.travis.yml 2019-07-09 23:53:08.000000000 +0200 @@ -9,6 +9,9 @@ - /^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+.*$/ language: php +services: + - mysql + # Cache Composer & Unish directories. cache: directories: @@ -29,15 +32,15 @@ include: # D8.7.x - php: 7.0 - env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=7.0-alpha1' + env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=7.3' # D8.6.x - php: 7.0 - env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=6.12' + env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=6.17' # D8.5.x - php: 7.0 - env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=5.13' + env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=5.15' # D8.4.x - php: 7.0 @@ -45,7 +48,7 @@ # D8.3.x - php: 7.0 - env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=3.7 PHPUNIT_ARGS=--group=commands' + env: 'UNISH_DRUPAL_MAJOR_VERSION=8 UNISH_DRUPAL_MINOR_VERSION=3.9 PHPUNIT_ARGS=--group=commands' # D8.2.x - php: 7.0 @@ -64,7 +67,7 @@ env: 'UNISH_DRUPAL_MAJOR_VERSION=6' # D6 - - php: 5.4 + - php: 5.6 env: 'UNISH_DRUPAL_MAJOR_VERSION=6' before_install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/commands/make/make.download.inc new/drush-8.3.0/commands/make/make.download.inc --- old/drush-8.2.2/commands/make/make.download.inc 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/commands/make/make.download.inc 2019-07-09 23:53:08.000000000 +0200 @@ -252,8 +252,8 @@ $tmp_path = make_tmp(); $wc = _get_working_copy_option($download); $checkout_after_clone = TRUE; - // If no download URL specified, assume anonymous clone from git.drupal.org. - $download['url'] = isset($download['url']) ? $download['url'] : "https://git.drupal.org/project/$name.git";; + // If no download URL specified, assume anonymous clone from git.drupalcode.org. + $download['url'] = isset($download['url']) ? $download['url'] : "https://git.drupalcode.org/project/$name.git";; // If no working-copy download URL specified, assume it is the same. $download['wc_url'] = isset($download['wc_url']) ? $download['wc_url'] : $download['url']; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/commands/pm/package_handler/git_drupalorg.inc new/drush-8.3.0/commands/pm/package_handler/git_drupalorg.inc --- old/drush-8.2.2/commands/pm/package_handler/git_drupalorg.inc 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/commands/pm/package_handler/git_drupalorg.inc 2019-07-09 23:53:08.000000000 +0200 @@ -48,11 +48,11 @@ */ function package_handler_download_project(&$request, $release) { if ($username = drush_get_option('gitusername')) { - // Uses SSH, which enables pushing changes back to git.drupal.org. - $repository = '[email protected]:project/' . $request['name'] . '.git'; + // Uses SSH, which enables pushing changes back to git.drupalcode.org. + $repository = '[email protected]:project/' . $request['name'] . '.git'; } else { - $repository = 'https://git.drupal.org/project/' . $request['name'] . '.git'; + $repository = 'https://git.drupalcode.org/project/' . $request['name'] . '.git'; } $request['repository'] = $repository; $tag = $release['tag']; @@ -99,13 +99,13 @@ $command .= ' ' . drush_escapeshellarg($repository); $command .= ' ' . drush_escapeshellarg($clone_path); if (!drush_shell_exec($command)) { - return drush_set_error('DRUSH_PM_GIT_CHECKOUT_PROBLEMS', dt('Unable to clone project !name from git.drupal.org.', array('!name' => $request['name']))); + return drush_set_error('DRUSH_PM_GIT_CHECKOUT_PROBLEMS', dt('Unable to clone project !name from git.drupalcode.org.', array('!name' => $request['name']))); } // Check if the 'tag' from the release feed is a tag or a branch. // If the tag exists, git will return it if (!drush_shell_cd_and_exec($clone_path, 'git tag -l ' . drush_escapeshellarg($tag))) { - return drush_set_error('DRUSH_PM_GIT_CHECKOUT_PROBLEMS', dt('Unable to clone project !name from git.drupal.org.', array('!name' => $request['name']))); + return drush_set_error('DRUSH_PM_GIT_CHECKOUT_PROBLEMS', dt('Unable to clone project !name from git.drupalcode.org.', array('!name' => $request['name']))); } $output = drush_shell_exec_output(); @@ -115,14 +115,14 @@ $command = 'git checkout ' . drush_get_option('gitcheckoutparams'); $command .= ' ' . drush_escapeshellarg($tag); if (!drush_shell_cd_and_exec($clone_path, $command)) { - return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupal.org.'); + return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupalcode.org.'); } } else { // Else, we want to checkout a branch. // First check if we are not already in the correct branch. if (!drush_shell_cd_and_exec($clone_path, 'git symbolic-ref HEAD')) { - return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupal.org.'); + return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupalcode.org.'); } $output = drush_shell_exec_output(); $current_branch = preg_replace('@^refs/heads/@', '', $output[0]); @@ -133,7 +133,7 @@ $command .= ' ' . drush_get_option('gitcheckoutparams'); $command .= ' --track ' . drush_escapeshellarg('origin/' . $tag) . ' -b ' . drush_escapeshellarg($tag); if (!drush_shell_cd_and_exec($clone_path, $command)) { - return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupal.org.'); + return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to retrieve ' . $request['name'] . ' from git.drupalcode.org.'); } } } @@ -169,7 +169,7 @@ } if (!drush_shell_cd_and_exec($request['full_project_path'], implode(' ', $commands))) { - return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to update ' . $request['name'] . ' from git.drupal.org.'); + return drush_set_error('DRUSH_PM_UNABLE_CHECKOUT', 'Unable to update ' . $request['name'] . ' from git.drupalcode.org.'); } return TRUE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/commands/pm/pm.drush.inc new/drush-8.3.0/commands/pm/pm.drush.inc --- old/drush-8.2.2/commands/pm/pm.drush.inc 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/commands/pm/pm.drush.inc 2019-07-09 23:53:08.000000000 +0200 @@ -1760,9 +1760,9 @@ ), ), 'git_drupalorg' => array( - 'description' => 'Use git.drupal.org to checkout and update projects.', + 'description' => 'Use git.drupalcode.org to checkout and update projects.', 'options' => array( - 'gitusername' => 'Your git username as shown on user/[uid]/edit/git. Typically, this is set this in drushrc.php. Omitting this prevents users from pushing changes back to git.drupal.org.', + 'gitusername' => 'Your git username as shown on user/[uid]/edit/git. Typically, this is set this in drushrc.php. Omitting this prevents users from pushing changes back to git.drupalcode.org.', 'gitsubmodule' => 'Use git submodules for checking out new projects. Existing git checkouts are unaffected, and will continue to (not) use submodules regardless of this setting.', 'gitcheckoutparams' => 'Add options to the `git checkout` command.', 'gitcloneparams' => 'Add options to the `git clone` command.', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/docs/make.md new/drush-8.3.0/docs/make.md --- old/drush-8.2.2/docs/make.md 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/docs/make.md 2019-07-09 23:53:08.000000000 +0200 @@ -486,7 +486,7 @@ type: "module" download: type: "git" - url: "https://git.drupal.org/project/views.git"; + url: "https://git.drupalcode.org/project/views.git"; A project or library entry of an included makefile can be removed entirely by setting the corresponding key to NULL: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/drush.info new/drush-8.3.0/drush.info --- old/drush-8.2.2/drush.info 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/drush.info 2019-07-09 23:53:08.000000000 +0200 @@ -1 +1 @@ -drush_version=8.2.2 +drush_version=8.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/examples/example.aliases.drushrc.php new/drush-8.3.0/examples/example.aliases.drushrc.php --- old/drush-8.2.2/examples/example.aliases.drushrc.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/examples/example.aliases.drushrc.php 2019-07-09 23:53:08.000000000 +0200 @@ -179,6 +179,36 @@ * * $ drush @none status * + * Wildcard Aliases for Service Providers + * + * Some service providers that manage Drupal sites allow customers to create + * multiple "environments" for a site. It is common for these providers to + * also have a feature to automatically create Drush aliases for all of a + * user's sites. Rather than write one record for every environment in that + * site, it is also possible to write a single "wildcard" alias that represents + * all possible environments. This is possible if the contents of each + * environment alias are identical save for the name of the environment in + * one or more values. The variable `${env-name}` will be substituted with the + * environment name wherever it appears. + * + * Example wildcard record: + * + * @code + * $aliases['remote-example.*'] = array( + * 'remote-host' => '${env-name}.server.domain.com', + * 'remote-user' => 'www-admin', + * 'root' => '/path/to/${env-name}', + * 'uri' => '${env-name}.example.com', + * ); + * @endcode + * + * With a wildcard record, any environment name may be used, and will always + * match. This is not desirable in instances where the specified environment + * does not exist (e.g. if the user made a typo). An alias alter hook in a + * policy file may be used to catch these mistakes and report an error. + * @see policy.drush.inc for an example on how to do this. + + * * See `drush help site-alias` for more options for displaying site * aliases. See `drush topic docs-bastion` for instructions on configuring * remote access to a Drupal site behind a firewall via a bastion server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/examples/example.make new/drush-8.3.0/examples/example.make --- old/drush-8.2.2/examples/example.make 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/examples/example.make 2019-07-09 23:53:08.000000000 +0200 @@ -36,7 +36,7 @@ ; Git clone of Drupal 7.x. Requires the `core` property to be set to 7.x. ; projects[drupal][type] = "core" ; projects[drupal][download][type] = git -; projects[drupal][download][url] = https://git.drupal.org/project/drupal.git +; projects[drupal][download][url] = https://git.drupalcode.org/project/drupal.git projects[] = drupal @@ -69,7 +69,7 @@ projects[data][type] = module projects[data][download][type] = git -projects[data][download][url] = https://git.drupal.org/project/views.git +projects[data][download][url] = https://git.drupalcode.org/project/views.git projects[data][download][revision] = DRUPAL-6--3 ; For projects on drupal.org, some shorthand is available. If any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/examples/example.make.yml new/drush-8.3.0/examples/example.make.yml --- old/drush-8.2.2/examples/example.make.yml 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/examples/example.make.yml 2019-07-09 23:53:08.000000000 +0200 @@ -40,7 +40,7 @@ # drupal: # type: "core" # download: -# url: "https://git.drupal.org/project/drupal.git"; +# url: "https://git.drupalcode.org/project/drupal.git"; projects: drupal: @@ -80,7 +80,7 @@ type: "module" download: type: "git" # Note, 'git' is the default, no need to specify. - url: "https://git.drupal.org/project/views.git"; + url: "https://git.drupalcode.org/project/views.git"; revision: "7.x-3.x" # For projects on drupal.org, some shorthand is available. If any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/examples/policy.drush.inc new/drush-8.3.0/examples/policy.drush.inc --- old/drush-8.2.2/examples/policy.drush.inc 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/examples/policy.drush.inc 2019-07-09 23:53:08.000000000 +0200 @@ -66,6 +66,22 @@ } unset($alias_record['parent']); } + + // If the alias is a remote wildcard alias, then test to see if the + // environment exists, and raise an "environment not found" error if + // it does not. + if (isset($alias_record['remote-host'])) { + $host = $alias_record['remote-host']; + if (preg_match('#\.myserver.com$#', $host)) { + $ip = gethostbyname($host); + // If the return value of gethostbyname equals its input parameter, + // that indicates failure. + if ($host == $ip) { + $aliasName = $alias_record['#name']; + return drush_set_error('NO_SUCH_ALIAS', "The alias $aliasName refers to a multidev environment that does not exist."); + } + } + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/includes/sitealias.inc new/drush-8.3.0/includes/sitealias.inc --- old/drush-8.2.2/includes/sitealias.inc 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/includes/sitealias.inc 2019-07-09 23:53:08.000000000 +0200 @@ -722,6 +722,9 @@ $aliases[$group_name] = array('site-list' => implode(',', $alias_names), '#group' => $group_name, '#name' => $group_name); } } + // Wildcard check if necessary. This will insert a resolved alias + // record into the aliases list, allowing the existing code to match it. + _drush_sitealias_wildcard_check($aliasname, $aliases); // Store only the named alias into the alias cache if ((isset($aliases)) && !empty($aliasname) && array_key_exists($aliasname, $aliases)) { drush_set_config_special_contexts($options); // maybe unnecessary @@ -752,6 +755,49 @@ return $result; } +/** + * Convert a matching wildcard record into the requested record if needed. + */ +function _drush_sitealias_wildcard_check($aliasname, &$aliases) { + // Don't overwrite a specific alias record with a resolved wildcard record. + if (array_key_exists($aliasname, $aliases) || empty($aliasname)) { + return; + } + // If the alias is 'site.dev', then $alias_env is 'dev' + $alias_env = preg_replace('#^.*\.#', '', $aliasname); + // Check to see if there is a wildcard record. + // e.g. if alias is 'site.dev', then look for a record 'site.*'. + $wildcard_alias_name = preg_replace('#\.[^.]*$#', '.*', $aliasname); + if (($wildcard_alias_name == $aliasname) || empty($alias_env) || !array_key_exists($wildcard_alias_name, $aliases)) { + return; + } + + $aliases[$aliasname] = _drush_sitealias_replace_wildcard_values($aliases[$wildcard_alias_name], $alias_env); + $aliases[$aliasname]['#name'] = $aliasname; +} + +/** + * Make substitutions in a wildcard alias record. + */ +function _drush_sitealias_replace_wildcard_values($alias_record, $alias_env) { + $result = array(); + + foreach ($alias_record as $key => $value) { + if (is_array($value)) { + $result[$key] = _drush_sitealias_replace_wildcard_values($value, $alias_env); + } + elseif (is_string($value)) { + // This substitution looks just like a consolidation/config variable, + // although this is the only one we support. + $result[$key] = str_replace('${env-name}', $alias_env, $value); + } + else { + $result[$key] = $value; + } + } + return $result; +} + /** * Merges two site aliases. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/src/TestTraits/CliTestTrait.php new/drush-8.3.0/src/TestTraits/CliTestTrait.php --- old/drush-8.2.2/src/TestTraits/CliTestTrait.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/src/TestTraits/CliTestTrait.php 2019-07-09 23:53:08.000000000 +0200 @@ -13,27 +13,27 @@ use OutputUtilsTrait; /** - * Default timeout for commands. + * Default timeout for commands. By default, there is no timeout. * * @var int */ - private $defaultTimeout = 60; + private $defaultTimeout = 0; /** - * Timeout for command. Set to zero for no timeouts. + * Timeout for command. * * Reset to $defaultTimeout after executing a command. * * @var int */ - protected $timeout = 60; + protected $timeout = 0; /** * Default idle timeout for commands. * * @var int */ - private $defaultIdleTimeout = 60; + private $defaultIdleTimeout = 0; /** * Idle timeouts for commands. @@ -42,7 +42,7 @@ * * @var int */ - protected $idleTimeout = 60; + protected $idleTimeout = 0; /** * @var Process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/src/TestTraits/DrushTestTrait.php new/drush-8.3.0/src/TestTraits/DrushTestTrait.php --- old/drush-8.2.2/src/TestTraits/DrushTestTrait.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/src/TestTraits/DrushTestTrait.php 2019-07-09 23:53:08.000000000 +0200 @@ -5,7 +5,7 @@ * DrushTestTrait provides a `drush()` method that may be * used to write functional tests for Drush extensions. * - * See the [example-drush-extension](https://github.com/drush-ops/example-drush-extension) for example usage. + * More information is available at https://github.com/drush-ops/drush/tree/master/tests#drush-test-traits. */ trait DrushTestTrait { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/coreTest.php new/drush-8.3.0/tests/coreTest.php --- old/drush-8.2.2/tests/coreTest.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/coreTest.php 2019-07-09 23:53:08.000000000 +0200 @@ -90,6 +90,9 @@ } function testDrupalDirectory() { + if (explode('.', UNISH_DRUPAL_MINOR_VERSION)[0] < '5') { + $this->markTestSkipped('Test uses devel, which requires Drupal 8.5.x or later'); + } $root = $this->webroot(); $sitewide = $this->drupalSitewideDirectory(); $options = array( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makeConvertTest.php new/drush-8.3.0/tests/makeConvertTest.php --- old/drush-8.2.2/tests/makeConvertTest.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makeConvertTest.php 2019-07-09 23:53:08.000000000 +0200 @@ -84,11 +84,11 @@ 'core = 7.x', 'api = 2', // Ensure Drupal core tag is set correctly. - 'projects[drupal][download][tag] = "7.43"', + 'projects[drupal][download][tag] = "7.67"', 'projects[features][download][type] = "git"', - 'projects[features][download][url] = "https://git.drupal.org/project/features";', - 'projects[features][download][tag] = "7.x-1.0-beta4"', - 'projects[features][patch][0] = "http://drupal.org/files/issues/features-drush-backend-invoke-25.patch";'), + 'projects[features][download][url] = "https://git.drupalcode.org/project/features.git";', + 'projects[features][download][tag] = "1.x-0.0-beta4"', + 'projects[features][patch][0] = "https://drupal.org/files/issues/features-drush-backend-invoke-25.patch";'), ), array( 'composer.lock', @@ -97,11 +97,11 @@ 'core: 7.x', 'api: 2', // Ensure Drupal core tag is set correctly. - "tag: '7.43'", + "tag: '7.67'", 'features:', - 'tag: 7.x-1.0-beta4', + 'tag: 1.x-0.0-beta4', 'patch:', - "- 'http://drupal.org/files/issues/features-drush-backend-invoke-25.patch'", + "- 'https://drupal.org/files/issues/features-drush-backend-invoke-25.patch'", ), ), ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makeTest.php new/drush-8.3.0/tests/makeTest.php --- old/drush-8.2.2/tests/makeTest.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makeTest.php 2019-07-09 23:53:08.000000000 +0200 @@ -319,7 +319,7 @@ // Verify that a reference cache was created. $cache_dir = UNISH_CACHE . DIRECTORY_SEPARATOR . 'cache'; - $this->assertFileExists($cache_dir . '/git/cck_signup-' . md5('https://git.drupal.org/project/cck_signup.git')); + $this->assertFileExists($cache_dir . '/git/cck_signup-' . md5('https://git.drupalcode.org/project/cck_signup.git')); // Test context_admin.info file. $this->assertFileExists(UNISH_SANDBOX . '/test-build/sites/all/modules/context_admin/context_admin.info'); @@ -329,7 +329,7 @@ $this->assertContains('project = "context_admin"', $contents); // Verify git reference cache exists. - $this->assertFileExists($cache_dir . '/git/context_admin-' . md5('https://git.drupal.org/project/context_admin.git')); + $this->assertFileExists($cache_dir . '/git/context_admin-' . md5('https://git.drupalcode.org/project/context_admin.git')); // Text caption_filter .info rewrite. $this->assertFileExists(UNISH_SANDBOX . '/test-build/sites/all/modules/contrib/caption_filter/caption_filter.info'); @@ -412,6 +412,7 @@ } function testMakeFile() { + $this->markTestSkipped('Test depends on drush_make, which can no longer be downloaded from drupal.org.'); $this->runMakefileTest('file'); } @@ -456,6 +457,7 @@ } function testMakeIgnoreChecksums() { + $this->markTestSkipped('Test depends on drush_make, which can no longer be downloaded from drupal.org.'); $this->runMakefileTest('ignore-checksums'); } @@ -501,6 +503,7 @@ } function testMakeMd5Succeed() { + $this->markTestSkipped('Test depends on drush_make, which can no longer be downloaded from drupal.org.'); $this->runMakefileTest('md5-succeed'); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makefiles/composer.json new/drush-8.3.0/tests/makefiles/composer.json --- old/drush-8.2.2/tests/makefiles/composer.json 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makefiles/composer.json 2019-07-09 23:53:08.000000000 +0200 @@ -1,20 +1,20 @@ { - "name": "Enter project name here", + "name": "vendor/project", "description": "Enter project description here", "type": "project", - "repositories": [ - { + "repositories": { + "drupal_org": { "type": "composer", - "url": "https://packagist.drupal-composer.org"; + "url": "https://packages.drupal.org/7"; } - ], + }, "require": { "composer/installers": "^1.0.20", "cweagans/composer-patches": "~1.0", "drupal/drupal": "7.*", - "drupal/wysiwyg": "7.2.1", - "drupal/features": "7.1.0-beta4", - "drupal/context": "7.3.0-beta2" + "drupal/wysiwyg": "2.1", + "drupal/features": "1.0-beta4", + "drupal/context": "3.0-beta2" }, "minimum-stability": "dev", "prefer-stable": true, @@ -38,15 +38,15 @@ }, "patches": { "drupal/wysiwyg": { - "Enter drupal/wysiwyg patch #0 description here": "http://drupal.org/files/0001-feature.inc-from-624018-211.patch";, + "Enter drupal/wysiwyg patch #0 description here": "https://drupal.org/files/0001-feature.inc-from-624018-211.patch";, "Enter drupal/wysiwyg patch #1 description here": "patches-local-test-wysiwyg.patch" }, "drupal/features": { - "Enter drupal/features patch #0 description here": "http://drupal.org/files/issues/features-drush-backend-invoke-25.patch"; + "Enter drupal/features patch #0 description here": "https://drupal.org/files/issues/features-drush-backend-invoke-25.patch"; }, "drupal/context": { - "Enter drupal/context patch #0 description here": "http://drupal.org/files/issues/custom_blocks_arent_editable-make.patch";, - "Enter drupal/context patch #1 description here": "http://drupal.org/files/issues/661094-context-permissions.patch"; + "Enter drupal/context patch #0 description here": "https://drupal.org/files/issues/custom_blocks_arent_editable-make.patch";, + "Enter drupal/context patch #1 description here": "https://drupal.org/files/issues/661094-context-permissions.patch"; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makefiles/composer.lock new/drush-8.3.0/tests/makefiles/composer.lock --- old/drush-8.2.2/tests/makefiles/composer.lock 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makefiles/composer.lock 2019-07-09 23:53:08.000000000 +0200 @@ -1,24 +1,23 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies";, "This file is @generated automatically" ], - "hash": "ded042990efb1c573ef284e73156d835", - "content-hash": "e03033724e81829af4933cd3370a66d9", + "content-hash": "56569fe34e56cb046e9e4a04bdb17b4b", "packages": [ { "name": "composer/installers", - "version": "v1.0.23", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git";, - "reference": "6213d900e92647831f7a406d5c530ea1f3d4360e" + "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/6213d900e92647831f7a406d5c530ea1f3d4360e";, - "reference": "6213d900e92647831f7a406d5c530ea1f3d4360e", + "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b";, + "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b", "shasum": "" }, "require": { @@ -30,7 +29,7 @@ }, "require-dev": { "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "^4.8.36" }, "type": "composer-plugin", "extra": { @@ -40,8 +39,8 @@ } }, "autoload": { - "psr-0": { - "Composer\\Installers\\": "src/" + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" } }, "notification-url": "https://packagist.org/downloads/";, @@ -56,71 +55,93 @@ } ], "description": "A multi-framework Composer library installer", - "homepage": "http://composer.github.com/installers/";, + "homepage": "https://composer.github.io/installers/";, "keywords": [ "Craft", "Dolibarr", + "Eliasis", "Hurad", + "ImageCMS", + "Kanboard", + "Lan Management System", "MODX Evo", + "Mautic", + "Maya", "OXID", + "Plentymarkets", + "Porto", + "RadPHP", "SMF", "Thelia", "WolfCMS", "agl", "aimeos", "annotatecms", + "attogram", "bitrix", "cakephp", "chef", + "cockpit", "codeigniter", "concrete5", "croogo", "dokuwiki", "drupal", + "eZ Platform", "elgg", + "expressionengine", "fuelphp", "grav", "installer", + "itop", "joomla", "kohana", "laravel", + "lavalite", "lithium", "magento", + "majima", "mako", "mediawiki", "modulework", + "modx", "moodle", + "osclass", "phpbb", "piwik", "ppi", "puppet", + "pxcms", + "reindex", "roundcube", "shopware", "silverstripe", + "sydes", "symfony", "typo3", "wordpress", + "yawik", "zend", "zikula" ], - "time": "2016-01-27 12:54:22" + "time": "2018-08-27T06:10:37+00:00" }, { "name": "cweagans/composer-patches", - "version": "1.4.0", + "version": "1.6.6", "source": { "type": "git", "url": "https://github.com/cweagans/composer-patches.git";, - "reference": "0d75c63b6de66144517a1da9084422b78c2ff251" + "reference": "1d89dcc730e7f42426c434b88261fcfb3bce651e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/0d75c63b6de66144517a1da9084422b78c2ff251";, - "reference": "0d75c63b6de66144517a1da9084422b78c2ff251", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/1d89dcc730e7f42426c434b88261fcfb3bce651e";, + "reference": "1d89dcc730e7f42426c434b88261fcfb3bce651e", "shasum": "" }, "require": { - "composer-plugin-api": "~1.0", + "composer-plugin-api": "^1.0", "php": ">=5.3.0" }, "require-dev": { @@ -138,7 +159,7 @@ }, "notification-url": "https://packagist.org/downloads/";, "license": [ - "BSD" + "BSD-3-Clause" ], "authors": [ { @@ -147,252 +168,448 @@ } ], "description": "Provides a way to patch Composer packages.", - "time": "2016-02-29 03:45:02" + "time": "2018-10-24T15:51:16+00:00" }, { "name": "drupal/context", - "version": "7.3.0-beta2", + "version": "3.0.0-beta2", "source": { "type": "git", - "url": "https://git.drupal.org/project/context";, - "reference": "289025b16464ecf8d1832ff49db3866f5aa40e1b" + "url": "https://git.drupalcode.org/project/context.git";, + "reference": "7.x-3.0-beta2" }, "dist": { "type": "zip", "url": "https://ftp.drupal.org/files/projects/context-7.x-3.0-beta2.zip";, - "reference": null, - "shasum": null + "reference": "7.x-3.0-beta2", + "shasum": "e2aebffe4cf68b63a08f6bf73717bdd560cde44c" }, "require": { - "drupal/ctools": "7.*", - "drupal/drupal": "7.*" - }, - "replace": { - "drupal/context_layouts": "self.version", - "drupal/context_ui": "self.version" + "drupal/ctools": "*", + "drupal/drupal": "~7.0" }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-7.x-3.x": "7.3.x-dev" + "dev-3.x": "3.x-dev" + }, + "drupal": { + "version": "7.x-3.0-beta2", + "datestamp": "1533185792", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } }, "patches_applied": { - "Enter drupal/context patch #0 description here": "http://drupal.org/files/issues/custom_blocks_arent_editable-make.patch";, - "Enter drupal/context patch #1 description here": "http://drupal.org/files/issues/661094-context-permissions.patch"; + "Enter drupal/context patch #0 description here": "https://drupal.org/files/issues/custom_blocks_arent_editable-make.patch";, + "Enter drupal/context patch #1 description here": "https://drupal.org/files/issues/661094-context-permissions.patch"; } }, - "notification-url": "https://packagist.drupal-composer.org/downloads/";, + "notification-url": "https://packages.drupal.org/7/downloads";, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "NormySan", + "homepage": "https://www.drupal.org/user/112352"; + }, + { + "name": "Steven Jones", + "homepage": "https://www.drupal.org/user/99644"; + }, + { + "name": "alex_b", + "homepage": "https://www.drupal.org/user/53995"; + }, + { + "name": "boshtian", + "homepage": "https://www.drupal.org/user/1773456"; + }, + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704"; + }, + { + "name": "emanaton", + "homepage": "https://www.drupal.org/user/120853"; + }, + { + "name": "febbraro", + "homepage": "https://www.drupal.org/user/43670"; + }, + { + "name": "fizk", + "homepage": "https://www.drupal.org/user/473174"; + }, + { + "name": "hass", + "homepage": "https://www.drupal.org/user/85918"; + }, + { + "name": "hefox", + "homepage": "https://www.drupal.org/user/426416"; + }, + { + "name": "hyrcan", + "homepage": "https://www.drupal.org/user/26618"; + }, + { + "name": "jmiccolis", + "homepage": "https://www.drupal.org/user/31731"; + }, + { + "name": "nedjo", + "homepage": "https://www.drupal.org/user/4481"; + }, + { + "name": "tekante", + "homepage": "https://www.drupal.org/user/640024"; + }, + { + "name": "yhahn", + "homepage": "https://www.drupal.org/user/264833"; + } + ], "description": "Provide modules with a cache that lasts for a single page request.", - "homepage": "https://www.drupal.org/project/context"; + "homepage": "https://www.drupal.org/project/context";, + "support": { + "source": "https://git.drupalcode.org/project/context"; + } }, { "name": "drupal/ctools", - "version": "7.1.9", + "version": "1.15.0", "source": { "type": "git", - "url": "https://git.drupal.org/project/ctools";, - "reference": "1bf2f388cd7371ae16639349ae3b344732faafae" + "url": "https://git.drupalcode.org/project/ctools.git";, + "reference": "7.x-1.15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-7.x-1.9.zip";, - "reference": null, - "shasum": null + "url": "https://ftp.drupal.org/files/projects/ctools-7.x-1.15.zip";, + "reference": "7.x-1.15", + "shasum": "d55e992f3c68dc663505b3e68a0418fee17cf960" }, "require": { - "drupal/drupal": "7.*" + "drupal/drupal": "~7.0" }, - "replace": { - "drupal/bulk_export": "self.version", - "drupal/ctools_access_ruleset": "self.version", - "drupal/ctools_ajax_sample": "self.version", - "drupal/ctools_custom_content": "self.version", - "drupal/ctools_plugin_example": "self.version", - "drupal/page_manager": "self.version", - "drupal/stylizer": "self.version", - "drupal/term_depth": "self.version", - "drupal/views_content": "self.version" - }, - "suggest": { - "drupal/advanced_help": "Required by drupal/ctools_plugin_example", - "drupal/color": "Required by drupal/stylizer", - "drupal/page_manager": "Required by drupal/ctools_plugin_example", - "drupal/panels": "Required by drupal/ctools_plugin_example", - "drupal/views": "Required by drupal/views_content" + "require-dev": { + "drupal/advanced_help": "*", + "drupal/page_manager": "*", + "drupal/panels": "*", + "drupal/views": "*" }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-7.x-1.x": "7.1.x-dev" + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "7.x-1.15", + "datestamp": "1549603684", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } } }, - "notification-url": "https://packagist.drupal-composer.org/downloads/";, + "notification-url": "https://packages.drupal.org/7/downloads";, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "EclipseGc", + "homepage": "https://www.drupal.org/user/61203"; + }, + { + "name": "damiankloip", + "homepage": "https://www.drupal.org/user/1037976"; + }, + { + "name": "dawehner", + "homepage": "https://www.drupal.org/user/99340"; + }, + { + "name": "esmerel", + "homepage": "https://www.drupal.org/user/164022"; + }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640"; + }, + { + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302"; + }, + { + "name": "merlinofchaos", + "homepage": "https://www.drupal.org/user/26979"; + }, + { + "name": "neclimdul", + "homepage": "https://www.drupal.org/user/48673"; + }, + { + "name": "sdboyer", + "homepage": "https://www.drupal.org/user/146719"; + }, + { + "name": "sun", + "homepage": "https://www.drupal.org/user/54136"; + }, + { + "name": "tim.plunkett", + "homepage": "https://www.drupal.org/user/241634"; + } + ], "description": "A library of helpful tools by Merlin of Chaos.", - "homepage": "https://www.drupal.org/project/ctools"; + "homepage": "https://www.drupal.org/project/ctools";, + "support": { + "source": "https://git.drupalcode.org/project/ctools"; + } }, { "name": "drupal/drupal", - "version": "7.43.0", + "version": "7.67.0", "source": { "type": "git", - "url": "https://git.drupal.org/project/drupal";, - "reference": "c136d1347b9b92145590cb1f84cc02a695d721fe" + "url": "https://git.drupalcode.org/project/drupal.git";, + "reference": "7.67" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/drupal-7.43.zip";, - "reference": null, - "shasum": null - }, - "replace": { - "drupal/aggregator": "self.version", - "drupal/bartik": "self.version", - "drupal/block": "self.version", - "drupal/blog": "self.version", - "drupal/book": "self.version", - "drupal/color": "self.version", - "drupal/comment": "self.version", - "drupal/contact": "self.version", - "drupal/contextual": "self.version", - "drupal/dashboard": "self.version", - "drupal/dblog": "self.version", - "drupal/field": "self.version", - "drupal/field_sql_storage": "self.version", - "drupal/field_ui": "self.version", - "drupal/file": "self.version", - "drupal/filter": "self.version", - "drupal/forum": "self.version", - "drupal/garland": "self.version", - "drupal/help": "self.version", - "drupal/image": "self.version", - "drupal/list": "self.version", - "drupal/locale": "self.version", - "drupal/menu": "self.version", - "drupal/minimal": "self.version", - "drupal/node": "self.version", - "drupal/number": "self.version", - "drupal/openid": "self.version", - "drupal/options": "self.version", - "drupal/overlay": "self.version", - "drupal/path": "self.version", - "drupal/php": "self.version", - "drupal/poll": "self.version", - "drupal/profile": "self.version", - "drupal/rdf": "self.version", - "drupal/search": "self.version", - "drupal/seven": "self.version", - "drupal/shortcut": "self.version", - "drupal/standard": "self.version", - "drupal/stark": "self.version", - "drupal/statistics": "self.version", - "drupal/syslog": "self.version", - "drupal/system": "self.version", - "drupal/taxonomy": "self.version", - "drupal/text": "self.version", - "drupal/toolbar": "self.version", - "drupal/tracker": "self.version", - "drupal/translation": "self.version", - "drupal/trigger": "self.version", - "drupal/update": "self.version", - "drupal/user": "self.version" - }, - "suggest": { - "drupal/block": "Required by drupal/dashboard, drupal/minimal, drupal/standard", - "drupal/color": "Required by drupal/standard", - "drupal/comment": "Required by drupal/forum, drupal/tracker, drupal/standard", - "drupal/contextual": "Required by drupal/standard", - "drupal/dashboard": "Required by drupal/standard", - "drupal/dblog": "Required by drupal/minimal, drupal/standard", - "drupal/field": "Required by drupal/field_sql_storage, drupal/list, drupal/number, drupal/options, drupal/text, drupal/field_ui, drupal/file", - "drupal/field_sql_storage": "Required by drupal/field", - "drupal/field_ui": "Required by drupal/standard", - "drupal/file": "Required by drupal/image, drupal/standard", - "drupal/help": "Required by drupal/standard", - "drupal/image": "Required by drupal/standard", - "drupal/list": "Required by drupal/standard", - "drupal/locale": "Required by drupal/translation", - "drupal/menu": "Required by drupal/standard", - "drupal/number": "Required by drupal/standard", - "drupal/options": "Required by drupal/list, drupal/taxonomy, drupal/standard", - "drupal/overlay": "Required by drupal/standard", - "drupal/path": "Required by drupal/standard", - "drupal/rdf": "Required by drupal/standard", - "drupal/search": "Required by drupal/standard", - "drupal/shortcut": "Required by drupal/standard", - "drupal/taxonomy": "Required by drupal/forum, drupal/standard", - "drupal/text": "Required by drupal/comment", - "drupal/toolbar": "Required by drupal/standard" + "url": "https://ftp.drupal.org/files/projects/drupal-7.67.zip";, + "reference": "7.67", + "shasum": "b7143116f747df1f5a07674f9b7132cc98589b55" }, "type": "drupal-core", "extra": { "branch-alias": { - "dev-7.x-": "7.x-dev" + "dev-7.x": "7.x-dev" + }, + "drupal": { + "version": "7.67", + "datestamp": "1557377067", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } } }, - "notification-url": "https://packagist.drupal-composer.org/downloads/";, - "description": "Handles general site configuration for administrators.", - "homepage": "https://www.drupal.org/project/drupal"; + "notification-url": "https://packages.drupal.org/7/downloads";, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "David_Rothstein", + "homepage": "https://www.drupal.org/user/124982"; + }, + { + "name": "Dries", + "homepage": "https://www.drupal.org/user/1"; + }, + { + "name": "Drupal", + "homepage": "https://www.drupal.org/user/3"; + }, + { + "name": "Fabianx", + "homepage": "https://www.drupal.org/user/693738"; + }, + { + "name": "Gábor Hojtsy", + "homepage": "https://www.drupal.org/user/4166"; + }, + { + "name": "alexpott", + "homepage": "https://www.drupal.org/user/157725"; + }, + { + "name": "catch", + "homepage": "https://www.drupal.org/user/35733"; + }, + { + "name": "cilefen", + "homepage": "https://www.drupal.org/user/1850070"; + }, + { + "name": "drumm", + "homepage": "https://www.drupal.org/user/3064"; + }, + { + "name": "effulgentsia", + "homepage": "https://www.drupal.org/user/78040"; + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439"; + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742"; + }, + { + "name": "plach", + "homepage": "https://www.drupal.org/user/183211"; + }, + { + "name": "stefan.r", + "homepage": "https://www.drupal.org/user/551886"; + }, + { + "name": "webchick", + "homepage": "https://www.drupal.org/user/24967"; + }, + { + "name": "xjm", + "homepage": "https://www.drupal.org/user/65776"; + }, + { + "name": "yoroy", + "homepage": "https://www.drupal.org/user/41502"; + } + ], + "homepage": "https://www.drupal.org/project/drupal";, + "support": { + "source": "https://git.drupalcode.org/project/drupal"; + } }, { "name": "drupal/features", - "version": "7.1.0-beta4", + "version": "1.0.0-beta4", "source": { "type": "git", - "url": "https://git.drupal.org/project/features";, - "reference": "dc3297e5f4141f40f46635c1bbf05913d0ae662d" + "url": "https://git.drupalcode.org/project/features.git";, + "reference": "7.x-1.0-beta4" }, "dist": { "type": "zip", "url": "https://ftp.drupal.org/files/projects/features-7.x-1.0-beta4.zip";, - "reference": null, - "shasum": null + "reference": "7.x-1.0-beta4", + "shasum": "c18cc2730473f98a7d16a082f3b5f160d0ff9795" }, "require": { - "drupal/drupal": "7.*" + "drupal/drupal": "~7.0" }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-7.x-1.x": "7.1.x-dev" + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "7.x-1.0-beta4", + "datestamp": "1460561197", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } }, "patches_applied": { - "Enter drupal/features patch #0 description here": "http://drupal.org/files/issues/features-drush-backend-invoke-25.patch"; + "Enter drupal/features patch #0 description here": "https://drupal.org/files/issues/features-drush-backend-invoke-25.patch"; } }, - "notification-url": "https://packagist.drupal-composer.org/downloads/";, + "notification-url": "https://packages.drupal.org/7/downloads";, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dawehner", + "homepage": "https://www.drupal.org/user/99340"; + }, + { + "name": "e2thex", + "homepage": "https://www.drupal.org/user/189123"; + }, + { + "name": "febbraro", + "homepage": "https://www.drupal.org/user/43670"; + }, + { + "name": "jmiccolis", + "homepage": "https://www.drupal.org/user/31731"; + }, + { + "name": "joseph.olstad", + "homepage": "https://www.drupal.org/user/1321830"; + }, + { + "name": "mpotter", + "homepage": "https://www.drupal.org/user/616192"; + }, + { + "name": "nedjo", + "homepage": "https://www.drupal.org/user/4481"; + }, + { + "name": "tim.plunkett", + "homepage": "https://www.drupal.org/user/241634"; + } + ], "description": "Provides feature management for Drupal.", - "homepage": "https://www.drupal.org/project/features"; + "homepage": "https://www.drupal.org/project/features";, + "support": { + "source": "https://git.drupalcode.org/project/features"; + } }, { "name": "drupal/wysiwyg", - "version": "7.2.1", + "version": "2.1.0", "source": { "type": "git", - "url": "https://git.drupal.org/project/wysiwyg";, - "reference": "2602159043586a5878a08a48f6faa665a62b726a" + "url": "https://git.drupalcode.org/project/wysiwyg.git";, + "reference": "7.x-2.1" }, "dist": { "type": "zip", "url": "https://ftp.drupal.org/files/projects/wysiwyg-7.x-2.1.zip";, - "reference": null, - "shasum": null + "reference": "7.x-2.1", + "shasum": "3be46576436e84ae32f091f1b09287d3f7cc4748" }, "require": { - "drupal/drupal": "7.*" + "drupal/drupal": "~7.0" }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-7.x-2.x": "7.2.x-dev" + "dev-2.x": "2.x-dev" + }, + "drupal": { + "version": "7.x-2.1", + "datestamp": "1390358005", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } }, "patches_applied": { - "Enter drupal/wysiwyg patch #0 description here": "http://drupal.org/files/0001-feature.inc-from-624018-211.patch";, + "Enter drupal/wysiwyg patch #0 description here": "https://drupal.org/files/0001-feature.inc-from-624018-211.patch";, "Enter drupal/wysiwyg patch #1 description here": "patches-local-test-wysiwyg.patch" } }, - "notification-url": "https://packagist.drupal-composer.org/downloads/";, + "notification-url": "https://packages.drupal.org/7/downloads";, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "TwoD", + "homepage": "https://www.drupal.org/user/244227"; + }, + { + "name": "sun", + "homepage": "https://www.drupal.org/user/54136"; + } + ], "description": "Allows to edit content with client-side editors.", - "homepage": "https://www.drupal.org/project/wysiwyg"; + "homepage": "https://www.drupal.org/project/wysiwyg";, + "support": { + "source": "https://git.drupalcode.org/project/wysiwyg"; + } } ], "packages-dev": [], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makefiles/lock-git.make.yml new/drush-8.3.0/tests/makefiles/lock-git.make.yml --- old/drush-8.2.2/tests/makefiles/lock-git.make.yml 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makefiles/lock-git.make.yml 2019-07-09 23:53:08.000000000 +0200 @@ -6,4 +6,4 @@ version: 7.42 atom: download: - url: https://git.drupal.org/project/atom.git + url: https://git.drupalcode.org/project/atom.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/makefiles/lockfiles/git.lock.yml new/drush-8.3.0/tests/makefiles/lockfiles/git.lock.yml --- old/drush-8.2.2/tests/makefiles/lockfiles/git.lock.yml 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/makefiles/lockfiles/git.lock.yml 2019-07-09 23:53:08.000000000 +0200 @@ -6,7 +6,7 @@ type: core atom: download: - url: 'https://git.drupal.org/project/atom.git' + url: 'https://git.drupalcode.org/project/atom.git' type: git branch: 7.x-1.x revision: a9e05aa6e6c45641a0b56dbeb55ede35f51ae3e1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/siteAliasTest.php new/drush-8.3.0/tests/siteAliasTest.php --- old/drush-8.2.2/tests/siteAliasTest.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/siteAliasTest.php 2019-07-09 23:53:08.000000000 +0200 @@ -172,6 +172,38 @@ } /** + * Test wildcard aliases + */ + public function testWildcardAliases() { + $aliasPath = UNISH_SANDBOX . '/site-alias-directory'; + file_exists($aliasPath) ?: mkdir($aliasPath); + $aliasFile = $aliasPath . '/wild.aliases.drushrc.php'; + $aliasContents = <<<EOD + <?php + // Written by Unish. This file is safe to delete. + \$aliases['foo.*'] = array( + 'remote-host' => '\${env-name}.remote-host.com', + 'remote-user' => 'www-admin', + 'root' => '/path/to/\${env-name}', + 'uri' => 'https://\${env-name}.foo.example.com', + ); +EOD; + file_put_contents($aliasFile, $aliasContents); + $options = array( + 'alias-path' => $aliasPath, + 'yes' => NULL, + ); + $this->drush('sa', array('@foo.bar'), $options, NULL, NULL, self::EXIT_SUCCESS); + $output = $this->getOutput(); + $this->assertEquals("\$aliases[\"foo.bar\"] = array ( + 'remote-host' => 'bar.remote-host.com', + 'remote-user' => 'www-admin', + 'root' => '/path/to/bar', + 'uri' => 'https://bar.foo.example.com', +);", $output); + } + + /** * Ensure that a --uri on CLI overrides on provided by site alias during a backend invoke. */ public function testBackendHonorsAliasOverride() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drush-8.2.2/tests/sqlSyncTest.php new/drush-8.3.0/tests/sqlSyncTest.php --- old/drush-8.2.2/tests/sqlSyncTest.php 2019-03-26 17:04:40.000000000 +0100 +++ new/drush-8.3.0/tests/sqlSyncTest.php 2019-07-09 23:53:08.000000000 +0200 @@ -133,21 +133,24 @@ $this->assertEquals($name, $row[0]); if (UNISH_DRUPAL_MAJOR_VERSION >= 8) { + // Assert that field_user_telephone DOES contain "5555555555". + $this->assertUserFieldContents('field_user_telephone', '5555555555', $options, TRUE); + $fields = [ 'field_user_email' => '[email protected]', 'field_user_string' => 'Private info', 'field_user_string_long' => 'Really private info', - 'field_user_text' => 'Super private info', - 'field_user_text_long' => 'Super duper private info', - 'field_user_text_with_summary' => 'Private', ]; + + // TODO: 'text' fields currently NOT being sanitized + // 'field_user_text' => 'Super private info', + // 'field_user_text_long' => 'Super duper private info', + // 'field_user_text_with_summary' => 'Private', + // Assert that field DO NOT contain values. foreach ($fields as $field_name => $value) { $this->assertUserFieldContents($field_name, $value, $options); } - - // Assert that field_user_telephone DOES contain "5555555555". - $this->assertUserFieldContents('field_user_telephone', '5555555555', $options, TRUE); } } ++++++ drush-vendor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php --- old/vendor/autoload.php 2019-03-26 23:45:00.143048632 +0100 +++ new/vendor/autoload.php 2019-07-10 21:36:23.716948367 +0200 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit382196ef2211048403d41e0b414bda0b::getLoader(); +return ComposerAutoloaderInit7422e67601b89076a0af10394e8e0014::getLoader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php --- old/vendor/composer/autoload_real.php 2019-03-26 23:45:00.143048632 +0100 +++ new/vendor/composer/autoload_real.php 2019-07-10 21:36:23.716948367 +0200 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit382196ef2211048403d41e0b414bda0b +class ComposerAutoloaderInit7422e67601b89076a0af10394e8e0014 { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit382196ef2211048403d41e0b414bda0b', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit7422e67601b89076a0af10394e8e0014', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit382196ef2211048403d41e0b414bda0b', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit7422e67601b89076a0af10394e8e0014', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit382196ef2211048403d41e0b414bda0b::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit7422e67601b89076a0af10394e8e0014::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit382196ef2211048403d41e0b414bda0b::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit7422e67601b89076a0af10394e8e0014::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire382196ef2211048403d41e0b414bda0b($fileIdentifier, $file); + composerRequire7422e67601b89076a0af10394e8e0014($fileIdentifier, $file); } return $loader; } } -function composerRequire382196ef2211048403d41e0b414bda0b($fileIdentifier, $file) +function composerRequire7422e67601b89076a0af10394e8e0014($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php --- old/vendor/composer/autoload_static.php 2019-03-26 23:45:00.143048632 +0100 +++ new/vendor/composer/autoload_static.php 2019-07-10 21:36:23.716948367 +0200 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit382196ef2211048403d41e0b414bda0b +class ComposerStaticInit7422e67601b89076a0af10394e8e0014 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -164,10 +164,10 @@ public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit382196ef2211048403d41e0b414bda0b::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit382196ef2211048403d41e0b414bda0b::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit382196ef2211048403d41e0b414bda0b::$prefixesPsr0; - $loader->classMap = ComposerStaticInit382196ef2211048403d41e0b414bda0b::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit7422e67601b89076a0af10394e8e0014::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit7422e67601b89076a0af10394e8e0014::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit7422e67601b89076a0af10394e8e0014::$prefixesPsr0; + $loader->classMap = ComposerStaticInit7422e67601b89076a0af10394e8e0014::$classMap; }, null, ClassLoader::class); } ++++++ update.sh ++++++ --- /var/tmp/diff_new_pack.ujgNqs/_old 2019-07-15 22:44:03.647901648 +0200 +++ /var/tmp/diff_new_pack.ujgNqs/_new 2019-07-15 22:44:03.647901648 +0200 @@ -16,3 +16,4 @@ cd .. tar --directory=$source_dir -cJf $name-vendor.tar.xz vendor rm -r $source_dir +osc addremove
