2.x prep (open-telemetry#1463)

Initial config changes for 2.x versions:
* update to php 8.2 minimum
* gitsplit 2.x
* skip rector ReadOnlyClassRector

Author: brettmc

.github/workflows/php.yml

@@ -2,9 +2,9 @@ name: PHP QA
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 1.x, 2.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 1.x, 2.x ]
 
 jobs:
   php:
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3']
         experimental: [false]
         composer_args: [""]
         include:
@@ -154,5 +154,5 @@ jobs:
     needs: php
     with:
       matrix_extension: '["ast, json, grpc"]'
-      matrix_php_version: '["8.1", "8.2", "8.3"]'
+      matrix_php_version: '["8.2", "8.3", "8.4"]'
       install_directory: '~/.test/.packages'

.github/workflows/shellcheck.yml

@@ -2,9 +2,9 @@ name: Shellcheck
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 1.x, 2.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 1.x, 2.x ]
 
 jobs:
   shellcheck:

.github/workflows/split-monorepo.yaml

@@ -4,8 +4,8 @@ on:
     branches:
       - main
       - split
-  release:
-    types: [published]
+      - 1.x
+      - 2.x
   create:
   workflow_dispatch:
 

.gitsplit.yml

@@ -35,3 +35,4 @@ splits:
 origins:
   - ^main$
   - ^split$
+  - ^2.x^

DEVELOPMENT.md

@@ -77,12 +77,12 @@ This does the following things:
 ### Other PHP versions
 
 We aim to support officially supported PHP versions, according to https://www.php.net/supported-versions.php. The
-developer image `ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base` is tagged as `8.1`, `8.2` and `8.3`
-respectively, with `8.1` being the default. You can execute the test suite against other PHP versions by running the
+developer image `ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base` is tagged as `8.2`, `8.3` and `8.4`
+respectively, with `8.2` being the default. You can execute the test suite against other PHP versions by running the
 following command:
 
 ```bash
-PHP_VERSION=8.1 make all
+PHP_VERSION=8.2 make all
 #or
 PHP_VERSION=8.3 make all
 ```

Makefile

@@ -1,6 +1,6 @@
 include .env
 
-PHP_VERSION ?= 8.1
+PHP_VERSION ?= 8.2
 DOCKER_COMPOSE ?= docker compose
 DC_RUN_PHP = $(DOCKER_COMPOSE) run --rm php
 

composer.json

@@ -101,8 +101,8 @@
         "phpstan/phpstan": "^1.10.13",
         "phpstan/phpstan-mockery": "^1.1",
         "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^10 || ^11",
-        "sebastian/exporter": "<= 6.0.1 || >= 6.1.3",
+        "phpunit/phpunit": "^11",
+        "sebastian/exporter": "^6.3",
         "symfony/http-client": "^5.2",
         "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.4 || ^7.0"

docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.1}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.2}
     volumes:
     - ./:/usr/src/myapp
     user: "${PHP_USER}:root"

rector.php

@@ -2,42 +2,34 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
 use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\Config\RectorConfig;
-use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
-use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\Php82\Rector\Class_\ReadOnlyClassRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 use Rector\ValueObject\PhpVersion;
 use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->phpVersion(PhpVersion::PHP_81);
+    $rectorConfig->phpVersion(PhpVersion::PHP_82);
 
     $rectorConfig->paths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ]);
 
     $rectorConfig->sets([
-        SetList::PHP_81,
+        SetList::PHP_82,
         SetList::CODE_QUALITY,
         PHPUnitSetList::PHPUNIT_100,
     ]);
     $rectorConfig->skip([
         FlipTypeControlToUseExclusiveTypeRector::class,
-        NewInInitializerRector::class => [
-            __DIR__ . '/src/SDK/Trace/Sampler/ParentBased.php',
-        ],
-        ReadOnlyPropertyRector::class => [
-            __DIR__ . '/src/SDK/Metrics/Stream/SynchronousMetricStream.php',
-            __DIR__ . '/tests/Unit/Extension/Propagator',
-        ],
         DisallowedEmptyRuleFixerRector::class,
         ExplicitBoolCompareRector::class,
         LocallyCalledStaticMethodToNonStaticRector::class,
+        ReadOnlyClassRector::class,
     ]);
 };

src/API/composer.json

@@ -17,10 +17,9 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "open-telemetry/context": "^1.0",
-        "psr/log": "^1.1|^2.0|^3.0",
-        "symfony/polyfill-php82": "^1.26"
+        "psr/log": "^1.1|^2.0|^3.0"
     },
     "conflict": {
         "open-telemetry/sdk": "<=1.0.8"
@@ -35,7 +34,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.1.x-dev"
+            "dev-main": "1.1.x-dev",
+            "dev-2.x": "2.x-dev"
         },
         "spi": {
             "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [