Add Makefile + Fix configuration (#179)

vjik · web-flow · commit 8d84f1b5ab51 · 2023-10-08T15:44:50.000+03:00
diff --git a/.editorconfig b/.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
 
diff --git a/Makefile b/Makefile
@@ -0,0 +1,17 @@
+init: composer-update up
+
+up:
+	docker-compose up -d
+down:
+	docker-compose down
+
+composer-update:
+	docker-compose run php composer update
+
+yii3:
+	docker-compose run php ./yii $(filter-out $@, $(MAKECMDGOALS))
+
+test:
+	docker-compose run php ./vendor/bin/codecept run
+psalm:
+	docker-compose run php ./vendor/bin/psalm
diff --git a/config/common/di/router.php b/config/common/di/router.php
@@ -19,7 +19,12 @@
             ->middleware(RequestBodyParser::class)
             ->middleware(FormatDataResponse::class)
             ->middleware(ExceptionMiddleware::class)
-            ->addGroup(Group::create('/{_language}')->routes(...$config->get('routes')));
+            ->addGroup(
+                Group::create('/{_language}')->routes(...$config->get('app-routes')),
+            )
+            ->addGroup(
+                Group::create()->routes(...$config->get('routes')),
+            );
 
         return new RouteCollection($collector);
     },
diff --git a/config/web/events.php b/config/web/events.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Translator\TranslatorInterface;
+use Yiisoft\Yii\Middleware\Event\SetLocaleEvent;
+
+return [
+    SetLocaleEvent::class => [
+        static fn(TranslatorInterface $translator, SetLocaleEvent $event) => $translator->setLocale($event->getLocale()),
+    ],
+];
diff --git a/configuration.php b/configuration.php
@@ -27,11 +27,14 @@
         'di-providers-web' => '$di-providers',
         'events' => [],
         'events-console' => '$events',
-        'events-web' => '$events',
+        'events-web' => [
+            '$events',
+            'web/events.php',
+        ],
         'bootstrap' => [],
         'bootstrap-console' => '$bootstrap',
         'bootstrap-web' => '$bootstrap',
-        'routes' => 'common/routes.php',
+        'app-routes' => 'common/routes.php',
     ],
     'config-plugin-environments' => [
         'dev' => [
