Change namespace to Yiisoft\Yii\View\Renderer\*

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## 7.0.0 under development
 
 - Chg #115: Only a full path can now be used as a layout (@vjik)
-- Chg #116: Rename package to `yiisoft/yii-view-renderer` (@vjik) 
+- Chg #116, #117, #118: Rename package to `yiisoft/yii-view-renderer` (@vjik) 
 
 ## 6.1.1 June 06, 2024
 

README.md

@@ -49,7 +49,7 @@ You can get an instance of a response with deferred rendering as follows:
  * @var \Yiisoft\View\WebView $webView
  */
 
-$viewRenderer = new \Yiisoft\Yii\View\ViewRenderer(
+$viewRenderer = new \Yiisoft\Yii\View\Renderer\ViewRenderer(
     $dataResponseFactory,
     $aliases,
     $webView,
@@ -129,7 +129,7 @@ With this approach, you do not need to specify the directory name each time when
 
 ```php
 use Psr\Http\Message\ResponseInterface;
-use Yiisoft\Yii\View\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
 
 class SiteController
 {
@@ -166,8 +166,8 @@ In addition to parameters passed directly when rendering the view template, you
 available in all views. In order to do it you need a class implementing at least one of the injection interfaces:
 
 ```php
-use Yiisoft\Yii\View\CommonParametersInjectionInterface;
-use Yiisoft\Yii\View\LayoutParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\CommonParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\LayoutParametersInjectionInterface;
 
 final class MyParametersInjection implements
     CommonParametersInjectionInterface,
@@ -196,8 +196,8 @@ Link tags and meta tags should be organized in the same way.
 ```php
 use Yiisoft\Html\Html;
 use Yiisoft\View\WebView;
-use Yiisoft\Yii\View\LinkTagsInjectionInterface;
-use Yiisoft\Yii\View\MetaTagsInjectionInterface;
+use Yiisoft\Yii\View\Renderer\LinkTagsInjectionInterface;
+use Yiisoft\Yii\View\Renderer\MetaTagsInjectionInterface;
 
 final class MyTagsInjection implements
     LinkTagsInjectionInterface,
@@ -263,14 +263,14 @@ and will overwrite the injected content parameters if their names match.
 #### Injections lazy loading
 
 You can use lazy loading for injections. Injections will be created by container that implements 
-`Yiisoft\Yii\View\InjectionContainerInterface`. Out of the box, it is available in `InjectionContainer` that is based on PSR-11 compatible 
+`Yiisoft\Yii\View\Renderer\InjectionContainerInterface`. Out of the box, it is available in `InjectionContainer` that is based on PSR-11 compatible 
 container.
 
 1. Add injection container to `ViewRenderer` constructor:
 
 ```php
-use Yiisoft\Yii\View\ViewRenderer;
-use Yiisoft\Yii\View\InjectionContainer\InjectionContainer;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\InjectionContainer\InjectionContainer;
 
 /**
  * @var Psr\Container\ContainerInterface $container

UPGRADE.md

@@ -10,4 +10,5 @@ application when you upgrade the package from one version to another.
 ## Upgrade from 6.x
 
 - Change layout value that passed to `ViewRenderer` constructor and `withLayout()` method to full path.
+- Change namespace `Yiisoft\Yii\View\*` to `Yiisoft\Yii\View\Renderer\*`.
 - Rename package configuration parameters key from "yiisoft/yii-view" to "yiisoft/yii-view-renderer".

composer.json

@@ -54,12 +54,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Yiisoft\\Yii\\View\\": "src"
+            "Yiisoft\\Yii\\View\\Renderer\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Yii\\View\\Tests\\": "tests"
+            "Yiisoft\\Yii\\View\\Renderer\\Tests\\": "tests"
         }
     },
     "extra": {

config/di-web.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Yii\View\InjectionContainer\InjectionContainer;
-use Yiisoft\Yii\View\InjectionContainer\InjectionContainerInterface;
-use Yiisoft\Yii\View\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\InjectionContainer\InjectionContainer;
+use Yiisoft\Yii\View\Renderer\InjectionContainer\InjectionContainerInterface;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
 
 /** @var array $params */
 

config/events-web.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Yiisoft\View\Event\WebView\AfterRender;
-use Yiisoft\Yii\View\Debug\WebViewCollector;
+use Yiisoft\Yii\View\Renderer\Debug\WebViewCollector;
 
 if (!($params['yiisoft/yii-debug']['enabled'] ?? false)) {
     return [];

config/params.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Yii\View\Debug\WebViewCollector;
+use Yiisoft\Yii\View\Renderer\Debug\WebViewCollector;
 
 return [
     'yiisoft/yii-view-renderer' => [

src/CommonParametersInjectionInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 /**
  * `CommonParametersInjectionInterface` is an interface that must be implemented by classes to inject

src/Csrf.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 use Stringable;
 use Yiisoft\Html\Html;

src/CsrfViewInjection.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 use LogicException;
 use Yiisoft\Csrf\CsrfMiddleware;

src/Debug/WebViewCollector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Debug;
+namespace Yiisoft\Yii\View\Renderer\Debug;
 
 use Yiisoft\View\Event\WebView\AfterRender;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
@@ -25,10 +25,10 @@
             return;
         }
 
         $this->renders[] = [
             'output' => $event->getResult(),
             'file' => $event->getFile(),
             'parameters' => $event->getParameters(),
         ];
     }
 

src/Exception/InvalidLinkTagException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Exception;
+namespace Yiisoft\Yii\View\Renderer\Exception;
 
 use RuntimeException;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
@@ -27,7 +27,7 @@ public function getSolution(): ?string
         return 'Got link tag:' . "\n" . var_export($this->tag, true) . <<<SOLUTION
 
 
-In injection that implements `Yiisoft\Yii\View\LinkTagsInjectionInterface` defined link tags in the method `getLinkTags()`.
+In injection that implements `Yiisoft\Yii\View\Renderer\LinkTagsInjectionInterface` defined link tags in the method `getLinkTags()`.
 
 The link tag can be define in the following ways:
 

src/Exception/InvalidMetaTagException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Exception;
+namespace Yiisoft\Yii\View\Renderer\Exception;
 
 use RuntimeException;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
@@ -27,7 +27,7 @@ public function getSolution(): ?string
         return 'Got meta tag:' . "\n" . var_export($this->tag, true) . <<<SOLUTION
 
 
-In injection that implements `Yiisoft\Yii\View\MetaTagsInjectionInterface` defined meta tags in the method `getMetaTags()`.
+In injection that implements `Yiisoft\Yii\View\Renderer\MetaTagsInjectionInterface` defined meta tags in the method `getMetaTags()`.
 
 The meta tag can be define in the following ways:
 

src/InjectionContainer/InjectionContainer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\InjectionContainer;
+namespace Yiisoft\Yii\View\Renderer\InjectionContainer;
 
 use Psr\Container\ContainerInterface;
 

src/InjectionContainer/InjectionContainerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\InjectionContainer;
+namespace Yiisoft\Yii\View\Renderer\InjectionContainer;
 
 interface InjectionContainerInterface
 {

src/InjectionContainer/StubInjectionContainer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\InjectionContainer;
+namespace Yiisoft\Yii\View\Renderer\InjectionContainer;
 
 use RuntimeException;
 

src/LayoutParametersInjectionInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 /**
  * LayoutParametersInjectionInterface is an interface that must be implemented by classes to inject layout parameters.

src/LayoutSpecificInjections.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 final class LayoutSpecificInjections
 {

src/LinkTagsInjectionInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 /**
  * LinkTagsInjectionInterface is an interface that must be implemented by classes to inject link tags.

src/MetaTagsInjectionInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 /**
  * MetaTagsInjectionInterface is an interface that must be implemented by classes to inject meta tags.

src/ViewRenderer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View;
+namespace Yiisoft\Yii\View\Renderer;
 
 use LogicException;
 use RuntimeException;
@@ -17,10 +17,10 @@
 use Yiisoft\View\Exception\ViewNotFoundException;
 use Yiisoft\View\ViewContextInterface;
 use Yiisoft\View\WebView;
-use Yiisoft\Yii\View\Exception\InvalidLinkTagException;
-use Yiisoft\Yii\View\Exception\InvalidMetaTagException;
-use Yiisoft\Yii\View\InjectionContainer\InjectionContainerInterface;
-use Yiisoft\Yii\View\InjectionContainer\StubInjectionContainer;
+use Yiisoft\Yii\View\Renderer\Exception\InvalidLinkTagException;
+use Yiisoft\Yii\View\Renderer\Exception\InvalidMetaTagException;
+use Yiisoft\Yii\View\Renderer\InjectionContainer\InjectionContainerInterface;
+use Yiisoft\Yii\View\Renderer\InjectionContainer\StubInjectionContainer;
 
 use function array_key_exists;
 use function array_merge;
@@ -258,7 +258,7 @@
     public function withAddedInjections(object|string ...$injections): self
     {
         $new = clone $this;
         $new->setInjections(array_merge($this->injections, $injections));
         return $new;
     }
 
@@ -281,7 +281,7 @@
      */
     public function withLocale(string $locale): self
     {
         $new = clone $this;
         $new->locale = $locale;
         return $new;
     }
@@ -418,7 +418,7 @@
         foreach ($this->getPreparedInjections() as $injection) {
             if ($injection instanceof $injectionInterface) {
                 $result[] = $injection;
                 continue;
             }
             if ($injection instanceof LayoutSpecificInjections && $injection->getLayout() === $layout) {
                 foreach ($injection->getInjections() as $layoutInjection) {
@@ -539,7 +539,7 @@
         }
 
         $regexp = '/((?<=controller\\\|controllers\\\)(?:[\w\\\]+)|(?:[a-z\d]+))controller$/iU';
         if (!preg_match($regexp, $class, $m) || empty($m[1])) {
             throw new RuntimeException('Cannot detect controller name.');
         }
 

tests/ConfigTest.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests;
+namespace Yiisoft\Yii\View\Renderer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
 use Yiisoft\Di\Container;
 use Yiisoft\Di\ContainerConfig;
 use Yiisoft\Test\Support\EventDispatcher\SimpleEventDispatcher;
 use Yiisoft\View\WebView;
-use Yiisoft\Yii\View\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
 
 final class ConfigTest extends TestCase
 {

tests/CsrfViewInjectionTest.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests;
+namespace Yiisoft\Yii\View\Renderer\Tests;
 
 use Nyholm\Psr7\Factory\Psr17Factory;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Csrf\CsrfMiddleware;
 use Yiisoft\Csrf\Synchronizer\Generator\RandomCsrfTokenGenerator;
 use Yiisoft\Csrf\Synchronizer\SynchronizerCsrfToken;
-use Yiisoft\Yii\View\Csrf;
-use Yiisoft\Yii\View\CsrfViewInjection;
-use Yiisoft\Yii\View\Tests\Support\FakeCsrfToken;
-use Yiisoft\Yii\View\Tests\Support\MockCsrfTokenStorage;
+use Yiisoft\Yii\View\Renderer\Csrf;
+use Yiisoft\Yii\View\Renderer\CsrfViewInjection;
+use Yiisoft\Yii\View\Renderer\Tests\Support\FakeCsrfToken;
+use Yiisoft\Yii\View\Renderer\Tests\Support\MockCsrfTokenStorage;
 
 final class CsrfViewInjectionTest extends TestCase
 {

tests/Debug/WebViewCollectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Debug;
+namespace Yiisoft\Yii\View\Renderer\Tests\Debug;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Yiisoft\View\Event\WebView\AfterRender;
 use Yiisoft\View\WebView;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
-use Yiisoft\Yii\View\Debug\WebViewCollector;
+use Yiisoft\Yii\View\Renderer\Debug\WebViewCollector;
 
 final class WebViewCollectorTest extends AbstractCollectorTestCase
 {

tests/Exception/InvalidLinkTagExceptionTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Exception;
+namespace Yiisoft\Yii\View\Renderer\Tests\Exception;
 
-use Yiisoft\Yii\View\Exception\InvalidLinkTagException;
+use Yiisoft\Yii\View\Renderer\Exception\InvalidLinkTagException;
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Yii\View\Tests\Support\TestTrait;
+use Yiisoft\Yii\View\Renderer\Tests\Support\TestTrait;
 
 final class InvalidLinkTagExceptionTest extends TestCase
 {

tests/Exception/InvalidMetaTagExceptionTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Exception;
+namespace Yiisoft\Yii\View\Renderer\Tests\Exception;
 
-use Yiisoft\Yii\View\Exception\InvalidMetaTagException;
+use Yiisoft\Yii\View\Renderer\Exception\InvalidMetaTagException;
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Yii\View\Tests\Support\TestTrait;
+use Yiisoft\Yii\View\Renderer\Tests\Support\TestTrait;
 
 final class InvalidMetaTagExceptionTest extends TestCase
 {

tests/Support/CharsetInjection.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Support;
+namespace Yiisoft\Yii\View\Renderer\Tests\Support;
 
-use Yiisoft\Yii\View\MetaTagsInjectionInterface;
+use Yiisoft\Yii\View\Renderer\MetaTagsInjectionInterface;
 
 final class CharsetInjection implements MetaTagsInjectionInterface
 {

tests/Support/CommonParametersInjection.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Support;
+namespace Yiisoft\Yii\View\Renderer\Tests\Support;
 
-use Yiisoft\Yii\View\CommonParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\CommonParametersInjectionInterface;
 
 final class CommonParametersInjection implements CommonParametersInjectionInterface
 {

tests/Support/Controller/Sub8Namespace/FakeController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\View\Tests\Support\Controller\Sub8Namespace;
+namespace Yiisoft\Yii\View\Renderer\Tests\Support\Controller\Sub8Namespace;
 
 final class FakeController
 {