Commit d2487184 authored by Neil Drumm's avatar Neil Drumm 👋
Browse files

Reduce noise, use PHP 7.3 for composer, array syntax

parent 8a4afac2

drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php

+5 −4
Changes for drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -140,18 +140,19 @@ class DrupalorgProjectPackageRelease implements ProjectReleasePackagerInterface 


    // Install core dependencies with composer for Drupal 8 and above.

    if ($this->project_node->type === 'project_core' && $this->release_node->field_release_version_major[LANGUAGE_NONE][0]['value'] >= 8 && file_exists($this->export . '/composer.json')) {

      $composer_options = array(

      $composer_options = [

        '--working-dir=%s',

        '--prefer-dist',

        '--no-interaction',

        '--ignore-platform-reqs',

      );

        '--no-suggest',

      ];

      // If we're packaging a tagged release, exclude all dev dependencies.

      if ($this->release_node->field_release_build_type[LANGUAGE_NONE][0]['value'] === 'static') {

        $composer_options[] = '--no-dev';

      }

      if (!drush_shell_cd_and_exec($this->temp_directory, 'composer install ' . implode(' ', $composer_options), $this->export)) {

        watchdog('package_error', 'Installing core dependencies with composer failed: <pre>@output</pre>', array('@output' => implode("\n", drush_shell_exec_output())), WATCHDOG_ERROR);

      if (!drush_shell_cd_and_exec($this->temp_directory, '/usr/bin/php7.3 /usr/local/bin/composer install ' . implode(' ', $composer_options), $this->export)) {

        watchdog('package_error', 'Installing core dependencies with composer failed: <pre>@output</pre>', ['@output' => implode("\n", drush_shell_exec_output())], WATCHDOG_ERROR);

        drush_shell_exec('rm -rf %s', $this->repository);

        return 'error';

      }