diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d17836edf..5359d59b4 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -19,7 +19,7 @@ jobs: - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' - name: Install dependencies run: | diff --git a/composer.json b/composer.json index d9e0ca646..c0a67e827 100644 --- a/composer.json +++ b/composer.json @@ -34,11 +34,11 @@ } }, "require": { - "php": "^8.1", + "php": "^8.2", "google/protobuf": "^4.0", "friendsofphp/php-cs-fixer": "^3", "symfony/yaml": "^5.2", - "symplify/coding-standard": "9.4.70", + "symplify/coding-standard": "13.0.0", "microsoft/tolerant-php-parser": "^0.1.2" }, "require-dev": { @@ -53,7 +53,7 @@ }, "config": { "platform": { - "php": "8.1" + "php": "8.2" } } } diff --git a/repositories.bzl b/repositories.bzl index 887ce7eef..fa8940ec2 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -25,7 +25,7 @@ def gapic_generator_php_repositories(): urls = ["https://github.com/googleapis/rules_gapic/archive/v%s.tar.gz" % _rules_gapic_version], ) - _php_version = "8.1.13" + _php_version = "8.2.29" maybe( php, name = "php_micro", diff --git a/rules_php_gapic/resources/php-8.2.29_linux_x86_64.tar.gz b/rules_php_gapic/resources/php-8.2.29_linux_x86_64.tar.gz new file mode 100644 index 000000000..870199fa8 Binary files /dev/null and b/rules_php_gapic/resources/php-8.2.29_linux_x86_64.tar.gz differ diff --git a/rules_php_gapic/resources/readme.md b/rules_php_gapic/resources/readme.md index 5f333591f..bd322b85e 100644 --- a/rules_php_gapic/resources/readme.md +++ b/rules_php_gapic/resources/readme.md @@ -15,15 +15,15 @@ The recommended (tested) way of doing it is as follows: ``` 3. Download the specific PHP distribution sources from https://www.php.net/distributions: ``` - curl https://www.php.net/distributions/php-8.1.13.tar.gz -o php-8.1.13.tar.gz + curl https://www.php.net/distributions/php-8.2.29.tar.gz -o php-8.2.29.tar.gz ``` 4. Unpack the downloaded archive: ``` - tar -xzpf php-8.1.13.tar.gz + tar -xzpf php-8.2.29.tar.gz ``` 5. Go to the unpacked directory: ``` - cd php-8.1.13 + cd php-8.2.29 ``` 6. Run the build config: ``` @@ -44,9 +44,9 @@ The recommended (tested) way of doing it is as follows: --disable-mbregex \ --with-openssl \ --enable-bcmath \ - --prefix=/tmp/php-8.1.13 + --prefix=/tmp/php-8.2.29 ``` - Please make sure that the `--prefix` destination folder has the same name as the root folder of your unpacked archive (i.e. the one you `cd` in step 3; it is usually `php-`, e.g. `php-8.1.13`). + Please make sure that the `--prefix` destination folder has the same name as the root folder of your unpacked archive (i.e. the one you `cd` in step 3; it is usually `php-`, e.g. `php-8.2.29`). 7. Run the build: ``` make -j10 @@ -62,7 +62,7 @@ The recommended (tested) way of doing it is as follows: ``` 10. Pack the relevant binaries in the archive, using `php-_.tar.gz` name format: ``` - tar -zchpf php-8.1.13_linux_x86_64.tar.gz php-8.1.13/bin php-8.1.13/lib + tar -zchpf php-8.2.29_linux_x86_64.tar.gz php-8.2.29/bin php-8.2.29/lib ``` 11. Copy the created archive to the `rules_gapic/php/resources` folder in this repository and post a PR.