diff --git a/lib/travis/yml/schema/def/lang/php.rb b/lib/travis/yml/schema/def/lang/php.rb index b843a56e2..54824557f 100644 --- a/lib/travis/yml/schema/def/lang/php.rb +++ b/lib/travis/yml/schema/def/lang/php.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true +require 'travis/yml/schema/def/lang/jdks' module Travis module Yml @@ -11,7 +12,10 @@ def define title 'PHP' summary 'PHP language support' see 'Building a PHP Project': 'https://docs.travis-ci.com/user/languages/php/' + matrix :php + matrix :jdk, to: :jdks + map :composer_args, to: :str end end diff --git a/public/docs/ref/jobs/allow_failures/jobs_entries/jobs_entry/language/php.html b/public/docs/ref/jobs/allow_failures/jobs_entries/jobs_entry/language/php.html index 3c4ee16ae..78311dcc7 100644 --- a/public/docs/ref/jobs/allow_failures/jobs_entries/jobs_entry/language/php.html +++ b/public/docs/ref/jobs/allow_failures/jobs_entries/jobs_entry/language/php.html @@ -61,6 +61,7 @@
php — (type: sequence of string, or string, matrix expand key)
jdk — JDK versions (type: sequence of string, or string, matrix expand key)
composer_args — (type: string)
php:
- string
+jdk:
+- string
composer_args: string
php: string
+
+
+jdk: string
+
diff --git a/schema.json b/schema.json
index db8a36b5a..ef6e54926 100644
--- a/schema.json
+++ b/schema.json
@@ -8454,6 +8454,14 @@
]
}
},
+ "jdk": {
+ "type": "string",
+ "only": {
+ "language": [
+ "php"
+ ]
+ }
+ },
"composer_args": {
"type": "string",
"only": {
@@ -10644,4 +10652,4 @@
"smalltalk_config",
"smalltalk_vm"
]
-}
\ No newline at end of file
+}
diff --git a/spec/travis/yml/schema/def/lang/php_spec.rb b/spec/travis/yml/schema/def/lang/php_spec.rb
index 3f84c4324..4b756cc47 100644
--- a/spec/travis/yml/schema/def/lang/php_spec.rb
+++ b/spec/travis/yml/schema/def/lang/php_spec.rb
@@ -22,6 +22,17 @@
]
}
},
+ jdk: {
+ '$ref': '#/definitions/type/jdks',
+ flags: [
+ :expand
+ ],
+ only: {
+ language: [
+ 'php'
+ ]
+ },
+ },
composer_args: {
type: :string,
only: {