Making the default to PHP 7.2

builder/gen-dockerfile/src/Builder/GenFilesCommand.php

@@ -109,17 +109,17 @@ protected function initialize(InputInterface $input, OutputInterface $output)
  $output->writeln("<info>
 There is no PHP runtime version specified in composer.json, or
 we don't support the version you specified. Google App Engine
-uses the latest 7.1.x version.
+uses the latest 7.2.x version.
 We recommend pinning your PHP version by running:
 
-composer require php 7.1.* (replace it with your desired minor version)
+composer require php 7.2.* (replace it with your desired minor version)
 
-Using PHP version 7.1.x...</info>
+Using PHP version 7.2.x...</info>
 ");
  } elseif ($version === DetectPhpVersion::EXACT_VERSION_SPECIFIED) {
  throw new ExactVersionException(
  "An exact PHP version was specified in composer.json. Please pin your" .
- "PHP version to a minor version such as '7.1.*'."
+ "PHP version to a minor version such as '7.2.*'."
  );
  }
  if (substr($version, 0, 3) === '5.6') {
@@ -128,12 +128,12 @@ protected function initialize(InputInterface $input, OutputInterface $output)
  } elseif (substr($version, 0, 3) === '7.0') {
  $this->baseImage = $input->getOption('php70-image');
  $this->detectedPhpVersion = '7.0';
- } elseif (substr($version, 0, 3) === '7.2') {
- $this->baseImage = $input->getOption('php72-image');
- $this->detectedPhpVersion = '7.2';
- } else {
+ } elseif (substr($version, 0, 3) === '7.1') {
  $this->baseImage = $input->getOption('php71-image');
  $this->detectedPhpVersion = '7.1';
+ } else {
+ $this->baseImage = $input->getOption('php72-image');
+ $this->detectedPhpVersion = '7.2';
  }
  $yamlPath = getenv('GAE_APPLICATION_YAML_PATH')
  ?: self::DEFAULT_YAML_PATH;

builder/gen-dockerfile/tests/GenFilesCommandTest.php

@@ -79,6 +79,7 @@ public function testGenFilesCommand(
  '--php56-image' => 'gcr.io/google-appengine/php56:latest',
  '--php70-image' => 'gcr.io/google-appengine/php70:latest',
  '--php71-image' => 'gcr.io/google-appengine/php71:latest',
+ '--php72-image' => 'gcr.io/google-appengine/php72:latest',
  ];
  }
  if ($expectedException !== null) {
@@ -134,10 +135,10 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
  "FRONT_CONTROLLER_FILE='index.php' \\\n",
- "DETECTED_PHP_VERSION='7.1' \n"
+ "DETECTED_PHP_VERSION='7.2' \n"
  ]
  ],
  [
@@ -158,10 +159,10 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  ["COMPOSER_FLAGS='--prefer-dist --no-dev --no-script' \\\n",
  "FRONT_CONTROLLER_FILE='index.php' \\\n",
- "DETECTED_PHP_VERSION='7.1' \n"
+ "DETECTED_PHP_VERSION='7.2' \n"
  ]
  ],
  [
@@ -182,10 +183,10 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
  "FRONT_CONTROLLER_FILE='index.php' \\\n",
- "DETECTED_PHP_VERSION='7.1' \\\n",
+ "DETECTED_PHP_VERSION='7.2' \\\n",
  "IS_BATCH_DAEMON_RUNNING='true' \n",
  "enable_stackdriver_integration.sh"
  ]
@@ -197,10 +198,10 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
  "FRONT_CONTROLLER_FILE='index.php' \\\n",
- "DETECTED_PHP_VERSION='7.1' \\\n",
+ "DETECTED_PHP_VERSION='7.2' \\\n",
  "IS_BATCH_DAEMON_RUNNING='true' \n",
  "enable_stackdriver_integration.sh --individual"
  ]
@@ -223,7 +224,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
  ],
@@ -234,7 +235,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
  ],
@@ -245,7 +246,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
  ],
@@ -256,7 +257,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
  ],
@@ -286,14 +287,27 @@ public function dataProvider()
  "DETECTED_PHP_VERSION='7.0' \n"
  ]
  ],
+ [
+ // PHP 7.1
+ __DIR__ . '/test_data/php71',
+ null,
+ '',
+ '/app',
+ 'added by the php runtime builder',
+ 'gcr.io/google-appengine/php71:latest',
+ ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
+ "FRONT_CONTROLLER_FILE='index.php' \\\n",
+ "DETECTED_PHP_VERSION='7.1' \n"
+ ]
+ ],
  [
  // values on env_variables
  __DIR__ . '/test_data/values_only_on_env',
  null,
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [
  "WHITELIST_FUNCTIONS='exec' \\\n",
  "FRONT_CONTROLLER_FILE='app.php'",
@@ -313,7 +327,7 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\MissingDocumentRootException'
  ],
@@ -324,7 +338,7 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [
  "WHITELIST_FUNCTIONS='exec' \\\n",
  "FRONT_CONTROLLER_FILE='app.php'",
@@ -345,7 +359,7 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  ["FRONT_CONTROLLER_FILE='app.php' \\\n"]
  ],
  [
@@ -355,7 +369,7 @@ public function dataProvider()
  'my.yaml',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest'
+ 'gcr.io/google-appengine/php72:latest'
  ],
  [
  // Overrides baseImage
@@ -364,11 +378,12 @@ public function dataProvider()
  '--php56-image' => 'gcr.io/php-mvm-a/php56:latest',
  '--php70-image' => 'gcr.io/php-mvm-a/php70:latest',
  '--php71-image' => 'gcr.io/php-mvm-a/php71:latest',
+ '--php72-image' => 'gcr.io/php-mvm-a/php72:latest',
  ],
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/php-mvm-a/php71:latest'
+ 'gcr.io/php-mvm-a/php72:latest'
  ],
  [
  // Has document_root set
@@ -377,7 +392,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest'
+ 'gcr.io/google-appengine/php72:latest'
  ],
  [
  // Has document_root set in env_variables
@@ -386,7 +401,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest'
+ 'gcr.io/google-appengine/php72:latest'
  ],
  [
  // document_root in both will throw exception
@@ -395,7 +410,7 @@ public function dataProvider()
  '',
  '/app/web',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php71:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\EnvConflictException'
  ],
@@ -415,7 +430,7 @@ public function dataProvider()
  '',
  '/app',
  'added by the php runtime builder',
- 'gcr.io/google-appengine/php56:latest',
+ 'gcr.io/google-appengine/php72:latest',
  [],
  '\\Google\\Cloud\\Runtimes\\Builder\\Exception\\ExactVersionException'
  ]

builder/gen-dockerfile/tests/test_data/php71/app.yaml

@@ -0,0 +1,5 @@
+env: flex
+runtime: php
+
+runtime_config:
+ document_root: /app

builder/gen-dockerfile/tests/test_data/php71/composer.json

@@ -0,0 +1,5 @@
+{
+ "require": {
+ "php": "7.1.*"
+ }
+}

cloudbuild.yaml

@@ -232,6 +232,24 @@ steps:
  waitFor: ['php71-custom-app', 'test-runner']
  id: php71-custom-test
 
+ # php72-custom test
+ - name: gcr.io/cloud-builders/docker
+ args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php72-custom:$_TAG', '.']
+ dir: testapps/php72_custom
+ waitFor: ['php-onbuild']
+ id: php72-custom-build
+ - name: gcr.io/gcp-runtimes/structure_test
+ args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php72-custom:$_TAG', '--config', 'php72.yaml', '-v']
+ waitFor: ['php72-custom-build']
+ - name: gcr.io/cloud-builders/docker
+ args: ['run', '--net=nw_$_TAG', '--name=php72-custom', '-d', 'gcr.io/${_GOOGLE_PROJECT_ID}/php72-custom:$_TAG']
+ waitFor: ['php72-custom-build', 'test-network']
+ id: php72-custom-app
+ - name: gcr.io/cloud-builders/docker
+ args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php72_custom/tests']
+ waitFor: ['php72-custom-app', 'test-runner']
+ id: php72-custom-test
+
  # php71-extensions test
  - name: gcr.io/cloud-builders/docker
  args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php71-extensions:$_TAG', '.']

integration-tests.yaml

@@ -6,11 +6,11 @@ steps:
  waitFor: ['-']
  id: test-runner
 
- # php71_e2e test
+ # php72_e2e test
  - name: gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG
- args: ['/workspace/testapps/php71_e2e/tests']
+ args: ['/workspace/testapps/php72_e2e/tests']
  waitFor: ['test-runner']
- id: php71_e2e
+ id: php72_e2e
  env:
  - 'SERVICE_ACCOUNT_JSON=${_SERVICE_ACCOUNT_JSON}'
  - 'TAG=${_TAG}-e2e'

php-base/Dockerfile

@@ -89,8 +89,8 @@ RUN mkdir -p $APP_DIR $UPLOAD_DIR $SESSION_SAVE_PATH \
  $APP_DIR $UPLOAD_DIR $SESSION_SAVE_PATH \
  $NGINX_USER_CONF_DIR $WWW_HOME $COMPOSER_HOME \
  && chmod 755 $UPLOAD_DIR $SESSION_SAVE_PATH $COMPOSER_HOME \
- # For easy access to php with `su www-data -c $CMD`
  && ln -sf ${PHP_DIR}/bin/php /usr/bin/php
+# Linking for easy access to php with `su www-data -c $CMD`
 
 # Put other config and shell files into place.
 COPY nginx.conf fastcgi_params gzip_params "${NGINX_DIR}/"

php-base/build-scripts/composer.sh

@@ -23,7 +23,7 @@ else
  set -e
 fi
 
-DEFAULT_PHP_VERSION="7.1"
+DEFAULT_PHP_VERSION="7.2"
 
 if [ -f ${APP_DIR}/composer.json ]; then
  if [ -n "${DETECTED_PHP_VERSION}" ]; then
@@ -36,16 +36,16 @@ if [ -f ${APP_DIR}/composer.json ]; then
 
  if [ "${PHP_VERSION}" == "exact" ]; then
  cat<<EOF
-An exact PHP version was specified in composer.json. Please pin your PHP version to a minor version such as '7.1.*'.
+An exact PHP version was specified in composer.json. Please pin your PHP version to a minor version such as '7.2.*'.
 EOF
  exit 1
- elif [ "${PHP_VERSION}" != "5.6" ] && [ "${PHP_VERSION}" != "7.0" ] && [ "${PHP_VERSION}" != "7.1" ]; then
+ elif [ "${PHP_VERSION}" != "5.6" ] && [ "${PHP_VERSION}" != "7.0" ] && [ "${PHP_VERSION}" != "7.1" ] && [ "${PHP_VERSION}" != "7.2" ]; then
  cat<<EOF
-There is no PHP runtime version specified in composer.json, or we don't support the version you specified. Google App Engine uses the latest 7.1.x version. We recommend pinning your PHP version by running:
+There is no PHP runtime version specified in composer.json, or we don't support the version you specified. Google App Engine uses the latest 7.2.x version. We recommend pinning your PHP version by running:
 
-composer require php 7.1.* (replace it with your desired minor version)
+composer require php 7.2.* (replace it with your desired minor version)
 
-Using PHP version 7.1.x...
+Using PHP version 7.2.x...
 EOF
  PHP_VERSION=${DEFAULT_PHP_VERSION}
  fi
@@ -63,6 +63,12 @@ EOF
  apt-get remove -y gcp-php71
  rm -rf /var/lib/apt/lists/*
  fi
+ if [ "${PHP_VERSION}" == "7.2" ]; then
+ apt-get -y update
+ /bin/bash /build-scripts/install_php72.sh
+ apt-get remove -y gcp-php71
+ rm -rf /var/lib/apt/lists/*
+ fi
  fi
 
  echo "Using PHP version: ${PHP_VERSION}"

php-base/build-scripts/detect_php_version.php

@@ -71,6 +71,7 @@ public static function version($constraint, $availableVersions = null)
  private static function detectAvailableVersions()
  {
  return [
+ trim(file_get_contents('/opt/php72_version')),
  trim(file_get_contents('/opt/php71_version')),
  trim(file_get_contents('/opt/php70_version')),
  trim(file_get_contents('/opt/php56_version'))

testapps/build_pipeline_php56/composer.json

@@ -1,6 +1,6 @@
 {
  "require": {
- "php": "^5.6",
+ "php": "5.6.*",
  "google/cloud": "*",
  "grpc/grpc": "*",
  "silex/silex": "^1.3"