Replace StyleCI with Yii Code Style and bump php version

.github/workflows/build.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']

.github/workflows/rector-cs.yml

@@ -0,0 +1,28 @@
+name: Rector + PHP CS Fixer
+
+on:
+  pull_request_target:
+    paths:
+      - 'src/**'
+      - 'config/**'
+      - 'tests/**'
+      - '.github/workflows/rector-cs.yml'
+      - 'composer.json'
+      - 'rector.php'
+      - '.php-cs-fixer.dist.php'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector-cs.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
+    with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
+      php: '8.1'

.github/workflows/static.yml

@@ -30,12 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
-  psalm80:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm80.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.0']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']

.gitignore

@@ -28,3 +28,7 @@ phpunit.phar
 /phpunit.xml
 # phpunit cache
 .phpunit.result.cache
+
+# PHP CS Fixer
+/.php-cs-fixer.cache
+/.php-cs-fixer.php

.php-cs-fixer.dist.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+use Yiisoft\CodeStyle\ConfigBuilder;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return ConfigBuilder::build()
+    ->setRiskyAllowed(true)
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@Yiisoft/Core' => true,
+        '@Yiisoft/Core:risky' => true,
+    ])
+    ->setFinder($finder);

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## 2.1.2 under development
 
-- no changes in this release.
+- Enh #105: Explicitly import classes, functions, and constants in "use" section (@rustamwin)
+- Chg #105: Raise the minimum PHP version to `8.1` (@rustamwin)
+- Chg #105: Change PHP constraint in `composer.json` to `8.1 - 8.5` (@rustamwin)
 
 ## 2.1.1 September 23, 2025
 

composer.json

@@ -27,20 +27,22 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "8.1 - 8.5",
         "yiisoft/aliases": "^3.0",
         "yiisoft/cache": "^2.0|^3.0",
         "yiisoft/html": "^2.5|^3.0",
         "yiisoft/view": "10 - 12",
         "yiisoft/widget": "^2.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.92.5",
         "maglnet/composer-require-checker": "^4.4",
         "phpunit/phpunit": "^9.6.23",
         "rector/rector": "^2.0.17",
         "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23.6",
         "vimeo/psalm": "^4.30|^5.26.1|^6.12",
+        "yiisoft/code-style": "^1.0",
         "yiisoft/psr-dummy-provider": "^1.0.2",
         "yiisoft/test-support": "^3.0.2"
     },
@@ -55,6 +57,7 @@
         }
     },
     "scripts": {
+        "cs-fix": "php-cs-fixer fix",
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch"
     },

src/Alert.php

@@ -15,6 +15,8 @@
 use function strtr;
 use function trim;
 
+use const PHP_EOL;
+
 /**
  * Alert renders an alert component.
  *
@@ -134,7 +136,7 @@
      */
     public function bodyContainerClass(string $value): self
     {
         $new = clone $this;
         Html::addCssClass($new->bodyContainerAttributes, $value);
 
         return $new;
@@ -472,8 +474,8 @@
      */
     private function renderButton(): string
     {
-        return PHP_EOL .
-            Button::tag()
+        return PHP_EOL
+            . Button::tag()
                 ->attributes($this->buttonAttributes)
                 ->content($this->buttonLabel)
                 ->encode(false)
@@ -486,13 +488,13 @@
      */
     private function renderIcon(): string
     {
-        return PHP_EOL .
-            Div::tag()
+        return PHP_EOL
+            . Div::tag()
                 ->attributes($this->iconContainerAttributes)
                 ->content(I::tag()->attributes($this->iconAttributes)->content($this->iconText)->render())
                 ->encode(false)
-                ->render() .
-            PHP_EOL;
+                ->render()
+            . PHP_EOL;
     }
 
     /**
@@ -510,7 +512,7 @@
      */
     private function renderHeader(): string
     {
         return Html::normalTag($this->headerTag, $this->header, $this->headerAttributes)->encode(false)->render();
     }
 
     /**
@@ -518,7 +520,7 @@
      */
     private function renderHeaderContainer(array $parts): string
     {
         $headerHtml = trim(strtr($this->layoutHeader, $parts));
 
         return $this->headerContainer && $headerHtml !== ''
             ? Div::tag()

src/Block.php

@@ -46,14 +46,12 @@ final class Block extends Widget
     private string $id = '';
     private bool $renderInPlace = false;
 
-    public function __construct(private WebView $webView)
-    {
-    }
+    public function __construct(private WebView $webView) {}
 
     /**
      * Starts recording a block.
      */
-    public function begin(): string|null
+    public function begin(): ?string
     {
         parent::begin();
 

src/Breadcrumbs.php

@@ -14,6 +14,8 @@
 use function is_string;
 use function strtr;
 
+use const PHP_EOL;
+
 /**
  * Breadcrumbs displays a list of items indicating the position of the current page in the whole site hierarchy.
  *
@@ -52,7 +54,7 @@ final class Breadcrumbs extends Widget
 {
     private string $activeItemTemplate = "<li class=\"active\">{link}</li>\n";
     private array $attributes = ['class' => 'breadcrumb'];
-    private array|null $homeItem = ['label' => 'Home', 'url' => '/'];
+    private ?array $homeItem = ['label' => 'Home', 'url' => '/'];
     private array $items = [];
     private string $itemTemplate = "<li>{link}</li>\n";
     private string $tag = 'ul';
@@ -204,7 +206,7 @@ public function render(): string
             if ($item !== []) {
                 $items[] = $this->renderItem(
                     $item,
-                    isset($item['url']) ? $this->itemTemplate : $this->activeItemTemplate
+                    isset($item['url']) ? $this->itemTemplate : $this->activeItemTemplate,
                 );
             }
         }

src/ContentDecorator.php

@@ -34,9 +34,7 @@ final class ContentDecorator extends Widget
     private array $parameters = [];
     private string $viewFile = '';
 
-    public function __construct(private Aliases $aliases, private WebView $webView)
-    {
-    }
+    public function __construct(private Aliases $aliases, private WebView $webView) {}
 
     /**
      * Returns a new instance with the specified parameters.

src/Dropdown.php

@@ -21,6 +21,8 @@
 use function str_contains;
 use function trim;
 
+use const PHP_EOL;
+
 final class Dropdown extends Widget
 {
     private string $activeClass = 'active';
@@ -488,7 +490,7 @@
         }
 
         return $this->renderItemContainer(
             Html::tag($this->dividerTag, '', $dividerAttributes)->encode(false)->render(),
         );
     }
 
@@ -506,7 +508,7 @@
             ->itemContainerAttributes($this->itemContainerAttributes)
             ->itemContainerTag($this->itemContainerTag)
             ->items($items)
             ->itemsContainerAttributes(array_merge($this->itemsContainerAttributes))
             ->itemTag($this->itemTag)
             ->toggleAttributes($this->toggleAttributes)
             ->toggleType($this->toggleType)
@@ -524,7 +526,7 @@
         }
 
         return $this->renderItemContainer(
             Html::normalTag($this->headerTag, $label, $headerAttributes)->encode(false)->render(),
         );
     }
 
@@ -585,7 +587,7 @@
 
             if ($this->toggleType === 'split' && !str_contains($this->containerClass, 'dropstart')) {
                 $lines[] = $toggleSplitButton . PHP_EOL . $toggle . PHP_EOL . $itemContainer;
             } elseif ($this->toggleType === 'split' && str_contains($this->containerClass, 'dropstart')) {
                 $lines[] = $toggle . PHP_EOL . $itemContainer . PHP_EOL . $toggleSplitButton;
             } else {
                 $lines[] = $toggle . PHP_EOL . $itemContainer;
@@ -636,7 +638,7 @@
         array $headerAttributes = [],
         array $itemContainerAttributes = [],
     ): string {
         return match (true) {
             $label === '-' => $this->renderDivider(),
             $enclose === false => $label,
             $link === '' => $this->renderHeader($label, $headerAttributes),
@@ -686,7 +688,7 @@
         string $label,
         string $link,
         array $linkAttributes = [],
-        array $itemContainerAttributes = []
+        array $itemContainerAttributes = [],
     ): string {
         $linkAttributes['href'] = $link;
 

src/FragmentCache.php

@@ -41,7 +41,7 @@
  */
 final class FragmentCache extends Widget
 {
-    private Dependency|null $dependency = null;
+    private ?Dependency $dependency = null;
     private string $id = '';
     private int $ttl = 60;
     /** @psalm-var string[] */
@@ -52,9 +52,7 @@ final class FragmentCache extends Widget
      */
     private array $dynamicContents = [];
 
-    public function __construct(private CacheInterface $cache)
-    {
-    }
+    public function __construct(private CacheInterface $cache) {}
 
     /**
      * Returns a new instance with the specified dynamic contents.