diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bb45959cfff19492362ee55e3c4be54f36abaa..f0b7f54283c5e7da8ffb5a081d1f068cdcded0e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: variables: VERSION: ${CI_COMMIT_TAG} - CI_VERSION: v2.0.21 + CI_VERSION: v2.1.0 before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY @@ -34,7 +34,7 @@ php: stage: build parallel: matrix: - - PHP: ['7.4','8.0','8.1'] + - PHP: ['7.4','8.0','8.1','8.2'] script: - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} . - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} diff --git a/configIdea.php b/configIdea.php index ae6b68fbae82a3b7e81fc2ce2800679a8aef8e94..dad42f1d8ed6b5befb23a1869b0c21fdf47ac5ea 100644 --- a/configIdea.php +++ b/configIdea.php @@ -17,7 +17,7 @@ $tasks = [ [ 'attribute' => 'class', 'value' => 'PhpCSValidationInspection', - 'content' => '<inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true"><option name="CODING_STANDARD" value="Drupal" /><option name="EXTENSIONS" value="php,js,css,inc" /></inspection_tool>', + 'content' => '<inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true"><option name="CODING_STANDARD" value="DrupalPractice" /><option name="EXTENSIONS" value="php,js,css,inc" /></inspection_tool>', ], ], ], diff --git a/run/scripts/reset b/run/scripts/reset index e9e72c73f240564cc49fa630eb45e623700b42c6..cf27d6f18759a29e90a6b8e6c0e9415195595493 100755 --- a/run/scripts/reset +++ b/run/scripts/reset @@ -19,6 +19,8 @@ export PHP_VERSION=8.0 /usr/local/bin/update export PHP_VERSION=8.1 /usr/local/bin/update +export PHP_VERSION=8.2 +/usr/local/bin/update echo "Cleaning old container" docker kill l3drun >/dev/null diff --git a/run/scripts/start b/run/scripts/start index 00c4d7f948abe5b95ad69de33e4f7c0c9996cec8..e5b580db45e35ff450e3aaace8554b0425a1e4fa 100755 --- a/run/scripts/start +++ b/run/scripts/start @@ -4,7 +4,7 @@ function getConfig() { if [[ ! -n ${PHP_VERSION} ]]; then while true; do DEFAULT=8.1 - read -p "WhIich PHP version is your project using [7.1 - 7.4, 8.0 - 8.1]? " VALUE + read -p "WhIich PHP version is your project using [7.4, 8.0, 8.1, 8.2]? " VALUE if [[ "x$VALUE" == "x" ]]; then PHP_VERSION=$DEFAULT else @@ -18,6 +18,7 @@ function getConfig() { 7.4) break ;; 8.0) break ;; 8.1) break ;; + 8.2) break ;; *) echo "Version not supported." ;; esac done