Skip to content

Commit

Permalink
Revert "Revert back to requiring php 5.6 as the minimum php version (a…
Browse files Browse the repository at this point in the history
…cquia#2665)"

This reverts commit f43c708.
  • Loading branch information
grasmash committed Oct 2, 2018
1 parent 03e26f0 commit 96f9756
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: php
dist: trusty

php:
- 5.6
- 7.1
- 7.2

Expand Down Expand Up @@ -90,5 +89,5 @@ deploy:
skip_cleanup: true
on:
branch: $DEPLOY_SOURCE_BRANCH
php: 5.6
php: 7.1
condition: $DRUPAL_CORE_VERSION = default
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"type": "composer-plugin",
"license": "GPL-2.0-only",
"require": {
"php": ">=5.6",
"php": ">=7.1",
"composer-plugin-api": "^1.1.0",
"composer/installers": "^1.2.0",
"composer/semver": "^1.4",
Expand Down
2 changes: 1 addition & 1 deletion scripts/pipelines/acquia-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 1.1.0
services:
- mysql
- php:
version: 5.6
version: 7.1

variables:
global:
Expand Down
9 changes: 4 additions & 5 deletions scripts/travis/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dist: trusty
# Making this version number greater than the production environment can have unintended consequences
# including a non-functional prod environment.
php:
- 5.6
- 7.1

matrix:
fast_finish: true
Expand Down Expand Up @@ -59,23 +59,22 @@ install:
script:
- source ${BLT_DIR}/scripts/travis/run_tests

# The version below MUST match the php version indicated at the top of this file, otherwise the artifact won't build.
deploy:
- provider: script
script: "${BLT_DIR}/scripts/travis/deploy_branch"
skip_cleanup: true
on:
branch: develop
php: 5.6
php: 7.1
- provider: script
script: "${BLT_DIR}/scripts/travis/deploy_branch"
skip_cleanup: true
on:
branch: master
php: 5.6
php: 7.1
- provider: script
script: "${BLT_DIR}/scripts/travis/deploy_tag"
skip_cleanup: true
on:
tags: true
php: 5.6
php: 7.1
11 changes: 11 additions & 0 deletions src/Robo/Hooks/WebServerHook.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@
namespace Acquia\Blt\Robo\Hooks;

use Acquia\Blt\Robo\BltTasks;
use Acquia\Blt\Robo\Common\IO;
use Acquia\Blt\Robo\Config\ConfigAwareTrait;
use Acquia\Blt\Robo\Inspector\InspectorAwareTrait;
use Consolidation\AnnotatedCommand\CommandData;
use League\Container\ContainerAwareTrait;
use Psr\Log\LoggerAwareTrait;

/**
* Starts and kills Drush webserver for @launchWebServer annotation.
*/
class WebServerHook extends BltTasks {

use ConfigAwareTrait;
use ContainerAwareTrait;
use LoggerAwareTrait;
use InspectorAwareTrait;
use IO;

protected $serverUrl;
protected $serverPort;

Expand Down
2 changes: 1 addition & 1 deletion src/Robo/Inspector/Inspector.php
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ public function issueEnvironmentWarnings($command_name) {
* @throws \Acquia\Blt\Robo\Exceptions\BltException
*/
public function warnIfPhpOutdated() {
$minimum_php_version = 5.6;
$minimum_php_version = 7;
$current_php_version = phpversion();
if ($current_php_version < $minimum_php_version) {
throw new BltException("BLT requires PHP $minimum_php_version or greater. You are using $current_php_version.");
Expand Down

0 comments on commit 96f9756

Please sign in to comment.