Blog: Fix locale, routes and npm dependencies (#597)

.github/workflows/blog-api_build.yml

@@ -14,6 +14,7 @@ on:
       - 'blog-api/psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog-api/docs/**'
       - 'blog-api/README.md'

.github/workflows/blog-api_dependency.yml

@@ -14,6 +14,7 @@ on:
       - 'blog-api/psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog-api/docs/**'
       - 'blog-api/README.md'

.github/workflows/blog-api_static.yml

@@ -14,6 +14,7 @@ on:
       - 'blog-api/phpunit.xml.dist'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog-api/docs/**'
       - 'blog-api/README.md'

.github/workflows/blog_build.yml

@@ -14,6 +14,7 @@ on:
       - 'blog/psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog/docs/**'
       - 'blog/README.md'
@@ -94,6 +95,10 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
         working-directory: ${{ env.working_directory }}
 
+      - name: Install dependencies with npm
+        run: npm update
+        working-directory: ${{ env.working_directory }}
+
       - name: Run tests codeception
         if: matrix.os != 'ubuntu-latest' || matrix.php != '8.0'
         run: vendor/bin/codecept run

.github/workflows/blog_dependency.yml

@@ -14,6 +14,7 @@ on:
       - 'blog/psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog/docs/**'
       - 'blog/README.md'

.github/workflows/blog_static.yml

@@ -14,6 +14,7 @@ on:
       - 'blog/phpunit.xml.dist'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'blog/docs/**'
       - 'blog/README.md'

blog/.editorconfig

@@ -10,6 +10,10 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
+[*.php]
+ij_php_space_before_short_closure_left_parenthesis = false
+ij_php_space_after_type_cast = true
+
 [*.md]
 trim_trailing_whitespace = false
 

blog/.gitignore

@@ -25,6 +25,7 @@ phpunit.phar
 /vendor
 /composer.lock
 /node_modules
+/package-lock.json
 
 # Codeception
 c3.php

blog/Makefile

@@ -0,0 +1,20 @@
+init: composer-update npm-update up
+
+up:
+	docker-compose up -d
+down:
+	docker-compose down
+
+composer:
+	docker-compose run php composer $(filter-out $@, $(MAKECMDGOALS))
+composer-update:
+	docker-compose run php composer update
+	npm i [email protected]
+
+npm:
+	docker-compose run php npm $(filter-out $@, $(MAKECMDGOALS))
+npm-update:
+	docker-compose run php npm update
+
+yii3:
+	docker-compose run php ./yii $(filter-out $@, $(MAKECMDGOALS))

blog/config/common/di/router.php

@@ -5,22 +5,40 @@
 use Yiisoft\Config\Config;
 use Yiisoft\Csrf\CsrfMiddleware;
 use Yiisoft\DataResponse\Middleware\FormatDataResponse;
+use Yiisoft\Router\FastRoute\UrlGenerator;
 use Yiisoft\Router\Group;
 use Yiisoft\Router\RouteCollection;
 use Yiisoft\Router\RouteCollectionInterface;
 use Yiisoft\Router\RouteCollectorInterface;
+use Yiisoft\Router\UrlGeneratorInterface;
 use Yiisoft\Yii\Debug\Viewer\Middleware\ToolbarMiddleware;
 
-/** @var Config $config */
+/**
+ * @var Config $config
+ * @var array $params
+ */
 
 return [
+    UrlGeneratorInterface::class => [
+        'class' => UrlGenerator::class,
+        'setEncodeRaw()' => [$params['yiisoft/router-fastroute']['encodeRaw']],
+        'setDefaultArgument()' => ['_language', 'en'],
+        'reset' => function () {
+            $this->defaultArguments = ['_language', 'en'];
+        },
+    ],
+
     RouteCollectionInterface::class => static function (RouteCollectorInterface $collector) use ($config) {
         $collector
             ->middleware(CsrfMiddleware::class)
             ->middleware(FormatDataResponse::class)
             ->addGroup(
-                Group::create('/{_language}')
+                Group::create()
                     ->routes(...$config->get('routes'))
+            )
+            ->addGroup(
+                Group::create('/{_language}')
+                    ->routes(...$config->get('app-routes'))
             );
 
         if (!str_starts_with(getenv('YII_ENV') ?: '', 'prod')) {

blog/config/web/events.php

@@ -3,10 +3,15 @@
 declare(strict_types=1);
 
 use App\Timer;
+use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Yii\Http\Event\ApplicationStartup;
+use Yiisoft\Yii\Middleware\Event\SetLocaleEvent;
 
 return [
     ApplicationStartup::class => [
-        static fn (Timer $timer) => $timer->start('overall'),
+        static fn(Timer $timer) => $timer->start('overall'),
+    ],
+    SetLocaleEvent::class => [
+        static fn(TranslatorInterface $translator, SetLocaleEvent $event) => $translator->setLocale($event->getLocale()),
     ],
 ];

blog/configuration.php

@@ -44,7 +44,7 @@
             '$events',
             'console/events.php',
         ],
-        'routes' => [
+        'app-routes' => [
             'common/routes/*.php',
         ],
         'bootstrap' => [

blog/package.json

@@ -0,0 +1,10 @@
+{
+    "name": "yii3-demo-blog",
+    "version": "1.0.0",
+    "description": "Yii3 Demo Blog",
+    "dependencies": {
+        "bootstrap": "^5.3.1"
+    },
+    "devDependencies": {},
+    "license": "BSD-3-Clause"
+}

blog/src/User/Controller/UserController.php

@@ -25,7 +25,7 @@ public function __construct(private ViewRenderer $viewRenderer)
 
     public function index(
         UserRepository $userRepository,
-        #[Body] array $body,
+        #[Body] ?array $body,
         #[Query] array $sortOrder,
         #[Route('page')] int $page = 1,
         #[Route('pagesize')] int $pageSize = null,