[Dep] Update to php 8.1 requirement (manual) (#1374)

samsonasik · TomasVotruba · web-flow · commit 1ba58dd16e3f · 2021-12-03T15:44:33.000+01:00
Co-authored-by: Tomas Votruba &lt;tomas.vot@gmail.com&gt;
diff --git a/.github/workflows/build_scoped_rector.yaml b/.github/workflows/build_scoped_rector.yaml
@@ -35,7 +35,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
                 # fixes https://github.com/rectorphp/rector/pull/4559/checks?check_run_id=1359814403, see https://github.com/shivammathur/setup-php#composer-github-oauth
@@ -58,6 +58,17 @@ jobs:
             # 2. downgrade rector
             -   run: sh build/downgrade-rector.sh rector-build
 
+            # scoped using php-scoper.phar which require #[\ReturnTypeWillChange] inside so use php 8.0 for scoping
+            -
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.0
+                    coverage: none
+
+                # fixes https://github.com/rectorphp/rector/pull/4559/checks?check_run_id=1359814403, see https://github.com/shivammathur/setup-php#composer-github-oauth
+                env:
+                    COMPOSER_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+
             # 3. prefix classes
             -   run: sh build/build-rector-scoped.sh rector-build rector-prefixed-downgraded
 
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -59,7 +59,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             -   uses: "ramsey/composer-install@v1"
diff --git a/.github/workflows/code_analysis_no_dev.yaml b/.github/workflows/code_analysis_no_dev.yaml
@@ -30,7 +30,7 @@ jobs:
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             # must be removed, as local config is missing dev dependencies
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -21,7 +21,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['8.0']
+                php_version: ['8.1']
                 directory:
                     - 'e2e/template-extends'
                     - 'e2e/plain-views'
diff --git a/.github/workflows/packages_tests.yaml b/.github/workflows/packages_tests.yaml
@@ -42,7 +42,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             -   run: composer config minimum-stability dev
diff --git a/.github/workflows/php_linter.yaml b/.github/workflows/php_linter.yaml
@@ -18,7 +18,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             -   run: composer create-project php-parallel-lint/php-parallel-lint php-parallel-lint
diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml
@@ -51,15 +51,16 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     # PHP 7.3 is required, so Rector's code is PHP 7.3 compatible even after refactoring
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             -   run: composer install --no-progress --ansi
 
             ## First run Rector - here can't be --dry-run !!! it would stop the job with it and not commit anything in the future
-            -   run: bin/rector process ${{ matrix.paths }} --ansi --no-progress-bar
+            # temporary disable rectify as splitted from https://github.com/rectorphp/rector-src/pull/1364
+            # -   run: bin/rector process ${{ matrix.paths }} --ansi --no-progress-bar
 
-            -   run: vendor/bin/ecs check --fix --ansi
+            # -   run: vendor/bin/ecs check --fix --ansi
 
             # see https://github.com/EndBug/add-and-commit
             -
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -15,7 +15,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ['8.0']
+                php: ['8.1']
                 path:
                     - tests
                     - rules-tests
diff --git a/.github/workflows/weekly_pull_requests.yaml b/.github/workflows/weekly_pull_requests.yaml
@@ -44,7 +44,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
 
             -   uses: "ramsey/composer-install@v1"
diff --git a/build/target-repository/.github/workflows/along_other_packages.yaml b/build/target-repository/.github/workflows/along_other_packages.yaml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
                 commands:
                     -
                         name: 'Composer Dependency'
diff --git a/build/target-repository/.github/workflows/bare_run.yaml b/build/target-repository/.github/workflows/bare_run.yaml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
         steps:
             -   uses: actions/checkout@v2
diff --git a/build/target-repository/.github/workflows/e2e.yaml b/build/target-repository/.github/workflows/e2e.yaml
@@ -15,7 +15,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
                 directory:
                     - 'e2e/attributes'
                     - 'e2e/define-constant'
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "homepage": "https://getrector.org",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-dom": "*",
         "ext-json": "*",
         "clue/ndjson-react": "^1.2",
diff --git a/e2e/plain-views/composer.json b/e2e/plain-views/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "php": "^8.0"
+        "php": "^8.1"
     },
     "minimum-stability": "dev",
     "prefer-stable": true
diff --git a/e2e/template-extends/composer.json b/e2e/template-extends/composer.json
@@ -5,7 +5,7 @@
         }
     },
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "myclabs/php-enum": "^1.8"
     },
     "minimum-stability": "dev",
diff --git a/rector.php b/rector.php
@@ -11,6 +11,8 @@
 use Rector\Core\Configuration\Option;
 use Rector\Nette\Set\NetteSetList;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
+use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 use Rector\Set\ValueObject\LevelSetList;
@@ -19,7 +21,7 @@
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     // include the latest PHP version + all bellow in one config!
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_80);
+    $containerConfigurator->import(LevelSetList::UP_TO_PHP_81);
 
     // include sets
     $containerConfigurator->import(SetList::CODING_STYLE);
@@ -75,6 +77,9 @@
             __DIR__ . '/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php',
         ],
 
+        MyCLabsClassToEnumRector::class,
+        SpatieEnumClassToEnumRector::class,
+
         // test paths
         '*/tests/**/Fixture/*',
         '*/rules-tests/**/Fixture/*',

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ jobs:`
`59`	`59`	`-`
`60`	`60`	`uses: shivammathur/setup-php@v2`
`61`	`61`	`with:`
`62`		`- php-version: 8.0`
	`62`	`+ php-version: 8.1`
`63`	`63`	`coverage: none`
`64`	`64`
`65`	`65`	`- uses: "ramsey/composer-install@v1"`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ jobs:`
`42`	`42`	`-`
`43`	`43`	`uses: shivammathur/setup-php@v2`
`44`	`44`	`with:`
`45`		`- php-version: 8.0`
	`45`	`+ php-version: 8.1`
`46`	`46`	`coverage: none`
`47`	`47`
`48`	`48`	`- run: composer config minimum-stability dev`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ jobs:`
`18`	`18`	`-`
`19`	`19`	`uses: shivammathur/setup-php@v2`
`20`	`20`	`with:`
`21`		`- php-version: 8.0`
	`21`	`+ php-version: 8.1`
`22`	`22`	`coverage: none`
`23`	`23`
`24`	`24`	`- run: composer create-project php-parallel-lint/php-parallel-lint php-parallel-lint`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ jobs:`
`44`	`44`	`-`
`45`	`45`	`uses: shivammathur/setup-php@v2`
`46`	`46`	`with:`
`47`		`- php-version: 8.0`
	`47`	`+ php-version: 8.1`
`48`	`48`	`coverage: none`
`49`	`49`
`50`	`50`	`- uses: "ramsey/composer-install@v1"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ jobs:`
`13`	`13`	`strategy:`
`14`	`14`	`fail-fast: false`
`15`	`15`	`matrix:`
`16`		`- php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']`
	`16`	`+ php_version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']`
`17`	`17`	`commands:`
`18`	`18`	`-`
`19`	`19`	`name: 'Composer Dependency'`